Merge pull request '#7356 - TicketServices and CrudModel updates' (!1479) from 7356_ticketService into test

Reviewed-on: #1479
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

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;

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);
 

src/pages/Ticket/Card/TicketService.vue

@@ -121,6 +121,50 @@ async function handleSave() {
         isSaving.value = false;
     }
 }
+function validateFields(item) {
+    // Only validate fields that are being updated
+    const shouldExist = (field) => !isUpdate || field in item;
+
+    if (!shouldExist('ticketServiceTypeFk') && !item.ticketServiceTypeFk) {
+        notify('Description is required', 'negative');
+        return false;
+    }
+
+    if (!shouldExist('quantity') && (!item.quantity || item.quantity <= 0)) {
+        notify('Quantity must be greater than 0', 'negative');
+        return false;
+    }
+
+    if (!shouldExist('price') && (!item.price || 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) {
+            create.ticketFk = route.params.id;
+            if (validateFields(create)) {
+                validData.creates.push(create);
+            }
+        }
+    }
+
+    // Validate updates
+    if (updates.length) {
+        for (const update of updates) {
+            validData.updates.push(update);
+        }
+    }
+    return validData;
+}
 </script>
 
 <template>
@@ -141,6 +185,7 @@ async function handleSave() {
         v-model:selected="selected"
         :order="['description ASC']"
         :default-remove="false"
+        :beforeSaveFn="beforeSave"
     >
         <template #moreBeforeActions>
             <QBtn
@@ -170,6 +215,7 @@ async function handleSave() {
                             option-value="id"
                             hide-selected
                             sort-by="name ASC"
+                            :required="true"
                         >
                             <template #form>
                                 <TicketCreateServiceType
@@ -185,6 +231,7 @@ async function handleSave() {
                             :label="col.label"
                             v-model.number="row.quantity"
                             type="number"
+                            :required="true"
                             min="0"
                             :info="t('service.quantityInfo')"
                         />
@@ -196,6 +243,7 @@ async function handleSave() {
                             :label="col.label"
                             v-model.number="row.price"
                             type="number"
+                            :required="true"
                             min="0"
                             @keyup.enter="handleSave"
                         />