From 9eb92903ad1b229f46deb2b94233ec637e508667 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 19 Aug 2024 13:43:27 -0700
Subject: [PATCH 1/2] Replace current page with 404 when navigating to
 not-found

---
 Client/src/Pages/Monitors/Details/index.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Client/src/Pages/Monitors/Details/index.jsx b/Client/src/Pages/Monitors/Details/index.jsx
index 79fba3b6b..519f2991f 100644
--- a/Client/src/Pages/Monitors/Details/index.jsx
+++ b/Client/src/Pages/Monitors/Details/index.jsx
@@ -132,7 +132,7 @@ const DetailsPage = () => {
       setMonitor(res.data.data);
     } catch (error) {
       console.error("Error fetching monitor of id: " + monitorId);
-      navigate("/not-found");
+      navigate("/not-found", { replace: true });
     }
   }, [authToken, monitorId, navigate, dateRange]);
 

From 92142395cc8a48e62d21d05ba37abe6d38a3ad4d Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 19 Aug 2024 13:46:40 -0700
Subject: [PATCH 2/2] Add replace true to remaining methods

---
 Client/src/Pages/Monitors/Configure/index.jsx  | 4 ++--
 Client/src/Pages/PageSpeed/Configure/index.jsx | 2 +-
 Client/src/Pages/PageSpeed/Details/index.jsx   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Client/src/Pages/Monitors/Configure/index.jsx b/Client/src/Pages/Monitors/Configure/index.jsx
index c873482a9..5a64f7167 100644
--- a/Client/src/Pages/Monitors/Configure/index.jsx
+++ b/Client/src/Pages/Monitors/Configure/index.jsx
@@ -109,12 +109,12 @@ const Configure = () => {
     const data = monitors.find((monitor) => monitor._id === monitorId);
     if (!data) {
       console.error("Error fetching monitor of id: " + monitorId);
-      navigate("/not-found");
+      navigate("/not-found", { replace: true });
     }
     setMonitor({
       ...data,
     });
-  }, [monitorId, authToken, monitors]);
+  }, [monitorId, authToken, monitors, navigate]);
 
   const handleChange = (event, name) => {
     let { value, id } = event.target;
diff --git a/Client/src/Pages/PageSpeed/Configure/index.jsx b/Client/src/Pages/PageSpeed/Configure/index.jsx
index 0dff8d7eb..ed91a2f3e 100644
--- a/Client/src/Pages/PageSpeed/Configure/index.jsx
+++ b/Client/src/Pages/PageSpeed/Configure/index.jsx
@@ -93,7 +93,7 @@ const PageSpeedConfigure = () => {
     const data = monitors.find((monitor) => monitor._id === monitorId);
     if (!data) {
       console.error("Error fetching pagespeed monitor of id: " + monitorId);
-      navigate("/not-found");
+      navigate("/not-found", { replace: true });
     }
     setMonitor({
       ...data,
diff --git a/Client/src/Pages/PageSpeed/Details/index.jsx b/Client/src/Pages/PageSpeed/Details/index.jsx
index 8ed0ec5c2..42ef4421e 100644
--- a/Client/src/Pages/PageSpeed/Details/index.jsx
+++ b/Client/src/Pages/PageSpeed/Details/index.jsx
@@ -211,7 +211,7 @@ const PageSpeedDetails = () => {
         setAudits(res?.data?.data?.checks?.[0]?.audits ?? []);
       } catch (error) {
         console.log(error);
-        navigate("/not-found");
+        navigate("/not-found", { replace: true });
       }
     };