From 7b164e4df536965623a6a007166712378762dd54 Mon Sep 17 00:00:00 2001 From: SkyKingPX Date: Thu, 16 Apr 2026 13:37:54 +0200 Subject: [PATCH] Make requested changes --- .../Status/Components/StatusBar.tsx | 39 +++++++++++++++---- client/src/locales/en.json | 9 +++-- 2 files changed, 37 insertions(+), 11 deletions(-) diff --git a/client/src/Pages/StatusPage/Status/Components/StatusBar.tsx b/client/src/Pages/StatusPage/Status/Components/StatusBar.tsx index e85eb97b1..3727669db 100644 --- a/client/src/Pages/StatusPage/Status/Components/StatusBar.tsx +++ b/client/src/Pages/StatusPage/Status/Components/StatusBar.tsx @@ -1,7 +1,7 @@ import { AlertTriangle, CircleCheck, - CircleX, + CircleX, Loader, PauseCircle, ShieldAlert, Wrench, @@ -14,11 +14,25 @@ import { useTheme } from "@mui/material"; import type { Theme } from "@mui/material"; import type { Monitor, MonitorStatus } from "@/Types/Monitor"; +interface StatusDisplay { + icon: JSX.Element; + msg?: string; + color?: string; +} + const getMonitorStatus = (monitors: Monitor[], theme: Theme, t: Function) => { - const monitorsStatus: Record = { + const monitorsStatus: StatusDisplay = { icon: , }; + // Handle empty monitors array + if (monitors.length === 0) { + monitorsStatus.msg = t("pages.statusPages.statusBar.noMonitors"); + monitorsStatus.color = theme.palette.warning.main; + monitorsStatus.icon = ; + return monitorsStatus; + } + const allOf = (...statuses: MonitorStatus[]) => monitors.every((m) => statuses.includes(m.status)); const someOf = (...statuses: MonitorStatus[]) => @@ -33,7 +47,7 @@ const getMonitorStatus = (monitors: Monitor[], theme: Theme, t: Function) => { monitorsStatus.icon = ; } else if (allOf("breached")) { monitorsStatus.msg = t("pages.statusPages.statusBar.allBreached"); - monitorsStatus.color = theme.palette.error.dark; + monitorsStatus.color = theme.palette.error.main; monitorsStatus.icon = ; } else if (allOf("maintenance")) { monitorsStatus.msg = t("pages.statusPages.statusBar.allMaintenance"); @@ -47,15 +61,19 @@ const getMonitorStatus = (monitors: Monitor[], theme: Theme, t: Function) => { monitorsStatus.msg = t("pages.statusPages.statusBar.allPaused"); monitorsStatus.color = theme.palette.warning.main; monitorsStatus.icon = ; + } else if (allOf("initializing")) { + monitorsStatus.msg = t("pages.statusPages.statusBar.allInitializing"); + monitorsStatus.color = theme.palette.warning.main; + monitorsStatus.icon = ; // Breached takes highest priority in mixed states } else if (someOf("breached") && someOf("down")) { monitorsStatus.msg = t("pages.statusPages.statusBar.breachedAndDown"); - monitorsStatus.color = theme.palette.error.dark; + monitorsStatus.color = theme.palette.error.main; monitorsStatus.icon = ; } else if (someOf("breached")) { monitorsStatus.msg = t("pages.statusPages.statusBar.breached"); - monitorsStatus.color = theme.palette.error.dark; + monitorsStatus.color = theme.palette.error.main; monitorsStatus.icon = ; // Maintenance combinations @@ -63,23 +81,28 @@ const getMonitorStatus = (monitors: Monitor[], theme: Theme, t: Function) => { monitorsStatus.msg = t("pages.statusPages.statusBar.maintenanceAndDown"); monitorsStatus.color = theme.palette.error.main; monitorsStatus.icon = ; - } else if (someOf("maintenance") && noneOf("down", "breached")) { + } else if (someOf("maintenance") && noneOf("down")) { monitorsStatus.msg = t("pages.statusPages.statusBar.maintenance"); monitorsStatus.color = theme.palette.warning.main; monitorsStatus.icon = ; // Degraded (some down, no maintenance/breached) - } else if (someOf("down") && noneOf("maintenance", "breached")) { + } else if (someOf("down")) { monitorsStatus.msg = t("pages.statusPages.statusBar.degraded"); monitorsStatus.color = theme.palette.warning.main; monitorsStatus.icon = ; // Some Paused - } else if (someOf("paused") && noneOf("down", "breached", "maintenance")) { + } else if (someOf("paused")) { monitorsStatus.msg = t("pages.statusPages.statusBar.partiallyPaused"); monitorsStatus.color = theme.palette.warning.main; monitorsStatus.icon = ; + // Initializing + } else if (someOf("initializing")) { + monitorsStatus.msg = t("pages.statusPages.statusBar.initializing"); + monitorsStatus.color = theme.palette.info.main; + monitorsStatus.icon = ; } else { monitorsStatus.msg = t("pages.statusPages.statusBar.unknown"); monitorsStatus.color = theme.palette.warning.main; diff --git a/client/src/locales/en.json b/client/src/locales/en.json index 69d316cd7..faf7516bf 100644 --- a/client/src/locales/en.json +++ b/client/src/locales/en.json @@ -1208,17 +1208,20 @@ } }, "statusBar": { - "allDown": "All systems are down", - "allMaintenance": "All systems are under maintenance", "allUp": "All systems operational", - "allPaused": "All systems are paused", "allBreached": "All systems have been breached", + "allMaintenance": "All systems are under maintenance", + "allDown": "All systems are down", + "allPaused": "All systems are paused", + "allInitializing": "All systems are initializing", "breachedAndDown": "Some systems are breached and down", "breached": "Some systems have been breached", "degraded": "Some systems are experiencing issues", "maintenanceAndDown": "Some systems are down during maintenance", "maintenance": "Some systems are under maintenance", "partiallyPaused": "Some systems are paused", + "initializing": "Some systems are initializing", + "noMonitors": "No monitors have been configured", "unknown": "Unable to determine system status" }, "table": {