From 4559215316c07d55f4ebfb19d5e7a2e913abce14 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Wed, 29 Jan 2025 12:32:09 -0800
Subject: [PATCH] add network error state to hooks

---
 .../Monitors/Hooks/useMonitorsFetch.jsx       |  4 ++-
 Client/src/Pages/PageSpeed/Monitors/index.jsx |  7 +++-
 .../Monitors/Hooks/useMonitorsFetch.jsx       | 10 +++++-
 Client/src/Pages/Uptime/Monitors/index.jsx    | 35 ++++++++++++-------
 Client/src/Utils/NetworkService.js            |  1 -
 5 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/Client/src/Pages/PageSpeed/Monitors/Hooks/useMonitorsFetch.jsx b/Client/src/Pages/PageSpeed/Monitors/Hooks/useMonitorsFetch.jsx
index 06d423acc..72bfbfc35 100644
--- a/Client/src/Pages/PageSpeed/Monitors/Hooks/useMonitorsFetch.jsx
+++ b/Client/src/Pages/PageSpeed/Monitors/Hooks/useMonitorsFetch.jsx
@@ -6,6 +6,7 @@ const useMonitorsFetch = ({ authToken, teamId }) => {
 	const [isLoading, setIsLoading] = useState(true);
 	const [monitors, setMonitors] = useState([]);
 	const [summary, setSummary] = useState({});
+	const [networkError, setNetworkError] = useState(false);
 
 	useEffect(() => {
 		const fetchMonitors = async () => {
@@ -27,6 +28,7 @@ const useMonitorsFetch = ({ authToken, teamId }) => {
 					setSummary(res.data.data.summary);
 				}
 			} catch (error) {
+				setNetworkError(true);
 				createToast({
 					body: error.message,
 				});
@@ -37,7 +39,7 @@ const useMonitorsFetch = ({ authToken, teamId }) => {
 
 		fetchMonitors();
 	}, [authToken, teamId]);
-	return { isLoading, monitors, summary };
+	return { isLoading, monitors, summary, networkError };
 };
 
 export default useMonitorsFetch;
diff --git a/Client/src/Pages/PageSpeed/Monitors/index.jsx b/Client/src/Pages/PageSpeed/Monitors/index.jsx
index e921bc15a..a0c24d48e 100644
--- a/Client/src/Pages/PageSpeed/Monitors/index.jsx
+++ b/Client/src/Pages/PageSpeed/Monitors/index.jsx
@@ -11,6 +11,7 @@ import { useTheme } from "@emotion/react";
 import { useSelector } from "react-redux";
 import { useIsAdmin } from "../../../Hooks/useIsAdmin";
 import useMonitorsFetch from "./Hooks/useMonitorsFetch";
+import NetworkErrorFallback from "../../../Components/NetworkErrorFallback";
 
 // Constants
 const BREADCRUMBS = [{ name: `pagespeed`, path: "/pagespeed" }];
@@ -20,11 +21,15 @@ const PageSpeed = () => {
 	const isAdmin = useIsAdmin();
 	const { user, authToken } = useSelector((state) => state.auth);
 
-	const { isLoading, monitors, summary } = useMonitorsFetch({
+	const { isLoading, monitors, summary, networkError } = useMonitorsFetch({
 		authToken: authToken,
 		teamId: user.teamId,
 	});
 
+	if (networkError === true) {
+		return <NetworkErrorFallback />;
+	}
+
 	if (!isLoading && monitors?.length === 0) {
 		return (
 			<Fallback
diff --git a/Client/src/Pages/Uptime/Monitors/Hooks/useMonitorsFetch.jsx b/Client/src/Pages/Uptime/Monitors/Hooks/useMonitorsFetch.jsx
index 12fcd9923..ec768e9f8 100644
--- a/Client/src/Pages/Uptime/Monitors/Hooks/useMonitorsFetch.jsx
+++ b/Client/src/Pages/Uptime/Monitors/Hooks/useMonitorsFetch.jsx
@@ -46,6 +46,7 @@ export const useMonitorFetch = ({
 	const [monitors, setMonitors] = useState(undefined);
 	const [filteredMonitors, setFilteredMonitors] = useState(undefined);
 	const [monitorsSummary, setMonitorsSummary] = useState(undefined);
+	const [networkError, setNetworkError] = useState(false);
 
 	const theme = useTheme();
 
@@ -72,6 +73,7 @@ export const useMonitorFetch = ({
 				setFilteredMonitors(mappedMonitors);
 				setMonitorsSummary(summary);
 			} catch (error) {
+				setNetworkError(true);
 				createToast({
 					body: error.message,
 				});
@@ -92,7 +94,13 @@ export const useMonitorFetch = ({
 		theme,
 		triggerUpdate,
 	]);
-	return { monitors, filteredMonitors, monitorsSummary, monitorsAreLoading };
+	return {
+		monitors,
+		filteredMonitors,
+		monitorsSummary,
+		monitorsAreLoading,
+		networkError,
+	};
 };
 
 export default useMonitorFetch;
diff --git a/Client/src/Pages/Uptime/Monitors/index.jsx b/Client/src/Pages/Uptime/Monitors/index.jsx
index f8d78ad52..1356d9e7c 100644
--- a/Client/src/Pages/Uptime/Monitors/index.jsx
+++ b/Client/src/Pages/Uptime/Monitors/index.jsx
@@ -6,6 +6,7 @@ import UptimeDataTable from "./Components/UptimeDataTable";
 import Pagination from "../../../Components/Table/TablePagination";
 import CreateMonitorHeader from "../../../Components/CreateMonitorHeader";
 import Fallback from "../../../Components/Fallback";
+import NetworkErrorFallback from "../../../Components/NetworkErrorFallback";
 import SearchComponent from "./Components/SearchComponent";
 
 import MonitorCountHeader from "../../../Components/MonitorCountHeader";
@@ -89,20 +90,28 @@ const UptimeMonitors = () => {
 	}, []);
 
 	const teamId = user.teamId;
-	const { monitorsAreLoading, monitors, filteredMonitors, monitorsSummary } =
-		useMonitorsFetch({
-			authToken,
-			teamId,
-			limit: 25,
-			page: page,
-			rowsPerPage: rowsPerPage,
-			filter: search,
-			field: sort?.field,
-			order: sort?.order,
-			triggerUpdate: monitorUpdateTrigger,
-		});
+	const {
+		monitorsAreLoading,
+		monitors,
+		filteredMonitors,
+		monitorsSummary,
+		networkError,
+	} = useMonitorsFetch({
+		authToken,
+		teamId,
+		limit: 25,
+		page: page,
+		rowsPerPage: rowsPerPage,
+		filter: search,
+		field: sort?.field,
+		order: sort?.order,
+		triggerUpdate: monitorUpdateTrigger,
+	});
 	const totalMonitors = monitorsSummary?.totalMonitors ?? 0;
-	if (!isLoading && !monitorsAreLoading && monitors?.length === 0) {
+
+	if (networkError) return <NetworkErrorFallback />;
+
+	if (!isLoading && !monitorsAreLoading && totalMonitors === 0) {
 		return (
 			<Fallback
 				vowelStart={true}
diff --git a/Client/src/Utils/NetworkService.js b/Client/src/Utils/NetworkService.js
index d040ff2fd..7dc505e7f 100644
--- a/Client/src/Utils/NetworkService.js
+++ b/Client/src/Utils/NetworkService.js
@@ -3,7 +3,6 @@ const BASE_URL = import.meta.env.VITE_APP_API_BASE_URL;
 const FALLBACK_BASE_URL = "http://localhost:5000/api/v1";
 import { clearAuthState } from "../Features/Auth/authSlice";
 import { clearUptimeMonitorState } from "../Features/UptimeMonitors/uptimeMonitorsSlice";
-import { createToast } from "./toastUtils";
 
 class NetworkService {
 	constructor(store, dispatch, navigate) {