From 0733c15363124751b945b2072d3bfdf88e051155 Mon Sep 17 00:00:00 2001
From: Simon Larsen <simonlarsen@oneuptime.com>
Date: Tue, 1 Oct 2024 16:50:39 +0100
Subject: [PATCH] fix: Improve monitor status retrieval logic in Overview
 component

---
 StatusPage/src/Pages/Overview/Overview.tsx | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/StatusPage/src/Pages/Overview/Overview.tsx b/StatusPage/src/Pages/Overview/Overview.tsx
index 0a35b1699cf..409283456f7 100644
--- 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;