From 3e9ed60db0fe3e454fe653d1f15e3e558d238f27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9on=20Dumestre?= <leon.dumestre@gmail.com>
Date: Sat, 11 Jan 2025 11:04:08 +0000
Subject: [PATCH] fix(nav): clean search field after navigation #2349

Approved-by: VANDERHAGHEN Luc <luke.vandh@gmail.com>

Closes #2349

See merge request 24-heures-insa/overbookd-mono!3169
---
 apps/web/layouts/navigation/DesktopSideNav.vue  | 9 +++++++--
 apps/web/layouts/navigation/SideNavPageItem.vue | 4 ++++
 apps/web/layouts/navigation/SideNavPageList.vue | 5 +++++
 apps/web/package.json                           | 2 +-
 package.json                                    | 2 +-
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/apps/web/layouts/navigation/DesktopSideNav.vue b/apps/web/layouts/navigation/DesktopSideNav.vue
index 5cec863c35..f6cf8b2713 100644
--- a/apps/web/layouts/navigation/DesktopSideNav.vue
+++ b/apps/web/layouts/navigation/DesktopSideNav.vue
@@ -16,7 +16,11 @@
       v-model:search-value="searchValue"
       :is-folded="isFolded"
     />
-    <SideNavPageList :search="searchValue" :is-folded="isFolded" />
+    <SideNavPageList
+      :search="searchValue"
+      :is-folded="isFolded"
+      @click="cleanSearchField"
+    />
     <SideNavHelpItemList
       :is-folded="isFolded"
       @ask-question="openAskQuestionDialog"
@@ -50,7 +54,8 @@ onMounted(() => navigationBadgeStore.fetchAll());
 const isDesktop = computed<boolean>(() => layoutStore.isDesktop);
 
 const isFolded = ref<boolean>(true);
-const searchValue = ref<string | undefined>(undefined);
+const searchValue = ref<string | undefined>();
+const cleanSearchField = () => (searchValue.value = "");
 
 const searchInput = ref<HTMLInputElement | null>(null);
 const unfocusOnSearch = () => searchInput.value?.blur();
diff --git a/apps/web/layouts/navigation/SideNavPageItem.vue b/apps/web/layouts/navigation/SideNavPageItem.vue
index 5e4d563d88..f4a1fe92ca 100644
--- a/apps/web/layouts/navigation/SideNavPageItem.vue
+++ b/apps/web/layouts/navigation/SideNavPageItem.vue
@@ -9,6 +9,7 @@
       'unfolded-item': !isFolded,
     }"
     link
+    @click="propagateClick"
   >
     <template #prepend>
       <v-badge
@@ -48,6 +49,9 @@ const isSelected = ({ to }: PageInSummary): boolean => {
   const currentPage = findPage(route.path);
   return currentPage?.to === to;
 };
+
+const emit = defineEmits(["click"]);
+const propagateClick = () => emit("click");
 </script>
 
 <style lang="scss" scoped>
diff --git a/apps/web/layouts/navigation/SideNavPageList.vue b/apps/web/layouts/navigation/SideNavPageList.vue
index b3a1488d00..da99a92834 100644
--- a/apps/web/layouts/navigation/SideNavPageList.vue
+++ b/apps/web/layouts/navigation/SideNavPageList.vue
@@ -10,6 +10,7 @@
       :key="page.to"
       :page="page"
       :is-folded="isFolded"
+      @click="propagateClick"
     />
     <v-divider
       v-show="favoritePages.length > 0 && nonFavoritePages.length > 0"
@@ -20,6 +21,7 @@
       :key="page.to"
       :page="page"
       :is-folded="isFolded"
+      @click="propagateClick"
     />
   </v-list>
 </template>
@@ -77,6 +79,9 @@ const favoritePages = computed<PageInSummary[]>(
 const nonFavoritePages = computed<PageInSummary[]>(
   () => PageFilter.from(filteredPages.value).nonFavorites,
 );
+
+const emit = defineEmits(["click"]);
+const propagateClick = () => emit("click");
 </script>
 
 <style lang="scss" scoped>
diff --git a/apps/web/package.json b/apps/web/package.json
index 2b1c4c07e8..08cce82f1f 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@overbookd/web",
-  "version": "3.3.74",
+  "version": "3.3.75",
   "description": "Application web pour le logiciel de gestion du festival des 24 heures de l'INSA",
   "author": "Club des 24 heures de l'INSA (https://www.24heures.org/)",
   "homepage": "https://gitlab.com/24-heures-insa/overbookd-mono",
diff --git a/package.json b/package.json
index 50a5d7c082..c5cc62fdbd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "overbookd",
-  "version": "3.24.1-rc.0",
+  "version": "3.24.1-rc.1",
   "main": "index.js",
   "keywords": [],
   "license": "Apache-2.0",