From cde0df937f703d85ae5e92540f92f36bf6f5a189 Mon Sep 17 00:00:00 2001
From: Kia Lam <digitalanime@gmail.com>
Date: Thu, 26 Aug 2021 12:47:43 -0400
Subject: [PATCH] Filter out instances with node_type equal to 'control'.

---
 .../InstanceGroup/Instances/InstanceList.js   | 23 +++++++++++++------
 .../Instances/InstanceListItem.js             |  2 +-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/awx/ui/src/screens/InstanceGroup/Instances/InstanceList.js b/awx/ui/src/screens/InstanceGroup/Instances/InstanceList.js
index c8cf075436..94e8327fca 100644
--- a/awx/ui/src/screens/InstanceGroup/Instances/InstanceList.js
+++ b/awx/ui/src/screens/InstanceGroup/Instances/InstanceList.js
@@ -90,9 +90,14 @@ function InstanceList() {
     useCallback(
       () =>
         Promise.all(
-          selected.map((instance) =>
-            InstanceGroupsAPI.disassociateInstance(instanceGroupId, instance.id)
-          )
+          selected
+            .filter((s) => s.node_type !== 'control')
+            .map((instance) =>
+              InstanceGroupsAPI.disassociateInstance(
+                instanceGroupId,
+                instance.id
+              )
+            )
         ),
       [instanceGroupId, selected]
     ),
@@ -107,9 +112,11 @@ function InstanceList() {
     useCallback(
       async (instancesToAssociate) => {
         await Promise.all(
-          instancesToAssociate.map((instance) =>
-            InstanceGroupsAPI.associateInstance(instanceGroupId, instance.id)
-          )
+          instancesToAssociate
+            .filter((i) => i.node_type !== 'control')
+            .map((instance) =>
+              InstanceGroupsAPI.associateInstance(instanceGroupId, instance.id)
+            )
         );
         fetchInstances();
       },
@@ -187,7 +194,9 @@ function InstanceList() {
                 verifyCannotDisassociate={false}
                 key="disassociate"
                 onDisassociate={handleDisassociate}
-                itemsToDisassociate={selected}
+                itemsToDisassociate={selected.filter(
+                  (s) => s.node_type !== 'control'
+                )}
                 modalTitle={t`Disassociate instance from instance group?`}
               />,
             ]}
diff --git a/awx/ui/src/screens/InstanceGroup/Instances/InstanceListItem.js b/awx/ui/src/screens/InstanceGroup/Instances/InstanceListItem.js
index 60b6e9e505..d3891e3755 100644
--- a/awx/ui/src/screens/InstanceGroup/Instances/InstanceListItem.js
+++ b/awx/ui/src/screens/InstanceGroup/Instances/InstanceListItem.js
@@ -106,7 +106,7 @@ function InstanceListItem({
         <Td
           select={{
             rowIndex,
-            isSelected,
+            isSelected: isSelected && instance.node_type !== 'control',
             onSelect,
             disable: instance.node_type === 'control',
           }}