fix catalog filter group getting removed on keyword change

openshift · May 19, 2022 · 62e0e60 · 62e0e60
1 parent e799218
commit 62e0e60
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 18 deletions.
diff --git a/frontend/packages/console-shared/src/components/catalog/catalog-view/CatalogFilters.tsx b/frontend/packages/console-shared/src/components/catalog/catalog-view/CatalogFilters.tsx
@@ -19,7 +19,6 @@ type CatalogFiltersProps = {
   filterGroupCounts: CatalogFilterCounts;
   filterGroupMap: { [key: string]: CatalogItemAttribute };
   filterGroupsShowAll: { [key: string]: boolean };
-  catalogItemsCount: number;
   onFilterChange: (filterType: string, id: string, value: boolean) => void;
   onShowAllToggle: (groupName: string) => void;
 };
@@ -29,7 +28,6 @@ const CatalogFilters: React.FC<CatalogFiltersProps> = ({
   filterGroupCounts,
   filterGroupMap,
   filterGroupsShowAll,
-  catalogItemsCount,
   onFilterChange,
   onShowAllToggle,
 }) => {
@@ -40,19 +38,6 @@ const CatalogFilters: React.FC<CatalogFiltersProps> = ({
       return acc;
     }, {});
 
-  const getFilterGroup = (filterGroup: CatalogFilter, groupName: string): CatalogFilter => {
-    const filterGroupKeys = Object.keys(filterGroup);
-
-    return filterGroupKeys.length > 0
-      ? _.omitBy(filterGroup, (filter, filterName) => {
-          const { label, active } = filter;
-          const count = filterGroupCounts[groupName]?.[filterName] ?? 0;
-          const showFilter = label && (active || (count > 0 && catalogItemsCount !== count));
-          return !showFilter;
-        })
-      : {};
-  };
-
   const renderFilterItem = (filter: CatalogFilterItem, filterName: string, groupName: string) => {
     const { label, active } = filter;
     const count = filterGroupCounts[groupName]?.[filterName] ?? 0;
@@ -75,8 +60,7 @@ const CatalogFilters: React.FC<CatalogFiltersProps> = ({
   };
 
   const renderFilterGroup = (filterGroup: CatalogFilter, groupName: string) => {
-    const fg = getFilterGroup(filterGroup, groupName);
-    const filterGroupKeys = Object.keys(fg);
+    const filterGroupKeys = Object.keys(filterGroup);
     if (filterGroupKeys.length > 0) {
       const sortedFilterGroup = filterGroupKeys.sort().reduce<CatalogFilter>((acc, filterName) => {
         acc[filterName] = filterGroup[filterName];

diff --git a/frontend/packages/console-shared/src/components/catalog/catalog-view/CatalogView.tsx b/frontend/packages/console-shared/src/components/catalog/catalog-view/CatalogView.tsx
@@ -246,7 +246,6 @@ const CatalogView: React.FC<CatalogViewProps> = ({
               filterGroupCounts={filterGroupCounts}
               filterGroupMap={filterGroupMap}
               filterGroupsShowAll={filterGroupsShowAll}
-              catalogItemsCount={items.length}
               onShowAllToggle={handleShowAllToggle}
               onFilterChange={handleFilterChange}
             />