Merge pull request #3130 from bluewave-labs/fix/monitor-service

Fix/monitor service
This commit is contained in:
Alexander Holliday authored and GitHub committed 2026-01-15 11:40:33 -08:00
commit e99b87fc1e
30 files changed
+404 -327

No files matched your search

@@ -71,7 +71,7 @@ const InfrastructureMonitors = () => {
const field = toFilterStatus !== undefined ? "status" : undefined;
const [monitors, count, isLoading, networkError] = useFetchMonitorsWithChecks({
const [summary, monitors, count, isLoading, networkError] = useFetchMonitorsWithChecks({
types: TYPES,
limit: 1,
page: page,
@@ -2,6 +2,7 @@ import { Grid, Grid2 } from "@mui/material";
import Card from "../Card/index.jsx";
const MonitorGrid = ({ shouldRender, monitors }) => {
console.log(monitors);
return (
<Grid
container
@@ -21,6 +21,7 @@ const PageSpeed = () => {
const isAdmin = useIsAdmin();
const [
summary,
monitorsWithChecks,
monitorsWithChecksCount,
monitorsWithChecksIsLoading,
+2 -2
View File
@@ -199,7 +199,7 @@ const UptimeCreate = ({ isClone = false }) => {
};
} else {
form = {
_id: monitor._id,
id: monitor.id,
url: monitor.url,
name: monitor.name || monitor.url.substring(0, 50),
statusWindowSize: monitor.statusWindowSize,
@@ -292,7 +292,7 @@ const UptimeCreate = ({ isClone = false }) => {
const handleRemove = async (event) => {
event.preventDefault();
const TEMP_MONITOR = { id: monitor._id };
const TEMP_MONITOR = { id: monitor.id };
await deleteMonitor({ monitor: TEMP_MONITOR, redirect: "/uptime" });
};
+14 -14
View File
@@ -27,8 +27,8 @@ import { useSelector, useDispatch } from "react-redux";
import { setRowsPerPage } from "../../../Features/UI/uiSlice.js";
import PropTypes from "prop-types";
import {
useFetchMonitorsWithSummary,
useFetchMonitorsWithChecks,
useFetchMonitorsByTeamId,
} from "@/Hooks/monitorHooks.js";
import { useTranslation } from "react-i18next";
@@ -103,12 +103,6 @@ const UptimeMonitors = () => {
setMonitorUpdateTrigger((prev) => !prev);
}, []);
const [monitors, monitorsSummary, monitorsWithSummaryIsLoading, networkError] =
useFetchMonitorsWithSummary({
types: TYPES,
monitorUpdateTrigger,
});
const handleReset = () => {
setSelectedState(undefined);
setSelectedTypes(undefined);
@@ -123,16 +117,17 @@ const UptimeMonitors = () => {
]);
const activeFilter = [...filterLookup].find(([key]) => key !== undefined);
const field = activeFilter?.[1] || sort?.field;
const field = activeFilter?.[1] || (search ? "name" : sort?.field);
const filter = activeFilter?.[0] || search;
const effectiveTypes = selectedTypes?.length ? selectedTypes : TYPES;
const [
summary,
monitorsWithChecks,
monitorsWithChecksCount,
monitorsWithChecksIsLoading,
monitorsWithChecksNetworkError,
networkError,
] = useFetchMonitorsWithChecks({
types: effectiveTypes,
limit: 25,
@@ -144,13 +139,18 @@ const UptimeMonitors = () => {
monitorUpdateTrigger,
});
const [monitors, listIsLoading, listNetworkError] = useFetchMonitorsByTeamId({
type: ["http", "ping", "docker", "port", "game"],
});
console.log(monitors);
useEffect(() => {
if (isSearching) {
setPage(undefined);
}
}, [isSearching]);
const isLoading = monitorsWithSummaryIsLoading || monitorsWithChecksIsLoading;
const isLoading = monitorsWithChecksIsLoading;
return (
<>
@@ -174,14 +174,14 @@ const UptimeMonitors = () => {
/>
<Greeting type="uptime" />
<StatusBoxes
monitorsSummary={monitorsSummary}
shouldRender={!monitorsWithSummaryIsLoading}
monitorsSummary={summary}
shouldRender={!monitorsWithChecksIsLoading}
/>
<Stack direction={"row"}>
<MonitorCountHeader
isLoading={monitorsWithSummaryIsLoading}
monitorCount={monitorsSummary?.totalMonitors}
isLoading={monitorsWithChecksIsLoading}
monitorCount={summary?.totalMonitors}
/>
<Filter
selectedTypes={selectedTypes}