Fix toggling performance filters on and off again does not restore sectioned "all models" view (#2189)

* fix default filters logic

Signed-off-by: Philip Colares Carneiro <philip.colares@gmail.com>

* add changes requested to isolate mathod

Signed-off-by: Philip Colares Carneiro <philip.colares@gmail.com>

---------

Signed-off-by: Philip Colares Carneiro <philip.colares@gmail.com>

Author: Philip-Carneiro

clients/ui/frontend/src/app/hooks/modelCatalog/useHasVisibleFiltersApplied.ts

@@ -0,0 +1,16 @@
+import React from 'react';
+import { ModelCatalogContext } from '~/app/context/modelCatalog/ModelCatalogContext';
+import { hasFiltersApplied } from '~/app/pages/modelCatalog/utils/modelCatalogUtils';
+import { BASIC_FILTER_KEYS } from '~/concepts/modelCatalog/const';
+
+export const useHasVisibleFiltersApplied = (): boolean => {
+  const { filterData, performanceViewEnabled } = React.useContext(ModelCatalogContext);
+
+  return React.useMemo(
+    () =>
+      performanceViewEnabled
+        ? hasFiltersApplied(filterData)
+        : hasFiltersApplied(filterData, BASIC_FILTER_KEYS),
+    [filterData, performanceViewEnabled],
+  );
+};

clients/ui/frontend/src/app/pages/modelCatalog/screens/ModelCatalog.tsx

@@ -4,17 +4,16 @@ import { ApplicationsPage, ProjectObjectType, TitleWithIcon } from 'mod-arch-sha
 import ScrollViewOnMount from '~/app/shared/components/ScrollViewOnMount';
 import ModelCatalogFilters from '~/app/pages/modelCatalog/components/ModelCatalogFilters';
 import { ModelCatalogContext } from '~/app/context/modelCatalog/ModelCatalogContext';
-import { hasFiltersApplied } from '~/app/pages/modelCatalog/utils/modelCatalogUtils';
 import { CategoryName } from '~/app/modelCatalogTypes';
+import { useHasVisibleFiltersApplied } from '~/app/hooks/modelCatalog/useHasVisibleFiltersApplied';
 import ModelCatalogSourceLabelSelectorNavigator from './ModelCatalogSourceLabelSelectorNavigator';
 import ModelCatalogAllModelsView from './ModelCatalogAllModelsView';
 import ModelCatalogGalleryView from './ModelCatalogGalleryView';
 
 const ModelCatalog: React.FC = () => {
   const [searchTerm, setSearchTerm] = React.useState('');
-  const { selectedSourceLabel, filterData, clearAllFilters } =
-    React.useContext(ModelCatalogContext);
-  const filtersApplied = hasFiltersApplied(filterData);
+  const { selectedSourceLabel, clearAllFilters } = React.useContext(ModelCatalogContext);
+  const filtersApplied = useHasVisibleFiltersApplied();
   const isAllModelsView =
     selectedSourceLabel === CategoryName.allModels && !searchTerm && !filtersApplied;
 

clients/ui/frontend/src/app/pages/modelCatalog/screens/ModelCatalogGalleryView.tsx

@@ -13,6 +13,7 @@ import { ChartBarIcon, SearchIcon } from '@patternfly/react-icons';
 import React from 'react';
 import { ModelCatalogContext } from '~/app/context/modelCatalog/ModelCatalogContext';
 import { useCatalogModelsBySources } from '~/app/hooks/modelCatalog/useCatalogModelsBySource';
+import { useHasVisibleFiltersApplied } from '~/app/hooks/modelCatalog/useHasVisibleFiltersApplied';
 import { CatalogModel, CategoryName, SourceLabel } from '~/app/modelCatalogTypes';
 import ModelCatalogCard from '~/app/pages/modelCatalog/components/ModelCatalogCard';
 import {
@@ -52,7 +53,7 @@ const ModelCatalogGalleryView: React.FC<ModelCatalogPageProps> = ({
     performanceViewEnabled,
     sortBy,
   } = React.useContext(ModelCatalogContext);
-  const filtersApplied = hasFiltersApplied(filterData);
+  const filtersApplied = useHasVisibleFiltersApplied();
 
   // When performance view is disabled, exclude performance filters from API queries
   // Memoize to prevent infinite re-fetching