Merge branch 'dev' into 7283-itemSectionsMigration

src/components/common/VnCard.vue

@@ -17,13 +17,7 @@ const props = defineProps({
     descriptor: { type: Object, required: true },
     filterPanel: { type: Object, default: undefined },
     searchDataKey: { type: String, default: undefined },
-    searchUrl: { type: String, default: undefined },
+    searchbarProps: { type: Object, default: undefined },
-    searchbarLabel: { type: String, default: '' },
-    searchbarInfo: { type: String, default: '' },
-    searchCustomRouteRedirect: { type: String, default: undefined },
-    searchRedirect: { type: Boolean, default: true },
-    searchMakeFetch: { type: Boolean, default: true },
-    searchUrlQuery: { type: String, default: undefined },
 });
 
 const stateStore = useStateStore();
@@ -66,15 +60,7 @@ if (props.baseUrl) {
         </QScrollArea>
     </QDrawer>
     <slot name="searchbar" v-if="props.searchDataKey">
-        <VnSearchbar
+        <VnSearchbar :data-key="props.searchDataKey" v-bind="$attrs['searchbarProps']" />
-            :data-key="props.searchDataKey"
-            :url="props.searchUrl"
-            :label="props.searchbarLabel"
-            :info="props.searchbarInfo"
-            :search-url="props.searchUrlQuery"
-            :custom-route-redirect-name="searchCustomRouteRedirect"
-            :redirect="searchRedirect"
-        />
     </slot>
     <slot v-else name="searchbar" />
     <RightMenu>

src/pages/Account/Alias/Card/AliasCard.vue

@@ -25,9 +25,11 @@ const searchBarDataKeys = {
         base-url="MailAliases"
         :descriptor="AliasDescriptor"
         :search-data-key="searchBarDataKeys[routeName]"
-        :search-custom-route-redirect="customRouteRedirectName"
+        :searchbarProps="{
-        :search-redirect="!!customRouteRedirectName"
+            redirect: !!customRouteRedirectName,
-        :searchbar-label="t('mailAlias.search')"
+            customRouteRedirectName,
-        :searchbar-info="t('mailAlias.searchInfo')"
+            info: t('mailAlias.searchInfo'),
+            label: t('mailAlias.search'),
+        }"
     />
 </template>

src/pages/Account/Card/AccountCard.vue

@@ -26,9 +26,11 @@ const searchBarDataKeys = {
         data-key="Account"
         :descriptor="AccountDescriptor"
         :search-data-key="searchBarDataKeys[routeName]"
-        :search-custom-route-redirect="customRouteRedirectName"
+        :searchbarProps="{
-        :search-redirect="!!customRouteRedirectName"
+            redirect: !!customRouteRedirectName,
-        :searchbar-label="t('account.search')"
+            customRouteRedirectName,
-        :searchbar-info="t('account.searchInfo')"
+            label: t('account.search'),
+            info: t('account.searchInfo'),
+        }"
     />
 </template>

src/pages/Account/Role/Card/RoleCard.vue

@@ -23,9 +23,11 @@ const searchBarDataKeys = {
         data-key="Role"
         :descriptor="RoleDescriptor"
         :search-data-key="searchBarDataKeys[routeName]"
-        :search-custom-route-redirect="customRouteRedirectName"
+        :searchbarProps="{
-        :search-redirect="!!customRouteRedirectName"
+            redirect: !!customRouteRedirectName,
-        :searchbar-label="t('role.searchRoles')"
+            customRouteRedirectName,
-        :searchbar-info="t('role.searchInfo')"
+            label: t('role.searchRoles'),
+            info: t('role.searchInfo'),
+        }"
     />
 </template>

src/pages/Claim/Card/ClaimCard.vue

@@ -11,9 +11,11 @@ import filter from './ClaimFilter.js';
         :descriptor="ClaimDescriptor"
         :filter-panel="ClaimFilter"
         search-data-key="ClaimList"
-        search-url="Claims/filter"
-        searchbar-label="Search claim"
-        searchbar-info="You can search by claim id or customer name"
         :filter="filter"
+        :searchbarProps="{
+            url: 'Claims/filter',
+            label: 'Search claim',
+            info: 'You can search by claim id or customer name',
+        }"
     />
 </template>

