From 6b60edbe5d950ead41dcd9ae23d28ef436c06c24 Mon Sep 17 00:00:00 2001
From: Rebeccah <rhunter@redhat.com>
Date: Wed, 16 Feb 2022 17:44:29 -0500
Subject: [PATCH] filter out both hop and control nodes instead of just one or
 the other

---
 awx/ui/src/screens/InstanceGroup/Instances/InstanceList.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/awx/ui/src/screens/InstanceGroup/Instances/InstanceList.js b/awx/ui/src/screens/InstanceGroup/Instances/InstanceList.js
index 37b422576c..219fceb4dc 100644
--- a/awx/ui/src/screens/InstanceGroup/Instances/InstanceList.js
+++ b/awx/ui/src/screens/InstanceGroup/Instances/InstanceList.js
@@ -127,7 +127,7 @@ function InstanceList() {
       async (instancesToAssociate) => {
         await Promise.all(
           instancesToAssociate
-            .filter((i) => i.node_type !== 'control')
+            .filter((i) => i.node_type !== 'control' || i.node_type !== 'hop')
             .map((instance) =>
               InstanceGroupsAPI.associateInstance(instanceGroupId, instance.id)
             )
@@ -155,8 +155,7 @@ function InstanceList() {
       InstancesAPI.read(
         mergeParams(params, {
           ...{ not__rampart_groups__id: instanceGroupId },
-          ...{ not__node_type: 'control' },
-          ...{ not__node_type: 'hop' },
+          ...{ not__node_type: ['hop', 'control'] },
         })
       ),
     [instanceGroupId]