From a11190396585bba04f9d54f4c92e0e7371d56d6f Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Thu, 12 Jun 2025 15:47:59 +0800 Subject: [PATCH] use hooks --- .../Components/IncidentTable/index.jsx | 35 ++++++++++++++----- client/src/Pages/Incidents/index.jsx | 33 +++++++++++------ client/src/Pages/Uptime/Details/index.jsx | 6 +++- 3 files changed, 55 insertions(+), 19 deletions(-) diff --git a/client/src/Pages/Incidents/Components/IncidentTable/index.jsx b/client/src/Pages/Incidents/Components/IncidentTable/index.jsx index cc2d212f0..bc4872735 100644 --- a/client/src/Pages/Incidents/Components/IncidentTable/index.jsx +++ b/client/src/Pages/Incidents/Components/IncidentTable/index.jsx @@ -10,10 +10,10 @@ import NetworkError from "../../../../Components/GenericFallback/NetworkError"; //Utils import { formatDateWithTz } from "../../../../Utils/timeUtils"; import { useSelector } from "react-redux"; -import { useState } from "react"; -import useChecksFetch from "../../Hooks/useChecksFetch"; +import { useState, useEffect } from "react"; import PropTypes from "prop-types"; import { useTranslation } from "react-i18next"; +import { useFetchChecks } from "../../../../Hooks/checkHooks"; const IncidentTable = ({ shouldRender, @@ -24,19 +24,28 @@ const IncidentTable = ({ }) => { //Redux state const uiTimezone = useSelector((state) => state.ui.timezone); + const { user } = useSelector((state) => state.auth); //Local state + const [teamId, setTeamId] = useState(undefined); + const [monitorId, setMonitorId] = useState(undefined); + const [page, setPage] = useState(0); const [rowsPerPage, setRowsPerPage] = useState(10); const selectedMonitorDetails = monitors?.[selectedMonitor]; const selectedMonitorType = selectedMonitorDetails?.type; - const { isLoading, networkError, checks, checksCount } = useChecksFetch({ - selectedMonitor, - selectedMonitorType, - filter, + + const [checks, checksCount, isLoading, networkError] = useFetchChecks({ + status: false, + monitorId, + teamId, + type: selectedMonitorType, + sortOrder: "desc", + limit: null, dateRange, - page, - rowsPerPage, + filter: filter, + page: page, + rowsPerPage: rowsPerPage, }); const { t } = useTranslation(); @@ -50,6 +59,16 @@ const IncidentTable = ({ setRowsPerPage(event.target.value); }; + useEffect(() => { + if (selectedMonitor === "0") { + setTeamId(user.teamId); + setMonitorId(undefined); + } else { + setMonitorId(selectedMonitor); + setTeamId(undefined); + } + }, [selectedMonitor, user.teamId]); + const headers = [ { id: "monitorName", diff --git a/client/src/Pages/Incidents/index.jsx b/client/src/Pages/Incidents/index.jsx index 16a62a621..d01543f8a 100644 --- a/client/src/Pages/Incidents/index.jsx +++ b/client/src/Pages/Incidents/index.jsx @@ -1,19 +1,19 @@ // Components import { Stack } from "@mui/material"; import Breadcrumbs from "../../Components/Breadcrumbs"; +import GenericFallback from "../../Components/GenericFallback"; +import IncidentTable from "./Components/IncidentTable"; +import OptionsHeader from "./Components/OptionsHeader"; //Utils import { useTheme } from "@emotion/react"; -import { useMonitorsFetch } from "./Hooks/useMonitorsFetch"; +import { useFetchMonitorsByTeamId } from "../../Hooks/monitorHooks"; import { useSelector } from "react-redux"; -import OptionsHeader from "./Components/OptionsHeader"; -import { useState } from "react"; -import IncidentTable from "./Components/IncidentTable"; -import GenericFallback from "../../Components/GenericFallback"; +import { useState, useEffect } from "react"; import NetworkError from "../../Components/GenericFallback/NetworkError"; import { useTranslation } from "react-i18next"; -//Constants +//Constants const Incidents = () => { // Redux state const { user } = useSelector((state) => state.auth); @@ -27,13 +27,26 @@ const Incidents = () => { const [selectedMonitor, setSelectedMonitor] = useState("0"); const [filter, setFilter] = useState(undefined); const [dateRange, setDateRange] = useState(undefined); + const [monitorLookup, setMonitorLookup] = useState(undefined); + //Utils const theme = useTheme(); - - const { monitors, isLoading, networkError } = useMonitorsFetch({ + const [monitors, , isLoading, networkError] = useFetchMonitorsByTeamId({ teamId: user.teamId, }); + useEffect(() => { + const monitorLookup = monitors?.reduce((acc, monitor) => { + acc[monitor._id] = { + _id: monitor._id, + name: monitor.name, + type: monitor.type, + }; + return acc; + }, {}); + setMonitorLookup(monitorLookup); + }, [monitors]); + if (networkError) { return ( @@ -47,7 +60,7 @@ const Incidents = () => { { /> { }); const monitorType = monitor?.type; + const [checks, checksCount, checksAreLoading, checksNetworkError] = useFetchChecks({ monitorId, - monitorType, + type: monitorType, + sortOrder: "desc", + limit: null, dateRange, + filter: null, page, rowsPerPage, });