fix: 🐛 host sets capabilities create/list

This commit is contained in:
dharini committed 2021-09-02 13:01:58 -07:00
1 parent 4b430f1a7f
commit b454efe41f
8 files changed
+176 -23

No files matched your search

@@ -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;
@@ -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
@@ -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 });
}
}
@@ -9,12 +9,15 @@
>
{{t 'resources.host.actions.create'}}
</dropdown.link>
<dropdown.link
@route='scopes.scope.host-catalogs.host-catalog.host-sets.new'
@model={{@model}}
>
{{t 'resources.host-set.actions.create'}}
</dropdown.link>
{{#if (can 'create collection' @model collection='host-sets')}}
<dropdown.link
@route='scopes.scope.host-catalogs.host-catalog.host-sets.new'
@model={{@model}}
>
{{t 'resources.host-set.actions.create'}}
</dropdown.link>
{{/if}}
{{#if (can 'delete model' @model)}}
<dropdown.separator />
<dropdown.button
@@ -5,7 +5,12 @@
<nav.link @route='scopes.scope.host-catalogs.host-catalog.hosts'>
{{t 'resources.host.title_plural'}}
</nav.link>
<nav.link @route='scopes.scope.host-catalogs.host-catalog.host-sets'>
{{t 'resources.host-set.title_plural'}}
</nav.link>
{{#if (can 'navigate collection' @model collection='host-sets')}}
<nav.link @route='scopes.scope.host-catalogs.host-catalog.host-sets'>
{{t 'resources.host-set.title_plural'}}
</nav.link>
{{/if}}
</Rose::Nav::Tabs>
@@ -51,14 +51,34 @@
as |message|
>
<message.description>
{{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}}
</message.description>
<message.link
@route='scopes.scope.host-catalogs.host-catalog.host-sets.new'
>
<Rose::Icon @name='flight-icons/plus-circle-16' />
{{t 'titles.new'}}
</message.link>
{{#if (can 'create collection' this.scope collection='host-sets')}}
<message.link
@route='scopes.scope.host-catalogs.host-catalog.host-sets.new'
>
<Rose::Icon @name='flight-icons/plus-circle-16' />
{{t 'titles.new'}}
</message.link>
{{/if}}
</Rose::Message>
</Rose::Layout::Centered>
@@ -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();
@@ -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}"]`));
});
});