From 2d2a6f01eb7e9ac28281851620030f37440f6637 Mon Sep 17 00:00:00 2001
From: aydawka <aydan.gasimova2@gmail.com>
Date: Mon, 13 Nov 2023 13:31:52 -0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E2=9C=A8=20dataset=20sidebar=20router?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/sidebar/DatasetSidebar.vue | 18 +++++++++++++++++-
 src/router/index.ts                       |  7 +++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/components/sidebar/DatasetSidebar.vue b/src/components/sidebar/DatasetSidebar.vue
index 9d51410b..a23b6669 100644
--- a/src/components/sidebar/DatasetSidebar.vue
+++ b/src/components/sidebar/DatasetSidebar.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { Icon } from "@iconify/vue";
-import type { MenuOption } from "naive-ui";
+import type { MenuInst, MenuOption } from "naive-ui";
 import { NLayoutSider, NMenu, NSpace } from "naive-ui";
 import { computed, h, ref } from "vue";
 import { useRoute, useRouter } from "vue-router";
@@ -197,6 +197,20 @@ const showSidebar = computed(() => {
 
   return false;
 });
+
+const selectedKeyRef = ref("1");
+const menuInstRef = ref<MenuInst | null>(null);
+
+const selectAndExpand = (key: string) => {
+  selectedKeyRef.value = key;
+  menuInstRef.value?.showOption(key);
+};
+
+router.beforeEach((to, from) => {
+  if (typeof to.name !== "string") return;
+  const name: string = to.meta && to.meta.menuItem ? (to.meta.menuItem as string) : to.name;
+  selectAndExpand(name);
+});
 </script>
 
 <template>
@@ -213,6 +227,8 @@ const showSidebar = computed(() => {
   >
     <n-space vertical justify="space-between" class="h-full">
       <n-menu
+        ref="menuInstRef"
+        v-model:value="selectedKeyRef"
         :collapsed-width="64"
         :collapsed-icon-size="22"
         :default-expanded-keys="['dataset:metadata']"
diff --git a/src/router/index.ts b/src/router/index.ts
index 0b67dde5..f492a915 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -286,6 +286,7 @@ const router = createRouter({
                       name: "dataset:publish:versions:new",
                       path: "new",
                       component: NewVersion,
+                      meta: { menuItem: "dataset:publish:versions" },
                     },
                     {
                       path: ":versionId",
@@ -294,31 +295,37 @@ const router = createRouter({
                           name: "dataset:publish:version:participants",
                           path: "participants",
                           component: PublishSelectParticipants,
+                          meta: { menuItem: "dataset:publish:versions" },
                         },
                         {
                           name: "dataset:publish:version:study-metadata",
                           path: "study-metadata",
                           component: PublishStudyMetadata,
+                          meta: { menuItem: "dataset:publish:versions" },
                         },
                         {
                           name: "dataset:publish:version:dataset-metadata",
                           path: "dataset-metadata",
                           component: PublishDatasetMetadata,
+                          meta: { menuItem: "dataset:publish:versions" },
                         },
                         {
                           name: "dataset:publish:version:changelog",
                           path: "changelog",
                           component: PublishChangelog,
+                          meta: { menuItem: "dataset:publish:versions" },
                         },
                         {
                           name: "dataset:publish:version:readme",
                           path: "additional-readme",
                           component: PublishReadme,
+                          meta: { menuItem: "dataset:publish:versions" },
                         },
                         {
                           name: "dataset:publish:version:summary",
                           path: "summary",
                           component: PublishSummary,
+                          meta: { menuItem: "dataset:publish:versions" },
                         },
                       ],
                     },