From b454efe41f81c30514137d0268cbf86bee1c4c9e Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 2 Sep 2021 13:01:58 -0700 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20host=20sets=20capabilitie?= =?UTF-8?q?s=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}"]`)); + }); +});