CyberCoveLLC/threshold-ui
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into host-sets

Browse Source
This commit is contained in:
Dharini Jeeva authored and GitHub committed 2021-08-24 13:45:25 -07:00
2 parents f6016453f1 0053b09285
commit 39b71aa526
8 files changed
+415 -194
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

addons/api/mirage/factories/host-catalog.js
+8
View File
@@ -1,7 +1,15 @@
import factory from '../generated/factories/host-catalog';
import { trait } from 'ember-cli-mirage';
import permissions from '../helpers/permissions';
export default factory.extend({
authorized_actions: () =>
permissions.authorizedActionsFor('host-catalog') || [
'no-op',
'read',
'update',
'delete',
],
withChildren: trait({
afterCreate(hostCatalog, server) {
const { scope } = hostCatalog;
ui/admin/app/components/form/host-catalog/index.hbs
+8 -8
View File
@@ -45,12 +45,12 @@
</field.errors>
{{/if}}
</form.textarea>
<form.actions
@disabled={{if @model.cannotSave @model.cannotSave}}
@enableEditText={{t 'actions.edit-form'}}
@submitText={{t 'actions.save'}}
@cancelText={{t 'actions.cancel'}}
/>
{{#if (can 'save model' @model)}}
<form.actions
@disabled={{if @model.cannotSave @model.cannotSave}}
@enableEditText={{t 'actions.edit-form'}}
@submitText={{t 'actions.save'}}
@cancelText={{t 'actions.cancel'}}
/>
{{/if}}
</Rose::Form>
ui/admin/app/templates/scopes/scope/host-catalogs/host-catalog/-actions.hbs
+10 -8
View File
@@ -15,12 +15,14 @@
>
{{t 'resources.host-set.actions.create'}}
</dropdown.link>
<dropdown.separator />
<dropdown.button
@style='danger'
@disabled={{@model.canSave}}
{{on 'click' (route-action 'delete' @model)}}
>
{{t 'resources.host-catalog.actions.delete'}}
</dropdown.button>
{{#if (can 'delete model' @model)}}
<dropdown.separator />
<dropdown.button
@style='danger'
@disabled={{@model.canSave}}
{{on 'click' (route-action 'delete' @model)}}
>
{{t 'resources.host-catalog.actions.delete'}}
</dropdown.button>
{{/if}}
</Rose::Dropdown>
ui/admin/app/templates/scopes/scope/host-catalogs/index.hbs
+9 -5
View File
@@ -41,12 +41,16 @@
{{#each @model as |hostCatalog|}}
<body.row as |row|>
<row.headerCell>
<LinkTo
@route='scopes.scope.host-catalogs.host-catalog'
@model={{hostCatalog.id}}
>
{{#if (can 'read model' hostCatalog)}}
<LinkTo
@route='scopes.scope.host-catalogs.host-catalog'
@model={{hostCatalog.id}}
>
{{hostCatalog.displayName}}
</LinkTo>
{{else}}
{{hostCatalog.displayName}}
</LinkTo>
{{/if}}
<p>{{hostCatalog.description}}</p>
</row.headerCell>
<row.cell>
ui/admin/tests/acceptance/host-catalogs-test.js
-173
View File
@@ -2,10 +2,7 @@ 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 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.
@@ -63,23 +60,6 @@ module('Acceptance | host-catalogs', function (hooks) {
authenticateSession({});
});
test('visiting host catalogs', async function (assert) {
assert.expect(2);
await visit(urls.hostCatalogs);
await a11yAudit();
assert.equal(currentURL(), urls.hostCatalogs);
await visit(urls.hostCatalog);
await a11yAudit();
assert.equal(currentURL(), urls.hostCatalog);
});
test('visiting an unknown host catalog displays 404 message', async function (assert) {
assert.expect(1);
await visit(urls.unknownHostCatalog);
await a11yAudit();
assert.ok(find('.rose-message-subtitle').textContent.trim(), 'Error 404');
});
test('can create new host catalogs', async function (assert) {
assert.expect(1);
const count = gethostCatalogCount();
@@ -131,157 +111,4 @@ module('Acceptance | host-catalogs', function (hooks) {
'Name is required.'
);
});
test('can save changes to existing host catalog', async function (assert) {
assert.expect(3);
assert.notEqual(instances.hostCatalog.name, 'random string');
await visit(urls.hostCatalog);
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.hostCatalog);
assert.equal(
this.server.schema.hostCatalogs.all().models[0].name,
'random string'
);
});
test('can cancel changes to existing host catalog', async function (assert) {
assert.expect(2);
await visit(urls.hostCatalog);
await click('form [type="button"]', 'Activate edit mode');
await fillIn('[name="name"]', 'random string');
await click('.rose-form-actions [type="button"]');
assert.notEqual(instances.hostCatalog.name, 'random string');
assert.equal(find('[name="name"]').value, instances.hostCatalog.name);
});
test('saving an existing host catalog with invalid fields displays error messages', async function (assert) {
assert.expect(2);
this.server.patch('/host-catalogs/: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.hostCatalog);
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 host catalog changes via dialog', async function (assert) {
assert.expect(5);
const confirmService = this.owner.lookup('service:confirm');
confirmService.enabled = true;
assert.notEqual(instances.hostCatalog.name, 'random string');
await visit(urls.hostCatalog);
await click('form [type="button"]', 'Activate edit mode');
await fillIn('[name="name"]', 'random string');
assert.equal(currentURL(), urls.hostCatalog);
try {
await visit(urls.hostCatalogs);
} catch (e) {
assert.ok(find('.rose-dialog'));
await click('.rose-dialog-footer button:first-child');
assert.equal(currentURL(), urls.hostCatalogs);
assert.notEqual(
this.server.schema.hostCatalogs.all().models[0].name,
'random string'
);
}
});
test('can cancel discard unsaved host catalog changes via dialog', async function (assert) {
assert.expect(5);
const confirmService = this.owner.lookup('service:confirm');
confirmService.enabled = true;
assert.notEqual(instances.hostCatalog.name, 'random string');
await visit(urls.hostCatalog);
await click('form [type="button"]', 'Activate edit mode');
await fillIn('[name="name"]', 'random string');
assert.equal(currentURL(), urls.hostCatalog);
try {
await visit(urls.hostCatalogs);
} catch (e) {
assert.ok(find('.rose-dialog'));
await click('.rose-dialog-footer button:last-child');
assert.equal(currentURL(), urls.hostCatalog);
assert.notEqual(
this.server.schema.hostCatalogs.all().models[0].name,
'random string'
);
}
});
test('can delete host catalog', async function (assert) {
assert.expect(1);
const count = gethostCatalogCount();
await visit(urls.hostCatalog);
await click('.rose-layout-page-actions .rose-dropdown-button-danger');
assert.equal(gethostCatalogCount(), count - 1);
});
test('can accept delete host catalog 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 count = gethostCatalogCount();
await visit(urls.hostCatalog);
await click('.rose-layout-page-actions .rose-dropdown-button-danger');
assert.equal(gethostCatalogCount(), count - 1);
assert.ok(confirmService.confirm.calledOnce);
});
test('cannot cancel delete host catalog 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 count = gethostCatalogCount();
await visit(urls.hostCatalog);
await click('.rose-layout-page-actions .rose-dropdown-button-danger');
assert.equal(gethostCatalogCount(), count);
assert.ok(confirmService.confirm.calledOnce);
});
test('deleting a host catalog which errors displays error messages', async function (assert) {
assert.expect(1);
this.server.del('/host-catalogs/:id', () => {
return new Response(
490,
{},
{
status: 490,
code: 'error',
message: 'Oops.',
}
);
});
await visit(urls.hostCatalog);
await click('.rose-layout-page-actions .rose-dropdown-button-danger');
assert.ok(find('[role="alert"]').textContent.trim(), 'Oops.');
});
});
ui/admin/tests/acceptance/host-catalogs/delete-test.js
+126
View File
@@ -0,0 +1,126 @@
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 | host-catalogs | delete', function (hooks) {
setupApplicationTest(hooks);
setupMirage(hooks);
let gethostCatalogCount;
const instances = {
scopes: {
global: null,
org: null,
project: null,
},
};
const urls = {
globalScope: null,
orgScope: null,
projectScope: null,
hostCatalogs: null,
hostCatalog: null,
newHostCatalog: 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,
});
// 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.unknownHostCatalog = `${urls.hostCatalogs}/foo`;
urls.newHostCatalog = `${urls.hostCatalogs}/new`;
// Generate resource couner
gethostCatalogCount = () =>
this.server.schema.hostCatalogs.all().models.length;
authenticateSession({});
});
test('can delete host catalog', async function (assert) {
assert.expect(1);
const count = gethostCatalogCount();
await visit(urls.hostCatalog);
await click('.rose-layout-page-actions .rose-dropdown-button-danger');
assert.equal(gethostCatalogCount(), count - 1);
});
test('cannot delete host catalog without proper authorization', async function (assert) {
assert.expect(1);
instances.hostCatalog.authorized_actions =
instances.hostCatalog.authorized_actions.filter(
(item) => item !== 'delete'
);
await visit(urls.hostCatalog);
assert.notOk(
find('.rose-layout-page-actions .rose-dropdown-button-danger')
);
});
test('can accept delete host catalog 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 count = gethostCatalogCount();
await visit(urls.hostCatalog);
await click('.rose-layout-page-actions .rose-dropdown-button-danger');
assert.equal(gethostCatalogCount(), count - 1);
assert.ok(confirmService.confirm.calledOnce);
});
test('cannot cancel delete host catalog 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 count = gethostCatalogCount();
await visit(urls.hostCatalog);
await click('.rose-layout-page-actions .rose-dropdown-button-danger');
assert.equal(gethostCatalogCount(), count);
assert.ok(confirmService.confirm.calledOnce);
});
test('deleting a host catalog which errors displays error messages', async function (assert) {
assert.expect(1);
this.server.del('/host-catalogs/:id', () => {
return new Response(
490,
{},
{
status: 490,
code: 'error',
message: 'Oops.',
}
);
});
await visit(urls.hostCatalog);
await click('.rose-layout-page-actions .rose-dropdown-button-danger');
assert.ok(find('[role="alert"]').textContent.trim(), 'Oops.');
});
});
ui/admin/tests/acceptance/host-catalogs/read-test.js
+84
View File
@@ -0,0 +1,84 @@
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 | host-catalogs | read', function (hooks) {
setupApplicationTest(hooks);
setupMirage(hooks);
const instances = {
scopes: {
global: null,
org: null,
project: null,
},
};
const urls = {
globalScope: null,
orgScope: null,
projectScope: null,
hostCatalogs: null,
hostCatalog: null,
newHostCatalog: 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,
});
// 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.unknownHostCatalog = `${urls.hostCatalogs}/foo`;
urls.newHostCatalog = `${urls.hostCatalogs}/new`;
authenticateSession({});
});
test('visiting host catalogs', async function (assert) {
assert.expect(2);
await visit(urls.hostCatalogs);
await a11yAudit();
assert.equal(currentURL(), urls.hostCatalogs);
await visit(urls.hostCatalog);
await a11yAudit();
assert.equal(currentURL(), urls.hostCatalog);
});
test('cannot navigate to a host catalog form without proper authorization', async function (assert) {
assert.expect(1);
instances.hostCatalog.authorized_actions =
instances.hostCatalog.authorized_actions.filter(
(item) => item !== 'read'
);
await visit(urls.hostCatalog);
assert.notOk(find('main tbody .rose-table-header-cell:nth-child(1) a'));
});
test('visiting an unknown host catalog displays 404 message', async function (assert) {
assert.expect(1);
await visit(urls.unknownHostCatalog);
await a11yAudit();
assert.ok(find('.rose-message-subtitle').textContent.trim(), 'Error 404');
});
});
ui/admin/tests/acceptance/host-catalogs/update-test.js
+170
View File
@@ -0,0 +1,170 @@
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 | host-catalogs | update', function (hooks) {
setupApplicationTest(hooks);
setupMirage(hooks);
const instances = {
scopes: {
global: null,
org: null,
project: null,
},
};
const urls = {
globalScope: null,
orgScope: null,
projectScope: null,
hostCatalogs: null,
hostCatalog: null,
newHostCatalog: 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,
});
// 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.unknownHostCatalog = `${urls.hostCatalogs}/foo`;
urls.newHostCatalog = `${urls.hostCatalogs}/new`;
authenticateSession({});
});
test('can save changes to existing host catalog', async function (assert) {
assert.expect(3);
assert.notEqual(instances.hostCatalog.name, 'random string');
await visit(urls.hostCatalog);
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.hostCatalog);
assert.equal(
this.server.schema.hostCatalogs.all().models[0].name,
'random string'
);
});
test('cannot make changes to an existing host catalog without proper authorization', async function (assert) {
assert.expect(1);
instances.hostCatalog.authorized_actions =
instances.hostCatalog.authorized_actions.filter(
(item) => item !== 'update'
);
await visit(urls.hostCatalog);
assert.notOk(find('.rose-layout-page-actions .rose-button-secondary'));
});
test('can cancel changes to existing host catalog', async function (assert) {
assert.expect(2);
await visit(urls.hostCatalog);
await click('form [type="button"]', 'Activate edit mode');
await fillIn('[name="name"]', 'random string');
await click('.rose-form-actions [type="button"]');
assert.notEqual(instances.hostCatalog.name, 'random string');
assert.equal(find('[name="name"]').value, instances.hostCatalog.name);
});
test('saving an existing host catalog with invalid fields displays error messages', async function (assert) {
assert.expect(2);
this.server.patch('/host-catalogs/: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.hostCatalog);
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 host catalog changes via dialog', async function (assert) {
assert.expect(5);
const confirmService = this.owner.lookup('service:confirm');
confirmService.enabled = true;
assert.notEqual(instances.hostCatalog.name, 'random string');
await visit(urls.hostCatalog);
await click('form [type="button"]', 'Activate edit mode');
await fillIn('[name="name"]', 'random string');
assert.equal(currentURL(), urls.hostCatalog);
try {
await visit(urls.hostCatalogs);
} catch (e) {
assert.ok(find('.rose-dialog'));
await click('.rose-dialog-footer button:first-child');
assert.equal(currentURL(), urls.hostCatalogs);
assert.notEqual(
this.server.schema.hostCatalogs.all().models[0].name,
'random string'
);
}
});
test('can cancel discard unsaved host catalog changes via dialog', async function (assert) {
assert.expect(5);
const confirmService = this.owner.lookup('service:confirm');
confirmService.enabled = true;
assert.notEqual(instances.hostCatalog.name, 'random string');
await visit(urls.hostCatalog);
await click('form [type="button"]', 'Activate edit mode');
await fillIn('[name="name"]', 'random string');
assert.equal(currentURL(), urls.hostCatalog);
try {
await visit(urls.hostCatalogs);
} catch (e) {
assert.ok(find('.rose-dialog'));
await click('.rose-dialog-footer button:last-child');
assert.equal(currentURL(), urls.hostCatalog);
assert.notEqual(
this.server.schema.hostCatalogs.all().models[0].name,
'random string'
);
}
});
});