Merge pull request #13085 from kyoto/monitoring-remove-silenced-by-li…

…st-checkboxes OCPBUGS-17504: Dev console: Remove checkboxes on Alert Details page Silenced By list
openshift · Aug 9, 2023 · 0f91327 · 0f91327
2 parents 4546dc5 + 7580514
commit 0f91327
Showing 1 changed file with 21 additions and 10 deletions.
diff --git a/frontend/public/components/monitoring/alerting.tsx b/frontend/public/components/monitoring/alerting.tsx
@@ -521,7 +521,12 @@ const SilenceMatchersList = ({ silence }) => (
   </div>
 );
 
-const SilenceTableRow: React.FC<RowProps<Silence>> = ({ obj }) => {
+type SilenceTableRowProps = {
+  obj: Silence;
+  showCheckbox?: boolean;
+};
+
+const SilenceTableRow: React.FC<SilenceTableRowProps> = ({ obj, showCheckbox }) => {
   const { t } = useTranslation();
 
   const { createdBy, endsAt, firingAlerts, id, name, startsAt } = obj;
@@ -548,14 +553,16 @@ const SilenceTableRow: React.FC<RowProps<Silence>> = ({ obj }) => {
 
   return (
     <>
-      <td className={tableSilenceClasses[0]}>
-        <Checkbox
-          id={id}
-          isChecked={selectedSilences.has(id)}
-          isDisabled={state === SilenceStates.Expired}
-          onChange={onCheckboxChange}
-        />
-      </td>
+      {showCheckbox && (
+        <td className={tableSilenceClasses[0]}>
+          <Checkbox
+            id={id}
+            isChecked={selectedSilences.has(id)}
+            isDisabled={state === SilenceStates.Expired}
+            onChange={onCheckboxChange}
+          />
+        </td>
+      )}
       <td className={tableSilenceClasses[1]}>
         <div className="co-resource-item">
           <MonitoringResourceIcon resource={SilenceResource} />
@@ -599,6 +606,10 @@ const SilenceTableRow: React.FC<RowProps<Silence>> = ({ obj }) => {
   );
 };
 
+const SilenceTableRowWithCheckbox: React.FC<RowProps<Silence>> = ({ obj }) => (
+  <SilenceTableRow showCheckbox={true} obj={obj} />
+);
+
 export const alertMessageResources: {
   [labelName: string]: { kind: string; namespaced?: boolean };
 } = {
@@ -2254,7 +2265,7 @@ const SilencesPage_: React.FC<{}> = () => {
                 data={filteredData ?? []}
                 loaded={loaded}
                 loadError={loadError}
-                Row={SilenceTableRow}
+                Row={SilenceTableRowWithCheckbox}
                 unfilteredData={data}
               />
             </div>