From 80337c61df3cc590808011716615b9d8b273d16b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 6 Feb 2025 10:09:30 +0100
Subject: [PATCH 1/4] fix: refs #7524 dynamic fetch

---
 src/pages/Zone/Card/ZoneBasicData.vue | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index c38da614c..cbeeff2e9 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -1,35 +1,16 @@
 <script setup>
-import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { ref } from 'vue';
-import FetchData from 'components/FetchData.vue';
 import FormModel from 'src/components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import { QCheckbox } from 'quasar';
 import VnInputTime from 'src/components/common/VnInputTime.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
-const route = useRoute();
 const { t } = useI18n();
-
-const agencyFilter = {
-    fields: ['id', 'name'],
-    order: 'name ASC',
-    limit: 30,
-};
-const agencyOptions = ref([]);
 </script>
 
 <template>
-    <FetchData
-        :filter="agencyFilter"
-        @on-fetch="(data) => (agencyOptions = data)"
-        auto-load
-        url="AgencyModes/isActive"
-    />
-
-    <FormModel :url="`Zones/${route.params.id}`" auto-load model="zone">
+    <FormModel :url="`Zones/${$route.params.id}`" auto-load model="zone">
         <template #form="{ data, validate }">
             <VnRow>
                 <VnInput
@@ -42,16 +23,16 @@ const agencyOptions = ref([]);
 
             <VnRow>
                 <VnSelect
-                    option-label="name"
-                    option-value="id"
                     v-model="data.agencyModeFk"
                     :rules="validate('zone.agencyModeFk')"
-                    :options="agencyOptions"
+                     url="AgencyModes/isActive"
+                     :fields="['id', 'name']"
                     :label="t('Agency')"
                     emit-value
                     map-options
                     use-input
                     hide-bottom-space
+                    sort-by="name"
                 />
                 <VnInput
                     class="mw-10"

From ab2d3fc4dc6bc659a931082b2fc12d4c75f9a6f1 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 6 Feb 2025 10:12:52 +0100
Subject: [PATCH 2/4] fix: use userFilter to keep includes

---
 src/components/ui/VnSms.vue                         | 2 +-
 src/pages/Account/AccountConnections.vue            | 2 +-
 src/pages/Account/Alias/Card/AliasUsers.vue         | 2 +-
 src/pages/Account/Card/AccountMailAlias.vue         | 2 +-
 src/pages/Account/InheritedRoles.vue                | 2 +-
 src/pages/Account/Role/Card/InheritedRoles.vue      | 2 +-
 src/pages/Account/Role/Card/SubRoles.vue            | 2 +-
 src/pages/Customer/Card/CustomerAddress.vue         | 2 +-
 src/pages/Customer/Card/CustomerCreditContracts.vue | 2 +-
 src/pages/Route/Agency/Card/AgencyModes.vue         | 4 ++--
 src/pages/Route/Agency/Card/AgencyWorkcenter.vue    | 2 +-
 src/pages/Route/RouteTickets.vue                    | 2 +-
 src/pages/Shelving/ShelvingList.vue                 | 2 +-
 src/pages/Supplier/Card/SupplierAddresses.vue       | 2 +-
 src/pages/Ticket/Card/TicketTracking.vue            | 2 +-
 src/pages/Travel/Card/TravelThermographs.vue        | 2 +-
 src/pages/Wagon/Type/WagonTypeEdit.vue              | 2 +-
 src/pages/Worker/Card/WorkerPda.vue                 | 2 +-
 src/pages/Zone/Card/ZoneWarehouses.vue              | 7 ++++---
 19 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/components/ui/VnSms.vue b/src/components/ui/VnSms.vue
