improve the code after rebase

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

Author: Philip-Carneiro

clients/ui/frontend/src/app/pages/mcpCatalog/screens/McpCatalog.tsx

@@ -30,7 +30,7 @@ const McpCatalog: React.FC = () => {
   const filtersApplied = hasMcpFiltersApplied(filters, searchQuery);
   const isAllServersView = selectedSourceLabel === undefined && !filtersApplied;
 
-  const { isSingleCategory, hasNoCategories } = useEffectiveCategories(
+  const { effectiveActiveCategories, isSingleCategory, hasNoCategories } = useEffectiveCategories(
     catalogSources,
     catalogLabels,
     emptyCategoryLabels,
@@ -92,6 +92,9 @@ const McpCatalog: React.FC = () => {
                     <McpCatalogGalleryView
                       handleFilterReset={handleResetAllFilters}
                       isSingleCategory={isSingleCategory}
+                      singleCategoryLabel={
+                        isSingleCategory ? effectiveActiveCategories[0] : undefined
+                      }
                     />
                   )}
                 </PageSection>

clients/ui/frontend/src/app/pages/mcpCatalog/screens/McpCatalogGalleryView.tsx

@@ -32,11 +32,13 @@ const PAGE_SIZE = 10;
 type McpCatalogGalleryViewProps = {
   handleFilterReset: () => void;
   isSingleCategory?: boolean;
+  singleCategoryLabel?: string;
 };
 
 const McpCatalogGalleryView: React.FC<McpCatalogGalleryViewProps> = ({
   handleFilterReset,
   isSingleCategory = false,
+  singleCategoryLabel,
 }) => {
   const {
     mcpApiState,
@@ -98,16 +100,17 @@ const McpCatalogGalleryView: React.FC<McpCatalogGalleryViewProps> = ({
     );
   }
 
+  const effectiveCategoryLabel = singleCategoryLabel || selectedSourceLabel || '';
   const categoryTitle = isSingleCategory
     ? getLabelDisplayName(
-        selectedSourceLabel || '',
+        effectiveCategoryLabel,
         catalogLabels,
         OTHER_MCP_SERVERS_DISPLAY_NAME,
         'servers',
       )
     : undefined;
   const categoryDescription = isSingleCategory
-    ? getLabelDescription(selectedSourceLabel || '', catalogLabels)
+    ? getLabelDescription(effectiveCategoryLabel, catalogLabels)
     : undefined;
 
   return (

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

@@ -26,7 +26,7 @@ const ModelCatalog: React.FC = () => {
   } = React.useContext(ModelCatalogContext);
   const filtersApplied = useHasVisibleFiltersApplied();
 
-  const { isSingleCategory, hasNoCategories } = useEffectiveCategories(
+  const { effectiveActiveCategories, isSingleCategory, hasNoCategories } = useEffectiveCategories(
     catalogSources,
     catalogLabels,
     emptyCategoryLabels,
@@ -88,7 +88,9 @@ const ModelCatalog: React.FC = () => {
                     searchTerm={searchTerm}
                     handleFilterReset={handleFilterReset}
                     isSingleCategory={isSingleCategory}
-                    singleCategoryLabel={isSingleCategory ? activeCategories[0] : undefined}
+                    singleCategoryLabel={
+                      isSingleCategory ? effectiveActiveCategories[0] : undefined
+                    }
                   />
                 )}
               </PageSection>