diff --git a/addons/api/mirage/factories/user.js b/addons/api/mirage/factories/user.js index 39c5abf96..00c6e8639 100644 --- a/addons/api/mirage/factories/user.js +++ b/addons/api/mirage/factories/user.js @@ -1,5 +1,13 @@ import factory from '../generated/factories/user'; +import permissions from '../helpers/permissions'; export default factory.extend({ + authorized_actions: () => + permissions.authorizedActionsFor('account') || [ + 'no-op', + 'read', + 'update', + 'delete', + ], id: (i) => `user-${i}`, }); diff --git a/ui/admin/app/components/form/user/index.hbs b/ui/admin/app/components/form/user/index.hbs index a0c3230ef..39571b820 100644 --- a/ui/admin/app/components/form/user/index.hbs +++ b/ui/admin/app/components/form/user/index.hbs @@ -45,12 +45,12 @@ {{/if}} - - - + {{#if (can 'save model' @model)}} + + {{/if}} \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/users/index.hbs b/ui/admin/app/templates/scopes/scope/users/index.hbs index 5d44a46b0..ab31bc1cf 100644 --- a/ui/admin/app/templates/scopes/scope/users/index.hbs +++ b/ui/admin/app/templates/scopes/scope/users/index.hbs @@ -37,9 +37,13 @@ {{#each @model as |user|}} - + {{#if (can 'read model' user)}} + + {{user.displayName}} + + {{else}} {{user.displayName}} - + {{/if}}

{{user.description}}

 diff --git a/ui/admin/app/templates/scopes/scope/users/user/-actions.hbs b/ui/admin/app/templates/scopes/scope/users/user/-actions.hbs index 0947bef21..4f993d425 100644 --- a/ui/admin/app/templates/scopes/scope/users/user/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/users/user/-actions.hbs @@ -1,17 +1,19 @@ - - - {{t 'resources.user.actions.add-accounts'}} - - - - {{t 'resources.user.actions.delete'}} - - \ No newline at end of file + + {{t 'resources.user.actions.add-accounts'}} + + + + {{t 'resources.user.actions.delete'}} + + +{{/if}} \ No newline at end of file diff --git a/ui/admin/tests/acceptance/users-test.js b/ui/admin/tests/acceptance/users-test.js index 065f8974b..b047a0d2a 100644 --- a/ui/admin/tests/acceptance/users-test.js +++ b/ui/admin/tests/acceptance/users-test.js @@ -2,7 +2,6 @@ import { module, test } from 'qunit'; import { visit, currentURL, click, fillIn, find } from '@ember/test-helpers'; import { setupApplicationTest } from 'ember-qunit'; import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; -import a11yAudit from 'ember-a11y-testing/test-support/audit'; import { Response } from 'miragejs'; import { authenticateSession, @@ -17,7 +16,6 @@ module('Acceptance | users', function (hooks) { let orgScope; let usersURL; - let userURL; let newUserURL; hooks.beforeEach(function () { @@ -29,31 +27,12 @@ module('Acceptance | users', function (hooks) { 'withChildren' ); - const user = this.server.create('user', { - scope: orgScope, - }); - usersURL = `/scopes/${orgScope.id}/users`; - userURL = `${usersURL}/${user.id}`; newUserURL = `${usersURL}/new`; authenticateSession({}); }); - test('visiting users', async function (assert) { - assert.expect(1); - await visit(usersURL); - await a11yAudit(); - assert.equal(currentURL(), usersURL); - }); - - test('visiting a user', async function (assert) { - assert.expect(1); - await visit(newUserURL); - await a11yAudit(); - assert.equal(currentURL(), newUserURL); - }); - test('can create new users', async function (assert) { assert.expect(1); const usersCount = this.server.db.users.length; @@ -108,90 +87,4 @@ module('Acceptance | users', function (hooks) { 'Displays field-level errors.' ); }); - - test('can save changes to an existing user', async function (assert) { - assert.expect(2); - await visit(userURL); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'Updated user name'); - await click('.rose-form-actions [type="submit"]'); - assert.equal(currentURL(), userURL); - assert.equal(this.server.db.users[0].name, 'Updated user name'); - }); - - test('can cancel changes to an existing user', async function (assert) { - assert.expect(1); - await visit(userURL); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'Unsaved user name'); - await click('.rose-form-actions [type="button"]'); - assert.notEqual(find('[name="name"]').value, 'Unsaved user name'); - }); - - test('can delete an user', async function (assert) { - assert.expect(1); - const usersCount = this.server.db.users.length; - await visit(userURL); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.equal(this.server.db.users.length, usersCount - 1); - }); - - test('saving an existing user with invalid fields displays error messages', async function (assert) { - assert.expect(2); - this.server.patch('/users/:id', () => { - return new Response( - 400, - {}, - { - status: 400, - code: 'invalid_argument', - message: 'The request was invalid.', - details: { - request_fields: [ - { - name: 'name', - description: 'Name is required.', - }, - ], - }, - } - ); - }); - await visit(userURL); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'User name'); - await click('[type="submit"]'); - assert.ok( - find('[role="alert"]').textContent.trim(), - 'The request was invalid.', - 'Displays primary error message.' - ); - assert.ok( - find('.rose-form-error-message').textContent.trim(), - 'Name is required.', - 'Displays field-level errors.' - ); - }); - - test('errors are displayed when user deletion fails', async function (assert) { - assert.expect(1); - this.server.del('/users/:id', () => { - return new Response( - 490, - {}, - { - status: 490, - code: 'error', - message: 'Oops.', - } - ); - }); - await visit(userURL); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.ok( - find('[role="alert"]').textContent.trim(), - 'Oops.', - 'Displays primary error message.' - ); - }); }); diff --git a/ui/admin/tests/acceptance/users/delete-test.js b/ui/admin/tests/acceptance/users/delete-test.js new file mode 100644 index 000000000..45933206a --- /dev/null +++ b/ui/admin/tests/acceptance/users/delete-test.js @@ -0,0 +1,86 @@ +import { module, test } from 'qunit'; +import { visit, click, find } from '@ember/test-helpers'; +import { setupApplicationTest } from 'ember-qunit'; +import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; +import { Response } from 'miragejs'; +import { + authenticateSession, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | users', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + let orgScope; + let usersURL; + let userURL; + + const instances = { + scopes: { + global: null, + org: null, + }, + user: null, + }; + hooks.beforeEach(function () { + orgScope = this.server.create( + 'scope', + { + type: 'org', + }, + 'withChildren' + ); + + instances.user = this.server.create('user', { + scope: orgScope, + }); + //instances.user = this.server.schema.users.all().models[0]; + usersURL = `/scopes/${orgScope.id}/users`; + userURL = `${usersURL}/${instances.user.id}`; + + authenticateSession({}); + }); + + test('can delete an user', async function (assert) { + assert.expect(1); + const usersCount = this.server.db.users.length; + await visit(userURL); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(this.server.db.users.length, usersCount - 1); + }); + + test('cannot delete a user without proper authorization', async function (assert) { + assert.expect(1); + instances.user.authorized_actions = + instances.user.authorized_actions.filter((item) => item !== 'delete'); + await visit(userURL); + assert.notOk( + find('.rose-layout-page-actions .rose-dropdown-button-danger') + ); + }); + + test('errors are displayed when user deletion fails', async function (assert) { + assert.expect(1); + this.server.del('/users/:id', () => { + return new Response( + 490, + {}, + { + status: 490, + code: 'error', + message: 'Oops.', + } + ); + }); + await visit(userURL); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.ok( + find('[role="alert"]').textContent.trim(), + 'Oops.', + 'Displays primary error message.' + ); + }); +}); diff --git a/ui/admin/tests/acceptance/users/read-test.js b/ui/admin/tests/acceptance/users/read-test.js new file mode 100644 index 000000000..551cf96f6 --- /dev/null +++ b/ui/admin/tests/acceptance/users/read-test.js @@ -0,0 +1,56 @@ +import { module, test } from 'qunit'; +import { visit, currentURL, find } from '@ember/test-helpers'; +import { setupApplicationTest } from 'ember-qunit'; +import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; +import a11yAudit from 'ember-a11y-testing/test-support/audit'; +import { + authenticateSession, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | users', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + let orgScope; + let usersURL; + + const instances = { + scopes: { + global: null, + org: null, + }, + user: null, + }; + hooks.beforeEach(function () { + orgScope = this.server.create( + 'scope', + { + type: 'org', + }, + 'withChildren' + ); + instances.user = this.server.create('user', { + scope: orgScope, + }); + usersURL = `/scopes/${orgScope.id}/users`; + authenticateSession({}); + }); + + test('visiting users', async function (assert) { + assert.expect(1); + await visit(usersURL); + await a11yAudit(); + assert.equal(currentURL(), usersURL); + }); + + test('cannot navigate to an account form without proper authorization', async function (assert) { + assert.expect(1); + instances.user.authorized_actions = + instances.user.authorized_actions.filter((item) => item !== 'read'); + await visit(usersURL); + assert.notOk(find('main tbody .rose-table-header-cell:nth-child(1) a')); + }); +}); diff --git a/ui/admin/tests/acceptance/users/update-test.js b/ui/admin/tests/acceptance/users/update-test.js new file mode 100644 index 000000000..eade03c6b --- /dev/null +++ b/ui/admin/tests/acceptance/users/update-test.js @@ -0,0 +1,94 @@ +import { module, test } from 'qunit'; +import { visit, currentURL, click, fillIn, find } from '@ember/test-helpers'; +import { setupApplicationTest } from 'ember-qunit'; +import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; +import { Response } from 'miragejs'; +import { + authenticateSession, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | users', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + let orgScope; + let usersURL; + let userURL; + + hooks.beforeEach(function () { + orgScope = this.server.create( + 'scope', + { + type: 'org', + }, + 'withChildren' + ); + + const user = this.server.create('user', { + scope: orgScope, + }); + + usersURL = `/scopes/${orgScope.id}/users`; + userURL = `${usersURL}/${user.id}`; + + authenticateSession({}); + }); + test('can save changes to an existing user', async function (assert) { + assert.expect(2); + await visit(userURL); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'Updated user name'); + await click('.rose-form-actions [type="submit"]'); + assert.equal(currentURL(), userURL); + assert.equal(this.server.db.users[0].name, 'Updated user name'); + }); + + test('can cancel changes to an existing user', async function (assert) { + assert.expect(1); + await visit(userURL); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'Unsaved user name'); + await click('.rose-form-actions [type="button"]'); + assert.notEqual(find('[name="name"]').value, 'Unsaved user name'); + }); + + test('saving an existing user with invalid fields displays error messages', async function (assert) { + assert.expect(2); + this.server.patch('/users/:id', () => { + return new Response( + 400, + {}, + { + status: 400, + code: 'invalid_argument', + message: 'The request was invalid.', + details: { + request_fields: [ + { + name: 'name', + description: 'Name is required.', + }, + ], + }, + } + ); + }); + await visit(userURL); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'User name'); + await click('[type="submit"]'); + assert.ok( + find('[role="alert"]').textContent.trim(), + 'The request was invalid.', + 'Displays primary error message.' + ); + assert.ok( + find('.rose-form-error-message').textContent.trim(), + 'Name is required.', + 'Displays field-level errors.' + ); + }); +}); diff --git a/yarn.lock b/yarn.lock index e32eb765e..796961516 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7682,7 +7682,7 @@ debug@^3.0.0, debug@^3.0.1, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6: dependencies: ms "^2.1.1" -debuglog@*, debuglog@^1.0.1: +debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= @@ -12399,7 +12399,7 @@ import-lazy@^4.0.0: resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153" integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw== -imurmurhash@*, imurmurhash@^0.1.4: +imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= @@ -14091,11 +14091,6 @@ lodash._baseflatten@^3.0.0: lodash.isarguments "^3.0.0" lodash.isarray "^3.0.0" -lodash._baseindexof@*: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c" - integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw= - lodash._baseuniq@~4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8" @@ -14104,16 +14099,11 @@ lodash._baseuniq@~4.6.0: lodash._createset "~4.0.0" lodash._root "~3.0.0" -lodash._bindcallback@*, lodash._bindcallback@^3.0.0: +lodash._bindcallback@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4= -lodash._cacheindexof@*: - version "3.0.2" - resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92" - integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI= - lodash._createassigner@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11" @@ -14123,19 +14113,12 @@ lodash._createassigner@^3.0.0: lodash._isiterateecall "^3.0.0" lodash.restparam "^3.0.0" -lodash._createcache@*: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093" - integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM= - dependencies: - lodash._getnative "^3.0.0" - lodash._createset@~4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26" integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY= -lodash._getnative@*, lodash._getnative@^3.0.0: +lodash._getnative@^3.0.0: version "3.9.1" resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= @@ -14353,7 +14336,7 @@ lodash.pick@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3" integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM= -lodash.restparam@*, lodash.restparam@^3.0.0: +lodash.restparam@^3.0.0: version "3.6.1" resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=