From 0703de350c18663a8a4c77d2bcf80db520146293 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 7 May 2024 13:04:27 +0200
Subject: [PATCH] fix: refs #6891 rollback order & route searchbar

---
 src/pages/Order/Card/OrderCard.vue      | 12 +++++++-----
 src/pages/Order/Card/OrderSearchbar.vue | 22 ++++++++++++++++++++++
 src/pages/Order/OrderList.vue           |  8 ++------
 src/pages/Order/locale/es.yml           |  2 --
 src/pages/Route/Card/RouteCard.vue      | 12 +++++++-----
 src/pages/Route/Card/RouteSearchbar.vue | 21 +++++++++++++++++++++
 src/pages/Route/RouteList.vue           |  9 ++-------
 src/pages/Route/locale/en.yml           |  2 --
 src/pages/Route/locale/es.yml           |  3 ---
 9 files changed, 61 insertions(+), 30 deletions(-)
 create mode 100644 src/pages/Order/Card/OrderSearchbar.vue
 delete mode 100644 src/pages/Order/locale/es.yml
 create mode 100644 src/pages/Route/Card/RouteSearchbar.vue
 delete mode 100644 src/pages/Route/locale/en.yml
 delete mode 100644 src/pages/Route/locale/es.yml

diff --git a/src/pages/Order/Card/OrderCard.vue b/src/pages/Order/Card/OrderCard.vue
index 2721979d5..5b6896656 100644
--- a/src/pages/Order/Card/OrderCard.vue
+++ b/src/pages/Order/Card/OrderCard.vue
@@ -2,6 +2,7 @@
 import VnCard from 'components/common/VnCard.vue';
 import OrderDescriptor from 'pages/Order/Card/OrderDescriptor.vue';
 import OrderFilter from './OrderFilter.vue';
+import OrderSearchbar from './OrderSearchbar.vue';
 </script>
 <template>
     <VnCard
@@ -9,9 +10,10 @@ import OrderFilter from './OrderFilter.vue';
         base-url="Orders"
         :descriptor="OrderDescriptor"
         :filter-panel="OrderFilter"
-        searchbar-data-key="OrderList"
-        searchbar-url="Orders/filter"
-        searchbar-label="Search order"
-        searchbar-info="You can search order by reference"
-    />
+        search-data-key="OrderList"
+    >
+        <template #searchbar>
+            <OrderSearchbar />
+        </template>
+    </VnCard>
 </template>
diff --git a/src/pages/Order/Card/OrderSearchbar.vue b/src/pages/Order/Card/OrderSearchbar.vue
new file mode 100644
index 000000000..a768768a5
--- /dev/null
+++ b/src/pages/Order/Card/OrderSearchbar.vue
@@ -0,0 +1,22 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+
+const { t } = useI18n();
+</script>
+
+<template>
+    <VnSearchbar
+        data-key="OrderList"
+        url="Orders/filter"
+        :label="t('Search order')"
+        :info="t('You can search orders by reference')"
+    />
+</template>
+
+<style scoped lang="scss"></style>
+<i18n>
+es:
+    Search order: Buscar orden
+    You can search orders by reference: Puedes buscar por referencia de la orden
+</i18n>
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index 0904de71a..203eaccd1 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -9,7 +9,7 @@ import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnLv from 'components/ui/VnLv.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import OrderSearchbar from 'pages/Order/Card/OrderSearchbar.vue';
 import OrderFilter from 'pages/Order/Card/OrderFilter.vue';
 import OrderSummary from 'pages/Order/Card/OrderSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
@@ -30,11 +30,7 @@ function navigate(id) {
 <template>
     <template v-if="stateStore.isHeaderMounted()">
         <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="OrderList"
-                :label="t('Search order')"
-                :info="t('You can search orders by reference')"
-            />
+            <OrderSearchbar />
         </Teleport>
         <Teleport to="#actions-append">
             <div class="row q-gutter-x-sm">
diff --git a/src/pages/Order/locale/es.yml b/src/pages/Order/locale/es.yml
deleted file mode 100644
index 5fcfd0f5d..000000000
--- a/src/pages/Order/locale/es.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-Search order: Buscar orden
-You can search orders by reference: Puedes buscar por referencia de la orden
diff --git a/src/pages/Route/Card/RouteCard.vue b/src/pages/Route/Card/RouteCard.vue
index 0da79acf6..461f2d95e 100644
--- a/src/pages/Route/Card/RouteCard.vue
+++ b/src/pages/Route/Card/RouteCard.vue
@@ -2,6 +2,7 @@
 import VnCard from 'components/common/VnCard.vue';
 import RouteDescriptor from 'pages/Route/Card/RouteDescriptor.vue';
 import RouteFilter from './RouteFilter.vue';
+import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
 </script>
 <template>
     <VnCard
@@ -9,9 +10,10 @@ import RouteFilter from './RouteFilter.vue';
         base-url="Routes"
         :descriptor="RouteDescriptor"
         :filter-panel="RouteFilter"
-        searchbar-data-key="RouteList"
-        searchbar-label="searchLabel"
-        searchbar-info="searchInfo"
-        custom-route-redirect-name="RouteList"
-    />
+        search-data-key="RouteList"
+    >
+        <template #searchbar>
+            <RouteSearchbar />
+        </template>
+    </VnCard>
 </template>
diff --git a/src/pages/Route/Card/RouteSearchbar.vue b/src/pages/Route/Card/RouteSearchbar.vue
new file mode 100644
index 000000000..924280580
--- /dev/null
+++ b/src/pages/Route/Card/RouteSearchbar.vue
@@ -0,0 +1,21 @@
+<script setup>
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import { useI18n } from 'vue-i18n';
+const { t } = useI18n();
+</script>
+
+<template>
+    <VnSearchbar
+        data-key="RouteList"
+        :label="t('Search route')"
+        :info="t('You can search by route reference')"
+        custom-route-redirect-name="RouteList"
+    />
+</template>
+
+<style scoped lang="scss"></style>
+<i18n>
+es:
+    Search route: Buscar rutas
+    You can search by route reference: Puedes buscar por referencia de la ruta
+</i18n>
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 9ebac4bee..c0888a225 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -11,7 +11,7 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'components/common/VnInput.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
 import axios from 'axios';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
 import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
 import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
@@ -179,12 +179,7 @@ const openTicketsDialog = (id) => {
 <template>
     <template v-if="stateStore.isHeaderMounted()">
         <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="RouteList"
-                :label="t('Search route')"
-                :info="t('You can search by route reference')"
-                custom-route-redirect-name="RouteList"
-            />
+            <RouteSearchbar />
         </Teleport>
         <Teleport to="#actions-append">
             <div class="row q-gutter-x-sm">
diff --git a/src/pages/Route/locale/en.yml b/src/pages/Route/locale/en.yml
deleted file mode 100644
index 427abec1c..000000000
--- a/src/pages/Route/locale/en.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-searchLabel: Search route
-searchInfo: You can search by route reference
diff --git a/src/pages/Route/locale/es.yml b/src/pages/Route/locale/es.yml
deleted file mode 100644
index cc75dbbc4..000000000
--- a/src/pages/Route/locale/es.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-route:
-    searchLabel: Buscar rutas
-    searchInfo: Puedes buscar por referencia de la ruta