diff --git a/app/assets/javascripts/token_access/components/inbound_token_access.vue b/app/assets/javascripts/token_access/components/inbound_token_access.vue index b927483ade5c1f6df51e7e1444dca95eb5f9cf9c..82d3be7b9f2f72768881dc025942bdaffdbf6df0 100644 --- a/app/assets/javascripts/token_access/components/inbound_token_access.vue +++ b/app/assets/javascripts/token_access/components/inbound_token_access.vue @@ -132,6 +132,13 @@ export default { } else { projects = project?.ciJobTokenScope?.inboundAllowlist?.nodes ?? []; groups = project?.ciJobTokenScope?.groupsAllowlist?.nodes ?? []; + const groupAllowlistAutopopulatedIds = + project?.ciJobTokenScope?.groupAllowlistAutopopulatedIds ?? []; + const inboundAllowlistAutopopulatedIds = + project?.ciJobTokenScope?.inboundAllowlistAutopopulatedIds ?? []; + + projects = this.addAutopopulatedAttribute(projects, inboundAllowlistAutopopulatedIds); + groups = this.addAutopopulatedAttribute(groups, groupAllowlistAutopopulatedIds); } return { projects, groups }; @@ -201,6 +208,7 @@ export default { ...node.target, defaultPermissions: node.defaultPermissions, jobTokenPolicies: node.jobTokenPolicies, + autopopulated: node.autopopulated, })); }, async updateCIJobTokenScope() { @@ -269,6 +277,12 @@ export default { this.namespaceToEdit = namespace; showFormFn(); }, + addAutopopulatedAttribute(collection, idList) { + return collection.map((item) => ({ + ...item, + autopopulated: idList.includes(item.id), + })); + }, }, }; diff --git a/app/assets/javascripts/token_access/components/token_access_table.vue b/app/assets/javascripts/token_access/components/token_access_table.vue index c7d1e0bb91978f234405bd1e8e00473995b0291b..d145aaac1430ef696ef794324894d6e0d618bba4 100644 --- a/app/assets/javascripts/token_access/components/token_access_table.vue +++ b/app/assets/javascripts/token_access/components/token_access_table.vue @@ -1,5 +1,13 @@