External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-22 05:30:18 -03:30
Code Issues Packages Projects Releases Wiki Activity

filter out both hop and control nodes instead of just one or the other

Browse Source
This commit is contained in:
Rebeccah
2022-02-16 17:44:29 -05:00
parent a94a602ccd
commit 6b60edbe5d
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/src/screens/InstanceGroup/Instances/InstanceList.js
View File

@@ -127,7 +127,7 @@ function InstanceList() {
async (instancesToAssociate) => { async (instancesToAssociate) => {
await Promise.all( await Promise.all(
instancesToAssociate instancesToAssociate
.filter((i) => i.node_type !== 'control') .filter((i) => i.node_type !== 'control' || i.node_type !== 'hop')
.map((instance) => .map((instance) =>
InstanceGroupsAPI.associateInstance(instanceGroupId, instance.id) InstanceGroupsAPI.associateInstance(instanceGroupId, instance.id)
) )
@@ -155,8 +155,7 @@ function InstanceList() {
InstancesAPI.read( InstancesAPI.read(
mergeParams(params, { mergeParams(params, {
...{ not__rampart_groups__id: instanceGroupId }, ...{ not__rampart_groups__id: instanceGroupId },
...{ not__node_type: 'control' }, ...{ not__node_type: ['hop', 'control'] },
...{ not__node_type: 'hop' },
}) })
), ),
[instanceGroupId] [instanceGroupId]