From 3df19fc51691d71ebfae3d1df9605a9650baa48f Mon Sep 17 00:00:00 2001 From: Pezhman Parsaee Date: Sun, 4 May 2025 01:21:53 +0200 Subject: [PATCH 1/5] hide certificate expiry box for non-http uptimes --- .../Components/UptimeStatusBoxes/index.jsx | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx b/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx index 66c021aa2..ddc7e223b 100644 --- a/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx +++ b/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx @@ -61,18 +61,20 @@ const UptimeStatusBoxes = ({ } /> - - {certificateExpiry} - - } - /> + {monitor?.type === "http" && ( + + {certificateExpiry} + + } + /> + )} ); }; From fd64a673608a22e3c9577fcab4a2b193437c4ee5 Mon Sep 17 00:00:00 2001 From: Pezhman Parsaee Date: Sun, 4 May 2025 11:34:36 +0200 Subject: [PATCH 2/5] defined a constant for the type of monitors --- .../Uptime/Details/Components/UptimeStatusBoxes/index.jsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx b/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx index ddc7e223b..80e1d2072 100644 --- a/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx +++ b/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx @@ -7,6 +7,13 @@ import { useTheme } from "@mui/material/styles"; import { Typography } from "@mui/material"; import useUtils from "../../../Monitors/Hooks/useUtils"; +const MONITOR_TYPES = { + WEB: ["http", "https"], + PING: ["ping"], + DOCKER: ["docker"], + PORT: ["port"], +}; + const UptimeStatusBoxes = ({ isLoading = false, monitor, From d68c8e523d80b69af203d4f7c7fc740c2c041858 Mon Sep 17 00:00:00 2001 From: Pezhman Parsaee Date: Sun, 4 May 2025 11:35:48 +0200 Subject: [PATCH 3/5] changed conditional rendering to hide certificate expiry box for non http uptimes --- .../Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx b/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx index 80e1d2072..9391256c5 100644 --- a/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx +++ b/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx @@ -68,7 +68,7 @@ const UptimeStatusBoxes = ({ } /> - {monitor?.type === "http" && ( + {MONITOR_TYPES.WEB.includes(monitor?.type) && ( Date: Mon, 5 May 2025 20:36:43 +0200 Subject: [PATCH 4/5] removed newly created constant for monitor types --- .../Uptime/Details/Components/UptimeStatusBoxes/index.jsx | 7 ------- 1 file changed, 7 deletions(-) diff --git a/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx b/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx index 9391256c5..f3ea2dfa6 100644 --- a/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx +++ b/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx @@ -7,13 +7,6 @@ import { useTheme } from "@mui/material/styles"; import { Typography } from "@mui/material"; import useUtils from "../../../Monitors/Hooks/useUtils"; -const MONITOR_TYPES = { - WEB: ["http", "https"], - PING: ["ping"], - DOCKER: ["docker"], - PORT: ["port"], -}; - const UptimeStatusBoxes = ({ isLoading = false, monitor, From 9b216cd059b8814da70cada808983de4fcc8025e Mon Sep 17 00:00:00 2001 From: Pezhman Parsaee Date: Mon, 5 May 2025 20:38:19 +0200 Subject: [PATCH 5/5] changed the condition to show the certificate expiry box for http monitor type --- .../Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx b/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx index f3ea2dfa6..ddc7e223b 100644 --- a/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx +++ b/client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx @@ -61,7 +61,7 @@ const UptimeStatusBoxes = ({ } /> - {MONITOR_TYPES.WEB.includes(monitor?.type) && ( + {monitor?.type === "http" && (