From 5958d4b81c743b998a93792775f5988247b39064 Mon Sep 17 00:00:00 2001 From: Br0wnHammer Date: Tue, 11 Mar 2025 03:23:04 +0530 Subject: [PATCH 1/2] Fix: Uptime UseChecks Hook --- src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx | 7 +++++-- src/Pages/Uptime/Details/index.jsx | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx b/src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx index 51da1a20b..c067b1d2b 100644 --- a/src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx +++ b/src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx @@ -2,18 +2,21 @@ import { useState } from "react"; import { useEffect } from "react"; import { networkService } from "../../../../main"; import { createToast } from "../../../../Utils/toastUtils"; -export const useChecksFetch = ({ monitorId, dateRange, page, rowsPerPage }) => { +export const useChecksFetch = ({ monitorId, monitorType, dateRange, page, rowsPerPage }) => { const [checks, setChecks] = useState(undefined); const [checksCount, setChecksCount] = useState(undefined); const [isLoading, setIsLoading] = useState(false); const [networkError, setNetworkError] = useState(false); useEffect(() => { + if (!monitorType) return; + const fetchChecks = async () => { try { setIsLoading(true); const res = await networkService.getChecksByMonitor({ monitorId: monitorId, + type: monitorType, sortOrder: "desc", limit: null, dateRange: dateRange, @@ -31,7 +34,7 @@ export const useChecksFetch = ({ monitorId, dateRange, page, rowsPerPage }) => { } }; fetchChecks(); - }, [monitorId, dateRange, page, rowsPerPage]); + }, [monitorId, monitorType, dateRange, page, rowsPerPage]); return [checks, checksCount, isLoading, networkError]; }; diff --git a/src/Pages/Uptime/Details/index.jsx b/src/Pages/Uptime/Details/index.jsx index d170f7b18..672640d67 100644 --- a/src/Pages/Uptime/Details/index.jsx +++ b/src/Pages/Uptime/Details/index.jsx @@ -59,8 +59,11 @@ const UptimeDetails = () => { uiTimezone, }); + const monitorType = monitor?.type; + const [checks, checksCount, checksAreLoading, checksNetworkError] = useChecksFetch({ monitorId, + monitorType, dateRange, page, rowsPerPage, From c9e604efed003b7fd69fdde0b97f69ab16b961d6 Mon Sep 17 00:00:00 2001 From: Br0wnHammer Date: Tue, 11 Mar 2025 22:27:43 +0530 Subject: [PATCH 2/2] Fix: Uptime UseChecks Hook --- src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx b/src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx index c067b1d2b..afdc5ed6b 100644 --- a/src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx +++ b/src/Pages/Uptime/Details/Hooks/useChecksFetch.jsx @@ -9,7 +9,9 @@ export const useChecksFetch = ({ monitorId, monitorType, dateRange, page, rowsPe const [networkError, setNetworkError] = useState(false); useEffect(() => { - if (!monitorType) return; + if (!monitorType) { + throw new Error('Monitor Type is not provided. Fetching checks will not proceed.'); + } const fetchChecks = async () => { try {