From 10dbfaad86d9cea11a03752efc81ccd16ab52d79 Mon Sep 17 00:00:00 2001
From: RachelElysia <71795832+RachelElysia@users.noreply.github.com>
Date: Mon, 6 Dec 2021 11:25:02 -0600
Subject: [PATCH] Query UI Bug: Query checkbox now reset on delete (#3203)

---
 changes/issue-3196-fix-query-checkbox-bug          |  3 +++
 .../RemovePackQueryModal/RemovePackQueryModal.tsx  |  2 +-
 .../ManageQueriesPage/ManageQueriesPage.tsx        |  3 ++-
 .../RemoveQueryModal/RemoveQueryModal.tsx          | 14 +++++++-------
 .../components/RemoveQueryModal/_styles.scss       |  2 +-
 5 files changed, 14 insertions(+), 10 deletions(-)
 create mode 100644 changes/issue-3196-fix-query-checkbox-bug

diff --git a/changes/issue-3196-fix-query-checkbox-bug b/changes/issue-3196-fix-query-checkbox-bug
new file mode 100644
index 0000000000..516ebbc119
--- /dev/null
+++ b/changes/issue-3196-fix-query-checkbox-bug
@@ -0,0 +1,3 @@
+* Policies now have proprietary queries and are managed independently from the saved queries.
+  * Amended policy creation API to support proprietary queries.
+  * Bug fix: Query checkboxes now reset upon deleting a query
\ No newline at end of file
diff --git a/frontend/pages/packs/EditPackPage/components/RemovePackQueryModal/RemovePackQueryModal.tsx b/frontend/pages/packs/EditPackPage/components/RemovePackQueryModal/RemovePackQueryModal.tsx
index fccae05a8b..0982ed6c2b 100644
--- a/frontend/pages/packs/EditPackPage/components/RemovePackQueryModal/RemovePackQueryModal.tsx
+++ b/frontend/pages/packs/EditPackPage/components/RemovePackQueryModal/RemovePackQueryModal.tsx
@@ -30,7 +30,7 @@ const RemovePackQueryModal = ({
           <Button
             className={`${baseClass}__btn`}
             onClick={onCancel}
-            variant="inverse"
+            variant="inverse-alert"
           >
             Cancel
           </Button>
diff --git a/frontend/pages/queries/ManageQueriesPage/ManageQueriesPage.tsx b/frontend/pages/queries/ManageQueriesPage/ManageQueriesPage.tsx
index ffc33f9696..1ba042f50b 100644
--- a/frontend/pages/queries/ManageQueriesPage/ManageQueriesPage.tsx
+++ b/frontend/pages/queries/ManageQueriesPage/ManageQueriesPage.tsx
@@ -144,7 +144,8 @@ const ManageQueriesPage = (): JSX.Element => {
     const queryOrQueries = selectedQueryIds.length === 1 ? "query" : "queries";
 
     const promises = selectedQueryIds.map((id: number) => {
-      return fleetQueriesAPI.destroy(id);
+      fleetQueriesAPI.destroy(id);
+      return null;
     });
 
     return Promise.all(promises)
diff --git a/frontend/pages/queries/ManageQueriesPage/components/RemoveQueryModal/RemoveQueryModal.tsx b/frontend/pages/queries/ManageQueriesPage/components/RemoveQueryModal/RemoveQueryModal.tsx
index 0f27e09c8e..bce7f5bbc6 100644
--- a/frontend/pages/queries/ManageQueriesPage/components/RemoveQueryModal/RemoveQueryModal.tsx
+++ b/frontend/pages/queries/ManageQueriesPage/components/RemoveQueryModal/RemoveQueryModal.tsx
@@ -19,13 +19,6 @@ const RemoveQueryModal = ({
       <div className={baseClass}>
         Are you sure you want to delete the selected queries?
         <div className={`${baseClass}__btn-wrap`}>
-          <Button
-            className={`${baseClass}__btn`}
-            onClick={onCancel}
-            variant="inverse-alert"
-          >
-            Cancel
-          </Button>
           <Button
             className={`${baseClass}__btn`}
             type="button"
@@ -34,6 +27,13 @@ const RemoveQueryModal = ({
           >
             Delete
           </Button>
+          <Button
+            className={`${baseClass}__btn`}
+            onClick={onCancel}
+            variant="inverse-alert"
+          >
+            Cancel
+          </Button>
         </div>
       </div>
     </Modal>
diff --git a/frontend/pages/queries/ManageQueriesPage/components/RemoveQueryModal/_styles.scss b/frontend/pages/queries/ManageQueriesPage/components/RemoveQueryModal/_styles.scss
index dd9de4b75d..c5a3de024d 100644
--- a/frontend/pages/queries/ManageQueriesPage/components/RemoveQueryModal/_styles.scss
+++ b/frontend/pages/queries/ManageQueriesPage/components/RemoveQueryModal/_styles.scss
@@ -3,7 +3,7 @@
 
   &__btn-wrap {
     display: flex;
-    justify-content: flex-end;
+    justify-content: row-reverse;
     margin-top: $pad-xxlarge;
   }