src/pages/Customer/Card/CustomerCard.vue

@@ -10,8 +10,10 @@ import CustomerFilter from '../CustomerFilter.vue';
         :descriptor="CustomerDescriptor"
         :filter-panel="CustomerFilter"
         search-data-key="CustomerList"
-        search-url="Clients/extendedListFilter"
+        :searchbarProps="{
-        searchbar-label="Search customer"
+            url: 'Clients/extendedListFilter',
-        searchbar-info="You can search by customer id or name"
+            label: 'Search customer',
+            info: 'You can search by customer id or name',
+        }"
     />
 </template>

src/pages/Entry/Card/EntryCard.vue

@@ -10,8 +10,10 @@ import EntryFilter from '../EntryFilter.vue';
         :descriptor="EntryDescriptor"
         :filter-panel="EntryFilter"
         search-data-key="EntryList"
-        search-url="Entries/filter"
+        :searchbarProps="{
-        searchbar-label="Search entries"
+            url: 'Entries/filter',
-        searchbar-info="You can search by entry reference"
+            label: 'Search entries',
+            info: 'You can search by entry reference',
+        }"
     />
 </template>

src/pages/InvoiceOut/Card/InvoiceOutCard.vue

@@ -10,8 +10,10 @@ import InvoiceOutFilter from '../InvoiceOutFilter.vue';
         :descriptor="InvoiceOutDescriptor"
         :filter-panel="InvoiceOutFilter"
         search-data-key="InvoiceOutList"
-        search-url="InvoiceOuts/filter"
+        :searchbarProps="{
-        searchbar-label="Search invoice"
+            url: 'InvoiceOuts/filter',
-        searchbar-info="You can search by invoice reference"
+            label: 'Search invoice',
+            info: 'You can search by invoice reference',
+        }"
     />
 </template>

src/pages/Item/Card/ItemCard.vue

@@ -10,8 +10,10 @@ import ItemListFilter from '../ItemListFilter.vue';
         :descriptor="ItemDescriptor"
         :filter-panel="ItemListFilter"
         search-data-key="ItemList"
-        search-url="Items/filter"
+        :searchbarProps="{
-        searchbar-label="searchbar.label"
+            url: 'Items/filter',
-        searchbar-info="searchbar.info"
+            label: 'searchbar.labelr',
+            info: 'searchbar.info',
+        }"
     />
 </template>

src/pages/Parking/Card/ParkingCard.vue

@@ -16,8 +16,10 @@ const filter = {
         :descriptor="ParkingDescriptor"
         :filter-panel="ParkingFilter"
         search-data-key="ParkingList"
-        search-url="Parkings"
+        :searchbarProps="{
-        searchbar-label="parking.searchBar.label"
+            url: 'Parkings',
-        searchbar-info="parking.searchBar.info"
+            label: 'parking.searchBar.label',
+            info: 'parking.searchBar.info',
+        }"
     />
 </template>

src/pages/Route/Agency/Card/AgencyCard.vue

@@ -8,8 +8,10 @@ import VnCard from 'components/common/VnCard.vue';
         base-url="Agencies"
         :descriptor="AgencyDescriptor"
         search-data-key="AgencyList"
-        search-url="Agencies"
+        :searchbarProps="{
-        searchbar-label="agency.searchBar.label"
+            url: 'Agencies',
-        searchbar-info="agency.searchBar.info"
+            label: 'agency.searchBar.label',
+            info: 'agency.searchBar.info',
+        }"
     />
 </template>

src/pages/Route/Roadmap/RoadmapCard.vue

