mirror/Checkmate
1
0
Fork 0
mirror of https://github.com/bluewave-labs/Checkmate.git synced 2026-01-21 00:59:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/infrastructure-header' into fix/cleanup

Browse Source
This commit is contained in:
Alex Holliday
2025-06-16 11:24:28 +08:00
parent 90a5fe946a f30529e8a2
commit 6cbc6546ac
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/Hooks/monitorHooks.js
View File

@@ -221,7 +221,7 @@ const useFetchMonitorById = ({ monitorId, setMonitor, updateTrigger }) => {
return [isLoading];
};
const useFetchHardwareMonitorById = ({ monitorId, dateRange }) => {
const useFetchHardwareMonitorById = ({ monitorId, dateRange, updateTrigger }) => {
const [isLoading, setIsLoading] = useState(true);
const [networkError, setNetworkError] = useState(false);
const [monitor, setMonitor] = useState(undefined);
@@ -244,7 +244,7 @@ const useFetchHardwareMonitorById = ({ monitorId, dateRange }) => {
}
};
fetchMonitor();
}, [monitorId, dateRange]);
}, [monitorId, dateRange, updateTrigger]);
return [monitor, isLoading, networkError];
};

20
client/src/Pages/Infrastructure/Details/index.jsx
View File

@@ -1,7 +1,7 @@
// Components
import { Stack, Typography } from "@mui/material";
import Breadcrumbs from "../../../Components/Breadcrumbs";
import MonitorStatusHeader from "../../../Components/MonitorStatusHeader";
import MonitorDetailsControlHeader from "../../../Components/MonitorDetailsControlHeader";
import MonitorTimeFrameHeader from "../../../Components/MonitorTimeFrameHeader";
import StatusBoxes from "./Components/StatusBoxes";
import GaugeBoxes from "./Components/GaugeBoxes";
@@ -26,6 +26,7 @@ const InfrastructureDetails = () => {
// Local state
const [dateRange, setDateRange] = useState("recent");
const [trigger, setTrigger] = useState(false);
// Utils
const theme = useTheme();
@@ -36,8 +37,13 @@ const InfrastructureDetails = () => {
const [monitor, isLoading, networkError] = useFetchHardwareMonitorById({
monitorId,
dateRange,
updateTrigger: trigger,
});
const triggerUpdate = () => {
setTrigger(!trigger);
};
if (networkError === true) {
return (
<GenericFallback>
@@ -57,11 +63,12 @@ const InfrastructureDetails = () => {
return (
<Stack gap={theme.spacing(10)}>
<Breadcrumbs list={BREADCRUMBS} />
<MonitorStatusHeader
<MonitorDetailsControlHeader
path={"infrastructure"}
isAdmin={false}
shouldRender={!isLoading}
isLoading={isLoading}
isAdmin={isAdmin}
monitor={monitor}
triggerUpdate={triggerUpdate}
/>
<GenericFallback>
<Typography>{t("distributedUptimeDetailsNoMonitorHistory")}</Typography>
@@ -73,11 +80,12 @@ const InfrastructureDetails = () => {
return (
<Stack gap={theme.spacing(10)}>
<Breadcrumbs list={BREADCRUMBS} />
<MonitorStatusHeader
<MonitorDetailsControlHeader
path={"infrastructure"}
isLoading={isLoading}
isAdmin={isAdmin}
shouldRender={!isLoading}
monitor={monitor}
triggerUpdate={triggerUpdate}
/>
<StatusBoxes
shouldRender={!isLoading}