From f85c2d001a8030cdea8b399965fdc22f87eb60aa Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Fri, 6 Sep 2024 10:09:13 -0700
Subject: [PATCH] Resolve conflicts, update create monitor

---
 .../Pages/Monitors/CreateMonitor/index.jsx    | 43 ++++++++++++-------
 .../src/Pages/Monitors/Home/actionsMenu.jsx   |  2 +-
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/Client/src/Pages/Monitors/CreateMonitor/index.jsx b/Client/src/Pages/Monitors/CreateMonitor/index.jsx
index 408c5788d..36a63f0e6 100644
--- a/Client/src/Pages/Monitors/CreateMonitor/index.jsx
+++ b/Client/src/Pages/Monitors/CreateMonitor/index.jsx
@@ -13,6 +13,7 @@ import Field from "../../../Components/Inputs/Field";
 import Select from "../../../Components/Inputs/Select";
 import Checkbox from "../../../Components/Inputs/Checkbox";
 import Breadcrumbs from "../../../Components/Breadcrumbs";
+import { getUptimeMonitorById } from "../../../Features/UptimeMonitors/uptimeMonitorsSlice";
 import "./index.css";
 
 const CreateMonitor = () => {
@@ -43,23 +44,33 @@ const CreateMonitor = () => {
   const [errors, setErrors] = useState({});
 
   useEffect(() => {
-    if (monitorId) {
-      const data = monitors.find((monitor) => monitor._id === monitorId);
-      if (!data) {
-        console.error("Error fetching monitor of id: " + monitorId);
-        navigate("/not-found", { replace: true });
+    const fetchMonitor = async () => {
+      if (monitorId) {
+        const action = await dispatch(
+          getUptimeMonitorById({ authToken, monitorId })
+        );
+
+        if (action.payload.success) {
+          const data = action.payload.data;
+          const { name, ...rest } = data; //data.name is read-only
+          if (rest.type === "http") {
+            const url = new URL(rest.url);
+            rest.url = url.host;
+          }
+          rest.name = `${name} (Clone)`;
+          rest.interval /= MS_PER_MINUTE;
+          setMonitor({
+            ...rest,
+          });
+        } else {
+          navigate("/not-found", { replace: true });
+          createToast({
+            body: "There was an error cloning the monitor.",
+          });
+        }
       }
-      const { name, ...rest } = data; //data.name is read-only
-      if (rest.type === "http") {
-        const url = new URL(rest.url);
-        rest.url = url.host;
-      }
-      rest.name = `${name} (Clone)`;
-      rest.interval /= MS_PER_MINUTE;
-      setMonitor({
-        ...rest,
-      });
-    }
+    };
+    fetchMonitor();
   }, [monitorId, authToken, monitors]);
 
   const handleChange = (event, name) => {
diff --git a/Client/src/Pages/Monitors/Home/actionsMenu.jsx b/Client/src/Pages/Monitors/Home/actionsMenu.jsx
index 5a25dfc90..7f2eb0d97 100644
--- a/Client/src/Pages/Monitors/Home/actionsMenu.jsx
+++ b/Client/src/Pages/Monitors/Home/actionsMenu.jsx
@@ -140,7 +140,7 @@ const ActionsMenu = ({ monitor, isAdmin, updateCallback }) => {
         <MenuItem
           onClick={(e) => {
             e.stopPropagation();
-            navigate(`/monitors/clone/${actions.id}`);
+            navigate(`/monitors/create/${actions.id}`);
           }}
         >
           Clone