diff --git a/client/src/Components/v2/design-elements/StatusBox.tsx b/client/src/Components/v2/design-elements/StatusBox.tsx
index bf7979cca..a83ebcf5d 100644
--- a/client/src/Components/v2/design-elements/StatusBox.tsx
+++ b/client/src/Components/v2/design-elements/StatusBox.tsx
@@ -105,6 +105,29 @@ export const PausedStatusBox = ({ n }: { n: number }) => {
/>
);
};
+export const MaintenanceStatusBox = ({ n }: { n: number }) => {
+ const theme = useTheme();
+ const { t } = useTranslation();
+ return (
+
+ );
+};
+export const InitializingStatusBox = ({ n }: { n: number }) => {
+ const theme = useTheme();
+ const { t } = useTranslation();
+ return (
+
+ );
+};
+
export const TotalChecksBox = ({ n }: { n: number }) => {
const theme = useTheme();
const { t } = useTranslation();
@@ -138,15 +161,3 @@ export const UpChecksBox = ({ n }: { n: number }) => {
/>
);
};
-
-export const InitializingStatusBox = ({ n }: { n: number }) => {
- const theme = useTheme();
- const { t } = useTranslation();
- return (
-
- );
-};
diff --git a/client/src/Components/v2/design-elements/StatusLabel.tsx b/client/src/Components/v2/design-elements/StatusLabel.tsx
index d7212ddff..cf404421e 100644
--- a/client/src/Components/v2/design-elements/StatusLabel.tsx
+++ b/client/src/Components/v2/design-elements/StatusLabel.tsx
@@ -11,33 +11,24 @@ import { useTranslation } from "react-i18next";
export const ValueTypes = ["positive", "negative", "neutral"] as const;
export type ValueType = (typeof ValueTypes)[number];
-export const StatusLabel = ({
- status,
- isActive,
- sx,
-}: {
- status: MonitorStatus;
- isActive?: boolean;
- sx?: SxProps;
-}) => {
+export const StatusLabel = ({ status, sx }: { status: MonitorStatus; sx?: SxProps }) => {
const { t } = useTranslation();
const theme = useTheme();
const palette = getStatusPalette(status);
- const determineStatus = (
- isActive: boolean | undefined,
- status: MonitorStatus
- ): string => {
- if (isActive === false) {
+ const determineStatus = (status: MonitorStatus): string => {
+ if (status === "up") {
+ return t("pages.common.monitors.status.up");
+ } else if (status === "down") {
+ return t("pages.common.monitors.status.down");
+ } else if (status === "maintenance") {
+ return t("pages.common.monitors.status.maintenance");
+ } else if (status === "paused") {
return t("pages.common.monitors.status.paused");
+ } else if (status === "initializing") {
+ return t("pages.common.monitors.status.initializing");
}
- if (status === true) {
- return t("pages.common.monitors.status.up");
- }
- if (status === false) {
- return t("pages.common.monitors.status.down");
- }
return t("pages.common.monitors.status.initializing");
};
@@ -64,9 +55,7 @@ export const StatusLabel = ({
borderRadius="50%"
marginRight="5px"
/>
-
- {determineStatus(isActive, status)}
-
+ {determineStatus(status)}
);
};
diff --git a/client/src/Components/v2/monitors/HeaderMonitorsSummary.tsx b/client/src/Components/v2/monitors/HeaderMonitorsSummary.tsx
new file mode 100644
index 000000000..b2a93a807
--- /dev/null
+++ b/client/src/Components/v2/monitors/HeaderMonitorsSummary.tsx
@@ -0,0 +1,29 @@
+import {
+ UpStatusBox,
+ DownStatusBox,
+ PausedStatusBox,
+ InitializingStatusBox,
+} from "@/Components/v2/design-elements";
+import Stack from "@mui/material/Stack";
+
+import type { MonitorsSummary } from "@/Types/Monitor";
+import { useTheme } from "@mui/material";
+
+interface MonitorsSummaryProps {
+ summary: MonitorsSummary | null;
+}
+
+export const HeaderMonitorsSummary = ({ summary }: MonitorsSummaryProps) => {
+ const theme = useTheme();
+ return (
+
+
+
+
+
+
+ );
+};
diff --git a/client/src/Components/v2/monitors/index.tsx b/client/src/Components/v2/monitors/index.tsx
index e2856d6a9..9496395f6 100644
--- a/client/src/Components/v2/monitors/index.tsx
+++ b/client/src/Components/v2/monitors/index.tsx
@@ -11,3 +11,4 @@ export * from "./charts/PiePageSpeedLegend";
export * from "./charts/HistogramPageSpeedDetails";
export * from "./charts/HistogramPageSpeedDetailsTooltip";
export * from "./charts/HistogramInfrastructure";
+export * from "./HeaderMonitorsSummary";
diff --git a/client/src/Pages/Infrastructure/Monitors/index.tsx b/client/src/Pages/Infrastructure/Monitors/index.tsx
index 1d38dbdd3..01de1c09c 100644
--- a/client/src/Pages/Infrastructure/Monitors/index.tsx
+++ b/client/src/Pages/Infrastructure/Monitors/index.tsx
@@ -1,13 +1,8 @@
import Stack from "@mui/material/Stack";
import useMediaQuery from "@mui/material/useMediaQuery";
-import {
- MonitorBasePageWithStates,
- UpStatusBox,
- DownStatusBox,
- PausedStatusBox,
-} from "@/Components/v2/design-elements";
+import { MonitorBasePageWithStates } from "@/Components/v2/design-elements";
import { HeaderCreate } from "@/Components/v2/common";
-import { ControlsFilter } from "@/Components/v2/monitors";
+import { ControlsFilter, HeaderMonitorsSummary } from "@/Components/v2/monitors";
import { TextField, Dialog } from "@/Components/v2/inputs";
import { useGet, useDelete } from "@/Hooks/UseApi";
@@ -99,7 +94,7 @@ const InfrastructureMonitors = () => {
{ refreshInterval: 5000, keepPreviousData: true }
);
- const { summary, count } = monitorsWithChecksData ?? {};
+ const { summary, count } = monitorsWithChecksData ?? { summary: null, count: 0 };
const isLoading = monitorsWithChecksLoading;
// Check if any filters are active
@@ -138,14 +133,7 @@ const InfrastructureMonitors = () => {
isLoading={isLoading}
isAdmin={isAdmin}
/>
-
-
-
-
-
+
{
const { t } = useTranslation();
- const theme = useTheme();
const isAdmin = useIsAdmin();
const { deleteFn, loading: isDeleting } = useDelete();
@@ -48,8 +43,8 @@ const PageSpeedMonitorsPage = () => {
const [rowsPerPage, setRowsPerPage] = useState(10);
const monitors = monitorsData?.monitors;
- const monitorsCount = monitorsData?.count;
- const summary = monitorsData?.summary;
+ const monitorsCount = monitorsData?.count ?? 0;
+ const summary = monitorsData?.summary ?? null;
const isLoading = monitorsIsLoading || settingsIsLoading;
@@ -80,14 +75,7 @@ const PageSpeedMonitorsPage = () => {
isLoading={isLoading}
isAdmin={isAdmin}
/>
-
-
-
-
-
+
{
)}
{monitors?.map((monitor) => {
- const status = determineState(monitor);
return (
{
)}
-
+
{statusPage.showCharts !== false && (
diff --git a/client/src/Pages/StatusPage/Status/Components/StatusBar.tsx b/client/src/Pages/StatusPage/Status/Components/StatusBar.tsx
index 8b3343249..b5c52b32b 100644
--- a/client/src/Pages/StatusPage/Status/Components/StatusBar.tsx
+++ b/client/src/Pages/StatusPage/Status/Components/StatusBar.tsx
@@ -12,16 +12,16 @@ const getMonitorStatus = (monitors: Monitor[], theme: Theme, t: Function) => {
icon: ,
};
- if (monitors.every((monitor) => monitor.status === true)) {
+ if (monitors.every((monitor) => monitor.status === "up")) {
monitorsStatus.msg = t("pages.statusPages.statusBar.allUp");
monitorsStatus.color = theme.palette.success.main;
monitorsStatus.icon = ;
return monitorsStatus;
- } else if (monitors.every((monitor) => monitor.status === false)) {
+ } else if (monitors.every((monitor) => monitor.status === "down")) {
monitorsStatus.msg = t("pages.statusPages.statusBar.allDown");
monitorsStatus.color = theme.palette.error.main;
return monitorsStatus;
- } else if (monitors.some((monitor) => monitor.status === false)) {
+ } else if (monitors.some((monitor) => monitor.status === "down")) {
monitorsStatus.msg = t("pages.statusPages.statusBar.degraded");
monitorsStatus.color = theme.palette.warning.main;
return monitorsStatus;
diff --git a/client/src/Pages/Uptime/Monitors/Components/UptimeMonitorsTable.tsx b/client/src/Pages/Uptime/Monitors/Components/UptimeMonitorsTable.tsx
index 94c619672..75738e6ad 100644
--- a/client/src/Pages/Uptime/Monitors/Components/UptimeMonitorsTable.tsx
+++ b/client/src/Pages/Uptime/Monitors/Components/UptimeMonitorsTable.tsx
@@ -186,12 +186,7 @@ export const MonitorTable = ({
),
render: (row) => {
- return (
-
- );
+ return ;
},
},
{
diff --git a/client/src/Pages/Uptime/Monitors/index.tsx b/client/src/Pages/Uptime/Monitors/index.tsx
index 702bbd928..9e36ccc86 100644
--- a/client/src/Pages/Uptime/Monitors/index.tsx
+++ b/client/src/Pages/Uptime/Monitors/index.tsx
@@ -1,10 +1,5 @@
-import { ControlsFilter } from "@/Components/v2/monitors";
-import {
- MonitorBasePageWithStates,
- UpStatusBox,
- DownStatusBox,
- PausedStatusBox,
-} from "@/Components/v2/design-elements";
+import { ControlsFilter, HeaderMonitorsSummary } from "@/Components/v2/monitors";
+import { MonitorBasePageWithStates } from "@/Components/v2/design-elements";
import { TextField, Dialog } from "@/Components/v2/inputs";
import Stack from "@mui/material/Stack";
import { MonitorTable } from "@/Pages/Uptime/Monitors/Components/UptimeMonitorsTable";
@@ -99,7 +94,11 @@ const UptimeMonitorsPage = () => {
{ refreshInterval: 5000, keepPreviousData: true }
);
- const { monitors: monitorsWithChecks, summary, count } = monitorsWithChecksData ?? {};
+ const {
+ monitors: monitorsWithChecks,
+ summary,
+ count,
+ } = monitorsWithChecksData ?? { monitors: null, summary: null, count: 0 };
// Delete hook
const { deleteFn, loading: isDeleting } = useDelete();
@@ -150,14 +149,8 @@ const UptimeMonitorsPage = () => {
isLoading={isLoading}
isAdmin={isAdmin}
/>
-
-
-
-
-
+
+
{
- if (typeof monitor === "undefined") return "pending";
- if (monitor?.isActive === false) return "paused";
- if (monitor?.status === undefined) return "pending";
- return monitor?.status == true ? "up" : "down";
-};
-
export const getMonitorPath = (type: MonitorType): string => {
const pathMap: Record = {
http: "uptime",
@@ -24,10 +17,10 @@ export const getMonitorPath = (type: MonitorType): string => {
};
export const getStatusPalette = (status: MonitorStatus): PaletteKey => {
- if (status === true) {
+ if (status === "up") {
return "success";
}
- if (status === false) {
+ if (status === "down") {
return "error";
}
return "warning";
@@ -43,11 +36,11 @@ export const getValuePalette = (value: ValueType): PaletteKey => {
};
export const getStatusColor = (status: MonitorStatus, theme: any): string => {
- if (status === true) {
+ if (status === "up") {
return theme.palette.success.light;
}
- if (status === false) {
+ if (status === "down") {
return theme.palette.error.light;
}
@@ -101,9 +94,9 @@ export const getStatusPageHeaderConfig = (
return { paletteKey: "error", message: "No monitors available" };
}
- const allUp = monitors.every((monitor) => monitor.status === true);
- const anyDown = monitors.some((monitor) => monitor.status === false);
- const allDown = monitors.every((monitor) => monitor.status === false);
+ const allUp = monitors.every((monitor) => monitor.status === "up");
+ const anyDown = monitors.some((monitor) => monitor.status === "down");
+ const allDown = monitors.every((monitor) => monitor.status === "down");
if (allUp)
return {
diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index d2a066c11..7eb833308 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -775,6 +775,7 @@
"status": {
"down": "down",
"initializing": "initializing",
+ "maintenance": "maintenance",
"paused": "paused",
"total": "total",
"up": "up"