From 15b080f7bd9b485169e8d1b3c81fa9fff373800b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 6 May 2024 14:27:04 +0200
Subject: [PATCH] feat: refs #6891 add redirection on VnfilterPanel

---
 src/components/common/VnCard.vue    | 46 ++++++++++++++++++-----------
 src/components/ui/VnFilterPanel.vue |  5 +++-
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 6d0badffb..97c681b79 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -8,6 +8,7 @@ import useCardSize from 'src/composables/useCardSize';
 import VnSubToolbar from '../ui/VnSubToolbar.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import LeftMenu from 'components/LeftMenu.vue';
+import RightMenu from 'components/common/RightMenu.vue';
 
 const props = defineProps({
     dataKey: { type: String, required: true },
@@ -15,6 +16,7 @@ const props = defineProps({
     customUrl: { type: String, default: undefined },
     filter: { type: Object, default: () => {} },
     descriptor: { type: Object, required: true },
+    filterPanel: { type: Object, default: undefined },
     searchbarDataKey: { type: String, default: undefined },
     searchbarUrl: { type: String, default: undefined },
     searchbarLabel: { type: String, default: '' },
@@ -49,24 +51,32 @@ if (props.baseUrl) {
 }
 </script>
 <template>
-    <Teleport
-        to="#searchbar"
-        v-if="stateStore.isHeaderMounted() && props.searchbarDataKey"
-    >
-        <VnSearchbar
-            :data-key="props.searchbarDataKey"
-            :url="props.searchbarUrl"
-            :label="t(props.searchbarLabel)"
-            :info="t(props.searchbarInfo)"
-        />
-    </Teleport>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <component :is="descriptor" />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar" v-if="props.searchbarDataKey">
+            <VnSearchbar
+                :data-key="props.searchbarDataKey"
+                :url="props.searchbarUrl"
+                :label="t(props.searchbarLabel)"
+                :info="t(props.searchbarInfo)"
+            />
+        </Teleport>
+        <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+            <QScrollArea class="fit">
+                <component :is="descriptor" />
+                <QSeparator />
+                <LeftMenu source="card" />
+            </QScrollArea>
+        </QDrawer>
+        <RightMenu>
+            <template #right-panel>
+                <component
+                    v-if="props.filterPanel"
+                    :is="props.filterPanel"
+                    :data-key="props.searchbarDataKey"
+                />
+            </template>
+        </RightMenu>
+    </template>
     <QPageContainer>
         <QPage>
             <VnSubToolbar />
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index eb0bbbe66..bc6c313b2 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 import { useRoute } from 'vue-router';
 import toDate from 'filters/toDate';
-
+import useRedirect from 'src/composables/useRedirect';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
 const { t } = useI18n();
@@ -56,6 +56,7 @@ const arrayData = useArrayData(props.dataKey, {
 const route = useRoute();
 const store = arrayData.store;
 const userParams = ref({});
+const { navigate } = useRedirect();
 
 onMounted(() => {
     if (props.params) userParams.value = JSON.parse(JSON.stringify(props.params));
@@ -92,6 +93,7 @@ async function search() {
 
     isLoading.value = false;
     emit('search');
+    navigate(store.data, {});
 }
 
 async function reload() {
@@ -102,6 +104,7 @@ async function reload() {
     if (!props.showAll && !params.length) store.data = [];
     isLoading.value = false;
     emit('refresh');
+    navigate(store.data, {});
 }
 
 async function clearFilters() {