Merge branch 'test' of https: refs #8246//gitea.verdnatura.es/verdnatura/salix-front into 8246-UseAddressFk

src/components/common/VnLog.vue

@@ -268,7 +268,7 @@ async function applyFilter() {
         filter.where.and.push(selectedFilters.value);
     }
 
-    paginate.value.fetch(filter);
+    paginate.value.fetch({ filter });
 }
 
 function setDate(type) {
@@ -404,7 +404,7 @@ watch(
         ref="paginate"
         :data-key="`${model}Log`"
         :url="`${model}Logs`"
-        :filter="filter"
+        :user-filter="filter"
         :skeleton="false"
         auto-load
         @on-fetch="setLogTree"

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"

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

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

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
             >

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

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

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
             >

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">

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"

src/pages/Entry/Card/EntryDescriptorMenu.vue

@@ -54,8 +54,8 @@ const transferEntry = async () => {
 <i18n>
 en:
     transferEntryDialog: The entries will be transferred to the next day
-    transferEntry: Transfer Entry
+    transferEntry: Partial delay
 es:
     transferEntryDialog: Se van a transferir las compras al dia siguiente
-    transferEntry: Transferir Entrada
+    transferEntry: Retraso parcial
 </i18n>

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
             >

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
         >

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

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 }">

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"

src/pages/Travel/Card/TravelThermographs.vue

@@ -158,7 +158,7 @@ const removeThermograph = async (id) => {
         ref="thermographPaginateRef"
         data-key="TravelThermographs"
         url="TravelThermographs"
-        :filter="thermographFilter"
+        :user-filter="thermographFilter"
         auto-load
     >
         <template #body="{ rows }">

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"

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

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),
                                             )
                                         "
                                     >

src/router/index.js

@@ -107,7 +107,10 @@ export default defineRouter(function (/* { store, ssrContext } */) {
             'Failed to fetch dynamically imported module',
             'Importing a module script failed',
         ];
-        state.set('error', errorMessages.some(message.includes));
+        state.set(
+            'error',
+            errorMessages.some((error) => message.startsWith(error)),
+        );
     });
     return Router;
 });