Support startsWith Nav Extension property

openshift · Jun 7, 2022 · 2700e4e · 2700e4e
1 parent 407bc56
commit 2700e4e
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/frontend/public/components/nav/NavLinkRoot.tsx b/frontend/public/components/nav/NavLinkRoot.tsx
@@ -26,13 +26,15 @@ const navLinkRootMapStateToProps = (
   state: RootState,
   { component: Component, ...props }: NavLinkRootProps,
 ): NavLinkRootStateProps => {
+  const { startsWith } = props;
+
+  const activeNamespace = getActiveNamespace(state);
+  const location = stripNS(state.UI.get('location'));
   return {
-    activeNamespace: getActiveNamespace(state),
-    isActive: Component.isActive(
-      props,
-      stripNS(state.UI.get('location')),
-      getActiveNamespace(state),
-    ),
+    activeNamespace,
+    isActive:
+      startsWith?.some((path) => location.startsWith(path)) ||
+      Component.isActive(props, location, activeNamespace),
   };
 };