From 780ed8147be40630b04cc48eec22d4a372449cd5 Mon Sep 17 00:00:00 2001
From: nikhil2004 <myemailnikhilsaxena@gmail.com>
Date: Tue, 22 Sep 2026 22:06:38 +0530
Subject: [PATCH] fix: resolve CORS issue on public status pages and handle UI
 errors

---
 .../Status/themes/shared/IncidentModal.tsx           | 12 +++++++++++-
 server/src/api/middleware/statusPagePublicApiPath.ts | 10 +++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/client/src/Pages/StatusPage/Status/themes/shared/IncidentModal.tsx b/client/src/Pages/StatusPage/Status/themes/shared/IncidentModal.tsx
index c96d947bf..a6a3e498f 100644
--- a/client/src/Pages/StatusPage/Status/themes/shared/IncidentModal.tsx
+++ b/client/src/Pages/StatusPage/Status/themes/shared/IncidentModal.tsx
@@ -38,7 +38,7 @@ export const IncidentModal = ({
 	const { t } = useTranslation();
 	const open = Boolean(monitorId && date);
 
-	const { data, isLoading } = useGet<{ incidents: Incident[] }>(
+	const { data, isLoading, error } = useGet<{ incidents: Incident[] }>(
 		open ? `/status-page/${url}/incidents/${monitorId}?date=${date}` : null,
 		{},
 		{ revalidateOnFocus: false }
@@ -68,6 +68,16 @@ export const IncidentModal = ({
 					<Typography mt={SPACING.SM}>
 						{t("pages.statusPages.monitorsList.incidents.loading")}
 					</Typography>
+				) : error ? (
+					<Typography
+						mt={SPACING.SM}
+						color="error"
+					>
+						{t(
+							"pages.statusPages.monitorsList.incidents.errorLoading",
+							"Failed to load incidents."
+						)}
+					</Typography>
 				) : data?.incidents && data.incidents.length > 0 ? (
 					<Stack
 						gap={SPACING.LG}
diff --git a/server/src/api/middleware/statusPagePublicApiPath.ts b/server/src/api/middleware/statusPagePublicApiPath.ts
index a4b5e42d1..b7e89f9af 100644
--- a/server/src/api/middleware/statusPagePublicApiPath.ts
+++ b/server/src/api/middleware/statusPagePublicApiPath.ts
@@ -16,7 +16,15 @@ export const isPublicStatusPageApiPath = (method: string, path: string): boolean
 		return true;
 	}
 
-	if (!slug || slug === "team" || slug.includes("/")) {
+	if (!slug || slug === "team") {
+		return false;
+	}
+
+	if (slug.includes("/")) {
+		const parts = slug.split("/");
+		if (parts.length === 3 && parts[1] === "incidents") {
+			return true;
+		}
 		return false;
 	}