diff --git a/ui/admin/app/templates/scopes/scope/roles/index.hbs b/ui/admin/app/templates/scopes/scope/roles/index.hbs index 142fa8bd5..95b27dda8 100644 --- a/ui/admin/app/templates/scopes/scope/roles/index.hbs +++ b/ui/admin/app/templates/scopes/scope/roles/index.hbs @@ -32,40 +32,38 @@ {{#if @model}} - - - - - {{t 'form.name.label'}} - {{t 'form.id.label'}} - - - - {{#each @model as |role|}} - - - {{#if (can 'read model' role)}} - - {{role.displayName}} - - {{else}} - {{role.displayName}} - {{/if}} -

{{role.description}}

-
- - - {{role.id}} - - -
- {{/each}} -
-
+ + <:body as |B|> + + + {{#if (can 'read role' B.data)}} + + {{B.data.displayName}} + + {{else}} + {{B.data.displayName}} + {{/if}} +

{{B.data.description}}

+
+ + + {{B.data.id}} + + +
+ +
{{else}} diff --git a/ui/admin/tests/acceptance/roles/read-test.js b/ui/admin/tests/acceptance/roles/read-test.js index 8404247b8..15aabe613 100644 --- a/ui/admin/tests/acceptance/roles/read-test.js +++ b/ui/admin/tests/acceptance/roles/read-test.js @@ -70,7 +70,7 @@ module('Acceptance | roles | read', function (hooks) { test('can navigate to a role form', async function (assert) { assert.expect(1); await visit(urls.roles); - await click('main tbody .rose-table-header-cell:nth-child(1) a'); + await click('main tbody .hds-table__tr:nth-child(1) a'); await a11yAudit(); assert.strictEqual(currentURL(), urls.role); }); @@ -80,6 +80,6 @@ module('Acceptance | roles | read', function (hooks) { instances.role.authorized_actions = instances.role.authorized_actions.filter((item) => item !== 'read'); await visit(urls.roles); - assert.notOk(find('main tbody .rose-table-header-cell:nth-child(1) a')); + assert.notOk(find('main tbody .hds-table__tr:nth-child(1) a')); }); });