Merge branch 'main' into cluster-switch

defenseunicorns · Nov 4, 2024 · fa3588e · fa3588e
2 parents fb247a3 + 6ae1097
commit fa3588e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/ui/src/lib/components/AnsiDisplay/component.svelte b/ui/src/lib/components/AnsiDisplay/component.svelte
@@ -9,6 +9,7 @@
   const convert = new Convert({
     newline: true,
     stream: true,
+    escapeXML: true,
   })
   let termElement: HTMLElement | null
   let scrollAnchor: Element | null | undefined

diff --git a/ui/src/lib/features/navigation/sidebar/component.svelte b/ui/src/lib/features/navigation/sidebar/component.svelte
@@ -43,6 +43,20 @@
         return route
       })
   }
+
+  // If link was clicked, updating url, but path is a child route that is currently not renendered
+  // we need to toggle the submenu to show the child route
+  function updateOnLinkClicks(path: string) {
+    for (const route of routes) {
+      if (path.includes(route.path) && !toggleSubmenus[route.path]) {
+        toggleSubmenus[route.path] = true
+      }
+    }
+  }
+
+  $: if ($page.url.pathname) {
+    updateOnLinkClicks($page.url.pathname)
+  }
 </script>
 
 <aside