From 3ed4105879916e9020a855d536ae4a821121f246 Mon Sep 17 00:00:00 2001
From: Laurent GAY <l.gay@sd-libre.fr>
Date: Wed, 16 Oct 2024 18:36:10 +0200
Subject: [PATCH] Issue #1560 "Location is lost when navigating" : propagation
 of query for each route

---
 src/components/NavBar.vue | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index b4a597942..fae37b5a8 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -189,8 +189,9 @@
           <li class="m-auto" v-if="islongEvents">
             <router-link
               :to="{
+                ...$route,
                 name: RouteName.SEARCH,
-                query: { contentType: 'SHORTEVENTS' },
+                query: { ...$route.query, contentType: 'SHORTEVENTS' },
               }"
               class="block py-2 pr-4 pl-3 text-zinc-700 border-b border-gray-100 hover:bg-zinc-50 md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 dark:text-zinc-400 md:dark:hover:text-white dark:hover:bg-zinc-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
               >{{ t("Events") }}</router-link
@@ -198,7 +199,11 @@
           </li>
           <li class="m-auto" v-else>
             <router-link
-              :to="{ name: RouteName.SEARCH, query: { contentType: 'EVENTS' } }"
+              :to="{
+                ...$route,
+                name: RouteName.SEARCH,
+                query: { ...$route.query, contentType: 'EVENTS' },
+              }"
               class="block py-2 pr-4 pl-3 text-zinc-700 border-b border-gray-100 hover:bg-zinc-50 md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 dark:text-zinc-400 md:dark:hover:text-white dark:hover:bg-zinc-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
               >{{ t("Events") }}</router-link
             >
@@ -206,8 +211,9 @@
           <li class="m-auto" v-if="islongEvents">
             <router-link
               :to="{
+                ...$route,
                 name: RouteName.SEARCH,
-                query: { contentType: 'LONGEVENTS' },
+                query: { ...$route.query, contentType: 'LONGEVENTS' },
               }"
               class="block py-2 pr-4 pl-3 text-zinc-700 border-b border-gray-100 hover:bg-zinc-50 md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 dark:text-zinc-400 md:dark:hover:text-white dark:hover:bg-zinc-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
               >{{ t("Activities") }}</router-link
@@ -215,7 +221,11 @@
           </li>
           <li class="m-auto">
             <router-link
-              :to="{ name: RouteName.SEARCH, query: { contentType: 'GROUPS' } }"
+              :to="{
+                ...$route,
+                name: RouteName.SEARCH,
+                query: { ...$route.query, contentType: 'GROUPS' },
+              }"
               class="block py-2 pr-4 pl-3 text-zinc-700 border-b border-gray-100 hover:bg-zinc-50 md:hover:bg-transparent md:border-0 md:hover:text-mbz-purple-700 md:p-0 dark:text-zinc-400 md:dark:hover:text-white dark:hover:bg-zinc-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
               >{{ t("Groups") }}</router-link
             >