From 58b102b921f5890bcb90caa571faedf52cfb86f2 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Thu, 26 Jun 2025 09:09:41 +0800
Subject: [PATCH] fix status page

---
 client/src/Pages/StatusPage/Create/index.jsx |  2 +-
 client/src/Pages/StatusPage/Status/index.jsx |  2 +-
 client/src/locales/en.json                   |  3 ++
 server/db/models/Monitor.js                  |  5 +++
 server/db/mongo/modules/statusPageModule.js  | 39 ++++++++++++++++++++
 5 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/client/src/Pages/StatusPage/Create/index.jsx b/client/src/Pages/StatusPage/Create/index.jsx
index 63c248786..b682fb16a 100644
--- a/client/src/Pages/StatusPage/Create/index.jsx
+++ b/client/src/Pages/StatusPage/Create/index.jsx
@@ -246,7 +246,7 @@ const CreateStatusPage = () => {
 					color="accent"
 					onClick={handleSubmit}
 				>
-					{t("settingsSave")}
+					{t("statusPageCreate.buttonSave")}
 				</Button>
 			</Stack>
 		</Stack>
diff --git a/client/src/Pages/StatusPage/Status/index.jsx b/client/src/Pages/StatusPage/Status/index.jsx
index 45822f6c6..0d4ed61f2 100644
--- a/client/src/Pages/StatusPage/Status/index.jsx
+++ b/client/src/Pages/StatusPage/Status/index.jsx
@@ -62,7 +62,7 @@ const PublicStatus = () => {
 		return <SkeletonLayout />;
 	}
 
-	if (monitors.length === 0) {
+	if (monitors?.length === 0) {
 		return (
 			<GenericFallback>
 				<Typography
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index fe4b1fa55..bf025667c 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -835,5 +835,8 @@
 			"selectEnabled": "Enabled",
 			"title": "Monitor IP/URL on Status Page"
 		}
+	},
+	"statusPageCreate": {
+		"buttonSave": "Save"
 	}
 }
diff --git a/server/db/models/Monitor.js b/server/db/models/Monitor.js
index 38aeff0c3..c71ea5f18 100755
--- a/server/db/models/Monitor.js
+++ b/server/db/models/Monitor.js
@@ -147,6 +147,7 @@ MonitorSchema.pre("findOneAndDelete", async function (next) {
 MonitorSchema.pre("deleteMany", async function (next) {
 	const filter = this.getFilter();
 	const monitors = await this.model.find(filter).select(["_id", "type"]).lean();
+
 	for (const monitor of monitors) {
 		if (monitor.type === "pagespeed") {
 			await PageSpeedCheck.deleteMany({ monitorId: monitor._id });
@@ -155,6 +156,10 @@ MonitorSchema.pre("deleteMany", async function (next) {
 		} else {
 			await Check.deleteMany({ monitorId: monitor._id });
 		}
+		await StatusPage.updateMany(
+			{ monitors: monitor._id },
+			{ $pull: { monitors: monitor._id } }
+		);
 		await MonitorStats.deleteMany({ monitorId: monitor._id.toString() });
 	}
 	next();
diff --git a/server/db/mongo/modules/statusPageModule.js b/server/db/mongo/modules/statusPageModule.js
index f0f2fa762..8a682d567 100755
--- a/server/db/mongo/modules/statusPageModule.js
+++ b/server/db/mongo/modules/statusPageModule.js
@@ -90,6 +90,45 @@ const getStatusPage = async (url) => {
 	const stringService = ServiceRegistry.get(StringService.SERVICE_NAME);
 
 	try {
+		const preliminaryStatusPage = await StatusPage.findOne({ url });
+		if (!preliminaryStatusPage) {
+			const error = new Error(stringService.statusPageNotFound);
+			error.status = 404;
+			throw error;
+		}
+
+		if (!preliminaryStatusPage.monitors || preliminaryStatusPage.monitors.length === 0) {
+			const {
+				_id,
+				color,
+				companyName,
+				isPublished,
+				logo,
+				originalMonitors,
+				showCharts,
+				showUptimePercentage,
+				timezone,
+				showAdminLoginLink,
+				url,
+			} = preliminaryStatusPage;
+			return {
+				statusPage: {
+					_id,
+					color,
+					companyName,
+					isPublished,
+					logo,
+					originalMonitors,
+					showCharts,
+					showUptimePercentage,
+					timezone,
+					showAdminLoginLink,
+					url,
+				},
+				monitors: [],
+			};
+		}
+
 		const statusPageQuery = await StatusPage.aggregate([
 			{ $match: { url: url } },
 			{