feat: count all descendant visible section items

kubeshop · Oct 27, 2021 · 8220c8a · 8220c8a
1 parent 554a404
commit 8220c8a
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 7 deletions.
diff --git a/src/components/organisms/NavigatorPane/SectionRenderer/SectionRenderer.tsx b/src/components/organisms/NavigatorPane/SectionRenderer/SectionRenderer.tsx
@@ -146,7 +146,7 @@ function SectionRenderer<ItemType, ScopeType>(props: SectionRendererProps<ItemTy
         isSectionInitialized={Boolean(sectionInstance?.isInitialized)}
         isSectionVisible={Boolean(sectionInstance?.isVisible)}
         level={level}
-        itemsLength={sectionInstance?.visibleItemIds.length || 0}
+        itemsLength={sectionInstance?.visibleDescendantItemsCount || 0}
         expandSection={expandSection}
         collapseSection={collapseSection}
       />

diff --git a/src/models/navigator.ts b/src/models/navigator.ts
@@ -94,6 +94,7 @@ export interface SectionInstance {
   visibleGroupIds: string[];
   visibleChildSectionIds?: string[];
   visibleDescendantSectionIds?: string[];
+  visibleDescendantItemsCount?: number;
   isLoading: boolean;
   isVisible: boolean;
   isInitialized: boolean;

diff --git a/src/navsections/sectionBlueprintMiddleware.ts b/src/navsections/sectionBlueprintMiddleware.ts
@@ -38,23 +38,33 @@ const hasNavigatorInstanceStateChanged = (
 function computeSectionVisibility(
   sectionInstance: SectionInstance,
   sectionInstanceMap: Record<string, SectionInstance>
-): [boolean, string[] | undefined] {
+): [boolean, string[] | undefined, number | undefined] {
   const sectionBlueprint = sectionBlueprintMap.getById(sectionInstance.id);
+  let visibleDescendantItemsCount = 0;
+
   if (sectionBlueprint.childSectionIds && sectionBlueprint.childSectionIds.length > 0) {
     const childSectionVisibilityMap: Record<string, boolean> = {};
+
     sectionBlueprint.childSectionIds.forEach(childSectionId => {
       const childSectionInstance = sectionInstanceMap[childSectionId];
-      const [isChildSectionVisible, visibleDescendantSectionIdsOfChildSection] = computeSectionVisibility(
-        childSectionInstance,
-        sectionInstanceMap
-      );
+      const [
+        isChildSectionVisible,
+        visibleDescendantSectionIdsOfChildSection,
+        visibleDescendantItemsCountOfChildSection,
+      ] = computeSectionVisibility(childSectionInstance, sectionInstanceMap);
+
       if (visibleDescendantSectionIdsOfChildSection) {
         if (sectionInstance.visibleDescendantSectionIds) {
           sectionInstance.visibleDescendantSectionIds.push(...visibleDescendantSectionIdsOfChildSection);
         } else {
           sectionInstance.visibleDescendantSectionIds = [...visibleDescendantSectionIdsOfChildSection];
         }
       }
+
+      if (visibleDescendantItemsCountOfChildSection) {
+        visibleDescendantItemsCount += visibleDescendantItemsCountOfChildSection;
+      }
+
       childSectionVisibilityMap[childSectionId] = isChildSectionVisible;
       if (isChildSectionVisible) {
         if (sectionInstance.visibleChildSectionIds) {
@@ -64,6 +74,7 @@ function computeSectionVisibility(
         }
       }
     });
+
     if (sectionInstance.visibleChildSectionIds) {
       if (sectionInstance.visibleDescendantSectionIds) {
         sectionInstance.visibleDescendantSectionIds.push(...sectionInstance.visibleChildSectionIds);
@@ -72,10 +83,21 @@ function computeSectionVisibility(
         sectionInstance.visibleDescendantSectionIds = [...sectionInstance.visibleChildSectionIds];
       }
     }
+
     sectionInstance.isVisible =
       sectionInstance.isVisible || Object.values(childSectionVisibilityMap).some(isVisible => isVisible === true);
   }
-  return [sectionInstance.isVisible, sectionInstance.visibleDescendantSectionIds];
+
+  if (sectionInstance.visibleItemIds) {
+    visibleDescendantItemsCount += sectionInstance.visibleItemIds.length;
+  }
+
+  sectionInstance.visibleDescendantItemsCount = visibleDescendantItemsCount;
+  return [
+    sectionInstance.isVisible,
+    sectionInstance.visibleDescendantSectionIds,
+    sectionInstance.visibleDescendantItemsCount,
+  ];
 }
 /**
  * Build the section and item instances based on the registered section blueprints