@@ -10,8 +10,10 @@ import RoadmapFilter from 'pages/Route/Roadmap/RoadmapFilter.vue';
         :descriptor="RoadmapDescriptor"
         :filter-panel="RoadmapFilter"
         search-data-key="RoadmapList"
-        search-url="Roadmaps"
+        :searchbarProps="{
-        searchbar-label="Search roadmap"
+            url: 'Roadmaps',
-        searchbar-info="You can search by roadmap id or customer name"
+            label: 'Search roadmap',
+            info: 'You can search by roadmap id or customer name',
+        }"
     />
 </template>

src/pages/Supplier/Card/SupplierCard.vue

@@ -10,8 +10,10 @@ import SupplierListFilter from '../SupplierListFilter.vue';
         :descriptor="SupplierDescriptor"
         :filter-panel="SupplierListFilter"
         search-data-key="SupplierList"
-        search-url="Suppliers/filter"
+        :searchbar-props="{
-        searchbar-label="Search suppliers"
+            url: 'Suppliers/filter',
-        search-url-query="table"
+            searchUrl: 'table',
+            label: 'Search suppliers',
+        }"
     />
 </template>

src/pages/Ticket/Card/TicketCard.vue

@@ -11,6 +11,7 @@ const { t } = useI18n();
 const route = useRoute();
 
 const routeName = computed(() => route.name);
+const customRouteRedirectName = computed(() => routeName.value);
 </script>
 <template>
     <VnCard
@@ -19,8 +20,10 @@ const routeName = computed(() => route.name);
         :filter-panel="TicketFilter"
         :descriptor="TicketDescriptor"
         search-data-key="TicketList"
-        :search-custom-route-redirect="routeName"
+        :searchbarProps="{
-        :searchbar-label="t('card.search')"
+            customRouteRedirectName,
-        :searchbar-info="t('card.searchInfo')"
+            label: t('card.search'),
+            info: t('card.searchInfo'),
+        }"
     />
 </template>

src/pages/Travel/Card/TravelCard.vue

@@ -35,10 +35,12 @@ const filter = {
         data-key="Travel"
         base-url="Travels"
         search-data-key="TravelList"
-        searchbar-label="Search travel"
-        searchbar-info="You can search by travel id or name"
-        search-url="Travels"
         :filter="filter"
         :descriptor="TravelDescriptor"
+        :searchbarProps="{
+            url: 'Travels',
+            label: 'Search travel',
+            info: 'You can search by travel id or name',
+        }"
     />
 </template>

src/pages/Worker/Card/WorkerCard.vue

@@ -10,8 +10,10 @@ import WorkerFilter from '../WorkerFilter.vue';
         :descriptor="WorkerDescriptor"
         :filter-panel="WorkerFilter"
         search-data-key="WorkerList"
-        search-url="Workers/filter"
+        :searchbarProps="{
-        searchbar-label="Search worker"
+            url: 'Workers/filter',
-        searchbar-info="You can search by worker id or name"
+            label: 'Search worker',
+            info: 'You can search by worker id or name',
+        }"
     />
 </template>

src/pages/Zone/Card/ZoneCard.vue

@@ -28,11 +28,12 @@ const searchBarDataKeys = {
         data-key="Zone"
         :descriptor="ZoneDescriptor"
         :search-data-key="searchBarDataKeys[routeName]"
-        :search-custom-route-redirect="customRouteRedirectName"
+        :filter-panel="ZoneFilterPanel"
-        :search-redirect="!!customRouteRedirectName"
+        :searchbarProps="{
-        :search-make-fetch="searchbarMakeFetch"
+            url: 'Zones',
-        :searchbar-label="t('list.searchZone')"
+            label: t('list.searchZone'),
-        :searchbar-info="t('list.searchInfo')"
+            info: t('list.searchInfo'),
+        }"
     >
         <template #searchbar>
             <ZoneSearchbar />