diff --git a/app/assets/javascripts/invite_members/components/invite_members_modal.vue b/app/assets/javascripts/invite_members/components/invite_members_modal.vue index 4f6ca5c5638faa5518204598d0ceade4642931a1..c9aa00830786d3b607479e29cf7bb4cf2248244c 100644 --- a/app/assets/javascripts/invite_members/components/invite_members_modal.vue +++ b/app/assets/javascripts/invite_members/components/invite_members_modal.vue @@ -509,7 +509,7 @@ export default { :exception-state="exceptionState" :users-filter="usersFilter" :filter-id="filterId" - :root-group-id="rootId" + :group-id="id" :invalid-members="invalidMembers" @clear="clearValidation" @token-remove="removeToken" diff --git a/app/assets/javascripts/invite_members/components/members_token_select.vue b/app/assets/javascripts/invite_members/components/members_token_select.vue index 0e3f2890b29898949c76e6b4b62d89266e9f73c4..4e2165dec6bdab212d2967001d34e659c584b215 100644 --- a/app/assets/javascripts/invite_members/components/members_token_select.vue +++ b/app/assets/javascripts/invite_members/components/members_token_select.vue @@ -62,7 +62,7 @@ export default { required: false, default: '', }, - rootGroupId: { + groupId: { type: String, required: true, }, @@ -149,7 +149,7 @@ export default { }, retrieveUsersRequest() { if (this.usersFilter === USERS_FILTER_SAML_PROVIDER_ID && this.glFeatures.groupUserSaml) { - return getGroupUsers(this.query, this.rootGroupId, this.queryOptions); + return getGroupUsers(this.query, this.groupId, this.queryOptions); } return getUsers(this.query, this.queryOptions); diff --git a/spec/frontend/invite_members/components/members_token_select_spec.js b/spec/frontend/invite_members/components/members_token_select_spec.js index a2b21367388884e75a1b8abdb65b4d03d2edcc06..7bfa49731080cab34b05086a434b7423d4581393 100644 --- a/spec/frontend/invite_members/components/members_token_select_spec.js +++ b/spec/frontend/invite_members/components/members_token_select_spec.js @@ -10,7 +10,7 @@ import * as Sentry from '~/sentry/sentry_browser_wrapper'; const label = 'testgroup'; const placeholder = 'Search for a member'; -const rootGroupId = '31'; +const groupId = '31'; const user1 = { id: 1, name: 'John Smith', username: 'one_1', avatar_url: '' }; const user2 = { id: 2, name: 'Jane Doe', username: 'two_2', avatar_url: '' }; const allUsers = [user1, user2]; @@ -22,7 +22,7 @@ const createComponent = (props = {}, glFeatures = {}) => { ariaLabelledby: label, invalidMembers: {}, placeholder, - rootGroupId, + groupId, ...props, }, provide: { glFeatures }, @@ -247,7 +247,7 @@ describe('MembersTokenSelect', () => { }); it('calls the group API with correct parameters', () => { - expect(UserApi.getGroupUsers).toHaveBeenCalledWith(searchParam, rootGroupId, { + expect(UserApi.getGroupUsers).toHaveBeenCalledWith(searchParam, groupId, { active: true, include_saml_users: true, include_service_accounts: true,