From 36f142800f04b6549b599ebc6633cc1dad5a8165 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 31 Mar 2025 09:51:36 +0200
Subject: [PATCH 1/3] refactor: simplify data fetching logic in VnCard.vue

---
 src/components/common/VnCard.vue | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 21cdc9df5..569fdfe87 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -26,11 +26,7 @@ const route = useRoute();
 const stateStore = useStateStore();
 const router = useRouter();
 const entityId = computed(() => props.id || route?.params?.id);
-const arrayData = useArrayData(props.dataKey, {
-    url: props.url,
-    userFilter: props.filter,
-    oneRecord: true,
-});
+let arrayData = getArrayData();
 
 onBeforeRouteLeave(() => {
     stateStore.cardDescriptorChangeValue(null);
@@ -61,16 +57,31 @@ onBeforeRouteUpdate(async (to, from) => {
 });
 
 async function fetch(id, append = false) {
-    const regex = /\/(\d+)/;
     if (props.idInWhere) arrayData.store.filter.where = { id };
-    else if (!regex.test(props.url)) arrayData.store.url = `${props.url}/${id}`;
-    else arrayData.store.url = props.url.replace(regex, `/${id}`);
+    else {
+        arrayData = getArrayData();
+    }
     await arrayData.fetch({ append, updateRouter: false });
     emit('onFetch', arrayData.store.data);
 }
 function hasRouteParam(params, valueToCheck = ':addressId') {
     return Object.values(params).includes(valueToCheck);
 }
+
+function formatUrl(id) {
+    const newId = id || entityId.value;
+    const regex = /\/(\d+)/;
+    if (!regex.test(props.url)) return `${props.url}/${newId}`;
+    return props.url.replace(regex, `/${newId}`);
+}
+
+function getArrayData() {
+    return useArrayData(props.dataKey, {
+        url: formatUrl(),
+        userFilter: props.filter,
+        oneRecord: true,
+    });
+}
 </script>
 <template>
     <template v-if="visual">
-- 
2.40.1


From 95950b748540e0d8cf074e95c3c735819e386681 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 31 Mar 2025 13:27:28 +0200
Subject: [PATCH 2/3] refactor(VnCard): use prop.url when init

---
 src/components/common/VnCard.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 569fdfe87..39c0b2e00 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -26,7 +26,7 @@ const route = useRoute();
 const stateStore = useStateStore();
 const router = useRouter();
 const entityId = computed(() => props.id || route?.params?.id);
-let arrayData = getArrayData();
+let arrayData = getArrayData(props.url);
 
 onBeforeRouteLeave(() => {
     stateStore.cardDescriptorChangeValue(null);
@@ -75,9 +75,9 @@ function formatUrl(id) {
     return props.url.replace(regex, `/${newId}`);
 }
 
-function getArrayData() {
+function getArrayData(url = formatUrl()) {
     return useArrayData(props.dataKey, {
-        url: formatUrl(),
+        url,
         userFilter: props.filter,
         oneRecord: true,
     });
-- 
2.40.1


From 246e4429bde5b8e41d3996b0a400e8403bbde14e Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 1 Apr 2025 11:04:36 +0200
Subject: [PATCH 3/3] refactor: update getArrayData function to accept entityId
 for improved data fetching

---
 src/components/common/VnCard.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 390906ab6..0b9cc2cce 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -26,7 +26,7 @@ const route = useRoute();
 const stateStore = useStateStore();
 const router = useRouter();
 const entityId = computed(() => props.id || route?.params?.id);
-let arrayData = getArrayData(props.url);
+let arrayData = getArrayData(entityId.value, props.url);
 
 onBeforeRouteLeave(() => {
     stateStore.cardDescriptorChangeValue(null);
@@ -59,7 +59,7 @@ onBeforeRouteUpdate(async (to, from) => {
 async function fetch(id, append = false) {
     if (props.idInWhere) arrayData.store.filter.where = { id };
     else {
-        arrayData = getArrayData();
+        arrayData = getArrayData(id);
     }
     await arrayData.fetch({ append, updateRouter: false });
     emit('onFetch', arrayData.store.data);
@@ -75,9 +75,9 @@ function formatUrl(id) {
     return props.url.replace(regex, `/${newId}`);
 }
 
-function getArrayData(url = formatUrl()) {
+function getArrayData(id, url) {
     return useArrayData(props.dataKey, {
-        url,
+        url: url ?? formatUrl(id),
         userFilter: props.filter,
         oneRecord: true,
     });
-- 
2.40.1