From b342511aac7b0bf83128d74b5c6ded79b08d6b11 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Thu, 20 Mar 2025 09:09:30 -0700 Subject: [PATCH 1/4] fix pause state --- src/Components/ActionsMenu/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/ActionsMenu/index.jsx b/src/Components/ActionsMenu/index.jsx index 2f46d6bc0..4d5ab7c01 100644 --- a/src/Components/ActionsMenu/index.jsx +++ b/src/Components/ActionsMenu/index.jsx @@ -46,7 +46,7 @@ const ActionsMenu = ({ setIsLoading(true); const action = await dispatch(pauseUptimeMonitor({ monitorId: monitor._id })); if (pauseUptimeMonitor.fulfilled.match(action)) { - const state = action?.payload?.data.isActive === false ? "paused" : "resumed"; + const state = action?.payload?.data.isActive === false ? "resumed" : "paused"; createToast({ body: `Monitor ${state} successfully.` }); pauseCallback(); } else { From 8a2d0d77249c00d408442c7bb6c61400886402b6 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Thu, 20 Mar 2025 09:09:50 -0700 Subject: [PATCH 2/4] add update trigger --- src/Hooks/useFetchMonitorsWithChecks.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Hooks/useFetchMonitorsWithChecks.js b/src/Hooks/useFetchMonitorsWithChecks.js index f318c4b69..a6f0437b9 100644 --- a/src/Hooks/useFetchMonitorsWithChecks.js +++ b/src/Hooks/useFetchMonitorsWithChecks.js @@ -13,6 +13,7 @@ export const useFetchMonitorsWithChecks = ({ filter, field, order, + monitorUpdateTrigger, }) => { const [isLoading, setIsLoading] = useState(false); const [count, setCount] = useState(undefined); @@ -63,6 +64,7 @@ export const useFetchMonitorsWithChecks = ({ teamId, theme, types, + monitorUpdateTrigger, ]); return [monitors, count, isLoading, networkError]; }; From a8aeed341aebbd79cf188678c2882ae5fb722aad Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Thu, 20 Mar 2025 09:10:28 -0700 Subject: [PATCH 3/4] add update trigger --- src/Hooks/useFetchMonitorsWithSummary.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Hooks/useFetchMonitorsWithSummary.js b/src/Hooks/useFetchMonitorsWithSummary.js index 7d1b6ec78..cd21271d4 100644 --- a/src/Hooks/useFetchMonitorsWithSummary.js +++ b/src/Hooks/useFetchMonitorsWithSummary.js @@ -2,7 +2,7 @@ import { useEffect, useState } from "react"; import { networkService } from "../main"; import { createToast } from "../Utils/toastUtils"; -export const useFetchMonitorsWithSummary = ({ teamId, types }) => { +export const useFetchMonitorsWithSummary = ({ teamId, types, monitorUpdateTrigger }) => { const [isLoading, setIsLoading] = useState(false); const [monitors, setMonitors] = useState(undefined); const [monitorsSummary, setMonitorsSummary] = useState(undefined); @@ -30,7 +30,7 @@ export const useFetchMonitorsWithSummary = ({ teamId, types }) => { } }; fetchMonitors(); - }, [teamId, types]); + }, [teamId, types, monitorUpdateTrigger]); return [monitors, monitorsSummary, isLoading, networkError]; }; From 32f7306a6d5d277b49150fdd9ec387d48af2b5df Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Thu, 20 Mar 2025 09:11:07 -0700 Subject: [PATCH 4/4] use update trigger --- src/Pages/Uptime/Monitors/index.jsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Pages/Uptime/Monitors/index.jsx b/src/Pages/Uptime/Monitors/index.jsx index 4ee099e5e..ddb5ce980 100644 --- a/src/Pages/Uptime/Monitors/index.jsx +++ b/src/Pages/Uptime/Monitors/index.jsx @@ -24,14 +24,12 @@ import { useState, useCallback } from "react"; import { useIsAdmin } from "../../../Hooks/useIsAdmin"; import { useTheme } from "@emotion/react"; import { useNavigate } from "react-router-dom"; -import useMonitorsFetch from "./Hooks/useMonitorsFetch"; import { useSelector, useDispatch } from "react-redux"; import { setRowsPerPage } from "../../../Features/UI/uiSlice"; import PropTypes from "prop-types"; import useFetchMonitorsWithSummary from "../../../Hooks/useFetchMonitorsWithSummary"; import useFetchMonitorsWithChecks from "../../../Hooks/useFetchMonitorsWithChecks"; import { useTranslation } from "react-i18next"; - const BREADCRUMBS = [{ name: `Uptime`, path: "/uptime" }]; const TYPES = ["http", "ping", "docker", "port"]; const CreateMonitorButton = ({ shouldRender }) => { @@ -103,6 +101,7 @@ const UptimeMonitors = () => { useFetchMonitorsWithSummary({ teamId, types: TYPES, + monitorUpdateTrigger, }); const [ @@ -119,11 +118,10 @@ const UptimeMonitors = () => { filter: search, field: sort?.field, order: sort?.order, - triggerUpdate, + monitorUpdateTrigger, }); const isLoading = monitorsWithSummaryIsLoading || monitorsWithChecksIsLoading; - if (networkError) { return ( @@ -194,6 +192,7 @@ const UptimeMonitors = () => { sort={sort} setSort={setSort} monitorsAreLoading={monitorsWithChecksIsLoading} + triggerUpdate={triggerUpdate} />