Merge pull request #152 from hashicorp/feature-add-members

Feature:  add members
This commit is contained in:
Susmitha Girumala authored and GitHub committed 2020-09-02 16:25:43 -04:00
commit 09294ec1af
16 files changed
+293 -20

No files matched your search

@@ -0,0 +1,48 @@
{{#if this.availableUsers}}
<Rose::Form
class="full-width"
@onSubmit={{fn this.submit @submit}}
@cancel={{@cancel}}
@disabled={{@model.isSaving}}
@error={{@model.errors.base}}
as |form|
>
<form.actions
@submitText={{t "actions.add-host-sets"}}
@cancelText={{t "actions.cancel"}} />
<Rose::Table as |table|>
<table.header as |header|>
<header.row as |row|>
<row.headerCell>{{t 'form.label.id'}}</row.headerCell>
<row.headerCell>{{t 'form.label.name'}}</row.headerCell>
</header.row>
</table.header>
<table.body as |body|>
{{#each this.availableUsers as |user|}}
<body.row as |row|>
<row.cell>
<form.checkbox
@label={{user.id}}
@description={{user.description}}
onChange={{fn this.toggleMember user}} />
</row.cell>
<row.cell>{{user.name}}</row.cell>
</body.row>
{{/each}}
</table.body>
</Rose::Table>
</Rose::Form>
{{/if}}
{{#unless this.availableUsers}}
<Rose::Layout::Centered>
<Rose::Message @title={{t "titles.no-available-users"}} as |message|>
<message.description>
{{t "descriptions.no-available-users"}}
</message.description>
</Rose::Message>
</Rose::Layout::Centered>
{{/unless}}
@@ -0,0 +1,42 @@
import Component from '@glimmer/component';
import { computed, action } from '@ember/object';
import { A } from '@ember/array';
export default class FormGroupAddMembersComponent extends Component {
// =properties
/**
* Array of selected user IDs.
* @type {EmberArray}
*/
selectedMemberIDs = A();
/**
* Host sets not already added to the target.
* @type {[UserModel]}
*/
@computed('args.{model.members_ids.[],users.[]}')
get availableUsers() {
const memberIDs = this.args.model.member_ids;
const users = this.args.users;
return users.filter(({ id }) => !memberIDs.includes(id));
}
// =actions
@action
toggleMember(user) {
if (!this.selectedMemberIDs.includes(user.id)) {
this.selectedMemberIDs.addObject(user.id);
} else {
this.selectedMemberIDs.removeObject(user.id);
}
}
@action
submit(fn) {
fn(this.selectedMemberIDs);
}
}
@@ -0,0 +1,20 @@
import Controller from '@ember/controller';
import { inject as service } from '@ember/service';
export default class ScopesScopeGroupsGroupAddMembersController extends Controller {
// =services
@service intl;
// =attributes
/**
* Translated new group breadcrumb
* @type {string}
*/
get breadCrumb() {
return this.intl.t('actions.add-members');
}
}
+1
View File
@@ -56,6 +56,7 @@ Router.map(function () {
this.route('groups', function () {
this.route('group', { path: ':group_id' }, function () {
this.route('members');
this.route('add-members');
});
this.route('new');
});
@@ -1,6 +1,7 @@
import Route from '@ember/routing/route';
export default class ScopesScopeGroupsGroupRoute extends Route {
// =methods
/**
@@ -9,10 +10,33 @@ export default class ScopesScopeGroupsGroupRoute extends Route {
* @param {string} params.group_id
* @return {groupModel}
*/
async model({ group_id }) {
model({ group_id }) {
const { id: scopeID } = this.modelFor('scopes.scope');
return this.store.findRecord('group', group_id, {
adapterOptions: { scopeID },
});
}
/**
* Renders the route-set specific page sections
* @override
*/
renderTemplate() {
super.renderTemplate(...arguments);
this.render('scopes/scope/groups/group/-header', {
into: 'scopes/scope/groups/group',
outlet: 'header'
});
this.render('scopes/scope/groups/group/-actions', {
into: 'scopes/scope/groups/group',
outlet: 'actions'
});
this.render('scopes/scope/groups/group/-navigation', {
into: 'scopes/scope/groups/group',
outlet: 'navigation'
});
}
}
@@ -0,0 +1,85 @@
import Route from '@ember/routing/route';
import { inject as service } from '@ember/service';
import { action } from '@ember/object';
import { hash } from 'rsvp';
export default class ScopesScopeGroupsGroupAddMembersRoute extends Route {
// =services
@service intl;
@service notify;
// =methods
/**
* Emtpy out any previously loaded users.
*/
beforeModel() {
this.store.unloadAll('user');
}
/**
* Loads all users and returns them with the group.
* @return {Promise{GroupModel, [UserModel]}}
*/
model() {
const { id: scopeID } = this.modelFor('scopes.scope');
return hash({
group: this.modelFor('scopes.scope.groups.group'),
users: this.store.findAll('user', { adapterOptions: { scopeID } })
});
}
/**
* Renders the route-set specific page sections
* @override
*/
renderTemplate() {
super.renderTemplate(...arguments);
this.render('scopes/scope/groups/group/add-members/-header', {
into: 'scopes/scope/groups/group',
outlet: 'header'
});
this.render('-empty', {
into: 'scopes/scope/groups/group',
outlet: 'actions'
});
this.render('-empty', {
into: 'scopes/scope/groups/group',
outlet: 'navigation'
});
}
// =actions
/**
* Adds members to the group and saves, replaces with the members index
* route, and notifies the user of success or error.
* @param {GroupModel} group
* @param {[string]} userIDs
*/
@action
async addMembers(group, userIDs) {
try {
await group.addMembers(userIDs);
await this.replaceWith('scopes.scope.groups.group.members');
this.notify.success(this.intl.t('notify.save-success'));
} catch (error) {
// TODO: replace with translated strings
this.notify.error(error.message, { closeAfter: null });
}
}
/**
* Redirect to group members as if nothing ever happened.
*/
@action
cancel() {
this.replaceWith('scopes.scope.groups.group.members');
}
}
@@ -7,30 +7,15 @@
</page.breadcrumbs>
<page.header>
<h2>{{t "resources.group"}}</h2>
{{outlet "header"}}
</page.header>
<page.navigation>
<Rose::Nav::Tabs as |nav|>
<nav.link @route='scopes.scope.groups.group.index'>
{{t 'titles.details'}}
</nav.link>
<nav.link @route='scopes.scope.groups.group.members'>
{{t 'titles.members'}}
</nav.link>
</Rose::Nav::Tabs>
{{outlet "navigation"}}
</page.navigation>
<page.actions>
<Rose::Dropdown @text="{{t 'actions.manage'}}" @dropdownRight={{true}} as |dropdown|>
<dropdown.button
@style="danger"
@disabled={{@model.canSave}}
{{on "click" (route-action "delete" @model)}}
>
{{t 'actions.delete-group'}}
</dropdown.button>
</Rose::Dropdown>
{{outlet "actions"}}
</page.actions>
<page.body>
@@ -0,0 +1,12 @@
<Rose::Dropdown @text="{{t 'actions.manage'}}" @dropdownRight={{true}} as |dropdown|>
<dropdown.link @route="scopes.scope.groups.group.add-members">
{{t "actions.add-members"}}
</dropdown.link>
<dropdown.button
@style="danger"
@disabled={{@model.canSave}}
{{on "click" (route-action "delete" @model)}}
>
{{t 'actions.delete-group'}}
</dropdown.button>
</Rose::Dropdown>
@@ -0,0 +1 @@
<h2>{{t "resources.group"}}</h2>
@@ -0,0 +1,8 @@
<Rose::Nav::Tabs as |nav|>
<nav.link @route='scopes.scope.groups.group.index'>
{{t 'titles.details'}}
</nav.link>
<nav.link @route='scopes.scope.groups.group.members'>
{{t 'titles.members'}}
</nav.link>
</Rose::Nav::Tabs>
@@ -0,0 +1,8 @@
{{title (t "actions.add-members")}}
<Form::Group::AddMembers
@model={{@model.group}}
@users={{@model.users}}
@submit={{route-action "addMembers" @model.group}}
@cancel={{route-action "cancel"}}
/>
@@ -0,0 +1 @@
<h2>{{t "actions.add-members"}}</h2>
+13 -1
View File
@@ -221,5 +221,17 @@ module('Acceptance | groups', function (hooks) {
test('can view group members', async function (assert) {
assert.expect(0);
});
test('can delete members', async function(assert) {
assert.expect(0);
});
test('select and save members to add', async function (assert) {
assert.expect(0);
});
test('select and cancel members to add', async function (assert) {
assert.expect(0);
});
});
@@ -0,0 +1,12 @@
import { module, test } from 'qunit';
import { setupTest } from 'ember-qunit';
module('Unit | Controller | scopes/scope/groups/group/add-members', function(hooks) {
setupTest(hooks);
// Replace this with your real tests.
test('it exists', function(assert) {
let controller = this.owner.lookup('controller:scopes/scope/groups/group/add-members');
assert.ok(controller);
});
});
@@ -0,0 +1,11 @@
import { module, test } from 'qunit';
import { setupTest } from 'ember-qunit';
module('Unit | Route | scopes/scope/groups/group/add-members', function(hooks) {
setupTest(hooks);
test('it exists', function(assert) {
let route = this.owner.lookup('route:scopes/scope/groups/group/add-members');
assert.ok(route);
});
});
+3
View File
@@ -23,6 +23,7 @@ actions:
add-host-set: Create Host Set
add-host: Create Host
add-host-sets: Add Host Sets
add-members: Add Members
auth:
titles:
no-scopes: No Scopes Available
@@ -95,6 +96,7 @@ titles:
role-principals-welcome: No Principals Associated
members: Members
group-members-welcome: Welcome to Members
no-available-users: No Users Available
descriptions:
host-catalogs: Overview of collections of hosts and host sets.
empty-set: There are no items to display yet. You may be able to add items or try back later.
@@ -112,6 +114,7 @@ descriptions:
no-host-sets-for-target: No host sets are available to add to this target.
role-principals-welcome: No principals are available in this role.
group-members-welcome: Users belonging to this group appear here.
no-available-users: No users are available to add to this group.
states:
info: Info
success: Success