From 52fcbdb68936a1f7af0a14024bcb14616325e65d Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 19 Sep 2023 10:21:24 +0200
Subject: [PATCH] refs #5673 feat(crudModel): add saveFn prop

---
 src/components/CrudModel.vue                  | 13 ++++++----
 src/pages/Worker/Card/WorkerSummary.vue       |  3 +--
 .../components/common/CrudModel.spec.js       | 24 +------------------
 3 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index e724bc0c5..7a22d8373 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -53,6 +53,10 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
+    saveFn: {
+        type: Function,
+        default: null,
+    },
 });
 
 const isLoading = ref(false);
@@ -83,6 +87,7 @@ onUnmounted(() => {
 function tMobile(...args) {
     if (!quasar.platform.is.mobile) return t(...args);
 }
+
 async function fetch(data) {
     if (data && Array.isArray(data)) {
         let $index = 0;
@@ -128,17 +133,18 @@ async function onSubmit() {
 }
 
 async function saveChanges(data) {
+    if ($props.saveFn) return $props.saveFn(data, getChanges);
     const changes = data || getChanges();
     try {
         await axios.post($props.saveUrl || $props.url + '/crud', changes);
     } catch (e) {
         return (isLoading.value = false);
     }
-
     originalData.value = JSON.parse(JSON.stringify(formData.value));
+    if (changes.creates?.length) await vnPaginateRef.value.fetch();
+
     hasChanges.value = false;
     isLoading.value = false;
-    if (changes.creates?.length) await vnPaginateRef.value.fetch();
 }
 
 async function insert() {
@@ -249,12 +255,9 @@ watch(formUrl, async () => {
 </script>
 <template>
     <VnPaginate
-        @submit="onSubmit"
-        @reset="reset"
         :url="url"
         v-bind="$attrs"
         @on-fetch="fetch"
-        class="q-pa-md"
         :skeleton="false"
         ref="vnPaginateRef"
     >
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 05ccdc373..7c8accc5d 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -1,6 +1,5 @@
 <script setup>
-import axios from 'axios';
-import { ref, onMounted, computed, onUpdated } from 'vue';
+import { ref, onMounted, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';
diff --git a/test/vitest/__tests__/components/common/CrudModel.spec.js b/test/vitest/__tests__/components/common/CrudModel.spec.js
index b4770e2e8..87c0dc5bf 100644
--- a/test/vitest/__tests__/components/common/CrudModel.spec.js
+++ b/test/vitest/__tests__/components/common/CrudModel.spec.js
@@ -1,4 +1,4 @@
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import { createWrapper } from 'app/test/vitest/helper';
 import CrudModel from 'components/CrudModel.vue';
 import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
 
@@ -95,28 +95,6 @@ describe('CrudModel', () => {
         });
     });
 
-    // TODO: test .onOk()
-    describe('remove()', () => {
-        it('should remove', async () => {
-            vi.spyOn(vm.quasar, 'dialog');
-
-            vm.originalData = [
-                { id: 1, name: 'Tony Starks', $index: 1 },
-                { id: 2, name: 'Jessica Jones', $index: 2 },
-                { id: 3, name: 'Bruce Wayne', $index: 3 },
-            ];
-            vm.state.set('crudModel', [
-                { id: 1, name: 'New name one', $index: 1 },
-                { id: 2, name: 'New name two', $index: 2 },
-                { id: 3, name: 'Bruce Wayne', $index: 3 },
-            ]);
-
-            await vm.remove([{ id: 1 }]);
-
-            expect(vm.quasar.dialog).toHaveBeenCalled();
-        });
-    });
-
     describe('getDifferences()', () => {
         it('should return the differences between two objects', async () => {
             const obj1 = {