-
+
{{t 'resources.user.actions.add-accounts'}}
diff --git a/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs b/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs
index 5d79b28c8..3ded8d49b 100644
--- a/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs
+++ b/ui/admin/app/templates/scopes/scope/users/user/add-accounts.hbs
@@ -20,7 +20,7 @@
{{t 'resources.user.messages.no-accounts.description'}}
-
+
{{t 'actions.back'}}
diff --git a/ui/admin/package.json b/ui/admin/package.json
index bc9e5b2b6..22cddb938 100644
--- a/ui/admin/package.json
+++ b/ui/admin/package.json
@@ -50,7 +50,7 @@
"ember-a11y-testing": "^4.0.7",
"ember-auto-import": "^1.10.1",
"ember-breadcrumbs": "^0.2.3",
- "ember-cli": "~3.27.0",
+ "ember-cli": "~3.28.0",
"ember-cli-app-version": "^5.0.0",
"ember-cli-babel": "^7.23.0",
"ember-cli-code-coverage": "^1.0.2",
diff --git a/ui/admin/tests/acceptance/auth-methods-test.js b/ui/admin/tests/acceptance/auth-methods/create-test.js
similarity index 68%
rename from ui/admin/tests/acceptance/auth-methods-test.js
rename to ui/admin/tests/acceptance/auth-methods/create-test.js
index 61d8071a3..684984999 100644
--- a/ui/admin/tests/acceptance/auth-methods-test.js
+++ b/ui/admin/tests/acceptance/auth-methods/create-test.js
@@ -2,7 +2,6 @@ import { module, test } from 'qunit';
import { visit, currentURL, 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,
@@ -12,7 +11,7 @@ import {
} from 'ember-simple-auth/test-support';
import { enableFeature } from 'ember-feature-flags/test-support';
-module('Acceptance | auth methods', function (hooks) {
+module('Acceptance | auth-methods | create ', function (hooks) {
setupApplicationTest(hooks);
setupMirage(hooks);
@@ -20,9 +19,12 @@ module('Acceptance | auth methods', function (hooks) {
scopes: {
global: null,
org: null,
+ project: null,
},
authMethod: null,
+ orgScope: null,
};
+
const urls = {
orgScope: null,
authMethods: null,
@@ -31,58 +33,33 @@ module('Acceptance | auth methods', function (hooks) {
};
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.orgScope = this.server.create(
+ 'scope',
+ {
+ type: 'org',
+ scope: { id: 'global', type: 'global' },
+ },
+ 'withChildren'
+ );
+
+ instances.scopes.project = this.server.create('scope', {
+ type: 'project',
+ scope: { id: instances.orgScope.id, type: instances.orgScope.type },
});
+
instances.authMethod = this.server.create('auth-method', {
- scope: instances.scopes.org,
+ scope: instances.orgScope,
});
// Generate route URLs for resources
- urls.orgScope = `/scopes/${instances.scopes.org.id}`;
+ urls.orgScope = `/scopes/${instances.orgScope.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('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('can create new auth method', async function (assert) {
+ test('Users can create new auth method', async function (assert) {
assert.expect(1);
const authMethodsCount = this.server.db.authMethods.length;
await visit(urls.newAuthMethod);
@@ -92,6 +69,33 @@ module('Acceptance | auth methods', function (hooks) {
assert.equal(this.server.db.authMethods.length, authMethodsCount + 1);
});
+ test('Users can navigate to new auth-methods route with proper authorization', async function (assert) {
+ assert.expect(2);
+ instances.orgScope.authorized_collection_actions['auth-methods'] = [
+ 'create',
+ 'list',
+ ];
+ await visit(urls.orgScope);
+ assert.ok(
+ instances.orgScope.authorized_collection_actions['auth-methods'].includes(
+ 'create'
+ )
+ );
+ assert.ok(find(`[href="${urls.authMethods}"]`));
+ });
+
+ test('Users cannot navigate to new auth-methods route without proper authorization', async function (assert) {
+ assert.expect(2);
+ instances.orgScope.authorized_collection_actions['auth-methods'] = [];
+ await visit(urls.orgScope);
+ assert.notOk(
+ instances.orgScope.authorized_collection_actions['auth-methods'].includes(
+ 'create'
+ )
+ );
+ assert.notOk(find(`[href="${urls.authMethods}"]`));
+ });
+
test('can cancel new auth method creation', async function (assert) {
assert.expect(2);
const authMethodsCount = this.server.db.authMethods.length;
@@ -106,7 +110,7 @@ module('Acceptance | auth methods', function (hooks) {
test('user can make primary an auth method', async function (assert) {
assert.expect(2);
assert.notOk(
- instances.scopes.org.primaryAuthMethodId,
+ instances.orgScope.primaryAuthMethodId,
'Primary auth method is not yet set.'
);
enableFeature('primary-auth-method');
@@ -114,7 +118,7 @@ module('Acceptance | auth methods', function (hooks) {
await click(
'.rose-layout-page-actions .rose-dropdown-content [type="button"]:first-child'
);
- const scope = this.server.schema.scopes.find(instances.scopes.org.id);
+ const scope = this.server.schema.scopes.find(instances.orgScope.id);
assert.equal(
scope.primaryAuthMethodId,
instances.authMethod.id,
@@ -136,7 +140,7 @@ module('Acceptance | auth methods', function (hooks) {
);
});
assert.notOk(
- instances.scopes.org.primaryAuthMethodId,
+ instances.orgScope.primaryAuthMethodId,
'Primary auth method is not yet set.'
);
enableFeature('primary-auth-method');
@@ -149,11 +153,11 @@ module('Acceptance | auth methods', function (hooks) {
test('user can remove as primary an auth method', async function (assert) {
assert.expect(2);
- instances.scopes.org.update({
+ instances.orgScope.update({
primaryAuthMethodId: instances.authMethod.id,
});
assert.ok(
- instances.scopes.org.primaryAuthMethodId,
+ instances.orgScope.primaryAuthMethodId,
'Primary auth method is set.'
);
enableFeature('primary-auth-method');
@@ -161,7 +165,7 @@ module('Acceptance | auth methods', function (hooks) {
await click(
'.rose-layout-page-actions .rose-dropdown-content [type="button"]:first-child'
);
- const scope = this.server.schema.scopes.find(instances.scopes.org.id);
+ const scope = this.server.schema.scopes.find(instances.orgScope.id);
assert.notOk(scope.primaryAuthMethodId, 'Primary auth method is unset.');
});
@@ -178,11 +182,11 @@ module('Acceptance | auth methods', function (hooks) {
}
);
});
- instances.scopes.org.update({
+ instances.orgScope.update({
primaryAuthMethodId: instances.authMethod.id,
});
assert.ok(
- instances.scopes.org.primaryAuthMethodId,
+ instances.orgScope.primaryAuthMethodId,
'Primary auth method is set.'
);
enableFeature('primary-auth-method');
@@ -196,7 +200,7 @@ module('Acceptance | auth methods', function (hooks) {
test('user can make and remove primary auth methods from index', async function (assert) {
assert.expect(3);
assert.notOk(
- instances.scopes.org.primaryAuthMethodId,
+ instances.orgScope.primaryAuthMethodId,
'Primary auth method is not yet set.'
);
enableFeature('primary-auth-method');
@@ -204,7 +208,7 @@ module('Acceptance | auth methods', function (hooks) {
await click(
'.rose-table-body .rose-table-row:first-child .rose-dropdown-content [type="button"]:first-child'
);
- let scope = this.server.schema.scopes.find(instances.scopes.org.id);
+ let scope = this.server.schema.scopes.find(instances.orgScope.id);
assert.equal(
scope.primaryAuthMethodId,
instances.authMethod.id,
@@ -213,7 +217,7 @@ module('Acceptance | auth methods', function (hooks) {
await click(
'.rose-table-body .rose-table-row:first-child .rose-dropdown-content [type="button"]:first-child'
);
- scope = this.server.schema.scopes.find(instances.scopes.org.id);
+ scope = this.server.schema.scopes.find(instances.orgScope.id);
assert.notOk(scope.primaryAuthMethodId, 'Primary auth method is unset.');
});
});
diff --git a/ui/admin/tests/acceptance/auth-methods/list-test.js b/ui/admin/tests/acceptance/auth-methods/list-test.js
new file mode 100644
index 000000000..385c8cb1a
--- /dev/null
+++ b/ui/admin/tests/acceptance/auth-methods/list-test.js
@@ -0,0 +1,79 @@
+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 | auth-methods | list', function (hooks) {
+ setupApplicationTest(hooks);
+ setupMirage(hooks);
+
+ const instances = {
+ scopes: {
+ global: null,
+ org: null,
+ },
+ orgScope: null,
+ };
+
+ const urls = {
+ scopes: {
+ org: null,
+ },
+ authMethods: null,
+ orgScope: null,
+ };
+
+ hooks.beforeEach(function () {
+ instances.scopes.global = this.server.create('scope', { id: 'global' });
+ instances.orgScope = this.server.create(
+ 'scope',
+ {
+ type: 'org',
+ scope: { id: 'global', type: 'global' },
+ },
+ 'withChildren'
+ );
+
+ urls.orgScope = `/scopes/${instances.orgScope.id}`;
+ urls.authMethods = `/scopes/${instances.orgScope.id}/auth-methods`;
+ authenticateSession({});
+ });
+
+ test('Users can navigate to auth methods with proper authorization', async function (assert) {
+ assert.expect(2);
+ await visit(urls.orgScope);
+ assert.ok(
+ instances.orgScope.authorized_collection_actions['auth-methods'].includes(
+ 'list'
+ )
+ );
+ assert.ok(find(`[href="${urls.authMethods}"]`));
+ });
+
+ test('Users cannot navigate to index without either list or create actions', async function (assert) {
+ assert.expect(2);
+ instances.orgScope.authorized_collection_actions['auth-methods'] = [];
+ await visit(urls.orgScope);
+ assert.notOk(
+ instances.orgScope.authorized_collection_actions['auth-methods'].includes(
+ 'list'
+ )
+ );
+ assert.notOk(find(`[href="${urls.authMethods}"]`));
+ });
+
+ test('User can navigate to index with only create action', async function (assert) {
+ assert.expect(1);
+ instances.orgScope.authorized_collection_actions['auth-methods'] = [
+ 'create',
+ ];
+ await visit(urls.orgScope);
+ assert.ok(find(`[href="${urls.authMethods}"]`));
+ });
+});
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}"]`));
+ });
+});
diff --git a/ui/admin/tests/acceptance/groups-test.js b/ui/admin/tests/acceptance/groups/create-test.js
similarity index 71%
rename from ui/admin/tests/acceptance/groups-test.js
rename to ui/admin/tests/acceptance/groups/create-test.js
index 38b95d60d..815e4a760 100644
--- a/ui/admin/tests/acceptance/groups-test.js
+++ b/ui/admin/tests/acceptance/groups/create-test.js
@@ -10,9 +10,10 @@ import {
//invalidateSession,
} from 'ember-simple-auth/test-support';
-module('Acceptance | groups', function (hooks) {
+module('Acceptance | groups | create', function (hooks) {
setupApplicationTest(hooks);
setupMirage(hooks);
+ let orgURL;
const instances = {
scopes: {
@@ -20,9 +21,9 @@ module('Acceptance | groups', function (hooks) {
org: null,
},
group: null,
+ orgScope: null,
};
const urls = {
- orgScope: null,
groups: null,
group: null,
newGroup: null,
@@ -30,17 +31,21 @@ module('Acceptance | groups', function (hooks) {
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' },
- });
+ instances.orgScope = this.server.create(
+ 'scope',
+ {
+ type: 'org',
+ scope: { id: 'global', type: 'global' },
+ },
+ 'withChildren'
+ );
instances.group = this.server.create('group', {
- scope: instances.scopes.org,
+ scope: instances.orgScope,
});
- urls.groups = `/scopes/${instances.scopes.org.id}/groups`;
+ urls.groups = `/scopes/${instances.orgScope.id}/groups`;
urls.group = `${urls.groups}/${instances.group.id}`;
urls.newGroup = `${urls.groups}/new`;
+ orgURL = `/scopes/${instances.orgScope.id}`;
});
test('can create new group', async function (assert) {
@@ -52,6 +57,24 @@ module('Acceptance | groups', function (hooks) {
assert.equal(this.server.db.groups.length, groupsCount + 1);
});
+ test('can navigate to new groups route with proper authorization', async function (assert) {
+ assert.expect(2);
+ await visit(orgURL);
+ assert.ok(
+ instances.orgScope.authorized_collection_actions.groups.includes('create')
+ );
+ assert.ok(find(`[href="${urls.groups}"]`));
+ });
+
+ test('cannot navigate to new groups route without proper authorization', async function (assert) {
+ assert.expect(2);
+ instances.orgScope.authorized_collection_actions.groups = [];
+ await visit(orgURL);
+ assert.notOk(
+ instances.orgScope.authorized_collection_actions.groups.includes('create')
+ );
+ assert.notOk(find(`[href="${urls.groups}"]`));
+ });
test('can cancel new group creation', async function (assert) {
assert.expect(2);
const groupsCount = this.server.db.groups.length;
diff --git a/ui/admin/tests/acceptance/groups/list-test.js b/ui/admin/tests/acceptance/groups/list-test.js
new file mode 100644
index 000000000..f9229c19d
--- /dev/null
+++ b/ui/admin/tests/acceptance/groups/list-test.js
@@ -0,0 +1,76 @@
+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 | groups | list', function (hooks) {
+ setupApplicationTest(hooks);
+ setupMirage(hooks);
+ let orgURL;
+
+ const instances = {
+ scopes: {
+ global: null,
+ org: null,
+ },
+ orgScope: null,
+ };
+
+ const urls = {
+ scopes: {
+ org: null,
+ },
+ groups: null,
+ };
+
+ hooks.beforeEach(function () {
+ instances.scopes.global = this.server.create('scope', { id: 'global' });
+ instances.orgScope = this.server.create(
+ 'scope',
+ {
+ type: 'org',
+ scope: { id: 'global', type: 'global' },
+ },
+ 'withChildren'
+ );
+ instances.group = this.server.create('group', {
+ scope: instances.orgScope,
+ });
+ orgURL = `/scopes/${instances.orgScope.id}`;
+
+ urls.groups = `/scopes/${instances.orgScope.id}/groups`;
+ authenticateSession({});
+ });
+
+ test('can navigate to groups with proper authorization', async function (assert) {
+ assert.expect(2);
+ await visit(orgURL);
+ assert.ok(
+ instances.orgScope.authorized_collection_actions.groups.includes('list')
+ );
+ assert.ok(find(`[href="${urls.groups}"]`));
+ });
+
+ test('User cannot navigate to index without either list or create actions', async function (assert) {
+ assert.expect(2);
+ instances.orgScope.authorized_collection_actions.groups = [];
+ await visit(orgURL);
+ assert.notOk(
+ instances.orgScope.authorized_collection_actions.groups.includes('list')
+ );
+ assert.notOk(find(`[href="${urls.groups}"]`));
+ });
+
+ test('User can navigate to index with only create action', async function (assert) {
+ assert.expect(1);
+ instances.orgScope.authorized_collection_actions.groups = ['create'];
+ await visit(orgURL);
+ assert.ok(find(`[href="${urls.groups}"]`));
+ });
+});
diff --git a/ui/admin/tests/acceptance/host-catalogs-test.js b/ui/admin/tests/acceptance/host-catalogs/create-test.js
similarity index 71%
rename from ui/admin/tests/acceptance/host-catalogs-test.js
rename to ui/admin/tests/acceptance/host-catalogs/create-test.js
index fea885978..e95ecbde0 100644
--- a/ui/admin/tests/acceptance/host-catalogs-test.js
+++ b/ui/admin/tests/acceptance/host-catalogs/create-test.js
@@ -10,7 +10,7 @@ import {
//invalidateSession,
} from 'ember-simple-auth/test-support';
-module('Acceptance | host-catalogs', function (hooks) {
+module('Acceptance | host-catalogs | create', function (hooks) {
setupApplicationTest(hooks);
setupMirage(hooks);
@@ -22,6 +22,7 @@ module('Acceptance | host-catalogs', function (hooks) {
org: null,
project: null,
},
+ orgScope: null,
};
const urls = {
globalScope: null,
@@ -35,6 +36,14 @@ module('Acceptance | host-catalogs', function (hooks) {
hooks.beforeEach(function () {
// Generate resources
instances.scopes.global = this.server.create('scope', { id: 'global' });
+ instances.orgScope = this.server.create(
+ 'scope',
+ {
+ type: 'org',
+ scope: { id: 'global', type: 'global' },
+ },
+ 'withChildren'
+ );
instances.scopes.org = this.server.create('scope', {
type: 'org',
scope: { id: 'global', type: 'global' },
@@ -46,21 +55,23 @@ module('Acceptance | host-catalogs', function (hooks) {
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.orgScope = `/scopes/${instances.orgScope.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 create new host catalogs', async function (assert) {
+ test('Users can create new host catalogs', async function (assert) {
assert.expect(1);
const count = gethostCatalogCount();
await visit(urls.newHostCatalog);
@@ -69,7 +80,7 @@ module('Acceptance | host-catalogs', function (hooks) {
assert.equal(gethostCatalogCount(), count + 1);
});
- test('can cancel create new host catalogs', async function (assert) {
+ test('Users can cancel create new host catalogs', async function (assert) {
assert.expect(2);
const count = gethostCatalogCount();
await visit(urls.newHostCatalog);
@@ -79,6 +90,30 @@ module('Acceptance | host-catalogs', function (hooks) {
assert.equal(gethostCatalogCount(), count);
});
+ test('Users can navigate to new host catalogs route with proper authorization', async function (assert) {
+ assert.expect(2);
+ await visit(urls.projectScope);
+ assert.ok(
+ instances.scopes.project.authorized_collection_actions[
+ 'host-catalogs'
+ ].includes('create')
+ );
+ assert.ok(find(`[href="${urls.hostCatalogs}"]`));
+ });
+
+ test('Users cannot navigate to new host catalogs route without proper authorization', async function (assert) {
+ assert.expect(2);
+ instances.scopes.project.authorized_collection_actions['host-catalogs'] =
+ [];
+ await visit(urls.projectScope);
+ assert.notOk(
+ instances.scopes.project.authorized_collection_actions[
+ 'host-catalogs'
+ ].includes('create')
+ );
+ assert.notOk(find(`[href="${urls.hostCatalogs}"]`));
+ });
+
test('saving a new host catalog with invalid fields displays error messages', async function (assert) {
assert.expect(2);
this.server.post('/host-catalogs', () => {
diff --git a/ui/admin/tests/acceptance/host-catalogs/list-test.js b/ui/admin/tests/acceptance/host-catalogs/list-test.js
new file mode 100644
index 000000000..6cf508e20
--- /dev/null
+++ b/ui/admin/tests/acceptance/host-catalogs/list-test.js
@@ -0,0 +1,97 @@
+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 | list', function (hooks) {
+ setupApplicationTest(hooks);
+ setupMirage(hooks);
+
+ const instances = {
+ scopes: {
+ global: null,
+ org: null,
+ project: null,
+ },
+ orgScope: null,
+ };
+
+ const urls = {
+ scopes: {
+ org: null,
+ },
+ projectScope: null,
+ hostCatalogs: null,
+ };
+
+ hooks.beforeEach(function () {
+ instances.scopes.global = this.server.create('scope', { id: 'global' });
+ instances.orgScope = this.server.create(
+ 'scope',
+ {
+ type: 'org',
+ scope: { id: 'global', type: 'global' },
+ },
+ 'withChildren'
+ );
+ 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,
+ });
+
+ urls.hostCatalogs = `/scopes/${instances.orgScope.id}/host-catalogs`;
+ urls.globalScope = `/scopes/global/scopes`;
+ urls.orgScope = `/scopes/${instances.orgScope.id}/scopes`;
+ urls.projectScope = `/scopes/${instances.scopes.project.id}`;
+ urls.hostCatalogs = `${urls.projectScope}/host-catalogs`;
+
+ urls.hostCatalog = `${urls.hostCatalogs}/${instances.hostCatalog.id}`;
+ authenticateSession({});
+ });
+
+ test('Users can navigate to host catalogs with proper authorization', async function (assert) {
+ assert.expect(2);
+ await visit(urls.projectScope);
+ assert.ok(
+ instances.scopes.project.authorized_collection_actions[
+ 'host-catalogs'
+ ].includes('list')
+ );
+ assert.ok(find(`[href="${urls.hostCatalogs}"]`));
+ });
+
+ test('User cannot navigate to index without either list or create actions', async function (assert) {
+ assert.expect(2);
+ instances.scopes.project.authorized_collection_actions['host-catalogs'] =
+ [];
+ await visit(urls.projectScope);
+ assert.notOk(
+ instances.scopes.project.authorized_collection_actions[
+ 'host-catalogs'
+ ].includes('list')
+ );
+ assert.notOk(find(`[href="${urls.hostCatalogs}"]`));
+ });
+
+ test('User can navigate to index with only create action', async function (assert) {
+ assert.expect(1);
+ instances.scopes.project.authorized_collection_actions['host-catalogs'] = [
+ 'create',
+ ];
+ await visit(urls.projectScope);
+ assert.ok(find(`[href="${urls.hostCatalogs}"]`));
+ });
+});
diff --git a/ui/admin/tests/acceptance/roles-test.js b/ui/admin/tests/acceptance/roles/create-test.js
similarity index 70%
rename from ui/admin/tests/acceptance/roles-test.js
rename to ui/admin/tests/acceptance/roles/create-test.js
index 77b971f46..a0564f67d 100644
--- a/ui/admin/tests/acceptance/roles-test.js
+++ b/ui/admin/tests/acceptance/roles/create-test.js
@@ -11,7 +11,7 @@ import {
//invalidateSession,
} from 'ember-simple-auth/test-support';
-module('Acceptance | roles', function (hooks) {
+module('Acceptance | roles | create', function (hooks) {
setupApplicationTest(hooks);
setupMirage(hooks);
@@ -22,38 +22,44 @@ module('Acceptance | roles', function (hooks) {
project: null,
},
role: null,
+ orgScope: null,
};
const urls = {
- orgScope: null,
roles: null,
role: null,
newRole: null,
+ orgScope: 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' },
- });
+ instances.orgScope = this.server.create(
+ 'scope',
+ {
+ type: 'org',
+ scope: { id: 'global', type: 'global' },
+ },
+ 'withChildren'
+ );
+
// 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 },
+ scope: { id: instances.orgScope.id, type: instances.orgScope.type },
});
instances.role = this.server.create(
'role',
{
- scope: instances.scopes.org,
+ scope: instances.orgScope,
},
'withPrincipals'
);
- urls.roles = `/scopes/${instances.scopes.org.id}/roles`;
+ urls.roles = `/scopes/${instances.orgScope.id}/roles`;
urls.role = `${urls.roles}/${instances.role.id}`;
urls.newRole = `${urls.roles}/new`;
+ urls.orgScope = `/scopes/${instances.orgScope.id}`;
});
test('can create new role', async function (assert) {
@@ -65,6 +71,25 @@ module('Acceptance | roles', function (hooks) {
assert.equal(this.server.db.roles.length, rolesCount + 1);
});
+ test('Users can navigate to new roles route with proper authorization', async function (assert) {
+ assert.expect(2);
+ await visit(urls.orgScope);
+ assert.ok(
+ instances.orgScope.authorized_collection_actions.roles.includes('create')
+ );
+ assert.ok(find(`[href="${urls.roles}"]`));
+ });
+
+ test('Users cannot navigate to new roles route without proper authorization', async function (assert) {
+ assert.expect(2);
+ instances.orgScope.authorized_collection_actions.roles = [];
+ await visit(urls.orgScope);
+ assert.notOk(
+ instances.orgScope.authorized_collection_actions.roles.includes('create')
+ );
+ assert.notOk(find(`[href="${urls.roles}"]`));
+ });
+
test('can cancel new role creation', async function (assert) {
assert.expect(2);
const rolesCount = this.server.db.roles.length;
diff --git a/ui/admin/tests/acceptance/roles/list-test.js b/ui/admin/tests/acceptance/roles/list-test.js
new file mode 100644
index 000000000..ff170aeb7
--- /dev/null
+++ b/ui/admin/tests/acceptance/roles/list-test.js
@@ -0,0 +1,75 @@
+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 | roles | list', function (hooks) {
+ setupApplicationTest(hooks);
+ setupMirage(hooks);
+
+ const instances = {
+ scopes: {
+ global: null,
+ org: null,
+ },
+ orgScope: null,
+ };
+
+ const urls = {
+ scopes: {
+ org: null,
+ },
+ roles: null,
+ orgScope: null,
+ };
+
+ hooks.beforeEach(function () {
+ instances.orgScope = this.server.create(
+ 'scope',
+ {
+ type: 'org',
+ scope: { id: 'global', type: 'global' },
+ },
+ 'withChildren'
+ );
+ instances.role = this.server.create('role', {
+ scope: instances.orgScope,
+ });
+ urls.orgScope = `/scopes/${instances.orgScope.id}`;
+
+ urls.roles = `/scopes/${instances.orgScope.id}/roles`;
+ authenticateSession({});
+ });
+
+ test('Users can navigate to roles with proper authorization', async function (assert) {
+ assert.expect(2);
+ await visit(urls.orgScope);
+ assert.ok(
+ instances.orgScope.authorized_collection_actions.roles.includes('list')
+ );
+ assert.ok(find(`[href="${urls.roles}"]`));
+ });
+
+ test('Users cannot navigate to index without either list or create actions', async function (assert) {
+ assert.expect(2);
+ instances.orgScope.authorized_collection_actions.roles = [];
+ await visit(urls.orgScope);
+ assert.notOk(
+ instances.orgScope.authorized_collection_actions.roles.includes('list')
+ );
+ assert.notOk(find(`[href="${urls.roles}"]`));
+ });
+
+ test('Users can navigate to index with only create action', async function (assert) {
+ assert.expect(1);
+ instances.orgScope.authorized_collection_actions.roles = ['create'];
+ await visit(urls.orgScope);
+ assert.ok(find(`[href="${urls.roles}"]`));
+ });
+});
diff --git a/ui/admin/tests/acceptance/sessions-test.js b/ui/admin/tests/acceptance/sessions-test.js
index d5f68ffeb..a5dfa25ff 100644
--- a/ui/admin/tests/acceptance/sessions-test.js
+++ b/ui/admin/tests/acceptance/sessions-test.js
@@ -15,13 +15,13 @@ import {
module('Acceptance | sessions', function (hooks) {
setupApplicationTest(hooks);
setupMirage(hooks);
-
const instances = {
scopes: {
global: null,
org: null,
},
sessions: null,
+ orgScope: null,
};
const urls = {
orgScope: null,
@@ -31,6 +31,14 @@ module('Acceptance | sessions', function (hooks) {
hooks.beforeEach(function () {
authenticateSession({});
instances.scopes.global = this.server.create('scope', { id: 'global' });
+ instances.orgScope = this.server.create(
+ 'scope',
+ {
+ type: 'org',
+ scope: { id: 'global', type: 'global' },
+ },
+ 'withChildren'
+ );
instances.scopes.org = this.server.create('scope', {
type: 'org',
scope: { id: 'global', type: 'global' },
@@ -66,6 +74,7 @@ module('Acceptance | sessions', function (hooks) {
},
'withAssociations'
);
+ urls.orgScope = `/scopes/${instances.scopes.project.id}`;
urls.sessions = `/scopes/${instances.scopes.project.id}/sessions`;
});
@@ -81,6 +90,38 @@ module('Acceptance | sessions', function (hooks) {
await visit(urls.sessions);
});
+ test('Users cannot navigate to sessions without proper authorization', async function (assert) {
+ assert.expect(2);
+ instances.scopes.project.authorized_collection_actions.sessions = [];
+ authenticateSession({});
+ later(async () => {
+ run.cancelTimers();
+ assert.notOk(
+ instances.scopes.project.authorized_collection_actions.sessions.includes(
+ 'list'
+ )
+ );
+ assert.notOk(find(`[href="${urls.sessions}"]`));
+ }, 750);
+ await visit(urls.orgScope);
+ });
+
+ test('Users can navigate to sessions with proper authorization', async function (assert) {
+ assert.expect(2);
+ instances.scopes.project.authorized_collection_actions.sessions = ['list'];
+ authenticateSession({});
+ later(async () => {
+ run.cancelTimers();
+ assert.ok(
+ instances.scopes.project.authorized_collection_actions.sessions.includes(
+ 'list'
+ )
+ );
+ assert.ok(find(`[href="${urls.sessions}"]`));
+ }, 750);
+ await visit(urls.orgScope);
+ });
+
test('visiting sessions without users or targets is OK', async function (assert) {
assert.expect(2);
instances.sessions[0].update({
diff --git a/ui/admin/tests/acceptance/targets-test.js b/ui/admin/tests/acceptance/targets/create-test.js
similarity index 80%
rename from ui/admin/tests/acceptance/targets-test.js
rename to ui/admin/tests/acceptance/targets/create-test.js
index cf202c049..16215cb7a 100644
--- a/ui/admin/tests/acceptance/targets-test.js
+++ b/ui/admin/tests/acceptance/targets/create-test.js
@@ -10,7 +10,7 @@ import {
//invalidateSession,
} from 'ember-simple-auth/test-support';
-module('Acceptance | targets', function (hooks) {
+module('Acceptance | targets | create', function (hooks) {
setupApplicationTest(hooks);
setupMirage(hooks);
@@ -33,7 +33,6 @@ module('Acceptance | targets', function (hooks) {
};
hooks.beforeEach(function () {
- // Generate resources
instances.scopes.global = this.server.create('scope', { id: 'global' });
instances.scopes.org = this.server.create('scope', {
type: 'org',
@@ -68,6 +67,29 @@ module('Acceptance | targets', function (hooks) {
assert.equal(getTargetCount(), count + 1);
});
+ test('can navigate to new targets route with proper authorization', async function (assert) {
+ assert.expect(2);
+ await visit(urls.projectScope);
+ assert.ok(
+ instances.scopes.project.authorized_collection_actions.targets.includes(
+ 'create'
+ )
+ );
+ assert.ok(find(`[href="${urls.targets}"]`));
+ });
+
+ test('cannot navigate to new targets route without proper authorization', async function (assert) {
+ assert.expect(2);
+ instances.scopes.project.authorized_collection_actions.targets = [];
+ await visit(urls.projectScope);
+ assert.notOk(
+ instances.scopes.project.authorized_collection_actions.targets.includes(
+ 'create'
+ )
+ );
+ assert.notOk(find(`[href="${urls.targets}"]`));
+ });
+
test('can cancel create new targets', async function (assert) {
assert.expect(2);
const count = getTargetCount();
diff --git a/ui/admin/tests/acceptance/targets/list-test.js b/ui/admin/tests/acceptance/targets/list-test.js
new file mode 100644
index 000000000..19bd4ee64
--- /dev/null
+++ b/ui/admin/tests/acceptance/targets/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 | targets | list', function (hooks) {
+ setupApplicationTest(hooks);
+ setupMirage(hooks);
+
+ const instances = {
+ scopes: {
+ global: null,
+ org: null,
+ },
+ orgScope: null,
+ };
+
+ const urls = {
+ scopes: {
+ org: null,
+ project: null,
+ },
+ targets: null,
+ projectScope: null,
+ };
+
+ hooks.beforeEach(function () {
+ instances.scopes.global = this.server.create('scope', { id: 'global' });
+ instances.orgScope = this.server.create(
+ 'scope',
+ {
+ type: 'org',
+ scope: { id: 'global', type: 'global' },
+ },
+ 'withChildren'
+ );
+ instances.scopes.project = this.server.create('scope', {
+ type: 'project',
+ scope: { id: instances.orgScope.id, type: 'org' },
+ });
+ instances.target = this.server.create('target', {
+ scope: instances.scopes.project,
+ });
+ urls.projectScope = `/scopes/${instances.scopes.project.id}`;
+ urls.targets = `${urls.projectScope}/targets`;
+ authenticateSession({});
+ });
+
+ test('can navigate to targets with proper authorization', async function (assert) {
+ assert.expect(2);
+ await visit(urls.projectScope);
+ assert.ok(
+ instances.scopes.project.authorized_collection_actions.targets.includes(
+ 'list'
+ )
+ );
+ assert.ok(find(`[href="${urls.targets}"]`));
+ });
+
+ test('User cannot navigate to index without either list or create actions', async function (assert) {
+ assert.expect(2);
+ instances.scopes.project.authorized_collection_actions.targets = [];
+ await visit(urls.projectScope);
+ assert.notOk(
+ instances.scopes.project.authorized_collection_actions.targets.includes(
+ 'list'
+ )
+ );
+ assert.notOk(find(`[href="${urls.targets}"]`));
+ });
+
+ test('User can navigate to index with only create action', async function (assert) {
+ assert.expect(1);
+ instances.scopes.project.authorized_collection_actions.targets = ['create'];
+ await visit(urls.projectScope);
+ assert.ok(find(`[href="${urls.targets}"]`));
+ });
+});
diff --git a/ui/admin/tests/acceptance/users-test.js b/ui/admin/tests/acceptance/users/create-test.js
similarity index 75%
rename from ui/admin/tests/acceptance/users-test.js
rename to ui/admin/tests/acceptance/users/create-test.js
index b047a0d2a..99b715b9b 100644
--- a/ui/admin/tests/acceptance/users-test.js
+++ b/ui/admin/tests/acceptance/users/create-test.js
@@ -10,11 +10,12 @@ import {
//invalidateSession,
} from 'ember-simple-auth/test-support';
-module('Acceptance | users', function (hooks) {
+module('Acceptance | users | create', function (hooks) {
setupApplicationTest(hooks);
setupMirage(hooks);
let orgScope;
+ let orgURL;
let usersURL;
let newUserURL;
@@ -23,10 +24,12 @@ module('Acceptance | users', function (hooks) {
'scope',
{
type: 'org',
+ scope: { id: 'global', type: 'global' },
},
'withChildren'
);
+ orgURL = `/scopes/${orgScope.id}`;
usersURL = `/scopes/${orgScope.id}/users`;
newUserURL = `${usersURL}/new`;
@@ -42,6 +45,23 @@ module('Acceptance | users', function (hooks) {
assert.equal(this.server.db.users.length, usersCount + 1);
});
+ test('Users can navigate to new users route with proper authorization', async function (assert) {
+ assert.expect(2);
+ await visit(orgURL);
+ assert.ok(orgScope.authorized_collection_actions.users.includes('create'));
+ assert.ok(find(`[href="${orgURL}/users"]`));
+ });
+
+ test('Users cannot navigate to new users route without proper authorization', async function (assert) {
+ assert.expect(2);
+ orgScope.authorized_collection_actions.users = [];
+ await visit(orgURL);
+ assert.notOk(
+ orgScope.authorized_collection_actions.users.includes('create')
+ );
+ assert.notOk(find(`[href="${orgURL}/users"]`));
+ });
+
test('can cancel creation of a new user', async function (assert) {
assert.expect(2);
const usersCount = this.server.db.users.length;
diff --git a/ui/admin/tests/acceptance/users/list-test.js b/ui/admin/tests/acceptance/users/list-test.js
new file mode 100644
index 000000000..d453e5b04
--- /dev/null
+++ b/ui/admin/tests/acceptance/users/list-test.js
@@ -0,0 +1,75 @@
+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 | users | list', function (hooks) {
+ setupApplicationTest(hooks);
+ setupMirage(hooks);
+ let orgURL;
+
+ const instances = {
+ scopes: {
+ global: null,
+ org: null,
+ },
+ orgScope: null,
+ };
+
+ const urls = {
+ scopes: {
+ org: null,
+ },
+ users: null,
+ };
+
+ hooks.beforeEach(function () {
+ instances.scopes.global = this.server.create('scope', { id: 'global' });
+ instances.orgScope = this.server.create(
+ 'scope',
+ {
+ type: 'org',
+ scope: { id: 'global', type: 'global' },
+ },
+ 'withChildren'
+ );
+ instances.user = this.server.create('user', {
+ scope: instances.orgScope,
+ });
+ orgURL = `/scopes/${instances.orgScope.id}`;
+ urls.users = `/scopes/${instances.orgScope.id}/users`;
+ authenticateSession({});
+ });
+
+ test('Users can navigate to users with proper authorization', async function (assert) {
+ assert.expect(2);
+ await visit(orgURL);
+ assert.ok(
+ instances.orgScope.authorized_collection_actions.users.includes('list')
+ );
+ assert.ok(find(`[href="${urls.users}"]`));
+ });
+
+ test('User cannot navigate to index without either list or create actions', async function (assert) {
+ assert.expect(2);
+ instances.orgScope.authorized_collection_actions.users = [];
+ await visit(orgURL);
+ assert.notOk(
+ instances.orgScope.authorized_collection_actions.users.includes('list')
+ );
+ assert.notOk(find(`[href="${urls.users}"]`));
+ });
+
+ test('User can navigate to index with only create action', async function (assert) {
+ assert.expect(1);
+ instances.orgScope.authorized_collection_actions.users = ['create'];
+ await visit(orgURL);
+ assert.ok(find(`[href="${urls.users}"]`));
+ });
+});
diff --git a/ui/desktop/app/components/copyable/index.js b/ui/desktop/app/components/copyable/index.js
index a30ff3aca..6168b8c97 100644
--- a/ui/desktop/app/components/copyable/index.js
+++ b/ui/desktop/app/components/copyable/index.js
@@ -13,8 +13,8 @@ export default class CopyableComponent extends Component {
id = generateComponentID();
copyableButtonId = `copyable-button-${this.id}`;
- actionIcon = 'copy-action';
- successIcon = 'copy-success';
+ actionIcon = 'flight-icons/clipboard-copy-16';
+ successIcon = 'flight-icons/clipboard-checked-16';
actionText = this.args.buttonText;
successText = this.args.acknowledgeText;
diff --git a/ui/desktop/app/components/hidden-secret/index.hbs b/ui/desktop/app/components/hidden-secret/index.hbs
index 6660a77e5..a3181b9a6 100644
--- a/ui/desktop/app/components/hidden-secret/index.hbs
+++ b/ui/desktop/app/components/hidden-secret/index.hbs
@@ -1,7 +1,11 @@
{{t 'actions.toggle-secret'}}
diff --git a/ui/desktop/app/styles/app.scss b/ui/desktop/app/styles/app.scss
index 617f09ea5..d4dcdb408 100644
--- a/ui/desktop/app/styles/app.scss
+++ b/ui/desktop/app/styles/app.scss
@@ -233,14 +233,6 @@
}
}
-.doc-link {
- .large {
- svg {
- transform: scale(0.8);
- }
- }
-}
-
[class*='session-status-'] {
color: var(--ui-gray-subtler-2);
}
diff --git a/ui/desktop/app/templates/application.hbs b/ui/desktop/app/templates/application.hbs
index 2e8d01b51..9ab80e5b8 100644
--- a/ui/desktop/app/templates/application.hbs
+++ b/ui/desktop/app/templates/application.hbs
@@ -21,7 +21,7 @@
{{#if this.showFrameActions}}
@@ -107,7 +107,7 @@
diff --git a/ui/desktop/app/templates/scopes/scope/authenticate.hbs b/ui/desktop/app/templates/scopes/scope/authenticate.hbs
index 60ccaefa0..2c48baf83 100644
--- a/ui/desktop/app/templates/scopes/scope/authenticate.hbs
+++ b/ui/desktop/app/templates/scopes/scope/authenticate.hbs
@@ -11,7 +11,7 @@
@@ -67,7 +67,7 @@
diff --git a/ui/desktop/app/templates/scopes/scope/authenticate/index.hbs b/ui/desktop/app/templates/scopes/scope/authenticate/index.hbs
index b8dbc824f..fa5633bb1 100644
--- a/ui/desktop/app/templates/scopes/scope/authenticate/index.hbs
+++ b/ui/desktop/app/templates/scopes/scope/authenticate/index.hbs
@@ -2,7 +2,7 @@
diff --git a/ui/desktop/app/templates/scopes/scope/projects.hbs b/ui/desktop/app/templates/scopes/scope/projects.hbs
index 4c68c45ca..7df14ea99 100644
--- a/ui/desktop/app/templates/scopes/scope/projects.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects.hbs
@@ -2,12 +2,12 @@
-
+
{{t 'resources.target.title_plural'}}
-
+
{{t 'resources.session.title_plural'}}
diff --git a/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs b/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs
index 58abacbc3..6c1fb5636 100644
--- a/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs
+++ b/ui/desktop/app/templates/scopes/scope/projects/sessions/index.hbs
@@ -29,7 +29,7 @@
<:header>
+ @icon='flight-icons/key-16'>
<:header>
<:body>
<:footer>
diff --git a/yarn.lock b/yarn.lock
index e356bc3d3..436f898c5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2066,10 +2066,10 @@
resolved "https://registry.yarnpkg.com/@handlebars/parser/-/parser-1.1.0.tgz#d6dbc7574774b238114582410e8fee0dc3532bdf"
integrity sha512-rR7tJoSwJ2eooOpYGxGGW95sLq6GXUaS1UtWvN7pei6n2/okYvCGld9vsUTvkl2migxbkszsycwtMf/GEc1k1A==
-"@hashicorp/structure-icons@^1.9.0-0":
- version "1.9.2"
- resolved "https://registry.yarnpkg.com/@hashicorp/structure-icons/-/structure-icons-1.9.2.tgz#c75f955b2eec414ecb92f3926c79b4ca01731d3c"
- integrity sha512-AffJv0V9npr1EWlM1XrpaKPG9PzddV48OE+jspqy7aRoFZB5++oNnPx4MZQKmFInOljnzNwfktVRkJiQHy7haw==
+"@hashicorp/flight-icons@0.0.6-beta":
+ version "0.0.6-beta"
+ resolved "https://registry.yarnpkg.com/@hashicorp/flight-icons/-/flight-icons-0.0.6-beta.tgz#49da48d4966c13ef0636a9853dc208fccc8d5c88"
+ integrity sha512-GJHFPig7n26mMyMDPuUiD2Szp8wEskkcLKxWGAx0wyCGASYotLgAYHAGfa4uLlUOsIkibxKjc/7Y/0ttQeN9hQ==
"@humanwhocodes/config-array@^0.5.0":
version "0.5.0"
@@ -5604,7 +5604,7 @@ broccoli-funnel@^1.0.1:
symlink-or-copy "^1.0.0"
walk-sync "^0.3.1"
-broccoli-funnel@^3.0.3, broccoli-funnel@^3.0.8:
+broccoli-funnel@^3.0.3, broccoli-funnel@^3.0.5, broccoli-funnel@^3.0.8:
version "3.0.8"
resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-3.0.8.tgz#f5b62e2763c3918026a15a3c833edc889971279b"
integrity sha512-ng4eIhPYiXqMw6SyGoxPHR3YAwEd2lr9FgBI1CyTbspl4txZovOsmzFkMkGAlu88xyvYXJqHiM2crfLa65T1BQ==
@@ -8787,10 +8787,10 @@ ember-cli-version-checker@^5.0.1, ember-cli-version-checker@^5.1.1, ember-cli-ve
semver "^7.3.4"
silent-error "^1.1.1"
-ember-cli@~3.27.0:
- version "3.27.0"
- resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.27.0.tgz#8ccf9db51d7b462f86210b853d086a4543605c34"
- integrity sha512-vFLPFkplXn5v005fattHdOcs5AbSp7RG4w1wpHDWHzOSYpl2Dr+5zzZtqLS7V5IVaLf3XK4l24XwhSW9HpMfsQ==
+ember-cli@~3.28.0:
+ version "3.28.0"
+ resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.28.0.tgz#0a0374c9a1d08386ddf56e8098a38b71dd4453bc"
+ integrity sha512-CrMs5edFQ2ingO2xfT33T4nUEl8SlvBQ7q+XO9L/GFTvFU07slHxYSvGur0cwgQfOiLnkSTnIaVF1oqBnEmfPQ==
dependencies:
"@babel/core" "^7.13.8"
"@babel/plugin-transform-modules-amd" "^7.12.1"
@@ -8806,7 +8806,7 @@ ember-cli@~3.27.0:
broccoli-config-loader "^1.0.1"
broccoli-config-replace "^1.1.2"
broccoli-debug "^0.6.5"
- broccoli-funnel "^2.0.2"
+ broccoli-funnel "^3.0.5"
broccoli-funnel-reducer "^1.0.0"
broccoli-merge-trees "^3.0.2"
broccoli-middleware "^2.1.1"
@@ -8872,7 +8872,7 @@ ember-cli@~3.27.0:
sane "^4.1.0"
semver "^7.3.4"
silent-error "^1.1.1"
- sort-package-json "^1.48.0"
+ sort-package-json "^1.49.0"
symlink-or-copy "^1.3.1"
temp "0.9.4"
testem "^3.2.0"
@@ -8881,7 +8881,7 @@ ember-cli@~3.27.0:
uuid "^8.3.2"
walk-sync "^2.2.0"
watch-detector "^1.0.0"
- workerpool "^6.0.3"
+ workerpool "^6.1.4"
yam "^1.0.0"
ember-compatibility-helpers@^1.1.1, ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.0, ember-compatibility-helpers@^1.2.1, ember-compatibility-helpers@^1.2.4:
@@ -19184,7 +19184,7 @@ sort-object-keys@^1.1.3:
resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45"
integrity sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg==
-sort-package-json@^1.48.0:
+sort-package-json@^1.49.0:
version "1.50.0"
resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.50.0.tgz#19fc109fe23bd157bd03c8e572fa3251a52467d8"
integrity sha512-qZpqhMU9XTntebgAgc4hv/D6Fzhh7kFnwvV6a7+q8y8J5JoaDqPYQnvXPf7BBqG95tdE8X6JVNo7/jDzcbdfUg==
@@ -20015,10 +20015,10 @@ tapable@^1.0.0, tapable@^1.1.3:
resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
-tar@^4, tar@^4.4.10, tar@^4.4.12, tar@^4.4.15, tar@^5.0.5, tar@^6.0.2, tar@^6.0.5, tar@^6.1.0, tar@^6.1.2:
- version "6.1.8"
- resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.8.tgz#4fc50cfe56511c538ce15b71e05eebe66530cbd4"
- integrity sha512-sb9b0cp855NbkMJcskdSYA7b11Q8JsX4qe4pyUAfHp+Y6jBjJeek2ZVlwEfWayshEIwlIzXx0Fain3QG9JPm2A==
+tar@^4, tar@^4.4.10, tar@^4.4.12, tar@^4.4.15, tar@^5.0.5, tar@^6.0.2, tar@^6.0.5, tar@^6.1.0, tar@^6.1.9:
+ version "6.1.11"
+ resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
+ integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
dependencies:
chownr "^2.0.0"
fs-minipass "^2.0.0"
@@ -21580,7 +21580,7 @@ workerpool@^3.1.1:
object-assign "4.1.1"
rsvp "^4.8.4"
-workerpool@^6.0.0, workerpool@^6.0.3, workerpool@^6.1.4:
+workerpool@^6.0.0, workerpool@^6.1.4:
version "6.1.5"
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.5.tgz#0f7cf076b6215fd7e1da903ff6f22ddd1886b581"
integrity sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==
@@ -21696,9 +21696,10 @@ xmlchars@^2.2.0:
resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
-xmldom@^0.6.0, "xmldom@github:xmldom/xmldom#0.7.0":
- version "0.7.0"
- resolved "https://codeload.github.com/xmldom/xmldom/tar.gz/c568938641cc1f121cef5b4df80fcfda1e489b6e"
+xmldom@^0.6.0:
+ version "0.6.0"
+ resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.6.0.tgz#43a96ecb8beece991cef382c08397d82d4d0c46f"
+ integrity sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg==
xmlhttprequest-ssl@^1.6.2:
version "1.6.3"