From 6619cc39f756cfcec31af22e56ad5dee8016bdec Mon Sep 17 00:00:00 2001
From: Alex Corey <alex.swansboro@gmail.com>
Date: Mon, 12 Sep 2022 15:46:05 -0400
Subject: [PATCH] properly deprovisions instance

---
 awx/ui/src/api/models/Instances.js                          | 2 +-
 awx/ui/src/screens/Instances/InstanceList/InstanceList.js   | 2 +-
 awx/ui/src/screens/Instances/Shared/RemoveInstanceButton.js | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/awx/ui/src/api/models/Instances.js b/awx/ui/src/api/models/Instances.js
index 21445ff02a..9434c94be3 100644
--- a/awx/ui/src/api/models/Instances.js
+++ b/awx/ui/src/api/models/Instances.js
@@ -27,7 +27,7 @@ class Instances extends Base {
   }
 
   deprovisionInstance(instanceId) {
-    return this.http.post(`${this.baseUrl}${instanceId}`, {
+    return this.http.patch(`${this.baseUrl}${instanceId}/`, {
       node_state: 'deprovisioning',
     });
   }
diff --git a/awx/ui/src/screens/Instances/InstanceList/InstanceList.js b/awx/ui/src/screens/Instances/InstanceList/InstanceList.js
index 88d1d4041b..f73fad8c44 100644
--- a/awx/ui/src/screens/Instances/InstanceList/InstanceList.js
+++ b/awx/ui/src/screens/Instances/InstanceList/InstanceList.js
@@ -110,7 +110,7 @@ function InstanceList() {
       Promise.all(
         selected.map(({ id }) => InstancesAPI.deprovisionInstance(id))
       ),
-    { fetchItems: fetchInstances }
+    { fetchItems: fetchInstances, qsConfig: QS_CONFIG }
   );
 
   return (
diff --git a/awx/ui/src/screens/Instances/Shared/RemoveInstanceButton.js b/awx/ui/src/screens/Instances/Shared/RemoveInstanceButton.js
index eee605c989..b6b1fb2986 100644
--- a/awx/ui/src/screens/Instances/Shared/RemoveInstanceButton.js
+++ b/awx/ui/src/screens/Instances/Shared/RemoveInstanceButton.js
@@ -38,7 +38,7 @@ function RemoveInstanceButton({ itemsToRemove, onRemove, isK8s }) {
   const toggleModal = async (isOpen) => {
     setRemoveDetails(null);
     setIsLoading(true);
-    if (isOpen && itemsToRemove.length === 1) {
+    if (isOpen && itemsToRemove.length > 0) {
       const { results, error } = await getRelatedResourceDeleteCounts(
         relatedResourceDeleteRequests.instance(itemsToRemove[0])
       );
@@ -85,7 +85,7 @@ function RemoveInstanceButton({ itemsToRemove, onRemove, isK8s }) {
       <Plural
         value={itemsToRemove.length}
         one="This intance is currently being used by other resources. Are you sure you want to delete it?"
-        other="Deleting these instances could impact other resources that rely on them. Are you sure you want to delete anyway?"
+        other="Deprovisioning these instances could impact other resources that rely on them. Are you sure you want to delete anyway?"
       />
       {removeDetails &&
         Object.entries(removeDetails).map(([key, value]) => (