From c164c39a2d70f802c1b5440baf5bb61ef9475604 Mon Sep 17 00:00:00 2001
From: Jtubau <jtubau@verdnatura.es>
Date: Thu, 12 Dec 2024 15:52:36 +0100
Subject: [PATCH 01/20] feat: refs #7050 7050 add test to isEmpty()

---
 .../components/common/CrudModel.spec.js       | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/test/vitest/__tests__/components/common/CrudModel.spec.js b/test/vitest/__tests__/components/common/CrudModel.spec.js
index 6ce93e59c..e8cf43473 100644
--- a/test/vitest/__tests__/components/common/CrudModel.spec.js
+++ b/test/vitest/__tests__/components/common/CrudModel.spec.js
@@ -1,5 +1,6 @@
 import { createWrapper } from 'app/test/vitest/helper';
 import CrudModel from 'components/CrudModel.vue';
+import c from 'croppie';
 import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
 
 describe('CrudModel', () => {
@@ -117,4 +118,47 @@ describe('CrudModel', () => {
             });
         });
     });
+
+    describe('isEmpty()', () => {
+        let dummyObj;
+        let dummyArray;
+        let result;
+        it('should return true if object si null', async () => {
+            dummyObj = null;
+            result = vm.isEmpty(dummyObj);
+
+            expect(result).toBe(true);
+        });
+
+        it('should return true if object si undefined', async () => {
+            dummyObj = undefined;
+            result = vm.isEmpty(dummyObj);
+
+            expect(result).toBe(true);
+        });
+
+        it('should return true if object is empty', async () => {
+            dummyObj ={};
+            result = vm.isEmpty(dummyObj);    
+
+            expect(result).toBe(true);
+            
+            dummyArray = [];
+            result = vm.isEmpty(dummyArray); 
+
+            expect(result).toBe(true);
+        });
+
+        it('should return false if object is not empty', async () => {
+            dummyObj = {a:1, b:2, c:3};
+            result = vm.isEmpty(dummyObj);
+
+            expect(result).toBe(false);
+            
+            dummyArray = [1,2,3];
+            result = vm.isEmpty(dummyArray);
+
+            expect(result).toBe(false);
+        })
+    });
 });

From 77f4949ba6297c4a585bd60e7ac43f51f6852682 Mon Sep 17 00:00:00 2001
From: Jtubau <jtubau@verdnatura.es>
Date: Thu, 12 Dec 2024 15:53:56 +0100
Subject: [PATCH 02/20] feat: refs #7050 7050 add object check

