fix: Improve monitor status retrieval logic in Overview component

OneUptime · Oct 1, 2024 · 0733c15 · 0733c15
1 parent 32fa57c
commit 0733c15
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/StatusPage/src/Pages/Overview/Overview.tsx b/StatusPage/src/Pages/Overview/Overview.tsx
@@ -725,13 +725,27 @@ const Overview: FunctionComponent<PageComponentProps> = (
       getResourcesInGroup(group);
 
     for (const resource of resourcesInGroup) {
-      let currentMonitorStatus: MonitorStatus | undefined =
-        monitorStatuses.find((status: MonitorStatus) => {
+      let currentMonitorStatus: MonitorStatus | undefined = undefined;
+
+      if (resource.monitor) {
+        currentMonitorStatus = monitorStatuses.find((status: MonitorStatus) => {
           return (
             status._id?.toString() ===
             resource.monitor?.currentMonitorStatusId?.toString()
           );
         });
+      }
+
+      if (resource.monitorGroupId) {
+        currentMonitorStatus = monitorStatuses.find((status: MonitorStatus) => {
+          return (
+            status._id?.toString() ===
+            monitorGroupCurrentStatuses[
+              resource.monitorGroupId?.toString() || ""
+            ]?.toString()
+          );
+        });
+      }
 
       if (!currentMonitorStatus) {
         currentMonitorStatus = currentStatus;