From 215331cd082bf9f6f3a523c09622c818cc4639cb Mon Sep 17 00:00:00 2001
From: RachelElysia <71795832+RachelElysia@users.noreply.github.com>
Date: Fri, 9 Jun 2023 12:56:09 -0400
Subject: [PATCH] Fleet UI: Fix released bug where deleting multiple pages of
 hosts only deleted first 50 (#12247)

---
 changes/11885-fix-bulk-delete-hosts           |  1 +
 .../hosts/ManageHostsPage/ManageHostsPage.tsx | 25 ++++++++-----------
 2 files changed, 11 insertions(+), 15 deletions(-)
 create mode 100644 changes/11885-fix-bulk-delete-hosts

diff --git a/changes/11885-fix-bulk-delete-hosts b/changes/11885-fix-bulk-delete-hosts
new file mode 100644
index 0000000000..d4a53fc711
--- /dev/null
+++ b/changes/11885-fix-bulk-delete-hosts
@@ -0,0 +1 @@
+Users can delete multiple pages of hosts
\ No newline at end of file
diff --git a/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx b/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx
index f3acb63359..0692081584 100644
--- a/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx
+++ b/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx
@@ -1003,23 +1003,18 @@ const ManageHostsPage = ({
   const onDeleteHostSubmit = async () => {
     setIsUpdatingHosts(true);
 
-    let action = hostsAPI.destroyBulk(selectedHostIds);
-
-    if (isAllMatchingHostsSelected) {
-      const teamId = isAnyTeamSelected ? currentTeamId ?? null : null;
-
-      const labelId = selectedLabel?.id;
-
-      action = hostsAPI.destroyByFilter({
-        teamId,
-        query: searchQuery,
-        status,
-        labelId,
-      });
-    }
+    const teamId = isAnyTeamSelected ? currentTeamId ?? null : null;
+    const labelId = selectedLabel?.id;
 
     try {
-      await action;
+      await (isAllMatchingHostsSelected
+        ? hostsAPI.destroyByFilter({
+            teamId,
+            query: searchQuery,
+            status,
+            labelId,
+          })
+        : hostsAPI.destroyBulk(selectedHostIds));
 
       const successMessage = `${
         selectedHostIds.length === 1 ? "Host" : "Hosts"