Skip to content

Commit

Permalink
Merge 8e3704a into 7c4a84b
Browse files Browse the repository at this point in the history
  • Loading branch information
MarieVerdonck committed Mar 18, 2020
2 parents 7c4a84b + 8e3704a commit 069e64c
Show file tree
Hide file tree
Showing 37 changed files with 3,823 additions and 69 deletions.
188 changes: 187 additions & 1 deletion resources/i18n/en.json5
Expand Up @@ -170,6 +170,189 @@



"admin.access-control.epeople.title": "DSpace Angular :: EPeople",

"admin.access-control.epeople.head": "EPeople",

"admin.access-control.epeople.search.head": "Search",

"admin.access-control.epeople.search.scope.metadata": "Metadata",

"admin.access-control.epeople.search.scope.email": "E-mail (exact)",

"admin.access-control.epeople.search.button": "Search",

"admin.access-control.epeople.button.add": "Add EPerson",

"admin.access-control.epeople.table.id": "ID",

"admin.access-control.epeople.table.name": "Name",

"admin.access-control.epeople.table.email": "E-mail",

"admin.access-control.epeople.table.edit": "Edit",

"admin.access-control.epeople.table.edit.buttons.edit": "Edit",

"admin.access-control.epeople.table.edit.buttons.remove": "Remove",

"admin.access-control.epeople.no-items": "No EPeople to show.",

"admin.access-control.epeople.form.create": "Create EPerson",

"admin.access-control.epeople.form.edit": "Edit EPerson",

"admin.access-control.epeople.form.firstName": "First name",

"admin.access-control.epeople.form.lastName": "Last name",

"admin.access-control.epeople.form.email": "E-mail",

"admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",

"admin.access-control.epeople.form.canLogIn": "Can log in",

"admin.access-control.epeople.form.requireCertificate": "Requires certificate",

"admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",

"admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",

"admin.access-control.epeople.form.notification.created.failure.emailInUse": "Failed to create EPerson \"{{name}}\", email \"{{email}}\" already in use.",

"admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Failed to edit EPerson \"{{name}}\", email \"{{email}}\" already in use.",

"admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",

"admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",

"admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",

"admin.access-control.epeople.form.table.id": "ID",

"admin.access-control.epeople.form.table.name": "Name",

"admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",

"admin.access-control.epeople.form.goToGroups": "Add to groups",

"admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",

"admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",



"admin.access-control.groups.title": "DSpace Angular :: Groups",

"admin.access-control.groups.head": "Groups",

"admin.access-control.groups.button.add": "Add group",

"admin.access-control.groups.search.head": "Search groups",

"admin.access-control.groups.search.button": "Search",

"admin.access-control.groups.table.id": "ID",

"admin.access-control.groups.table.name": "Name",

"admin.access-control.groups.table.members": "Members",

"admin.access-control.groups.table.comcol": "Community / Collection",

"admin.access-control.groups.table.edit": "Edit",

"admin.access-control.groups.no-items": "No groups found with this in their name or this as UUID",

"admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",

"admin.access-control.groups.notification.deleted.failure": "Failed to delete group \"{{name}}\"",


"admin.access-control.groups.form.head.create": "Create group",

"admin.access-control.groups.form.head.edit": "Edit group",

"admin.access-control.groups.form.groupName": "Group name",

"admin.access-control.groups.form.groupDescription": "Description",

"admin.access-control.groups.form.notification.created.success": "Successfully created group \"{{name}}\"",

"admin.access-control.groups.form.notification.created.failure": "Failed to create group \"{{name}}\"",

"admin.access-control.groups.form.members-list.head": "Members",

"admin.access-control.groups.form.members-list.search.head": "Search EPeople",

"admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",

"admin.access-control.groups.form.members-list.search.scope.email": "E-mail",

"admin.access-control.groups.form.members-list.search.button": "Search",

"admin.access-control.groups.form.members-list.table.id": "ID",

"admin.access-control.groups.form.members-list.table.name": "Name",

"admin.access-control.groups.form.members-list.table.edit": "Remove / Add",

"admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Remove member with name \"{{name}}\"",

"admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",

"admin.access-control.groups.form.members-list.notification.failure.addMember": "Failed to add member: \"{{name}}\"",

"admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",

"admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Failed to delete member: \"{{name}}\"",

"admin.access-control.groups.form.members-list.table.edit.buttons.add": "Add member with name \"{{name}}\"",

"admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",

"admin.access-control.groups.form.members-list.no-members-yet": "No members in group yet, search and add.",

"admin.access-control.groups.form.members-list.button.see-all": "Search all",

"admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",

"admin.access-control.groups.form.subgroups-list.head": "Subgroups",

"admin.access-control.groups.form.subgroups-list.search.head": "Search Groups",

"admin.access-control.groups.form.subgroups-list.search.button": "Search",

"admin.access-control.groups.form.subgroups-list.table.id": "ID",

