Merge 81d6cf2 into 521b0d3

resources/i18n/en.json5

@@ -176,12 +176,10 @@
 
   "admin.access-control.epeople.search.head": "Search",
 
-  "admin.access-control.epeople.search.scope.name": "Name",
+  "admin.access-control.epeople.search.scope.metadata": "Metadata",
 
   "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
 
-  "admin.access-control.epeople.search.scope.metadata": "Metadata",
-
   "admin.access-control.epeople.search.button": "Search",
 
   "admin.access-control.epeople.button.add": "Add EPerson",
@@ -190,13 +188,13 @@
 
   "admin.access-control.epeople.table.name": "Name",
 
-  "admin.access-control.epeople.table.email": "E-mail",
+  "admin.access-control.epeople.table.email": "E-mail (exact)",
 
   "admin.access-control.epeople.table.edit": "Edit",
 
-  "item.access-control.epeople.table.edit.buttons.edit": "Edit",
+  "admin.access-control.epeople.table.edit.buttons.edit": "Edit",
 
-  "item.access-control.epeople.table.edit.buttons.remove": "Remove",
+  "admin.access-control.epeople.table.edit.buttons.remove": "Remove",
 
   "admin.access-control.epeople.no-items": "No EPeople to show.",
 
@@ -228,12 +226,135 @@
 
   "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.notification.created.failure.groupNameInUse": "Failed to create Group with name: \"{{name}}\", make sure the name is not already in use.",
+
+  "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 (exact)",
+
+  "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",
@@ -588,6 +709,12 @@
 
   "community.edit.tabs.roles.title": "Community Edit - Roles",
 
+  "community.edit.tabs.roles.none": "None",
+
+  "community.edit.tabs.roles.admin.name": "Administrators",
+
+  "community.edit.tabs.roles.admin.description": "Community administrators can create sub-communities or collections, and manage or assign management for those sub-communities or collections. In addition, they decide who can submit items to any sub-collections, edit item metadata (after submission), and add (map) existing items from other collections (subject to authorization).",
+
 
 
   "community.form.abstract": "Short Description",
@@ -2193,6 +2320,9 @@
 
   "administrativeView.search.results.head": "Administrative Search",
 
+  "menu.section.admin_search": "Admin Search",
+
+
 
   "uploader.browse": "browse",
 

src/app/+admin/admin-access-control/admin-access-control-routing.module.ts

@@ -1,11 +1,32 @@
 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';
+import { URLCombiner } from '../../core/url-combiner/url-combiner';
+import { getAccessControlModulePath } from '../admin-routing.module';
+
+const GROUP_EDIT_PATH = 'groups';
+
+export function getGroupEditPath(id: string) {
+  return new URLCombiner(getAccessControlModulePath(), GROUP_EDIT_PATH, id).toString();
+}
 
 @NgModule({
   imports: [
     RouterModule.forChild([
       { path: 'epeople', component: EPeopleRegistryComponent, data: { title: 'admin.access-control.epeople.title' } },
+      { path: GROUP_EDIT_PATH, component: GroupsRegistryComponent, data: { title: 'admin.access-control.groups.title' } },
+      {
+        path: `${GROUP_EDIT_PATH}/:groupId`,
+        component: GroupFormComponent,
+        data: {title: 'admin.registries.schema.title'}
+      },
+      {
+        path: `${GROUP_EDIT_PATH}/newGroup`,
+        component: GroupFormComponent,
+        data: {title: 'admin.registries.schema.title'}
+      },
     ])
   ]
 })

src/app/+admin/admin-access-control/admin-access-control.module.ts

@@ -6,6 +6,10 @@ 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: [
@@ -17,7 +21,11 @@ import { EPersonFormComponent } from './epeople-registry/eperson-form/eperson-fo
   ],
   declarations: [
     EPeopleRegistryComponent,
-    EPersonFormComponent
+    EPersonFormComponent,
+    GroupsRegistryComponent,
+    GroupFormComponent,
+    SubgroupsListComponent,
+    MembersListComponent
   ],
   entryComponents: []
 })

src/app/+admin/admin-access-control/epeople-registry/epeople-registry.component.spec.ts

@@ -29,10 +29,11 @@ describe('EPeopleRegistryComponent', () => {
   let translateService: TranslateService;
   let builderService: FormBuilderService;
 
-  const mockEPeople = [EPersonMock, EPersonMock2];
+  let mockEPeople;
   let ePersonDataServiceStub: any;
 
   beforeEach(async(() => {
+    mockEPeople = [EPersonMock, EPersonMock2];
     ePersonDataServiceStub = {
       activeEPerson: null,
       allEpeople: mockEPeople,
@@ -88,8 +89,7 @@ describe('EPeopleRegistryComponent', () => {
       providers: [EPeopleRegistryComponent,
         { provide: EPersonDataService, useValue: ePersonDataServiceStub },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
-        { provide: FormBuilderService, useValue: builderService },
-        EPeopleRegistryComponent
+        { provide: FormBuilderService, useValue: builderService }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();