From 61c3bea6152c7df9c413069c146bc400e1012112 Mon Sep 17 00:00:00 2001
From: Sriniketh Varma <srinikethvarma22@gmail.com>
Date: Mon, 16 Dec 2019 14:11:42 -0500
Subject: [PATCH 1/3] Added new button in the Web-UI to delete agents

---
 web/htdocs/index.html   | 25 ++++++++++++++++++++++++-
 web/htdocs/js/shield.js | 22 ++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/web/htdocs/index.html b/web/htdocs/index.html
index a056d5a8c..9430cc642 100755
--- a/web/htdocs/index.html
+++ b/web/htdocs/index.html
@@ -2961,7 +2961,8 @@ <h2>[[= _.heading ]]</h2>
                   <td>[[ if (agent.hidden) { ]]no[[ } else { ]]yes[[ } ]]</td>
                   <td>[[ if (agent.hidden) { ]]<a href="#" rel="show">show</a>
                       [[ } else            { ]]<a href="#" rel="hide">hide</a>[[ } ]]
-                      | <a href="#" rel="resync">resync</a></td>
+                      | <a href="#" rel="resync">resync</a>
+                      | <a href="#" rel="delete">delete</a></td>
                 </tr>
                 [[ if (problems.length != 0 || agent.last_error != '') { ]]
                 <tr class="note fail">
@@ -2980,6 +2981,28 @@ <h2>[[= _.heading ]]</h2>
             </table>
             [[ } ]]
     <!-- }}} --></script>
+    <script type="text/html" id="template:agents-delete"><!-- {{{ -->
+      [[#
+        {agents-delete}
+
+        A modal interaction screen that requires the operator to acknowledge
+        that what they are about to do will result in the destruction of
+        configuration data.
+      ]]
+          <div class="confirm">
+            <h2>Delete The <em>[[= h(_.agent.name) ]]</em> Agent?</h2>
+
+            <p>You have requested that SHIELD remove the configuration for
+            the agent "[[= h(_.agent.name) ]]".  <em>This is a
+            irreversible action; it cannot be undone.</em></p>
+
+            <p class="q">Are you sure you want to delete <em>[[= h(_.agent.name) ]]</em>?</p>
+            <div class="a">
+              <button class="safe" rel="close">No, Keep It</button>
+              <button class="danger" rel="yes">Yes, Delete It</button>
+            </div>
+          </div>
+    <!-- }}} --></script>
     <script type="text/html" id="template:auth-providers"><!-- {{{ -->
       [[#
         {auth-providers} template
diff --git a/web/htdocs/js/shield.js b/web/htdocs/js/shield.js
index 7801b3dc5..b417a46aa 100644
--- a/web/htdocs/js/shield.js
+++ b/web/htdocs/js/shield.js
@@ -642,6 +642,28 @@ function dispatch(page) {
                   banner("Resynchronization of agent underway");
                 }
               });
+            } else if (action == 'delete') {
+              var agent_uuid = $(event.target).extract('agent-uuid');
+              modal($($.template('agents-delete', { agent: data.agents[0] }))
+              .on('click', '[rel="yes"]', function (event) {
+                event.preventDefault();
+                api({
+                  type: 'DELETE',
+                  url:  '/v2/agents/'+agent_uuid,
+                  error: "Unable to delete agent",
+                  complete: function () {
+                    modal(true);
+                  },
+                  success: function (event) {
+                    goto('#!/admin/agents');
+                  }
+                });
+              })
+              .on('click', '[rel="close"]', function (event) {
+                  modal(true);
+                  goto('#!/admin/agents');
+                })
+              );
             }
           }));
       }

From bcf3a1496c40dd0a9087185483df3bda6a154993 Mon Sep 17 00:00:00 2001
From: Sriniketh Varma <srinikethvarma22@gmail.com>
Date: Mon, 16 Dec 2019 14:29:23 -0500
Subject: [PATCH 2/3] fixed typo in confirm box

---
 web/htdocs/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/htdocs/index.html b/web/htdocs/index.html
index 9430cc642..4e6633b5a 100755
--- a/web/htdocs/index.html
+++ b/web/htdocs/index.html
@@ -2993,7 +2993,7 @@ <h2>[[= _.heading ]]</h2>
             <h2>Delete The <em>[[= h(_.agent.name) ]]</em> Agent?</h2>
 
             <p>You have requested that SHIELD remove the configuration for
-            the agent "[[= h(_.agent.name) ]]".  <em>This is a
+            the agent "[[= h(_.agent.name) ]]".  <em>This is an
             irreversible action; it cannot be undone.</em></p>
 
             <p class="q">Are you sure you want to delete <em>[[= h(_.agent.name) ]]</em>?</p>

From 8c22023c7af4d09111093b5a0a0c8084a9bbc61d Mon Sep 17 00:00:00 2001
From: Sriniketh Varma <srinikethvarma22@gmail.com>
Date: Mon, 16 Dec 2019 14:35:50 -0500
Subject: [PATCH 3/3] fixed type for deleting cloud storage

---
 web/htdocs/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/htdocs/index.html b/web/htdocs/index.html
index 4e6633b5a..fa97cb504 100755
--- a/web/htdocs/index.html
+++ b/web/htdocs/index.html
@@ -2661,7 +2661,7 @@ <h2>[[ if (_.store) { ]]Edit[[ } else { ]]New[[ } ]] Storage System</h2>
             <h2>Delete The <em>[[= h(_.store.name) ]]</em> Cloud Storage System?</h2>
 
             <p>You have requested that SHIELD remove the configuration for
-            the cloud storage system "[[= h(_.store.name) ]]".  <em>This is a
+            the cloud storage system "[[= h(_.store.name) ]]".  <em>This is an
             irreversible action; it cannot be undone.</em></p>
 
             <p class="q">Are you sure you want to delete <em>[[= h(_.store.name) ]]</em>?</p>