index 8b25ba5da..2fe21d8ed 100644
--- a/src/components/ui/VnSms.vue
+++ b/src/components/ui/VnSms.vue
@@ -49,7 +49,7 @@ function formatNumber(number) {
             <VnPaginate
                 :data-key="$props.url"
                 :url="$props.url"
-                :filter="filter"
+                :user-filter="filter"
                 order="smsFk DESC"
                 :offset="100"
                 :limit="5"
diff --git a/src/pages/Account/AccountConnections.vue b/src/pages/Account/AccountConnections.vue
index ba4ed49c8..a0568acc4 100644
--- a/src/pages/Account/AccountConnections.vue
+++ b/src/pages/Account/AccountConnections.vue
@@ -46,7 +46,7 @@ const killSession = async ({ userId, created }) => {
             <VnPaginate
                 :data-key="urlPath"
                 ref="paginateRef"
-                :filter="filter"
+                :user-filter="filter"
                 :url="urlPath"
                 order="created DESC"
                 auto-load
diff --git a/src/pages/Account/Alias/Card/AliasUsers.vue b/src/pages/Account/Alias/Card/AliasUsers.vue
index 4aad68f1a..6a2f6df90 100644
--- a/src/pages/Account/Alias/Card/AliasUsers.vue
+++ b/src/pages/Account/Alias/Card/AliasUsers.vue
@@ -69,7 +69,7 @@ const fetchAliases = () => paginateRef.value.fetch();
             <VnPaginate
                 ref="paginateRef"
                 data-key="AliasUsers"
-                :filter="filter"
+                :user-filter="filter"
                 :url="urlPath"
                 :limit="0"
                 auto-load
diff --git a/src/pages/Account/Card/AccountMailAlias.vue b/src/pages/Account/Card/AccountMailAlias.vue
index efd2b481b..ef1707cf2 100644
--- a/src/pages/Account/Card/AccountMailAlias.vue
+++ b/src/pages/Account/Card/AccountMailAlias.vue
@@ -99,7 +99,7 @@ onMounted(async () => await getAccountData(false));
             <VnPaginate
                 ref="paginateRef"
                 data-key="AccountMailAliases"
-                :filter="filter"
+                :user-filter="filter"
                 :url="urlPath"
                 auto-load
             >
diff --git a/src/pages/Account/InheritedRoles.vue b/src/pages/Account/InheritedRoles.vue
index 13294cfdf..2ae857c9b 100644
--- a/src/pages/Account/InheritedRoles.vue
+++ b/src/pages/Account/InheritedRoles.vue
@@ -59,7 +59,7 @@ const redirectToRoleSummary = (id) =>
             <VnPaginate
                 ref="paginateRef"
                 :data-key="dataKey"
-                :filter="filter"
+                :user-filter="filter"
                 :url="urlPath"
                 :limit="0"
                 auto-load
diff --git a/src/pages/Account/Role/Card/InheritedRoles.vue b/src/pages/Account/Role/Card/InheritedRoles.vue
index ee82375ae..95a9eb12a 100644
--- a/src/pages/Account/Role/Card/InheritedRoles.vue
+++ b/src/pages/Account/Role/Card/InheritedRoles.vue
@@ -58,7 +58,7 @@ const redirectToRoleSummary = (id) =>
             <VnPaginate
                 ref="paginateRef"
                 data-key="InheritedRoles"
-                :filter="filter"
+                :user-filter="filter"
                 :url="urlPath"
                 :limit="0"
                 auto-load
diff --git a/src/pages/Account/Role/Card/SubRoles.vue b/src/pages/Account/Role/Card/SubRoles.vue
index 6cac94667..0077f12b0 100644
--- a/src/pages/Account/Role/Card/SubRoles.vue
+++ b/src/pages/Account/Role/Card/SubRoles.vue
@@ -80,7 +80,7 @@ const redirectToRoleSummary = (id) =>
             <VnPaginate
                 ref="paginateRef"
                 data-key="SubRoles"
-                :filter="filter"
+                :user-filter="filter"
                 :url="urlPath"
                 auto-load
             >
diff --git a/src/pages/Customer/Card/CustomerAddress.vue b/src/pages/Customer/Card/CustomerAddress.vue
index 657cc7ae7..5c200582d 100644
--- a/src/pages/Customer/Card/CustomerAddress.vue
+++ b/src/pages/Customer/Card/CustomerAddress.vue
@@ -117,7 +117,7 @@ const toCustomerAddressEdit = (addressId) => {
         data-key="CustomerAddresses"
         order="id DESC"
         ref="vnPaginateRef"
-        :filter="addressFilter"
+        :user-filter="addressFilter"
         :url="`Clients/${route.params.id}/addresses`"
     />
     <div class="full-width flex justify-center">
diff --git a/src/pages/Customer/Card/CustomerCreditContracts.vue b/src/pages/Customer/Card/CustomerCreditContracts.vue
index 0ff074793..7dc53db72 100644
--- a/src/pages/Customer/Card/CustomerCreditContracts.vue
+++ b/src/pages/Customer/Card/CustomerCreditContracts.vue
@@ -75,7 +75,7 @@ const updateData = () => {
     <div class="full-width flex justify-center">
         <QCard class="card-width q-pa-lg">
             <VnPaginate
-                :filter="filter"
+                :user-filter="filter"
                 @on-fetch="fetch"
                 auto-load
                 data-key="CustomerCreditContracts"
diff --git a/src/pages/Route/Agency/Card/AgencyModes.vue b/src/pages/Route/Agency/Card/AgencyModes.vue
index 4fb81914a..13f6011e4 100644
--- a/src/pages/Route/Agency/Card/AgencyModes.vue
+++ b/src/pages/Route/Agency/Card/AgencyModes.vue
@@ -16,7 +16,7 @@ const routeId = route.params.id;
             <VnPaginate
                 data-key="AgencyModes"
                 :url="`AgencyModes`"
-                :filter="{ where: { agencyFk: routeId } }"
+                :user-filter="{ where: { agencyFk: routeId } }"
                 order="name"
                 auto-load
             >
@@ -47,7 +47,7 @@ const routeId = route.params.id;
     </QPage>
 </template>
 <i18n>
-    es: 
+    es:
         isOwn: Tiene propietario
         isAnyVolumeAllowed: Permite cualquier volumen
         Search agency: Buscar agencia
diff --git a/src/pages/Route/Agency/Card/AgencyWorkcenter.vue b/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
index 7103ea9ce..7cabf396d 100644
--- a/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
+++ b/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
@@ -57,7 +57,7 @@ async function deleteWorCenter(id) {
             ref="paginate"
             data-key="AgencyWorkCenters"
             url="AgencyWorkCenters"
-            :filter="{ where: { agencyFk: routeId } }"
+            :user-filter="{ where: { agencyFk: routeId } }"
             order="id"
             auto-load
         >
diff --git a/src/pages/Route/RouteTickets.vue b/src/pages/Route/RouteTickets.vue
index 56e3143b4..1416f77ce 100644
--- a/src/pages/Route/RouteTickets.vue
+++ b/src/pages/Route/RouteTickets.vue
@@ -300,7 +300,7 @@ const openSmsDialog = async () => {
                 :key="refreshKey"
                 data-key="RouteTicketList"
                 url="Routes/getTickets"
-                :filter="{ id: route.params.id }"
+                :user-filter="{ id: route.params.id }"
                 :limit="0"
                 :order="['priority ASC']"
                 auto-load
diff --git a/src/pages/Shelving/ShelvingList.vue b/src/pages/Shelving/ShelvingList.vue
index cd7c4bcf9..fb055215c 100644
--- a/src/pages/Shelving/ShelvingList.vue
+++ b/src/pages/Shelving/ShelvingList.vue
@@ -45,7 +45,7 @@ function exprBuilder(param, value) {
             <VnPaginate
                 data-key="ShelvingList"
                 url="Shelvings"
-                :filter="filter"
+                :user-filter="filter"
                 :expr-builder="exprBuilder"
                 :limit="20"
             >
diff --git a/src/pages/Supplier/Card/SupplierAddresses.vue b/src/pages/Supplier/Card/SupplierAddresses.vue
index f1e95b8de..e568962ff 100644
--- a/src/pages/Supplier/Card/SupplierAddresses.vue
+++ b/src/pages/Supplier/Card/SupplierAddresses.vue
@@ -57,7 +57,7 @@ const redirectToUpdateView = (addressData) => {
             <VnPaginate
                 data-key="SupplierAddress"
                 :url="`Suppliers/${route.params.id}/addresses`"
-                :filter="addressesFilter"
+                :user-filter="addressesFilter"
                 auto-load
             >
                 <template #body="{ rows }">
diff --git a/src/pages/Ticket/Card/TicketTracking.vue b/src/pages/Ticket/Card/TicketTracking.vue
index f5ed03b0d..f4b8544d3 100644
--- a/src/pages/Ticket/Card/TicketTracking.vue
+++ b/src/pages/Ticket/Card/TicketTracking.vue
@@ -80,7 +80,7 @@ const openCreateModal = () => createTrackingDialogRef.value.show();
         <VnPaginate
             ref="paginateRef"
             data-key="TicketTracking"
-            :filter="paginateFilter"
+            :user-filter="paginateFilter"
             url="TicketTrackings"
             auto-load
             order="created DESC"
diff --git a/src/pages/Travel/Card/TravelThermographs.vue b/src/pages/Travel/Card/TravelThermographs.vue
index 85781a6a4..86550266a 100644
--- a/src/pages/Travel/Card/TravelThermographs.vue
+++ b/src/pages/Travel/Card/TravelThermographs.vue
@@ -140,7 +140,7 @@ const removeThermograph = async (id) => {
         ref="thermographPaginateRef"
         data-key="TravelThermographs"
         url="TravelThermographs"
-        :filter="thermographFilter"
+        :user-filter="thermographFilter"
         auto-load
     >
         <template #body="{ rows }">
diff --git a/src/pages/Wagon/Type/WagonTypeEdit.vue b/src/pages/Wagon/Type/WagonTypeEdit.vue
index 49492b1b9..cfa1c76cd 100644
--- a/src/pages/Wagon/Type/WagonTypeEdit.vue
+++ b/src/pages/Wagon/Type/WagonTypeEdit.vue
@@ -102,7 +102,7 @@ watch(
                         data-key="wagonTypeTray"
                         url="WagonTypeTrays"
                         order="id DESC"
-                        :filter="filter"
+                        :user-filter="filter"
                         auto-load
                         ref="vnPaginateRef"
                         v-bind="$attrs"
diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index c1beef40d..f6cb92aac 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -58,7 +58,7 @@ function reloadData() {
             ref="paginate"
             data-key="WorkerPda"
             url="DeviceProductionUsers"
-            :filter="{ where: { userFk: routeId } }"
+            :user-filter="{ where: { userFk: routeId } }"
             order="id"
             search-url="pda"
             auto-load
diff --git a/src/pages/Zone/Card/ZoneWarehouses.vue b/src/pages/Zone/Card/ZoneWarehouses.vue
index d3b1d7a1c..c96735697 100644
--- a/src/pages/Zone/Card/ZoneWarehouses.vue
+++ b/src/pages/Zone/Card/ZoneWarehouses.vue
@@ -49,7 +49,7 @@ watch(
         store.url = urlPath.value;
         store.filter.include = 'warehouse';
         fetchWarehouses();
-    }
+    },
 );
 
 const fetchWarehouses = () => paginateRef.value.fetch();
@@ -63,7 +63,7 @@ const openCreateWarehouseForm = () => createWarehouseDialogRef.value.show();
             <VnPaginate
                 ref="paginateRef"
                 data-key="ZoneWarehouses"
-                :filter="{ include: 'warehouse' }"
+                :user-filter="{ include: 'warehouse' }"
                 :url="urlPath"
                 auto-load
             >
@@ -84,7 +84,8 @@ const openCreateWarehouseForm = () => createWarehouseDialogRef.value.show();
                                             openConfirmationModal(
                                                 t('zone.deleteTitle'),
                                                 t('zone.deleteSubtitle'),
-                                                () => deleteWarehouse(row, rows, rowIndex)
+                                                () =>
+                                                    deleteWarehouse(row, rows, rowIndex),
                                             )
                                         "
                                     >

From 2fea795bdb6ec24793c1f76dae4313d414fca086 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 7 Feb 2025 07:21:59 +0100
Subject: [PATCH 3/4] fix: hotfix empty observations

---
 src/pages/Customer/Card/CustomerAddress.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerAddress.vue b/src/pages/Customer/Card/CustomerAddress.vue
index 5c200582d..4869182cb 100644
--- a/src/pages/Customer/Card/CustomerAddress.vue
+++ b/src/pages/Customer/Card/CustomerAddress.vue
@@ -189,11 +189,11 @@ const toCustomerAddressEdit = (addressId) => {
 
                     <QSeparator
                         class="q-mx-lg"
-                        v-if="item.observations.length"
+                        v-if="item?.observations?.length"
                         vertical
                     />
 
-                    <div v-if="item.observations.length">
+                    <div v-if="item?.observations?.length">
                         <div
                             :key="obIndex"
                             class="flex q-mb-sm"

From 3021e38ae875e75a822b9c491c9b7c8617e1035e Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 7 Feb 2025 07:32:28 +0100
Subject: [PATCH 4/4] fix: hotfix fetchData not use userFilter

---
 src/pages/Customer/Card/CustomerAddress.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Customer/Card/CustomerAddress.vue b/src/pages/Customer/Card/CustomerAddress.vue
index 4869182cb..1b0d1dde1 100644
--- a/src/pages/Customer/Card/CustomerAddress.vue
+++ b/src/pages/Customer/Card/CustomerAddress.vue
@@ -117,7 +117,7 @@ const toCustomerAddressEdit = (addressId) => {
         data-key="CustomerAddresses"
         order="id DESC"
         ref="vnPaginateRef"
-        :user-filter="addressFilter"
+        :filter="addressFilter"
         :url="`Clients/${route.params.id}/addresses`"
     />
     <div class="full-width flex justify-center">