From 87619dc9dcaf9a0053a261002839f22ea3fd52b9 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Fri, 27 Aug 2021 14:43:18 -0400 Subject: [PATCH 01/12] =?UTF-8?q?test:=20=F0=9F=92=8D=20separate=20delete?= =?UTF-8?q?=20and=20update=20tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/admin/tests/acceptance/scopes-test.js | 155 ---------------- .../tests/acceptance/scopes/delete-test.js | 127 +++++++++++++ .../tests/acceptance/scopes/update-test.js | 174 ++++++++++++++++++ 3 files changed, 301 insertions(+), 155 deletions(-) create mode 100644 ui/admin/tests/acceptance/scopes/delete-test.js create mode 100644 ui/admin/tests/acceptance/scopes/update-test.js diff --git a/ui/admin/tests/acceptance/scopes-test.js b/ui/admin/tests/acceptance/scopes-test.js index df294416b..87a2e5656 100644 --- a/ui/admin/tests/acceptance/scopes-test.js +++ b/ui/admin/tests/acceptance/scopes-test.js @@ -4,8 +4,6 @@ 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 { resolve, reject } from 'rsvp'; -import sinon from 'sinon'; import { authenticateSession, // These are left here intentionally for future reference. @@ -202,157 +200,4 @@ module('Acceptance | scopes', function (hooks) { 'Name is required.' ); }); - - test('can save changes to existing scope', async function (assert) { - assert.expect(3); - assert.notEqual(instances.scopes.org.name, 'random string'); - await visit(urls.orgScopeEdit); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'random string'); - await click('.rose-form-actions [type="submit"]'); - assert.equal(currentURL(), urls.orgScopeEdit); - assert.equal( - this.server.schema.scopes.where({ type: 'org' }).models[0].name, - 'random string' - ); - }); - - test('can cancel changes to existing scope', async function (assert) { - assert.expect(2); - await visit(urls.orgScopeEdit); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'random string'); - await click('.rose-form-actions [type="button"]'); - assert.notEqual(instances.scopes.org.name, 'random string'); - assert.equal(find('[name="name"]').value, instances.scopes.org.name); - }); - - test('saving an existing scope with invalid fields displays error messages', async function (assert) { - assert.expect(2); - this.server.patch('/scopes/: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(urls.orgScopeEdit); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'random string'); - await click('[type="submit"]'); - assert.ok( - find('[role="alert"]').textContent.trim(), - 'The request was invalid.' - ); - assert.ok( - find('.rose-form-error-message').textContent.trim(), - 'Name is required.' - ); - }); - - test('can discard unsaved scope changes via dialog', async function (assert) { - assert.expect(5); - const confirmService = this.owner.lookup('service:confirm'); - confirmService.enabled = true; - assert.notEqual(instances.scopes.org.name, 'random string'); - await visit(urls.orgScopeEdit); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'random string'); - assert.equal(currentURL(), urls.orgScopeEdit); - try { - await visit(urls.globalScope); - } catch (e) { - assert.ok(find('.rose-dialog')); - await click('.rose-dialog-footer button:first-child'); - assert.equal(currentURL(), urls.globalScope); - assert.notEqual( - this.server.schema.scopes.where({ type: 'org' }).models[0].name, - 'random string' - ); - } - }); - - test('can cancel discard unsaved scope changes via dialog', async function (assert) { - assert.expect(5); - const confirmService = this.owner.lookup('service:confirm'); - confirmService.enabled = true; - assert.notEqual(instances.scopes.org.name, 'random string'); - await visit(urls.orgScopeEdit); - await click('form [type="button"]', 'Activate edit mode'); - await fillIn('[name="name"]', 'random string'); - assert.equal(currentURL(), urls.orgScopeEdit); - try { - await visit(urls.globalScope); - } catch (e) { - assert.ok(find('.rose-dialog')); - await click('.rose-dialog-footer button:last-child'); - assert.equal(currentURL(), urls.orgScopeEdit); - assert.notEqual( - this.server.schema.scopes.where({ type: 'org' }).models[0].name, - 'random string' - ); - } - }); - - test('can delete scope', async function (assert) { - assert.expect(1); - const orgScopeCount = getScopeCount('org'); - await visit(urls.orgScopeEdit); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.equal(getScopeCount('org'), orgScopeCount - 1); - }); - - test('can accept delete scope via dialog', async function (assert) { - assert.expect(2); - const confirmService = this.owner.lookup('service:confirm'); - confirmService.enabled = true; - confirmService.confirm = sinon.fake.returns(resolve()); - const orgScopeCount = getScopeCount('org'); - await visit(urls.orgScopeEdit); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.equal(getScopeCount('org'), orgScopeCount - 1); - assert.ok(confirmService.confirm.calledOnce); - }); - - test('cannot cancel delete scope via dialog', async function (assert) { - assert.expect(2); - const confirmService = this.owner.lookup('service:confirm'); - confirmService.enabled = true; - confirmService.confirm = sinon.fake.returns(reject()); - const orgScopeCount = getScopeCount('org'); - await visit(urls.orgScopeEdit); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.equal(getScopeCount('org'), orgScopeCount); - assert.ok(confirmService.confirm.calledOnce); - }); - - test('deleting a scope which errors displays error messages', async function (assert) { - assert.expect(1); - this.server.del('/scopes/:id', () => { - return new Response( - 490, - {}, - { - status: 490, - code: 'error', - message: 'Oops.', - } - ); - }); - await visit(urls.orgScopeEdit); - await click('.rose-layout-page-actions .rose-dropdown-button-danger'); - assert.ok(find('[role="alert"]').textContent.trim(), 'Oops.'); - }); }); diff --git a/ui/admin/tests/acceptance/scopes/delete-test.js b/ui/admin/tests/acceptance/scopes/delete-test.js new file mode 100644 index 000000000..1651dd0b6 --- /dev/null +++ b/ui/admin/tests/acceptance/scopes/delete-test.js @@ -0,0 +1,127 @@ +import { module, test } from 'qunit'; +import { visit, find, click } from '@ember/test-helpers'; +import { setupApplicationTest } from 'ember-qunit'; +import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; +import { Response } from 'miragejs'; +import { resolve, reject } from 'rsvp'; +import sinon from 'sinon'; +import { + authenticateSession, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | scopes | delete', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + let getScopeCount; + + const instances = { + scopes: { + global: null, + org: null, + org2: null, + project: null, + project2: null, + }, + }; + const urls = { + globalScope: null, + orgScope: null, + org2Scope: null, + orgScopeEdit: null, + org2ScopeEdit: null, + projectScope: null, + project2Scope: null, + projectScopeEdit: null, + project2ScopeEdit: null, + }; + + hooks.beforeEach(function () { + // Generate resources + instances.scopes.global = this.server.create('scope', { id: 'global' }); + instances.scopes.org = this.server.create('scope', { + type: 'org', + scope: { id: 'global', type: 'global' }, + }); + instances.scopes.org2 = this.server.create('scope', { + type: 'org', + scope: { id: 'global', type: 'global' }, + }); + instances.scopes.project = this.server.create('scope', { + type: 'project', + scope: { id: instances.scopes.org.id, type: 'org' }, + }); + instances.scopes.project2 = this.server.create('scope', { + type: 'project', + scope: { id: instances.scopes.org.id, type: 'org' }, + }); + // Generate route URLs for resources + urls.globalScope = `/scopes/global/scopes`; + urls.newOrgScope = `/scopes/global/new`; + urls.orgScope = `/scopes/${instances.scopes.org.id}/scopes`; + urls.org2Scope = `/scopes/${instances.scopes.org2.id}/scopes`; + urls.orgScopeEdit = `/scopes/${instances.scopes.org.id}/edit`; + urls.org2ScopeEdit = `/scopes/${instances.scopes.org2.id}/edit`; + urls.newProjectScope = `/scopes/${instances.scopes.org.id}/new`; + urls.projectScope = `/scopes/${instances.scopes.project.id}`; + urls.project2Scope = `/scopes/${instances.scopes.project2.id}`; + urls.projectScopeEdit = `/scopes/${instances.scopes.project.id}/edit`; + urls.project2ScopeEdit = `/scopes/${instances.scopes.project2.id}/edit`; + // Generate resource couner + getScopeCount = (type) => this.server.schema.scopes.where({ type }).length; + authenticateSession({}); + }); + + test('can delete scope', async function (assert) { + assert.expect(1); + const orgScopeCount = getScopeCount('org'); + await visit(urls.orgScopeEdit); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(getScopeCount('org'), orgScopeCount - 1); + }); + + test('can accept delete scope via dialog', async function (assert) { + assert.expect(2); + const confirmService = this.owner.lookup('service:confirm'); + confirmService.enabled = true; + confirmService.confirm = sinon.fake.returns(resolve()); + const orgScopeCount = getScopeCount('org'); + await visit(urls.orgScopeEdit); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(getScopeCount('org'), orgScopeCount - 1); + assert.ok(confirmService.confirm.calledOnce); + }); + + test('cannot cancel delete scope via dialog', async function (assert) { + assert.expect(2); + const confirmService = this.owner.lookup('service:confirm'); + confirmService.enabled = true; + confirmService.confirm = sinon.fake.returns(reject()); + const orgScopeCount = getScopeCount('org'); + await visit(urls.orgScopeEdit); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.equal(getScopeCount('org'), orgScopeCount); + assert.ok(confirmService.confirm.calledOnce); + }); + + test('deleting a scope which errors displays error messages', async function (assert) { + assert.expect(1); + this.server.del('/scopes/:id', () => { + return new Response( + 490, + {}, + { + status: 490, + code: 'error', + message: 'Oops.', + } + ); + }); + await visit(urls.orgScopeEdit); + await click('.rose-layout-page-actions .rose-dropdown-button-danger'); + assert.ok(find('[role="alert"]').textContent.trim(), 'Oops.'); + }); +}); diff --git a/ui/admin/tests/acceptance/scopes/update-test.js b/ui/admin/tests/acceptance/scopes/update-test.js new file mode 100644 index 000000000..1d7a4974b --- /dev/null +++ b/ui/admin/tests/acceptance/scopes/update-test.js @@ -0,0 +1,174 @@ +import { module, test } from 'qunit'; +import { visit, currentURL, find, click, fillIn } 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 | scopes | update', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + org2: null, + project: null, + project2: null, + }, + }; + const urls = { + globalScope: null, + orgScope: null, + org2Scope: null, + orgScopeEdit: null, + org2ScopeEdit: null, + projectScope: null, + project2Scope: null, + projectScopeEdit: null, + project2ScopeEdit: null, + }; + + hooks.beforeEach(function () { + // Generate resources + instances.scopes.global = this.server.create('scope', { id: 'global' }); + instances.scopes.org = this.server.create('scope', { + type: 'org', + scope: { id: 'global', type: 'global' }, + }); + instances.scopes.org2 = this.server.create('scope', { + type: 'org', + scope: { id: 'global', type: 'global' }, + }); + instances.scopes.project = this.server.create('scope', { + type: 'project', + scope: { id: instances.scopes.org.id, type: 'org' }, + }); + instances.scopes.project2 = this.server.create('scope', { + type: 'project', + scope: { id: instances.scopes.org.id, type: 'org' }, + }); + // Generate route URLs for resources + urls.globalScope = `/scopes/global/scopes`; + urls.newOrgScope = `/scopes/global/new`; + urls.orgScope = `/scopes/${instances.scopes.org.id}/scopes`; + urls.org2Scope = `/scopes/${instances.scopes.org2.id}/scopes`; + urls.orgScopeEdit = `/scopes/${instances.scopes.org.id}/edit`; + urls.org2ScopeEdit = `/scopes/${instances.scopes.org2.id}/edit`; + urls.newProjectScope = `/scopes/${instances.scopes.org.id}/new`; + urls.projectScope = `/scopes/${instances.scopes.project.id}`; + urls.project2Scope = `/scopes/${instances.scopes.project2.id}`; + urls.projectScopeEdit = `/scopes/${instances.scopes.project.id}/edit`; + urls.project2ScopeEdit = `/scopes/${instances.scopes.project2.id}/edit`; + authenticateSession({}); + }); + + test('can save changes to existing scope', async function (assert) { + assert.expect(3); + assert.notEqual(instances.scopes.org.name, 'random string'); + await visit(urls.orgScopeEdit); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'random string'); + await click('.rose-form-actions [type="submit"]'); + assert.equal(currentURL(), urls.orgScopeEdit); + assert.equal( + this.server.schema.scopes.where({ type: 'org' }).models[0].name, + 'random string' + ); + }); + + test('can cancel changes to existing scope', async function (assert) { + assert.expect(2); + await visit(urls.orgScopeEdit); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'random string'); + await click('.rose-form-actions [type="button"]'); + assert.notEqual(instances.scopes.org.name, 'random string'); + assert.equal(find('[name="name"]').value, instances.scopes.org.name); + }); + + test('saving an existing scope with invalid fields displays error messages', async function (assert) { + assert.expect(2); + this.server.patch('/scopes/: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(urls.orgScopeEdit); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'random string'); + await click('[type="submit"]'); + assert.ok( + find('[role="alert"]').textContent.trim(), + 'The request was invalid.' + ); + assert.ok( + find('.rose-form-error-message').textContent.trim(), + 'Name is required.' + ); + }); + + test('can discard unsaved scope changes via dialog', async function (assert) { + assert.expect(5); + const confirmService = this.owner.lookup('service:confirm'); + confirmService.enabled = true; + assert.notEqual(instances.scopes.org.name, 'random string'); + await visit(urls.orgScopeEdit); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'random string'); + assert.equal(currentURL(), urls.orgScopeEdit); + try { + await visit(urls.globalScope); + } catch (e) { + assert.ok(find('.rose-dialog')); + await click('.rose-dialog-footer button:first-child'); + assert.equal(currentURL(), urls.globalScope); + assert.notEqual( + this.server.schema.scopes.where({ type: 'org' }).models[0].name, + 'random string' + ); + } + }); + + test('can cancel discard unsaved scope changes via dialog', async function (assert) { + assert.expect(5); + const confirmService = this.owner.lookup('service:confirm'); + confirmService.enabled = true; + assert.notEqual(instances.scopes.org.name, 'random string'); + await visit(urls.orgScopeEdit); + await click('form [type="button"]', 'Activate edit mode'); + await fillIn('[name="name"]', 'random string'); + assert.equal(currentURL(), urls.orgScopeEdit); + try { + await visit(urls.globalScope); + } catch (e) { + assert.ok(find('.rose-dialog')); + await click('.rose-dialog-footer button:last-child'); + assert.equal(currentURL(), urls.orgScopeEdit); + assert.notEqual( + this.server.schema.scopes.where({ type: 'org' }).models[0].name, + 'random string' + ); + } + }); +}); From 0dd0e167835c043212e15946d83ca50c03049805 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Tue, 31 Aug 2021 15:03:40 -0400 Subject: [PATCH 02/12] feature: implement scope update capability --- addons/api/mirage/factories/scope.js | 9 +++++++++ ui/admin/app/components/form/scope/index.hbs | 14 ++++++++------ ui/admin/tests/acceptance/scopes/update-test.js | 7 +++++++ ui/admin/tests/acceptance/users/create-test.js | 7 ++++--- ui/admin/tests/acceptance/users/list-test.js | 6 +++--- 5 files changed, 31 insertions(+), 12 deletions(-) diff --git a/addons/api/mirage/factories/scope.js b/addons/api/mirage/factories/scope.js index e9c5ac09f..3c98f27c9 100644 --- a/addons/api/mirage/factories/scope.js +++ b/addons/api/mirage/factories/scope.js @@ -1,9 +1,18 @@ import factory from '../generated/factories/scope'; import { trait } from 'ember-cli-mirage'; +import permissions from '../helpers/permissions'; export default factory.extend({ type: 'global', + authorized_actions: () => + permissions.authorizedActionsFor('scope') || [ + 'no-op', + 'read', + 'update', + 'delete', + ], + authorized_collection_actions: () => { return { users: ['create', 'list'], diff --git a/ui/admin/app/components/form/scope/index.hbs b/ui/admin/app/components/form/scope/index.hbs index a0c3230ef..d86d409b3 100644 --- a/ui/admin/app/components/form/scope/index.hbs +++ b/ui/admin/app/components/form/scope/index.hbs @@ -46,11 +46,13 @@ {{/if}} - + {{#if (can 'save model' @model)}} + + {{/if}} \ No newline at end of file diff --git a/ui/admin/tests/acceptance/scopes/update-test.js b/ui/admin/tests/acceptance/scopes/update-test.js index 1d7a4974b..4ddb8085d 100644 --- a/ui/admin/tests/acceptance/scopes/update-test.js +++ b/ui/admin/tests/acceptance/scopes/update-test.js @@ -83,6 +83,13 @@ module('Acceptance | scopes | update', function (hooks) { ); }); + test('cannot save changes to without proper authorization', async function (assert) { + assert.expect(1); + instances.scopes.org.update({ authorized_actions: [] }); + await visit(urls.orgScopeEdit); + assert.notOk(find('form [type="button"]')); + }); + test('can cancel changes to existing scope', async function (assert) { assert.expect(2); await visit(urls.orgScopeEdit); diff --git a/ui/admin/tests/acceptance/users/create-test.js b/ui/admin/tests/acceptance/users/create-test.js index 069ca0102..805e3def5 100644 --- a/ui/admin/tests/acceptance/users/create-test.js +++ b/ui/admin/tests/acceptance/users/create-test.js @@ -14,14 +14,13 @@ module('Acceptance | users | create', function (hooks) { setupApplicationTest(hooks); setupMirage(hooks); - let globalScope; let orgScope; let orgURL; let usersURL; let newUserURL; hooks.beforeEach(function () { - globalScope = this.server.create('scope', { id: 'global' }); + this.server.create('scope', { id: 'global' }); orgScope = this.server.create( 'scope', { @@ -58,7 +57,9 @@ module('Acceptance | users | create', function (hooks) { assert.expect(2); orgScope.authorized_collection_actions.users = []; await visit(orgURL); - assert.notOk(orgScope.authorized_collection_actions.users.includes('create')); + assert.notOk( + orgScope.authorized_collection_actions.users.includes('create') + ); assert.notOk(find(`[href="${orgURL}/users"]`)); }); diff --git a/ui/admin/tests/acceptance/users/list-test.js b/ui/admin/tests/acceptance/users/list-test.js index bf768b334..14709851f 100644 --- a/ui/admin/tests/acceptance/users/list-test.js +++ b/ui/admin/tests/acceptance/users/list-test.js @@ -20,14 +20,14 @@ module('Acceptance | users | list', function (hooks) { scopes: { global: null, org: null, - } + }, }; const urls = { scopes: { - org: null + org: null, }, - users: null + users: null, }; hooks.beforeEach(function () { From 9f28484bd7fcf6820908f9751c0b7181b209fdd9 Mon Sep 17 00:00:00 2001 From: dharini Date: Wed, 1 Sep 2021 14:02:27 -0700 Subject: [PATCH 03/12] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20cred=20store=20cre?= =?UTF-8?q?ate/list?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/api/mirage/factories/scope.js | 2 +- .../routes/scopes/scope/credential-stores.js | 14 +++- .../scopes/scope/credential-stores/index.js | 9 +- ui/admin/app/templates/scopes/scope.hbs | 15 ++-- .../scopes/scope/credential-stores/index.hbs | 50 ++++++++--- .../create-test.js} | 22 +++-- .../acceptance/credential-store/list-test.js | 84 +++++++++++++++++++ 7 files changed, 169 insertions(+), 27 deletions(-) rename ui/admin/tests/acceptance/{credential-stores-test.js => credential-store/create-test.js} (82%) create mode 100644 ui/admin/tests/acceptance/credential-store/list-test.js diff --git a/addons/api/mirage/factories/scope.js b/addons/api/mirage/factories/scope.js index e9c5ac09f..1d479d1b1 100644 --- a/addons/api/mirage/factories/scope.js +++ b/addons/api/mirage/factories/scope.js @@ -13,7 +13,7 @@ export default factory.extend({ // sessopms: ['list'], // targets: ['create', 'list'], // 'host-catalogs': ['create', 'list'], - // 'credential-stores': ['create', 'list'], + 'credential-stores': ['create', 'list'], }; }, diff --git a/ui/admin/app/routes/scopes/scope/credential-stores.js b/ui/admin/app/routes/scopes/scope/credential-stores.js index 8bfce1b1d..d49379fcf 100644 --- a/ui/admin/app/routes/scopes/scope/credential-stores.js +++ b/ui/admin/app/routes/scopes/scope/credential-stores.js @@ -1,4 +1,5 @@ import Route from '@ember/routing/route'; +import { inject as service } from '@ember/service'; import { action } from '@ember/object'; import loading from 'ember-loading/decorator'; import { confirm } from 'core/decorators/confirm'; @@ -6,14 +7,21 @@ import { notifySuccess, notifyError } from 'core/decorators/notify'; export default class ScopesScopeCredentialStoresRoute extends Route { // =methods - + @service can; /** * Load all credential stores under current scope * @returns {Promise[CredentialStoreModel]} */ async model() { - const { id: scope_id } = this.modelFor('scopes.scope'); - return this.store.query('credential-store', { scope_id }); + const scope = this.modelFor('scopes.scope'); + const { id: scope_id } = scope; + if ( + this.can.can('list collection', scope, { + collection: 'credential-stores', + }) + ) { + return this.store.query('credential-store', { scope_id }); + } } // =actions diff --git a/ui/admin/app/routes/scopes/scope/credential-stores/index.js b/ui/admin/app/routes/scopes/scope/credential-stores/index.js index 99ced4658..57fea4b74 100644 --- a/ui/admin/app/routes/scopes/scope/credential-stores/index.js +++ b/ui/admin/app/routes/scopes/scope/credential-stores/index.js @@ -1,3 +1,10 @@ import Route from '@ember/routing/route'; +export default class ScopesScopeCredentialStoresIndexRoute extends Route { + // =methods -export default class ScopesScopeCredentialStoresIndexRoute extends Route {} + setupController(controller) { + const scope = this.modelFor('scopes.scope'); + super.setupController(...arguments); + controller.setProperties({ scope }); + } +} diff --git a/ui/admin/app/templates/scopes/scope.hbs b/ui/admin/app/templates/scopes/scope.hbs index fd20ca2a2..3a2745d60 100644 --- a/ui/admin/app/templates/scopes/scope.hbs +++ b/ui/admin/app/templates/scopes/scope.hbs @@ -83,11 +83,16 @@ {{t 'resources.host-catalog.title_plural'}} - {{#if (feature-flag 'credential-store')}} - - - {{t 'resources.credential-store.title_plural'}} - + {{#if + (can 'navigate collection' @model collection='credential-stores') + }} + {{#if (feature-flag 'credential-store')}} + + + + {{t 'resources.credential-store.title_plural'}} + + {{/if}} {{/if}} {{/if}} diff --git a/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs b/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs index faa489b0b..6dd0d281f 100644 --- a/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs +++ b/ui/admin/app/templates/scopes/scope/credential-stores/index.hbs @@ -14,13 +14,16 @@ - {{#if @model}} - - {{t 'titles.new'}} - + + {{#if (can 'create collection' this.scope collection='credential-stores')}} + {{#if @model}} + + {{t 'titles.new'}} + + {{/if}} {{/if}} @@ -79,12 +82,35 @@ as |message| > - {{t 'resources.credential-store.description'}} + {{#if + (can 'list collection' this.scope collection='credential-stores') + }} + {{! can list (at least): show default welcome message}} + {{t 'resources.credential-store.description'}} + {{else if (can + 'create collection' this.scope collection='credential-stores' + )}} + {{! can create (only): show create-but-not-list welcome message}} + {{t + 'descriptions.create-but-not-list' + resource=(t 'resources.credential-store.title_plural') + }} + {{else}} + {{! can neither list nor create }} + {{t + 'descriptions.neither-list-nor-create' + resource=(t 'resources.user.title_plural') + }} + {{/if}} - - - {{t 'titles.new'}} - + {{#if + (can 'create collection' this.scope collection='credential-stores') + }} + + + {{t 'titles.new'}} + + {{/if}} diff --git a/ui/admin/tests/acceptance/credential-stores-test.js b/ui/admin/tests/acceptance/credential-store/create-test.js similarity index 82% rename from ui/admin/tests/acceptance/credential-stores-test.js rename to ui/admin/tests/acceptance/credential-store/create-test.js index 54764b5a3..e651a641b 100644 --- a/ui/admin/tests/acceptance/credential-stores-test.js +++ b/ui/admin/tests/acceptance/credential-store/create-test.js @@ -5,7 +5,7 @@ import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; import { authenticateSession } from 'ember-simple-auth/test-support'; import { Response } from 'miragejs'; -module('Acceptance | credential-stores', function (hooks) { +module('Acceptance | credential-stores | create', function (hooks) { setupApplicationTest(hooks); setupMirage(hooks); @@ -21,7 +21,6 @@ module('Acceptance | credential-stores', function (hooks) { const urls = { globalScope: null, - orgScope: null, projectScope: null, credentialStores: null, credentialStore: null, @@ -45,7 +44,6 @@ module('Acceptance | credential-stores', function (hooks) { }); // Generate route URLs for resources urls.globalScope = `/scopes/global/scopes`; - urls.orgScope = `/scopes/${instances.scopes.org.id}/scopes`; urls.projectScope = `/scopes/${instances.scopes.project.id}`; urls.credentialStores = `${urls.projectScope}/credential-stores`; urls.credentialStore = `${urls.credentialStores}/${instances.credentialStore.id}`; @@ -58,7 +56,7 @@ module('Acceptance | credential-stores', function (hooks) { authenticateSession({}); }); - test('can create a new credential stores', async function (assert) { + test('Users can create a new credential stores', async function (assert) { assert.expect(1); const count = getCredentialStoresCount(); await visit(urls.newCredentialStore); @@ -67,7 +65,7 @@ module('Acceptance | credential-stores', function (hooks) { assert.equal(getCredentialStoresCount(), count + 1); }); - test('can cancel create new credential stores', async function (assert) { + test('Users can cancel create new credential stores', async function (assert) { assert.expect(2); const count = getCredentialStoresCount(); await visit(urls.newCredentialStore); @@ -77,6 +75,20 @@ module('Acceptance | credential-stores', function (hooks) { assert.equal(getCredentialStoresCount(), count); }); + test('Users cannot navigate to new credential stores route without proper authorization', async function (assert) { + assert.expect(2); + instances.scopes.project.authorized_collection_actions[ + 'credential-stores' + ] = []; + await visit(urls.projectScope); + assert.notOk( + instances.scopes.project.authorized_collection_actions[ + 'credential-stores' + ].includes('create') + ); + assert.notOk(find(`[href="${urls.credentialStores}"]`)); + }); + test('saving a new credential store with invalid fields displays error messages', async function (assert) { assert.expect(2); this.server.post('/credential-stores', () => { diff --git a/ui/admin/tests/acceptance/credential-store/list-test.js b/ui/admin/tests/acceptance/credential-store/list-test.js new file mode 100644 index 000000000..e4d6cda15 --- /dev/null +++ b/ui/admin/tests/acceptance/credential-store/list-test.js @@ -0,0 +1,84 @@ +import { module, test } from 'qunit'; +import { visit, find } from '@ember/test-helpers'; +import { setupApplicationTest } from 'ember-qunit'; +import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; +import { + authenticateSession, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | credential-stores | list', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + project: null, + }, + }; + + const urls = { + scopes: { + org: null, + }, + projectScope: null, + credentialStores: null, + credentialStore: null, + }; + + hooks.beforeEach(function () { + instances.scopes.global = this.server.create('scope', { id: 'global' }); + instances.scopes.org = this.server.create('scope', { + type: 'org', + scope: { id: 'global', type: 'global' }, + }); + instances.scopes.project = this.server.create('scope', { + type: 'project', + scope: { id: instances.scopes.org.id, type: 'org' }, + }); + instances.credentialStore = this.server.create('credential-store', { + scope: instances.scopes.project, + }); + urls.projectScope = `/scopes/${instances.scopes.project.id}`; + urls.credentialStores = `${urls.projectScope}/credential-stores`; + authenticateSession({}); + }); + + test('Users can navigate to credential-stores with proper authorization', async function (assert) { + assert.expect(2); + await visit(urls.projectScope); + assert.ok( + instances.scopes.project.authorized_collection_actions[ + 'credential-stores' + ].includes('list') + ); + assert.ok(find(`[href="${urls.credentialStores}"]`)); + }); + + test('Users cannot navigate to index without either list or create actions', async function (assert) { + assert.expect(2); + instances.scopes.project.authorized_collection_actions[ + 'credential-stores' + ] = []; + await visit(urls.projectScope); + assert.notOk( + instances.scopes.project.authorized_collection_actions[ + 'credential-stores' + ].includes('list') + ); + assert.notOk(find(`[href="${urls.credentialStores}"]`)); + }); + + test('Users can navigate to index with only create action', async function (assert) { + assert.expect(1); + instances.scopes.project.authorized_collection_actions[ + 'credential-stores' + ] = ['create']; + await visit(urls.projectScope); + assert.ok(find(`[href="${urls.credentialStores}"]`)); + }); +}); From 6be0a2a17d4d3f772c6e7cffd1002c377045406d Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 2 Sep 2021 10:58:06 -0400 Subject: [PATCH 04/12] chore: add scope delete capability --- ui/admin/app/templates/scopes/scope/edit.hbs | 38 ++++++++++--------- .../tests/acceptance/scopes/delete-test.js | 9 +++++ 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/ui/admin/app/templates/scopes/scope/edit.hbs b/ui/admin/app/templates/scopes/scope/edit.hbs index 9e3898e0f..648a03111 100644 --- a/ui/admin/app/templates/scopes/scope/edit.hbs +++ b/ui/admin/app/templates/scopes/scope/edit.hbs @@ -36,25 +36,27 @@ - - - + - {{#if @model.isOrg}} - {{t 'resources.org.actions.delete'}} - {{else}} - {{t 'resources.project.actions.delete'}} - {{/if}} - - - + + {{#if @model.isOrg}} + {{t 'resources.org.actions.delete'}} + {{else}} + {{t 'resources.project.actions.delete'}} + {{/if}} + + + + {{/if}} Date: Thu, 2 Sep 2021 15:00:44 -0400 Subject: [PATCH 05/12] =?UTF-8?q?test:=20=F0=9F=92=8D=20add=20read=20capab?= =?UTF-8?q?ility=20and=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/core/translations/resources/en-us.yaml | 5 ++ ui/admin/app/templates/scopes/scope/edit.hbs | 36 ++++++++---- ui/admin/tests/acceptance/scopes/read-test.js | 55 +++++++++++++++++++ 3 files changed, 84 insertions(+), 12 deletions(-) create mode 100644 ui/admin/tests/acceptance/scopes/read-test.js diff --git a/addons/core/translations/resources/en-us.yaml b/addons/core/translations/resources/en-us.yaml index 52bd07d03..4d373e26d 100644 --- a/addons/core/translations/resources/en-us.yaml +++ b/addons/core/translations/resources/en-us.yaml @@ -346,3 +346,8 @@ credential-library: help: The body of the HTTP request the library sends to Vault when requesting credentials. Only allowed when HTTP method is set to POST. types: vault: Vault +scope: + title: Scope + title_plural: Scopes + messages: + cannot_read: While you do not have permission to read this scope, you may have permission to view resources within it. diff --git a/ui/admin/app/templates/scopes/scope/edit.hbs b/ui/admin/app/templates/scopes/scope/edit.hbs index 648a03111..d8f6dc683 100644 --- a/ui/admin/app/templates/scopes/scope/edit.hbs +++ b/ui/admin/app/templates/scopes/scope/edit.hbs @@ -28,13 +28,15 @@ - - - - {{t 'titles.details'}} - - - + {{#if (can 'read model' @model)}} + + + + {{t 'titles.details'}} + + + + {{/if}} {{#if (can 'delete model' @model)}} @@ -59,11 +61,21 @@ {{/if}} - + {{#if (can 'read model' @model)}} + + {{else}} + + + + {{t 'resources.scope.messages.cannot_read'}} + + + + {{/if}} \ No newline at end of file diff --git a/ui/admin/tests/acceptance/scopes/read-test.js b/ui/admin/tests/acceptance/scopes/read-test.js new file mode 100644 index 000000000..1ddd1e5a4 --- /dev/null +++ b/ui/admin/tests/acceptance/scopes/read-test.js @@ -0,0 +1,55 @@ +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 | scopes | read', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + }, + }; + const urls = { + orgScopeEdit: null, + }; + + hooks.beforeEach(function () { + // Generate resources + instances.scopes.global = this.server.create('scope', { id: 'global' }); + instances.scopes.org = this.server.create('scope', { + type: 'org', + scope: { id: 'global', type: 'global' }, + }); + // Generate route URLs for resources + urls.orgScopeEdit = `/scopes/${instances.scopes.org.id}/edit`; + // Generate resource couner + authenticateSession({}); + }); + + test('visiting org scope edit', async function (assert) { + assert.expect(2); + await visit(urls.orgScopeEdit); + await a11yAudit(); + assert.equal(currentURL(), urls.orgScopeEdit); + assert.ok(find('main .rose-form')); + }); + + test('visiting org scope edit without read permission results in no form displayed', async function (assert) { + assert.expect(2); + instances.scopes.org.update({ authorized_actions: [] }); + await visit(urls.orgScopeEdit); + assert.equal(currentURL(), urls.orgScopeEdit); + assert.notOk(find('main .rose-form')); + }); +}); From b454efe41f81c30514137d0268cbf86bee1c4c9e Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 2 Sep 2021 13:01:58 -0700 Subject: [PATCH 06/12] =?UTF-8?q?fix:=20=F0=9F=90=9B=20host=20sets=20capab?= =?UTF-8?q?ilities=20create/list?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/api/mirage/factories/host-catalog.js | 5 + .../host-catalogs/host-catalog/host-sets.js | 16 +++- .../host-catalog/host-sets/index.js | 9 +- .../host-catalogs/host-catalog/-actions.hbs | 15 +-- .../host-catalog/-navigation.hbs | 11 ++- .../host-catalog/host-sets/index.hbs | 34 +++++-- .../create-test.js} | 14 ++- .../host-catalogs/host-sets/list-test.js | 95 +++++++++++++++++++ 8 files changed, 176 insertions(+), 23 deletions(-) rename ui/admin/tests/acceptance/host-catalogs/{host-sets-test.js => host-sets/create-test.js} (87%) create mode 100644 ui/admin/tests/acceptance/host-catalogs/host-sets/list-test.js diff --git a/addons/api/mirage/factories/host-catalog.js b/addons/api/mirage/factories/host-catalog.js index cd033f7f3..085e69ef0 100644 --- a/addons/api/mirage/factories/host-catalog.js +++ b/addons/api/mirage/factories/host-catalog.js @@ -10,6 +10,11 @@ export default factory.extend({ 'update', 'delete', ], + authorized_collection_actions: () => { + return { + 'host-sets': ['create', 'list'], + }; + }, withChildren: trait({ afterCreate(hostCatalog, server) { const { scope } = hostCatalog; diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js index beb0aa93a..db09586ed 100644 --- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js +++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js @@ -10,7 +10,7 @@ export default class ScopesScopeHostCatalogsHostCatalogHostSetsRoute extends Rou @service intl; @service notify; - + @service can; // =methods /** @@ -18,10 +18,16 @@ export default class ScopesScopeHostCatalogsHostCatalogHostSetsRoute extends Rou * @return {Promise{[HostSetModel]}} */ model() { - const { id: host_catalog_id } = this.modelFor( - 'scopes.scope.host-catalogs.host-catalog' - ); - return this.store.query('host-set', { host_catalog_id }); + const scope = this.modelFor('scopes.scope.host-catalogs.host-catalog'); + + const { id: host_catalog_id } = scope; + if ( + this.can.can('list collection', scope, { + collection: 'host-sets', + }) + ) { + return this.store.query('host-set', { host_catalog_id }); + } } // =actions diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/index.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/index.js index e62c9f95e..ad76516df 100644 --- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/index.js +++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/index.js @@ -1,3 +1,10 @@ import Route from '@ember/routing/route'; +export default class ScopesScopeHostCatalogsHostCatalogHostSetsIndexRoute extends Route { + // =methods -export default class ScopesScopeHostCatalogsHostCatalogHostSetsIndexRoute extends Route {} + setupController(controller) { + const scope = this.modelFor('scopes.scope.host-catalogs.host-catalog'); + super.setupController(...arguments); + controller.setProperties({ scope }); + } +} diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-actions.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-actions.hbs index bf5fe452e..ef151fb92 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-actions.hbs @@ -9,12 +9,15 @@ > {{t 'resources.host.actions.create'}} - - {{t 'resources.host-set.actions.create'}} - + {{#if (can 'create collection' @model collection='host-sets')}} + + + {{t 'resources.host-set.actions.create'}} + + {{/if}} {{#if (can 'delete model' @model)}} {{t 'resources.host.title_plural'}} - - {{t 'resources.host-set.title_plural'}} - + + {{#if (can 'navigate collection' @model collection='host-sets')}} + + + {{t 'resources.host-set.title_plural'}} + + {{/if}} + \ No newline at end of file diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs index 1b0a18cb8..e45630421 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs @@ -51,14 +51,34 @@ as |message| > - {{t 'resources.host-set.description'}} + + {{#if (can 'list collection' this.scope collection='host-sets')}} + {{! can list (at least): show default welcome message}} + {{t 'resources.host-set.description'}} + + {{else if (can 'create collection' this.scope collection='host-sets')}} + {{! can create (only): show create-but-not-list welcome message}} + {{t + 'descriptions.create-but-not-list' + resource=(t 'resources.host-set.title_plural') + }} + {{else}} + {{! can neither list nor create }} + {{t + 'descriptions.neither-list-nor-create' + resource=(t 'resources.host-set.title_plural') + }} + {{/if}} - - - {{t 'titles.new'}} - + + {{#if (can 'create collection' this.scope collection='host-sets')}} + + + {{t 'titles.new'}} + + {{/if}} diff --git a/ui/admin/tests/acceptance/host-catalogs/host-sets-test.js b/ui/admin/tests/acceptance/host-catalogs/host-sets/create-test.js similarity index 87% rename from ui/admin/tests/acceptance/host-catalogs/host-sets-test.js rename to ui/admin/tests/acceptance/host-catalogs/host-sets/create-test.js index 33465e7ce..5e31b9bb6 100644 --- a/ui/admin/tests/acceptance/host-catalogs/host-sets-test.js +++ b/ui/admin/tests/acceptance/host-catalogs/host-sets/create-test.js @@ -10,7 +10,7 @@ import { //invalidateSession, } from 'ember-simple-auth/test-support'; -module('Acceptance | host-catalogs | host sets', function (hooks) { +module('Acceptance | host-catalogs | host sets | create', function (hooks) { setupApplicationTest(hooks); setupMirage(hooks); @@ -79,6 +79,18 @@ module('Acceptance | host-catalogs | host sets', function (hooks) { assert.equal(getHostSetCount(), count + 1); }); + test('Users cannot navigate to new credential library route without proper authorization', async function (assert) { + assert.expect(2); + instances.hostCatalog.authorized_collection_actions['host-sets'] = []; + await visit(urls.hostCatalog); + assert.notOk( + instances.hostCatalog.authorized_collection_actions['host-sets'].includes( + 'create' + ) + ); + assert.notOk(find(`[href="${urls.hostSets}"]`)); + }); + test('can cancel create new host', async function (assert) { assert.expect(2); const count = getHostSetCount(); diff --git a/ui/admin/tests/acceptance/host-catalogs/host-sets/list-test.js b/ui/admin/tests/acceptance/host-catalogs/host-sets/list-test.js new file mode 100644 index 000000000..bd38f95ad --- /dev/null +++ b/ui/admin/tests/acceptance/host-catalogs/host-sets/list-test.js @@ -0,0 +1,95 @@ +import { module, test } from 'qunit'; +import { visit, find } from '@ember/test-helpers'; +import { setupApplicationTest } from 'ember-qunit'; +import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; +import { + authenticateSession, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | host-catalogs | host sets | list', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + project: null, + hostCatalog: null, + host: null, + }, + }; + const urls = { + globalScope: null, + orgScope: null, + projectScope: null, + hostCatalogs: null, + hostCatalog: null, + hostSets: null, + hostSet: null, + }; + + hooks.beforeEach(function () { + // Generate resources + instances.scopes.global = this.server.create('scope', { id: 'global' }); + instances.scopes.org = this.server.create('scope', { + type: 'org', + scope: { id: 'global', type: 'global' }, + }); + instances.scopes.project = this.server.create('scope', { + type: 'project', + scope: { id: instances.scopes.org.id, type: 'org' }, + }); + instances.hostCatalog = this.server.create('host-catalog', { + scope: instances.scopes.project, + }); + instances.hostSet = this.server.create('host-set', { + scope: instances.scopes.project, + hostCatalog: instances.hostCatalog, + }); + // Generate route URLs for resources + urls.globalScope = `/scopes/global/scopes`; + urls.orgScope = `/scopes/${instances.scopes.org.id}/scopes`; + urls.projectScope = `/scopes/${instances.scopes.project.id}`; + urls.hostCatalogs = `${urls.projectScope}/host-catalogs`; + urls.hostCatalog = `${urls.hostCatalogs}/${instances.hostCatalog.id}`; + urls.hostSets = `${urls.hostCatalog}/host-sets`; + urls.hostSet = `${urls.hostSets}/${instances.hostSet.id}`; + authenticateSession({}); + }); + + test('Users can navigate to host-sets with proper authorization', async function (assert) { + assert.expect(2); + await visit(urls.hostCatalog); + assert.ok( + instances.hostCatalog.authorized_collection_actions['host-sets'].includes( + 'list' + ) + ); + assert.ok(find(`[href="${urls.hostSets}"]`)); + }); + + test('Users cannot navigate to index without either list or create actions', async function (assert) { + assert.expect(2); + instances.hostCatalog.authorized_collection_actions['host-sets'] = []; + await visit(urls.hostCatalog); + assert.notOk( + instances.hostCatalog.authorized_collection_actions['host-sets'].includes( + 'list' + ) + ); + assert.notOk(find(`[href="${urls.hostSets}"]`)); + }); + + test('Users can navigate to index with only create action', async function (assert) { + assert.expect(1); + instances.hostCatalog.authorized_collection_actions['host-sets'] = [ + 'create', + ]; + await visit(urls.hostCatalog); + assert.ok(find(`[href="${urls.hostSets}"]`)); + }); +}); From e2b0c3ad134f9f0e9e7e6d7e511fe825fa51deb5 Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 2 Sep 2021 13:17:19 -0700 Subject: [PATCH 07/12] =?UTF-8?q?fix:=20=F0=9F=90=9B=20typo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tests/acceptance/host-catalogs/host-sets/create-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/admin/tests/acceptance/host-catalogs/host-sets/create-test.js b/ui/admin/tests/acceptance/host-catalogs/host-sets/create-test.js index 5e31b9bb6..732b6db48 100644 --- a/ui/admin/tests/acceptance/host-catalogs/host-sets/create-test.js +++ b/ui/admin/tests/acceptance/host-catalogs/host-sets/create-test.js @@ -79,7 +79,7 @@ module('Acceptance | host-catalogs | host sets | create', function (hooks) { assert.equal(getHostSetCount(), count + 1); }); - test('Users cannot navigate to new credential library route without proper authorization', async function (assert) { + test('Users cannot navigate to new host sets route without proper authorization', async function (assert) { assert.expect(2); instances.hostCatalog.authorized_collection_actions['host-sets'] = []; await visit(urls.hostCatalog); From 99e24500d31af32031ecabe18065ef020dcecba2 Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 2 Sep 2021 13:38:09 -0700 Subject: [PATCH 08/12] =?UTF-8?q?fix:=20=F0=9F=90=9B=20update=20const=20na?= =?UTF-8?q?me?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scopes/scope/host-catalogs/host-catalog/host-sets.js | 8 +++++--- .../scope/host-catalogs/host-catalog/host-sets/index.js | 7 ++++--- .../scope/host-catalogs/host-catalog/host-sets/index.hbs | 8 +++++--- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js index db09586ed..36d341bc4 100644 --- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js +++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets.js @@ -18,11 +18,13 @@ export default class ScopesScopeHostCatalogsHostCatalogHostSetsRoute extends Rou * @return {Promise{[HostSetModel]}} */ model() { - const scope = this.modelFor('scopes.scope.host-catalogs.host-catalog'); + const hostCatalog = this.modelFor( + 'scopes.scope.host-catalogs.host-catalog' + ); - const { id: host_catalog_id } = scope; + const { id: host_catalog_id } = hostCatalog; if ( - this.can.can('list collection', scope, { + this.can.can('list collection', hostCatalog, { collection: 'host-sets', }) ) { diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/index.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/index.js index ad76516df..1f49ad3af 100644 --- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/index.js +++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/host-sets/index.js @@ -1,10 +1,11 @@ import Route from '@ember/routing/route'; export default class ScopesScopeHostCatalogsHostCatalogHostSetsIndexRoute extends Route { // =methods - setupController(controller) { - const scope = this.modelFor('scopes.scope.host-catalogs.host-catalog'); + const hostCatalog = this.modelFor( + 'scopes.scope.host-catalogs.host-catalog' + ); super.setupController(...arguments); - controller.setProperties({ scope }); + controller.setProperties({ hostCatalog }); } } diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs index e45630421..c814c749e 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/host-sets/index.hbs @@ -52,11 +52,13 @@ > - {{#if (can 'list collection' this.scope collection='host-sets')}} + {{#if (can 'list collection' this.hostCatalog collection='host-sets')}} {{! can list (at least): show default welcome message}} {{t 'resources.host-set.description'}} - {{else if (can 'create collection' this.scope collection='host-sets')}} + {{else if (can + 'create collection' this.hostCatalog collection='host-sets' + )}} {{! can create (only): show create-but-not-list welcome message}} {{t 'descriptions.create-but-not-list' @@ -71,7 +73,7 @@ {{/if}} - {{#if (can 'create collection' this.scope collection='host-sets')}} + {{#if (can 'create collection' this.hostCatalog collection='host-sets')}} From 451c1e861b5e9cdec4a2a783ca9351b9f6a2f0f5 Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 2 Sep 2021 15:28:40 -0700 Subject: [PATCH 09/12] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20hosts=20capabiliti?= =?UTF-8?q?es=20create=20lit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- addons/api/mirage/factories/host-catalog.js | 5 + .../scope/host-catalogs/host-catalog/hosts.js | 13 ++- .../host-catalogs/host-catalog/hosts/index.js | 10 +- .../host-catalogs/host-catalog/-actions.hbs | 15 +-- .../host-catalog/-navigation.hbs | 10 +- .../host-catalog/hosts/index.hbs | 35 ++++++- .../{hosts-test.js => hosts/create-test.js} | 36 +++++++- .../host-catalogs/hosts/list-test.js | 92 +++++++++++++++++++ 8 files changed, 197 insertions(+), 19 deletions(-) rename ui/admin/tests/acceptance/host-catalogs/{hosts-test.js => hosts/create-test.js} (74%) create mode 100644 ui/admin/tests/acceptance/host-catalogs/hosts/list-test.js diff --git a/addons/api/mirage/factories/host-catalog.js b/addons/api/mirage/factories/host-catalog.js index cd033f7f3..b01ffc065 100644 --- a/addons/api/mirage/factories/host-catalog.js +++ b/addons/api/mirage/factories/host-catalog.js @@ -10,6 +10,11 @@ export default factory.extend({ 'update', 'delete', ], + authorized_collection_actions: () => { + return { + hosts: ['create', 'list'], + }; + }, withChildren: trait({ afterCreate(hostCatalog, server) { const { scope } = hostCatalog; diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts.js index a41073688..5969a8b67 100644 --- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts.js +++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts.js @@ -10,7 +10,7 @@ export default class ScopesScopeHostCatalogsHostCatalogHostsRoute extends Route @service intl; @service notify; - + @service can; // =methods /** @@ -18,10 +18,17 @@ export default class ScopesScopeHostCatalogsHostCatalogHostsRoute extends Route * @return {Promise{[HostModel]}} */ model() { - const { id: host_catalog_id } = this.modelFor( + const hostCatalog = this.modelFor( 'scopes.scope.host-catalogs.host-catalog' ); - return this.store.query('host', { host_catalog_id }); + const { id: host_catalog_id } = hostCatalog; + if ( + this.can.can('list collection', hostCatalog, { + collection: 'hosts', + }) + ) { + return this.store.query('host', { host_catalog_id }); + } } // =actions diff --git a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts/index.js b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts/index.js index c219c570f..617551d99 100644 --- a/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts/index.js +++ b/ui/admin/app/routes/scopes/scope/host-catalogs/host-catalog/hosts/index.js @@ -1,3 +1,11 @@ import Route from '@ember/routing/route'; -export default class ScopesScopeHostCatalogsHostCatalogHostsIndexRoute extends Route {} +export default class ScopesScopeHostCatalogsHostCatalogHostsIndexRoute extends Route { + setupController(controller) { + const hostCatalog = this.modelFor( + 'scopes.scope.host-catalogs.host-catalog' + ); + super.setupController(...arguments); + controller.setProperties({ hostCatalog }); + } +} diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-actions.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-actions.hbs index bf5fe452e..4f70d7987 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-actions.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-actions.hbs @@ -3,12 +3,15 @@ @dropdownRight={{true}} as |dropdown| > - - {{t 'resources.host.actions.create'}} - + {{#if (can 'create collection' @model collection='hosts')}} + + + {{t 'resources.host.actions.create'}} + + {{/if}} {{t 'titles.details'}} - - {{t 'resources.host.title_plural'}} - + + {{#if (can 'navigate collection' @model collection='hosts')}} + + + {{t 'resources.host.title_plural'}} + + {{/if}} {{t 'resources.host-set.title_plural'}} diff --git a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs index 6687cbf76..117689f14 100644 --- a/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs +++ b/ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/hosts/index.hbs @@ -55,12 +55,37 @@ as |message| > - {{t 'resources.host.description'}} + + {{#if (can 'list collection' this.hostCatalog collection='hosts')}} + {{! can list (at least): show default welcome message}} + {{t 'resources.host.description'}} + + {{else if (can + 'create collection' this.hostCatalog collection='hosts' + )}} + {{! can create (only): show create-but-not-list welcome message}} + {{t + 'descriptions.create-but-not-list' + resource=(t 'resources.host.title_plural') + }} + {{else}} + {{! can neither list nor create }} + {{t + 'descriptions.neither-list-nor-create' + resource=(t 'resources.host.title_plural') + }} + {{/if}} - - - {{t 'titles.new'}} - + + {{#if (can 'create collection' this.hostCatalog collection='hosts')}} + + + + {{t 'titles.new'}} + + {{/if}} diff --git a/ui/admin/tests/acceptance/host-catalogs/hosts-test.js b/ui/admin/tests/acceptance/host-catalogs/hosts/create-test.js similarity index 74% rename from ui/admin/tests/acceptance/host-catalogs/hosts-test.js rename to ui/admin/tests/acceptance/host-catalogs/hosts/create-test.js index a4ab70a60..1b50b301b 100644 --- a/ui/admin/tests/acceptance/host-catalogs/hosts-test.js +++ b/ui/admin/tests/acceptance/host-catalogs/hosts/create-test.js @@ -10,7 +10,7 @@ import { //invalidateSession, } from 'ember-simple-auth/test-support'; -module('Acceptance | host-catalogs | hosts', function (hooks) { +module('Acceptance | host-catalogs | hosts | create', function (hooks) { setupApplicationTest(hooks); setupMirage(hooks); @@ -79,6 +79,40 @@ module('Acceptance | host-catalogs | hosts', function (hooks) { assert.equal(getHostCount(), count + 1); }); + test('Users cannot create a new host without proper authorization', async function (assert) { + assert.expect(2); + instances.hostCatalog.authorized_collection_actions.hosts = []; + await visit(urls.hostCatalog); + assert.notOk( + instances.hostCatalog.authorized_collection_actions.hosts.includes( + 'create' + ) + ); + assert.notOk(find(`.rose-layout-page-actions [href="${urls.newHost}"]`)); + }); + test('Users can navigate to new host catalogs route with proper authorization', async function (assert) { + assert.expect(2); + await visit(urls.hostCatalog); + assert.ok( + instances.hostCatalog.authorized_collection_actions.hosts.includes( + 'create' + ) + ); + assert.ok(find(`[href="${urls.hosts}"]`)); + }); + + test('Users cannot navigate to new host catalogs route without proper authorization', async function (assert) { + assert.expect(2); + instances.hostCatalog.authorized_collection_actions.hosts = []; + await visit(urls.hostCatalog); + assert.notOk( + instances.hostCatalog.authorized_collection_actions.hosts.includes( + 'create' + ) + ); + assert.notOk(find(`[href="${urls.hosts}"]`)); + }); + test('can cancel create new host', async function (assert) { assert.expect(2); const count = getHostCount(); diff --git a/ui/admin/tests/acceptance/host-catalogs/hosts/list-test.js b/ui/admin/tests/acceptance/host-catalogs/hosts/list-test.js new file mode 100644 index 000000000..356693474 --- /dev/null +++ b/ui/admin/tests/acceptance/host-catalogs/hosts/list-test.js @@ -0,0 +1,92 @@ +import { module, test } from 'qunit'; +import { visit, find } from '@ember/test-helpers'; +import { setupApplicationTest } from 'ember-qunit'; +import setupMirage from 'ember-cli-mirage/test-support/setup-mirage'; +import { + authenticateSession, + // These are left here intentionally for future reference. + //currentSession, + //invalidateSession, +} from 'ember-simple-auth/test-support'; + +module('Acceptance | host-catalogs | hosts | list', function (hooks) { + setupApplicationTest(hooks); + setupMirage(hooks); + + const instances = { + scopes: { + global: null, + org: null, + project: null, + hostCatalog: null, + host: null, + }, + }; + const urls = { + globalScope: null, + orgScope: null, + projectScope: null, + hostCatalogs: null, + hostCatalog: null, + hosts: null, + host: null, + unknownHost: null, + newHost: null, + }; + + hooks.beforeEach(function () { + // Generate resources + instances.scopes.global = this.server.create('scope', { id: 'global' }); + instances.scopes.org = this.server.create('scope', { + type: 'org', + scope: { id: 'global', type: 'global' }, + }); + instances.scopes.project = this.server.create('scope', { + type: 'project', + scope: { id: instances.scopes.org.id, type: 'org' }, + }); + instances.hostCatalog = this.server.create('host-catalog', { + scope: instances.scopes.project, + }); + instances.host = this.server.create('host', { + scope: instances.scopes.project, + hostCatalog: instances.hostCatalog, + }); + // Generate route URLs for resources + urls.globalScope = `/scopes/global/scopes`; + urls.orgScope = `/scopes/${instances.scopes.org.id}/scopes`; + urls.projectScope = `/scopes/${instances.scopes.project.id}`; + urls.hostCatalogs = `${urls.projectScope}/host-catalogs`; + urls.hostCatalog = `${urls.hostCatalogs}/${instances.hostCatalog.id}`; + urls.hosts = `${urls.hostCatalog}/hosts`; + urls.host = `${urls.hosts}/${instances.host.id}`; + urls.unknownHost = `${urls.hosts}/foo`; + urls.newHost = `${urls.hosts}/new`; + authenticateSession({}); + }); + test('Users can navigate to hosts with proper authorization', async function (assert) { + assert.expect(2); + await visit(urls.hostCatalog); + assert.ok( + instances.hostCatalog.authorized_collection_actions.hosts.includes('list') + ); + assert.ok(find(`[href="${urls.hosts}"]`)); + }); + + test('User cannot navigate to index without either list or create actions', async function (assert) { + assert.expect(2); + instances.hostCatalog.authorized_collection_actions.hosts = []; + await visit(urls.hostCatalog); + assert.notOk( + instances.hostCatalog.authorized_collection_actions.hosts.includes('list') + ); + assert.notOk(find(`[href="${urls.hosts}"]`)); + }); + + test('User can navigate to index with only create action', async function (assert) { + assert.expect(1); + instances.hostCatalog.authorized_collection_actions.hosts = ['create']; + await visit(urls.hostCatalog); + assert.ok(find(`[href="${urls.hosts}"]`)); + }); +}); From 4423c53cc4a79a7f350a2a91a068bc3981e13eeb Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 2 Sep 2021 15:58:45 -0700 Subject: [PATCH 10/12] =?UTF-8?q?fix:=20=F0=9F=90=9B=20add=20test=20for=20?= =?UTF-8?q?manage=20catalog=20options?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../host-catalogs/host-sets/create-test.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/ui/admin/tests/acceptance/host-catalogs/host-sets/create-test.js b/ui/admin/tests/acceptance/host-catalogs/host-sets/create-test.js index 732b6db48..a7ede23ed 100644 --- a/ui/admin/tests/acceptance/host-catalogs/host-sets/create-test.js +++ b/ui/admin/tests/acceptance/host-catalogs/host-sets/create-test.js @@ -70,7 +70,7 @@ module('Acceptance | host-catalogs | host sets | create', function (hooks) { authenticateSession({}); }); - test('can create new host', async function (assert) { + test('can create new host sets', async function (assert) { assert.expect(1); const count = getHostSetCount(); await visit(urls.newHostSet); @@ -79,6 +79,18 @@ module('Acceptance | host-catalogs | host sets | create', function (hooks) { assert.equal(getHostSetCount(), count + 1); }); + test('Users cannot create a new host set without proper authorization', async function (assert) { + assert.expect(2); + instances.hostCatalog.authorized_collection_actions['host-sets'] = []; + await visit(urls.hostCatalog); + assert.notOk( + instances.hostCatalog.authorized_collection_actions['host-sets'].includes( + 'create' + ) + ); + assert.notOk(find(`.rose-layout-page-actions [href="${urls.newHostSet}"]`)); + }); + test('Users cannot navigate to new host sets route without proper authorization', async function (assert) { assert.expect(2); instances.hostCatalog.authorized_collection_actions['host-sets'] = []; From 6babacd0bc3880b60b07d5ed8f66fb88ffe00daa Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 2 Sep 2021 16:16:19 -0700 Subject: [PATCH 11/12] =?UTF-8?q?fix:=20=F0=9F=90=9B=20verify=20manage=20o?= =?UTF-8?q?ptions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tests/acceptance/host-catalogs/host-sets/list-test.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ui/admin/tests/acceptance/host-catalogs/host-sets/list-test.js b/ui/admin/tests/acceptance/host-catalogs/host-sets/list-test.js index bd38f95ad..6e092398b 100644 --- a/ui/admin/tests/acceptance/host-catalogs/host-sets/list-test.js +++ b/ui/admin/tests/acceptance/host-catalogs/host-sets/list-test.js @@ -30,6 +30,7 @@ module('Acceptance | host-catalogs | host sets | list', function (hooks) { hostCatalog: null, hostSets: null, hostSet: null, + newHostSet: null, }; hooks.beforeEach(function () { @@ -58,6 +59,7 @@ module('Acceptance | host-catalogs | host sets | list', function (hooks) { urls.hostCatalog = `${urls.hostCatalogs}/${instances.hostCatalog.id}`; urls.hostSets = `${urls.hostCatalog}/host-sets`; urls.hostSet = `${urls.hostSets}/${instances.hostSet.id}`; + urls.newHostSet = `${urls.hostSets}/new`; authenticateSession({}); }); @@ -85,11 +87,12 @@ module('Acceptance | host-catalogs | host sets | list', function (hooks) { }); test('Users can navigate to index with only create action', async function (assert) { - assert.expect(1); + assert.expect(2); instances.hostCatalog.authorized_collection_actions['host-sets'] = [ 'create', ]; await visit(urls.hostCatalog); assert.ok(find(`[href="${urls.hostSets}"]`)); + assert.ok(find(`.rose-layout-page-actions [href="${urls.newHostSet}"]`)); }); }); From 6c58749a6e296ea03c3e40bcf4988a7a754d5821 Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 2 Sep 2021 16:25:47 -0700 Subject: [PATCH 12/12] =?UTF-8?q?fix:=20=F0=9F=90=9B=20verify=20manage=20a?= =?UTF-8?q?ction=20options?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/admin/tests/acceptance/host-catalogs/hosts/list-test.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/admin/tests/acceptance/host-catalogs/hosts/list-test.js b/ui/admin/tests/acceptance/host-catalogs/hosts/list-test.js index 356693474..c5f3e4735 100644 --- a/ui/admin/tests/acceptance/host-catalogs/hosts/list-test.js +++ b/ui/admin/tests/acceptance/host-catalogs/hosts/list-test.js @@ -84,9 +84,10 @@ module('Acceptance | host-catalogs | hosts | list', function (hooks) { }); test('User can navigate to index with only create action', async function (assert) { - assert.expect(1); + assert.expect(2); instances.hostCatalog.authorized_collection_actions.hosts = ['create']; await visit(urls.hostCatalog); assert.ok(find(`[href="${urls.hosts}"]`)); + assert.ok(find(`.rose-layout-page-actions [href="${urls.newHost}"]`)); }); });