---
 src/components/CrudModel.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 7fdb54bc4..cff18f2de 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -270,10 +270,8 @@ function getChanges() {
 
 function isEmpty(obj) {
     if (obj == null) return true;
-    if (obj === undefined) return true;
-    if (Object.keys(obj).length === 0) return true;
-
-    if (obj.length > 0) return false;
+    if (Array.isArray(obj)) return !obj.length;
+    return Object.keys(obj).length === 0 ;
 }
 
 async function reload(params) {

From 0706c9d58ed0c28ed38f58f20f83a0b91b0252ca Mon Sep 17 00:00:00 2001
From: Jtubau <jtubau@verdnatura.es>
Date: Thu, 12 Dec 2024 16:04:57 +0100
Subject: [PATCH 03/20] fix: refs #7050 delete import added by mistake

---
 test/vitest/__tests__/components/common/CrudModel.spec.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/vitest/__tests__/components/common/CrudModel.spec.js b/test/vitest/__tests__/components/common/CrudModel.spec.js
index e8cf43473..2d7493cca 100644
--- a/test/vitest/__tests__/components/common/CrudModel.spec.js
+++ b/test/vitest/__tests__/components/common/CrudModel.spec.js
@@ -1,6 +1,5 @@
 import { createWrapper } from 'app/test/vitest/helper';
 import CrudModel from 'components/CrudModel.vue';
-import c from 'croppie';
 import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
 
 describe('CrudModel', () => {

From 35cef37d4f31f09e975e1ac023a9a666cfa282d9 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 13 Dec 2024 08:04:05 +0100
Subject: [PATCH 04/20] fix: refs #8201 use arrayData to fix the error

---
 src/pages/Supplier/Card/SupplierDescriptor.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 28cfe49ce..9d469bcc1 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -9,7 +9,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import { toDateString } from 'src/filters';
 import useCardDescription from 'src/composables/useCardDescription';
 import { getUrl } from 'src/composables/getUrl';
-import { useState } from 'src/composables/useState';
+import { useArrayData } from 'src/composables/useArrayData';
 
 const $props = defineProps({
     id: {
@@ -26,7 +26,7 @@ const $props = defineProps({
 const route = useRoute();
 const { t } = useI18n();
 const url = ref();
-const state = useState();
+const arrayData = useArrayData();
 
 const filter = {
     fields: [
@@ -77,7 +77,7 @@ const setData = (entity) => {
     data.value = useCardDescription(entity.ref, entity.id);
 };
 
-const supplier = computed(() => state.get('supplier'));
+const supplier = computed(() => arrayData.store.data);
 
 const getEntryQueryParams = (supplier) => {
     if (!supplier) return null;
@@ -127,6 +127,7 @@ const getEntryQueryParams = (supplier) => {
             <VnLv :label="t('supplier.summary.account')" :value="entity.account" />
         </template>
         <template #icons>
+            {{ console.log('supplier: ', supplier) }}
             <QCardActions v-if="supplier" class="q-gutter-x-md">
                 <QIcon
                     v-if="!supplier.isActive"

From 1a0789b77fc71cbf78839a331925e992c9475c07 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 13 Dec 2024 08:05:03 +0100
Subject: [PATCH 05/20] refactor: refs #8201 deleted log

---
 src/pages/Supplier/Card/SupplierDescriptor.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 9d469bcc1..a1a2a0991 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -127,7 +127,6 @@ const getEntryQueryParams = (supplier) => {
             <VnLv :label="t('supplier.summary.account')" :value="entity.account" />
         </template>
         <template #icons>
-            {{ console.log('supplier: ', supplier) }}
             <QCardActions v-if="supplier" class="q-gutter-x-md">
                 <QIcon
                     v-if="!supplier.isActive"

From 43c24e0383cdca8ae82c20aeae3d19da24811118 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 13 Dec 2024 14:20:17 +0100
Subject: [PATCH 06/20] fix: refs #8201 added onDataSaved emi to refetch when
 cahnges are made

---
 src/pages/Account/Card/AccountDescriptor.vue  | 7 +++----
 src/pages/Supplier/Card/SupplierBasicData.vue | 7 +++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/pages/Account/Card/AccountDescriptor.vue b/src/pages/Account/Card/AccountDescriptor.vue
index 3156f8e1e..ed7adc455 100644
--- a/src/pages/Account/Card/AccountDescriptor.vue
+++ b/src/pages/Account/Card/AccountDescriptor.vue
@@ -53,7 +53,6 @@ const hasAccount = ref(false);
             <AccountDescriptorMenu :has-account="hasAccount" />
         </template>
         <template #before>
-            <!-- falla id :id="entityId.value" collection="user" size="160x160" -->
             <VnImg :id="entityId" collection="user" resolution="520x520" class="photo">
                 <template #error>
                     <div
@@ -75,8 +74,8 @@ const hasAccount = ref(false);
             <VnLv :label="t('account.card.nickname')" :value="entity.name" />
             <VnLv :label="t('account.card.role')" :value="entity.role.name" />
         </template>
-        <template #actions="{ entity }">
-            <QCardActions class="q-gutter-x-md">
+        <template #icons="{ entity }">
+            <QCardActions v-if="accountData" class="q-gutter-x-md">
                 <QIcon
                     v-if="!entity.active"
                     color="primary"
@@ -91,7 +90,7 @@ const hasAccount = ref(false);
                 <QIcon
                     color="primary"
                     name="contact_mail"
-                    v-if="entity.hasAccount"
+                    v-if="hasAccount"
                     flat
                     round
                     size="sm"
diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index 842109656..4b4988789 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -6,14 +6,20 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
+import { useArrayData } from 'src/composables/useArrayData';
 
 const route = useRoute();
 const { t } = useI18n();
+const arrayData = useArrayData();
 const companySizes = [
     { id: 'small', name: t('globals.small'), size: '1-5' },
     { id: 'medium', name: t('globals.medium'), size: '6-50' },
     { id: 'big', name: t('globals.big'), size: '>50' },
 ];
+
+const onSave = () => {
+    arrayData.fetch({});
+};
 </script>
 <template>
     <FormModel
@@ -22,6 +28,7 @@ const companySizes = [
         model="supplier"
         auto-load
         :clear-store-on-unmount="false"
+        @on-data-saved="onSave"
     >
         <template #form="{ data, validate }">
             <VnRow>

From fe1d9e93a33d2027f7922402bedd50ce3c0ea843 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 17 Dec 2024 06:27:03 +0100
Subject: [PATCH 07/20] refactor: refs #8201  added onMounted to stablish the
 value to show icons

---
 src/pages/Claim/Card/ClaimDevelopment.vue         | 14 +-------------
 src/pages/Customer/Card/CustomerDescriptor.vue    | 12 +++++++++---
 src/pages/Department/Card/DepartmentBasicData.vue |  2 +-
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimDevelopment.vue b/src/pages/Claim/Card/ClaimDevelopment.vue
index e288d8614..d17c6b4e6 100644
--- a/src/pages/Claim/Card/ClaimDevelopment.vue
+++ b/src/pages/Claim/Card/ClaimDevelopment.vue
@@ -164,19 +164,7 @@ const columns = computed(() => [
                             :autofocus="col.tabIndex == 1"
                             input-debounce="0"
                             hide-selected
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                                        <QItemLabel caption>
-                                            {{ scope.opt?.nickname }}
-                                            {{ scope.opt?.code }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelectWorker>
+                        />
                         <VnSelect
                             v-else
                             v-model="row[col.model]"
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 98e53d568..a17b7c796 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -14,7 +14,13 @@ import CustomerDescriptorMenu from './CustomerDescriptorMenu.vue';
 import { useState } from 'src/composables/useState';
 const state = useState();
 
-const customer = computed(() => state.get('customer'));
+const customer = ref();
+
+onMounted(async () => {
+    console.log('state.get(customer): ', state.get('customer'));
+    customer.value = state.get('customer');
+    if (customer.value) customer.value.webAccess = data.value?.account?.isActive;
+});
 
 const $props = defineProps({
     id: {
@@ -38,7 +44,6 @@ const entityId = computed(() => {
 const data = ref(useCardDescription());
 const setData = (entity) => {
     data.value = useCardDescription(entity?.name, entity?.id);
-    if (customer.value) customer.value.webAccess = data.value?.account?.isActive;
 };
 const debtWarning = computed(() => {
     return customer.value?.debt > customer.value?.credit ? 'negative' : 'primary';
@@ -94,6 +99,7 @@ const debtWarning = computed(() => {
             />
         </template>
         <template #icons>
+            {{ console.log('customer: ', customer) }}
             <QCardActions v-if="customer" class="q-gutter-x-md">
                 <QIcon
                     v-if="!customer.isActive"
diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Department/Card/DepartmentBasicData.vue
index 22ce06821..b13aed2d3 100644
--- a/src/pages/Department/Card/DepartmentBasicData.vue
+++ b/src/pages/Department/Card/DepartmentBasicData.vue
@@ -52,7 +52,7 @@ const { t } = useI18n();
                 <VnSelectWorker
                     :label="t('department.bossDepartment')"
                     v-model="data.workerFk"
-                    :rules="validate('department.workerFk')"
+                    :rules="validate('department.bossDepartment')"
                 />
                 <VnSelect
                     :label="t('department.selfConsumptionCustomer')"

From 9d955f45bbdb0947781106c734ef0bbe8841fc9b Mon Sep 17 00:00:00 2001
From: Jtubau <jtubau@verdnatura.es>
Date: Wed, 18 Dec 2024 07:06:34 +0100
Subject: [PATCH 08/20] test: refs #7050 add tests to fns resetData() and
 saveChanges()

---
 .../components/common/CrudModel.spec.js       | 101 +++++++++++++++++-
 1 file changed, 100 insertions(+), 1 deletion(-)

diff --git a/test/vitest/__tests__/components/common/CrudModel.spec.js b/test/vitest/__tests__/components/common/CrudModel.spec.js
index 2d7493cca..b3cdbede7 100644
--- a/test/vitest/__tests__/components/common/CrudModel.spec.js
+++ b/test/vitest/__tests__/components/common/CrudModel.spec.js
@@ -1,9 +1,10 @@
-import { createWrapper } from 'app/test/vitest/helper';
+import { createWrapper, axios } from 'app/test/vitest/helper';
 import CrudModel from 'components/CrudModel.vue';
 import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
 
 describe('CrudModel', () => {
     let vm;
+    let data;
     beforeAll(() => {
         vm = createWrapper(CrudModel, {
             global: {
@@ -31,6 +32,7 @@ describe('CrudModel', () => {
 
     beforeEach(() => {
         vm.fetch([]);
+        vm.watchChanges = null;
     });
 
     afterEach(() => {
@@ -160,4 +162,101 @@ describe('CrudModel', () => {
             expect(result).toBe(false);
         })
     });
+
+    describe('resetData()', () => {
+        
+        it('should add $index to elements in data[] and sets originalData and formData with data', async () => {
+            data = [{
+                name: 'Tony',
+                lastName: 'Stark',
+                age: 42,
+            }];
+
+            vm.resetData(data);
+            
+            expect(vm.originalData).toEqual(data);
+            expect(vm.originalData[0].$index).toEqual(0);
+            expect(vm.formData).toEqual(data);
+            expect(vm.formData[0].$index).toEqual(0);
+            expect(vm.watchChanges).not.toBeNull();
+        });
+
+        it('should dont do nothing if data is null', async () => {
+            vm.resetData(null);
+
+            expect(vm.watchChanges).toBeNull();
+        });
+
+        it('should set originalData and formatData with data and generate watchChanges', async () => {
+            data = {
+                name: 'Tony',
+                lastName: 'Stark',
+                age: 42,
+            };
+
+            vm.resetData(data);
+
+            expect(vm.originalData).toEqual(data);
+            expect(vm.formData).toEqual(data);
+            expect(vm.watchChanges).not.toBeNull();
+        });
+    });
+
+    describe('saveChanges()', () => {
+        data = [{
+            name: 'Tony',
+            lastName: 'Stark',
+            age: 42,
+        }];
+
+        it('should call saveFn if exists', async () => {
+            const saveFnMock = vi.fn();
+            
+            const localVm = createWrapper(CrudModel, {
+                global: {
+                    stubs: [
+                        'vnPaginate',
+                        'useState',
+                        'arrayData',
+                        'useStateStore',
+                        'vue-i18n',
+                    ],
+                    mocks: {
+                        validate: vi.fn(),
+                    },
+                },
+                propsData: {
+                    dataRequired: {
+                        fk: 1,
+                    },
+                    dataKey: 'crudModelKey',
+                    model: 'crudModel',
+                    url: 'crudModelUrl',
+                    saveFn: saveFnMock,
+                },
+            });
+
+            localVm.vm.saveChanges(data);
+            expect(saveFnMock).toHaveBeenCalledOnce();
+            expect(localVm.vm.isLoading).toBe(false);
+            expect(localVm.vm.hasChanges).toBe(false);
+        });
+
+        it('should not call saveFn if not exists', async () => {
+            const postMock =vi.spyOn(axios, 'post');
+            
+            vm.formData = [{
+                name: 'Bruce',
+                lastName: 'Wayne',
+                age: 45,
+            }]
+
+            await vm.saveChanges(data);
+
+            expect(postMock).toHaveBeenCalledWith(vm.url + '/crud', data);
+            expect(vm.isLoading).toBe(false);
+            expect(vm.hasChanges).toBe(false);
+            expect(vm.originalData).toEqual(JSON.parse(JSON.stringify(vm.formData)));
+        });
+    });
 });

From 410052d6ec28e4cc8b1145134cd69e386b2bc35f Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 18 Dec 2024 10:04:21 +0100
Subject: [PATCH 09/20] refactor: refs #8201 deleted logs

---
 src/pages/Customer/Card/CustomerDescriptor.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index a17b7c796..dc5f08d37 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -17,7 +17,6 @@ const state = useState();
 const customer = ref();
 
 onMounted(async () => {
-    console.log('state.get(customer): ', state.get('customer'));
     customer.value = state.get('customer');
     if (customer.value) customer.value.webAccess = data.value?.account?.isActive;
 });
@@ -99,7 +98,6 @@ const debtWarning = computed(() => {
             />
         </template>
         <template #icons>
-            {{ console.log('customer: ', customer) }}
             <QCardActions v-if="customer" class="q-gutter-x-md">
                 <QIcon
                     v-if="!customer.isActive"

From 7a53282122322c2fb94824375922062a2b447622 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 20 Dec 2024 12:00:32 +0100
Subject: [PATCH 10/20] feat: refs #7056 update route meta information and add
 FormModel tests

---
 .../__tests__/components/FormModel.spec.js    | 145 ++++++++++++++++++
 test/vitest/helper.js                         |   4 +-
 2 files changed, 147 insertions(+), 2 deletions(-)
 create mode 100644 test/vitest/__tests__/components/FormModel.spec.js

diff --git a/test/vitest/__tests__/components/FormModel.spec.js b/test/vitest/__tests__/components/FormModel.spec.js
new file mode 100644
index 000000000..a608d26d6
--- /dev/null
+++ b/test/vitest/__tests__/components/FormModel.spec.js
@@ -0,0 +1,145 @@
+import { describe, expect, it, beforeAll, vi, afterAll } from 'vitest';
+import { createWrapper, axios } from 'app/test/vitest/helper';
+import FormModel from 'src/components/FormModel.vue';
+
+describe('FormModel', () => {
+    const model = 'mockModel';
+    const url = 'mockUrl';
+    const formInitialData = { mockKey: 'mockVal' };
+
+    describe('modelValue', () => {
+        it('should use the provided model', () => {
+            const { vm } = mount({ propsData: { model: 'mockModel' } });
+            expect(vm.modelValue).toBe('mockModel');
+        });
+
+        it('should use the route meta title when model is not provided', () => {
+            const { vm } = mount({});
+            expect(vm.modelValue).toBe('formModel_mockTitle');
+        });
+    });
+
+    describe('onMounted()', () => {
+        let mockGet;
+
+        beforeAll(() => {
+            mockGet = vi.spyOn(axios, 'get').mockResolvedValue({ data: {} });
+        });
+
+        afterAll(() => {
+            mockGet.mockRestore();
+        });
+
+        it('should not fetch when has formInitialData', () => {
+            mount({ propsData: { url, model, autoLoad: true, formInitialData } });
+            expect(mockGet).not.toHaveBeenCalled();
+        });
+
+        it('should fetch when there is url and auto-load', () => {
+            mount({ propsData: { url, model, autoLoad: true } });
+            expect(mockGet).toHaveBeenCalled();
+        });
+
+        it('should not observe changes', () => {
+            const { vm } = mount({
+                propsData: { url, model, observeFormChanges: false, formInitialData },
+            });
+
+            expect(vm.hasChanges).toBe(true);
+            vm.reset();
+            expect(vm.hasChanges).toBe(true);
+        });
+
+        it('should observe changes', async () => {
+            const { vm } = mount({
+                propsData: { url, model, formInitialData },
+            });
+            vm.state.set(model, { mockKey: 'mockVal' });
+            expect(vm.hasChanges).toBe(false);
+
+            vm.formData.mockKey = 'newVal';
+            await vm.$nextTick();
+            expect(vm.hasChanges).toBe(true);
+        });
+    });
+
+    describe.skip('watch()', () => {
+        let wrapper;
+        let vm;
+
+        beforeAll(() => {
+            wrapper = mount({
+                propsData: { url, model, formInitialData },
+            });
+            vm = wrapper.vm;
+        });
+
+        it('should call updateAndEmit when arrayData.store.data changes', async () => {
+            const updateAndEmitSpy = vi.spyOn(vm, 'updateAndEmit');
+            await vm.$nextTick();
+            console.log('vm.arrayData.store.data', vm.arrayData.store.data);
+            vm.arrayData.store.data = { newData: 'newValue' };
+            await vm.$nextTick();
+            vm.arrayData.store.data = { newData: 'anotherVal' };
+            await vm.$nextTick();
+
+            expect(updateAndEmitSpy).toHaveBeenCalled();
+        });
+
+        it('should call reset and fetch when $props.url or $props.filter changes', async () => {
+            const resetSpy = vi.spyOn(vm, 'reset');
+            const fetchSpy = vi.spyOn(vm, 'fetch');
+
+            wrapper.setProps({ url: 'newMockUrl' });
+            await wrapper.vm.$nextTick();
+            expect(resetSpy).toHaveBeenCalled();
+            expect(fetchSpy).toHaveBeenCalled();
+        });
+    });
+
+    describe('trimData()', () => {
+        let vm;
+        beforeAll(() => {
+            vm = mount({}).vm;
+        });
+
+        it('should trim whitespace from string values', () => {
+            const data = { key1: '  value1  ', key2: '  value2  ' };
+            const trimmedData = vm.trimData(data);
+            expect(trimmedData).toEqual({ key1: 'value1', key2: 'value2' });
+        });
+
+        it('should not modify non-string values', () => {
+            const data = { key1: 123, key2: true, key3: null, key4: undefined };
+            const trimmedData = vm.trimData(data);
+            expect(trimmedData).toEqual(data);
+        });
+    });
+
+    describe('onUnmounted()', () => {
+        it('should restore original data in the store if changes were made but not saved', async () => {
+            const wrapper = mount({ propsData: { model, formInitialData } });
+            const vm = wrapper.vm;
+            vm.formData.mockKey = 'newVal';
+            await vm.$nextTick();
+            await wrapper.unmount();
+            expect(vm.state.get(model)).toEqual(formInitialData);
+        });
+
+        it('should clear the store on unmount if clearStoreOnUnmount is true', async () => {
+            const wrapper = mount({
+                propsData: { model, formInitialData, clearStoreOnUnmount: true },
+            });
+            const vm = wrapper.vm;
+            vm.hasChanges = false;
+            await wrapper.unmount();
+            expect(vm.state.get(model)).toBeUndefined();
+        });
+    });
+});
+
+function mount({ propsData = {} }) {
+    return createWrapper(FormModel, {
+        propsData,
+    });
+}
diff --git a/test/vitest/helper.js b/test/vitest/helper.js
index ce057c7c3..1e693ab63 100644
--- a/test/vitest/helper.js
+++ b/test/vitest/helper.js
@@ -26,7 +26,7 @@ vi.mock('vue-router', () => ({
                 params: {
                     id: 1,
                 },
-                meta: { moduleName: 'mockName' },
+                meta: { moduleName: 'mockModuleName' },
                 matched: [{ path: 'mockName/list' }],
             },
         },
@@ -35,7 +35,7 @@ vi.mock('vue-router', () => ({
         matched: [],
         query: {},
         params: {},
-        meta: { moduleName: 'mockName' },
+        meta: { moduleName: 'mockModuleName', title: 'mockTitle', name: 'mockName' },
         path: 'mockSection/list',
     }),
     onBeforeRouteLeave: () => {},

From 48742289fef97cf9d4a2e9d4b11e114c848d8ca7 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 23 Dec 2024 09:45:15 +0100
Subject: [PATCH 11/20] feat: refs #7056 add tests in FormModel

---
 .../__tests__/components/FormModel.spec.js    | 77 +++++++------------
 1 file changed, 27 insertions(+), 50 deletions(-)

diff --git a/test/vitest/__tests__/components/FormModel.spec.js b/test/vitest/__tests__/components/FormModel.spec.js
index a608d26d6..469e52770 100644
--- a/test/vitest/__tests__/components/FormModel.spec.js
+++ b/test/vitest/__tests__/components/FormModel.spec.js
@@ -54,46 +54,13 @@ describe('FormModel', () => {
             const { vm } = mount({
                 propsData: { url, model, formInitialData },
             });
-            vm.state.set(model, { mockKey: 'mockVal' });
+            vm.state.set(model, formInitialData);
             expect(vm.hasChanges).toBe(false);
 
             vm.formData.mockKey = 'newVal';
             await vm.$nextTick();
             expect(vm.hasChanges).toBe(true);
-        });
-    });
-
-    describe.skip('watch()', () => {
-        let wrapper;
-        let vm;
-
-        beforeAll(() => {
-            wrapper = mount({
-                propsData: { url, model, formInitialData },
-            });
-            vm = wrapper.vm;
-        });
-
-        it('should call updateAndEmit when arrayData.store.data changes', async () => {
-            const updateAndEmitSpy = vi.spyOn(vm, 'updateAndEmit');
-            await vm.$nextTick();
-            console.log('vm.arrayData.store.data', vm.arrayData.store.data);
-            vm.arrayData.store.data = { newData: 'newValue' };
-            await vm.$nextTick();
-            vm.arrayData.store.data = { newData: 'anotherVal' };
-            await vm.$nextTick();
-
-            expect(updateAndEmitSpy).toHaveBeenCalled();
-        });
-
-        it('should call reset and fetch when $props.url or $props.filter changes', async () => {
-            const resetSpy = vi.spyOn(vm, 'reset');
-            const fetchSpy = vi.spyOn(vm, 'fetch');
-
-            wrapper.setProps({ url: 'newMockUrl' });
-            await wrapper.vm.$nextTick();
-            expect(resetSpy).toHaveBeenCalled();
-            expect(fetchSpy).toHaveBeenCalled();
+            vm.formData.mockKey = 'mockVal';
         });
     });
 
@@ -116,24 +83,34 @@ describe('FormModel', () => {
         });
     });
 
-    describe('onUnmounted()', () => {
-        it('should restore original data in the store if changes were made but not saved', async () => {
-            const wrapper = mount({ propsData: { model, formInitialData } });
-            const vm = wrapper.vm;
-            vm.formData.mockKey = 'newVal';
-            await vm.$nextTick();
-            await wrapper.unmount();
-            expect(vm.state.get(model)).toEqual(formInitialData);
+    describe('save()', async () => {
+        it('should not call if there are not changes', async () => {
+            const { vm } = mount({ propsData: { url, model } });
+
+            await vm.save();
+            expect(vm.hasChanges).toBe(false);
         });
 
-        it('should clear the store on unmount if clearStoreOnUnmount is true', async () => {
-            const wrapper = mount({
-                propsData: { model, formInitialData, clearStoreOnUnmount: true },
+        it('should call axios.patch with the right data', async () => {
+            const spy = vi.spyOn(axios, 'patch').mockResolvedValue({ data: {} });
+            const { vm } = mount({ propsData: { url, model, formInitialData } });
+            vm.formData.mockKey = 'newVal';
+            await vm.$nextTick();
+            await vm.save();
+            expect(spy).toHaveBeenCalled();
+            vm.formData.mockKey = 'mockVal';
+        });
+
+        it('should call axios.post with the right data', async () => {
+            const spy = vi.spyOn(axios, 'post').mockResolvedValue({ data: {} });
+            const { vm } = mount({
+                propsData: { url, model, formInitialData, urlCreate: 'mockUrlCreate' },
             });
-            const vm = wrapper.vm;
-            vm.hasChanges = false;
-            await wrapper.unmount();
-            expect(vm.state.get(model)).toBeUndefined();
+            vm.formData.mockKey = 'newVal';
+            await vm.$nextTick();
+            await vm.save();
+            expect(spy).toHaveBeenCalled();
+            vm.formData.mockKey = 'mockVal';
         });
     });
 });

From 093034c523e561622549decdacc8e8678b6a22dc Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 23 Dec 2024 13:01:59 +0100
Subject: [PATCH 12/20] chore: refs #7056 move test

---
 .../components => src/components/__tests__}/FormModel.spec.js     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {test/vitest/__tests__/components => src/components/__tests__}/FormModel.spec.js (100%)

diff --git a/test/vitest/__tests__/components/FormModel.spec.js b/src/components/__tests__/FormModel.spec.js
similarity index 100%
rename from test/vitest/__tests__/components/FormModel.spec.js
rename to src/components/__tests__/FormModel.spec.js

From 7cb4dfe16a51e56f86a4f19ceb20e0f0ec6d43f3 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 23 Dec 2024 13:34:34 +0100
Subject: [PATCH 13/20] test: refs #7056 add save function and reload data
 tests for FormModel component

---
 src/components/__tests__/FormModel.spec.js | 27 ++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/components/__tests__/FormModel.spec.js b/src/components/__tests__/FormModel.spec.js
index 469e52770..66157d567 100644
--- a/src/components/__tests__/FormModel.spec.js
+++ b/src/components/__tests__/FormModel.spec.js
@@ -112,6 +112,33 @@ describe('FormModel', () => {
             expect(spy).toHaveBeenCalled();
             vm.formData.mockKey = 'mockVal';
         });
+
+        it('should use the saveFn', async () => {
+            const { vm } = mount({
+                propsData: { url, model, formInitialData, saveFn: () => {} },
+            });
+            const spyPatch = vi.spyOn(axios, 'patch').mockResolvedValue({ data: {} });
+            const spySaveFn = vi.spyOn(vm.$props, 'saveFn');
+
+            vm.formData.mockKey = 'newVal';
+            await vm.$nextTick();
+            await vm.save();
+            expect(spyPatch).not.toHaveBeenCalled();
+            expect(spySaveFn).toHaveBeenCalled();
+            vm.formData.mockKey = 'mockVal';
+        });
+
+        it('should reload the data after save', async () => {
+            const { vm } = mount({
+                propsData: { url, model, formInitialData, reload: true },
+            });
+            vi.spyOn(axios, 'patch').mockResolvedValue({ data: {} });
+
+            vm.formData.mockKey = 'newVal';
+            await vm.$nextTick();
+            await vm.save();
+            vm.formData.mockKey = 'mockVal';
+        });
     });
 });
 

From f4aee047ff7f77e2dfbbc3f5dc10a049a2e8cd58 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 23 Dec 2024 14:21:36 +0100
Subject: [PATCH 14/20] test: refs #7056 update FormModel.spec.js to use
 dynamic model value in tests

---
 src/components/__tests__/FormModel.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/__tests__/FormModel.spec.js b/src/components/__tests__/FormModel.spec.js
index 66157d567..e35684bc3 100644
--- a/src/components/__tests__/FormModel.spec.js
+++ b/src/components/__tests__/FormModel.spec.js
@@ -9,8 +9,8 @@ describe('FormModel', () => {
 
     describe('modelValue', () => {
         it('should use the provided model', () => {
-            const { vm } = mount({ propsData: { model: 'mockModel' } });
-            expect(vm.modelValue).toBe('mockModel');
+            const { vm } = mount({ propsData: { model } });
+            expect(vm.modelValue).toBe(model);
         });
 
         it('should use the route meta title when model is not provided', () => {

From 1cf817be173892a8b3a9e8780aef00c8943f8b13 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Mon, 23 Dec 2024 15:09:14 +0100
Subject: [PATCH 15/20] refactor: refs #7050 refactorize

---
 src/components/CrudModel.vue                  |  4 +-
 .../components/common/CrudModel.spec.js       | 65 ++++++++-----------
 2 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index cff18f2de..940b72ff0 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -127,7 +127,7 @@ function resetData(data) {
     originalData.value = JSON.parse(JSON.stringify(data));
     formData.value = JSON.parse(JSON.stringify(data));
 
-    if (watchChanges.value) watchChanges.value(); //destoy watcher
+    if (watchChanges.value) watchChanges.value(); //destroy watcher
     watchChanges.value = watch(formData, () => (hasChanges.value = true), { deep: true });
 }
 
@@ -271,7 +271,7 @@ function getChanges() {
 function isEmpty(obj) {
     if (obj == null) return true;
     if (Array.isArray(obj)) return !obj.length;
-    return Object.keys(obj).length === 0 ;
+    return !Object.keys(obj).length;
 }
 
 async function reload(params) {
diff --git a/test/vitest/__tests__/components/common/CrudModel.spec.js b/test/vitest/__tests__/components/common/CrudModel.spec.js
index b3cdbede7..e28b6003e 100644
--- a/test/vitest/__tests__/components/common/CrudModel.spec.js
+++ b/test/vitest/__tests__/components/common/CrudModel.spec.js
@@ -3,10 +3,11 @@ import CrudModel from 'components/CrudModel.vue';
 import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
 
 describe('CrudModel', () => {
+    let wrapper;
     let vm;
     let data;
     beforeAll(() => {
-        vm = createWrapper(CrudModel, {
+        wrapper = createWrapper(CrudModel, {
             global: {
                 stubs: [
                     'vnPaginate',
@@ -26,8 +27,11 @@ describe('CrudModel', () => {
                 dataKey: 'crudModelKey',
                 model: 'crudModel',
                 url: 'crudModelUrl',
+                saveFn: '',
             },
-        }).vm;
+        });
+        wrapper=wrapper.wrapper;
+        vm=wrapper.vm;
     });
 
     beforeEach(() => {
@@ -143,11 +147,6 @@ describe('CrudModel', () => {
             result = vm.isEmpty(dummyObj);    
 
             expect(result).toBe(true);
-            
-            dummyArray = [];
-            result = vm.isEmpty(dummyArray); 
-
-            expect(result).toBe(true);
         });
 
         it('should return false if object is not empty', async () => {
@@ -155,6 +154,17 @@ describe('CrudModel', () => {
             result = vm.isEmpty(dummyObj);
 
             expect(result).toBe(false);
+        });
+
+        it('should return true if array is empty', async () => {
+            
+            dummyArray = [];
+            result = vm.isEmpty(dummyArray); 
+
+            expect(result).toBe(true);
+        });
+        
+        it('should return false if array is not empty', async () => {
             
             dummyArray = [1,2,3];
             result = vm.isEmpty(dummyArray);
@@ -193,7 +203,7 @@ describe('CrudModel', () => {
                 lastName: 'Stark',
                 age: 42,
             };
-
+            
             vm.resetData(data);
 
             expect(vm.originalData).toEqual(data);
@@ -210,39 +220,18 @@ describe('CrudModel', () => {
         }];
 
         it('should call saveFn if exists', async () => {
-            const saveFnMock = vi.fn();
-            
-            const localVm = createWrapper(CrudModel, {
-                global: {
-                    stubs: [
-                        'vnPaginate',
-                        'useState',
-                        'arrayData',
-                        'useStateStore',
-                        'vue-i18n',
-                    ],
-                    mocks: {
-                        validate: vi.fn(),
-                    },
-                },
-                propsData: {
-                    dataRequired: {
-                        fk: 1,
-                    },
-                    dataKey: 'crudModelKey',
-                    model: 'crudModel',
-                    url: 'crudModelUrl',
-                    saveFn: saveFnMock,
-                },
-            });
+            await wrapper.setProps({ saveFn: vi.fn() });
 
-            localVm.vm.saveChanges(data);
-            expect(saveFnMock).toHaveBeenCalledOnce();
-            expect(localVm.vm.isLoading).toBe(false);
-            expect(localVm.vm.hasChanges).toBe(false);
+            vm.saveChanges(data);
+            
+            expect(vm.saveFn).toHaveBeenCalledOnce();
+            expect(vm.isLoading).toBe(false);
+            expect(vm.hasChanges).toBe(false);
+
+            await wrapper.setProps({ saveFn: '' });
         });
 
-        it('should not call saveFn if not exists', async () => {
+        it("should use default url if there's not saveFn", async () => {
             const postMock =vi.spyOn(axios, 'post');
             
             vm.formData = [{

From 638bd1dc260b1c2de2e3517eed18bb5227aed926 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Tue, 24 Dec 2024 12:59:40 +0100
Subject: [PATCH 16/20] refactor: refs #7050 removed blank spaces

---
 test/vitest/__tests__/components/common/CrudModel.spec.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/test/vitest/__tests__/components/common/CrudModel.spec.js b/test/vitest/__tests__/components/common/CrudModel.spec.js
index e28b6003e..e0afd30ad 100644
--- a/test/vitest/__tests__/components/common/CrudModel.spec.js
+++ b/test/vitest/__tests__/components/common/CrudModel.spec.js
@@ -157,7 +157,6 @@ describe('CrudModel', () => {
         });
 
         it('should return true if array is empty', async () => {
-            
             dummyArray = [];
             result = vm.isEmpty(dummyArray); 
 
@@ -165,7 +164,6 @@ describe('CrudModel', () => {
         });
         
         it('should return false if array is not empty', async () => {
-            
             dummyArray = [1,2,3];
             result = vm.isEmpty(dummyArray);
 
@@ -174,7 +172,6 @@ describe('CrudModel', () => {
     });
 
     describe('resetData()', () => {
-        
         it('should add $index to elements in data[] and sets originalData and formData with data', async () => {
             data = [{
                 name: 'Tony',

From be71e66075b5e90a8430d0a17eab1eca1e62d6e0 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Dec 2024 17:59:42 +0100
Subject: [PATCH 17/20] fix: refs #7935 remove unused 'companyFk' column from
 InvoiceInList component

---
 src/pages/InvoiceIn/InvoiceInList.vue | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index db6e7d214..43b9f2c11 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -108,19 +108,6 @@ const cols = computed(() => [
         },
         format: (row) => row.code,
     },
-    {
-        name: 'companyFk',
-        label: t('globals.company'),
-        columnFilter: {
-            component: 'select',
-            attrs: {
-                url: 'Companies',
-                fields: ['id', 'code'],
-                optionLabel: 'code',
-            },
-        },
-        format: (row) => row.code,
-    },
     {
         align: 'right',
         name: 'tableActions',

From 1ff54d7423c9bd621249d96ac41a831c8c3f102a Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 27 Dec 2024 09:18:29 +0100
Subject: [PATCH 18/20] refactor: refs #8201 deleted condition

---
 src/pages/Account/Card/AccountDescriptor.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Account/Card/AccountDescriptor.vue b/src/pages/Account/Card/AccountDescriptor.vue
index ed7adc455..826c285b3 100644
--- a/src/pages/Account/Card/AccountDescriptor.vue
+++ b/src/pages/Account/Card/AccountDescriptor.vue
@@ -75,14 +75,14 @@ const hasAccount = ref(false);
             <VnLv :label="t('account.card.role')" :value="entity.role.name" />
         </template>
         <template #icons="{ entity }">
-            <QCardActions v-if="accountData" class="q-gutter-x-md">
+            <QCardActions class="q-gutter-x-md">
                 <QIcon
                     v-if="!entity.active"
                     color="primary"
                     name="vn:disabled"
                     flat
                     round
-                    size="sm"
+                    size="xs"
                     class="fill-icon"
                 >
                     <QTooltip>{{ t('account.card.deactivated') }}</QTooltip>
@@ -93,7 +93,7 @@ const hasAccount = ref(false);
                     v-if="hasAccount"
                     flat
                     round
-                    size="sm"
+                    size="xs"
                     class="fill-icon"
                 >
                     <QTooltip>{{ t('account.card.enabled') }}</QTooltip>

From 9d89f6c5d1c40a86b3a115a74997ab69ef5e0b18 Mon Sep 17 00:00:00 2001
From: PAU ROVIRA ROSALENY <provira@verdnatura.es>
Date: Fri, 27 Dec 2024 09:24:39 +0000
Subject: [PATCH 19/20] fix: discount class

---
 src/pages/Claim/Card/ClaimLines.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Claim/Card/ClaimLines.vue b/src/pages/Claim/Card/ClaimLines.vue
index 90a68beae..7c545b15b 100644
--- a/src/pages/Claim/Card/ClaimLines.vue
+++ b/src/pages/Claim/Card/ClaimLines.vue
@@ -230,7 +230,7 @@ async function saveWhenHasChanges() {
                         </QTd>
                     </template>
                     <template #body-cell-discount="{ row, value, rowIndex }">
-                        <QTd auto-width align="right" class="text-primary shrink">
+                        <QTd auto-width align="right" class="link shrink">
                             {{ value }}
                             <VnDiscount
                                 :quantity="row.quantity"

From de307253225f992d032267e29df7ac185af41578 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 27 Dec 2024 10:36:03 +0100
Subject: [PATCH 20/20] perf: refs #8201 onDataSaved fetch

---
 src/pages/Supplier/Card/SupplierBasicData.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index 4b4988789..22a6deaab 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -16,10 +16,6 @@ const companySizes = [
     { id: 'medium', name: t('globals.medium'), size: '6-50' },
     { id: 'big', name: t('globals.big'), size: '>50' },
 ];
-
-const onSave = () => {
-    arrayData.fetch({});
-};
 </script>
 <template>
     <FormModel
@@ -28,7 +24,7 @@ const onSave = () => {
         model="supplier"
         auto-load
         :clear-store-on-unmount="false"
-        @on-data-saved="onSave"
+        @on-data-saved="arrayData.fetch({})"
     >
         <template #form="{ data, validate }">
             <VnRow>