From 339dd6f6fb15ace64ee0fd7a4a082eb37feff8cc Mon Sep 17 00:00:00 2001
From: Aleix Casanovas <acasanov@redhat.com>
Date: Thu, 19 Sep 2024 18:50:24 +0200
Subject: [PATCH 1/2] feat: Remove admin selector

---
 catalog/ui/src/app/Catalog/AdminSelector.tsx | 88 --------------------
 catalog/ui/src/app/Catalog/Catalog.tsx       |  2 -
 2 files changed, 90 deletions(-)
 delete mode 100644 catalog/ui/src/app/Catalog/AdminSelector.tsx

diff --git a/catalog/ui/src/app/Catalog/AdminSelector.tsx b/catalog/ui/src/app/Catalog/AdminSelector.tsx
deleted file mode 100644
index d20fcede7..000000000
--- a/catalog/ui/src/app/Catalog/AdminSelector.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-import React, { useState } from 'react';
-import { Button, Checkbox, ExpandableSection, Form, FormGroup, Tooltip } from '@patternfly/react-core';
-import { FilterAltIcon } from '@patternfly/react-icons';
-
-import './catalog-label-selector.css';
-
-const CatalogCategorySelector: React.FC<{
-  onSelect: (statuses: string[]) => void;
-  selected: string[];
-}> = ({ onSelect, selected }) => {
-  const [isExpanded, setIsExpanded] = useState(false);
-  function handleOnChange(key: string) {
-    if (selected.includes(key)) {
-      onSelect(selected.filter((s) => s !== key));
-    } else {
-      onSelect([...selected, key]);
-    }
-  }
-  return (
-    <Form className="catalog-label-selector">
-      <ExpandableSection
-        key="catalog-admin-selector"
-        isExpanded={isExpanded}
-        toggleContent={
-          <div style={{ display: 'flex', flexDirection: 'row' }}>
-            <p>Admin</p>
-            {selected.length > 0 ? (
-              <Tooltip content={<div>Clear filter</div>}>
-                <Button
-                  variant="plain"
-                  component="span"
-                  style={{ marginRight: 0, marginLeft: 'auto', padding: 0 }}
-                  onClick={(ev) => {
-                    ev.stopPropagation();
-                    onSelect([]);
-                  }}
-                >
-                  <FilterAltIcon />
-                </Button>
-              </Tooltip>
-            ) : null}
-          </div>
-        }
-        onToggle={(_event, expanded: boolean) => setIsExpanded(expanded)}
-      >
-        <FormGroup>
-          <Checkbox
-            id="operational"
-            key="operational"
-            label="Operational"
-            isChecked={selected.includes('operational')}
-            onChange={() => handleOnChange('operational')}
-          />
-          <Checkbox
-            id="degraded-performance"
-            key="degraded-performance"
-            label="Degraded performance"
-            isChecked={selected.includes('degraded-performance')}
-            onChange={() => handleOnChange('degraded-performance')}
-          />
-          <Checkbox
-            id="partial-outage"
-            key="partial-outage"
-            label="Partial outage"
-            isChecked={selected.includes('partial-outage')}
-            onChange={() => handleOnChange('partial-outage')}
-          />
-          <Checkbox
-            id="major-outage"
-            key="major-outage"
-            label="Major outage"
-            isChecked={selected.includes('major-outage')}
-            onChange={() => handleOnChange('major-outage')}
-          />
-          <Checkbox
-            id="under-maintenance"
-            key="under-maintenance"
-            label="Under maintenance"
-            isChecked={selected.includes('under-maintenance')}
-            onChange={() => handleOnChange('under-maintenance')}
-          />
-        </FormGroup>
-      </ExpandableSection>
-    </Form>
-  );
-};
-
-export default CatalogCategorySelector;
diff --git a/catalog/ui/src/app/Catalog/Catalog.tsx b/catalog/ui/src/app/Catalog/Catalog.tsx
index 5bac0dcb1..0a4525440 100644
--- 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">

From e50c2dff6cdff7c420406d9bbf45b3e2fe074de1 Mon Sep 17 00:00:00 2001
From: Aleix Casanovas <acasanov@redhat.com>
Date: Thu, 19 Sep 2024 19:02:20 +0200
Subject: [PATCH 2/2] fixup! feat: Remove admin selector

---
 catalog/ui/src/app/Admin/CatalogIncidentsAlertList.tsx | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/catalog/ui/src/app/Admin/CatalogIncidentsAlertList.tsx b/catalog/ui/src/app/Admin/CatalogIncidentsAlertList.tsx
index 4bf4590b9..5e650b378 100644
--- 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]);