From 156b6a4670d30d25cfe34dffa54fee899a46f9a2 Mon Sep 17 00:00:00 2001
From: Thuan Vo <thvo@redhat.com>
Date: Fri, 2 Jun 2023 03:10:20 -0400
Subject: [PATCH] fix(notification): fix potential infinite effect

---
 src/app/Notifications/NotificationCenter.tsx | 27 +++++---------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/app/Notifications/NotificationCenter.tsx b/src/app/Notifications/NotificationCenter.tsx
index 2cb827b43..cc76c2118 100644
--- a/src/app/Notifications/NotificationCenter.tsx
+++ b/src/app/Notifications/NotificationCenter.tsx
@@ -59,6 +59,10 @@ import * as React from 'react';
 import { combineLatest } from 'rxjs';
 import { Notification, NotificationsContext } from './Notifications';
 
+const countUnreadNotifications = (notifications: Notification[]) => {
+  return notifications.filter((n) => !n.read).length;
+};
+
 export interface NotificationCenterProps {
   onClose: () => void;
 }
@@ -77,17 +81,12 @@ export const NotificationCenter: React.FC<NotificationCenterProps> = (props) =>
 
   const [totalUnreadNotificationsCount, setTotalUnreadNotificationsCount] = React.useState(0);
   const [isHeaderDropdownOpen, setHeaderDropdownOpen] = React.useState(false);
-  const PROBLEMS_CATEGORY_IDX = 2;
   const [drawerCategories, setDrawerCategories] = React.useState([
     { title: 'Completed Actions', isExpanded: true, notifications: [] as Notification[], unreadCount: 0 },
     { title: 'Cryostat Status', isExpanded: false, notifications: [] as Notification[], unreadCount: 0 },
-    { title: 'Problems', isExpanded: false, notifications: [] as Notification[], unreadCount: 0 },
+    { title: 'Problems', isExpanded: true, notifications: [] as Notification[], unreadCount: 0 },
   ] as NotificationDrawerCategory[]);
 
-  const countUnreadNotifications = (notifications: Notification[]) => {
-    return notifications.filter((n) => !n.read).length;
-  };
-
   React.useEffect(() => {
     addSubscription(
       combineLatest([
@@ -104,7 +103,7 @@ export const NotificationCenter: React.FC<NotificationCenterProps> = (props) =>
         });
       })
     );
-  }, [addSubscription, context, context.notifications, setDrawerCategories]);
+  }, [addSubscription, context, setDrawerCategories]);
 
   React.useEffect(() => {
     addSubscription(
@@ -130,20 +129,6 @@ export const NotificationCenter: React.FC<NotificationCenterProps> = (props) =>
     [setDrawerCategories]
   );
 
-  // Expands the Problems tab when unread errors/warnings are present
-  React.useEffect(() => {
-    if (drawerCategories[PROBLEMS_CATEGORY_IDX].unreadCount === 0) {
-      return;
-    }
-
-    setDrawerCategories((drawerCategories) => {
-      return drawerCategories.map((category: NotificationDrawerCategory, idx) => {
-        category.isExpanded = idx === PROBLEMS_CATEGORY_IDX;
-        return category;
-      });
-    });
-  }, [setDrawerCategories, drawerCategories]);
-
   const handleMarkAllRead = React.useCallback(() => {
     context.markAllRead();
   }, [context]);