From 7a1a5ad5015295a056e03d3fefcce6a4a3afa394 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 24 Feb 2025 12:54:41 +0100
Subject: [PATCH 1/5] fix: refs #7356 ticketService

---
 src/pages/Ticket/Card/TicketService.vue | 51 +++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index 6ce69a6aa..6e3ddc2c6 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -121,6 +121,53 @@ async function handleSave() {
         isSaving.value = false;
     }
 }
+function validateFields(item, isUpdate = false) {
+    // Only validate fields that are being updated
+    const shouldValidate = (field) => !isUpdate || field in item;
+
+    if (shouldValidate('ticketServiceTypeFk') && !item.ticketServiceTypeFk) {
+        notify('Descriptssion is required', 'negative');
+        return false;
+    }
+
+    if (shouldValidate('quantity') && (!item.quantity || item.quantity <= 0)) {
+        notify('Quantity must be greater than 0', 'negative');
+        return false;
+    }
+
+    if (shouldValidate('price') && (item.price === null || item.price < 0)) {
+        notify('Price must be valid', 'negative');
+        return false;
+    }
+
+    return true;
+}
+
+function beforeSave(data) {
+    const { creates = [], updates = [] } = data;
+    const validData = { creates: [], updates: [] };
+
+    // Validate creates
+    if (creates.length) {
+        for (const create of creates) {
+            if (validateFields(create)) {
+                validData.creates.push(create);
+            }
+            create.ticketFk = route.params.id;
+        }
+    }
+
+    // Validate updates
+    if (updates.length) {
+        for (const update of updates) {
+            if (validateFields(update, true)) {
+                validData.updates.push(update);
+                return false;
+            }
+        }
+    }
+    return validData;
+}
 </script>
 
 <template>
