From b083dada832cdf64c5b17edfc35dfbd2660e8391 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 30 Jan 2025 16:25:43 +0100
Subject: [PATCH] refactor: refs #6919 replace userFilter prop with filter in
 multiple components

---
 src/components/common/VnCardBeta.vue         |  3 +-
 src/pages/Claim/Card/ClaimCard.vue           |  1 -
 src/pages/Entry/Card/EntryCard.vue           |  2 +-
 src/pages/InvoiceIn/Card/InvoiceInCard.vue   |  2 +-
 src/pages/InvoiceOut/Card/InvoiceOutCard.vue |  1 -
 src/pages/Order/Card/OrderCard.vue           |  1 +
 src/pages/Route/Agency/Card/AgencyCard.vue   |  2 +-
 src/pages/Route/Roadmap/RoadmapCard.vue      |  2 +-
 src/pages/Shelving/Card/ShelvingCard.vue     |  1 -
 src/pages/Supplier/Card/SupplierCard.vue     |  2 --
 src/pages/Travel/Card/TravelCard.vue         | 34 ++------------------
 11 files changed, 8 insertions(+), 43 deletions(-)

diff --git a/src/components/common/VnCardBeta.vue b/src/components/common/VnCardBeta.vue
index 3a6acdb54..d2bed6257 100644
--- a/src/components/common/VnCardBeta.vue
+++ b/src/components/common/VnCardBeta.vue
@@ -12,7 +12,6 @@ const props = defineProps({
     url: { type: String, default: undefined },
     idInWhere: { type: Boolean, default: false },
     filter: { type: Object, default: () => {} },
-    userFilter: { type: Object, default: () => {} },
     descriptor: { type: Object, required: true },
     filterPanel: { type: Object, default: undefined },
     searchDataKey: { type: String, default: undefined },
@@ -24,7 +23,7 @@ const stateStore = useStateStore();
 const router = useRouter();
 const arrayData = useArrayData(props.dataKey, {
     url: props.url,
-    userFilter: props.userFilter,
+    userFilter: props.filter,
     oneRecord: true,
 });
 
diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index f8388402f..05f3b53a8 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -8,7 +8,6 @@ import filter from './ClaimFilter.js';
         data-key="Claim"
         url="Claims"
         :descriptor="ClaimDescriptor"
-        :filter-panel="ClaimFilter"
         search-data-key="ClaimList"
         :filter="filter"
     />
diff --git a/src/pages/Entry/Card/EntryCard.vue b/src/pages/Entry/Card/EntryCard.vue
index 132205c64..be82289f4 100644
--- a/src/pages/Entry/Card/EntryCard.vue
+++ b/src/pages/Entry/Card/EntryCard.vue
@@ -8,6 +8,6 @@ import filter from './EntryFilter.js';
         data-key="Entry"
         url="Entries"
         :descriptor="EntryDescriptor"
-        :user-filter="filter"
+        :filter="filter"
     />
 </template>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInCard.vue b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
index 6be7d0486..34cc26437 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCard.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
@@ -13,6 +13,6 @@ onBeforeRouteUpdate(async (to) => await setRectificative(to));
         data-key="InvoiceIn"
         url="InvoiceIns"
         :descriptor="InvoiceInDescriptor"
-        :user-filter="filter"
+        :filter="filter"
     />
 </template>
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
index 3809bb1b8..a50c9d247 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
@@ -1,7 +1,6 @@
 <script setup>
 import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
 import VnCardBeta from 'components/common/VnCardBeta.vue';
-import InvoiceOutFilter from '../InvoiceOutFilter.vue';
 import filter from './InvoiceOutFilter.js';
 </script>
 <template>
diff --git a/src/pages/Order/Card/OrderCard.vue b/src/pages/Order/Card/OrderCard.vue
index 32c1308a2..ad5c73a87 100644
--- a/src/pages/Order/Card/OrderCard.vue
+++ b/src/pages/Order/Card/OrderCard.vue
@@ -1,6 +1,7 @@
 <script setup>
 import VnCardBeta from 'components/common/VnCardBeta.vue';
 import OrderDescriptor from 'pages/Order/Card/OrderDescriptor.vue';
+import filter from './OrderFilter.js';
 </script>
 
 <template>
diff --git a/src/pages/Route/Agency/Card/AgencyCard.vue b/src/pages/Route/Agency/Card/AgencyCard.vue
index 35685790a..7dc31f8ba 100644
--- a/src/pages/Route/Agency/Card/AgencyCard.vue
+++ b/src/pages/Route/Agency/Card/AgencyCard.vue
@@ -3,5 +3,5 @@ import AgencyDescriptor from 'pages/Route/Agency/Card/AgencyDescriptor.vue';
 import VnCardBeta from 'src/components/common/VnCardBeta.vue';
 </script>
 <template>
-    <VnCardBeta data-key="Agency" base-url="Agencies" :descriptor="AgencyDescriptor" />
+    <VnCardBeta data-key="Agency" url="Agencies" :descriptor="AgencyDescriptor" />
 </template>
diff --git a/src/pages/Route/Roadmap/RoadmapCard.vue b/src/pages/Route/Roadmap/RoadmapCard.vue
index 0b81de673..48ba516a1 100644
--- a/src/pages/Route/Roadmap/RoadmapCard.vue
+++ b/src/pages/Route/Roadmap/RoadmapCard.vue
@@ -3,5 +3,5 @@ import VnCardBeta from 'components/common/VnCardBeta.vue';
 import RoadmapDescriptor from 'pages/Route/Roadmap/RoadmapDescriptor.vue';
 </script>
 <template>
-    <VnCardBeta data-key="Roadmap" base-url="Roadmaps" :descriptor="RoadmapDescriptor" />
+    <VnCardBeta data-key="Roadmap" url="Roadmaps" :descriptor="RoadmapDescriptor" />
 </template>
diff --git a/src/pages/Shelving/Card/ShelvingCard.vue b/src/pages/Shelving/Card/ShelvingCard.vue
index 701b98243..9e0ac8ad2 100644
--- a/src/pages/Shelving/Card/ShelvingCard.vue
+++ b/src/pages/Shelving/Card/ShelvingCard.vue
@@ -1,7 +1,6 @@
 <script setup>
 import VnCardBeta from 'components/common/VnCardBeta.vue';
 import ShelvingDescriptor from 'pages/Shelving/Card/ShelvingDescriptor.vue';
-import ShelvingFilter from './ShelvingFilter.vue';
 import filter from './ShelvingFilter.js';
 </script>
 
diff --git a/src/pages/Supplier/Card/SupplierCard.vue b/src/pages/Supplier/Card/SupplierCard.vue
index ce5f743e1..eec7e0a91 100644
--- a/src/pages/Supplier/Card/SupplierCard.vue
+++ b/src/pages/Supplier/Card/SupplierCard.vue
@@ -1,7 +1,6 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import SupplierDescriptor from './SupplierDescriptor.vue';
-import SupplierListFilter from '../SupplierListFilter.vue';
 import filter from './SupplierFilter.js';
 </script>
 <template>
@@ -10,7 +9,6 @@ import filter from './SupplierFilter.js';
         url="Suppliers"
         :filter="filter"
         :descriptor="SupplierDescriptor"
-        :filter-panel="SupplierListFilter"
         search-data-key="SupplierList"
         :searchbar-props="{
             url: 'Suppliers/filter',
diff --git a/src/pages/Travel/Card/TravelCard.vue b/src/pages/Travel/Card/TravelCard.vue
index 96027ac13..cb09eafd6 100644
--- a/src/pages/Travel/Card/TravelCard.vue
+++ b/src/pages/Travel/Card/TravelCard.vue
@@ -1,43 +1,13 @@
 <script setup>
 import TravelDescriptor from './TravelDescriptor.vue';
 import VnCardBeta from 'src/components/common/VnCardBeta.vue';
-
-const userFilter = {
-    fields: [
-        'id',
-        'ref',
-        'shipped',
-        'landed',
-        'totalEntries',
-        'warehouseInFk',
-        'warehouseOutFk',
-        'cargoSupplierFk',
-        'agencyModeFk',
-        'isRaid',
-        'isDelivered',
-        'isReceived',
-    ],
-    include: [
-        {
-            relation: 'warehouseIn',
-            scope: {
-                fields: ['name'],
-            },
-        },
-        {
-            relation: 'warehouseOut',
-            scope: {
-                fields: ['name'],
-            },
-        },
-    ],
-};
+import filter from './TravelFilter.js';
 </script>
 <template>
     <VnCardBeta
         data-key="Travel"
         url="Travels"
         :descriptor="TravelDescriptor"
-        :user-filter="userFilter"
+        :filter="filter"
     />
 </template>