From 5851787c1323e5d5ce1b5ffa3d4b05446b061f84 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 9 Aug 2024 23:17:17 -0700
Subject: [PATCH 1/2] Stop double rendering, add monitors to useEffect
 dependency array

---
 Client/src/Pages/Incidents/IncidentTable/index.jsx | 4 ++++
 Client/src/Pages/Incidents/index.jsx               | 1 +
 2 files changed, 5 insertions(+)

diff --git a/Client/src/Pages/Incidents/IncidentTable/index.jsx b/Client/src/Pages/Incidents/IncidentTable/index.jsx
index d16c23733..18cb376ac 100644
--- a/Client/src/Pages/Incidents/IncidentTable/index.jsx
+++ b/Client/src/Pages/Incidents/IncidentTable/index.jsx
@@ -30,6 +30,9 @@ const IncidentTable = ({ monitors, selectedMonitor, filter }) => {
 
   useEffect(() => {
     const fetchPage = async () => {
+      if (!monitors || Object.keys(monitors).length === 0) {
+        return;
+      }
       try {
         let url = `/checks/${selectedMonitor}?sortOrder=desc&filter=${filter}&page=${paginationController.page}&rowsPerPage=${paginationController.rowsPerPage}`;
 
@@ -52,6 +55,7 @@ const IncidentTable = ({ monitors, selectedMonitor, filter }) => {
   }, [
     authToken,
     user,
+    monitors,
     selectedMonitor,
     filter,
     paginationController.page,
diff --git a/Client/src/Pages/Incidents/index.jsx b/Client/src/Pages/Incidents/index.jsx
index 515f8ec0c..21061ffc7 100644
--- a/Client/src/Pages/Incidents/index.jsx
+++ b/Client/src/Pages/Incidents/index.jsx
@@ -47,6 +47,7 @@ const Incidents = () => {
 
   useEffect(() => {
     const fetchMonitors = async () => {
+      console.log("fetching monitors");
       setLoading(true);
       const res = await axiosInstance.get(
         `/monitors/user/${authState.user._id}?status=false&limit=1`,

From c599b7ce90535b0a076e0743e426fc4d17341c5b Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 9 Aug 2024 23:19:53 -0700
Subject: [PATCH 2/2] removed console.log

---
 Client/src/Pages/Incidents/index.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Client/src/Pages/Incidents/index.jsx b/Client/src/Pages/Incidents/index.jsx
index 21061ffc7..515f8ec0c 100644
--- a/Client/src/Pages/Incidents/index.jsx
+++ b/Client/src/Pages/Incidents/index.jsx
@@ -47,7 +47,6 @@ const Incidents = () => {
 
   useEffect(() => {
     const fetchMonitors = async () => {
-      console.log("fetching monitors");
       setLoading(true);
       const res = await axiosInstance.get(
         `/monitors/user/${authState.user._id}?status=false&limit=1`,