@@ -141,6 +188,7 @@ async function handleSave() {
         v-model:selected="selected"
         :order="['description ASC']"
         :default-remove="false"
+        :beforeSaveFn="beforeSave"
     >
         <template #moreBeforeActions>
             <QBtn
@@ -170,6 +218,7 @@ async function handleSave() {
                             option-value="id"
                             hide-selected
                             sort-by="name ASC"
+                            :required="true"
                         >
                             <template #form>
                                 <TicketCreateServiceType
@@ -185,6 +234,7 @@ async function handleSave() {
                             :label="col.label"
                             v-model.number="row.quantity"
                             type="number"
+                            :required="true"
                             min="0"
                             :info="t('service.quantityInfo')"
                         />
@@ -196,6 +246,7 @@ async function handleSave() {
                             :label="col.label"
                             v-model.number="row.price"
                             type="number"
+                            :required="true"
                             min="0"
                             @keyup.enter="handleSave"
                         />

From e0524bdecf77e3ccd2d77d4c134f65010c0807d4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 24 Feb 2025 12:54:50 +0100
Subject: [PATCH 2/5] feat: refs #7356 update CrudModel

---
 src/components/CrudModel.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 93a2ac96a..ede91a5ed 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -184,8 +184,11 @@ async function saveChanges(data) {
     if ($props.beforeSaveFn) {
         changes = await $props.beforeSaveFn(changes, getChanges);
     }
-
     try {
+        if (changes.creates.length === 0 && changes.updates.length === 0) {
+            return;
+        }
+
         await axios.post($props.saveUrl || $props.url + '/crud', changes);
     } finally {
         isLoading.value = false;

From 947024ef565cf6c67001d2003805c1a184660feb Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sun, 2 Mar 2025 23:50:23 +0100
Subject: [PATCH 3/5] perf: refs #7356 minor changes

---
 src/pages/Ticket/Card/TicketService.vue | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index 6e3ddc2c6..1bd1548a4 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -121,21 +121,21 @@ async function handleSave() {
         isSaving.value = false;
     }
 }
-function validateFields(item, isUpdate = false) {
+function validateFields(item) {
     // Only validate fields that are being updated
-    const shouldValidate = (field) => !isUpdate || field in item;
+    const shouldExist = (field) => !isUpdate || field in item;
 
-    if (shouldValidate('ticketServiceTypeFk') && !item.ticketServiceTypeFk) {
-        notify('Descriptssion is required', 'negative');
+    if (!shouldExist('ticketServiceTypeFk') && !item.ticketServiceTypeFk) {
+        notify('Description is required', 'negative');
         return false;
     }
 
-    if (shouldValidate('quantity') && (!item.quantity || item.quantity <= 0)) {
+    if (!shouldExist('quantity') && (!item.quantity || item.quantity <= 0)) {
         notify('Quantity must be greater than 0', 'negative');
         return false;
     }
 
-    if (shouldValidate('price') && (item.price === null || item.price < 0)) {
+    if (!shouldExist('price') && (!item.price || item.price < 0)) {
         notify('Price must be valid', 'negative');
         return false;
     }
@@ -150,20 +150,17 @@ function beforeSave(data) {
     // Validate creates
     if (creates.length) {
         for (const create of creates) {
+            create.ticketFk = route.params.id;
             if (validateFields(create)) {
                 validData.creates.push(create);
             }
-            create.ticketFk = route.params.id;
         }
     }
 
     // Validate updates
     if (updates.length) {
         for (const update of updates) {
-            if (validateFields(update, true)) {
-                validData.updates.push(update);
-                return false;
-            }
+            validData.updates.push(update);
         }
     }
     return validData;

From 967848c790e3c82f9d9063195a711595639f1507 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 3 Mar 2025 10:19:19 +0100
Subject: [PATCH 4/5] fix: refs #7356 chaining params

---
 src/components/CrudModel.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index ede91a5ed..8c4f70f3b 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -185,7 +185,7 @@ async function saveChanges(data) {
         changes = await $props.beforeSaveFn(changes, getChanges);
     }
     try {
-        if (changes.creates.length === 0 && changes.updates.length === 0) {
+        if (changes?.creates?.length === 0 && changes?.updates?.length === 0) {
             return;
         }
 

From a7af697947500799df02d86270aad0733a445695 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 3 Mar 2025 10:22:07 +0100
Subject: [PATCH 5/5] style: refs #7356 eslint format

---
 src/components/__tests__/CrudModel.spec.js | 64 ++++++++++++----------
 1 file changed, 35 insertions(+), 29 deletions(-)

diff --git a/src/components/__tests__/CrudModel.spec.js b/src/components/__tests__/CrudModel.spec.js
index e0afd30ad..f6c93e0d5 100644
--- a/src/components/__tests__/CrudModel.spec.js
+++ b/src/components/__tests__/CrudModel.spec.js
@@ -30,8 +30,8 @@ describe('CrudModel', () => {
                 saveFn: '',
             },
         });
-        wrapper=wrapper.wrapper;
-        vm=wrapper.vm;
+        wrapper = wrapper.wrapper;
+        vm = wrapper.vm;
     });
 
     beforeEach(() => {
@@ -143,14 +143,14 @@ describe('CrudModel', () => {
         });
 
         it('should return true if object is empty', async () => {
-            dummyObj ={};
-            result = vm.isEmpty(dummyObj);    
+            dummyObj = {};
+            result = vm.isEmpty(dummyObj);
 
             expect(result).toBe(true);
         });
 
         it('should return false if object is not empty', async () => {
-            dummyObj = {a:1, b:2, c:3};
+            dummyObj = { a: 1, b: 2, c: 3 };
             result = vm.isEmpty(dummyObj);
 
             expect(result).toBe(false);
@@ -158,29 +158,31 @@ describe('CrudModel', () => {
 
         it('should return true if array is empty', async () => {
             dummyArray = [];
-            result = vm.isEmpty(dummyArray); 
+            result = vm.isEmpty(dummyArray);
 
             expect(result).toBe(true);
         });
-        
+
         it('should return false if array is not empty', async () => {
-            dummyArray = [1,2,3];
+            dummyArray = [1, 2, 3];
             result = vm.isEmpty(dummyArray);
 
             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,
-            }];
+            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);
@@ -200,7 +202,7 @@ describe('CrudModel', () => {
                 lastName: 'Stark',
                 age: 42,
             };
-            
+
             vm.resetData(data);
 
             expect(vm.originalData).toEqual(data);
@@ -210,17 +212,19 @@ describe('CrudModel', () => {
     });
 
     describe('saveChanges()', () => {
-        data = [{
-            name: 'Tony',
-            lastName: 'Stark',
-            age: 42,
-        }];
+        data = [
+            {
+                name: 'Tony',
+                lastName: 'Stark',
+                age: 42,
+            },
+        ];
 
         it('should call saveFn if exists', async () => {
             await wrapper.setProps({ saveFn: vi.fn() });
 
             vm.saveChanges(data);
-            
+
             expect(vm.saveFn).toHaveBeenCalledOnce();
             expect(vm.isLoading).toBe(false);
             expect(vm.hasChanges).toBe(false);
@@ -229,13 +233,15 @@ describe('CrudModel', () => {
         });
 
         it("should use default url if there's not saveFn", async () => {
-            const postMock =vi.spyOn(axios, 'post');
-            
-            vm.formData = [{
-                name: 'Bruce',
-                lastName: 'Wayne',
-                age: 45,
-            }]
+            const postMock = vi.spyOn(axios, 'post');
+
+            vm.formData = [
+                {
+                    name: 'Bruce',
+                    lastName: 'Wayne',
+                    age: 45,
+                },
+            ];
 
             await vm.saveChanges(data);