From 98409991831a3c356de84821062d44196d3058c9 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 28 Jan 2025 11:03:46 -0800 Subject: [PATCH] standardize uptime directory structure, use shared components --- .../Uptime/{CreateUptime => Create}/index.css | 0 .../Uptime/{CreateUptime => Create}/index.jsx | 0 .../Home/Components/StatusBoxes/index.jsx | 2 +- .../Home/Components/UptimeDataTable/index.jsx | 16 +++++++------- Client/src/Pages/Uptime/Home/index.jsx | 21 +++++++++++++++++-- 5 files changed, 28 insertions(+), 11 deletions(-) rename Client/src/Pages/Uptime/{CreateUptime => Create}/index.css (100%) rename Client/src/Pages/Uptime/{CreateUptime => Create}/index.jsx (100%) diff --git a/Client/src/Pages/Uptime/CreateUptime/index.css b/Client/src/Pages/Uptime/Create/index.css similarity index 100% rename from Client/src/Pages/Uptime/CreateUptime/index.css rename to Client/src/Pages/Uptime/Create/index.css diff --git a/Client/src/Pages/Uptime/CreateUptime/index.jsx b/Client/src/Pages/Uptime/Create/index.jsx similarity index 100% rename from Client/src/Pages/Uptime/CreateUptime/index.jsx rename to Client/src/Pages/Uptime/Create/index.jsx diff --git a/Client/src/Pages/Uptime/Home/Components/StatusBoxes/index.jsx b/Client/src/Pages/Uptime/Home/Components/StatusBoxes/index.jsx index ac9eca47f..aa7b7ee0d 100644 --- a/Client/src/Pages/Uptime/Home/Components/StatusBoxes/index.jsx +++ b/Client/src/Pages/Uptime/Home/Components/StatusBoxes/index.jsx @@ -30,7 +30,7 @@ const StatusBoxes = ({ shouldRender, monitorsSummary }) => { }; StatusBoxes.propTypes = { - monitorsSummary: PropTypes.object.isRequired, + monitorsSummary: PropTypes.object, }; export default StatusBoxes; diff --git a/Client/src/Pages/Uptime/Home/Components/UptimeDataTable/index.jsx b/Client/src/Pages/Uptime/Home/Components/UptimeDataTable/index.jsx index 936a6ebed..e96705cc1 100644 --- a/Client/src/Pages/Uptime/Home/Components/UptimeDataTable/index.jsx +++ b/Client/src/Pages/Uptime/Home/Components/UptimeDataTable/index.jsx @@ -12,7 +12,9 @@ import { useState } from "react"; import SearchComponent from "../SearchComponent"; import CircularCount from "../../../../../Components/CircularCount"; import LoadingSpinner from "../LoadingSpinner"; +import MonitorCountHeader from "../../../../../Components/MonitorCountHeader"; import UptimeDataTableSkeleton from "./skeleton"; + // Utils import { useTheme } from "@emotion/react"; import useUtils from "../../Hooks/useUtils"; @@ -214,21 +216,19 @@ const UptimeDataTable = (props) => { flex={1} py={theme.spacing(8)} > - - Uptime monitors - - + { }); const totalMonitors = monitorsSummary?.totalMonitors ?? 0; + if (!isLoading && monitors?.length === 0) { + return ( + + ); + } + return ( - +