feat: Sort disabled items to end of catalog (#2142)

redhat-cop · Sep 17, 2024 · 3573c8e · 3573c8e
1 parent 6697939
commit 3573c8e
Showing 1 changed file with 19 additions and 7 deletions.
diff --git a/catalog/ui/src/app/Catalog/Catalog.tsx b/catalog/ui/src/app/Catalog/Catalog.tsx
@@ -53,6 +53,8 @@ import {
   HIDDEN_LABELS,
   CUSTOM_LABELS,
   setLastFilter,
+  getIsDisabled,
+  getStatus,
 } from './catalog-utils';
 import CatalogCategorySelector from './CatalogCategorySelector';
 import CatalogInterfaceDescription from './CatalogInterfaceDescription';
@@ -403,13 +405,23 @@ const Catalog: React.FC<{ userHasRequiredPropertiesToAccess: boolean }> = ({ use
     return [catalogItemsFuse, catalogItemsCpy];
   }, [catalogItems, selectedCategory, selectedLabels, compareCatalogItems, selectedAdminFilter]);
 
-  const catalogItemsResult = useMemo(
-    () =>
-      searchString
-        ? _catalogItems.search("'" + searchString.split(' ').join(" '")).map((x) => x.item)
-        : _catalogItemsCpy,
-    [searchString, _catalogItems, _catalogItemsCpy]
-  );
+  const catalogItemsResult = useMemo(() => {
+    const items = searchString
+      ? _catalogItems.search("'" + searchString.split(' ').join(" '")).map((x) => x.item)
+      : _catalogItemsCpy;
+    const operationalItems = [];
+    const disabledItems = [];
+    for (let catalogItem of items) {
+      const isDisabled = getIsDisabled(catalogItem);
+      const { code: status } = getStatus(catalogItem);
+      if (status === 'under-maintenance' || isDisabled) {
+        disabledItems.push(catalogItem);
+      } else {
+        operationalItems.push(catalogItem);
+      }
+    }
+    return operationalItems.concat(disabledItems);
+  }, [searchString, _catalogItems, _catalogItemsCpy]);
 
   const openCatalogItem =
     openCatalogItemName && openCatalogItemNamespaceName