From 55321ffc3cdbfe6b36ca07db45f4fab3aa0ad563 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 10 Feb 2025 13:46:26 -0800 Subject: [PATCH] use url in hook --- .../StatusPage/Create/Hooks/useCreateStatusPage.jsx | 4 ++-- .../StatusPage/Status/Hooks/useStatusPageDelete.jsx | 2 +- .../StatusPage/Status/Hooks/useStatusPageFetch.jsx | 11 +++++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Client/src/Pages/StatusPage/Create/Hooks/useCreateStatusPage.jsx b/Client/src/Pages/StatusPage/Create/Hooks/useCreateStatusPage.jsx index 92e2acf96..4972672f3 100644 --- a/Client/src/Pages/StatusPage/Create/Hooks/useCreateStatusPage.jsx +++ b/Client/src/Pages/StatusPage/Create/Hooks/useCreateStatusPage.jsx @@ -3,7 +3,7 @@ import { networkService } from "../../../../main"; import { useSelector } from "react-redux"; import { createToast } from "../../../../Utils/toastUtils"; -const useCreateStatusPage = (isCreate) => { +const useCreateStatusPage = (isCreate, url) => { const { authToken, user } = useSelector((state) => state.auth); const [isLoading, setIsLoading] = useState(false); @@ -11,7 +11,7 @@ const useCreateStatusPage = (isCreate) => { const createStatusPage = async ({ form }) => { setIsLoading(true); try { - await networkService.createStatusPage({ authToken, user, form, isCreate }); + await networkService.createStatusPage({ authToken, user, form, isCreate, url }); return true; } catch (error) { setNetworkError(true); diff --git a/Client/src/Pages/StatusPage/Status/Hooks/useStatusPageDelete.jsx b/Client/src/Pages/StatusPage/Status/Hooks/useStatusPageDelete.jsx index f9699020c..6f8368f37 100644 --- a/Client/src/Pages/StatusPage/Status/Hooks/useStatusPageDelete.jsx +++ b/Client/src/Pages/StatusPage/Status/Hooks/useStatusPageDelete.jsx @@ -4,7 +4,7 @@ import { networkService } from "../../../../main"; import { createToast } from "../../../../Utils/toastUtils"; import { useNavigate } from "react-router-dom"; -const useStatusPageDelete = (fetchStatusPage, url = "/status/public") => { +const useStatusPageDelete = (fetchStatusPage, url) => { const [isLoading, setIsLoading] = useState(false); const navigate = useNavigate(); const { authToken } = useSelector((state) => state.auth); diff --git a/Client/src/Pages/StatusPage/Status/Hooks/useStatusPageFetch.jsx b/Client/src/Pages/StatusPage/Status/Hooks/useStatusPageFetch.jsx index 013e32dd9..317dfe7b6 100644 --- a/Client/src/Pages/StatusPage/Status/Hooks/useStatusPageFetch.jsx +++ b/Client/src/Pages/StatusPage/Status/Hooks/useStatusPageFetch.jsx @@ -5,7 +5,7 @@ import { createToast } from "../../../../Utils/toastUtils"; import { useTheme } from "@emotion/react"; import { useMonitorUtils } from "../../../../Hooks/useMonitorUtils"; -const useStatusPageFetch = (isCreate = false) => { +const useStatusPageFetch = (isCreate = false, url) => { const [isLoading, setIsLoading] = useState(true); const [networkError, setNetworkError] = useState(false); const [statusPage, setStatusPage] = useState(undefined); @@ -15,10 +15,13 @@ const useStatusPageFetch = (isCreate = false) => { const { getMonitorWithPercentage } = useMonitorUtils(); const fetchStatusPage = useCallback(async () => { try { - const response = await networkService.getStatusPage({ authToken }); + const response = await networkService.getStatusPageByUrl({ + authToken, + url, + type: "uptime", + }); if (!response?.data?.data) return; const { statusPage, monitors } = response.data.data; - setStatusPage(statusPage); const monitorsWithPercentage = monitors.map((monitor) => @@ -37,7 +40,7 @@ const useStatusPageFetch = (isCreate = false) => { } finally { setIsLoading(false); } - }, [authToken, theme, getMonitorWithPercentage]); + }, [authToken, theme, getMonitorWithPercentage, url]); useEffect(() => { if (isCreate === true) {