Merge branches 'w/128.0/bugfix/alert-filtering' and 'q/4334/127.0/bugfix/alert-filtering' into tmp/octopus/q/128.0

Author: bert-e

CHANGELOG.md

@@ -125,6 +125,9 @@
 - Following to Alert Manager Bump the test email feature from the
   UI wasn't working correctly.
   (PR[#4322](https://github.com/scality/metalk8s/pull/4322))
+- Alert filtering in the UI when both a critical and warning alert
+  wasn't working properly.
+  (PR[#4334](https://github.com/scality/metalk8s/pull/4334)) 
 
 ## Release 127.0.1
 

shell-ui/src/alerts/services/alertUtils.ts

@@ -56,24 +56,20 @@ const isSameAlertWithDiffSeverity = (
   or where we resolve the promise with `react-query` 
   */
 export const removeWarningAlerts = (alerts: Alert[]): Alert[] => {
-  const len = alerts.length;
-  const removeIndex = [];
-
-  for (let i = 0; i < len - 1; i++) {
-    for (let j = i + 1; j < len; j++) {
-      if (isSameAlertWithDiffSeverity(alerts[i].labels, alerts[j].labels)) {
-        if (alerts[i].labels.severity === STATUS_WARNING) {
-          removeIndex.push(i);
-        } else if (alerts[j].labels.severity === STATUS_WARNING) {
-          removeIndex.push(j);
-        }
-      }
+  const criticalAlerts = alerts.filter((alert) => {
+    if (alert.severity === STATUS_CRITICAL) {
+      return true;
     }
-  }
-
-  let removedWarningAlerts = [...alerts];
-  removeIndex.forEach((index) => removedWarningAlerts.splice(index, 1));
-  return removedWarningAlerts;
+    // check if there is a critical alert with the same labels
+    const isSameAlert = alerts.find((a) => {
+      return (
+        a.severity === STATUS_CRITICAL &&
+        isSameAlertWithDiffSeverity(a.labels, alert.labels)
+      );
+    });
+    return !isSameAlert;
+  });
+  return criticalAlerts;
 };
 // Sort the alerts base on the `severity`
 export const sortAlerts = (alerts: Alert[]): Alert[] => {