Merge branch '8217_mapper' of https://gitea.verdnatura.es/verdnatura/salix-front into 8217_mapper

This reverts commit 6c573f61ca.

src/components/FormModel.vue

@@ -1,6 +1,15 @@
 <script setup>
 import axios from 'axios';
-import { onMounted, onUnmounted, computed, ref, watch, nextTick, useAttrs } from 'vue';
+import {
+    onMounted,
+    onUnmounted,
+    computed,
+    ref,
+    watch,
+    nextTick,
+    useAttrs,
+    toRef,
+} from 'vue';
 import { onBeforeRouteLeave, useRouter, useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@@ -12,7 +21,7 @@ import SkeletonForm from 'components/ui/SkeletonForm.vue';
 import VnConfirm from './ui/VnConfirm.vue';
 import { tMobile } from 'src/composables/tMobile';
 import { useArrayData } from 'src/composables/useArrayData';
-import { getDifferences, getUpdatedValues } from 'src/filters';
+import { onBeforeSave } from 'src/filters';
 const { push } = useRouter();
 const quasar = useQuasar();
 const state = useState();
@@ -67,7 +76,7 @@ const $props = defineProps({
     },
     mapper: {
         type: Function,
-        default: null,
+        default: onBeforeSave,
     },
     clearStoreOnUnmount: {
         type: Boolean,
@@ -223,6 +232,35 @@ async function fetch() {
     }
 }
 
+async function handleResponse(promise) {
+    const [response] = await Promise.all([promise]);
+    updateAndEmit('onDataSaved', {
+        val: formData.value,
+        res: response?.data,
+        old: originalData.value,
+    });
+    if ($props.reload) await arrayData.fetch({});
+    hasChanges.value = false;
+}
+
+async function create() {
+    const promise = $props.saveFn
+        ? $props.saveFn(formData.value)
+        : axios.post($props.urlCreate, formData.value);
+
+    await handleResponse(promise);
+    notify('globals.dataCreated', 'positive');
+}
+
+async function update() {
+    const body = $props.mapper
+        ? $props.mapper(originalData.value, formData.value)
+        : formData.value;
+    const url = $props.urlUpdate || $props.url || arrayData.store.url;
+    const promise = $props.saveFn ? $props.saveFn(body) : axios.patch(url, body);
+    await handleResponse(promise);
+}
+
 async function save() {
     if ($props.observeFormChanges && !hasChanges.value)
         return notify('globals.noChanges', 'negative');
@@ -230,25 +268,11 @@ async function save() {
     isLoading.value = true;
     try {
         formData.value = trimData(formData.value);
-        const body = $props.mapper
+        if ($props.urlCreate) {
-            ? $props.mapper(formData.value, originalData.value)
+            await create();
-            : formData.value;
+        } else {
-        const method = $props.urlCreate ? 'post' : 'patch';
+            await update();
-        const url =
+        }
-            $props.urlCreate || $props.urlUpdate || $props.url || arrayData.store.url;
-        const response = await Promise.resolve(
-            $props.saveFn ? $props.saveFn(body) : axios[method](url, body),
-        );
-
-        if ($props.urlCreate) notify('globals.dataCreated', 'positive');
-
-        updateAndEmit('onDataSaved', {
-            val: formData.value,
-            res: response?.data,
-            old: originalData.value,
-        });
-        if ($props.reload) await arrayData.fetch({});
-        hasChanges.value = false;
     } finally {
         isLoading.value = false;
     }
@@ -297,12 +321,7 @@ function trimData(data) {
     }
     return data;
 }
-function onBeforeSave(formData, originalData) {
+
-    return getUpdatedValues(
-        Object.keys(getDifferences(formData, originalData)),
-        formData,
-    );
-}
 async function onKeyup(evt) {
     if (evt.key === 'Enter' && !$props.preventSubmit) {
         const input = evt.target;
@@ -333,16 +352,15 @@ defineExpose({
 <template>
     <div class="column items-center full-width">
         <QForm
+            id="formModel"
             v-on="$attrs"
             ref="myForm"
             v-if="formData"
             @submit.prevent="save"
             @keyup.prevent="onKeyup"
             @reset="reset"
-            class="q-pa-md"
+            class="full-width q-pa-md"
             :style="maxWidth ? 'max-width: ' + maxWidth : ''"
-            id="formModel"
-            :mapper="onBeforeSave"
         >
             <QCard>
                 <slot
@@ -440,9 +458,6 @@ defineExpose({
 .q-notifications {
     color: black;
 }
-#formModel {
-    width: 100%;
-}
 
 .q-card {
     padding: 32px;

src/components/__tests__/CrudModel.spec.js

@@ -115,6 +115,7 @@ describe('CrudModel', () => {
             expect(result).toEqual({
                 a: null,
                 b: 4,
+                c: 3,
                 d: 5,
             });
         });

src/components/__tests__/FormModel.spec.js

@@ -3,11 +3,17 @@ import { createWrapper } from 'app/test/vitest/helper';
 import { default as axios } from 'axios';
 
 import FormModel from 'src/components/FormModel.vue';
+import { useState } from 'src/composables/useState';
 
 describe('FormModel', () => {
     const model = 'mockModel';
     const url = 'mockUrl';
     const formInitialData = { mockKey: 'mockVal' };
+    let state;
+    beforeEach(() => {
+        state = useState();
+        state.set(model, formInitialData);
+    });
 
     describe('modelValue', () => {
         it('should use the provided model', () => {
@@ -94,30 +100,39 @@ describe('FormModel', () => {
             expect(vm.hasChanges).toBe(false);
         });
 
-        it('should call axios.patch with the right data', async () => {
+        it('should call axios.post with the right data', async () => {
-            const spy = vi.spyOn(axios, 'patch').mockResolvedValue({ data: {} });
+            const spy = vi.spyOn(axios, 'post').mockResolvedValue({ data: {} });
-            const { vm } = mount({ propsData: { url, model } });
+            const urlCreate = 'mockUrlCreate';
+            const { vm } = mount({ propsData: { url, urlCreate, model } });
 
             vm.formData = {};
             await vm.$nextTick();
-            vm.formData = { mockKey: 'newVal' };
+            const formData = { mockKey: 'newVal', mockKey2: 'newVal2' };
+            vm.formData = formData;
             await vm.$nextTick();
 
             await vm.save();
             expect(spy).toHaveBeenCalled();
+            expect(spy).toHaveBeenCalledWith(urlCreate, formData);
             vm.formData.mockKey = 'mockVal';
         });
 
-        it('should call axios.post with the right data', async () => {
+        it('should call axios.patch with the right data', async () => {
-            const spy = vi.spyOn(axios, 'post').mockResolvedValue({ data: {} });
+            const spy = vi.spyOn(axios, 'patch').mockResolvedValue({ data: {} });
+
             const { vm } = mount({
-                propsData: { url, model, formInitialData, urlCreate: 'mockUrlCreate' },
+                propsData: {
+                    url,
+                    model,
+                    formInitialData,
+                },
             });
             await vm.$nextTick();
             vm.formData.mockKey = 'newVal';
             await vm.$nextTick();
             await vm.save();
             expect(spy).toHaveBeenCalled();
+            expect(spy).toHaveBeenCalledWith(url, { mockKey: 'newVal' });
             vm.formData.mockKey = 'mockVal';
         });
 

src/filters/__tests__/getDifferences.spec.js

@@ -0,0 +1,41 @@
+import getDifferences from '../getDifferences';
+
+describe('getDifferences', () => {
+    it('should handle empty initialData', () => {
+        const initialData = {};
+        const formData = { name: 'John' };
+        expect(getDifferences(initialData, formData)).toEqual({ name: 'John' });
+    });
+
+    it('should detect when formData has a key not present in initialData', () => {
+        const initialData = { age: 30 };
+        const formData = { name: 'John' };
+        expect(getDifferences(initialData, formData)).toEqual({ age: 30, name: 'John' });
+    });
+
+    it('should detect when formData has different value for existing key', () => {
+        const initialData = { name: 'John', age: 30 };
+        const formData = { name: 'Jane', age: 30 };
+        expect(getDifferences(initialData, formData)).toEqual({ name: 'Jane' });
+    });
+
+    it('should detect when formData has null value for existing key', () => {
+        const initialData = { name: 'John' };
+        const formData = { name: null };
+        expect(getDifferences(initialData, formData)).toEqual({ name: null });
+    });
+
+    it('should handle missing keys in formData', () => {
+        const initialData = { name: 'John', age: 30 };
+        const formData = { name: 'John' };
+        expect(getDifferences(initialData, formData)).toEqual({ age: 30 });
+    });
+
+    it('should handle complex objects', () => {
+        const initialData = { user: { name: 'John', age: 30 } };
+        const formData = { user: { name: 'John', age: 31 } };
+        expect(getDifferences(initialData, formData)).toEqual({
+            user: { name: 'John', age: 31 },
+        });
+    });
+});

src/filters/getDifferences.js

@@ -1,19 +1,23 @@
-export default function getDifferences(obj1, obj2) {
+export default function getDifferences(initialData = {}, formData = {}) {
     const diff = {};
-    delete obj1.$index;
+    delete initialData?.$index;
-    delete obj2.$index;
+    delete formData?.$index;
 
-    for (const key in obj1) {
+    // Añadimos los valores que están en initialData
-        if (obj2[key] && JSON.stringify(obj1[key]) !== JSON.stringify(obj2[key])) {
+    for (const key in initialData) {
-            diff[key] = obj2[key];
+        if (!Object.prototype.hasOwnProperty.call(formData, key)) {
+            // Caso 1: initialData tiene una clave que no tiene formData
+            diff[key] = initialData[key];
+        } else if (JSON.stringify(initialData[key]) !== JSON.stringify(formData[key])) {
+            // Caso 2 y 3: valores diferentes o null en formData
+            diff[key] = formData[key];
         }
     }
-    for (const key in obj2) {
+
-        if (
+    // Añadimos las claves nuevas de formData
-            obj1[key] === undefined ||
+    for (const key in formData) {
-            JSON.stringify(obj1[key]) !== JSON.stringify(obj2[key])
+        if (!Object.prototype.hasOwnProperty.call(initialData, key)) {
-        ) {
+            diff[key] = formData[key];
-            diff[key] = obj2[key];
         }
     }
 

src/filters/index.js

@@ -3,6 +3,7 @@ import toDate from './toDate';
 import toDateString from './toDateString';
 import toDateHourMin from './toDateHourMin';
 import toDateHourMinSec from './toDateHourMinSec';
+import onBeforeSave from './onBeforeSave';
 import toRelativeDate from './toRelativeDate';
 import toCurrency from './toCurrency';
 import toPercentage from './toPercentage';
@@ -20,6 +21,7 @@ import isDialogOpened from './isDialogOpened';
 import toCelsius from './toCelsius';
 
 export {
+    onBeforeSave,
     getUpdatedValues,
     getDifferences,
     isDialogOpened,

src/filters/onBeforeSave.js

@@ -0,0 +1,9 @@
+import getDifferences from './getDifferences';
+import getUpdatedValues from './getUpdatedValues';
+
+export default function onBeforeSave(originalData, formData) {
+    return getUpdatedValues(
+        Object.keys(getDifferences(originalData, formData)),
+        formData,
+    );
+}

src/pages/Claim/Card/ClaimBasicData.vue

@@ -15,13 +15,6 @@ import VnAvatar from 'src/components/ui/VnAvatar.vue';
 const route = useRoute();
 const { t } = useI18n();
 const workersOptions = ref([]);
-
-function onBeforeSave(formData, originalData) {
-    return getUpdatedValues(
-        Object.keys(getDifferences(formData, originalData)),
-        formData,
-    );
-}
 </script>
 <template>
     <FetchData
@@ -35,7 +28,6 @@ function onBeforeSave(formData, originalData) {
         model="Claim"
         :go-to="`/claim/${route.params.id}/notes`"
         :url-update="`Claims/updateClaim/${route.params.id}`"
-        :mapper="onBeforeSave"
         auto-load
     >
         <template #form="{ data, validate }">

src/pages/Customer/Card/CustomerBasicData.vue

@@ -8,37 +8,12 @@ import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import { getDifferences, getUpdatedValues } from 'src/filters';
 
 const route = useRoute();
 const { t } = useI18n();
 
 const businessTypes = ref([]);
 const contactChannels = ref([]);
-const handleSalesModelValue = (val) => {
-    if (!val) val = '';
-    return {
-        or: [
-            { id: val },
-            { name: val },
-            { nickname: { like: '%' + val + '%' } },
-            { code: { like: `${val}%` } },
-        ],
-    };
-};
-
-const exprBuilder = (param, value) => {
-    return {
-        and: [{ active: { neq: false } }, handleSalesModelValue(value)],
-    };
-};
-
-function onBeforeSave(formData, originalData) {
-    return getUpdatedValues(
-        Object.keys(getDifferences(formData, originalData)),
-        formData,
-    );
-}
 </script>
 <template>
     <FetchData
@@ -52,12 +27,7 @@ function onBeforeSave(formData, originalData) {
         @on-fetch="(data) => (businessTypes = data)"
         auto-load
     />
-    <FormModel
+    <FormModel :url-update="`Clients/${route.params.id}`" auto-load model="Customer">
-        :url-update="`Clients/${route.params.id}`"
-        auto-load
-        :mapper="onBeforeSave"
-        model="Customer"
-    >
         <template #form="{ data, validate }">
             <VnRow>
                 <VnInput

src/pages/Customer/Card/CustomerFiscalData.vue

@@ -13,7 +13,6 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
 import VnCheckbox from 'src/components/common/VnCheckbox.vue';
-import { getDifferences, getUpdatedValues } from 'src/filters';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
 
 const quasar = useQuasar();
@@ -31,12 +30,6 @@ function handleLocation(data, location) {
     data.provinceFk = provinceFk;
     data.countryFk = countryFk;
 }
-function onBeforeSave(formData, originalData) {
-    return getUpdatedValues(
-        Object.keys(getDifferences(formData, originalData)),
-        formData,
-    );
-}
 
 async function checkEtChanges(data, _, originalData) {
     const equalizatedHasChanged = originalData.isEqualizated != data.isEqualizated;
@@ -75,7 +68,6 @@ async function acceptPropagate({ isEqualizated }) {
         :url-update="`Clients/${route.params.id}/updateFiscalData`"
         auto-load
         model="Customer"
-        :mapper="onBeforeSave"
         observe-form-changes
         @on-data-saved="checkEtChanges"
     >

src/pages/Item/Card/ItemBotanical.vue

@@ -39,6 +39,7 @@ const entityId = computed(() => {
             where: { itemFk: entityId },
         }"
         @on-fetch="(data) => (itemBotanicalsForm = data)"
+        :mapper="(_, data) => data"
     >
         <template #form="{ data }">
             <VnRow>

src/pages/Worker/Card/WorkerBasicData.vue

@@ -1,6 +1,7 @@
 <script setup>
-import { ref, nextTick } from 'vue';
+import { ref, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
+import axios from 'axios';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'src/components/FormModel.vue';
@@ -20,11 +21,30 @@ const maritalStatus = [
     { code: 'S', name: t('Single') },
 ];
 const route = useRoute();
+
 async function addAdvancedData(data) {
     const advanced = await useAdvancedSummary('Workers', route.params.id);
-    data.value = { ...data.value, ...advanced };
+    return { ...data, ...advanced };
-    nextTick(() => (form.value.hasChanges = false));
 }
+
+const initialData = ref(null);
+onBeforeMount(async () => {
+    let baseData = {};
+    try {
+        const { data } = await axios.get(`Workers/summary`, {
+            params: {
+                filter: JSON.stringify({
+                    where: { id: route.params.id },
+                }),
+            },
+        });
+        baseData = data[0];
+    } catch (e) {
+        baseData = {};
+    }
+    const advancedData = await addAdvancedData(baseData);
+    initialData.value = advancedData;
+});
 </script>
 <template>
     <FetchData
@@ -40,11 +60,12 @@ async function addAdvancedData(data) {
         auto-load
     />
     <FormModel
+        v-if="initialData"
         ref="form"
+        :form-initial-data="initialData"
         :url-update="`Workers/${$route.params.id}`"
-        auto-load
         :model
-        @on-fetch="(data, res, old, formData) => addAdvancedData(formData)"
+        :reload="false"
     >
         <template #form="{ data }">
             <VnRow>