From 7ebbb5da9a86c5b23abc3eba979f585bed408844 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 28 Apr 2025 13:49:32 +0200
Subject: [PATCH] fix: refs #8217 update FormModel to use toRef for mapper and
 improve data handling

---
 src/components/FormModel.vue          | 16 ++++++++++++++--
 src/pages/Item/Card/ItemBotanical.vue |  1 +
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 0526145a9..6eb386955 100644
--- a/src/components/FormModel.vue
+++ b/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';
@@ -140,6 +149,7 @@ const submitForm = async (evt) => {
         await save(evt);
     }
 };
+const mapper = toRef($props, 'mapper');
 
 onMounted(async () => {
     nextTick(() => (componentIsRendered.value = true));
@@ -247,7 +257,9 @@ async function create() {
 
 async function update() {
     formData.value = trimData(formData.value);
-    const body = $props.mapper(originalData.value, formData.value);
+    const body = mapper.value
+        ? mapper.value(originalData.value, formData.value)
+        : formData.value;
     const url = $props.urlUpdate || $props.url || arrayData.store.url;
     const response = await Promise.resolve(
         $props.saveFn ? $props.saveFn(body) : axios.patch(url, body),
diff --git a/src/pages/Item/Card/ItemBotanical.vue b/src/pages/Item/Card/ItemBotanical.vue
index a40d81589..6a3a44901 100644
--- a/src/pages/Item/Card/ItemBotanical.vue
+++ b/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>