From 246e4429bde5b8e41d3996b0a400e8403bbde14e Mon Sep 17 00:00:00 2001 From: alexm Date: Tue, 1 Apr 2025 11:04:36 +0200 Subject: [PATCH] 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 390906ab69f..0b9cc2cceec 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, });