From 65c2b24b782e020475ef2b9f720e6b871507102f Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Mon, 13 Jan 2025 14:30:58 +0100
Subject: [PATCH 1/4] feat: refs #8387 crudModel

---
 src/components/CrudModel.vue | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 940b72ff0..81276e7b0 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -151,14 +151,22 @@ function filter(value, update, filterOptions) {
 }
 
 async function onSubmit() {
-    if (!hasChanges.value) {
-        return quasar.notify({
+    try {
+        if (!hasChanges.value) {
+            return quasar.notify({
+                type: 'negative',
+                message: t('globals.noChanges'),
+            });
+        }
+        isLoading.value = true;
+        await saveChanges($props.saveFn ? formData.value : null);
+    } catch (e) {
+        const errMessage = e?.response?.data?.error?.message;
+        quasar.notify({
             type: 'negative',
-            message: t('globals.noChanges'),
+            message: t(`${errMessage}`),
         });
     }
-    isLoading.value = true;
-    await saveChanges($props.saveFn ? formData.value : null);
 }
 
 async function onSubmitAndGo() {
-- 
2.40.1


From 0b9788d38b0159c277dfc244f5628dbd75cf2f82 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Wed, 15 Jan 2025 10:33:49 +0100
Subject: [PATCH 2/4] feat: refs #8387 changes

---
 src/components/CrudModel.vue     |  8 ++------
 src/pages/Item/Card/ItemTags.vue | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 81276e7b0..7e8c6a3de 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -83,7 +83,7 @@ const saveButtonRef = ref(null);
 const watchChanges = ref();
 const formUrl = computed(() => $props.url);
 
-const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
+const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges', 'dataError']);
 
 defineExpose({
     reload,
@@ -161,11 +161,7 @@ async function onSubmit() {
         isLoading.value = true;
         await saveChanges($props.saveFn ? formData.value : null);
     } catch (e) {
-        const errMessage = e?.response?.data?.error?.message;
-        quasar.notify({
-            type: 'negative',
-            message: t(`${errMessage}`),
-        });
+        emit('dataError', e);
     }
 }
 
diff --git a/src/pages/Item/Card/ItemTags.vue b/src/pages/Item/Card/ItemTags.vue
index 992b1042b..d64929f78 100644
--- a/src/pages/Item/Card/ItemTags.vue
+++ b/src/pages/Item/Card/ItemTags.vue
@@ -9,6 +9,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import axios from 'axios';
+import { useQuasar } from 'quasar';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -16,7 +17,7 @@ const { t } = useI18n();
 const itemTagsRef = ref(null);
 const tagOptions = ref([]);
 const valueOptionsMap = ref(new Map());
-
+const quasar = useQuasar();
 const getSelectedTagValues = async (tag) => {
     if (!tag.tagFk && tag.tag.isFree) return;
     const filter = {
@@ -63,6 +64,15 @@ const insertTag = (rows) => {
 const submitTags = async (data) => {
     itemTagsRef.value.onSubmit(data);
 };
+
+const errMessage = ref();
+function showError(error) {
+    errMessage.value = error?.response?.data?.error?.message;
+    quasar.notify({
+        type: 'negative',
+        message: t(`${errMessage.value}`),
+    });
+}
 </script>
 
 <template>
@@ -105,6 +115,7 @@ const submitTags = async (data) => {
                 order="priority"
                 auto-load
                 @on-fetch="onItemTagsFetched"
+                @data-error="(val) => showError(val)"
             >
                 <template #body="{ rows, validate }">
                     <QCard class="q-px-lg q-pt-md q-pb-sm" data-cy="itemTags">
@@ -197,4 +208,5 @@ const submitTags = async (data) => {
 <i18n>
 es:
     Tags can not be repeated: Las etiquetas no pueden repetirse
+    The value must be a number or a range of numbers: El valor debe ser un número o un rango de números
 </i18n>
-- 
2.40.1


From 75ba4d4fd9d775439eb23e22bece1ffee11292e9 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Mon, 27 Jan 2025 08:57:24 +0100
Subject: [PATCH 3/4] feat: refs #8387 changes request

---
 src/components/CrudModel.vue     |  8 ++++----
 src/pages/Item/Card/ItemTags.vue | 22 +++-------------------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 98cd94adc..62e4ed9df 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -84,7 +84,7 @@ const saveButtonRef = ref(null);
 const watchChanges = ref();
 const formUrl = computed(() => $props.url);
 
-const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges', 'dataError']);
+const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
 
 defineExpose({
     reload,
@@ -149,7 +149,7 @@ function filter(value, update, filterOptions) {
         (ref) => {
             ref.setOptionIndex(-1);
             ref.moveOptionSelection(1, true);
-        }
+        },
     );
 }
 
@@ -164,7 +164,7 @@ async function onSubmit() {
         isLoading.value = true;
         await saveChanges($props.saveFn ? formData.value : null);
     } catch (e) {
-        emit('dataError', e);
+        throw e;
     }
 }
 
@@ -219,7 +219,7 @@ async function remove(data) {
 
     if (preRemove.length) {
         newData = newData.filter(
-            (form) => !preRemove.some((index) => index == form.$index)
+            (form) => !preRemove.some((index) => index == form.$index),
         );
         const changes = getChanges();
         if (!changes.creates?.length && !changes.updates?.length)
diff --git a/src/pages/Item/Card/ItemTags.vue b/src/pages/Item/Card/ItemTags.vue
index d64929f78..5876cf8dc 100644
--- a/src/pages/Item/Card/ItemTags.vue
+++ b/src/pages/Item/Card/ItemTags.vue
@@ -9,15 +9,13 @@ import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import axios from 'axios';
-import { useQuasar } from 'quasar';
 
 const route = useRoute();
 const { t } = useI18n();
 
-const itemTagsRef = ref(null);
+const itemTagsRef = ref();
 const tagOptions = ref([]);
 const valueOptionsMap = ref(new Map());
-const quasar = useQuasar();
 const getSelectedTagValues = async (tag) => {
     if (!tag.tagFk && tag.tag.isFree) return;
     const filter = {
@@ -60,19 +58,6 @@ const insertTag = (rows) => {
     itemTagsRef.value.formData[itemTagsRef.value.formData.length - 1].priority =
         getHighestPriority(rows);
 };
-
-const submitTags = async (data) => {
-    itemTagsRef.value.onSubmit(data);
-};
-
-const errMessage = ref();
-function showError(error) {
-    errMessage.value = error?.response?.data?.error?.message;
-    quasar.notify({
-        type: 'negative',
-        message: t(`${errMessage.value}`),
-    });
-}
 </script>
 
 <template>
@@ -115,7 +100,6 @@ function showError(error) {
                 order="priority"
                 auto-load
                 @on-fetch="onItemTagsFetched"
-                @data-error="(val) => showError(val)"
             >
                 <template #body="{ rows, validate }">
                     <QCard class="q-px-lg q-pt-md q-pb-sm" data-cy="itemTags">
@@ -160,7 +144,7 @@ function showError(error) {
                                 v-model="row.value"
                                 :label="t('itemTags.value')"
                                 :is-clearable="false"
-                                @keyup.enter.stop="submitTags(row)"
+                                @keyup.enter.stop="(data) => itemTagsRef.onSubmit(data)"
                             />
                             <VnInput
                                 :label="t('itemBasicData.relevancy')"
@@ -168,7 +152,7 @@ function showError(error) {
                                 v-model="row.priority"
                                 :required="true"
                                 :rules="validate('itemTag.priority')"
-                                @keyup.enter.stop="submitTags(row)"
+                                @keyup.enter.stop="(data) => itemTagsRef.onSubmit(data)"
                             />
                             <div class="row justify-center" style="flex: 0">
                                 <QIcon
-- 
2.40.1


From 2cc04da76cefa7bad93dfd083fff16cdc7d14f23 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Mon, 27 Jan 2025 12:27:58 +0100
Subject: [PATCH 4/4] feat: refs #8387 refs#8387 change request

---
 src/components/CrudModel.vue | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 62e4ed9df..d569dfda1 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -154,18 +154,14 @@ function filter(value, update, filterOptions) {
 }
 
 async function onSubmit() {
-    try {
-        if (!hasChanges.value) {
-            return quasar.notify({
-                type: 'negative',
-                message: t('globals.noChanges'),
-            });
-        }
-        isLoading.value = true;
-        await saveChanges($props.saveFn ? formData.value : null);
-    } catch (e) {
-        throw e;
+    if (!hasChanges.value) {
+        return quasar.notify({
+            type: 'negative',
+            message: t('globals.noChanges'),
+        });
     }
+    isLoading.value = true;
+    await saveChanges($props.saveFn ? formData.value : null);
 }
 
 async function onSubmitAndGo() {
-- 
2.40.1