From 3d19870b36ba3dbccedd088d0e216b548c98abe9 Mon Sep 17 00:00:00 2001
From: Amir Raminfar <findamir@gmail.com>
Date: Fri, 21 Jun 2024 12:04:22 -0700
Subject: [PATCH] chore: fixes bugs with auto switching of menu

---
 assets/components/HostMenu.vue  | 12 ++++--------
 assets/components/SideMenu.vue  |  2 +-
 assets/pages/container/[id].vue |  4 ++++
 assets/pages/merged/[name].vue  |  4 ++++
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/assets/components/HostMenu.vue b/assets/components/HostMenu.vue
index ade80e34..a59f273f 100644
--- a/assets/components/HostMenu.vue
+++ b/assets/components/HostMenu.vue
@@ -170,18 +170,14 @@ const menuItems = computed(() => {
 
 const route = useRoute("/container/[id]");
 
-const updateHostForContainerRoute = (to: RouteLocationNormalizedLoaded) => {
-  if (to.name === "/container/[id]") {
-    const container = containerStore.findContainerById(to.params.id as string);
+watchEffect(() => {
+  if (route.name === "/container/[id]") {
+    const container = containerStore.findContainerById(route.params.id);
     if (container) {
       setHost(container.host);
     }
   }
-};
-
-updateHostForContainerRoute(route);
-
-onBeforeRouteUpdate((to) => updateHostForContainerRoute(to));
+});
 </script>
 <style scoped lang="postcss">
 .menu {
diff --git a/assets/components/SideMenu.vue b/assets/components/SideMenu.vue
index 88069a20..416ced58 100644
--- a/assets/components/SideMenu.vue
+++ b/assets/components/SideMenu.vue
@@ -32,7 +32,7 @@ const showSwarm = useSessionStorage<boolean>("DOZZLE_SWARM_MODE", false);
 onBeforeRouteLeave((to) => {
   if (to.meta.swarmMode) {
     showSwarm.value = true;
-  } else {
+  } else if (to.meta.containerMode) {
     showSwarm.value = false;
   }
 });
diff --git a/assets/pages/container/[id].vue b/assets/pages/container/[id].vue
index 36809ac7..6cb0f065 100644
--- a/assets/pages/container/[id].vue
+++ b/assets/pages/container/[id].vue
@@ -31,3 +31,7 @@ watchEffect(() => {
   }
 });
 </script>
+<route lang="yaml">
+meta:
+  containerMode: true
+</route>
diff --git a/assets/pages/merged/[name].vue b/assets/pages/merged/[name].vue
index 510a092d..71d6dad9 100644
--- a/assets/pages/merged/[name].vue
+++ b/assets/pages/merged/[name].vue
@@ -20,3 +20,7 @@ watchEffect(() => {
   }
 });
 </script>
+<route lang="yaml">
+meta:
+  containerMode: true
+</route>