"admin.access-control.groups.form.subgroups-list.table.name": "Name",

"admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add",

"admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Remove subgroup with name \"{{name}}\"",

"admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Add subgroup with name \"{{name}}\"",

"admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",

"admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Failed to add subgroup: \"{{name}}\"",

"admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"",

"admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Failed to delete subgroup: \"{{name}}\"",

"admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "No current active group, submit a name first.",

"admin.access-control.groups.form.subgroups-list.no-items": "No groups found with this in their name or this as UUID",

"admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "No subgroups in group yet, search and add.",

"admin.access-control.groups.form.subgroups-list.button.see-all": "Search all",

"admin.access-control.groups.form.return": "Return to groups",



"admin.search.breadcrumbs": "Administrative Search",

"admin.search.collection.edit": "Edit",
Expand Down Expand Up @@ -1560,7 +1743,7 @@
"relationships.isSingleVolumeOf": "Journal Volume",

"relationships.isVolumeOf": "Journal Volumes",

"relationships.isContributorOf": "Contributors",


Expand Down Expand Up @@ -2100,6 +2283,9 @@

"administrativeView.search.results.head": "Administrative Search",

"menu.section.admin_search": "Admin Search",



"uploader.browse": "browse",

Expand Down
@@ -0,0 +1,30 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component';
import { GroupFormComponent } from './group-registry/group-form/group-form.component';
import { GroupsRegistryComponent } from './group-registry/groups-registry.component';

@NgModule({
imports: [
RouterModule.forChild([
{ path: 'epeople', component: EPeopleRegistryComponent, data: { title: 'admin.access-control.epeople.title' } },
{ path: 'groups', component: GroupsRegistryComponent, data: { title: 'admin.access-control.groups.title' } },
{
path: 'groups/:groupId',
component: GroupFormComponent,
data: {title: 'admin.registries.schema.title'}
},
{
path: 'groups/newGroup',
component: GroupFormComponent,
data: {title: 'admin.registries.schema.title'}
},
])
]
})
/**
* Routing module for the AccessControl section of the admin sidebar
*/
export class AdminAccessControlRoutingModule {

}
37 changes: 37 additions & 0 deletions src/app/+admin/admin-access-control/admin-access-control.module.ts
@@ -0,0 +1,37 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { TranslateModule } from '@ngx-translate/core';
import { SharedModule } from '../../shared/shared.module';
import { AdminAccessControlRoutingModule } from './admin-access-control-routing.module';
import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component';
import { EPersonFormComponent } from './epeople-registry/eperson-form/eperson-form.component';
import { GroupFormComponent } from './group-registry/group-form/group-form.component';
import { MembersListComponent } from './group-registry/group-form/members-list/members-list.component';
import { SubgroupsListComponent } from './group-registry/group-form/subgroup-list/subgroups-list.component';
import { GroupsRegistryComponent } from './group-registry/groups-registry.component';

@NgModule({
imports: [
CommonModule,
SharedModule,
RouterModule,
TranslateModule,
AdminAccessControlRoutingModule
],
declarations: [
EPeopleRegistryComponent,
EPersonFormComponent,
GroupsRegistryComponent,
GroupFormComponent,
SubgroupsListComponent,
MembersListComponent
],
entryComponents: []
})
/**
* This module handles all components related to the access control pages
*/
export class AdminAccessControlModule {

}
@@ -0,0 +1,49 @@
import { Action } from '@ngrx/store';
import { EPerson } from '../../../core/eperson/models/eperson.model';
import { type } from '../../../shared/ngrx/type';

/**
* For each action type in an action group, make a simple
* enum object for all of this group's action types.
*
* The 'type' utility function coerces strings into string
* literal types and runs a simple check to guarantee all
* action types in the application are unique.
*/
export const EPeopleRegistryActionTypes = {

EDIT_EPERSON: type('dspace/epeople-registry/EDIT_EPERSON'),
CANCEL_EDIT_EPERSON: type('dspace/epeople-registry/CANCEL_EDIT_EPERSON'),
};

/* tslint:disable:max-classes-per-file */
/**
* Used to edit an EPerson in the EPeople registry
*/
export class EPeopleRegistryEditEPersonAction implements Action {
type = EPeopleRegistryActionTypes.EDIT_EPERSON;

eperson: EPerson;

constructor(eperson: EPerson) {
this.eperson = eperson;
}
}

/**
* Used to cancel the editing of an EPerson in the EPeople registry
*/
export class EPeopleRegistryCancelEPersonAction implements Action {
type = EPeopleRegistryActionTypes.CANCEL_EDIT_EPERSON;
}

/* tslint:enable:max-classes-per-file */

/**
* Export a type alias of all actions in this action group
* so that reducers can easily compose action types
* These are all the actions to perform on the EPeople registry state
*/
export type EPeopleRegistryAction
= EPeopleRegistryEditEPersonAction
| EPeopleRegistryCancelEPersonAction

0 comments on commit 069e64c

Please sign in to comment.