From e8f76f39e1a10fb87a2a58e9cd2464974836710b Mon Sep 17 00:00:00 2001
From: Mike Salvatore <mike.s.salvatore@gmail.com>
Date: Thu, 30 Jun 2022 14:50:25 -0400
Subject: [PATCH 1/5] UI: Use new `/api/clear-simulation-data` endpoint

---
 .../src/components/ui-components/IslandResetModal.tsx  | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/monkey/monkey_island/cc/ui/src/components/ui-components/IslandResetModal.tsx b/monkey/monkey_island/cc/ui/src/components/ui-components/IslandResetModal.tsx
index 15281362f..7b3887f09 100644
--- a/monkey/monkey_island/cc/ui/src/components/ui-components/IslandResetModal.tsx
+++ b/monkey/monkey_island/cc/ui/src/components/ui-components/IslandResetModal.tsx
@@ -54,8 +54,7 @@ const IslandResetModal = (props: Props) => {
         <button type='button' className='btn btn-danger btn-lg' style={{margin: '5px'}}
                 onClick={() => {
                   setDeleteStatus(Loading);
-                  resetIsland('/api?action=delete-agent-data',
-                    () => {
+                  clearSimulationData(() => {
                       setDeleteStatus(Done)
                     })
                 }}>
@@ -91,11 +90,10 @@ const IslandResetModal = (props: Props) => {
     }
   }
 
-  function resetIsland(url: string, callback: () => void) {
-    auth.authFetch(url)
-      .then(res => res.json())
+  function clearSimulationData(callback: () => void) {
+    auth.authFetch('/api/clear-simulation-data', {method: 'POST'})
       .then(res => {
-        if (res['status'] === 'OK') {
+        if (res.status === 200) {
           callback()
         }
       })

From ddc3f2012d49d4c894384e31740c3c6037ac2b35 Mon Sep 17 00:00:00 2001
From: Mike Salvatore <mike.s.salvatore@gmail.com>
Date: Thu, 30 Jun 2022 14:50:44 -0400
Subject: [PATCH 2/5] UI: Use new reset endpoints to reset all data

---
 .../ui-components/IslandResetModal.tsx        | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/monkey/monkey_island/cc/ui/src/components/ui-components/IslandResetModal.tsx b/monkey/monkey_island/cc/ui/src/components/ui-components/IslandResetModal.tsx
index 7b3887f09..e4b3f045c 100644
--- a/monkey/monkey_island/cc/ui/src/components/ui-components/IslandResetModal.tsx
+++ b/monkey/monkey_island/cc/ui/src/components/ui-components/IslandResetModal.tsx
@@ -74,8 +74,7 @@ const IslandResetModal = (props: Props) => {
         <button type='button' className='btn btn-danger btn-lg' style={{margin: '5px'}}
                 onClick={() => {
                   setResetAll(Loading);
-                  resetIsland('/api?action=reset',
-                    () => {
+                  resetAll(() => {
                       setResetAll(Done);
                       props.onClose();
                     })
@@ -98,6 +97,24 @@ const IslandResetModal = (props: Props) => {
         }
       })
   }
+  function resetAll(callback: () => void) {
+    auth.authFetch('/api/reset-agent-configuration', {method: 'POST'})
+      .then(res => {
+        if (res.status === 200) {
+            auth.authFetch('/api/clear-simulation-data', {method: 'POST'})
+              .then(res => {
+                if (res.status === 200) {
+                    auth.authFetch('/api/island-mode', {method: 'POST', body: '{"mode": "unset"}'})
+                      .then(res => {
+                        if (res.status === 200) {
+                            callback()
+                        }
+                    })
+                }
+              })
+          }
+      })
+  }
 
   function showModalButtons() {
     return (<Container className={`text-left island-reset-modal`}>

From 05129c9d6ba715c8803232d96f2db996de213548 Mon Sep 17 00:00:00 2001
From: Mike Salvatore <mike.s.salvatore@gmail.com>
Date: Fri, 1 Jul 2022 08:55:57 -0400
Subject: [PATCH 3/5] UI: Add missing semicolons

---
 .../cc/ui/src/components/ui-components/IslandResetModal.tsx   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/monkey/monkey_island/cc/ui/src/components/ui-components/IslandResetModal.tsx b/monkey/monkey_island/cc/ui/src/components/ui-components/IslandResetModal.tsx
index e4b3f045c..b142e97c4 100644
--- a/monkey/monkey_island/cc/ui/src/components/ui-components/IslandResetModal.tsx
+++ b/monkey/monkey_island/cc/ui/src/components/ui-components/IslandResetModal.tsx
@@ -93,7 +93,7 @@ const IslandResetModal = (props: Props) => {
     auth.authFetch('/api/clear-simulation-data', {method: 'POST'})
       .then(res => {
         if (res.status === 200) {
-          callback()
+          callback();
         }
       })
   }
@@ -107,7 +107,7 @@ const IslandResetModal = (props: Props) => {
                     auth.authFetch('/api/island-mode', {method: 'POST', body: '{"mode": "unset"}'})
                       .then(res => {
                         if (res.status === 200) {
-                            callback()
+                            callback();
                         }
                     })
                 }

From d8a7ac3fb63a95260537041d9c717ab422c8da6a Mon Sep 17 00:00:00 2001
From: Mike Salvatore <mike.s.salvatore@gmail.com>
Date: Fri, 1 Jul 2022 09:05:42 -0400
Subject: [PATCH 4/5] UI: Throw error if resetAll() fails

---
 .../ui-components/IslandResetModal.tsx        | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/monkey/monkey_island/cc/ui/src/components/ui-components/IslandResetModal.tsx b/monkey/monkey_island/cc/ui/src/components/ui-components/IslandResetModal.tsx
index b142e97c4..a6eef2070 100644
--- a/monkey/monkey_island/cc/ui/src/components/ui-components/IslandResetModal.tsx
+++ b/monkey/monkey_island/cc/ui/src/components/ui-components/IslandResetModal.tsx
@@ -74,10 +74,19 @@ const IslandResetModal = (props: Props) => {
         <button type='button' className='btn btn-danger btn-lg' style={{margin: '5px'}}
                 onClick={() => {
                   setResetAll(Loading);
-                  resetAll(() => {
-                      setResetAll(Done);
-                      props.onClose();
+                  try {
+                      resetAll().then(res => {
+                        if (res.status === 200) {
+                          setResetAll(Done);
+                          props.onClose();
+                        } else {
+                            throw 'Error resetting the simulation'
+                        }
                     })
+                  } catch (err) {
+                    // TODO: Display error message
+                    console.error(err)
+                  }
                 }}>
           Reset the Island
         </button>
@@ -97,24 +106,17 @@ const IslandResetModal = (props: Props) => {
         }
       })
   }
-  function resetAll(callback: () => void) {
-    auth.authFetch('/api/reset-agent-configuration', {method: 'POST'})
+  function resetAll() {
+    return auth.authFetch('/api/reset-agent-configuration', {method: 'POST'})
       .then(res => {
         if (res.status === 200) {
-            auth.authFetch('/api/clear-simulation-data', {method: 'POST'})
-              .then(res => {
-                if (res.status === 200) {
-                    auth.authFetch('/api/island-mode', {method: 'POST', body: '{"mode": "unset"}'})
-                      .then(res => {
-                        if (res.status === 200) {
-                            callback();
-                        }
-                    })
-                }
-              })
-          }
-      })
-  }
+            return auth.authFetch('/api/clear-simulation-data', {method: 'POST'})
+        })
+      .then(res => {
+        if (res.status === 200) {
+            return auth.authFetch('/api/island-mode', {method: 'POST', body: '{"mode": "unset"}'})
+        })
+}
 
   function showModalButtons() {
     return (<Container className={`text-left island-reset-modal`}>

From a53fda39cee303b33b6c42080e830051964fe904 Mon Sep 17 00:00:00 2001
From: Mike Salvatore <mike.s.salvatore@gmail.com>
Date: Fri, 1 Jul 2022 09:09:40 -0400
Subject: [PATCH 5/5] UI: Throw exception from resetAll()

---
 .../ui-components/IslandResetModal.tsx        | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/monkey/monkey_island/cc/ui/src/components/ui-components/IslandResetModal.tsx b/monkey/monkey_island/cc/ui/src/components/ui-components/IslandResetModal.tsx
index a6eef2070..8936cc077 100644
--- a/monkey/monkey_island/cc/ui/src/components/ui-components/IslandResetModal.tsx
+++ b/monkey/monkey_island/cc/ui/src/components/ui-components/IslandResetModal.tsx
@@ -75,16 +75,11 @@ const IslandResetModal = (props: Props) => {
                 onClick={() => {
                   setResetAll(Loading);
                   try {
-                      resetAll().then(res => {
-                        if (res.status === 200) {
-                          setResetAll(Done);
-                          props.onClose();
-                        } else {
-                            throw 'Error resetting the simulation'
-                        }
-                    })
+                    resetAll();
+                    setResetAll(Done);
+                    props.onClose();
                   } catch (err) {
-                    // TODO: Display error message
+                    // TODO: Display error message to user
                     console.error(err)
                   }
                 }}>
@@ -107,7 +102,7 @@ const IslandResetModal = (props: Props) => {
       })
   }
   function resetAll() {
-    return auth.authFetch('/api/reset-agent-configuration', {method: 'POST'})
+    auth.authFetch('/api/reset-agent-configuration', {method: 'POST'})
       .then(res => {
         if (res.status === 200) {
             return auth.authFetch('/api/clear-simulation-data', {method: 'POST'})
@@ -116,6 +111,11 @@ const IslandResetModal = (props: Props) => {
         if (res.status === 200) {
             return auth.authFetch('/api/island-mode', {method: 'POST', body: '{"mode": "unset"}'})
         })
+      .then(res => {
+        if (res.status !== 200) {
+          throw 'Error resetting the simulation'
+        }
+      })
 }
 
   function showModalButtons() {