diff --git a/addons/api/mirage/factories/group.js b/addons/api/mirage/factories/group.js
index 79b28cc2e..1f7256543 100644
--- a/addons/api/mirage/factories/group.js
+++ b/addons/api/mirage/factories/group.js
@@ -1,7 +1,15 @@
import factory from '../generated/factories/group';
import { trait } from 'ember-cli-mirage';
+import permissions from '../helpers/permissions';
export default factory.extend({
+ authorized_actions: () =>
+ permissions.authorizedActionsFor('group') || [
+ 'no-op',
+ 'read',
+ 'update',
+ 'delete',
+ ],
id: (i) => `group-${i}`,
/**
diff --git a/ui/admin/app/components/form/group/index.hbs b/ui/admin/app/components/form/group/index.hbs
index a0c3230ef..7ed797846 100644
--- a/ui/admin/app/components/form/group/index.hbs
+++ b/ui/admin/app/components/form/group/index.hbs
@@ -46,11 +46,12 @@
{{/if}}
-
-
+ {{#if (can 'save model' @model)}}
+
+ {{/if}}
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/groups/group/-actions.hbs b/ui/admin/app/templates/scopes/scope/groups/group/-actions.hbs
index c1a11742e..253b39ab0 100644
--- a/ui/admin/app/templates/scopes/scope/groups/group/-actions.hbs
+++ b/ui/admin/app/templates/scopes/scope/groups/group/-actions.hbs
@@ -6,12 +6,14 @@
{{t 'resources.group.actions.add-members'}}
-
-
- {{t 'resources.group.actions.delete'}}
-
+ {{#if (can 'delete model' @model)}}
+
+
+ {{t 'resources.group.actions.delete'}}
+
+ {{/if}}
\ No newline at end of file
diff --git a/ui/admin/app/templates/scopes/scope/groups/index.hbs b/ui/admin/app/templates/scopes/scope/groups/index.hbs
index 64abb45ad..cb59fde2e 100644
--- a/ui/admin/app/templates/scopes/scope/groups/index.hbs
+++ b/ui/admin/app/templates/scopes/scope/groups/index.hbs
@@ -35,9 +35,16 @@
{{#each @model as |group|}}
-
+ {{#if (can 'read model' group)}}
+
+ {{group.displayName}}
+
+ {{else}}
{{group.displayName}}
-
+ {{/if}}
{{group.description}}
diff --git a/ui/admin/tests/acceptance/groups-test.js b/ui/admin/tests/acceptance/groups-test.js
index 1dfb81a7c..38b95d60d 100644
--- a/ui/admin/tests/acceptance/groups-test.js
+++ b/ui/admin/tests/acceptance/groups-test.js
@@ -2,7 +2,6 @@ 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 a11yAudit from 'ember-a11y-testing/test-support/audit';
import { Response } from 'miragejs';
import {
authenticateSession,
@@ -44,20 +43,6 @@ module('Acceptance | groups', function (hooks) {
urls.newGroup = `${urls.groups}/new`;
});
- test('visiting groups', async function (assert) {
- assert.expect(1);
- await visit(urls.groups);
- await a11yAudit();
- assert.equal(currentURL(), urls.groups);
- });
-
- test('visiting a group', async function (assert) {
- assert.expect(1);
- await visit(urls.newGroup);
- await a11yAudit();
- assert.equal(currentURL(), urls.newGroup);
- });
-
test('can create new group', async function (assert) {
assert.expect(1);
const groupsCount = this.server.db.groups.length;
@@ -112,90 +97,4 @@ module('Acceptance | groups', function (hooks) {
'Displays field-level errors.'
);
});
-
- test('can save changes to an existing group', async function (assert) {
- assert.expect(2);
- await visit(urls.group);
- await click('form [type="button"]', 'Activate edit mode');
- await fillIn('[name="name"]', 'Updated admin group');
- await click('.rose-form-actions [type="submit"]');
- assert.equal(currentURL(), urls.group);
- assert.equal(this.server.db.groups[0].name, 'Updated admin group');
- });
-
- test('can cancel changes to an existing group', async function (assert) {
- assert.expect(1);
- await visit(urls.group);
- await click('form [type="button"]', 'Activate edit mode');
- await fillIn('[name="name"]', 'Updated admin group');
- await click('.rose-form-actions [type="button"]');
- assert.notEqual(find('[name="name"]').value, 'Updated admin group');
- });
-
- test('can delete a group', async function (assert) {
- assert.expect(1);
- const groupsCount = this.server.db.groups.length;
- await visit(urls.group);
- await click('.rose-layout-page-actions .rose-dropdown-button-danger');
- assert.equal(this.server.db.groups.length, groupsCount - 1);
- });
-
- test('saving an existing group with invalid fields displays error messages', async function (assert) {
- assert.expect(2);
- this.server.patch('/groups/: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.group);
- 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('/groups/:id', () => {
- return new Response(
- 490,
- {},
- {
- status: 490,
- code: 'error',
- message: 'Oops.',
- }
- );
- });
- await visit(urls.group);
- await click('.rose-layout-page-actions .rose-dropdown-button-danger');
- assert.ok(
- find('[role="alert"]').textContent.trim(),
- 'Oops.',
- 'Displays primary error message.'
- );
- });
});
diff --git a/ui/admin/tests/acceptance/groups/delete-test.js b/ui/admin/tests/acceptance/groups/delete-test.js
new file mode 100644
index 000000000..c1dec7fdb
--- /dev/null
+++ b/ui/admin/tests/acceptance/groups/delete-test.js
@@ -0,0 +1,85 @@
+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 | groups | delete', function (hooks) {
+ setupApplicationTest(hooks);
+ setupMirage(hooks);
+
+ const instances = {
+ scopes: {
+ global: null,
+ org: null,
+ },
+ group: null,
+ };
+ const urls = {
+ orgScope: null,
+ groups: null,
+ group: null,
+ newGroup: 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.group = this.server.create('group', {
+ scope: instances.scopes.org,
+ });
+ urls.groups = `/scopes/${instances.scopes.org.id}/groups`;
+ urls.group = `${urls.groups}/${instances.group.id}`;
+ urls.newGroup = `${urls.groups}/new`;
+ });
+
+ test('can delete a group', async function (assert) {
+ assert.expect(1);
+ const groupsCount = this.server.db.groups.length;
+ await visit(urls.group);
+ await click('.rose-layout-page-actions .rose-dropdown-button-danger');
+ assert.equal(this.server.db.groups.length, groupsCount - 1);
+ });
+
+ test('cannot delete a group without proper authorization', async function (assert) {
+ assert.expect(1);
+ instances.group.authorized_actions =
+ instances.group.authorized_actions.filter((item) => item !== 'delete');
+ await visit(urls.group);
+ 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('/groups/:id', () => {
+ return new Response(
+ 490,
+ {},
+ {
+ status: 490,
+ code: 'error',
+ message: 'Oops.',
+ }
+ );
+ });
+ await visit(urls.group);
+ await click('.rose-layout-page-actions .rose-dropdown-button-danger');
+ assert.ok(
+ find('[role="alert"]').textContent.trim(),
+ 'Oops.',
+ 'Displays primary error message.'
+ );
+ });
+});
diff --git a/ui/admin/tests/acceptance/groups/read-test.js b/ui/admin/tests/acceptance/groups/read-test.js
new file mode 100644
index 000000000..535ea1175
--- /dev/null
+++ b/ui/admin/tests/acceptance/groups/read-test.js
@@ -0,0 +1,60 @@
+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 | groups | read', function (hooks) {
+ setupApplicationTest(hooks);
+ setupMirage(hooks);
+
+ const instances = {
+ scopes: {
+ global: null,
+ org: null,
+ },
+ group: null,
+ };
+ const urls = {
+ orgScope: null,
+ groups: null,
+ group: null,
+ newGroup: 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.group = this.server.create('group', {
+ scope: instances.scopes.org,
+ });
+ urls.groups = `/scopes/${instances.scopes.org.id}/groups`;
+ urls.group = `${urls.groups}/${instances.group.id}`;
+ urls.newGroup = `${urls.groups}/new`;
+ });
+
+ test('visiting a group', async function (assert) {
+ assert.expect(1);
+ await visit(urls.newGroup);
+ await a11yAudit();
+ assert.equal(currentURL(), urls.newGroup);
+ });
+
+ test('cannot navigate to a group form without proper authorization', async function (assert) {
+ assert.expect(1);
+ instances.group.authorized_actions =
+ instances.group.authorized_actions.filter((item) => item !== 'read');
+ await visit(urls.group);
+ assert.notOk(find('main tbody .rose-table-header-cell:nth-child(1) a'));
+ });
+});
diff --git a/ui/admin/tests/acceptance/groups/update-test.js b/ui/admin/tests/acceptance/groups/update-test.js
new file mode 100644
index 000000000..6d39cefbe
--- /dev/null
+++ b/ui/admin/tests/acceptance/groups/update-test.js
@@ -0,0 +1,109 @@
+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 { Response } from 'miragejs';
+import {
+ authenticateSession,
+ // These are left here intentionally for future reference.
+ //currentSession,
+ //invalidateSession,
+} from 'ember-simple-auth/test-support';
+
+module('Acceptance | groups | update', function (hooks) {
+ setupApplicationTest(hooks);
+ setupMirage(hooks);
+
+ const instances = {
+ scopes: {
+ global: null,
+ org: null,
+ },
+ group: null,
+ };
+ const urls = {
+ orgScope: null,
+ groups: null,
+ group: null,
+ newGroup: 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.group = this.server.create('group', {
+ scope: instances.scopes.org,
+ });
+ urls.groups = `/scopes/${instances.scopes.org.id}/groups`;
+ urls.group = `${urls.groups}/${instances.group.id}`;
+ urls.newGroup = `${urls.groups}/new`;
+ });
+
+ test('can save changes to an existing group', async function (assert) {
+ assert.expect(2);
+ await visit(urls.group);
+ await click('form [type="button"]', 'Activate edit mode');
+ await fillIn('[name="name"]', 'Updated admin group');
+ await click('.rose-form-actions [type="submit"]');
+ assert.equal(currentURL(), urls.group);
+ assert.equal(this.server.db.groups[0].name, 'Updated admin group');
+ });
+
+ test('cannot make changes to an existing group without proper authorization', async function (assert) {
+ assert.expect(1);
+ instances.group.authorized_actions =
+ instances.group.authorized_actions.filter((item) => item !== 'update');
+ await visit(urls.group);
+ assert.notOk(find('.rose-layout-page-actions .rose-button-secondary'));
+ });
+
+ test('can cancel changes to an existing group', async function (assert) {
+ assert.expect(1);
+ await visit(urls.group);
+ await click('form [type="button"]', 'Activate edit mode');
+ await fillIn('[name="name"]', 'Updated admin group');
+ await click('.rose-form-actions [type="button"]');
+ assert.notEqual(find('[name="name"]').value, 'Updated admin group');
+ });
+
+ test('saving an existing group with invalid fields displays error messages', async function (assert) {
+ assert.expect(2);
+ this.server.patch('/groups/: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.group);
+ 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.'
+ );
+ });
+});