feat: Remove admin selector (#2153)

* feat: Remove admin selector * fixup! feat: Remove admin selector
redhat-cop · Sep 19, 2024 · b21ee0c · b21ee0c
1 parent 9fe971a
commit b21ee0c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 93 deletions.
diff --git a/catalog/ui/src/app/Admin/CatalogIncidentsAlertList.tsx b/catalog/ui/src/app/Admin/CatalogIncidentsAlertList.tsx
@@ -30,9 +30,12 @@ const CatalogIncidentsAlertList: React.FC = () => {
  if (catalogItemsArr && catalogIncidents) {
  return catalogIncidents.items.map(i => {
  const ci = catalogItemsArr.find(c => c.metadata.labels?.['gpte.redhat.com/asset-uuid'] === i.asset_uuid && getStageFromK8sObject(c) === i.stage);
- ci.metadata.annotations[`${BABYLON_DOMAIN}/incident`] = JSON.stringify(i);
- return ci;
- });
+ if (ci) {
+ ci.metadata.annotations[`${BABYLON_DOMAIN}/incident`] = JSON.stringify(i);
+ return ci;
+ }
+ return null;
+ }).filter(Boolean);
  } 
  return [];
  }, [catalogItemsArr, catalogIncidents]);

diff --git a/catalog/ui/src/app/Catalog/AdminSelector.tsx b/catalog/ui/src/app/Catalog/AdminSelector.tsx
diff --git a/catalog/ui/src/app/Catalog/Catalog.tsx b/catalog/ui/src/app/Catalog/Catalog.tsx
@@ -63,7 +63,6 @@ import CatalogLabelSelector from './CatalogLabelSelector';
 import CatalogNamespaceSelect from './CatalogNamespaceSelect';
 import CatalogContent from './CatalogContent';
 import IncidentsBanner from '@app/components/IncidentsBanner';
-import AdminSelector from './AdminSelector';
 import useInterfaceConfig from '@app/utils/useInterfaceConfig';
 
 import './catalog.css';
@@ -558,7 +557,6 @@ const Catalog: React.FC<{ userHasRequiredPropertiesToAccess: boolean }> = ({ use
  onSelect={onSelectLabels}
  selected={selectedLabels}
  />
- {isAdmin ? <AdminSelector onSelect={onSelectAdminFilter} selected={selectedAdminFilter} /> : null}
  </SidebarPanel>
  <SidebarContent>
  <PageSection variant={PageSectionVariants.light} className="catalog__header">