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

Merge branch 'main' into hosts

Browse Source
This commit is contained in:
Dharini Jeeva authored and GitHub committed 2021-08-20 11:42:50 -07:00
2 parents 7d08d69db0 8118781d06
commit 3fd8d2d01f
25 files changed
+729 -336
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

addons/api/mirage/factories/auth-method.js
+8
View File
@@ -1,9 +1,17 @@
import factory from '../generated/factories/auth-method';
import { trait } from 'ember-cli-mirage';
import permissions from '../helpers/permissions';
const types = ['password', 'oidc'];
export default factory.extend({
authorized_actions: () =>
permissions.authorizedActionsFor('auth-method') || [
'no-op',
'read',
'update',
'delete',
],
id: (i) => `auth-method-id-${i}`,
// Cycle through available types
addons/api/mirage/factories/role.js
+8
View File
@@ -1,7 +1,15 @@
import factory from '../generated/factories/role';
import { trait } from 'ember-cli-mirage';
import permissions from '../helpers/permissions';
export default factory.extend({
authorized_actions: () =>
permissions.authorizedActionsFor('role') || [
'no-op',
'read',
'update',
'delete',
],
// eslint-disable-next-line ember/avoid-leaking-state-in-ember-objects
grant_strings: () => [
'id=*;action=*',
package.json
+2 -1
View File
@@ -77,7 +77,8 @@
"normalize-url": "^4.5.1",
"glob-parent": "^5.1.2",
"tar": "^6.1.2",
"xmldom": "github:xmldom/xmldom#0.7.0"
"xmldom": "github:xmldom/xmldom#0.7.0",
"path-parse": "^1.0.7"
},
"config": {
"commitizen": {
ui/admin/app/components/form/auth-method/oidc/index.hbs
+8 -8
View File
@@ -6,7 +6,6 @@
@showEditToggle={{if @model.isNew false true}}
as |form|
>
<form.actions
@disabled={{if @model.cannotSave @model.cannotSave}}
@enableEditText={{t 'actions.edit-form'}}
@@ -678,11 +677,12 @@
@disabled={{true}}
/>
{{/unless}}
<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/components/form/auth-method/password/index.hbs
+8 -7
View File
@@ -51,11 +51,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/components/form/role/index.hbs
+8 -8
View File
@@ -119,12 +119,12 @@
</form.radioGroup>
</fieldset>
{{/unless}}
<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/auth-methods/auth-method/-actions.hbs
+10 -8
View File
@@ -59,12 +59,14 @@
>
{{t 'resources.account.actions.create'}}
</dropdown.link>
<dropdown.separator />
<dropdown.button
@style='danger'
@disabled={{@model.canSave}}
{{on 'click' (route-action 'delete' @model)}}
>
{{t 'resources.auth-method.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.auth-method.actions.delete'}}
</dropdown.button>
{{/if}}
</Rose::Dropdown>
ui/admin/app/templates/scopes/scope/auth-methods/index.hbs
+13 -7
View File
@@ -76,6 +76,19 @@
}}
{{#if authMethod.isOIDC}}
{{#if (feature-flag 'oidc-crud')}}
{{#if (can 'read model' authMethod)}}
<LinkTo
@route='scopes.scope.auth-methods.auth-method'
@model={{authMethod.id}}
>
{{authMethod.displayName}}
</LinkTo>
{{else}}
{{authMethod.displayName}}
{{/if}}
{{/if}}
{{else}}
{{#if (can 'read model' authMethod)}}
<LinkTo
@route='scopes.scope.auth-methods.auth-method'
@model={{authMethod.id}}
@@ -85,13 +98,6 @@
{{else}}
{{authMethod.displayName}}
{{/if}}
{{else}}
<LinkTo
@route='scopes.scope.auth-methods.auth-method'
@model={{authMethod.id}}
>
{{authMethod.displayName}}
</LinkTo>
{{/if}}
<p>{{authMethod.description}}</p>
</row.headerCell>
ui/admin/app/templates/scopes/scope/roles/index.hbs
+6 -2
View File
@@ -37,9 +37,13 @@
{{#each @model as |role|}}
<body.row as |row|>
<row.headerCell>
<LinkTo @route='scopes.scope.roles.role' @model={{role.id}}>
{{#if (can 'read model' role)}}
<LinkTo @route='scopes.scope.roles.role' @model={{role.id}}>
{{role.displayName}}
</LinkTo>
{{else}}
{{role.displayName}}
</LinkTo>
{{/if}}
<p>{{role.description}}</p>
</row.headerCell>
<row.cell>
ui/admin/app/templates/scopes/scope/roles/role/-actions.hbs
+10 -8
View File
@@ -6,12 +6,14 @@
<dropdown.link @route='scopes.scope.roles.role.add-principals'>
{{t 'resources.role.principal.actions.add-principals'}}
</dropdown.link>
<dropdown.separator />
<dropdown.button
@style='danger'
@disabled={{@model.canSave}}
{{on 'click' (route-action 'delete' @model)}}
>
{{t 'resources.role.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.role.actions.delete'}}
</dropdown.button>
{{/if}}
</Rose::Dropdown>
ui/admin/jsconfig.json
-1
View File
@@ -1 +0,0 @@
{"compilerOptions":{"target":"es6","experimentalDecorators":true},"exclude":["node_modules","bower_components","tmp","vendor",".git","dist"]}
ui/admin/tests/acceptance/auth-methods-test.js
-169
View File
@@ -103,175 +103,6 @@ module('Acceptance | auth methods', function (hooks) {
assert.equal(currentURL(), urls.authMethods);
});
test('can delete an auth method', async function (assert) {
assert.expect(1);
const authMethodsCount = this.server.db.authMethods.length;
await visit(urls.authMethod);
await click('.rose-layout-page-actions .rose-dropdown-button-danger');
assert.equal(this.server.db.authMethods.length, authMethodsCount - 1);
});
test('saving a new auth method with invalid fields displays error messages', async function (assert) {
assert.expect(2);
this.server.post('/auth-methods', () => {
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.newAuthMethod);
await fillIn('[name="name"]', 'new auth method');
await click('form [type="submit"]');
await a11yAudit();
assert.ok(
find('[role="alert"]').textContent.trim(),
'The request was invalid.',
'Displays primary error message.'
);
assert.ok(
find('.rose-form-error-message').textContent.trim(),
'Name is required.',
'Displays field-level errors.'
);
});
test('errors are displayed when save on auth method fails', async function (assert) {
assert.expect(1);
this.server.patch('/auth-methods/:id', () => {
return new Response(
490,
{},
{
status: 490,
code: 'error',
message: 'Oops.',
}
);
});
await visit(urls.authMethod);
await click('form [type="button"]', 'Activate edit mode');
await fillIn('[name="name"]', 'save auth method');
await click('form [type="submit"]');
await a11yAudit();
assert.ok(
find('[role="alert"]').textContent.trim(),
'Oops.',
'Displays primary error message.'
);
});
test('errors are displayed when delete on an auth method fails', async function (assert) {
assert.expect(1);
this.server.del('/auth-methods/:id', () => {
return new Response(
490,
{},
{
status: 490,
code: 'error',
message: 'Oops.',
}
);
});
await visit(urls.authMethod);
await click('.rose-layout-page-actions .rose-dropdown-button-danger');
await a11yAudit();
assert.ok(
find('[role="alert"]').textContent.trim(),
'Oops.',
'Displays primary error message.'
);
});
test('saving an existing auth method with invalid fields displays error messages', async function (assert) {
assert.expect(2);
this.server.patch('/auth-methods/: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.authMethod);
await click('form [type="button"]', 'Activate edit mode');
await fillIn('[name="name"]', 'existing auth method');
await click('form [type="submit"]');
await a11yAudit();
assert.ok(
find('[role="alert"]').textContent.trim(),
'The request was invalid.',
'Displays primary error message.'
);
assert.ok(
find('.rose-form-error-message').textContent.trim(),
'Name is required.',
'Displays field-level errors.'
);
});
test('saving an existing auth method with invalid fields displays error messages', async function (assert) {
assert.expect(2);
this.server.patch('/auth-methods/: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.authMethod);
await click('form [type="button"]', 'Activate edit mode');
await fillIn('[name="name"]', 'existing auth method');
await click('form [type="submit"]');
await a11yAudit();
assert.ok(
find('[role="alert"]').textContent.trim(),
'The request was invalid.',
'Displays primary error message.'
);
assert.ok(
find('.rose-form-error-message').textContent.trim(),
'Name is required.',
'Displays field-level errors.'
);
});
test('user can make primary an auth method', async function (assert) {
assert.expect(2);
assert.notOk(
ui/admin/tests/acceptance/auth-methods/delete-test.js
+93
View File
@@ -0,0 +1,93 @@
import { module, test } from 'qunit';
import { visit, click, find } from '@ember/test-helpers';
import { setupApplicationTest } from 'ember-qunit';
import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
import a11yAudit from 'ember-a11y-testing/test-support/audit';
import { Response } from 'miragejs';
import {
authenticateSession,
// // These are left here intentionally for future reference.
// //currentSession,
// //invalidateSession,
} from 'ember-simple-auth/test-support';
module('Acceptance | auth methods | delete', function (hooks) {
setupApplicationTest(hooks);
setupMirage(hooks);
const instances = {
scopes: {
global: null,
org: null,
},
authMethod: null,
};
const urls = {
orgScope: null,
authMethods: null,
newAuthMethod: null,
authMethod: null,
};
hooks.beforeEach(function () {
// Setup Mirage mock resources for this test
authenticateSession({});
instances.scopes.global = this.server.create('scope', { id: 'global' });
instances.scopes.org = this.server.create('scope', {
type: 'org',
scope: { id: 'global', type: 'global' },
});
instances.authMethod = this.server.create('auth-method', {
scope: instances.scopes.org,
});
// Generate route URLs for resources
urls.orgScope = `/scopes/${instances.scopes.org.id}`;
urls.authMethods = `${urls.orgScope}/auth-methods`;
urls.newAuthMethod = `${urls.authMethods}/new?type=password`;
urls.authMethod = `${urls.authMethods}/${instances.authMethod.id}`;
});
test('can delete an auth method', async function (assert) {
assert.expect(1);
const authMethodsCount = this.server.db.authMethods.length;
await visit(urls.authMethod);
await click('.rose-layout-page-actions .rose-dropdown-button-danger');
assert.equal(this.server.db.authMethods.length, authMethodsCount - 1);
});
test('errors are displayed when delete on an auth method fails', async function (assert) {
assert.expect(1);
this.server.del('/auth-methods/:id', () => {
return new Response(
490,
{},
{
status: 490,
code: 'error',
message: 'Oops.',
}
);
});
await visit(urls.authMethod);
await click('.rose-layout-page-actions .rose-dropdown-button-danger');
await a11yAudit();
assert.ok(
find('[role="alert"]').textContent.trim(),
'Oops.',
'Displays primary error message.'
);
});
test('cannot delete an auth method without proper authorization', async function (assert) {
assert.expect(1);
instances.authMethod.authorized_actions =
instances.authMethod.authorized_actions.filter(
(item) => item !== 'delete'
);
await visit(urls.authMethod);
assert.notOk(
find('.rose-layout-page-actions .rose-dropdown-button-danger')
);
});
});
ui/admin/tests/acceptance/auth-methods/read-test.js
+72
View File
@@ -0,0 +1,72 @@
import { module, test } from 'qunit';
import { visit, currentURL, click, 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 | auth methods | read', function (hooks) {
setupApplicationTest(hooks);
setupMirage(hooks);
const instances = {
scopes: {
global: null,
org: null,
},
authMethod: null,
};
const urls = {
orgScope: null,
authMethods: null,
newAuthMethod: null,
authMethod: null,
};
hooks.beforeEach(function () {
// Setup Mirage mock resources for this test
authenticateSession({});
instances.scopes.global = this.server.create('scope', { id: 'global' });
instances.scopes.org = this.server.create('scope', {
type: 'org',
scope: { id: 'global', type: 'global' },
});
instances.authMethod = this.server.create('auth-method', {
scope: instances.scopes.org,
});
// Generate route URLs for resources
urls.orgScope = `/scopes/${instances.scopes.org.id}`;
urls.authMethods = `${urls.orgScope}/auth-methods`;
urls.newAuthMethod = `${urls.authMethods}/new?type=password`;
urls.authMethod = `${urls.authMethods}/${instances.authMethod.id}`;
});
test('visiting auth methods', async function (assert) {
assert.expect(1);
await visit(urls.authMethods);
await a11yAudit();
assert.equal(currentURL(), urls.authMethods);
});
test('can navigate to an auth method form', async function (assert) {
assert.expect(1);
await visit(urls.authMethods);
await click('main tbody .rose-table-header-cell:nth-child(1) a');
await a11yAudit();
assert.equal(currentURL(), urls.authMethod);
});
test('cannot navigate to an auth method form without proper authorization', async function (assert) {
assert.expect(1);
instances.authMethod.authorized_actions =
instances.authMethod.authorized_actions.filter((item) => item !== 'read');
await visit(urls.authMethod);
assert.notOk(find('main tbody .rose-table-header-cell:nth-child(1) a'));
});
});
ui/admin/tests/acceptance/auth-methods/update-test.js
+154
View File
@@ -0,0 +1,154 @@
import { module, test } from 'qunit';
import { visit, click, find, 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 {
authenticateSession,
// // These are left here intentionally for future reference.
// //currentSession,
// //invalidateSession,
} from 'ember-simple-auth/test-support';
module('Acceptance | auth methods | update', function (hooks) {
setupApplicationTest(hooks);
setupMirage(hooks);
const instances = {
scopes: {
global: null,
org: null,
},
authMethod: null,
};
const urls = {
orgScope: null,
authMethods: null,
newAuthMethod: null,
authMethod: null,
};
hooks.beforeEach(function () {
// Setup Mirage mock resources for this test
authenticateSession({});
instances.scopes.global = this.server.create('scope', { id: 'global' });
instances.scopes.org = this.server.create('scope', {
type: 'org',
scope: { id: 'global', type: 'global' },
});
instances.authMethod = this.server.create('auth-method', {
scope: instances.scopes.org,
});
// Generate route URLs for resources
urls.orgScope = `/scopes/${instances.scopes.org.id}`;
urls.authMethods = `${urls.orgScope}/auth-methods`;
urls.newAuthMethod = `${urls.authMethods}/new?type=password`;
urls.authMethod = `${urls.authMethods}/${instances.authMethod.id}`;
});
test('can update an auth method and save changes', async function (assert) {
assert.expect(1);
await visit(urls.authMethod);
await click('form [type="button"]', 'Activate edit mode');
await fillIn('[name="name"]', 'update name');
await click('form [type="submit"]:not(:disabled)');
assert.equal(this.server.db.authMethods[0].name, 'update name');
});
test('can update an auth method and cancel changes', async function (assert) {
assert.expect(1);
await visit(urls.authMethod);
await click('form [type="button"]', 'Activate edit mode');
await fillIn('[name="name"]', 'update name');
await click('form button:not([type="submit"])');
assert.notEqual(this.server.db.authMethods[0].name, 'update name');
});
test('cannot make changes to an existing auth method without proper authorization', async function (assert) {
assert.expect(1);
instances.authMethod.authorized_actions =
instances.authMethod.authorized_actions.filter(
(item) => item !== 'update'
);
await visit(urls.authMethod);
assert.notOk(find('.rose-layout-page-actions .rose-button-secondary'));
});
test('saving an existing auth method with invalid fields displays error messages', async function (assert) {
assert.expect(2);
this.server.patch('/auth-methods/: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.authMethod);
await click('form [type="button"]', 'Activate edit mode');
await fillIn('[name="name"]', 'existing auth method');
await click('form [type="submit"]');
await a11yAudit();
assert.ok(
find('[role="alert"]').textContent.trim(),
'The request was invalid.',
'Displays primary error message.'
);
assert.ok(
find('.rose-form-error-message').textContent.trim(),
'Name is required.',
'Displays field-level errors.'
);
});
test('saving an existing auth method with invalid fields displays error messages', async function (assert) {
assert.expect(2);
this.server.patch('/auth-methods/: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.authMethod);
await click('form [type="button"]', 'Activate edit mode');
await fillIn('[name="name"]', 'existing auth method');
await click('form [type="submit"]');
await a11yAudit();
assert.ok(
find('[role="alert"]').textContent.trim(),
'The request was invalid.',
'Displays primary error message.'
);
assert.ok(
find('.rose-form-error-message').textContent.trim(),
'Name is required.',
'Displays field-level errors.'
);
});
});
ui/admin/tests/acceptance/roles-test.js
-101
View File
@@ -56,40 +56,6 @@ module('Acceptance | roles', function (hooks) {
urls.newRole = `${urls.roles}/new`;
});
test('visiting roles', async function (assert) {
assert.expect(1);
await visit(urls.roles);
await a11yAudit();
assert.equal(currentURL(), urls.roles);
});
test('can navigate to a role form', async function (assert) {
assert.expect(1);
await visit(urls.roles);
await click('main tbody .rose-table-header-cell:nth-child(1) a');
await a11yAudit();
assert.equal(currentURL(), urls.role);
});
test('can save changes to an existing role', async function (assert) {
assert.expect(2);
await visit(urls.role);
await click('form [type="button"]', 'Activate edit mode');
await fillIn('[name="name"]', 'Updated admin role');
await click('.rose-form-actions [type="submit"]');
assert.equal(currentURL(), urls.role);
assert.equal(this.server.db.roles[0].name, 'Updated admin role');
});
test('can cancel changes to an existing role', async function (assert) {
assert.expect(1);
await visit(urls.role);
await click('form [type="button"]', 'Activate edit mode');
await fillIn('[name="name"]', 'Updated admin role');
await click('.rose-form-actions [type="button"]');
assert.notEqual(find('[name="name"]').value, 'Updated admin role');
});
test('can create new role', async function (assert) {
assert.expect(1);
const rolesCount = this.server.db.roles.length;
@@ -109,14 +75,6 @@ module('Acceptance | roles', function (hooks) {
assert.equal(this.server.db.roles.length, rolesCount);
});
test('can delete a role', async function (assert) {
assert.expect(1);
const rolesCount = this.server.db.roles.length;
await visit(urls.role);
await click('.rose-layout-page-actions .rose-dropdown-button-danger');
assert.equal(this.server.db.roles.length, rolesCount - 1);
});
test('saving a new role with invalid fields displays error messages', async function (assert) {
assert.expect(2);
this.server.post('/roles', () => {
@@ -145,63 +103,4 @@ module('Acceptance | roles', function (hooks) {
assert.ok(find('[role="alert"]'));
assert.ok(find('.rose-form-error-message'));
});
test('saving an existing role with invalid fields displays error messages', async function (assert) {
assert.expect(2);
this.server.patch('/roles/: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.role);
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.',
'Displays primary error message.'
);
assert.ok(
find('.rose-form-error-message').textContent.trim(),
'Name is required.',
'Displays field-level errors.'
);
});
test('errors are displayed when delete project fails', async function (assert) {
assert.expect(1);
this.server.del('/roles/:id', () => {
return new Response(
490,
{},
{
status: 490,
code: 'error',
message: 'Oops.',
}
);
});
await visit(urls.role);
await click('.rose-layout-page-actions .rose-dropdown-button-danger');
assert.ok(
find('[role="alert"]').textContent.trim(),
'Oops.',
'Displays primary error message.'
);
});
});
ui/admin/tests/acceptance/roles/delete-test.js
+97
View File
@@ -0,0 +1,97 @@
import { module, test } from 'qunit';
import { visit, click, find } from '@ember/test-helpers';
import { setupApplicationTest } from 'ember-qunit';
import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
import { Response } from 'miragejs';
import {
authenticateSession,
// These are left here intentionally for future reference.
//currentSession,
//invalidateSession,
} from 'ember-simple-auth/test-support';
module('Acceptance | roles | delete', function (hooks) {
setupApplicationTest(hooks);
setupMirage(hooks);
const instances = {
scopes: {
global: null,
org: null,
project: null,
},
role: null,
};
const urls = {
orgScope: null,
roles: null,
role: null,
newRole: null,
};
hooks.beforeEach(function () {
authenticateSession({});
instances.scopes.global = this.server.create('scope', { id: 'global' });
instances.scopes.org = this.server.create('scope', {
type: 'org',
scope: { id: 'global', type: 'global' },
});
// The project scope is not yet used for role tests (though it will be
// in the future). This is created simply to test the grant scope loading
// mechanism.
instances.scopes.project = this.server.create('scope', {
type: 'project',
scope: { id: instances.scopes.org.id, type: instances.scopes.org.type },
});
instances.role = this.server.create(
'role',
{
scope: instances.scopes.org,
},
'withPrincipals'
);
urls.roles = `/scopes/${instances.scopes.org.id}/roles`;
urls.role = `${urls.roles}/${instances.role.id}`;
urls.newRole = `${urls.roles}/new`;
});
test('can delete a role', async function (assert) {
assert.expect(1);
const rolesCount = this.server.db.roles.length;
await visit(urls.role);
await click('.rose-layout-page-actions .rose-dropdown-button-danger');
assert.equal(this.server.db.roles.length, rolesCount - 1);
});
test('cannot delete a role without proper authorization', async function (assert) {
assert.expect(1);
instances.role.authorized_actions =
instances.role.authorized_actions.filter((item) => item !== 'delete');
await visit(urls.role);
assert.notOk(
find('.rose-layout-page-actions .rose-dropdown-button-danger')
);
});
test('errors are displayed when delete project fails', async function (assert) {
assert.expect(1);
this.server.del('/roles/:id', () => {
return new Response(
490,
{},
{
status: 490,
code: 'error',
message: 'Oops.',
}
);
});
await visit(urls.role);
await click('.rose-layout-page-actions .rose-dropdown-button-danger');
assert.ok(
find('[role="alert"]').textContent.trim(),
'Oops.',
'Displays primary error message.'
);
});
});
ui/admin/tests/acceptance/roles/read-test.js
+80
View File
@@ -0,0 +1,80 @@
import { module, test } from 'qunit';
import { visit, currentURL, click, 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 | roles | read', function (hooks) {
setupApplicationTest(hooks);
setupMirage(hooks);
const instances = {
scopes: {
global: null,
org: null,
project: null,
},
role: null,
};
const urls = {
orgScope: null,
roles: null,
role: null,
newRole: null,
};
hooks.beforeEach(function () {
authenticateSession({});
instances.scopes.global = this.server.create('scope', { id: 'global' });
instances.scopes.org = this.server.create('scope', {
type: 'org',
scope: { id: 'global', type: 'global' },
});
// The project scope is not yet used for role tests (though it will be
// in the future). This is created simply to test the grant scope loading
// mechanism.
instances.scopes.project = this.server.create('scope', {
type: 'project',
scope: { id: instances.scopes.org.id, type: instances.scopes.org.type },
});
instances.role = this.server.create(
'role',
{
scope: instances.scopes.org,
},
'withPrincipals'
);
urls.roles = `/scopes/${instances.scopes.org.id}/roles`;
urls.role = `${urls.roles}/${instances.role.id}`;
urls.newRole = `${urls.roles}/new`;
});
test('visiting roles', async function (assert) {
assert.expect(1);
await visit(urls.roles);
await a11yAudit();
assert.equal(currentURL(), urls.roles);
});
test('can navigate to a role form', async function (assert) {
assert.expect(1);
await visit(urls.roles);
await click('main tbody .rose-table-header-cell:nth-child(1) a');
await a11yAudit();
assert.equal(currentURL(), urls.role);
});
test('cannot navigate to a role form without proper authorization', async function (assert) {
assert.expect(1);
instances.role.authorized_actions =
instances.role.authorized_actions.filter((item) => item !== 'read');
await visit(urls.roles);
assert.notOk(find('main tbody .rose-table-header-cell:nth-child(1) a'));
});
});
ui/admin/tests/acceptance/roles/update-test.js
+121
View File
@@ -0,0 +1,121 @@
import { module, test } from 'qunit';
import { visit, currentURL, click, fillIn, find } from '@ember/test-helpers';
import { setupApplicationTest } from 'ember-qunit';
import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
import { Response } from 'miragejs';
import {
authenticateSession,
// These are left here intentionally for future reference.
//currentSession,
//invalidateSession,
} from 'ember-simple-auth/test-support';
module('Acceptance | roles | update', function (hooks) {
setupApplicationTest(hooks);
setupMirage(hooks);
const instances = {
scopes: {
global: null,
org: null,
project: null,
},
role: null,
};
const urls = {
orgScope: null,
roles: null,
role: null,
newRole: null,
};
hooks.beforeEach(function () {
authenticateSession({});
instances.scopes.global = this.server.create('scope', { id: 'global' });
instances.scopes.org = this.server.create('scope', {
type: 'org',
scope: { id: 'global', type: 'global' },
});
// The project scope is not yet used for role tests (though it will be
// in the future). This is created simply to test the grant scope loading
// mechanism.
instances.scopes.project = this.server.create('scope', {
type: 'project',
scope: { id: instances.scopes.org.id, type: instances.scopes.org.type },
});
instances.role = this.server.create(
'role',
{
scope: instances.scopes.org,
},
'withPrincipals'
);
urls.roles = `/scopes/${instances.scopes.org.id}/roles`;
urls.role = `${urls.roles}/${instances.role.id}`;
urls.newRole = `${urls.roles}/new`;
});
test('can save changes to an existing role', async function (assert) {
assert.expect(2);
await visit(urls.role);
await click('form [type="button"]', 'Activate edit mode');
await fillIn('[name="name"]', 'Updated admin role');
await click('.rose-form-actions [type="submit"]');
assert.equal(currentURL(), urls.role);
assert.equal(this.server.db.roles[0].name, 'Updated admin role');
});
test('cannot make changes to an existing role without proper authorization', async function (assert) {
assert.expect(1);
instances.role.authorized_actions =
instances.role.authorized_actions.filter((item) => item !== 'update');
await visit(urls.role);
assert.notOk(find('.rose-layout-page-actions .rose-button-secondary'));
});
test('can cancel changes to an existing role', async function (assert) {
assert.expect(1);
await visit(urls.role);
await click('form [type="button"]', 'Activate edit mode');
await fillIn('[name="name"]', 'Updated admin role');
await click('.rose-form-actions [type="button"]');
assert.notEqual(find('[name="name"]').value, 'Updated admin role');
});
test('saving an existing role with invalid fields displays error messages', async function (assert) {
assert.expect(2);
this.server.patch('/roles/: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.role);
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.',
'Displays primary error message.'
);
assert.ok(
find('.rose-form-error-message').textContent.trim(),
'Name is required.',
'Displays field-level errors.'
);
});
});
ui/desktop/app/templates/scopes/scope/projects/targets/index.hbs
+9 -5
View File
@@ -24,12 +24,16 @@
{{#each @model as |model|}}
<body.row as |row|>
<row.headerCell>
<LinkTo
@route='scopes.scope.projects.targets.target'
@model={{model.id}}
>
{{#if (can 'read model' model)}}
<LinkTo
@route='scopes.scope.projects.targets.target'
@model={{model.id}}
>
{{model.displayName}}
</LinkTo>
{{else}}
{{model.displayName}}
</LinkTo>
{{/if}}
{{#if model.target.description}}
<p>{{model.target.description}}</p>
{{/if}}
ui/desktop/electron-app/package.json
+2 -1
View File
@@ -46,6 +46,7 @@
"yargs-parser": "~20.2.7",
"trim-newlines": "^3.0.1",
"normalize-url": "^4.5.1",
"jszip": "^3.7.0"
"jszip": "^3.7.0",
"path-parse": "^1.0.7"
}
}
ui/desktop/electron-app/yarn.lock
+8 -8
View File
@@ -2080,10 +2080,10 @@ jsprim@^1.2.2:
json-schema "0.2.3"
verror "1.10.0"
jszip@^3.1.0:
version "3.6.0"
resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.6.0.tgz#839b72812e3f97819cc13ac4134ffced95dd6af9"
integrity sha512-jgnQoG9LKnWO3mnVNBnfhkh0QknICd1FGSrXcgrl67zioyJ4wgx25o9ZqwNtrROSflGBCGYnJfjrIyRIby1OoQ==
jszip@^3.1.0, jszip@^3.7.0:
version "3.7.1"
resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.1.tgz#bd63401221c15625a1228c556ca8a68da6fda3d9"
integrity sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==
dependencies:
lie "~3.3.0"
pako "~1.0.2"
@@ -2802,10 +2802,10 @@ path-key@^3.1.0:
resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
path-parse@^1.0.6:
version "1.0.6"
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
path-parse@^1.0.6, path-parse@^1.0.7:
version "1.0.7"
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
path-type@^1.0.0:
version "1.1.0"
ui/desktop/jsconfig.json
-1
View File
@@ -1 +0,0 @@
{"compilerOptions":{"target":"es6","experimentalDecorators":true},"exclude":["node_modules","bower_components","tmp","vendor",".git","dist"]}
ui/desktop/tests/acceptance/projects/targets-test.js
+11
View File
@@ -209,6 +209,17 @@ module('Acceptance | projects | targets', function (hooks) {
await visit(urls.targets);
});
test('cannot navigate to a target without proper authorization', async function (assert) {
assert.expect(1);
instances.target.authorized_actions =
instances.target.authorized_actions.filter((item) => item !== 'read');
later(async () => {
run.cancelTimers();
assert.notOk(find('main tbody .rose-table-header-cell:nth-child(1) a'));
}, 750);
await visit(urls.targets);
});
test('connecting to a target', async function (assert) {
assert.expect(4);
stubs.ipcService.withArgs('cliExists').returns(true);
yarn.lock
+1 -1
View File
@@ -16701,7 +16701,7 @@ path-key@^3.0.0, path-key@^3.1.0:
resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
path-parse@^1.0.6:
path-parse@^1.0.6, path-parse@^1.0.7:
version "1.0.7"
resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==