diff --git a/ui/admin/app/templates/scopes/scope/groups/group/members.hbs b/ui/admin/app/templates/scopes/scope/groups/group/members.hbs index 2d27bb706..41b049302 100644 --- a/ui/admin/app/templates/scopes/scope/groups/group/members.hbs +++ b/ui/admin/app/templates/scopes/scope/groups/group/members.hbs @@ -26,62 +26,63 @@ {{#if @model.members}} - - - - {{t 'form.name.label'}} - {{t 'form.id.label'}} - {{t 'resources.scope.title'}} - {{t 'titles.actions'}} - - - - {{#each @model.members as |member|}} - - - {{member.displayName}} - {{#if member.accountName}} -
+ + <:body as |B|> + + + {{#if + (can 'read group' B.data) + }} + {{B.data.displayName}} + {{#if B.data.accountName}} +
+ {{/if}} {{/if}} -
- - - {{member.id}} - - - - - - - {{#if (can 'removeMembers group' @model.group)}} - + + + + {{B.data.id}} + + + + + + + {{#if (can 'removeMembers group' @model.group)}} + + - - {{t 'actions.remove'}} - - - {{/if}} - -
- {{/each}} -
-
+ @hasChevron={{false}} + /> + + + {{/if}} + + + + {{else}} diff --git a/ui/admin/tests/acceptance/groups/members-test.js b/ui/admin/tests/acceptance/groups/members-test.js index 5617f0a44..e87a695c3 100644 --- a/ui/admin/tests/acceptance/groups/members-test.js +++ b/ui/admin/tests/acceptance/groups/members-test.js @@ -69,7 +69,8 @@ module('Acceptance | groups | members', function (hooks) { assert.expect(2); await visit(urls.members); assert.strictEqual(findAll('tbody tr').length, membersCount); - await click('tbody tr .rose-dropdown-button-danger'); + await click('.hds-dropdown-toggle-icon'); + await click('tbody tr .hds-dropdown-list-item button'); assert.strictEqual(findAll('tbody tr').length, membersCount - 1); }); @@ -99,7 +100,8 @@ module('Acceptance | groups | members', function (hooks) { }); await visit(urls.members); assert.strictEqual(findAll('tbody tr').length, membersCount); - await click('tbody tr .rose-dropdown-button-danger'); + await click('.hds-dropdown-toggle-icon'); + await click('tbody tr .hds-dropdown-list-item button'); assert.ok(find('[role="alert"]')); }); @@ -146,7 +148,8 @@ module('Acceptance | groups | members', function (hooks) { assert.expect(4); await visit(urls.members); assert.strictEqual(findAll('tbody tr').length, membersCount); - await click('tbody tr .rose-dropdown-button-danger'); + await click('.hds-dropdown-toggle-icon'); + await click('tbody tr .hds-dropdown-list-item button'); assert.strictEqual(findAll('tbody tr').length, membersCount - 1); await click('.rose-layout-page-actions a'); assert.strictEqual(currentURL(), urls.addMembers);