feat: Hide visible sections/subsections on namespace filter

kubeshop · Aug 26, 2021 · 3f3d624 · 3f3d624
1 parent 364d2cb
commit 3f3d624
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 20 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/organisms/NavigatorPane/components/ResourcesSection.tsx b/src/components/organisms/NavigatorPane/components/ResourcesSection.tsx
@@ -20,6 +20,12 @@ import Section from './Section';
 
 import {ALL_NAMESPACES} from '../constants';
 
+const filterByNameSpace = (resource: K8sResource, namespace: string): boolean => {
+  return (
+    namespace === ALL_NAMESPACES || resource.namespace === namespace || (namespace === 'default' && !resource.namespace)
+  );
+};
+
 const ResourcesSection = () => {
   const dispatch = useAppDispatch();
   const appConfig = useAppSelector(state => state.config);
@@ -78,7 +84,7 @@ const ResourcesSection = () => {
     return (
       item.kind === subsection.kindSelector &&
       micromatch.isMatch(item.version, subsection.apiVersionSelector) &&
-      (namespace === ALL_NAMESPACES || item.namespace === namespace || (namespace === 'default' && !item.namespace)) &&
+      filterByNameSpace(item, namespace) &&
       Object.values(resourceMap).length > 0
     );
   }
@@ -93,7 +99,10 @@ const ResourcesSection = () => {
   function shouldSubsectionBeVisible(subsection: NavigatorSubSection) {
     return (
       activeResources.length === 0 ||
-      (activeResources.length > 0 && activeResources.some(resource => resource.kind === subsection.kindSelector))
+      (activeResources.length > 0 &&
+        activeResources.some(
+          resource => resource.kind === subsection.kindSelector && filterByNameSpace(resource, namespace)
+        ))
     );
   }