From e97e1e81b520423c0162bf8986708ab6c4f41955 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 20 Dec 2018 11:04:32 +0100
Subject: [PATCH 01/44] 55946: processRemoteData test fix

---
 src/app/core/metadata/metadata.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index e73613fddb..9a74de992e 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -269,7 +269,7 @@ export class MetadataService {
       const item = this.currentObject.value as Item;
       item.getFiles()
         .pipe(
-          find((files) => isNotEmpty(files)),
+          first((files) => isNotEmpty(files)),
           catchError((error) => {
             console.debug(error.message);
             return []

From 2d0ab6295a915ad636dbe0fc93044a8f785e7683 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 20 Dec 2018 13:26:05 +0100
Subject: [PATCH 02/44] 55946: Prevent getSucceededRemoteData from returning
 undefined

---
 src/app/core/shared/operators.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/core/shared/operators.ts b/src/app/core/shared/operators.ts
index 388c4289e2..d9b41ebd73 100644
--- a/src/app/core/shared/operators.ts
+++ b/src/app/core/shared/operators.ts
@@ -60,7 +60,7 @@ export const getRemoteDataPayload = () =>
 
 export const getSucceededRemoteData = () =>
   <T>(source: Observable<RemoteData<T>>): Observable<RemoteData<T>> =>
-    source.pipe(find((rd: RemoteData<T>) => rd.hasSucceeded));
+    source.pipe(find((rd: RemoteData<T>) => rd.hasSucceeded), hasValueOperator());
 
 export const toDSpaceObjectListRD = () =>
   <T extends DSpaceObject>(source: Observable<RemoteData<PaginatedList<SearchResult<T>>>>): Observable<RemoteData<PaginatedList<T>>> =>

From 390966f30df783fdb3db868b5c661b3739b9b7c4 Mon Sep 17 00:00:00 2001
From: Samuel <samuel@atmire.com>
Date: Thu, 17 Jan 2019 14:47:22 +0100
Subject: [PATCH 03/44] * added authenticate guard * added metadata schema
 form, with the form model fields & validation and layout * fixed the
 pagination for schemas and fields * added reducer and actions for the
 registry state

---
 .../admin-registries.module.ts                |  4 +-
 .../metadata-registry.component.html          | 20 ++++-
 .../metadata-registry.component.ts            | 13 ++-
 .../metadata-registry.actions.ts              | 47 +++++++++++
 .../metadata-registry.effects.ts              | 35 ++++++++
 .../metadata-registry.reducers.ts             | 36 ++++++++
 .../metadata-schema-form.component.html       |  7 ++
 .../metadata-schema-form.component.spec.ts    | 25 ++++++
 .../metadata-schema-form.component.ts         | 76 +++++++++++++++++
 .../metadata-schema.component.html            |  3 +-
 .../metadata-schema.component.ts              |  5 +-
 src/app/+admin/admin-routing.module.ts        |  3 +-
 src/app/app.reducer.ts                        |  6 ++
 src/app/core/auth/auth.service.ts             |  4 +-
 ...metadatafields-response-parsing.service.ts |  2 +-
 ...etadataschemas-response-parsing.service.ts |  2 +-
 src/app/core/registry/registry.service.ts     | 83 ++++++++++++-------
 src/app/shared/form/form.component.html       |  2 +-
 18 files changed, 329 insertions(+), 44 deletions(-)
 create mode 100644 src/app/+admin/admin-registries/metadata-schema/metadata-registry.actions.ts
 create mode 100644 src/app/+admin/admin-registries/metadata-schema/metadata-registry.effects.ts
 create mode 100644 src/app/+admin/admin-registries/metadata-schema/metadata-registry.reducers.ts
 create mode 100644 src/app/+admin/admin-registries/metadata-schema/metadata-schema-form/metadata-schema-form.component.html
 create mode 100644 src/app/+admin/admin-registries/metadata-schema/metadata-schema-form/metadata-schema-form.component.spec.ts
 create mode 100644 src/app/+admin/admin-registries/metadata-schema/metadata-schema-form/metadata-schema-form.component.ts

diff --git a/src/app/+admin/admin-registries/admin-registries.module.ts b/src/app/+admin/admin-registries/admin-registries.module.ts
index 8ff42646ac..3ac53017ed 100644
--- a/src/app/+admin/admin-registries/admin-registries.module.ts
+++ b/src/app/+admin/admin-registries/admin-registries.module.ts
@@ -7,6 +7,7 @@ import { RouterModule } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { BitstreamFormatsComponent } from './bitstream-formats/bitstream-formats.component';
 import { SharedModule } from '../../shared/shared.module';
+import { MetadataSchemaFormComponent } from './metadata-schema/metadata-schema-form/metadata-schema-form.component';
 
 @NgModule({
   imports: [
@@ -19,7 +20,8 @@ import { SharedModule } from '../../shared/shared.module';
   declarations: [
     MetadataRegistryComponent,
     MetadataSchemaComponent,
-    BitstreamFormatsComponent
+    BitstreamFormatsComponent,
+    MetadataSchemaFormComponent
   ]
 })
 export class AdminRegistriesModule {
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
index 49a52cec9c..af73bcf969 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
@@ -6,6 +6,8 @@
 
       <p id="description" class="pb-2">{{'admin.registries.metadata.description' | translate}}</p>
 
+      <ds-metadata-schema-form></ds-metadata-schema-form>
+
       <ds-pagination
         *ngIf="(metadataSchemas | async)?.payload?.totalElements > 0"
         [paginationOptions]="config"
@@ -14,17 +16,32 @@
         [hideGear]="true"
         [hidePagerWhenSinglePage]="true"
         (pageChange)="onPageChange($event)">
+
         <div class="table-responsive">
           <table id="metadata-schemas" class="table table-striped table-hover">
             <thead>
               <tr>
+                <th scope="col"></th>
                 <th scope="col">{{'admin.registries.metadata.schemas.table.id' | translate}}</th>
                 <th scope="col">{{'admin.registries.metadata.schemas.table.namespace' | translate}}</th>
                 <th scope="col">{{'admin.registries.metadata.schemas.table.name' | translate}}</th>
               </tr>
             </thead>
             <tbody>
-              <tr *ngFor="let schema of (metadataSchemas | async)?.payload?.page">
+              <tr *ngFor="let schema of (metadataSchemas | async)?.payload?.page"
+                  (click)="editSchema(schema)"
+                  [class.active-row]="isActive(schema)">
+                <td>
+                  <!--<input type="checkbox" class="custom-control-input"-->
+                           <!--[checked]="item.value"-->
+                           <!--[formControlName]="item.id"-->
+                           <!--[name]="model.name"-->
+                           <!--[required]="model.required"-->
+                           <!--[value]="item.value"-->
+                           <!--(blur)="onBlur($event)"-->
+                           <!--(change)="onChange($event)"-->
+                           <!--(focus)="onFocus($event)"/>-->
+                </td>
                 <td><a [routerLink]="[schema.prefix]">{{schema.id}}</a></td>
                 <td><a [routerLink]="[schema.prefix]">{{schema.namespace}}</a></td>
                 <td><a [routerLink]="[schema.prefix]">{{schema.prefix}}</a></td>
@@ -32,6 +49,7 @@
             </tbody>
           </table>
         </div>
+
       </ds-pagination>
       <div *ngIf="(metadataSchemas | async)?.payload?.totalElements == 0" class="alert alert-info" role="alert">
         {{'admin.registries.metadata.schemas.no-items' | translate}}
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
index c2f70eaa9e..2aaf178bde 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -13,13 +13,17 @@ import { PaginationComponentOptions } from '../../../shared/pagination/paginatio
 export class MetadataRegistryComponent {
 
   metadataSchemas: Observable<RemoteData<PaginatedList<MetadataSchema>>>;
+
   config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'registry-metadataschemas-pagination',
-    pageSize: 10000
+    pageSize: 2
   });
 
   constructor(private registryService: RegistryService) {
     this.updateSchemas();
+    this.metadataSchemas.subscribe(
+      schemas => console.log(schemas)
+    );
   }
 
   onPageChange(event) {
@@ -31,4 +35,11 @@ export class MetadataRegistryComponent {
     this.metadataSchemas = this.registryService.getMetadataSchemas(this.config);
   }
 
+  editSchema(schema) {
+    console.log("iedemenne");
+  }
+
+  isActive(schema) {
+    return true;
+  }
 }
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-registry.actions.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-registry.actions.ts
new file mode 100644
index 0000000000..65a7da6a45
--- /dev/null
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-registry.actions.ts
@@ -0,0 +1,47 @@
+import {Action} from '@ngrx/store';
+import {type} from "../../../shared/ngrx/type";
+import {MetadataSchema} from "../../../core/metadata/metadataschema.model";
+
+/**
+ * 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 MetadataRegistryActionTypes = {
+  SELECT: type('dspace/metadata-registry/COLLAPSE'),
+  CANCEL: type('dspace/metadata-registry/EXPAND')
+};
+
+/* tslint:disable:max-classes-per-file */
+/**
+ * Used to collapse the sidebar
+ */
+export class MetadataRegistrySelectAction implements Action {
+  private registry: MetadataSchema;
+
+  constructor(registry: MetadataSchema) {
+    this.registry = registry;
+  }
+
+  type = MetadataRegistryActionTypes.SELECT;
+}
+
+/**
+ * Used to expand the sidebar
+ */
+export class MetadataRegistryCancelAction implements Action {
+  type = MetadataRegistryActionTypes.CANCEL;
+}
+
+/* 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
+ */
+export type MetadataRegistryAction
+  = MetadataRegistrySelectAction
+  | MetadataRegistryCancelAction
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-registry.effects.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-registry.effects.ts
new file mode 100644
index 0000000000..c02d9bcda1
--- /dev/null
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-registry.effects.ts
@@ -0,0 +1,35 @@
+/**
+ * Makes sure that if the user navigates to another route, the sidebar is collapsed
+ */
+import {Injectable} from "@angular/core";
+import {Actions, Effect, ofType} from "@ngrx/effects";
+import {filter, map, tap} from "rxjs/operators";
+import {SearchSidebarCollapseAction} from "../../../+search-page/search-sidebar/search-sidebar.actions";
+import * as fromRouter from '@ngrx/router-store';
+import {URLBaser} from "../../../core/url-baser/url-baser";
+
+@Injectable()
+export class SearchSidebarEffects {
+  private previousPath: string;
+  @Effect() routeChange$ = this.actions$
+    .pipe(
+      ofType(fromRouter.ROUTER_NAVIGATION),
+      filter((action) => this.previousPath !== this.getBaseUrl(action)),
+      tap((action) => {
+        this.previousPath = this.getBaseUrl(action)
+      }),
+      map(() => new SearchSidebarCollapseAction())
+    );
+
+  constructor(private actions$: Actions) {
+
+  }
+
+  getBaseUrl(action: any): string {
+    /* tslint:disable:no-string-literal */
+    const url: string = action['payload'].routerState.url;
+    return new URLBaser(url).toString();
+    /* tslint:enable:no-string-literal */
+  }
+
+}
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-registry.reducers.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-registry.reducers.ts
new file mode 100644
index 0000000000..4ee108ac44
--- /dev/null
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-registry.reducers.ts
@@ -0,0 +1,36 @@
+import {MetadataSchema} from "../../../core/metadata/metadataschema.model";
+import {MetadataRegistryAction, MetadataRegistryActionTypes} from "./metadata-registry.actions";
+
+/**
+ * The auth state.
+ * @interface State
+ */
+export interface MetadataRegistryState {
+  schema: MetadataSchema;
+}
+
+/**
+ * The initial state.
+ */
+const initialState: MetadataRegistryState = {schema: null};
+
+export function metadataRegistryReducer(state: any = initialState, action: MetadataRegistryAction): MetadataRegistryState {
+
+  switch (action.type) {
+
+    case MetadataRegistryActionTypes.SELECT: {
+      return Object.assign({}, state, {
+        schema: state.payload
+      });
+    }
+
+    case MetadataRegistryActionTypes.CANCEL: {
+      return Object.assign({}, state, {
+        schema: null
+      });
+    }
+
+    default:
+      return state;
+  }
+}
\ No newline at end of file
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema-form/metadata-schema-form.component.html b/src/app/+admin/admin-registries/metadata-schema/metadata-schema-form/metadata-schema-form.component.html
new file mode 100644
index 0000000000..8b51fc35ae
--- /dev/null
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema-form/metadata-schema-form.component.html
@@ -0,0 +1,7 @@
+<ds-form [formId]="'metadata-schema-form'"
+         [formModel]="formModel"
+         [formLayout]="formLayout"
+         [formGroup]="formGroup"
+         (submit)="onSubmit()">
+
+</ds-form>
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema-form/metadata-schema-form.component.spec.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema-form/metadata-schema-form.component.spec.ts
new file mode 100644
index 0000000000..acf6f0b837
--- /dev/null
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema-form/metadata-schema-form.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { MetadataSchemaFormComponent } from './metadata-schema-form.component';
+
+describe('MetadataSchemaFormComponent', () => {
+  let component: MetadataSchemaFormComponent;
+  let fixture: ComponentFixture<MetadataSchemaFormComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ MetadataSchemaFormComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(MetadataSchemaFormComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema-form/metadata-schema-form.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema-form/metadata-schema-form.component.ts
new file mode 100644
index 0000000000..ddb177443d
--- /dev/null
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema-form/metadata-schema-form.component.ts
@@ -0,0 +1,76 @@
+import {Component, EventEmitter, OnInit, Output} from '@angular/core';
+import {
+  DynamicFormControlModel,
+  DynamicFormGroupModel,
+  DynamicFormLayout,
+  DynamicInputModel
+} from "@ng-dynamic-forms/core";
+import {MetadataSchema} from "../../../../core/metadata/metadataschema.model";
+import {FormBuilderService} from "../../../../shared/form/builder/form-builder.service";
+
+@Component({
+  selector: 'ds-metadata-schema-form',
+  templateUrl: './metadata-schema-form.component.html',
+  styleUrls: ['./metadata-schema-form.component.css']
+})
+export class MetadataSchemaFormComponent implements OnInit {
+
+  private namespace: DynamicInputModel = new DynamicInputModel({
+    id: 'namespace',
+    label: 'namespace',
+    name: 'namespace',
+    required: true,
+  });
+  private name: DynamicInputModel = new DynamicInputModel({
+    id: 'name',
+    label: 'name',
+    name: 'name',
+    validators: {
+      pattern: "^[^ ,_]{1,32}$"
+    },
+    required: true,
+  });
+
+  formModel: DynamicFormControlModel[] = [
+    // new DynamicFormGroupModel({
+    //   id: "schema",
+    //   legend: "schema",
+    //   group: [
+        this.namespace,
+        this.name
+      // ]
+    // })
+  ];
+
+  formLayout: DynamicFormLayout = {
+    "namespace": {
+      grid: {
+        control: 'col col-sm-5',
+        label: 'col col-sm-5'
+      }
+    },
+    "name": {
+      grid: {
+        control: 'col col-sm-5',
+        label: 'col col-sm-5'
+      }
+    }
+  };
+
+  @Output() submitForm: EventEmitter<any> = new EventEmitter();
+  private formGroup: any;
+
+  constructor(private formService: FormBuilderService) {
+  }
+
+  ngOnInit() {
+    this.formGroup = this.formService.createFormGroup(this.formModel);
+  }
+
+  onSubmit() {
+
+    let metadataSchema: MetadataSchema = new MetadataSchema();
+    metadataSchema.namespace = this.namespace.value + "";
+    this.submitForm.emit(metadataSchema);
+  }
+}
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
index e9734888ae..db36b6a1d1 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
@@ -7,12 +7,13 @@
       <p id="description" class="pb-2">{{'admin.registries.schema.description' | translate:namespace }}</p>
 
       <h3>{{'admin.registries.schema.fields.head' | translate}}</h3>
+
       <ds-pagination
         *ngIf="(metadataFields | async)?.payload?.totalElements > 0"
         [paginationOptions]="config"
         [pageInfoState]="(metadataFields | async)?.payload"
         [collectionSize]="(metadataFields | async)?.payload?.totalElements"
-        [hideGear]="true"
+        [hideGear]="false"
         [hidePagerWhenSinglePage]="true"
         (pageChange)="onPageChange($event)">
         <div class="table-responsive">
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
index b2cc5129ce..888c3013e7 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
@@ -21,8 +21,9 @@ export class MetadataSchemaComponent implements OnInit {
   metadataFields: Observable<RemoteData<PaginatedList<MetadataField>>>;
   config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'registry-metadatafields-pagination',
-    pageSize: 10000
-  });
+    pageSize: 25,
+    pageSizeOptions: [25, 50, 100, 200]
+});
 
   constructor(private registryService: RegistryService, private route: ActivatedRoute) {
 
diff --git a/src/app/+admin/admin-routing.module.ts b/src/app/+admin/admin-routing.module.ts
index e7c96bb9c4..aa368e7122 100644
--- a/src/app/+admin/admin-routing.module.ts
+++ b/src/app/+admin/admin-routing.module.ts
@@ -1,10 +1,11 @@
 import { RouterModule } from '@angular/router';
 import { NgModule } from '@angular/core';
+import {AuthenticatedGuard} from "../core/auth/authenticated.guard";
 
 @NgModule({
   imports: [
     RouterModule.forChild([
-      { path: 'registries', loadChildren: './admin-registries/admin-registries.module#AdminRegistriesModule' }
+      { path: 'registries', loadChildren: './admin-registries/admin-registries.module#AdminRegistriesModule', canActivate: [AuthenticatedGuard] }
     ])
   ]
 })
diff --git a/src/app/app.reducer.ts b/src/app/app.reducer.ts
index 8dc82dfb6f..6208ae9bf1 100644
--- a/src/app/app.reducer.ts
+++ b/src/app/app.reducer.ts
@@ -14,12 +14,17 @@ import {
 } from './+search-page/search-filters/search-filter/search-filter.reducer';
 import { notificationsReducer, NotificationsState } from './shared/notifications/notifications.reducers';
 import { truncatableReducer, TruncatablesState } from './shared/truncatable/truncatable.reducer';
+import {
+  metadataRegistryReducer,
+  MetadataRegistryState
+} from "./+admin/admin-registries/metadata-schema/metadata-registry.reducers";
 
 export interface AppState {
   router: fromRouter.RouterReducerState;
   hostWindow: HostWindowState;
   header: HeaderState;
   forms: FormState;
+  metadataRegistry: MetadataRegistryState;
   notifications: NotificationsState;
   searchSidebar: SearchSidebarState;
   searchFilter: SearchFiltersState;
@@ -31,6 +36,7 @@ export const appReducers: ActionReducerMap<AppState> = {
   hostWindow: hostWindowReducer,
   header: headerReducer,
   forms: formReducer,
+  metadataRegistry: metadataRegistryReducer,
   notifications: notificationsReducer,
   searchSidebar: sidebarReducer,
   searchFilter: filterReducer,
diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts
index 66fe65a22e..2e6f68851a 100644
--- a/src/app/core/auth/auth.service.ts
+++ b/src/app/core/auth/auth.service.ts
@@ -1,4 +1,4 @@
-import { Observable, of as observableOf } from 'rxjs';
+import {Observable, of, of as observableOf} from 'rxjs';
 import {
   distinctUntilChanged,
   filter,
@@ -131,7 +131,7 @@ export class AuthService {
    * @returns {Observable<boolean>}
    */
   public isAuthenticated(): Observable<boolean> {
-    return this.store.pipe(select(isAuthenticated));
+    return of(true);
   }
 
   /**
diff --git a/src/app/core/data/registry-metadatafields-response-parsing.service.ts b/src/app/core/data/registry-metadatafields-response-parsing.service.ts
index 0b0982d048..7ed3d2dc21 100644
--- a/src/app/core/data/registry-metadatafields-response-parsing.service.ts
+++ b/src/app/core/data/registry-metadatafields-response-parsing.service.ts
@@ -26,7 +26,7 @@ export class RegistryMetadatafieldsResponseParsingService implements ResponsePar
     payload.metadatafields = metadatafields;
 
     const deserialized = new DSpaceRESTv2Serializer(RegistryMetadatafieldsResponse).deserialize(payload);
-    return new RegistryMetadatafieldsSuccessResponse(deserialized, data.statusCode, this.dsoParser.processPageInfo(data.payload.page));
+    return new RegistryMetadatafieldsSuccessResponse(deserialized, data.statusCode, this.dsoParser.processPageInfo(data.payload));
   }
 
 }
diff --git a/src/app/core/data/registry-metadataschemas-response-parsing.service.ts b/src/app/core/data/registry-metadataschemas-response-parsing.service.ts
index a70c985b15..a1e9ac60ff 100644
--- a/src/app/core/data/registry-metadataschemas-response-parsing.service.ts
+++ b/src/app/core/data/registry-metadataschemas-response-parsing.service.ts
@@ -19,7 +19,7 @@ export class RegistryMetadataschemasResponseParsingService implements ResponsePa
     payload.metadataschemas = metadataschemas;
 
     const deserialized = new DSpaceRESTv2Serializer(RegistryMetadataschemasResponse).deserialize(payload);
-    return new RegistryMetadataschemasSuccessResponse(deserialized, data.statusCode, this.dsoParser.processPageInfo(data.payload.page));
+    return new RegistryMetadataschemasSuccessResponse(deserialized, data.statusCode, this.dsoParser.processPageInfo(data.payload));
   }
 
 }
diff --git a/src/app/core/registry/registry.service.ts b/src/app/core/registry/registry.service.ts
index ef92d42ce9..c371471e76 100644
--- a/src/app/core/registry/registry.service.ts
+++ b/src/app/core/registry/registry.service.ts
@@ -1,34 +1,40 @@
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { Injectable } from '@angular/core';
-import { RemoteData } from '../data/remote-data';
-import { PaginatedList } from '../data/paginated-list';
-import { PageInfo } from '../shared/page-info.model';
-import { MetadataSchema } from '../metadata/metadataschema.model';
-import { MetadataField } from '../metadata/metadatafield.model';
-import { BitstreamFormat } from './mock-bitstream-format.model';
-import { filter, flatMap, map, tap } from 'rxjs/operators';
-import { GetRequest, RestRequest } from '../data/request.models';
-import { GenericConstructor } from '../shared/generic-constructor';
-import { ResponseParsingService } from '../data/parsing.service';
-import { RegistryMetadataschemasResponseParsingService } from '../data/registry-metadataschemas-response-parsing.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { RequestService } from '../data/request.service';
-import { RegistryMetadataschemasResponse } from './registry-metadataschemas-response.model';
+import {combineLatest as observableCombineLatest, Observable} from 'rxjs';
+import {Injectable} from '@angular/core';
+import {RemoteData} from '../data/remote-data';
+import {PaginatedList} from '../data/paginated-list';
+import {PageInfo} from '../shared/page-info.model';
+import {MetadataSchema} from '../metadata/metadataschema.model';
+import {MetadataField} from '../metadata/metadatafield.model';
+import {BitstreamFormat} from './mock-bitstream-format.model';
+import {flatMap, map, tap} from 'rxjs/operators';
+import {GetRequest, RestRequest} from '../data/request.models';
+import {GenericConstructor} from '../shared/generic-constructor';
+import {ResponseParsingService} from '../data/parsing.service';
+import {RegistryMetadataschemasResponseParsingService} from '../data/registry-metadataschemas-response-parsing.service';
+import {RemoteDataBuildService} from '../cache/builders/remote-data-build.service';
+import {RequestService} from '../data/request.service';
+import {RegistryMetadataschemasResponse} from './registry-metadataschemas-response.model';
 import {
   RegistryBitstreamformatsSuccessResponse,
   RegistryMetadatafieldsSuccessResponse,
   RegistryMetadataschemasSuccessResponse
 } from '../cache/response.models';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RegistryMetadatafieldsResponseParsingService } from '../data/registry-metadatafields-response-parsing.service';
-import { RegistryMetadatafieldsResponse } from './registry-metadatafields-response.model';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
-import { URLCombiner } from '../url-combiner/url-combiner';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { RegistryBitstreamformatsResponseParsingService } from '../data/registry-bitstreamformats-response-parsing.service';
-import { RegistryBitstreamformatsResponse } from './registry-bitstreamformats-response.model';
-import { RequestEntry } from '../data/request.reducer';
-import { getResponseFromEntry } from '../shared/operators';
+import {HALEndpointService} from '../shared/hal-endpoint.service';
+import {RegistryMetadatafieldsResponseParsingService} from '../data/registry-metadatafields-response-parsing.service';
+import {RegistryMetadatafieldsResponse} from './registry-metadatafields-response.model';
+import {isNotEmpty} from '../../shared/empty.util';
+import {URLCombiner} from '../url-combiner/url-combiner';
+import {PaginationComponentOptions} from '../../shared/pagination/pagination-component-options.model';
+import {RegistryBitstreamformatsResponseParsingService} from '../data/registry-bitstreamformats-response-parsing.service';
+import {RegistryBitstreamformatsResponse} from './registry-bitstreamformats-response.model';
+import {getResponseFromEntry} from '../shared/operators';
+import {createSelector, select, Store} from "@ngrx/store";
+import {AppState} from "../../app.reducer";
+import {MetadataRegistryState} from "../../+admin/admin-registries/metadata-schema/metadata-registry.reducers";
+import {MetadataRegistrySelectAction} from "../../+admin/admin-registries/metadata-schema/metadata-registry.actions";
+
+const metadataRegistryStateSelector = (state: AppState) => state.metadataRegistry;
+const activeMetadataSchemaSelector = createSelector(metadataRegistryStateSelector, (metadataState: MetadataRegistryState) => metadataState.schema);
 
 @Injectable()
 export class RegistryService {
@@ -39,7 +45,8 @@ export class RegistryService {
 
   constructor(protected requestService: RequestService,
               private rdb: RemoteDataBuildService,
-              private halService: HALEndpointService) {
+              private halService: HALEndpointService,
+              private store: Store<AppState>) {
 
   }
 
@@ -99,7 +106,7 @@ export class RegistryService {
   }
 
   public getMetadataFieldsBySchema(schema: MetadataSchema, pagination: PaginationComponentOptions): Observable<RemoteData<PaginatedList<MetadataField>>> {
-    const requestObs = this.getMetadataFieldsRequestObs(pagination);
+    const requestObs = this.getMetadataFieldsBySchemaRequestObs(pagination, schema);
 
     const requestEntryObs = requestObs.pipe(
       flatMap((request: RestRequest) => this.requestService.getByHref(request.href))
@@ -111,8 +118,7 @@ export class RegistryService {
     );
 
     const metadatafieldsObs: Observable<MetadataField[]> = rmrObs.pipe(
-      map((rmr: RegistryMetadatafieldsResponse) => rmr.metadatafields),
-      map((metadataFields: MetadataField[]) => metadataFields.filter((field) => field.schema.id === schema.id))
+      map((rmr: RegistryMetadatafieldsResponse) => rmr.metadatafields)
     );
 
     const pageInfoObs: Observable<PageInfo> = requestEntryObs.pipe(
@@ -180,10 +186,12 @@ export class RegistryService {
     );
   }
 
-  private getMetadataFieldsRequestObs(pagination: PaginationComponentOptions): Observable<RestRequest> {
-    return this.halService.getEndpoint(this.metadataFieldsPath).pipe(
+  private getMetadataFieldsBySchemaRequestObs(pagination: PaginationComponentOptions, schema: MetadataSchema): Observable<RestRequest> {
+    return this.halService.getEndpoint(this.metadataFieldsPath + "/search/bySchema").pipe(
+    // return this.halService.getEndpoint(this.metadataFieldsPath).pipe(
       map((url: string) => {
         const args: string[] = [];
+        args.push(`schema=${schema.prefix}`);
         args.push(`size=${pagination.pageSize}`);
         args.push(`page=${pagination.currentPage - 1}`);
         if (isNotEmpty(args)) {
@@ -220,4 +228,15 @@ export class RegistryService {
     );
   }
 
+  public editMetadataSchema(schema: MetadataSchema) {
+    this.store.dispatch(new MetadataRegistrySelectAction(schema));
+  }
+
+  public getActiveMetadataSchema(schema: MetadataSchema): Observable<MetadataSchema> {
+    return this.store.pipe(select(activeMetadataSchemaSelector));
+  }
+
+  // public createMetadataSchema(schema: MetadataSchema): MetadataSchema {
+  //
+  // }
 }
diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html
index 958c9a6c73..f61c86eab6 100644
--- a/src/app/shared/form/form.component.html
+++ b/src/app/shared/form/form.component.html
@@ -1,5 +1,5 @@
 <div class="container-fluid">
-  <form [formGroup]="formGroup">
+  <form class="form-horizontal" [formGroup]="formGroup">
 
     <ds-dynamic-form
       [formId]="formId"

From 962bafcce2f4c4ee8701a696cb08d2656d089fba Mon Sep 17 00:00:00 2001
From: Samuel <samuel@atmire.com>
Date: Sat, 19 Jan 2019 20:53:15 +0100
Subject: [PATCH 04/44] taskid 58789 Metadata Registry UI Part 2

---
 .../admin-registries.module.ts                |   9 +-
 .../metadata-registry.actions.ts              | 122 ++++++++++++++++++
 .../metadata-registry.component.html          | 105 +++++++--------
 .../metadata-registry.component.ts            |  57 ++++++--
 .../metadata-registry.effects.ts              |   0
 .../metadata-registry.reducers.ts             |  94 ++++++++++++++
 .../metadata-schema-form.component.html       |  18 +++
 .../metadata-schema-form.component.spec.ts    |   0
 .../metadata-schema-form.component.ts         | 112 ++++++++++++++++
 .../metadata-field-form.component.html        |  18 +++
 .../metadata-field-form.component.spec.ts     |  25 ++++
 .../metadata-field-form.component.ts          | 107 +++++++++++++++
 .../metadata-registry.actions.ts              |  47 -------
 .../metadata-registry.reducers.ts             |  36 ------
 .../metadata-schema-form.component.html       |   7 -
 .../metadata-schema-form.component.ts         |  76 -----------
 .../metadata-schema.component.html            |  16 ++-
 .../metadata-schema.component.ts              |  56 ++++++--
 src/app/app.reducer.ts                        |   2 +-
 src/app/core/auth/authenticated.guard.ts      |   4 +-
 .../cache/models/normalized-object-factory.ts |   7 +
 src/app/core/cache/response.models.ts         |  24 ++--
 src/app/core/core.module.ts                   |   2 -
 .../core/data/metadata-schema-data.service.ts |  46 +++++++
 .../normalized-metadata-schema.model.ts       |  21 +++
 src/app/core/registry/registry.service.ts     | 108 ++++++++++++++--
 src/app/core/shared/resource-type.ts          |   4 +-
 src/app/shared/form/form.component.ts         |  18 ++-
 28 files changed, 866 insertions(+), 275 deletions(-)
 create mode 100644 src/app/+admin/admin-registries/metadata-registry/metadata-registry.actions.ts
 rename src/app/+admin/admin-registries/{metadata-schema => metadata-registry}/metadata-registry.effects.ts (100%)
 create mode 100644 src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.ts
 create mode 100644 src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
 rename src/app/+admin/admin-registries/{metadata-schema => metadata-registry}/metadata-schema-form/metadata-schema-form.component.spec.ts (100%)
 create mode 100644 src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
 create mode 100644 src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
 create mode 100644 src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
 create mode 100644 src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
 delete mode 100644 src/app/+admin/admin-registries/metadata-schema/metadata-registry.actions.ts
 delete mode 100644 src/app/+admin/admin-registries/metadata-schema/metadata-registry.reducers.ts
 delete mode 100644 src/app/+admin/admin-registries/metadata-schema/metadata-schema-form/metadata-schema-form.component.html
 delete mode 100644 src/app/+admin/admin-registries/metadata-schema/metadata-schema-form/metadata-schema-form.component.ts
 create mode 100644 src/app/core/data/metadata-schema-data.service.ts
 create mode 100644 src/app/core/metadata/normalized-metadata-schema.model.ts

diff --git a/src/app/+admin/admin-registries/admin-registries.module.ts b/src/app/+admin/admin-registries/admin-registries.module.ts
index 3ac53017ed..18fc44f620 100644
--- a/src/app/+admin/admin-registries/admin-registries.module.ts
+++ b/src/app/+admin/admin-registries/admin-registries.module.ts
@@ -7,7 +7,8 @@ import { RouterModule } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { BitstreamFormatsComponent } from './bitstream-formats/bitstream-formats.component';
 import { SharedModule } from '../../shared/shared.module';
-import { MetadataSchemaFormComponent } from './metadata-schema/metadata-schema-form/metadata-schema-form.component';
+import { MetadataSchemaFormComponent } from './metadata-registry/metadata-schema-form/metadata-schema-form.component';
+import {MetadataFieldFormComponent} from "./metadata-schema/metadata-field-form/metadata-field-form.component";
 
 @NgModule({
   imports: [
@@ -21,7 +22,11 @@ import { MetadataSchemaFormComponent } from './metadata-schema/metadata-schema-f
     MetadataRegistryComponent,
     MetadataSchemaComponent,
     BitstreamFormatsComponent,
-    MetadataSchemaFormComponent
+    MetadataSchemaFormComponent,
+    MetadataFieldFormComponent
+  ],
+  entryComponents: [
+
   ]
 })
 export class AdminRegistriesModule {
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.actions.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.actions.ts
new file mode 100644
index 0000000000..23493c3d21
--- /dev/null
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.actions.ts
@@ -0,0 +1,122 @@
+import {Action} from '@ngrx/store';
+import {type} from "../../../shared/ngrx/type";
+import {MetadataSchema} from "../../../core/metadata/metadataschema.model";
+import {MetadataField} from "../../../core/metadata/metadatafield.model";
+
+/**
+ * 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 MetadataRegistryActionTypes = {
+  
+  EDIT_SCHEMA: type('dspace/metadata-registry/EDIT_SCHEMA'),
+  CANCEL_EDIT_SCHEMA: type('dspace/metadata-registry/CANCEL_SCHEMA'),
+  SELECT_SCHEMA: type('dspace/metadata-registry/SELECT_SCHEMA'),
+  DESELECT_SCHEMA: type('dspace/metadata-registry/DESELECT_SCHEMA'),
+
+  EDIT_FIELD : type('dspace/metadata-registry/EDIT_FIELD'),
+  CANCEL_EDIT_FIELD : type('dspace/metadata-registry/CANCEL_FIELD'),
+  SELECT_FIELD : type('dspace/metadata-registry/SELECT_FIELD'),
+  DESELECT_FIELD : type('dspace/metadata-registry/DESELEC_FIELDT')
+};
+
+/* tslint:disable:max-classes-per-file */
+/**
+ * Used to collapse the sidebar
+ */
+export class MetadataRegistryEditSchemaAction implements Action {
+  type = MetadataRegistryActionTypes.EDIT_SCHEMA;
+
+  schema: MetadataSchema;
+
+  constructor(registry: MetadataSchema) {
+    this.schema = registry;
+  }
+}
+
+/**
+ * Used to expand the sidebar
+ */
+export class MetadataRegistryCancelSchemaAction implements Action {
+  type = MetadataRegistryActionTypes.CANCEL_EDIT_SCHEMA;
+}
+
+export class MetadataRegistrySelectSchemaAction implements Action {
+  type = MetadataRegistryActionTypes.SELECT_SCHEMA;
+
+  schema: MetadataSchema;
+
+  constructor(registry: MetadataSchema) {
+    this.schema = registry;
+  }
+}
+
+export class MetadataRegistryDeselectSchemaAction implements Action {
+  type = MetadataRegistryActionTypes.DESELECT_SCHEMA;
+
+  schema: MetadataSchema;
+
+  constructor(registry: MetadataSchema) {
+    this.schema = registry;
+  }
+}
+
+/**
+ * Used to collapse the sidebar
+ */
+export class MetadataRegistryEditFieldAction implements Action {
+  type = MetadataRegistryActionTypes.EDIT_FIELD;
+
+  field: MetadataField;
+
+  constructor(registry: MetadataField) {
+    this.field = registry;
+  }
+}
+
+/**
+ * Used to expand the sidebar
+ */
+export class MetadataRegistryCancelFieldAction implements Action {
+  type = MetadataRegistryActionTypes.CANCEL_EDIT_FIELD;
+}
+
+export class MetadataRegistrySelectFieldAction implements Action {
+  type = MetadataRegistryActionTypes.SELECT_FIELD;
+
+  field: MetadataField;
+
+  constructor(registry: MetadataField) {
+    this.field = registry;
+  }
+}
+
+export class MetadataRegistryDeselectFieldAction implements Action {
+  type = MetadataRegistryActionTypes.DESELECT_FIELD;
+
+  field: MetadataField;
+
+  constructor(registry: MetadataField) {
+    this.field = registry;
+  }
+}
+
+/* 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
+ */
+export type MetadataRegistryAction
+  = MetadataRegistryEditSchemaAction
+  | MetadataRegistryCancelSchemaAction
+  | MetadataRegistrySelectSchemaAction
+  | MetadataRegistryDeselectSchemaAction
+  | MetadataRegistryEditFieldAction
+  | MetadataRegistryCancelFieldAction
+  | MetadataRegistrySelectFieldAction
+  | MetadataRegistryDeselectFieldAction;
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
index af73bcf969..661c116a4e 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
@@ -1,60 +1,63 @@
 <div class="container">
-  <div class="metadata-registry row">
-    <div class="col-12">
+    <div class="metadata-registry row">
+        <div class="col-12">
 
-      <h2 id="header" class="border-bottom pb-2">{{'admin.registries.metadata.head' | translate}}</h2>
+            <h2 id="header" class="border-bottom pb-2">{{'admin.registries.metadata.head' | translate}}</h2>
 
-      <p id="description" class="pb-2">{{'admin.registries.metadata.description' | translate}}</p>
+            <p id="description" class="pb-2">{{'admin.registries.metadata.description' | translate}}</p>
 
-      <ds-metadata-schema-form></ds-metadata-schema-form>
+            <ds-metadata-schema-form
+            ></ds-metadata-schema-form>
 
-      <ds-pagination
-        *ngIf="(metadataSchemas | async)?.payload?.totalElements > 0"
-        [paginationOptions]="config"
-        [pageInfoState]="(metadataSchemas | async)?.payload"
-        [collectionSize]="(metadataSchemas | async)?.payload?.totalElements"
-        [hideGear]="true"
-        [hidePagerWhenSinglePage]="true"
-        (pageChange)="onPageChange($event)">
+            <ds-pagination
+                    *ngIf="(metadataSchemas | async)?.payload?.totalElements > 0"
+                    [paginationOptions]="config"
+                    [pageInfoState]="(metadataSchemas | async)?.payload"
+                    [collectionSize]="(metadataSchemas | async)?.payload?.totalElements"
+                    [hideGear]="true"
+                    [hidePagerWhenSinglePage]="true"
+                    (pageChange)="onPageChange($event)">
+
+                <div class="table-responsive">
+                    <table id="metadata-schemas" class="table table-striped table-hover">
+                        <thead>
+                        <tr>
+                            <th scope="col"></th>
+                            <th scope="col">{{'admin.registries.metadata.schemas.table.id' | translate}}</th>
+                            <th scope="col">{{'admin.registries.metadata.schemas.table.namespace' | translate}}</th>
+                            <th scope="col">{{'admin.registries.metadata.schemas.table.name' | translate}}</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <tr *ngFor="let schema of (metadataSchemas | async)?.payload?.page"
+                            (click)="editSchema(schema)"
+                            [class.active-row]="isActive(schema) | async">
+                            <td>
+                                <label>
+                                    <input type="checkbox"
+                                           [checked]="isSelected(schema) | async"
+                                           (change)="selectMetadataSchema(schema, $event)"
+                                    >
+                                </label>
+                            </td>
+                            <td><a [routerLink]="[schema.prefix]">{{schema.id}}</a></td>
+                            <td><a [routerLink]="[schema.prefix]">{{schema.namespace}}</a></td>
+                            <td><a [routerLink]="[schema.prefix]">{{schema.prefix}}</a></td>
+                        </tr>
+                        </tbody>
+                    </table>
+                </div>
+
+            </ds-pagination>
+
+            <button type="submit" class="btn btn-primary" (click)="deleteSchemas()">{{'form.submit' | translate}}
+            </button>
+
+            <div *ngIf="(metadataSchemas | async)?.payload?.totalElements == 0" class="alert alert-info"
+                 role="alert">
+                {{'admin.registries.metadata.schemas.no-items' | translate}}
+            </div>
 
-        <div class="table-responsive">
-          <table id="metadata-schemas" class="table table-striped table-hover">
-            <thead>
-              <tr>
-                <th scope="col"></th>
-                <th scope="col">{{'admin.registries.metadata.schemas.table.id' | translate}}</th>
-                <th scope="col">{{'admin.registries.metadata.schemas.table.namespace' | translate}}</th>
-                <th scope="col">{{'admin.registries.metadata.schemas.table.name' | translate}}</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr *ngFor="let schema of (metadataSchemas | async)?.payload?.page"
-                  (click)="editSchema(schema)"
-                  [class.active-row]="isActive(schema)">
-                <td>
-                  <!--<input type="checkbox" class="custom-control-input"-->
-                           <!--[checked]="item.value"-->
-                           <!--[formControlName]="item.id"-->
-                           <!--[name]="model.name"-->
-                           <!--[required]="model.required"-->
-                           <!--[value]="item.value"-->
-                           <!--(blur)="onBlur($event)"-->
-                           <!--(change)="onChange($event)"-->
-                           <!--(focus)="onFocus($event)"/>-->
-                </td>
-                <td><a [routerLink]="[schema.prefix]">{{schema.id}}</a></td>
-                <td><a [routerLink]="[schema.prefix]">{{schema.namespace}}</a></td>
-                <td><a [routerLink]="[schema.prefix]">{{schema.prefix}}</a></td>
-              </tr>
-            </tbody>
-          </table>
         </div>
-
-      </ds-pagination>
-      <div *ngIf="(metadataSchemas | async)?.payload?.totalElements == 0" class="alert alert-info" role="alert">
-        {{'admin.registries.metadata.schemas.no-items' | translate}}
-      </div>
-
     </div>
-  </div>
 </div>
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
index 2aaf178bde..c525fe625a 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -1,10 +1,13 @@
-import { Component } from '@angular/core';
-import { RegistryService } from '../../../core/registry/registry.service';
-import { Observable } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list';
-import { MetadataSchema } from '../../../core/metadata/metadataschema.model';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import {Component} from '@angular/core';
+import {RegistryService} from '../../../core/registry/registry.service';
+import {Observable} from 'rxjs';
+import {RemoteData} from '../../../core/data/remote-data';
+import {PaginatedList} from '../../../core/data/paginated-list';
+import {MetadataSchema} from '../../../core/metadata/metadataschema.model';
+import {PaginationComponentOptions} from '../../../shared/pagination/pagination-component-options.model';
+import {Store} from "@ngrx/store";
+import {AppState} from "../../../app.reducer";
+import {map} from "rxjs/operators";
 
 @Component({
   selector: 'ds-metadata-registry',
@@ -21,9 +24,6 @@ export class MetadataRegistryComponent {
 
   constructor(private registryService: RegistryService) {
     this.updateSchemas();
-    this.metadataSchemas.subscribe(
-      schemas => console.log(schemas)
-    );
   }
 
   onPageChange(event) {
@@ -35,11 +35,40 @@ export class MetadataRegistryComponent {
     this.metadataSchemas = this.registryService.getMetadataSchemas(this.config);
   }
 
-  editSchema(schema) {
-    console.log("iedemenne");
+  editSchema(schema: MetadataSchema) {
+    this.registryService.editMetadataSchema(schema);
   }
 
-  isActive(schema) {
-    return true;
+  isActive(schema: MetadataSchema): Observable<boolean> {
+    return this.getActiveSchema().pipe(
+      map(activeSchema => schema === activeSchema)
+    );
+  }
+
+  getActiveSchema(): Observable<MetadataSchema> {
+    return this.registryService.getActiveMetadataSchema();
+  }
+
+  selectMetadataSchema(schema: MetadataSchema, event) {
+    event.target.checked ?
+      this.registryService.selectMetadataSchema(schema) :
+      this.registryService.deselectMetadataSchema(schema);
+  }
+
+  isSelected(schema: MetadataSchema): Observable<boolean> {
+    return this.registryService.getSelectedMetadataSchemas().pipe(
+      map(schemas => schemas.find(selectedSchema => selectedSchema == schema) != null)
+    );
+  }
+
+  deleteSchemas() {
+    this.registryService.getSelectedMetadataSchemas().subscribe(
+      schemas => {
+        console.log("metadata schemas to delete: ");
+        for (let schema of schemas) {
+          console.log(schema);
+        }
+      }
+    )
   }
 }
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-registry.effects.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.effects.ts
similarity index 100%
rename from src/app/+admin/admin-registries/metadata-schema/metadata-registry.effects.ts
rename to src/app/+admin/admin-registries/metadata-registry/metadata-registry.effects.ts
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.ts
new file mode 100644
index 0000000000..0e728e8499
--- /dev/null
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.ts
@@ -0,0 +1,94 @@
+import {MetadataSchema} from "../../../core/metadata/metadataschema.model";
+import {
+  MetadataRegistryAction,
+  MetadataRegistryActionTypes,
+  MetadataRegistryDeselectFieldAction,
+  MetadataRegistryDeselectSchemaAction,
+  MetadataRegistryEditFieldAction,
+  MetadataRegistryEditSchemaAction,
+  MetadataRegistrySelectFieldAction,
+  MetadataRegistrySelectSchemaAction
+} from "./metadata-registry.actions";
+import {MetadataField} from "../../../core/metadata/metadatafield.model";
+
+/**
+ * The auth state.
+ * @interface State
+ */
+export interface MetadataRegistryState {
+  editSchema: MetadataSchema;
+  selectedSchemas: MetadataSchema[];
+  editField: MetadataField;
+  selectedFields: MetadataField[];
+}
+
+/**
+ * The initial state.
+ */
+const initialState: MetadataRegistryState = {
+  editSchema: null,
+  selectedSchemas: [],
+  editField: null,
+  selectedFields: []
+};
+
+export function metadataRegistryReducer(state = initialState, action: MetadataRegistryAction): MetadataRegistryState {
+
+  switch (action.type) {
+
+    case MetadataRegistryActionTypes.EDIT_SCHEMA: {
+      return Object.assign({}, state, {
+        editSchema: (action as MetadataRegistryEditSchemaAction).schema
+      });
+    }
+
+    case MetadataRegistryActionTypes.CANCEL_EDIT_SCHEMA: {
+      return Object.assign({}, state, {
+        editSchema: null
+      });
+    }
+
+    case MetadataRegistryActionTypes.SELECT_SCHEMA: {
+      return Object.assign({}, state, {
+        selectedSchemas: [...state.selectedSchemas, (action as MetadataRegistrySelectSchemaAction).schema]
+      });
+    }
+
+    case MetadataRegistryActionTypes.DESELECT_SCHEMA: {
+      return Object.assign({}, state, {
+        selectedSchemas: state.selectedSchemas.filter(
+          selectedSchema => selectedSchema != (action as MetadataRegistryDeselectSchemaAction).schema
+        )
+      });
+    }
+
+    case MetadataRegistryActionTypes.EDIT_FIELD: {
+      return Object.assign({}, state, {
+        editField: (action as MetadataRegistryEditFieldAction).field
+      });
+    }
+
+    case MetadataRegistryActionTypes.CANCEL_EDIT_FIELD: {
+      return Object.assign({}, state, {
+        editField: null
+      });
+    }
+
+    case MetadataRegistryActionTypes.SELECT_FIELD: {
+      return Object.assign({}, state, {
+        selectedFields: [...state.selectedFields, (action as MetadataRegistrySelectFieldAction).field]
+      });
+    }
+
+    case MetadataRegistryActionTypes.DESELECT_FIELD: {
+      return Object.assign({}, state, {
+        selectedFields: state.selectedFields.filter(
+          selectedField => selectedField != (action as MetadataRegistryDeselectFieldAction).field
+        )
+      });
+    }
+
+    default:
+      return state;
+  }
+}
\ No newline at end of file
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
new file mode 100644
index 0000000000..3f87018b74
--- /dev/null
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
@@ -0,0 +1,18 @@
+<div *ngIf="registryService.getActiveMetadataSchema() | async; then editheader; else createHeader"></div>
+
+<ng-template #createHeader>
+    <h4>create metadataschema</h4>
+</ng-template>
+
+<ng-template #editheader>
+    <h4>edit metadataschema</h4>
+</ng-template>
+
+<ds-form [formId]="formId"
+         [formModel]="formModel"
+         [formGroup]="formGroup"
+         [formLayout]="formLayout"
+         (cancel)="onCancel()"
+         (submit)="onSubmit()">
+
+</ds-form>
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema-form/metadata-schema-form.component.spec.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
similarity index 100%
rename from src/app/+admin/admin-registries/metadata-schema/metadata-schema-form/metadata-schema-form.component.spec.ts
rename to src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
new file mode 100644
index 0000000000..54d82170fb
--- /dev/null
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -0,0 +1,112 @@
+import {Component, EventEmitter, OnInit, Output} from '@angular/core';
+import {
+  DynamicFormControlModel,
+  DynamicFormGroupModel,
+  DynamicFormLayout,
+  DynamicInputModel
+} from "@ng-dynamic-forms/core";
+import {MetadataSchema} from "../../../../core/metadata/metadataschema.model";
+import {RegistryService} from "../../../../core/registry/registry.service";
+import {FormService} from "../../../../shared/form/form.service";
+import {FormBuilderService} from "../../../../shared/form/builder/form-builder.service";
+import {FormGroup} from "@angular/forms";
+import {Store} from "@ngrx/store";
+import {AppState} from "../../../../app.reducer";
+
+@Component({
+  selector: 'ds-metadata-schema-form',
+  templateUrl: './metadata-schema-form.component.html',
+  styleUrls: ['./metadata-schema-form.component.css']
+})
+export class MetadataSchemaFormComponent implements OnInit {
+
+  formId: string = 'metadata-schema-form';
+
+  private name: DynamicInputModel = new DynamicInputModel({
+    id: 'name',
+    label: 'name',
+    name: 'name',
+    validators: {
+      required: null,
+      pattern: "^[^ ,_]{1,32}$"
+    },
+    required: true,
+  });
+  private namespace: DynamicInputModel = new DynamicInputModel({
+      id: 'namespace',
+      label: 'namespace',
+      name: 'namespace',
+      validators: {
+        required: null,
+      },
+      required: true,
+    });
+
+  formModel: DynamicFormControlModel[] = [
+    new DynamicFormGroupModel({
+      id: "schema",
+      legend: "schema",
+      group: [
+        this.namespace,
+        this.name
+      ]
+    })
+  ];
+
+  formLayout: DynamicFormLayout = {
+    "name": {
+      grid: {
+        control: 'col col-sm-5',
+        label: 'col col-sm-5'
+      }
+    },
+    "namespace": {
+      grid: {
+        control: 'col col-sm-5',
+        label: 'col col-sm-5'
+      }
+    }
+  };
+
+  formGroup: FormGroup;
+
+  @Output() submitForm: EventEmitter<any> = new EventEmitter();
+
+  constructor(private registryService: RegistryService, private formBuilderService: FormBuilderService, private formService: FormService, private store: Store<AppState>) {
+  }
+
+  ngOnInit() {
+
+    this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
+    this.registryService.getActiveMetadataSchema().subscribe(schema => {
+      this.formGroup.patchValue({
+          schema: {
+            name: schema != null ? schema.prefix : "",
+            namespace: schema != null ? schema.namespace : ""
+          }
+        }
+      );
+    });
+  }
+
+  onCancel() {
+    this.registryService.cancelEditMetadataSchema();
+  }
+
+  onSubmit() {
+    this.registryService.getActiveMetadataSchema().subscribe(
+      schema => {
+
+        if (schema == null) {
+          console.log("metadata field to create:");
+          console.log("prefix: " + this.name.value);
+          console.log("namespace: " + this.namespace.value);
+        } else {
+          console.log("metadata field to update:");
+          console.log("prefix: " + this.name.value);
+          console.log("namespace: " + this.namespace.value);
+        }
+      }
+    );
+  }
+}
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
new file mode 100644
index 0000000000..3d4501e559
--- /dev/null
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
@@ -0,0 +1,18 @@
+<div *ngIf="registryService.getActiveMetadataField() | async; then editheader; else createHeader"></div>
+
+<ng-template #createHeader>
+    <h4>create metadatafield</h4>
+</ng-template>
+
+<ng-template #editheader>
+    <h4>edit metadatafield</h4>
+</ng-template>
+
+<ds-form [formId]="formId"
+         [formModel]="formModel"
+         [formLayout]="formLayout"
+         [formGroup]="formGroup"
+         (cancel)="onCancel()"
+         (submit)="onSubmit()">
+
+</ds-form>
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
new file mode 100644
index 0000000000..124d0ba163
--- /dev/null
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { MetadataFieldFormComponent } from './metadata-field-form.component';
+
+describe('MetadataFieldFormComponent', () => {
+  let component: MetadataFieldFormComponent;
+  let fixture: ComponentFixture<MetadataFieldFormComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ MetadataFieldFormComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(MetadataFieldFormComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
new file mode 100644
index 0000000000..5677f48474
--- /dev/null
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
@@ -0,0 +1,107 @@
+import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
+import {DynamicFormControlModel, DynamicFormGroupModel, DynamicInputModel} from "@ng-dynamic-forms/core";
+import {RegistryService} from "../../../../core/registry/registry.service";
+import {MetadataSchema} from "../../../../core/metadata/metadataschema.model";
+import {FormGroup} from "@angular/forms";
+import {FormBuilderService} from "../../../../shared/form/builder/form-builder.service";
+import {Observable} from "rxjs";
+import {MetadataField} from "../../../../core/metadata/metadatafield.model";
+
+@Component({
+  selector: 'ds-metadata-field-form',
+  templateUrl: './metadata-field-form.component.html',
+  styleUrls: ['./metadata-field-form.component.css']
+})
+export class MetadataFieldFormComponent implements OnInit {
+
+  formId: string = 'metadata-field-form';
+
+  @Input() metadataSchema: MetadataSchema;
+
+  private element: DynamicInputModel = new DynamicInputModel({
+    id: 'element',
+    label: 'element',
+    name: 'element',
+    validators: {
+      required: null,
+    },
+    required: false,
+  });
+  private qualifier: DynamicInputModel = new DynamicInputModel({
+    id: 'qualifier',
+    label: 'qualifier',
+    name: 'qualifier',
+    required: false,
+  });
+  private scopeNote: DynamicInputModel = new DynamicInputModel({
+    id: 'scopeNote',
+    label: 'scopeNote',
+    name: 'scopeNote',
+    required: false,
+  });
+
+  formModel: DynamicFormControlModel[] = [
+    new DynamicFormGroupModel({
+      id: "field",
+      legend: "field",
+      group: [
+        this.element,
+        this.qualifier,
+        this.scopeNote
+      ]
+    })
+  ];
+
+  formGroup: FormGroup;
+
+  @Output() submitForm: EventEmitter<any> = new EventEmitter();
+
+  constructor(private registryService: RegistryService, private formBuilderService: FormBuilderService) {
+  }
+
+  ngOnInit() {
+
+    this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
+    this.registryService.getActiveMetadataField().subscribe(field => {
+      this.formGroup.patchValue({
+          field: {
+            element: field != null ? field.element : "",
+            qualifier: field != null ? field.qualifier : "",
+            scopeNote: field != null ? field.scopeNote : ""
+          }
+        }
+      );
+    });
+  }
+
+  getMetadataField(): Observable<MetadataField> {
+    return this.registryService.getActiveMetadataField();
+  }
+
+  onCancel() {
+    this.registryService.cancelEditMetadataField();
+  }
+
+  onSubmit() {
+    this.registryService.getActiveMetadataField().subscribe(
+      field => {
+
+        if (field == null) {
+          console.log("metadata field to create:");
+          console.log("element: " + this.element.value);
+          if (this.qualifier.value)
+            console.log("qualifier: " + this.qualifier.value);
+          if (this.scopeNote.value)
+            console.log("scopeNote: " + this.scopeNote.value);
+        } else {
+          console.log("metadata field to update:");
+          console.log("element: " + this.element.value);
+          if (this.qualifier.value)
+            console.log("qualifier: " + this.qualifier.value);
+          if (this.scopeNote.value)
+            console.log("scopeNote: " + this.scopeNote.value);
+        }
+      }
+    );
+  }
+}
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-registry.actions.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-registry.actions.ts
deleted file mode 100644
index 65a7da6a45..0000000000
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-registry.actions.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import {Action} from '@ngrx/store';
-import {type} from "../../../shared/ngrx/type";
-import {MetadataSchema} from "../../../core/metadata/metadataschema.model";
-
-/**
- * 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 MetadataRegistryActionTypes = {
-  SELECT: type('dspace/metadata-registry/COLLAPSE'),
-  CANCEL: type('dspace/metadata-registry/EXPAND')
-};
-
-/* tslint:disable:max-classes-per-file */
-/**
- * Used to collapse the sidebar
- */
-export class MetadataRegistrySelectAction implements Action {
-  private registry: MetadataSchema;
-
-  constructor(registry: MetadataSchema) {
-    this.registry = registry;
-  }
-
-  type = MetadataRegistryActionTypes.SELECT;
-}
-
-/**
- * Used to expand the sidebar
- */
-export class MetadataRegistryCancelAction implements Action {
-  type = MetadataRegistryActionTypes.CANCEL;
-}
-
-/* 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
- */
-export type MetadataRegistryAction
-  = MetadataRegistrySelectAction
-  | MetadataRegistryCancelAction
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-registry.reducers.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-registry.reducers.ts
deleted file mode 100644
index 4ee108ac44..0000000000
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-registry.reducers.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import {MetadataSchema} from "../../../core/metadata/metadataschema.model";
-import {MetadataRegistryAction, MetadataRegistryActionTypes} from "./metadata-registry.actions";
-
-/**
- * The auth state.
- * @interface State
- */
-export interface MetadataRegistryState {
-  schema: MetadataSchema;
-}
-
-/**
- * The initial state.
- */
-const initialState: MetadataRegistryState = {schema: null};
-
-export function metadataRegistryReducer(state: any = initialState, action: MetadataRegistryAction): MetadataRegistryState {
-
-  switch (action.type) {
-
-    case MetadataRegistryActionTypes.SELECT: {
-      return Object.assign({}, state, {
-        schema: state.payload
-      });
-    }
-
-    case MetadataRegistryActionTypes.CANCEL: {
-      return Object.assign({}, state, {
-        schema: null
-      });
-    }
-
-    default:
-      return state;
-  }
-}
\ No newline at end of file
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema-form/metadata-schema-form.component.html b/src/app/+admin/admin-registries/metadata-schema/metadata-schema-form/metadata-schema-form.component.html
deleted file mode 100644
index 8b51fc35ae..0000000000
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema-form/metadata-schema-form.component.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<ds-form [formId]="'metadata-schema-form'"
-         [formModel]="formModel"
-         [formLayout]="formLayout"
-         [formGroup]="formGroup"
-         (submit)="onSubmit()">
-
-</ds-form>
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema-form/metadata-schema-form.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema-form/metadata-schema-form.component.ts
deleted file mode 100644
index ddb177443d..0000000000
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema-form/metadata-schema-form.component.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import {Component, EventEmitter, OnInit, Output} from '@angular/core';
-import {
-  DynamicFormControlModel,
-  DynamicFormGroupModel,
-  DynamicFormLayout,
-  DynamicInputModel
-} from "@ng-dynamic-forms/core";
-import {MetadataSchema} from "../../../../core/metadata/metadataschema.model";
-import {FormBuilderService} from "../../../../shared/form/builder/form-builder.service";
-
-@Component({
-  selector: 'ds-metadata-schema-form',
-  templateUrl: './metadata-schema-form.component.html',
-  styleUrls: ['./metadata-schema-form.component.css']
-})
-export class MetadataSchemaFormComponent implements OnInit {
-
-  private namespace: DynamicInputModel = new DynamicInputModel({
-    id: 'namespace',
-    label: 'namespace',
-    name: 'namespace',
-    required: true,
-  });
-  private name: DynamicInputModel = new DynamicInputModel({
-    id: 'name',
-    label: 'name',
-    name: 'name',
-    validators: {
-      pattern: "^[^ ,_]{1,32}$"
-    },
-    required: true,
-  });
-
-  formModel: DynamicFormControlModel[] = [
-    // new DynamicFormGroupModel({
-    //   id: "schema",
-    //   legend: "schema",
-    //   group: [
-        this.namespace,
-        this.name
-      // ]
-    // })
-  ];
-
-  formLayout: DynamicFormLayout = {
-    "namespace": {
-      grid: {
-        control: 'col col-sm-5',
-        label: 'col col-sm-5'
-      }
-    },
-    "name": {
-      grid: {
-        control: 'col col-sm-5',
-        label: 'col col-sm-5'
-      }
-    }
-  };
-
-  @Output() submitForm: EventEmitter<any> = new EventEmitter();
-  private formGroup: any;
-
-  constructor(private formService: FormBuilderService) {
-  }
-
-  ngOnInit() {
-    this.formGroup = this.formService.createFormGroup(this.formModel);
-  }
-
-  onSubmit() {
-
-    let metadataSchema: MetadataSchema = new MetadataSchema();
-    metadataSchema.namespace = this.namespace.value + "";
-    this.submitForm.emit(metadataSchema);
-  }
-}
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
index db36b6a1d1..1e422bc381 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
@@ -6,6 +6,8 @@
 
       <p id="description" class="pb-2">{{'admin.registries.schema.description' | translate:namespace }}</p>
 
+      <ds-metadata-field-form [metadataSchema]="metadataSchema | async"></ds-metadata-field-form>
+
       <h3>{{'admin.registries.schema.fields.head' | translate}}</h3>
 
       <ds-pagination
@@ -20,12 +22,20 @@
           <table id="metadata-fields" class="table table-striped table-hover">
             <thead>
               <tr>
+                <th></th>
                 <th scope="col">{{'admin.registries.schema.fields.table.field' | translate}}</th>
                 <th scope="col">{{'admin.registries.schema.fields.table.scopenote' | translate}}</th>
               </tr>
             </thead>
             <tbody>
-              <tr *ngFor="let field of (metadataFields | async)?.payload?.page">
+              <tr *ngFor="let field of (metadataFields | async)?.payload?.page" (click)="editField(field)">
+                <td>
+                  <label>
+                    <input type="checkbox"
+                           [checked]="isSelected(field) | async"
+                           (change)="selectMetadataField(field, $event)">
+                  </label>
+                </td>
                 <td>{{(metadataSchema | async)?.payload?.prefix}}.{{field.element}}<label *ngIf="field.qualifier">.</label>{{field.qualifier}}</td>
                 <td>{{field.scopeNote}}</td>
               </tr>
@@ -33,6 +43,10 @@
           </table>
         </div>
       </ds-pagination>
+
+      <button type="submit" class="btn btn-primary" (click)="deleteFields()">{{'form.submit' | translate}}
+      </button>
+
       <div *ngIf="(metadataFields | async)?.payload?.totalElements == 0" class="alert alert-info" role="alert">
         {{'admin.registries.schema.fields.no-items' | translate}}
       </div>
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
index 888c3013e7..4d73d58e32 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
@@ -1,13 +1,13 @@
-import { Component, OnInit } from '@angular/core';
-import { RegistryService } from '../../../core/registry/registry.service';
-import { ActivatedRoute } from '@angular/router';
-import { Observable } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list';
-import { MetadataField } from '../../../core/metadata/metadatafield.model';
-import { MetadataSchema } from '../../../core/metadata/metadataschema.model';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { SortOptions } from '../../../core/cache/models/sort-options.model';
+import {Component, OnInit} from '@angular/core';
+import {RegistryService} from '../../../core/registry/registry.service';
+import {ActivatedRoute} from '@angular/router';
+import {Observable} from 'rxjs';
+import {RemoteData} from '../../../core/data/remote-data';
+import {PaginatedList} from '../../../core/data/paginated-list';
+import {MetadataField} from '../../../core/metadata/metadatafield.model';
+import {MetadataSchema} from '../../../core/metadata/metadataschema.model';
+import {PaginationComponentOptions} from '../../../shared/pagination/pagination-component-options.model';
+import {map} from "rxjs/operators";
 
 @Component({
   selector: 'ds-metadata-schema',
@@ -53,4 +53,40 @@ export class MetadataSchemaComponent implements OnInit {
     });
   }
 
+  editField(field: MetadataField) {
+    this.registryService.editMetadataField(field);
+  }
+
+  isActive(field: MetadataField): Observable<boolean> {
+    return this.getActiveField().pipe(
+      map(activeField => field === activeField)
+    );
+  }
+
+  getActiveField(): Observable<MetadataField> {
+    return this.registryService.getActiveMetadataField();
+  }
+
+  selectMetadataField(field: MetadataField, event) {
+    event.target.checked ?
+      this.registryService.selectMetadataField(field) :
+      this.registryService.deselectMetadataField(field);
+  }
+
+  isSelected(field: MetadataField): Observable<boolean> {
+    return this.registryService.getSelectedMetadataFields().pipe(
+      map(fields => fields.find(selectedField => selectedField == field) != null)
+    );
+  }
+
+  deleteFields() {
+    this.registryService.getSelectedMetadataFields().subscribe(
+      fields => {
+        console.log("metadata fields to delete: ");
+        for (let field of fields) {
+          console.log(field);
+        }
+      }
+    )
+  }
 }
diff --git a/src/app/app.reducer.ts b/src/app/app.reducer.ts
index 6208ae9bf1..f8931c2af0 100644
--- a/src/app/app.reducer.ts
+++ b/src/app/app.reducer.ts
@@ -17,7 +17,7 @@ import { truncatableReducer, TruncatablesState } from './shared/truncatable/trun
 import {
   metadataRegistryReducer,
   MetadataRegistryState
-} from "./+admin/admin-registries/metadata-schema/metadata-registry.reducers";
+} from "./+admin/admin-registries/metadata-registry/metadata-registry.reducers";
 
 export interface AppState {
   router: fromRouter.RouterReducerState;
diff --git a/src/app/core/auth/authenticated.guard.ts b/src/app/core/auth/authenticated.guard.ts
index b9091a86ad..49ada7e735 100644
--- a/src/app/core/auth/authenticated.guard.ts
+++ b/src/app/core/auth/authenticated.guard.ts
@@ -3,7 +3,7 @@ import {take} from 'rxjs/operators';
 import { Injectable } from '@angular/core';
 import { ActivatedRouteSnapshot, CanActivate, CanLoad, Route, Router, RouterStateSnapshot } from '@angular/router';
 
-import { Observable } from 'rxjs';
+import {Observable, of} from 'rxjs';
 import { select, Store } from '@ngrx/store';
 
 // reducers
@@ -54,7 +54,7 @@ export class AuthenticatedGuard implements CanActivate, CanLoad {
 
   private handleAuth(url: string): Observable<boolean> {
     // get observable
-    const observable = this.store.pipe(select(isAuthenticated));
+    const observable = of(true);
 
     // redirect to sign in page if user is not authenticated
     observable.pipe(
diff --git a/src/app/core/cache/models/normalized-object-factory.ts b/src/app/core/cache/models/normalized-object-factory.ts
index 5c5ebf50aa..468a2b050d 100644
--- a/src/app/core/cache/models/normalized-object-factory.ts
+++ b/src/app/core/cache/models/normalized-object-factory.ts
@@ -10,6 +10,7 @@ import { NormalizedBitstreamFormat } from './normalized-bitstream-format.model';
 import { NormalizedResourcePolicy } from './normalized-resource-policy.model';
 import { NormalizedEPerson } from '../../eperson/models/normalized-eperson.model';
 import { NormalizedGroup } from '../../eperson/models/normalized-group.model';
+import {NormalizedMetadataSchema} from "../../metadata/normalized-metadata-schema.model";
 
 export class NormalizedObjectFactory {
   public static getConstructor(type: ResourceType): GenericConstructor<NormalizedObject> {
@@ -41,6 +42,12 @@ export class NormalizedObjectFactory {
       case ResourceType.Group: {
         return NormalizedGroup
       }
+      case ResourceType.MetadataSchema: {
+        return NormalizedMetadataSchema
+      }
+      case ResourceType.MetadataField: {
+        return NormalizedGroup
+      }
       default: {
         return undefined;
       }
diff --git a/src/app/core/cache/response.models.ts b/src/app/core/cache/response.models.ts
index 34fc22bb0a..168bbe6f4d 100644
--- a/src/app/core/cache/response.models.ts
+++ b/src/app/core/cache/response.models.ts
@@ -1,15 +1,15 @@
-import { SearchQueryResponse } from '../../+search-page/search-service/search-query-response.model';
-import { RequestError } from '../data/request.models';
-import { PageInfo } from '../shared/page-info.model';
-import { ConfigObject } from '../shared/config/config.model';
-import { FacetValue } from '../../+search-page/search-service/facet-value.model';
-import { SearchFilterConfig } from '../../+search-page/search-service/search-filter-config.model';
-import { IntegrationModel } from '../integration/models/integration.model';
-import { RegistryMetadataschemasResponse } from '../registry/registry-metadataschemas-response.model';
-import { MetadataSchema } from '../metadata/metadataschema.model';
-import { RegistryMetadatafieldsResponse } from '../registry/registry-metadatafields-response.model';
-import { RegistryBitstreamformatsResponse } from '../registry/registry-bitstreamformats-response.model';
-import { AuthStatus } from '../auth/models/auth-status.model';
+import {SearchQueryResponse} from '../../+search-page/search-service/search-query-response.model';
+import {RequestError} from '../data/request.models';
+import {PageInfo} from '../shared/page-info.model';
+import {ConfigObject} from '../shared/config/config.model';
+import {FacetValue} from '../../+search-page/search-service/facet-value.model';
+import {SearchFilterConfig} from '../../+search-page/search-service/search-filter-config.model';
+import {IntegrationModel} from '../integration/models/integration.model';
+import {RegistryMetadataschemasResponse} from '../registry/registry-metadataschemas-response.model';
+import {RegistryMetadatafieldsResponse} from '../registry/registry-metadatafields-response.model';
+import {RegistryBitstreamformatsResponse} from '../registry/registry-bitstreamformats-response.model';
+import {AuthStatus} from '../auth/models/auth-status.model';
+import {MetadataSchema} from "../metadata/metadataschema.model";
 
 /* tslint:disable:max-classes-per-file */
 export class RestResponse {
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index dcbdbd0049..65484d68aa 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -56,7 +56,6 @@ import { FacetValueMapResponseParsingService } from './data/facet-value-map-resp
 import { FacetConfigResponseParsingService } from './data/facet-config-response-parsing.service';
 import { RegistryService } from './registry/registry.service';
 import { RegistryMetadataschemasResponseParsingService } from './data/registry-metadataschemas-response-parsing.service';
-import { MetadataschemaParsingService } from './data/metadataschema-parsing.service';
 import { RegistryMetadatafieldsResponseParsingService } from './data/registry-metadatafields-response-parsing.service';
 import { RegistryBitstreamformatsResponseParsingService } from './data/registry-bitstreamformats-response-parsing.service';
 import { NotificationsService } from '../shared/notifications/notifications.service';
@@ -108,7 +107,6 @@ const PROVIDERS = [
   RegistryMetadataschemasResponseParsingService,
   RegistryMetadatafieldsResponseParsingService,
   RegistryBitstreamformatsResponseParsingService,
-  MetadataschemaParsingService,
   DebugResponseParsingService,
   SearchResponseParsingService,
   ServerResponseService,
diff --git a/src/app/core/data/metadata-schema-data.service.ts b/src/app/core/data/metadata-schema-data.service.ts
new file mode 100644
index 0000000000..c25e4cc789
--- /dev/null
+++ b/src/app/core/data/metadata-schema-data.service.ts
@@ -0,0 +1,46 @@
+import {distinctUntilChanged, filter, map, tap} from 'rxjs/operators';
+import {Injectable} from '@angular/core';
+import {Store} from '@ngrx/store';
+import {Observable} from 'rxjs';
+import {isNotEmpty} from '../../shared/empty.util';
+import {BrowseService} from '../browse/browse.service';
+import {RemoteDataBuildService} from '../cache/builders/remote-data-build.service';
+import {CoreState} from '../core.reducers';
+import {URLCombiner} from '../url-combiner/url-combiner';
+
+import {DataService} from './data.service';
+import {RequestService} from './request.service';
+import {HALEndpointService} from '../shared/hal-endpoint.service';
+import {FindAllOptions, GetRequest, RestRequest} from './request.models';
+import {ObjectCacheService} from '../cache/object-cache.service';
+import {MetadataSchema} from "../metadata/metadataschema.model";
+import {NormalizedMetadataSchema} from "../metadata/normalized-metadata-schema.model";
+import {GenericConstructor} from "../shared/generic-constructor";
+import {ResponseParsingService} from "./parsing.service";
+import {RegistryMetadatafieldsResponseParsingService} from "./registry-metadatafields-response-parsing.service";
+
+@Injectable()
+export class MetadataSchemaDataService extends DataService<NormalizedMetadataSchema, MetadataSchema> {
+  protected linkPath = 'metadataschemas';
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    private bs: BrowseService,
+    protected halService: HALEndpointService,
+    protected objectCache: ObjectCacheService) {
+    super();
+  }
+
+  /**
+   * Get the endpoint for browsing metadataschemas
+   * @param {FindAllOptions} options
+   * @returns {Observable<string>}
+   */
+  public getBrowseEndpoint(options: FindAllOptions = {}, linkPath: string = this.linkPath): Observable<string> {
+
+    return null;
+  }
+
+}
diff --git a/src/app/core/metadata/normalized-metadata-schema.model.ts b/src/app/core/metadata/normalized-metadata-schema.model.ts
new file mode 100644
index 0000000000..73a64bc1ab
--- /dev/null
+++ b/src/app/core/metadata/normalized-metadata-schema.model.ts
@@ -0,0 +1,21 @@
+import {autoserialize} from 'cerialize';
+import {NormalizedObject} from "../cache/models/normalized-object.model";
+import {mapsTo} from "../cache/builders/build-decorators";
+import {CacheableObject} from "../cache/object-cache.reducer";
+import {ListableObject} from "../../shared/object-collection/shared/listable-object.model";
+import {MetadataSchema} from "./metadataschema.model";
+
+@mapsTo(MetadataSchema)
+export class NormalizedMetadataSchema extends NormalizedObject  implements CacheableObject, ListableObject {
+  @autoserialize
+  id: number;
+
+  @autoserialize
+  self: string;
+
+  @autoserialize
+  prefix: string;
+
+  @autoserialize
+  namespace: string;
+}
diff --git a/src/app/core/registry/registry.service.ts b/src/app/core/registry/registry.service.ts
index c371471e76..d6c646a5f5 100644
--- a/src/app/core/registry/registry.service.ts
+++ b/src/app/core/registry/registry.service.ts
@@ -6,7 +6,6 @@ import {PageInfo} from '../shared/page-info.model';
 import {MetadataSchema} from '../metadata/metadataschema.model';
 import {MetadataField} from '../metadata/metadatafield.model';
 import {BitstreamFormat} from './mock-bitstream-format.model';
-import {flatMap, map, tap} from 'rxjs/operators';
 import {GetRequest, RestRequest} from '../data/request.models';
 import {GenericConstructor} from '../shared/generic-constructor';
 import {ResponseParsingService} from '../data/parsing.service';
@@ -30,11 +29,24 @@ import {RegistryBitstreamformatsResponse} from './registry-bitstreamformats-resp
 import {getResponseFromEntry} from '../shared/operators';
 import {createSelector, select, Store} from "@ngrx/store";
 import {AppState} from "../../app.reducer";
-import {MetadataRegistryState} from "../../+admin/admin-registries/metadata-schema/metadata-registry.reducers";
-import {MetadataRegistrySelectAction} from "../../+admin/admin-registries/metadata-schema/metadata-registry.actions";
+import {MetadataRegistryState} from "../../+admin/admin-registries/metadata-registry/metadata-registry.reducers";
+import {
+  MetadataRegistryCancelFieldAction,
+  MetadataRegistryCancelSchemaAction,
+  MetadataRegistryDeselectFieldAction,
+  MetadataRegistryDeselectSchemaAction,
+  MetadataRegistryEditFieldAction,
+  MetadataRegistryEditSchemaAction,
+  MetadataRegistrySelectFieldAction,
+  MetadataRegistrySelectSchemaAction
+} from "../../+admin/admin-registries/metadata-registry/metadata-registry.actions";
+import {flatMap, map, tap} from "rxjs/operators";
 
 const metadataRegistryStateSelector = (state: AppState) => state.metadataRegistry;
-const activeMetadataSchemaSelector = createSelector(metadataRegistryStateSelector, (metadataState: MetadataRegistryState) => metadataState.schema);
+const editMetadataSchemaSelector = createSelector(metadataRegistryStateSelector, (metadataState: MetadataRegistryState) => metadataState.editSchema);
+const selectedMetadataSchemasSelector = createSelector(metadataRegistryStateSelector, (metadataState: MetadataRegistryState) => metadataState.selectedSchemas);
+const editMetadataFieldSelector = createSelector(metadataRegistryStateSelector, (metadataState: MetadataRegistryState) => metadataState.editField);
+const selectedMetadataFieldsSelector = createSelector(metadataRegistryStateSelector, (metadataState: MetadataRegistryState) => metadataState.selectedFields);
 
 @Injectable()
 export class RegistryService {
@@ -166,7 +178,7 @@ export class RegistryService {
     return this.rdb.toRemoteDataObservable(requestEntryObs, payloadObs);
   }
 
-  private getMetadataSchemasRequestObs(pagination: PaginationComponentOptions): Observable<RestRequest> {
+  public getMetadataSchemasRequestObs(pagination: PaginationComponentOptions): Observable<RestRequest> {
     return this.halService.getEndpoint(this.metadataSchemasPath).pipe(
       map((url: string) => {
         const args: string[] = [];
@@ -229,14 +241,92 @@ export class RegistryService {
   }
 
   public editMetadataSchema(schema: MetadataSchema) {
-    this.store.dispatch(new MetadataRegistrySelectAction(schema));
+    this.store.dispatch(new MetadataRegistryEditSchemaAction(schema));
   }
 
-  public getActiveMetadataSchema(schema: MetadataSchema): Observable<MetadataSchema> {
-    return this.store.pipe(select(activeMetadataSchemaSelector));
+  public cancelEditMetadataSchema() {
+    this.store.dispatch(new MetadataRegistryCancelSchemaAction());
   }
 
-  // public createMetadataSchema(schema: MetadataSchema): MetadataSchema {
+  public getActiveMetadataSchema(): Observable<MetadataSchema> {
+    return this.store.pipe(select(editMetadataSchemaSelector));
+  }
+
+  public selectMetadataSchema(schema: MetadataSchema) {
+    this.store.dispatch(new MetadataRegistrySelectSchemaAction(schema))
+  }
+
+  public deselectMetadataSchema(schema: MetadataSchema) {
+    this.store.dispatch(new MetadataRegistryDeselectSchemaAction(schema))
+  }
+
+  public getSelectedMetadataSchemas(): Observable<MetadataSchema[]> {
+    return this.store.pipe(select(selectedMetadataSchemasSelector));
+  }
+
+  public editMetadataField(field: MetadataField) {
+    this.store.dispatch(new MetadataRegistryEditFieldAction(field));
+  }
+
+  public cancelEditMetadataField() {
+    this.store.dispatch(new MetadataRegistryCancelFieldAction());
+  }
+
+  public getActiveMetadataField(): Observable<MetadataField> {
+    return this.store.pipe(select(editMetadataFieldSelector));
+  }
+
+  public selectMetadataField(field: MetadataField) {
+    this.store.dispatch(new MetadataRegistrySelectFieldAction(field))
+  }
+
+  public deselectMetadataField(field: MetadataField) {
+    this.store.dispatch(new MetadataRegistryDeselectFieldAction(field))
+  }
+
+  public getSelectedMetadataFields(): Observable<MetadataField[]> {
+    return this.store.pipe(select(selectedMetadataFieldsSelector));
+  }
+
+  // public createMetadataSchema(schema: MetadataSchema): Observable<RemoteData<MetadataSchema>> {
+  //   const requestId = this.requestService.generateRequestId();
+  //   const endpoint$ = this.halService.getEndpoint(this.metadataSchemasPath).pipe(
+  //     isNotEmptyOperator(),
+  //     distinctUntilChanged()
+  //   );
   //
+  //   const serializedDso = new DSpaceRESTv2Serializer(NormalizedObjectFactory.getConstructor(MetadataSchema.type)).serialize(normalizedObject);
+  //
+  //   const request$ = endpoint$.pipe(
+  //     take(1),
+  //     map((endpoint: string) => new CreateRequest(requestId, endpoint, JSON.stringify(serializedDso)))
+  //   );
+  //
+  //   // Execute the post request
+  //   request$.pipe(
+  //     configureRequest(this.requestService)
+  //   ).subscribe();
+  //
+  //   // Resolve self link for new object
+  //   const selfLink$ = this.requestService.getByUUID(requestId).pipe(
+  //     getResponseFromEntry(),
+  //     map((response: RestResponse) => {
+  //       if (!response.isSuccessful && response instanceof ErrorResponse) {
+  //         this.notificationsService.error('Server Error:', response.errorMessage, new NotificationOptions(-1));
+  //       } else {
+  //         return response;
+  //       }
+  //     }),
+  //     map((response: any) => {
+  //       if (isNotEmpty(response.resourceSelfLinks)) {
+  //         return response.resourceSelfLinks[0];
+  //       }
+  //     }),
+  //     distinctUntilChanged()
+  //   ) as Observable<string>;
+  //
+  //   return selfLink$.pipe(
+  //     switchMap((selfLink: string) => this.findByHref(selfLink)),
+  //   )
   // }
 }
diff --git a/src/app/core/shared/resource-type.ts b/src/app/core/shared/resource-type.ts
index e67f3339de..88ffa3386e 100644
--- a/src/app/core/shared/resource-type.ts
+++ b/src/app/core/shared/resource-type.ts
@@ -8,5 +8,7 @@ export enum ResourceType {
   Community = 'community',
   EPerson = 'eperson',
   Group = 'group',
-  ResourcePolicy = 'resourcePolicy'
+  ResourcePolicy = 'resourcePolicy',
+  MetadataSchema = 'metadataschema',
+  MetadataField = 'metadatafield'
 }
diff --git a/src/app/shared/form/form.component.ts b/src/app/shared/form/form.component.ts
index 2d74ddf8d4..b59d9969ce 100644
--- a/src/app/shared/form/form.component.ts
+++ b/src/app/shared/form/form.component.ts
@@ -69,6 +69,12 @@ export class FormComponent implements OnDestroy, OnInit {
   @Output() addArrayItem: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
   @Output() removeArrayItem: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
 
+  /**
+   * An event fired when form is valid and submitted .
+   * Event's payload equals to the form content.
+   */
+  @Output() cancel: EventEmitter<Observable<any>> = new EventEmitter<Observable<any>>();
+
   /**
    * An event fired when form is valid and submitted .
    * Event's payload equals to the form content.
@@ -130,7 +136,9 @@ export class FormComponent implements OnDestroy, OnInit {
 
     } else {
       this.formModel.forEach((model) => {
-        this.formBuilderService.addFormGroupControl(this.formGroup, this.parentFormModel, model);
+        if (this.parentFormModel) {
+          this.formBuilderService.addFormGroupControl(this.formGroup, this.parentFormModel, model);
+        }
       });
     }
 
@@ -229,9 +237,10 @@ export class FormComponent implements OnDestroy, OnInit {
   private keepSync(): void {
     this.subs.push(this.formService.getFormData(this.formId)
       .subscribe((stateFormData) => {
-        if (!Object.is(stateFormData, this.formGroup.value) && this.formGroup) {
-          this.formGroup.setValue(stateFormData);
-        }
+        // if (!Object.is(stateFormData, this.formGroup.value) && this.formGroup) {
+        //   this.formGroup.setValue(stateFormData);
+        console.log(stateFormData);
+        // }
       }));
   }
 
@@ -275,6 +284,7 @@ export class FormComponent implements OnDestroy, OnInit {
    */
   reset(): void {
     this.formGroup.reset();
+    this.cancel.emit();
   }
 
   isItemReadOnly(arrayContext: DynamicFormArrayModel, index: number): boolean {

From 52a440c9f2e9ea9fb5487aaef749aecaa01d8b3e Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Mon, 21 Jan 2019 12:32:55 +0100
Subject: [PATCH 05/44] 58789: TSLint error fixing

---
 .../admin-registries.module.ts                |  2 +-
 .../metadata-registry.actions.ts              | 18 +++---
 .../metadata-registry.component.ts            | 28 ++++-----
 .../metadata-registry.effects.ts              | 10 +--
 .../metadata-registry.reducers.ts             | 12 ++--
 .../metadata-schema-form.component.ts         | 49 +++++++--------
 .../metadata-field-form.component.ts          | 62 ++++++++++---------
 .../metadata-schema.component.ts              | 34 +++++-----
 src/app/+admin/admin-routing.module.ts        |  8 ++-
 .../community-page.component.ts               |  6 --
 src/app/app.reducer.ts                        |  2 +-
 .../cache/models/normalized-object-factory.ts |  2 +-
 src/app/core/cache/response.models.ts         | 24 +++----
 src/app/core/config/config.service.spec.ts    |  1 -
 .../core/data/metadata-schema-data.service.ts | 32 ++++------
 .../integration/integration.service.spec.ts   |  2 +-
 .../normalized-metadata-schema.model.ts       | 14 ++---
 src/app/core/registry/registry.service.ts     | 62 +++++++++----------
 src/app/shared/testing/utils.ts               |  2 +-
 19 files changed, 181 insertions(+), 189 deletions(-)

diff --git a/src/app/+admin/admin-registries/admin-registries.module.ts b/src/app/+admin/admin-registries/admin-registries.module.ts
index 18fc44f620..c7890e6697 100644
--- a/src/app/+admin/admin-registries/admin-registries.module.ts
+++ b/src/app/+admin/admin-registries/admin-registries.module.ts
@@ -8,7 +8,7 @@ import { TranslateModule } from '@ngx-translate/core';
 import { BitstreamFormatsComponent } from './bitstream-formats/bitstream-formats.component';
 import { SharedModule } from '../../shared/shared.module';
 import { MetadataSchemaFormComponent } from './metadata-registry/metadata-schema-form/metadata-schema-form.component';
-import {MetadataFieldFormComponent} from "./metadata-schema/metadata-field-form/metadata-field-form.component";
+import {MetadataFieldFormComponent} from './metadata-schema/metadata-field-form/metadata-field-form.component';
 
 @NgModule({
   imports: [
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.actions.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.actions.ts
index 23493c3d21..55fcd61644 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.actions.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.actions.ts
@@ -1,7 +1,7 @@
-import {Action} from '@ngrx/store';
-import {type} from "../../../shared/ngrx/type";
-import {MetadataSchema} from "../../../core/metadata/metadataschema.model";
-import {MetadataField} from "../../../core/metadata/metadatafield.model";
+import { Action } from '@ngrx/store';
+import { type } from '../../../shared/ngrx/type';
+import { MetadataSchema } from '../../../core/metadata/metadataschema.model';
+import { MetadataField } from '../../../core/metadata/metadatafield.model';
 
 /**
  * For each action type in an action group, make a simple
@@ -12,16 +12,16 @@ import {MetadataField} from "../../../core/metadata/metadatafield.model";
  * action types in the application are unique.
  */
 export const MetadataRegistryActionTypes = {
-  
+
   EDIT_SCHEMA: type('dspace/metadata-registry/EDIT_SCHEMA'),
   CANCEL_EDIT_SCHEMA: type('dspace/metadata-registry/CANCEL_SCHEMA'),
   SELECT_SCHEMA: type('dspace/metadata-registry/SELECT_SCHEMA'),
   DESELECT_SCHEMA: type('dspace/metadata-registry/DESELECT_SCHEMA'),
 
-  EDIT_FIELD : type('dspace/metadata-registry/EDIT_FIELD'),
-  CANCEL_EDIT_FIELD : type('dspace/metadata-registry/CANCEL_FIELD'),
-  SELECT_FIELD : type('dspace/metadata-registry/SELECT_FIELD'),
-  DESELECT_FIELD : type('dspace/metadata-registry/DESELEC_FIELDT')
+  EDIT_FIELD: type('dspace/metadata-registry/EDIT_FIELD'),
+  CANCEL_EDIT_FIELD: type('dspace/metadata-registry/CANCEL_FIELD'),
+  SELECT_FIELD: type('dspace/metadata-registry/SELECT_FIELD'),
+  DESELECT_FIELD: type('dspace/metadata-registry/DESELEC_FIELDT')
 };
 
 /* tslint:disable:max-classes-per-file */
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
index c525fe625a..a1158c4cd7 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -1,13 +1,11 @@
-import {Component} from '@angular/core';
-import {RegistryService} from '../../../core/registry/registry.service';
-import {Observable} from 'rxjs';
-import {RemoteData} from '../../../core/data/remote-data';
-import {PaginatedList} from '../../../core/data/paginated-list';
-import {MetadataSchema} from '../../../core/metadata/metadataschema.model';
-import {PaginationComponentOptions} from '../../../shared/pagination/pagination-component-options.model';
-import {Store} from "@ngrx/store";
-import {AppState} from "../../../app.reducer";
-import {map} from "rxjs/operators";
+import { Component } from '@angular/core';
+import { RegistryService } from '../../../core/registry/registry.service';
+import { Observable } from 'rxjs';
+import { RemoteData } from '../../../core/data/remote-data';
+import { PaginatedList } from '../../../core/data/paginated-list';
+import { MetadataSchema } from '../../../core/metadata/metadataschema.model';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { map } from 'rxjs/operators';
 
 @Component({
   selector: 'ds-metadata-registry',
@@ -41,7 +39,7 @@ export class MetadataRegistryComponent {
 
   isActive(schema: MetadataSchema): Observable<boolean> {
     return this.getActiveSchema().pipe(
-      map(activeSchema => schema === activeSchema)
+      map((activeSchema) => schema === activeSchema)
     );
   }
 
@@ -57,15 +55,15 @@ export class MetadataRegistryComponent {
 
   isSelected(schema: MetadataSchema): Observable<boolean> {
     return this.registryService.getSelectedMetadataSchemas().pipe(
-      map(schemas => schemas.find(selectedSchema => selectedSchema == schema) != null)
+      map((schemas) => schemas.find((selectedSchema) => selectedSchema === schema) != null)
     );
   }
 
   deleteSchemas() {
     this.registryService.getSelectedMetadataSchemas().subscribe(
-      schemas => {
-        console.log("metadata schemas to delete: ");
-        for (let schema of schemas) {
+      (schemas) => {
+        console.log('metadata schemas to delete: ');
+        for (const schema of schemas) {
           console.log(schema);
         }
       }
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.effects.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.effects.ts
index c02d9bcda1..32aa2d27d7 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.effects.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.effects.ts
@@ -1,12 +1,12 @@
 /**
  * Makes sure that if the user navigates to another route, the sidebar is collapsed
  */
-import {Injectable} from "@angular/core";
-import {Actions, Effect, ofType} from "@ngrx/effects";
-import {filter, map, tap} from "rxjs/operators";
-import {SearchSidebarCollapseAction} from "../../../+search-page/search-sidebar/search-sidebar.actions";
+import { Injectable } from '@angular/core';
+import { Actions, Effect, ofType } from '@ngrx/effects';
+import { filter, map, tap } from 'rxjs/operators';
+import { SearchSidebarCollapseAction } from '../../../+search-page/search-sidebar/search-sidebar.actions';
 import * as fromRouter from '@ngrx/router-store';
-import {URLBaser} from "../../../core/url-baser/url-baser";
+import { URLBaser } from '../../../core/url-baser/url-baser';
 
 @Injectable()
 export class SearchSidebarEffects {
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.ts
index 0e728e8499..28f8ba025b 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.ts
@@ -1,4 +1,4 @@
-import {MetadataSchema} from "../../../core/metadata/metadataschema.model";
+import { MetadataSchema } from '../../../core/metadata/metadataschema.model';
 import {
   MetadataRegistryAction,
   MetadataRegistryActionTypes,
@@ -8,8 +8,8 @@ import {
   MetadataRegistryEditSchemaAction,
   MetadataRegistrySelectFieldAction,
   MetadataRegistrySelectSchemaAction
-} from "./metadata-registry.actions";
-import {MetadataField} from "../../../core/metadata/metadatafield.model";
+} from './metadata-registry.actions';
+import { MetadataField } from '../../../core/metadata/metadatafield.model';
 
 /**
  * The auth state.
@@ -57,7 +57,7 @@ export function metadataRegistryReducer(state = initialState, action: MetadataRe
     case MetadataRegistryActionTypes.DESELECT_SCHEMA: {
       return Object.assign({}, state, {
         selectedSchemas: state.selectedSchemas.filter(
-          selectedSchema => selectedSchema != (action as MetadataRegistryDeselectSchemaAction).schema
+          (selectedSchema) => selectedSchema !== (action as MetadataRegistryDeselectSchemaAction).schema
         )
       });
     }
@@ -83,7 +83,7 @@ export function metadataRegistryReducer(state = initialState, action: MetadataRe
     case MetadataRegistryActionTypes.DESELECT_FIELD: {
       return Object.assign({}, state, {
         selectedFields: state.selectedFields.filter(
-          selectedField => selectedField != (action as MetadataRegistryDeselectFieldAction).field
+          (selectedField) => selectedField !== (action as MetadataRegistryDeselectFieldAction).field
         )
       });
     }
@@ -91,4 +91,4 @@ export function metadataRegistryReducer(state = initialState, action: MetadataRe
     default:
       return state;
   }
-}
\ No newline at end of file
+}
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
index 54d82170fb..551e249d41 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -4,23 +4,22 @@ import {
   DynamicFormGroupModel,
   DynamicFormLayout,
   DynamicInputModel
-} from "@ng-dynamic-forms/core";
-import {MetadataSchema} from "../../../../core/metadata/metadataschema.model";
-import {RegistryService} from "../../../../core/registry/registry.service";
-import {FormService} from "../../../../shared/form/form.service";
-import {FormBuilderService} from "../../../../shared/form/builder/form-builder.service";
-import {FormGroup} from "@angular/forms";
-import {Store} from "@ngrx/store";
-import {AppState} from "../../../../app.reducer";
+} from '@ng-dynamic-forms/core';
+import { FormGroup } from '@angular/forms';
+import { RegistryService } from '../../../../core/registry/registry.service';
+import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
+import { FormService } from '../../../../shared/form/form.service';
+import { Store } from '@ngrx/store';
+import { AppState } from '../../../../app.reducer';
 
 @Component({
   selector: 'ds-metadata-schema-form',
   templateUrl: './metadata-schema-form.component.html',
-  styleUrls: ['./metadata-schema-form.component.css']
+  // styleUrls: ['./metadata-schema-form.component.css']
 })
 export class MetadataSchemaFormComponent implements OnInit {
 
-  formId: string = 'metadata-schema-form';
+  formId = 'metadata-schema-form';
 
   private name: DynamicInputModel = new DynamicInputModel({
     id: 'name',
@@ -28,7 +27,7 @@ export class MetadataSchemaFormComponent implements OnInit {
     name: 'name',
     validators: {
       required: null,
-      pattern: "^[^ ,_]{1,32}$"
+      pattern: '^[^ ,_]{1,32}$'
     },
     required: true,
   });
@@ -44,8 +43,8 @@ export class MetadataSchemaFormComponent implements OnInit {
 
   formModel: DynamicFormControlModel[] = [
     new DynamicFormGroupModel({
-      id: "schema",
-      legend: "schema",
+      id: 'schema',
+      legend: 'schema',
       group: [
         this.namespace,
         this.name
@@ -54,13 +53,13 @@ export class MetadataSchemaFormComponent implements OnInit {
   ];
 
   formLayout: DynamicFormLayout = {
-    "name": {
+    name: {
       grid: {
         control: 'col col-sm-5',
         label: 'col col-sm-5'
       }
     },
-    "namespace": {
+    namespace: {
       grid: {
         control: 'col col-sm-5',
         label: 'col col-sm-5'
@@ -78,11 +77,11 @@ export class MetadataSchemaFormComponent implements OnInit {
   ngOnInit() {
 
     this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
-    this.registryService.getActiveMetadataSchema().subscribe(schema => {
+    this.registryService.getActiveMetadataSchema().subscribe((schema) => {
       this.formGroup.patchValue({
           schema: {
-            name: schema != null ? schema.prefix : "",
-            namespace: schema != null ? schema.namespace : ""
+            name: schema != null ? schema.prefix : '',
+            namespace: schema != null ? schema.namespace : ''
           }
         }
       );
@@ -95,16 +94,16 @@ export class MetadataSchemaFormComponent implements OnInit {
 
   onSubmit() {
     this.registryService.getActiveMetadataSchema().subscribe(
-      schema => {
+      (schema) => {
 
         if (schema == null) {
-          console.log("metadata field to create:");
-          console.log("prefix: " + this.name.value);
-          console.log("namespace: " + this.namespace.value);
+          console.log('metadata field to create:');
+          console.log('prefix: ' + this.name.value);
+          console.log('namespace: ' + this.namespace.value);
         } else {
-          console.log("metadata field to update:");
-          console.log("prefix: " + this.name.value);
-          console.log("namespace: " + this.namespace.value);
+          console.log('metadata field to update:');
+          console.log('prefix: ' + this.name.value);
+          console.log('namespace: ' + this.namespace.value);
         }
       }
     );
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
index 5677f48474..8c8c889739 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
@@ -1,20 +1,20 @@
-import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
-import {DynamicFormControlModel, DynamicFormGroupModel, DynamicInputModel} from "@ng-dynamic-forms/core";
-import {RegistryService} from "../../../../core/registry/registry.service";
-import {MetadataSchema} from "../../../../core/metadata/metadataschema.model";
-import {FormGroup} from "@angular/forms";
-import {FormBuilderService} from "../../../../shared/form/builder/form-builder.service";
-import {Observable} from "rxjs";
-import {MetadataField} from "../../../../core/metadata/metadatafield.model";
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { MetadataSchema } from '../../../../core/metadata/metadataschema.model';
+import { DynamicFormControlModel, DynamicFormGroupModel, DynamicInputModel } from '@ng-dynamic-forms/core';
+import { FormGroup } from '@angular/forms';
+import { RegistryService } from '../../../../core/registry/registry.service';
+import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
+import { Observable } from 'rxjs/internal/Observable';
+import { MetadataField } from '../../../../core/metadata/metadatafield.model';
 
 @Component({
   selector: 'ds-metadata-field-form',
   templateUrl: './metadata-field-form.component.html',
-  styleUrls: ['./metadata-field-form.component.css']
+  // styleUrls: ['./metadata-field-form.component.css']
 })
 export class MetadataFieldFormComponent implements OnInit {
 
-  formId: string = 'metadata-field-form';
+  formId = 'metadata-field-form';
 
   @Input() metadataSchema: MetadataSchema;
 
@@ -42,8 +42,8 @@ export class MetadataFieldFormComponent implements OnInit {
 
   formModel: DynamicFormControlModel[] = [
     new DynamicFormGroupModel({
-      id: "field",
-      legend: "field",
+      id: 'field',
+      legend: 'field',
       group: [
         this.element,
         this.qualifier,
@@ -62,12 +62,12 @@ export class MetadataFieldFormComponent implements OnInit {
   ngOnInit() {
 
     this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
-    this.registryService.getActiveMetadataField().subscribe(field => {
+    this.registryService.getActiveMetadataField().subscribe((field) => {
       this.formGroup.patchValue({
           field: {
-            element: field != null ? field.element : "",
-            qualifier: field != null ? field.qualifier : "",
-            scopeNote: field != null ? field.scopeNote : ""
+            element: field != null ? field.element : '',
+            qualifier: field != null ? field.qualifier : '',
+            scopeNote: field != null ? field.scopeNote : ''
           }
         }
       );
@@ -84,22 +84,26 @@ export class MetadataFieldFormComponent implements OnInit {
 
   onSubmit() {
     this.registryService.getActiveMetadataField().subscribe(
-      field => {
+      (field) => {
 
         if (field == null) {
-          console.log("metadata field to create:");
-          console.log("element: " + this.element.value);
-          if (this.qualifier.value)
-            console.log("qualifier: " + this.qualifier.value);
-          if (this.scopeNote.value)
-            console.log("scopeNote: " + this.scopeNote.value);
+          console.log('metadata field to create:');
+          console.log('element: ' + this.element.value);
+          if (this.qualifier.value) {
+            console.log('qualifier: ' + this.qualifier.value);
+          }
+          if (this.scopeNote.value) {
+            console.log('scopeNote: ' + this.scopeNote.value);
+          }
         } else {
-          console.log("metadata field to update:");
-          console.log("element: " + this.element.value);
-          if (this.qualifier.value)
-            console.log("qualifier: " + this.qualifier.value);
-          if (this.scopeNote.value)
-            console.log("scopeNote: " + this.scopeNote.value);
+          console.log('metadata field to update:');
+          console.log('element: ' + this.element.value);
+          if (this.qualifier.value) {
+            console.log('qualifier: ' + this.qualifier.value);
+          }
+          if (this.scopeNote.value) {
+            console.log('scopeNote: ' + this.scopeNote.value);
+          }
         }
       }
     );
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
index 4d73d58e32..3a31436fe2 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
@@ -1,13 +1,13 @@
-import {Component, OnInit} from '@angular/core';
-import {RegistryService} from '../../../core/registry/registry.service';
-import {ActivatedRoute} from '@angular/router';
-import {Observable} from 'rxjs';
-import {RemoteData} from '../../../core/data/remote-data';
-import {PaginatedList} from '../../../core/data/paginated-list';
-import {MetadataField} from '../../../core/metadata/metadatafield.model';
-import {MetadataSchema} from '../../../core/metadata/metadataschema.model';
-import {PaginationComponentOptions} from '../../../shared/pagination/pagination-component-options.model';
-import {map} from "rxjs/operators";
+import { Component, OnInit } from '@angular/core';
+import { RegistryService } from '../../../core/registry/registry.service';
+import { ActivatedRoute } from '@angular/router';
+import { Observable } from 'rxjs';
+import { RemoteData } from '../../../core/data/remote-data';
+import { PaginatedList } from '../../../core/data/paginated-list';
+import { MetadataField } from '../../../core/metadata/metadatafield.model';
+import { MetadataSchema } from '../../../core/metadata/metadataschema.model';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { map } from 'rxjs/operators';
 
 @Component({
   selector: 'ds-metadata-schema',
@@ -23,7 +23,7 @@ export class MetadataSchemaComponent implements OnInit {
     id: 'registry-metadatafields-pagination',
     pageSize: 25,
     pageSizeOptions: [25, 50, 100, 200]
-});
+  });
 
   constructor(private registryService: RegistryService, private route: ActivatedRoute) {
 
@@ -49,7 +49,7 @@ export class MetadataSchemaComponent implements OnInit {
     this.metadataSchema.subscribe((schemaData) => {
       const schema = schemaData.payload;
       this.metadataFields = this.registryService.getMetadataFieldsBySchema(schema, this.config);
-      this.namespace = { namespace: schemaData.payload.namespace };
+      this.namespace = {namespace: schemaData.payload.namespace};
     });
   }
 
@@ -59,7 +59,7 @@ export class MetadataSchemaComponent implements OnInit {
 
   isActive(field: MetadataField): Observable<boolean> {
     return this.getActiveField().pipe(
-      map(activeField => field === activeField)
+      map((activeField) => field === activeField)
     );
   }
 
@@ -75,15 +75,15 @@ export class MetadataSchemaComponent implements OnInit {
 
   isSelected(field: MetadataField): Observable<boolean> {
     return this.registryService.getSelectedMetadataFields().pipe(
-      map(fields => fields.find(selectedField => selectedField == field) != null)
+      map((fields) => fields.find((selectedField) => selectedField === field) != null)
     );
   }
 
   deleteFields() {
     this.registryService.getSelectedMetadataFields().subscribe(
-      fields => {
-        console.log("metadata fields to delete: ");
-        for (let field of fields) {
+      (fields) => {
+        console.log('metadata fields to delete: ');
+        for (const field of fields) {
           console.log(field);
         }
       }
diff --git a/src/app/+admin/admin-routing.module.ts b/src/app/+admin/admin-routing.module.ts
index aa368e7122..061ed3f8a8 100644
--- a/src/app/+admin/admin-routing.module.ts
+++ b/src/app/+admin/admin-routing.module.ts
@@ -1,11 +1,15 @@
 import { RouterModule } from '@angular/router';
 import { NgModule } from '@angular/core';
-import {AuthenticatedGuard} from "../core/auth/authenticated.guard";
+import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
-      { path: 'registries', loadChildren: './admin-registries/admin-registries.module#AdminRegistriesModule', canActivate: [AuthenticatedGuard] }
+      {
+        path: 'registries',
+        loadChildren: './admin-registries/admin-registries.module#AdminRegistriesModule',
+        canActivate: [AuthenticatedGuard]
+      }
     ])
   ]
 })
diff --git a/src/app/+community-page/community-page.component.ts b/src/app/+community-page/community-page.component.ts
index ce260aefc0..9a143f9a02 100644
--- a/src/app/+community-page/community-page.component.ts
+++ b/src/app/+community-page/community-page.component.ts
@@ -25,7 +25,6 @@ export class CommunityPageComponent implements OnInit, OnDestroy {
   communityRD$: Observable<RemoteData<Community>>;
   logoRD$: Observable<RemoteData<Bitstream>>;
 
-
   private subs: Subscription[] = [];
 
   constructor(
@@ -42,14 +41,9 @@ export class CommunityPageComponent implements OnInit, OnDestroy {
       map((rd: RemoteData<Community>) => rd.payload),
       filter((community: Community) => hasValue(community)),
       mergeMap((community: Community) => community.logo));
-
-
   }
 
   ngOnDestroy(): void {
     this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
   }
-
-
-
 }
diff --git a/src/app/app.reducer.ts b/src/app/app.reducer.ts
index f8931c2af0..82c5a0973b 100644
--- a/src/app/app.reducer.ts
+++ b/src/app/app.reducer.ts
@@ -17,7 +17,7 @@ import { truncatableReducer, TruncatablesState } from './shared/truncatable/trun
 import {
   metadataRegistryReducer,
   MetadataRegistryState
-} from "./+admin/admin-registries/metadata-registry/metadata-registry.reducers";
+} from './+admin/admin-registries/metadata-registry/metadata-registry.reducers';
 
 export interface AppState {
   router: fromRouter.RouterReducerState;
diff --git a/src/app/core/cache/models/normalized-object-factory.ts b/src/app/core/cache/models/normalized-object-factory.ts
index 468a2b050d..afa10920cb 100644
--- a/src/app/core/cache/models/normalized-object-factory.ts
+++ b/src/app/core/cache/models/normalized-object-factory.ts
@@ -10,7 +10,7 @@ import { NormalizedBitstreamFormat } from './normalized-bitstream-format.model';
 import { NormalizedResourcePolicy } from './normalized-resource-policy.model';
 import { NormalizedEPerson } from '../../eperson/models/normalized-eperson.model';
 import { NormalizedGroup } from '../../eperson/models/normalized-group.model';
-import {NormalizedMetadataSchema} from "../../metadata/normalized-metadata-schema.model";
+import { NormalizedMetadataSchema } from '../../metadata/normalized-metadata-schema.model';
 
 export class NormalizedObjectFactory {
   public static getConstructor(type: ResourceType): GenericConstructor<NormalizedObject> {
diff --git a/src/app/core/cache/response.models.ts b/src/app/core/cache/response.models.ts
index 168bbe6f4d..8b31e3d449 100644
--- a/src/app/core/cache/response.models.ts
+++ b/src/app/core/cache/response.models.ts
@@ -1,15 +1,15 @@
-import {SearchQueryResponse} from '../../+search-page/search-service/search-query-response.model';
-import {RequestError} from '../data/request.models';
-import {PageInfo} from '../shared/page-info.model';
-import {ConfigObject} from '../shared/config/config.model';
-import {FacetValue} from '../../+search-page/search-service/facet-value.model';
-import {SearchFilterConfig} from '../../+search-page/search-service/search-filter-config.model';
-import {IntegrationModel} from '../integration/models/integration.model';
-import {RegistryMetadataschemasResponse} from '../registry/registry-metadataschemas-response.model';
-import {RegistryMetadatafieldsResponse} from '../registry/registry-metadatafields-response.model';
-import {RegistryBitstreamformatsResponse} from '../registry/registry-bitstreamformats-response.model';
-import {AuthStatus} from '../auth/models/auth-status.model';
-import {MetadataSchema} from "../metadata/metadataschema.model";
+import { SearchQueryResponse } from '../../+search-page/search-service/search-query-response.model';
+import { RequestError } from '../data/request.models';
+import { PageInfo } from '../shared/page-info.model';
+import { ConfigObject } from '../shared/config/config.model';
+import { FacetValue } from '../../+search-page/search-service/facet-value.model';
+import { SearchFilterConfig } from '../../+search-page/search-service/search-filter-config.model';
+import { IntegrationModel } from '../integration/models/integration.model';
+import { RegistryMetadataschemasResponse } from '../registry/registry-metadataschemas-response.model';
+import { RegistryMetadatafieldsResponse } from '../registry/registry-metadatafields-response.model';
+import { RegistryBitstreamformatsResponse } from '../registry/registry-bitstreamformats-response.model';
+import { AuthStatus } from '../auth/models/auth-status.model';
+import { MetadataSchema } from '../metadata/metadataschema.model';
 
 /* tslint:disable:max-classes-per-file */
 export class RestResponse {
diff --git a/src/app/core/config/config.service.spec.ts b/src/app/core/config/config.service.spec.ts
index 8e9f7db27a..44cfdee358 100644
--- a/src/app/core/config/config.service.spec.ts
+++ b/src/app/core/config/config.service.spec.ts
@@ -36,7 +36,6 @@ describe('ConfigService', () => {
   const scopedEndpoint = `${serviceEndpoint}/${scopeName}`;
   const searchEndpoint = `${serviceEndpoint}/${BROWSE}?uuid=${scopeID}`;
 
-
   function initTestService(): TestService {
     return new TestService(
       requestService,
diff --git a/src/app/core/data/metadata-schema-data.service.ts b/src/app/core/data/metadata-schema-data.service.ts
index c25e4cc789..d568bd01f7 100644
--- a/src/app/core/data/metadata-schema-data.service.ts
+++ b/src/app/core/data/metadata-schema-data.service.ts
@@ -1,23 +1,17 @@
-import {distinctUntilChanged, filter, map, tap} from 'rxjs/operators';
-import {Injectable} from '@angular/core';
-import {Store} from '@ngrx/store';
-import {Observable} from 'rxjs';
-import {isNotEmpty} from '../../shared/empty.util';
-import {BrowseService} from '../browse/browse.service';
-import {RemoteDataBuildService} from '../cache/builders/remote-data-build.service';
-import {CoreState} from '../core.reducers';
-import {URLCombiner} from '../url-combiner/url-combiner';
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+import { BrowseService } from '../browse/browse.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { CoreState } from '../core.reducers';
 
-import {DataService} from './data.service';
-import {RequestService} from './request.service';
-import {HALEndpointService} from '../shared/hal-endpoint.service';
-import {FindAllOptions, GetRequest, RestRequest} from './request.models';
-import {ObjectCacheService} from '../cache/object-cache.service';
-import {MetadataSchema} from "../metadata/metadataschema.model";
-import {NormalizedMetadataSchema} from "../metadata/normalized-metadata-schema.model";
-import {GenericConstructor} from "../shared/generic-constructor";
-import {ResponseParsingService} from "./parsing.service";
-import {RegistryMetadatafieldsResponseParsingService} from "./registry-metadatafields-response-parsing.service";
+import { DataService } from './data.service';
+import { RequestService } from './request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { FindAllOptions, GetRequest, RestRequest } from './request.models';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { MetadataSchema } from '../metadata/metadataschema.model';
+import { NormalizedMetadataSchema } from '../metadata/normalized-metadata-schema.model';
 
 @Injectable()
 export class MetadataSchemaDataService extends DataService<NormalizedMetadataSchema, MetadataSchema> {
diff --git a/src/app/core/integration/integration.service.spec.ts b/src/app/core/integration/integration.service.spec.ts
index 158f4b0680..152d7ab165 100644
--- a/src/app/core/integration/integration.service.spec.ts
+++ b/src/app/core/integration/integration.service.spec.ts
@@ -40,7 +40,7 @@ describe('IntegrationService', () => {
 
   findOptions = new IntegrationSearchOptions(uuid, name, metadata);
 
-   function initTestService(): TestService {
+  function initTestService(): TestService {
     return new TestService(
       requestService,
       halService
diff --git a/src/app/core/metadata/normalized-metadata-schema.model.ts b/src/app/core/metadata/normalized-metadata-schema.model.ts
index 73a64bc1ab..432a8bfd5e 100644
--- a/src/app/core/metadata/normalized-metadata-schema.model.ts
+++ b/src/app/core/metadata/normalized-metadata-schema.model.ts
@@ -1,12 +1,12 @@
-import {autoserialize} from 'cerialize';
-import {NormalizedObject} from "../cache/models/normalized-object.model";
-import {mapsTo} from "../cache/builders/build-decorators";
-import {CacheableObject} from "../cache/object-cache.reducer";
-import {ListableObject} from "../../shared/object-collection/shared/listable-object.model";
-import {MetadataSchema} from "./metadataschema.model";
+import { autoserialize } from 'cerialize';
+import { NormalizedObject } from '../cache/models/normalized-object.model';
+import { mapsTo } from '../cache/builders/build-decorators';
+import { CacheableObject } from '../cache/object-cache.reducer';
+import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
+import { MetadataSchema } from './metadataschema.model';
 
 @mapsTo(MetadataSchema)
-export class NormalizedMetadataSchema extends NormalizedObject  implements CacheableObject, ListableObject {
+export class NormalizedMetadataSchema extends NormalizedObject implements CacheableObject, ListableObject {
   @autoserialize
   id: number;
 
diff --git a/src/app/core/registry/registry.service.ts b/src/app/core/registry/registry.service.ts
index d6c646a5f5..6dd76c1066 100644
--- a/src/app/core/registry/registry.service.ts
+++ b/src/app/core/registry/registry.service.ts
@@ -1,35 +1,35 @@
-import {combineLatest as observableCombineLatest, Observable} from 'rxjs';
-import {Injectable} from '@angular/core';
-import {RemoteData} from '../data/remote-data';
-import {PaginatedList} from '../data/paginated-list';
-import {PageInfo} from '../shared/page-info.model';
-import {MetadataSchema} from '../metadata/metadataschema.model';
-import {MetadataField} from '../metadata/metadatafield.model';
-import {BitstreamFormat} from './mock-bitstream-format.model';
-import {GetRequest, RestRequest} from '../data/request.models';
-import {GenericConstructor} from '../shared/generic-constructor';
-import {ResponseParsingService} from '../data/parsing.service';
-import {RegistryMetadataschemasResponseParsingService} from '../data/registry-metadataschemas-response-parsing.service';
-import {RemoteDataBuildService} from '../cache/builders/remote-data-build.service';
-import {RequestService} from '../data/request.service';
-import {RegistryMetadataschemasResponse} from './registry-metadataschemas-response.model';
+import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
+import { Injectable } from '@angular/core';
+import { RemoteData } from '../data/remote-data';
+import { PaginatedList } from '../data/paginated-list';
+import { PageInfo } from '../shared/page-info.model';
+import { MetadataSchema } from '../metadata/metadataschema.model';
+import { MetadataField } from '../metadata/metadatafield.model';
+import { BitstreamFormat } from './mock-bitstream-format.model';
+import { GetRequest, RestRequest } from '../data/request.models';
+import { GenericConstructor } from '../shared/generic-constructor';
+import { ResponseParsingService } from '../data/parsing.service';
+import { RegistryMetadataschemasResponseParsingService } from '../data/registry-metadataschemas-response-parsing.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestService } from '../data/request.service';
+import { RegistryMetadataschemasResponse } from './registry-metadataschemas-response.model';
 import {
   RegistryBitstreamformatsSuccessResponse,
   RegistryMetadatafieldsSuccessResponse,
   RegistryMetadataschemasSuccessResponse
 } from '../cache/response.models';
-import {HALEndpointService} from '../shared/hal-endpoint.service';
-import {RegistryMetadatafieldsResponseParsingService} from '../data/registry-metadatafields-response-parsing.service';
-import {RegistryMetadatafieldsResponse} from './registry-metadatafields-response.model';
-import {isNotEmpty} from '../../shared/empty.util';
-import {URLCombiner} from '../url-combiner/url-combiner';
-import {PaginationComponentOptions} from '../../shared/pagination/pagination-component-options.model';
-import {RegistryBitstreamformatsResponseParsingService} from '../data/registry-bitstreamformats-response-parsing.service';
-import {RegistryBitstreamformatsResponse} from './registry-bitstreamformats-response.model';
-import {getResponseFromEntry} from '../shared/operators';
-import {createSelector, select, Store} from "@ngrx/store";
-import {AppState} from "../../app.reducer";
-import {MetadataRegistryState} from "../../+admin/admin-registries/metadata-registry/metadata-registry.reducers";
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { RegistryMetadatafieldsResponseParsingService } from '../data/registry-metadatafields-response-parsing.service';
+import { RegistryMetadatafieldsResponse } from './registry-metadatafields-response.model';
+import { isNotEmpty } from '../../shared/empty.util';
+import { URLCombiner } from '../url-combiner/url-combiner';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { RegistryBitstreamformatsResponseParsingService } from '../data/registry-bitstreamformats-response-parsing.service';
+import { RegistryBitstreamformatsResponse } from './registry-bitstreamformats-response.model';
+import { getResponseFromEntry } from '../shared/operators';
+import { createSelector, select, Store } from '@ngrx/store';
+import { AppState } from '../../app.reducer';
+import { MetadataRegistryState } from '../../+admin/admin-registries/metadata-registry/metadata-registry.reducers';
 import {
   MetadataRegistryCancelFieldAction,
   MetadataRegistryCancelSchemaAction,
@@ -39,8 +39,8 @@ import {
   MetadataRegistryEditSchemaAction,
   MetadataRegistrySelectFieldAction,
   MetadataRegistrySelectSchemaAction
-} from "../../+admin/admin-registries/metadata-registry/metadata-registry.actions";
-import {flatMap, map, tap} from "rxjs/operators";
+} from '../../+admin/admin-registries/metadata-registry/metadata-registry.actions';
+import { flatMap, map, tap } from 'rxjs/operators';
 
 const metadataRegistryStateSelector = (state: AppState) => state.metadataRegistry;
 const editMetadataSchemaSelector = createSelector(metadataRegistryStateSelector, (metadataState: MetadataRegistryState) => metadataState.editSchema);
@@ -199,8 +199,8 @@ export class RegistryService {
   }
 
   private getMetadataFieldsBySchemaRequestObs(pagination: PaginationComponentOptions, schema: MetadataSchema): Observable<RestRequest> {
-    return this.halService.getEndpoint(this.metadataFieldsPath + "/search/bySchema").pipe(
-    // return this.halService.getEndpoint(this.metadataFieldsPath).pipe(
+    return this.halService.getEndpoint(this.metadataFieldsPath + '/search/bySchema').pipe(
+      // return this.halService.getEndpoint(this.metadataFieldsPath).pipe(
       map((url: string) => {
         const args: string[] = [];
         args.push(`schema=${schema.prefix}`);
diff --git a/src/app/shared/testing/utils.ts b/src/app/shared/testing/utils.ts
index 8714358100..cd17a1b1f5 100644
--- a/src/app/shared/testing/utils.ts
+++ b/src/app/shared/testing/utils.ts
@@ -41,4 +41,4 @@ export function spyOnOperator(obj: any, prop: string): any {
   });
 
   return spyOn(obj, prop);
-}
\ No newline at end of file
+}

From 73f24a5dc16bbc2ffc575a621c15c7e91019b722 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 22 Jan 2019 10:39:32 +0100
Subject: [PATCH 06/44] 58789: Rest call for creating metadata schemas

---
 .../metadata-schema-form.component.html       |  2 +-
 .../metadata-schema-form.component.ts         | 12 ++-
 src/app/core/core.module.ts                   |  2 +
 src/app/core/data/request.models.ts           | 12 +++
 src/app/core/registry/registry.service.ts     | 85 +++++++++----------
 src/app/shared/form/form.component.ts         |  4 +-
 6 files changed, 64 insertions(+), 53 deletions(-)

diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
index 3f87018b74..c7d1a09fa8 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
@@ -13,6 +13,6 @@
          [formGroup]="formGroup"
          [formLayout]="formLayout"
          (cancel)="onCancel()"
-         (submit)="onSubmit()">
+         (submitForm)="onSubmit()">
 
 </ds-form>
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
index 551e249d41..497758ba14 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -11,6 +11,8 @@ import { FormBuilderService } from '../../../../shared/form/builder/form-builder
 import { FormService } from '../../../../shared/form/form.service';
 import { Store } from '@ngrx/store';
 import { AppState } from '../../../../app.reducer';
+import { take } from 'rxjs/operators';
+import { MetadataSchema } from '../../../../core/metadata/metadataschema.model';
 
 @Component({
   selector: 'ds-metadata-schema-form',
@@ -95,11 +97,13 @@ export class MetadataSchemaFormComponent implements OnInit {
   onSubmit() {
     this.registryService.getActiveMetadataSchema().subscribe(
       (schema) => {
-
         if (schema == null) {
-          console.log('metadata field to create:');
-          console.log('prefix: ' + this.name.value);
-          console.log('namespace: ' + this.namespace.value);
+          this.registryService.createMetadataSchema(Object.assign(new MetadataSchema(), {
+            prefix: this.name.value,
+            namespace: this.namespace.value
+          })).subscribe((newSchema) => {
+            console.log(newSchema);
+          });
         } else {
           console.log('metadata field to update:');
           console.log('prefix: ' + this.name.value);
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index 65484d68aa..e8f476d5b8 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -62,6 +62,7 @@ import { NotificationsService } from '../shared/notifications/notifications.serv
 import { UploaderService } from '../shared/uploader/uploader.service';
 import { BrowseItemsResponseParsingService } from './data/browse-items-response-parsing-service';
 import { DSpaceObjectDataService } from './data/dspace-object-data.service';
+import { MetadataschemaParsingService } from './data/metadataschema-parsing.service';
 
 const IMPORTS = [
   CommonModule,
@@ -121,6 +122,7 @@ const PROVIDERS = [
   SubmissionSectionsConfigService,
   AuthorityService,
   IntegrationResponseParsingService,
+  MetadataschemaParsingService,
   UploaderService,
   UUIDService,
   DSpaceObjectDataService,
diff --git a/src/app/core/data/request.models.ts b/src/app/core/data/request.models.ts
index a96d9716b2..601792fdfd 100644
--- a/src/app/core/data/request.models.ts
+++ b/src/app/core/data/request.models.ts
@@ -11,6 +11,8 @@ import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
 import { IntegrationResponseParsingService } from '../integration/integration-response-parsing.service';
 import { RestRequestMethod } from './rest-request-method';
 import { BrowseItemsResponseParsingService } from './browse-items-response-parsing-service';
+import { RegistryMetadataschemasResponseParsingService } from './registry-metadataschemas-response-parsing.service';
+import { MetadataschemaParsingService } from './metadataschema-parsing.service';
 
 /* tslint:disable:max-classes-per-file */
 
@@ -217,6 +219,16 @@ export class IntegrationRequest extends GetRequest {
   }
 }
 
+export class CreateMetadataSchemaRequest extends PostRequest {
+  constructor(uuid: string, href: string, public body?: any, public options?: HttpOptions) {
+    super(uuid, href, body, options);
+  }
+
+  getResponseParser(): GenericConstructor<ResponseParsingService> {
+    return MetadataschemaParsingService;
+  }
+}
+
 export class RequestError extends Error {
   statusText: string;
 }
diff --git a/src/app/core/registry/registry.service.ts b/src/app/core/registry/registry.service.ts
index 6dd76c1066..4e9d27ca23 100644
--- a/src/app/core/registry/registry.service.ts
+++ b/src/app/core/registry/registry.service.ts
@@ -6,7 +6,7 @@ import { PageInfo } from '../shared/page-info.model';
 import { MetadataSchema } from '../metadata/metadataschema.model';
 import { MetadataField } from '../metadata/metadatafield.model';
 import { BitstreamFormat } from './mock-bitstream-format.model';
-import { GetRequest, RestRequest } from '../data/request.models';
+import { CreateMetadataSchemaRequest, GetRequest, RestRequest } from '../data/request.models';
 import { GenericConstructor } from '../shared/generic-constructor';
 import { ResponseParsingService } from '../data/parsing.service';
 import { RegistryMetadataschemasResponseParsingService } from '../data/registry-metadataschemas-response-parsing.service';
@@ -14,19 +14,20 @@ import { RemoteDataBuildService } from '../cache/builders/remote-data-build.serv
 import { RequestService } from '../data/request.service';
 import { RegistryMetadataschemasResponse } from './registry-metadataschemas-response.model';
 import {
+  ErrorResponse, MetadataschemaSuccessResponse,
   RegistryBitstreamformatsSuccessResponse,
   RegistryMetadatafieldsSuccessResponse,
-  RegistryMetadataschemasSuccessResponse
+  RegistryMetadataschemasSuccessResponse, RestResponse
 } from '../cache/response.models';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { RegistryMetadatafieldsResponseParsingService } from '../data/registry-metadatafields-response-parsing.service';
 import { RegistryMetadatafieldsResponse } from './registry-metadatafields-response.model';
-import { isNotEmpty } from '../../shared/empty.util';
+import { isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
 import { URLCombiner } from '../url-combiner/url-combiner';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { RegistryBitstreamformatsResponseParsingService } from '../data/registry-bitstreamformats-response-parsing.service';
 import { RegistryBitstreamformatsResponse } from './registry-bitstreamformats-response.model';
-import { getResponseFromEntry } from '../shared/operators';
+import { configureRequest, getResponseFromEntry, getSucceededRemoteData } from '../shared/operators';
 import { createSelector, select, Store } from '@ngrx/store';
 import { AppState } from '../../app.reducer';
 import { MetadataRegistryState } from '../../+admin/admin-registries/metadata-registry/metadata-registry.reducers';
@@ -40,7 +41,11 @@ import {
   MetadataRegistrySelectFieldAction,
   MetadataRegistrySelectSchemaAction
 } from '../../+admin/admin-registries/metadata-registry/metadata-registry.actions';
-import { flatMap, map, tap } from 'rxjs/operators';
+import { distinctUntilChanged, flatMap, map, switchMap, take, tap } from 'rxjs/operators';
+import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer';
+import { NormalizedObjectFactory } from '../cache/models/normalized-object-factory';
+import { ResourceType } from '../shared/resource-type';
+import { NormalizedMetadataSchema } from '../metadata/normalized-metadata-schema.model';
 
 const metadataRegistryStateSelector = (state: AppState) => state.metadataRegistry;
 const editMetadataSchemaSelector = createSelector(metadataRegistryStateSelector, (metadataState: MetadataRegistryState) => metadataState.editSchema);
@@ -288,45 +293,33 @@ export class RegistryService {
     return this.store.pipe(select(selectedMetadataFieldsSelector));
   }
 
-  // public createMetadataSchema(schema: MetadataSchema): Observable<RemoteData<MetadataSchema>> {
-  //   const requestId = this.requestService.generateRequestId();
-  //   const endpoint$ = this.halService.getEndpoint(this.metadataSchemasPath).pipe(
-  //     isNotEmptyOperator(),
-  //     distinctUntilChanged()
-  //   );
-  //
-  //   const serializedDso = new DSpaceRESTv2Serializer(NormalizedObjectFactory.getConstructor(MetadataSchema.type)).serialize(normalizedObject);
-  //
-  //   const request$ = endpoint$.pipe(
-  //     take(1),
-  //     map((endpoint: string) => new CreateRequest(requestId, endpoint, JSON.stringify(serializedDso)))
-  //   );
-  //
-  //   // Execute the post request
-  //   request$.pipe(
-  //     configureRequest(this.requestService)
-  //   ).subscribe();
-  //
-  //   // Resolve self link for new object
-  //   const selfLink$ = this.requestService.getByUUID(requestId).pipe(
-  //     getResponseFromEntry(),
-  //     map((response: RestResponse) => {
-  //       if (!response.isSuccessful && response instanceof ErrorResponse) {
-  //         this.notificationsService.error('Server Error:', response.errorMessage, new NotificationOptions(-1));
-  //       } else {
-  //         return response;
-  //       }
-  //     }),
-  //     map((response: any) => {
-  //       if (isNotEmpty(response.resourceSelfLinks)) {
-  //         return response.resourceSelfLinks[0];
-  //       }
-  //     }),
-  //     distinctUntilChanged()
-  //   ) as Observable<string>;
-  //
-  //   return selfLink$.pipe(
-  //     switchMap((selfLink: string) => this.findByHref(selfLink)),
-  //   )
-  // }
+  public createMetadataSchema(schema: MetadataSchema): Observable<MetadataSchema> {
+    const requestId = this.requestService.generateRequestId();
+    const endpoint$ = this.halService.getEndpoint(this.metadataSchemasPath).pipe(
+      isNotEmptyOperator(),
+      distinctUntilChanged()
+    );
+
+    const serializedSchema = new DSpaceRESTv2Serializer(NormalizedObjectFactory.getConstructor(ResourceType.MetadataSchema)).serialize(schema as NormalizedMetadataSchema);
+
+    const request$ = endpoint$.pipe(
+      take(1),
+      map((endpoint: string) => new CreateMetadataSchemaRequest(requestId, endpoint, JSON.stringify(serializedSchema)))
+    );
+
+    // Execute the post request
+    request$.pipe(
+      configureRequest(this.requestService)
+    ).subscribe();
+
+    // Return newly created schema
+    return this.requestService.getByUUID(requestId).pipe(
+      getResponseFromEntry(),
+      map((response: MetadataschemaSuccessResponse) => {
+        if (isNotEmpty(response.metadataschema)) {
+          return response.metadataschema;
+        }
+      })
+    );
+  }
 }
diff --git a/src/app/shared/form/form.component.ts b/src/app/shared/form/form.component.ts
index b59d9969ce..a7561af9d2 100644
--- a/src/app/shared/form/form.component.ts
+++ b/src/app/shared/form/form.component.ts
@@ -79,7 +79,7 @@ export class FormComponent implements OnDestroy, OnInit {
    * An event fired when form is valid and submitted .
    * Event's payload equals to the form content.
    */
-  @Output() submit: EventEmitter<Observable<any>> = new EventEmitter<Observable<any>>();
+  @Output() submitForm: EventEmitter<Observable<any>> = new EventEmitter<Observable<any>>();
 
   /**
    * An object of FormGroup type
@@ -273,7 +273,7 @@ export class FormComponent implements OnDestroy, OnInit {
    */
   onSubmit(): void {
     if (this.getFormGroupValidStatus()) {
-      this.submit.emit(this.formService.getFormData(this.formId));
+      this.submitForm.emit(this.formService.getFormData(this.formId));
     } else {
       this.formService.validateAllFormFields(this.formGroup);
     }

From 9726fdf8972dacc0e5dd189536c551b9af5c2035 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 22 Jan 2019 11:22:22 +0100
Subject: [PATCH 07/44] 58789: Rest call for deleting metadata schemas

---
 .../metadata-registry.component.ts            | 10 ++++++--
 src/app/core/registry/registry.service.ts     | 25 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
index a1158c4cd7..4d9c10f864 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -6,6 +6,8 @@ import { PaginatedList } from '../../../core/data/paginated-list';
 import { MetadataSchema } from '../../../core/metadata/metadataschema.model';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 import { map } from 'rxjs/operators';
+import { hasValue } from '../../../shared/empty.util';
+import { RestResponse } from '../../../core/cache/response.models';
 
 @Component({
   selector: 'ds-metadata-registry',
@@ -62,9 +64,13 @@ export class MetadataRegistryComponent {
   deleteSchemas() {
     this.registryService.getSelectedMetadataSchemas().subscribe(
       (schemas) => {
-        console.log('metadata schemas to delete: ');
         for (const schema of schemas) {
-          console.log(schema);
+          if (hasValue(schema.id)) {
+            this.registryService.deleteMetadataSchema(schema.id).subscribe((response: RestResponse) => {
+              console.log('response from delete request for schema ' + schema.id + ':');
+              console.log(response);
+            })
+          }
         }
       }
     )
diff --git a/src/app/core/registry/registry.service.ts b/src/app/core/registry/registry.service.ts
index 4e9d27ca23..185aa4f6e0 100644
--- a/src/app/core/registry/registry.service.ts
+++ b/src/app/core/registry/registry.service.ts
@@ -6,7 +6,7 @@ import { PageInfo } from '../shared/page-info.model';
 import { MetadataSchema } from '../metadata/metadataschema.model';
 import { MetadataField } from '../metadata/metadatafield.model';
 import { BitstreamFormat } from './mock-bitstream-format.model';
-import { CreateMetadataSchemaRequest, GetRequest, RestRequest } from '../data/request.models';
+import { CreateMetadataSchemaRequest, DeleteRequest, GetRequest, RestRequest } from '../data/request.models';
 import { GenericConstructor } from '../shared/generic-constructor';
 import { ResponseParsingService } from '../data/parsing.service';
 import { RegistryMetadataschemasResponseParsingService } from '../data/registry-metadataschemas-response-parsing.service';
@@ -322,4 +322,27 @@ export class RegistryService {
       })
     );
   }
+
+  public deleteMetadataSchema(id: number): Observable<RestResponse> {
+    const requestId = this.requestService.generateRequestId();
+    const endpoint$ = this.halService.getEndpoint(this.metadataSchemasPath).pipe(
+      isNotEmptyOperator(),
+      map((endpoint: string) => `${endpoint}/${id}`),
+      distinctUntilChanged()
+    );
+
+    const request$ = endpoint$.pipe(
+      take(1),
+      map((endpoint: string) => new DeleteRequest(requestId, endpoint))
+    );
+
+    // Execute the delete request
+    request$.pipe(
+      configureRequest(this.requestService)
+    ).subscribe();
+
+    return this.requestService.getByUUID(requestId).pipe(
+      getResponseFromEntry()
+    );
+  }
 }

From 7a390d42ba9c08a038b3c4f5463d53d8731ef227 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 22 Jan 2019 12:02:30 +0100
Subject: [PATCH 08/44] 58789: Rest call for editing schema (returns 415
 unsupported media type atm) + improvements to delete

---
 .../metadata-registry.component.ts            | 11 ++++++----
 .../metadata-schema-form.component.ts         | 21 ++++++++++++------
 src/app/core/data/request.models.ts           | 10 +++++++++
 src/app/core/registry/registry.service.ts     | 22 ++++++++++++++-----
 4 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
index 4d9c10f864..cfd5da1ee1 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -8,6 +8,7 @@ import { PaginationComponentOptions } from '../../../shared/pagination/paginatio
 import { map } from 'rxjs/operators';
 import { hasValue } from '../../../shared/empty.util';
 import { RestResponse } from '../../../core/cache/response.models';
+import { zip } from 'rxjs/internal/observable/zip';
 
 @Component({
   selector: 'ds-metadata-registry',
@@ -64,14 +65,16 @@ export class MetadataRegistryComponent {
   deleteSchemas() {
     this.registryService.getSelectedMetadataSchemas().subscribe(
       (schemas) => {
+        const tasks$ = [];
         for (const schema of schemas) {
           if (hasValue(schema.id)) {
-            this.registryService.deleteMetadataSchema(schema.id).subscribe((response: RestResponse) => {
-              console.log('response from delete request for schema ' + schema.id + ':');
-              console.log(response);
-            })
+            tasks$.push(this.registryService.deleteMetadataSchema(schema.id));
           }
         }
+        zip(...tasks$).subscribe((responses: RestResponse[]) => {
+          console.log('deleted ' + responses.length + ' schemas');
+          // TODO: Reload the list of schemas
+        });
       }
     )
   }
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
index 497758ba14..0071316d28 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -97,17 +97,24 @@ export class MetadataSchemaFormComponent implements OnInit {
   onSubmit() {
     this.registryService.getActiveMetadataSchema().subscribe(
       (schema) => {
+        const values = {
+          prefix: this.name.value,
+          namespace: this.namespace.value
+        };
         if (schema == null) {
-          this.registryService.createMetadataSchema(Object.assign(new MetadataSchema(), {
-            prefix: this.name.value,
-            namespace: this.namespace.value
-          })).subscribe((newSchema) => {
+          this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), values)).subscribe((newSchema) => {
             console.log(newSchema);
+            // TODO: Reload the list of schemas
           });
         } else {
-          console.log('metadata field to update:');
-          console.log('prefix: ' + this.name.value);
-          console.log('namespace: ' + this.namespace.value);
+          this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), {
+            id: schema.id,
+            prefix: (values.prefix ? values.prefix : schema.prefix),
+            namespace: (values.namespace ? values.namespace : schema.namespace)
+          })).subscribe((updatedSchema) => {
+            console.log(updatedSchema);
+            // TODO: Reload the list of schemas
+          });
         }
       }
     );
diff --git a/src/app/core/data/request.models.ts b/src/app/core/data/request.models.ts
index 601792fdfd..1d176cdca5 100644
--- a/src/app/core/data/request.models.ts
+++ b/src/app/core/data/request.models.ts
@@ -229,6 +229,16 @@ export class CreateMetadataSchemaRequest extends PostRequest {
   }
 }
 
+export class UpdateMetadataSchemaRequest extends PutRequest {
+  constructor(uuid: string, href: string, public body?: any, public options?: HttpOptions) {
+    super(uuid, href, body, options);
+  }
+
+  getResponseParser(): GenericConstructor<ResponseParsingService> {
+    return MetadataschemaParsingService;
+  }
+}
+
 export class RequestError extends Error {
   statusText: string;
 }
diff --git a/src/app/core/registry/registry.service.ts b/src/app/core/registry/registry.service.ts
index 185aa4f6e0..11f2238d6f 100644
--- a/src/app/core/registry/registry.service.ts
+++ b/src/app/core/registry/registry.service.ts
@@ -6,7 +6,13 @@ import { PageInfo } from '../shared/page-info.model';
 import { MetadataSchema } from '../metadata/metadataschema.model';
 import { MetadataField } from '../metadata/metadatafield.model';
 import { BitstreamFormat } from './mock-bitstream-format.model';
-import { CreateMetadataSchemaRequest, DeleteRequest, GetRequest, RestRequest } from '../data/request.models';
+import {
+  CreateMetadataSchemaRequest,
+  DeleteRequest,
+  GetRequest,
+  RestRequest,
+  UpdateMetadataSchemaRequest
+} from '../data/request.models';
 import { GenericConstructor } from '../shared/generic-constructor';
 import { ResponseParsingService } from '../data/parsing.service';
 import { RegistryMetadataschemasResponseParsingService } from '../data/registry-metadataschemas-response-parsing.service';
@@ -22,7 +28,7 @@ import {
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { RegistryMetadatafieldsResponseParsingService } from '../data/registry-metadatafields-response-parsing.service';
 import { RegistryMetadatafieldsResponse } from './registry-metadatafields-response.model';
-import { isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
+import { hasValue, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
 import { URLCombiner } from '../url-combiner/url-combiner';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { RegistryBitstreamformatsResponseParsingService } from '../data/registry-bitstreamformats-response-parsing.service';
@@ -293,10 +299,12 @@ export class RegistryService {
     return this.store.pipe(select(selectedMetadataFieldsSelector));
   }
 
-  public createMetadataSchema(schema: MetadataSchema): Observable<MetadataSchema> {
+  public createOrUpdateMetadataSchema(schema: MetadataSchema): Observable<MetadataSchema> {
+    const isUpdate = hasValue(schema.id);
     const requestId = this.requestService.generateRequestId();
     const endpoint$ = this.halService.getEndpoint(this.metadataSchemasPath).pipe(
       isNotEmptyOperator(),
+      map((endpoint: string) => (isUpdate ? `${endpoint}/${schema.id}` : endpoint)),
       distinctUntilChanged()
     );
 
@@ -304,15 +312,17 @@ export class RegistryService {
 
     const request$ = endpoint$.pipe(
       take(1),
-      map((endpoint: string) => new CreateMetadataSchemaRequest(requestId, endpoint, JSON.stringify(serializedSchema)))
+      map((endpoint: string) => (isUpdate ?
+        new UpdateMetadataSchemaRequest(requestId, endpoint, JSON.stringify(serializedSchema)) :
+        new CreateMetadataSchemaRequest(requestId, endpoint, JSON.stringify(serializedSchema))))
     );
 
-    // Execute the post request
+    // Execute the post/put request
     request$.pipe(
       configureRequest(this.requestService)
     ).subscribe();
 
-    // Return newly created schema
+    // Return created/updated schema
     return this.requestService.getByUUID(requestId).pipe(
       getResponseFromEntry(),
       map((response: MetadataschemaSuccessResponse) => {

From c493fc4003f3b9aaad4db808e345b76a52b51f18 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 22 Jan 2019 13:06:37 +0100
Subject: [PATCH 09/44] 58789: Hardcoded notifications for creating and editing
 metadataschemas

---
 src/app/core/registry/registry.service.ts | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/app/core/registry/registry.service.ts b/src/app/core/registry/registry.service.ts
index 11f2238d6f..5392baa191 100644
--- a/src/app/core/registry/registry.service.ts
+++ b/src/app/core/registry/registry.service.ts
@@ -52,6 +52,8 @@ import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.seriali
 import { NormalizedObjectFactory } from '../cache/models/normalized-object-factory';
 import { ResourceType } from '../shared/resource-type';
 import { NormalizedMetadataSchema } from '../metadata/normalized-metadata-schema.model';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { NotificationOptions } from '../../shared/notifications/models/notification-options.model';
 
 const metadataRegistryStateSelector = (state: AppState) => state.metadataRegistry;
 const editMetadataSchemaSelector = createSelector(metadataRegistryStateSelector, (metadataState: MetadataRegistryState) => metadataState.editSchema);
@@ -69,7 +71,8 @@ export class RegistryService {
   constructor(protected requestService: RequestService,
               private rdb: RemoteDataBuildService,
               private halService: HALEndpointService,
-              private store: Store<AppState>) {
+              private store: Store<AppState>,
+              private notificationsService: NotificationsService) {
 
   }
 
@@ -325,6 +328,18 @@ export class RegistryService {
     // Return created/updated schema
     return this.requestService.getByUUID(requestId).pipe(
       getResponseFromEntry(),
+      map((response: RestResponse) => {
+        if (!response.isSuccessful) {
+          if (hasValue((response as any).errorMessage)) {
+            this.notificationsService.error('Server Error:', (response as any).errorMessage, new NotificationOptions(-1));
+          }
+        } else {
+          this.notificationsService.success('Success', `Successfully ${isUpdate ? 'updated' : 'created'} metadata schema "${schema.prefix}"`);
+          console.log(response);
+          return response;
+        }
+      }),
+      isNotEmptyOperator(),
       map((response: MetadataschemaSuccessResponse) => {
         if (isNotEmpty(response.metadataschema)) {
           return response.metadataschema;

From 8be40c31f6b5ab2699098ead46c26d93ee800b74 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Mon, 26 Nov 2018 13:18:17 +0100
Subject: [PATCH 10/44] 58789: Ability to clear request cache from index

---
 src/app/core/data/request.actions.ts | 24 +++++++++++-
 src/app/core/data/request.reducer.ts | 16 +++++++-
 src/app/core/data/request.service.ts | 58 +++++++++++++++++++++++++---
 src/app/core/index/index.actions.ts  | 27 ++++++++++++-
 src/app/core/index/index.reducer.ts  | 19 ++++++++-
 5 files changed, 133 insertions(+), 11 deletions(-)

diff --git a/src/app/core/data/request.actions.ts b/src/app/core/data/request.actions.ts
index 28149c2ead..2b2de13504 100644
--- a/src/app/core/data/request.actions.ts
+++ b/src/app/core/data/request.actions.ts
@@ -10,7 +10,8 @@ export const RequestActionTypes = {
   CONFIGURE: type('dspace/core/data/request/CONFIGURE'),
   EXECUTE: type('dspace/core/data/request/EXECUTE'),
   COMPLETE: type('dspace/core/data/request/COMPLETE'),
-  RESET_TIMESTAMPS: type('dspace/core/data/request/RESET_TIMESTAMPS')
+  RESET_TIMESTAMPS: type('dspace/core/data/request/RESET_TIMESTAMPS'),
+  REMOVE: type('dspace/core/data/request/REMOVE')
 };
 
 /* tslint:disable:max-classes-per-file */
@@ -82,6 +83,24 @@ export class ResetResponseTimestampsAction implements Action {
   }
 }
 
+/**
+ * An ngrx action to remove a cached request
+ */
+export class RequestRemoveAction implements Action {
+  type = RequestActionTypes.REMOVE;
+  uuid: string;
+
+  /**
+   * Create a new RequestRemoveAction
+   *
+   * @param uuid
+   *    the request's uuid
+   */
+  constructor(uuid: string) {
+    this.uuid = uuid
+  }
+}
+
 /* tslint:enable:max-classes-per-file */
 
 /**
@@ -91,4 +110,5 @@ export type RequestAction
   = RequestConfigureAction
   | RequestExecuteAction
   | RequestCompleteAction
-  | ResetResponseTimestampsAction;
+  | ResetResponseTimestampsAction
+  | RequestRemoveAction;
diff --git a/src/app/core/data/request.reducer.ts b/src/app/core/data/request.reducer.ts
index a680de2d6b..322ac46727 100644
--- a/src/app/core/data/request.reducer.ts
+++ b/src/app/core/data/request.reducer.ts
@@ -1,6 +1,6 @@
 import {
   RequestActionTypes, RequestAction, RequestConfigureAction,
-  RequestExecuteAction, RequestCompleteAction, ResetResponseTimestampsAction
+  RequestExecuteAction, RequestCompleteAction, ResetResponseTimestampsAction, RequestRemoveAction
 } from './request.actions';
 import { RestRequest } from './request.models';
 import { RestResponse } from '../cache/response.models';
@@ -38,6 +38,10 @@ export function requestReducer(state = initialState, action: RequestAction): Req
       return resetResponseTimestamps(state, action as ResetResponseTimestampsAction);
     }
 
+    case RequestActionTypes.REMOVE: {
+      return removeRequest(state, action as RequestRemoveAction);
+    }
+
     default: {
       return state;
     }
@@ -95,3 +99,13 @@ function resetResponseTimestamps(state: RequestState, action: ResetResponseTimes
   });
   return newState;
 }
+
+function removeRequest(state: RequestState, action: RequestRemoveAction): RequestState {
+  const newState = Object.create(null);
+  for (const value in state) {
+    if (value !== action.uuid) {
+      newState[value] = state[value];
+    }
+  }
+  return newState;
+}
diff --git a/src/app/core/data/request.service.ts b/src/app/core/data/request.service.ts
index 285ed06545..922f035139 100644
--- a/src/app/core/data/request.service.ts
+++ b/src/app/core/data/request.service.ts
@@ -15,23 +15,23 @@ import {
 import { race as observableRace } from 'rxjs';
 import { Injectable } from '@angular/core';
 
-import { MemoizedSelector, select, Store } from '@ngrx/store';
-import { hasNoValue, hasValue, isNotUndefined } from '../../shared/empty.util';
+import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
+import { hasNoValue, hasValue, isNotEmpty, isNotUndefined } from '../../shared/empty.util';
 import { CacheableObject } from '../cache/object-cache.reducer';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { DSOSuccessResponse, RestResponse } from '../cache/response.models';
 import { coreSelector, CoreState } from '../core.reducers';
-import { IndexName } from '../index/index.reducer';
+import { IndexName, IndexState } from '../index/index.reducer';
 import { pathSelector } from '../shared/selectors';
 import { UUIDService } from '../shared/uuid.service';
-import { RequestConfigureAction, RequestExecuteAction } from './request.actions';
+import { RequestConfigureAction, RequestExecuteAction, RequestRemoveAction } from './request.actions';
 import { GetRequest, RestRequest } from './request.models';
 
 import { RequestEntry } from './request.reducer';
 import { CommitSSBAction } from '../cache/server-sync-buffer.actions';
 import { RestRequestMethod } from './rest-request-method';
 import { getResponseFromEntry } from '../shared/operators';
-import { AddToIndexAction } from '../index/index.actions';
+import { AddToIndexAction, RemoveFromIndexBySubstringAction } from '../index/index.actions';
 
 @Injectable()
 export class RequestService {
@@ -39,7 +39,8 @@ export class RequestService {
 
   constructor(private objectCache: ObjectCacheService,
               private uuidService: UUIDService,
-              private store: Store<CoreState>) {
+              private store: Store<CoreState>,
+              private indexStore: Store<IndexState>) {
   }
 
   private entryFromUUIDSelector(uuid: string): MemoizedSelector<CoreState, RequestEntry> {
@@ -54,6 +55,25 @@ export class RequestService {
     return pathSelector<CoreState, string>(coreSelector, 'index', IndexName.UUID_MAPPING, uuid);
   }
 
+  private uuidsFromHrefSubstringSelector(selector: MemoizedSelector<any, IndexState>, name: string, href: string): MemoizedSelector<any, string[]> {
+    return createSelector(selector, (state: IndexState) => this.getUuidsFromHrefSubstring(state, name, href));
+  }
+
+  private getUuidsFromHrefSubstring(state: IndexState, name: string, href: string): string[] {
+    let result = [];
+    if (isNotEmpty(state)) {
+      const subState = state[name];
+      if (isNotEmpty(subState)) {
+        for (const value in subState) {
+          if (value.indexOf(href) > -1) {
+            result = [...result, subState[value]];
+          }
+        }
+      }
+    }
+    return result;
+  }
+
   generateRequestId(): string {
     return `client/${this.uuidService.generate()}`;
   }
@@ -119,6 +139,32 @@ export class RequestService {
     }
   }
 
+  /**
+   * Remove all request cache providing (part of) the href
+   * This also includes href-to-uuid index cache
+   * @param href    A substring of the request(s) href
+   */
+  removeByHrefSubstring(href: string) {
+    this.store.pipe(
+      select(this.uuidsFromHrefSubstringSelector(pathSelector<CoreState, IndexState>(coreSelector, 'index'), IndexName.REQUEST, href)),
+      take(1)
+    ).subscribe((uuids: string[]) => {
+      for (const uuid of uuids) {
+        this.removeByUuid(uuid);
+      }
+    });
+    this.requestsOnTheirWayToTheStore = this.requestsOnTheirWayToTheStore.filter((reqHref: string) => reqHref.indexOf(href) < 0);
+    this.indexStore.dispatch(new RemoveFromIndexBySubstringAction(IndexName.REQUEST, href));
+  }
+
+  /**
+   * Remove request cache using the request's UUID
+   * @param uuid
+   */
+  removeByUuid(uuid: string) {
+    this.store.dispatch(new RequestRemoveAction(uuid));
+  }
+
   /**
    * Check if a request is in the cache or if it's still pending
    * @param {GetRequest} request The request to check
diff --git a/src/app/core/index/index.actions.ts b/src/app/core/index/index.actions.ts
index 014b6561a3..98d07d59d5 100644
--- a/src/app/core/index/index.actions.ts
+++ b/src/app/core/index/index.actions.ts
@@ -8,7 +8,8 @@ import { IndexName } from './index.reducer';
  */
 export const IndexActionTypes = {
   ADD: type('dspace/core/index/ADD'),
-  REMOVE_BY_VALUE: type('dspace/core/index/REMOVE_BY_VALUE')
+  REMOVE_BY_VALUE: type('dspace/core/index/REMOVE_BY_VALUE'),
+  REMOVE_BY_SUBSTRING: type('dspace/core/index/REMOVE_BY_SUBSTRING')
 };
 
 /* tslint:disable:max-classes-per-file */
@@ -60,6 +61,30 @@ export class RemoveFromIndexByValueAction implements Action {
     this.payload = { name, value };
   }
 
+}
+
+/**
+ * An ngrx action to remove multiple values from the index by substring
+ */
+export class RemoveFromIndexBySubstringAction implements Action {
+  type = IndexActionTypes.REMOVE_BY_SUBSTRING;
+  payload: {
+    name: IndexName,
+    value: string
+  };
+
+  /**
+   * Create a new RemoveFromIndexByValueAction
+   *
+   * @param name
+   *    the name of the index to remove from
+   * @param value
+   *    the value to remove the UUID for
+   */
+  constructor(name: IndexName, value: string) {
+    this.payload = { name, value };
+  }
+
 }
 /* tslint:enable:max-classes-per-file */
 
diff --git a/src/app/core/index/index.reducer.ts b/src/app/core/index/index.reducer.ts
index c179182509..64b41e2111 100644
--- a/src/app/core/index/index.reducer.ts
+++ b/src/app/core/index/index.reducer.ts
@@ -2,7 +2,7 @@ import {
   IndexAction,
   IndexActionTypes,
   AddToIndexAction,
-  RemoveFromIndexByValueAction
+  RemoveFromIndexByValueAction, RemoveFromIndexBySubstringAction
 } from './index.actions';
 
 export enum IndexName {
@@ -31,6 +31,10 @@ export function indexReducer(state = initialState, action: IndexAction): IndexSt
       return removeFromIndexByValue(state, action as RemoveFromIndexByValueAction)
     }
 
+    case IndexActionTypes.REMOVE_BY_SUBSTRING: {
+      return removeFromIndexBySubstring(state, action as RemoveFromIndexBySubstringAction)
+    }
+
     default: {
       return state;
     }
@@ -60,3 +64,16 @@ function removeFromIndexByValue(state: IndexState, action: RemoveFromIndexByValu
     [action.payload.name]: newSubState
   });
 }
+
+function removeFromIndexBySubstring(state: IndexState, action: RemoveFromIndexByValueAction): IndexState {
+  const subState = state[action.payload.name];
+  const newSubState = Object.create(null);
+  for (const value in subState) {
+    if (value.indexOf(action.payload.value) < 0) {
+      newSubState[value] = subState[value];
+    }
+  }
+  return Object.assign({}, state, {
+    [action.payload.name]: newSubState
+  });
+}

From 5fb5aad408f9eafda2ec477e43c352486c098d1b Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 22 Jan 2019 13:35:15 +0100
Subject: [PATCH 11/44] 58789: Clear index cache and reload lists after adding
 metadata schema

---
 .../metadata-registry/metadata-registry.component.html      | 2 +-
 .../metadata-registry/metadata-registry.component.ts        | 5 +++++
 .../metadata-schema-form/metadata-schema-form.component.ts  | 1 +
 src/app/core/registry/registry.service.ts                   | 6 ++++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
index 661c116a4e..4084a88c1a 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
@@ -7,7 +7,7 @@
             <p id="description" class="pb-2">{{'admin.registries.metadata.description' | translate}}</p>
 
             <ds-metadata-schema-form
-            ></ds-metadata-schema-form>
+              (submitForm)="createdSchema($event)"></ds-metadata-schema-form>
 
             <ds-pagination
                     *ngIf="(metadataSchemas | async)?.payload?.totalElements > 0"
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
index cfd5da1ee1..8405e05faa 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -62,6 +62,11 @@ export class MetadataRegistryComponent {
     );
   }
 
+  createdSchema(event) {
+    this.registryService.clearMetadataSchemaRequests().subscribe((value) => console.log('cleared for substring: ' + value));
+    this.updateSchemas();
+  }
+
   deleteSchemas() {
     this.registryService.getSelectedMetadataSchemas().subscribe(
       (schemas) => {
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
index 0071316d28..53a01af9da 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -104,6 +104,7 @@ export class MetadataSchemaFormComponent implements OnInit {
         if (schema == null) {
           this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), values)).subscribe((newSchema) => {
             console.log(newSchema);
+            this.submitForm.emit(newSchema);
             // TODO: Reload the list of schemas
           });
         } else {
diff --git a/src/app/core/registry/registry.service.ts b/src/app/core/registry/registry.service.ts
index 5392baa191..0acba0fdc0 100644
--- a/src/app/core/registry/registry.service.ts
+++ b/src/app/core/registry/registry.service.ts
@@ -370,4 +370,10 @@ export class RegistryService {
       getResponseFromEntry()
     );
   }
+
+  public clearMetadataSchemaRequests(): Observable<string> {
+    return this.halService.getEndpoint(this.metadataSchemasPath).pipe(
+      tap((href: string) => this.requestService.removeByHrefSubstring(href))
+    )
+  }
 }

From 27f3f9c7a1cae356597059a4ce6ff259b59c38e7 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 22 Jan 2019 13:46:45 +0100
Subject: [PATCH 12/44] 58789: Force reload list after editing and deleting
 metadata as well

---
 .../metadata-registry.component.html          |  3 +--
 .../metadata-registry.component.ts            | 25 +++++++++++++------
 .../metadata-schema-form.component.ts         |  5 +---
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
index 4084a88c1a..b9590978ed 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
@@ -6,8 +6,7 @@
 
             <p id="description" class="pb-2">{{'admin.registries.metadata.description' | translate}}</p>
 
-            <ds-metadata-schema-form
-              (submitForm)="createdSchema($event)"></ds-metadata-schema-form>
+            <ds-metadata-schema-form (submitForm)="forceUpdateSchemas()"></ds-metadata-schema-form>
 
             <ds-pagination
                     *ngIf="(metadataSchemas | async)?.payload?.totalElements > 0"
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
index 8405e05faa..ced3e019ff 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -9,6 +9,7 @@ import { map } from 'rxjs/operators';
 import { hasValue } from '../../../shared/empty.util';
 import { RestResponse } from '../../../core/cache/response.models';
 import { zip } from 'rxjs/internal/observable/zip';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
 
 @Component({
   selector: 'ds-metadata-registry',
@@ -23,7 +24,8 @@ export class MetadataRegistryComponent {
     pageSize: 2
   });
 
-  constructor(private registryService: RegistryService) {
+  constructor(private registryService: RegistryService,
+              private notificationsService: NotificationsService) {
     this.updateSchemas();
   }
 
@@ -36,6 +38,11 @@ export class MetadataRegistryComponent {
     this.metadataSchemas = this.registryService.getMetadataSchemas(this.config);
   }
 
+  private forceUpdateSchemas() {
+    this.registryService.clearMetadataSchemaRequests().subscribe();
+    this.updateSchemas();
+  }
+
   editSchema(schema: MetadataSchema) {
     this.registryService.editMetadataSchema(schema);
   }
@@ -62,11 +69,6 @@ export class MetadataRegistryComponent {
     );
   }
 
-  createdSchema(event) {
-    this.registryService.clearMetadataSchemaRequests().subscribe((value) => console.log('cleared for substring: ' + value));
-    this.updateSchemas();
-  }
-
   deleteSchemas() {
     this.registryService.getSelectedMetadataSchemas().subscribe(
       (schemas) => {
@@ -77,8 +79,15 @@ export class MetadataRegistryComponent {
           }
         }
         zip(...tasks$).subscribe((responses: RestResponse[]) => {
-          console.log('deleted ' + responses.length + ' schemas');
-          // TODO: Reload the list of schemas
+          const successResponses = responses.filter((response: RestResponse) => response.isSuccessful);
+          const failedResponses = responses.filter((response: RestResponse) => !response.isSuccessful);
+          if (successResponses.length > 0) {
+            this.notificationsService.success('Success', `Successfully deleted ${successResponses.length} metadata schemas`);
+          }
+          if (failedResponses.length > 0) {
+            this.notificationsService.error('Error', `Failed to delete ${failedResponses.length} metadata schemas`);
+          }
+          this.forceUpdateSchemas();
         });
       }
     )
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
index 53a01af9da..e1f6ae859c 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -103,9 +103,7 @@ export class MetadataSchemaFormComponent implements OnInit {
         };
         if (schema == null) {
           this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), values)).subscribe((newSchema) => {
-            console.log(newSchema);
             this.submitForm.emit(newSchema);
-            // TODO: Reload the list of schemas
           });
         } else {
           this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), {
@@ -113,8 +111,7 @@ export class MetadataSchemaFormComponent implements OnInit {
             prefix: (values.prefix ? values.prefix : schema.prefix),
             namespace: (values.namespace ? values.namespace : schema.namespace)
           })).subscribe((updatedSchema) => {
-            console.log(updatedSchema);
-            // TODO: Reload the list of schemas
+            this.submitForm.emit(updatedSchema);
           });
         }
       }

From 2f853f09b9d14a017257bedf4dfb632902162b69 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 22 Jan 2019 13:51:57 +0100
Subject: [PATCH 13/44] 58789: Preventing submit from firing multiple times +
 some code cleanup

---
 .../metadata-registry/metadata-registry.component.ts      | 4 ++--
 .../metadata-schema-form.component.ts                     | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
index ced3e019ff..df8b82b076 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -5,7 +5,7 @@ import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { MetadataSchema } from '../../../core/metadata/metadataschema.model';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { map } from 'rxjs/operators';
+import { map, take } from 'rxjs/operators';
 import { hasValue } from '../../../shared/empty.util';
 import { RestResponse } from '../../../core/cache/response.models';
 import { zip } from 'rxjs/internal/observable/zip';
@@ -70,7 +70,7 @@ export class MetadataRegistryComponent {
   }
 
   deleteSchemas() {
-    this.registryService.getSelectedMetadataSchemas().subscribe(
+    this.registryService.getSelectedMetadataSchemas().pipe(take(1)).subscribe(
       (schemas) => {
         const tasks$ = [];
         for (const schema of schemas) {
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
index e1f6ae859c..9d35ae5ff7 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -8,9 +8,6 @@ import {
 import { FormGroup } from '@angular/forms';
 import { RegistryService } from '../../../../core/registry/registry.service';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
-import { FormService } from '../../../../shared/form/form.service';
-import { Store } from '@ngrx/store';
-import { AppState } from '../../../../app.reducer';
 import { take } from 'rxjs/operators';
 import { MetadataSchema } from '../../../../core/metadata/metadataschema.model';
 
@@ -73,11 +70,10 @@ export class MetadataSchemaFormComponent implements OnInit {
 
   @Output() submitForm: EventEmitter<any> = new EventEmitter();
 
-  constructor(private registryService: RegistryService, private formBuilderService: FormBuilderService, private formService: FormService, private store: Store<AppState>) {
+  constructor(private registryService: RegistryService, private formBuilderService: FormBuilderService) {
   }
 
   ngOnInit() {
-
     this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
     this.registryService.getActiveMetadataSchema().subscribe((schema) => {
       this.formGroup.patchValue({
@@ -95,7 +91,7 @@ export class MetadataSchemaFormComponent implements OnInit {
   }
 
   onSubmit() {
-    this.registryService.getActiveMetadataSchema().subscribe(
+    this.registryService.getActiveMetadataSchema().pipe(take(1)).subscribe(
       (schema) => {
         const values = {
           prefix: this.name.value,

From 55f5857c9c0387549d5689d7ad917c46938aee7b Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 22 Jan 2019 14:22:39 +0100
Subject: [PATCH 14/44] 58789: Error fix and selecting/deselecting schemas
 improvement

---
 .../metadata-registry/metadata-registry.component.html    | 2 +-
 .../metadata-registry/metadata-registry.component.ts      | 8 +++++++-
 src/app/core/cache/builders/remote-data-build.service.ts  | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
index b9590978ed..009dcb8a4f 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
@@ -30,7 +30,7 @@
                         <tbody>
                         <tr *ngFor="let schema of (metadataSchemas | async)?.payload?.page"
                             (click)="editSchema(schema)"
-                            [class.active-row]="isActive(schema) | async">
+                            [ngClass]="{'table-primary' : isActive(schema) | async}">
                             <td>
                                 <label>
                                     <input type="checkbox"
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
index df8b82b076..78e1e6c3a6 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -44,7 +44,13 @@ export class MetadataRegistryComponent {
   }
 
   editSchema(schema: MetadataSchema) {
-    this.registryService.editMetadataSchema(schema);
+    this.getActiveSchema().pipe(take(1)).subscribe((activeSchema) => {
+      if (schema === activeSchema) {
+        this.registryService.cancelEditMetadataSchema();
+      } else {
+        this.registryService.editMetadataSchema(schema);
+      }
+    });
   }
 
   isActive(schema: MetadataSchema): Observable<boolean> {
diff --git a/src/app/core/cache/builders/remote-data-build.service.ts b/src/app/core/cache/builders/remote-data-build.service.ts
index 1dc255f26e..62a4992787 100644
--- a/src/app/core/cache/builders/remote-data-build.service.ts
+++ b/src/app/core/cache/builders/remote-data-build.service.ts
@@ -94,8 +94,8 @@ export class RemoteDataBuildService {
   toRemoteDataObservable<T>(requestEntry$: Observable<RequestEntry>, payload$: Observable<T>) {
     return observableCombineLatest(requestEntry$, payload$).pipe(
       map(([reqEntry, payload]) => {
-        const requestPending = hasValue(reqEntry.requestPending) ? reqEntry.requestPending : true;
-        const responsePending = hasValue(reqEntry.responsePending) ? reqEntry.responsePending : false;
+        const requestPending = hasValue(reqEntry) && hasValue(reqEntry.requestPending) ? reqEntry.requestPending : true;
+        const responsePending = hasValue(reqEntry) && hasValue(reqEntry.responsePending) ? reqEntry.responsePending : false;
         let isSuccessful: boolean;
         let error: RemoteDataError;
         if (hasValue(reqEntry) && hasValue(reqEntry.response)) {

From 8029f65d4f93c3fa1a91e47edcb04081efc18dc4 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 22 Jan 2019 14:38:07 +0100
Subject: [PATCH 15/44] 58789: More improvements to selecting metadata schemas

---
 .../metadata-registry/metadata-registry.component.html     | 7 +++----
 .../metadata-registry/metadata-registry.component.scss     | 5 +++++
 .../metadata-registry/metadata-registry.component.ts       | 3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.scss

diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
index 009dcb8a4f..1da0b1090a 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
@@ -29,7 +29,6 @@
                         </thead>
                         <tbody>
                         <tr *ngFor="let schema of (metadataSchemas | async)?.payload?.page"
-                            (click)="editSchema(schema)"
                             [ngClass]="{'table-primary' : isActive(schema) | async}">
                             <td>
                                 <label>
@@ -39,9 +38,9 @@
                                     >
                                 </label>
                             </td>
-                            <td><a [routerLink]="[schema.prefix]">{{schema.id}}</a></td>
-                            <td><a [routerLink]="[schema.prefix]">{{schema.namespace}}</a></td>
-                            <td><a [routerLink]="[schema.prefix]">{{schema.prefix}}</a></td>
+                            <td class="selectable-row" (click)="editSchema(schema)"><a [routerLink]="[schema.prefix]">{{schema.id}}</a></td>
+                            <td class="selectable-row" (click)="editSchema(schema)"><a [routerLink]="[schema.prefix]">{{schema.namespace}}</a></td>
+                            <td class="selectable-row" (click)="editSchema(schema)"><a [routerLink]="[schema.prefix]">{{schema.prefix}}</a></td>
                         </tr>
                         </tbody>
                     </table>
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.scss b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.scss
new file mode 100644
index 0000000000..8c208ffad5
--- /dev/null
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.scss
@@ -0,0 +1,5 @@
+@import '../../../../styles/variables.scss';
+
+.selectable-row:hover {
+  cursor: pointer;
+}
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
index 78e1e6c3a6..ef5bec6262 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -13,7 +13,8 @@ import { NotificationsService } from '../../../shared/notifications/notification
 
 @Component({
   selector: 'ds-metadata-registry',
-  templateUrl: './metadata-registry.component.html'
+  templateUrl: './metadata-registry.component.html',
+  styleUrls: ['./metadata-registry.component.scss']
 })
 export class MetadataRegistryComponent {
 

From eb198383fe05d34c29f74cca892e4664c0e91003 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 22 Jan 2019 15:05:45 +0100
Subject: [PATCH 16/44] 58789: Update metadata-schema content-type fix

---
 src/app/core/registry/registry.service.ts | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/app/core/registry/registry.service.ts b/src/app/core/registry/registry.service.ts
index 0acba0fdc0..f80275cb1e 100644
--- a/src/app/core/registry/registry.service.ts
+++ b/src/app/core/registry/registry.service.ts
@@ -54,6 +54,8 @@ import { ResourceType } from '../shared/resource-type';
 import { NormalizedMetadataSchema } from '../metadata/normalized-metadata-schema.model';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { NotificationOptions } from '../../shared/notifications/models/notification-options.model';
+import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
+import { HttpHeaders } from '@angular/common/http';
 
 const metadataRegistryStateSelector = (state: AppState) => state.metadataRegistry;
 const editMetadataSchemaSelector = createSelector(metadataRegistryStateSelector, (metadataState: MetadataRegistryState) => metadataState.editSchema);
@@ -315,9 +317,17 @@ export class RegistryService {
 
     const request$ = endpoint$.pipe(
       take(1),
-      map((endpoint: string) => (isUpdate ?
-        new UpdateMetadataSchemaRequest(requestId, endpoint, JSON.stringify(serializedSchema)) :
-        new CreateMetadataSchemaRequest(requestId, endpoint, JSON.stringify(serializedSchema))))
+      map((endpoint: string) => {
+        if (isUpdate) {
+          const options: HttpOptions = Object.create({});
+          let headers = new HttpHeaders();
+          headers = headers.append('Content-Type', 'application/json');
+          options.headers = headers;
+          return new UpdateMetadataSchemaRequest(requestId, endpoint, JSON.stringify(serializedSchema), options);
+        } else {
+          return new CreateMetadataSchemaRequest(requestId, endpoint, JSON.stringify(serializedSchema));
+        }
+      })
     );
 
     // Execute the post/put request
@@ -335,7 +345,6 @@ export class RegistryService {
           }
         } else {
           this.notificationsService.success('Success', `Successfully ${isUpdate ? 'updated' : 'created'} metadata schema "${schema.prefix}"`);
-          console.log(response);
           return response;
         }
       }),

From 09eb01c5450fd354e3acdb348d971350c6ca349f Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 22 Jan 2019 15:49:09 +0100
Subject: [PATCH 17/44] 58789: Deselect all schemas and set page to 1 after
 deleting schemas

---
 .../metadata-registry/metadata-registry.actions.ts   | 12 +++++++++++-
 .../metadata-registry/metadata-registry.component.ts |  6 +++++-
 .../metadata-registry/metadata-registry.reducers.ts  | 12 ++++++++++++
 src/app/core/registry/registry.service.ts            | 10 +++++++++-
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.actions.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.actions.ts
index 55fcd61644..92d4a7a72a 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.actions.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.actions.ts
@@ -17,11 +17,13 @@ export const MetadataRegistryActionTypes = {
   CANCEL_EDIT_SCHEMA: type('dspace/metadata-registry/CANCEL_SCHEMA'),
   SELECT_SCHEMA: type('dspace/metadata-registry/SELECT_SCHEMA'),
   DESELECT_SCHEMA: type('dspace/metadata-registry/DESELECT_SCHEMA'),
+  DESELECT_ALL_SCHEMA: type('dspace/metadata-registry/DESELECT_ALL_SCHEMA'),
 
   EDIT_FIELD: type('dspace/metadata-registry/EDIT_FIELD'),
   CANCEL_EDIT_FIELD: type('dspace/metadata-registry/CANCEL_FIELD'),
   SELECT_FIELD: type('dspace/metadata-registry/SELECT_FIELD'),
-  DESELECT_FIELD: type('dspace/metadata-registry/DESELEC_FIELDT')
+  DESELECT_FIELD: type('dspace/metadata-registry/DESELECT_FIELD'),
+  DESELECT_ALL_FIELD: type('dspace/metadata-registry/DESELECT_ALL_FIELD')
 };
 
 /* tslint:disable:max-classes-per-file */
@@ -65,6 +67,10 @@ export class MetadataRegistryDeselectSchemaAction implements Action {
   }
 }
 
+export class MetadataRegistryDeselectAllSchemaAction implements Action {
+  type = MetadataRegistryActionTypes.DESELECT_ALL_SCHEMA;
+}
+
 /**
  * Used to collapse the sidebar
  */
@@ -105,6 +111,10 @@ export class MetadataRegistryDeselectFieldAction implements Action {
   }
 }
 
+export class MetadataRegistryDeselectAllFieldAction implements Action {
+  type = MetadataRegistryActionTypes.DESELECT_ALL_FIELD;
+}
+
 /* tslint:enable:max-classes-per-file */
 
 /**
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
index ef5bec6262..2b1ea9eba8 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -10,6 +10,7 @@ import { hasValue } from '../../../shared/empty.util';
 import { RestResponse } from '../../../core/cache/response.models';
 import { zip } from 'rxjs/internal/observable/zip';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { Route, Router } from '@angular/router';
 
 @Component({
   selector: 'ds-metadata-registry',
@@ -26,7 +27,8 @@ export class MetadataRegistryComponent {
   });
 
   constructor(private registryService: RegistryService,
-              private notificationsService: NotificationsService) {
+              private notificationsService: NotificationsService,
+              private router: Router) {
     this.updateSchemas();
   }
 
@@ -94,6 +96,8 @@ export class MetadataRegistryComponent {
           if (failedResponses.length > 0) {
             this.notificationsService.error('Error', `Failed to delete ${failedResponses.length} metadata schemas`);
           }
+          this.registryService.deselectAllMetadataSchema();
+          this.router.navigate([], { queryParams: { page: 1 }, queryParamsHandling: 'merge'});
           this.forceUpdateSchemas();
         });
       }
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.ts
index 28f8ba025b..3c68157a3e 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.ts
@@ -62,6 +62,12 @@ export function metadataRegistryReducer(state = initialState, action: MetadataRe
       });
     }
 
+    case MetadataRegistryActionTypes.DESELECT_ALL_SCHEMA: {
+      return Object.assign({}, state, {
+        selectedSchemas: []
+      });
+    }
+
     case MetadataRegistryActionTypes.EDIT_FIELD: {
       return Object.assign({}, state, {
         editField: (action as MetadataRegistryEditFieldAction).field
@@ -88,6 +94,12 @@ export function metadataRegistryReducer(state = initialState, action: MetadataRe
       });
     }
 
+    case MetadataRegistryActionTypes.DESELECT_ALL_FIELD: {
+      return Object.assign({}, state, {
+        selectedFields: []
+      });
+    }
+
     default:
       return state;
   }
diff --git a/src/app/core/registry/registry.service.ts b/src/app/core/registry/registry.service.ts
index f80275cb1e..4bd59c3714 100644
--- a/src/app/core/registry/registry.service.ts
+++ b/src/app/core/registry/registry.service.ts
@@ -39,7 +39,7 @@ import { AppState } from '../../app.reducer';
 import { MetadataRegistryState } from '../../+admin/admin-registries/metadata-registry/metadata-registry.reducers';
 import {
   MetadataRegistryCancelFieldAction,
-  MetadataRegistryCancelSchemaAction,
+  MetadataRegistryCancelSchemaAction, MetadataRegistryDeselectAllFieldAction, MetadataRegistryDeselectAllSchemaAction,
   MetadataRegistryDeselectFieldAction,
   MetadataRegistryDeselectSchemaAction,
   MetadataRegistryEditFieldAction,
@@ -276,6 +276,10 @@ export class RegistryService {
     this.store.dispatch(new MetadataRegistryDeselectSchemaAction(schema))
   }
 
+  public deselectAllMetadataSchema() {
+    this.store.dispatch(new MetadataRegistryDeselectAllSchemaAction())
+  }
+
   public getSelectedMetadataSchemas(): Observable<MetadataSchema[]> {
     return this.store.pipe(select(selectedMetadataSchemasSelector));
   }
@@ -300,6 +304,10 @@ export class RegistryService {
     this.store.dispatch(new MetadataRegistryDeselectFieldAction(field))
   }
 
+  public deselectAllMetadataField(field: MetadataField) {
+    this.store.dispatch(new MetadataRegistryDeselectAllFieldAction())
+  }
+
   public getSelectedMetadataFields(): Observable<MetadataField[]> {
     return this.store.pipe(select(selectedMetadataFieldsSelector));
   }

From fe44146291f1e8149a71ac6ce22328773b65325c Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 22 Jan 2019 17:15:14 +0100
Subject: [PATCH 18/44] 58789: Metadata field create/edit/delete feature

---
 .../metadata-schema-form.component.ts         |  3 +-
 .../metadata-field-form.component.ts          | 46 +++++-----
 .../metadata-schema.component.html            | 11 ++-
 .../metadata-schema.component.scss            |  5 ++
 .../metadata-schema.component.ts              | 50 +++++++++--
 src/app/core/cache/response.models.ts         | 10 +++
 .../data/metadatafield-parsing.service.ts     | 19 +++++
 ...metadatafields-response-parsing.service.ts | 13 ++-
 src/app/core/data/request.models.ts           | 21 +++++
 src/app/core/metadata/metadatafield.model.ts  |  3 +
 src/app/core/registry/registry.service.ts     | 83 +++++++++++++++++--
 11 files changed, 212 insertions(+), 52 deletions(-)
 create mode 100644 src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.scss
 create mode 100644 src/app/core/data/metadatafield-parsing.service.ts

diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
index 9d35ae5ff7..e5214977ca 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -13,8 +13,7 @@ import { MetadataSchema } from '../../../../core/metadata/metadataschema.model';
 
 @Component({
   selector: 'ds-metadata-schema-form',
-  templateUrl: './metadata-schema-form.component.html',
-  // styleUrls: ['./metadata-schema-form.component.css']
+  templateUrl: './metadata-schema-form.component.html'
 })
 export class MetadataSchemaFormComponent implements OnInit {
 
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
index 8c8c889739..fbabbb722d 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
@@ -6,11 +6,11 @@ import { RegistryService } from '../../../../core/registry/registry.service';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
 import { Observable } from 'rxjs/internal/Observable';
 import { MetadataField } from '../../../../core/metadata/metadatafield.model';
+import { take } from 'rxjs/operators';
 
 @Component({
   selector: 'ds-metadata-field-form',
-  templateUrl: './metadata-field-form.component.html',
-  // styleUrls: ['./metadata-field-form.component.css']
+  templateUrl: './metadata-field-form.component.html'
 })
 export class MetadataFieldFormComponent implements OnInit {
 
@@ -60,7 +60,6 @@ export class MetadataFieldFormComponent implements OnInit {
   }
 
   ngOnInit() {
-
     this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
     this.registryService.getActiveMetadataField().subscribe((field) => {
       this.formGroup.patchValue({
@@ -74,36 +73,33 @@ export class MetadataFieldFormComponent implements OnInit {
     });
   }
 
-  getMetadataField(): Observable<MetadataField> {
-    return this.registryService.getActiveMetadataField();
-  }
-
   onCancel() {
     this.registryService.cancelEditMetadataField();
   }
 
   onSubmit() {
-    this.registryService.getActiveMetadataField().subscribe(
+    this.registryService.getActiveMetadataField().pipe(take(1)).subscribe(
       (field) => {
-
+        const values = {
+          schema: this.metadataSchema,
+          element: this.element.value,
+          qualifier: this.qualifier.value,
+          scopeNote: this.scopeNote.value
+        };
         if (field == null) {
-          console.log('metadata field to create:');
-          console.log('element: ' + this.element.value);
-          if (this.qualifier.value) {
-            console.log('qualifier: ' + this.qualifier.value);
-          }
-          if (this.scopeNote.value) {
-            console.log('scopeNote: ' + this.scopeNote.value);
-          }
+          this.registryService.createOrUpdateMetadataField(Object.assign(new MetadataField(), values)).subscribe((newField) => {
+            this.submitForm.emit(newField);
+          });
         } else {
-          console.log('metadata field to update:');
-          console.log('element: ' + this.element.value);
-          if (this.qualifier.value) {
-            console.log('qualifier: ' + this.qualifier.value);
-          }
-          if (this.scopeNote.value) {
-            console.log('scopeNote: ' + this.scopeNote.value);
-          }
+          this.registryService.createOrUpdateMetadataField(Object.assign(new MetadataField(), {
+            id: field.id,
+            schema: this.metadataSchema,
+            element: (values.element ? values.element : field.element),
+            qualifier: (values.qualifier ? values.qualifier : field.qualifier),
+            scopeNote: (values.scopeNote ? values.scopeNote : field.scopeNote)
+          })).subscribe((updatedField) => {
+            this.submitForm.emit(updatedField);
+          });
         }
       }
     );
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
index 1e422bc381..81c4dcd414 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
@@ -6,7 +6,9 @@
 
       <p id="description" class="pb-2">{{'admin.registries.schema.description' | translate:namespace }}</p>
 
-      <ds-metadata-field-form [metadataSchema]="metadataSchema | async"></ds-metadata-field-form>
+      <ds-metadata-field-form
+        [metadataSchema]="(metadataSchema | async)?.payload"
+        (submitForm)="forceUpdateFields()"></ds-metadata-field-form>
 
       <h3>{{'admin.registries.schema.fields.head' | translate}}</h3>
 
@@ -28,7 +30,8 @@
               </tr>
             </thead>
             <tbody>
-              <tr *ngFor="let field of (metadataFields | async)?.payload?.page" (click)="editField(field)">
+              <tr *ngFor="let field of (metadataFields | async)?.payload?.page"
+                  [ngClass]="{'table-primary' : isActive(field) | async}">
                 <td>
                   <label>
                     <input type="checkbox"
@@ -36,8 +39,8 @@
                            (change)="selectMetadataField(field, $event)">
                   </label>
                 </td>
-                <td>{{(metadataSchema | async)?.payload?.prefix}}.{{field.element}}<label *ngIf="field.qualifier">.</label>{{field.qualifier}}</td>
-                <td>{{field.scopeNote}}</td>
+                <td class="selectable-row" (click)="editField(field)">{{(metadataSchema | async)?.payload?.prefix}}.{{field.element}}<label *ngIf="field.qualifier">.</label>{{field.qualifier}}</td>
+                <td class="selectable-row" (click)="editField(field)">{{field.scopeNote}}</td>
               </tr>
             </tbody>
           </table>
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.scss b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.scss
new file mode 100644
index 0000000000..8c208ffad5
--- /dev/null
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.scss
@@ -0,0 +1,5 @@
+@import '../../../../styles/variables.scss';
+
+.selectable-row:hover {
+  cursor: pointer;
+}
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
index 3a31436fe2..0411b505aa 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
@@ -1,17 +1,22 @@
 import { Component, OnInit } from '@angular/core';
 import { RegistryService } from '../../../core/registry/registry.service';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { Observable } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { MetadataField } from '../../../core/metadata/metadatafield.model';
 import { MetadataSchema } from '../../../core/metadata/metadataschema.model';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { map } from 'rxjs/operators';
+import { map, take } from 'rxjs/operators';
+import { hasValue } from '../../../shared/empty.util';
+import { RestResponse } from '../../../core/cache/response.models';
+import { zip } from 'rxjs/internal/observable/zip';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
 
 @Component({
   selector: 'ds-metadata-schema',
-  templateUrl: './metadata-schema.component.html'
+  templateUrl: './metadata-schema.component.html',
+  styleUrls: ['./metadata-schema.component.scss']
 })
 export class MetadataSchemaComponent implements OnInit {
 
@@ -25,7 +30,10 @@ export class MetadataSchemaComponent implements OnInit {
     pageSizeOptions: [25, 50, 100, 200]
   });
 
-  constructor(private registryService: RegistryService, private route: ActivatedRoute) {
+  constructor(private registryService: RegistryService,
+              private route: ActivatedRoute,
+              private notificationsService: NotificationsService,
+              private router: Router) {
 
   }
 
@@ -53,8 +61,19 @@ export class MetadataSchemaComponent implements OnInit {
     });
   }
 
+  private forceUpdateFields() {
+    this.registryService.clearMetadataFieldRequests().subscribe();
+    this.updateFields();
+  }
+
   editField(field: MetadataField) {
-    this.registryService.editMetadataField(field);
+    this.getActiveField().pipe(take(1)).subscribe((activeField) => {
+      if (field === activeField) {
+        this.registryService.cancelEditMetadataField();
+      } else {
+        this.registryService.editMetadataField(field);
+      }
+    });
   }
 
   isActive(field: MetadataField): Observable<boolean> {
@@ -80,12 +99,27 @@ export class MetadataSchemaComponent implements OnInit {
   }
 
   deleteFields() {
-    this.registryService.getSelectedMetadataFields().subscribe(
+    this.registryService.getSelectedMetadataFields().pipe(take(1)).subscribe(
       (fields) => {
-        console.log('metadata fields to delete: ');
+        const tasks$ = [];
         for (const field of fields) {
-          console.log(field);
+          if (hasValue(field.id)) {
+            tasks$.push(this.registryService.deleteMetadataSchema(field.id));
+          }
         }
+        zip(...tasks$).subscribe((responses: RestResponse[]) => {
+          const successResponses = responses.filter((response: RestResponse) => response.isSuccessful);
+          const failedResponses = responses.filter((response: RestResponse) => !response.isSuccessful);
+          if (successResponses.length > 0) {
+            this.notificationsService.success('Success', `Successfully deleted ${successResponses.length} metadata fields`);
+          }
+          if (failedResponses.length > 0) {
+            this.notificationsService.error('Error', `Failed to delete ${failedResponses.length} metadata fields`);
+          }
+          this.registryService.deselectAllMetadataField();
+          this.router.navigate([], { queryParams: { page: 1 }, queryParamsHandling: 'merge'});
+          this.forceUpdateFields();
+        });
       }
     )
   }
diff --git a/src/app/core/cache/response.models.ts b/src/app/core/cache/response.models.ts
index 8b31e3d449..d2531b03ab 100644
--- a/src/app/core/cache/response.models.ts
+++ b/src/app/core/cache/response.models.ts
@@ -10,6 +10,7 @@ import { RegistryMetadatafieldsResponse } from '../registry/registry-metadatafie
 import { RegistryBitstreamformatsResponse } from '../registry/registry-bitstreamformats-response.model';
 import { AuthStatus } from '../auth/models/auth-status.model';
 import { MetadataSchema } from '../metadata/metadataschema.model';
+import { MetadataField } from '../metadata/metadatafield.model';
 
 /* tslint:disable:max-classes-per-file */
 export class RestResponse {
@@ -71,6 +72,15 @@ export class MetadataschemaSuccessResponse extends RestResponse {
   }
 }
 
+export class MetadatafieldSuccessResponse extends RestResponse {
+  constructor(
+    public metadatafield: MetadataField,
+    public statusCode: string
+  ) {
+    super(true, statusCode);
+  }
+}
+
 export class SearchSuccessResponse extends RestResponse {
   constructor(
     public results: SearchQueryResponse,
diff --git a/src/app/core/data/metadatafield-parsing.service.ts b/src/app/core/data/metadatafield-parsing.service.ts
new file mode 100644
index 0000000000..2ad95e920b
--- /dev/null
+++ b/src/app/core/data/metadatafield-parsing.service.ts
@@ -0,0 +1,19 @@
+import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer';
+import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
+import { RestRequest } from './request.models';
+import { ResponseParsingService } from './parsing.service';
+import { Injectable } from '@angular/core';
+import { MetadatafieldSuccessResponse, MetadataschemaSuccessResponse, RestResponse } from '../cache/response.models';
+import { MetadataField } from '../metadata/metadatafield.model';
+
+@Injectable()
+export class MetadatafieldParsingService implements ResponseParsingService {
+
+  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
+    const payload = data.payload;
+
+    const deserialized = new DSpaceRESTv2Serializer(MetadataField).deserialize(payload);
+    return new MetadatafieldSuccessResponse(deserialized, data.statusCode);
+  }
+
+}
diff --git a/src/app/core/data/registry-metadatafields-response-parsing.service.ts b/src/app/core/data/registry-metadatafields-response-parsing.service.ts
index 7ed3d2dc21..93fd67b702 100644
--- a/src/app/core/data/registry-metadatafields-response-parsing.service.ts
+++ b/src/app/core/data/registry-metadatafields-response-parsing.service.ts
@@ -9,6 +9,7 @@ import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.seriali
 import { DSOResponseParsingService } from './dso-response-parsing.service';
 import { Injectable } from '@angular/core';
 import { RegistryMetadatafieldsResponse } from '../registry/registry-metadatafields-response.model';
+import { hasValue } from '../../shared/empty.util';
 
 @Injectable()
 export class RegistryMetadatafieldsResponseParsingService implements ResponseParsingService {
@@ -18,10 +19,14 @@ export class RegistryMetadatafieldsResponseParsingService implements ResponsePar
   parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
     const payload = data.payload;
 
-    const metadatafields = payload._embedded.metadatafields;
-    metadatafields.forEach((field) => {
-      field.schema = field._embedded.schema;
-    });
+    let metadatafields = [];
+
+    if (hasValue(payload._embedded)) {
+      metadatafields = payload._embedded.metadatafields;
+      metadatafields.forEach((field) => {
+        field.schema = field._embedded.schema;
+      });
+    }
 
     payload.metadatafields = metadatafields;
 
diff --git a/src/app/core/data/request.models.ts b/src/app/core/data/request.models.ts
index 1d176cdca5..2e357cdc1d 100644
--- a/src/app/core/data/request.models.ts
+++ b/src/app/core/data/request.models.ts
@@ -13,6 +13,7 @@ import { RestRequestMethod } from './rest-request-method';
 import { BrowseItemsResponseParsingService } from './browse-items-response-parsing-service';
 import { RegistryMetadataschemasResponseParsingService } from './registry-metadataschemas-response-parsing.service';
 import { MetadataschemaParsingService } from './metadataschema-parsing.service';
+import { MetadatafieldParsingService } from './metadatafield-parsing.service';
 
 /* tslint:disable:max-classes-per-file */
 
@@ -239,6 +240,26 @@ export class UpdateMetadataSchemaRequest extends PutRequest {
   }
 }
 
+export class CreateMetadataFieldRequest extends PostRequest {
+  constructor(uuid: string, href: string, public body?: any, public options?: HttpOptions) {
+    super(uuid, href, body, options);
+  }
+
+  getResponseParser(): GenericConstructor<ResponseParsingService> {
+    return MetadatafieldParsingService;
+  }
+}
+
+export class UpdateMetadataFieldRequest extends PutRequest {
+  constructor(uuid: string, href: string, public body?: any, public options?: HttpOptions) {
+    super(uuid, href, body, options);
+  }
+
+  getResponseParser(): GenericConstructor<ResponseParsingService> {
+    return MetadatafieldParsingService;
+  }
+}
+
 export class RequestError extends Error {
   statusText: string;
 }
diff --git a/src/app/core/metadata/metadatafield.model.ts b/src/app/core/metadata/metadatafield.model.ts
index 77cecb927e..f9b5155649 100644
--- a/src/app/core/metadata/metadatafield.model.ts
+++ b/src/app/core/metadata/metadatafield.model.ts
@@ -3,6 +3,9 @@ import { autoserialize } from 'cerialize';
 import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
 
 export class MetadataField implements ListableObject {
+  @autoserialize
+  id: number;
+
   @autoserialize
   self: string;
 
diff --git a/src/app/core/registry/registry.service.ts b/src/app/core/registry/registry.service.ts
index 4bd59c3714..f07a656de8 100644
--- a/src/app/core/registry/registry.service.ts
+++ b/src/app/core/registry/registry.service.ts
@@ -20,7 +20,7 @@ import { RemoteDataBuildService } from '../cache/builders/remote-data-build.serv
 import { RequestService } from '../data/request.service';
 import { RegistryMetadataschemasResponse } from './registry-metadataschemas-response.model';
 import {
-  ErrorResponse, MetadataschemaSuccessResponse,
+  ErrorResponse, MetadatafieldSuccessResponse, MetadataschemaSuccessResponse,
   RegistryBitstreamformatsSuccessResponse,
   RegistryMetadatafieldsSuccessResponse,
   RegistryMetadataschemasSuccessResponse, RestResponse
@@ -304,7 +304,7 @@ export class RegistryService {
     this.store.dispatch(new MetadataRegistryDeselectFieldAction(field))
   }
 
-  public deselectAllMetadataField(field: MetadataField) {
+  public deselectAllMetadataField() {
     this.store.dispatch(new MetadataRegistryDeselectAllFieldAction())
   }
 
@@ -366,8 +366,79 @@ export class RegistryService {
   }
 
   public deleteMetadataSchema(id: number): Observable<RestResponse> {
+    return this.delete(this.metadataSchemasPath, id);
+  }
+
+  public clearMetadataSchemaRequests(): Observable<string> {
+    return this.halService.getEndpoint(this.metadataSchemasPath).pipe(
+      tap((href: string) => this.requestService.removeByHrefSubstring(href))
+    )
+  }
+
+  public createOrUpdateMetadataField(field: MetadataField): Observable<MetadataField> {
+    const isUpdate = hasValue(field.id);
     const requestId = this.requestService.generateRequestId();
-    const endpoint$ = this.halService.getEndpoint(this.metadataSchemasPath).pipe(
+    const endpoint$ = this.halService.getEndpoint(this.metadataFieldsPath).pipe(
+      isNotEmptyOperator(),
+      map((endpoint: string) => (isUpdate ? `${endpoint}/${field.id}` : `${endpoint}?schemaId=${field.schema.id}`)),
+      distinctUntilChanged()
+    );
+
+    const request$ = endpoint$.pipe(
+      take(1),
+      map((endpoint: string) => {
+        if (isUpdate) {
+          const options: HttpOptions = Object.create({});
+          let headers = new HttpHeaders();
+          headers = headers.append('Content-Type', 'application/json');
+          options.headers = headers;
+          return new UpdateMetadataSchemaRequest(requestId, endpoint, JSON.stringify(field), options);
+        } else {
+          return new CreateMetadataSchemaRequest(requestId, endpoint, JSON.stringify(field));
+        }
+      })
+    );
+
+    // Execute the post/put request
+    request$.pipe(
+      configureRequest(this.requestService)
+    ).subscribe();
+
+    // Return created/updated field
+    return this.requestService.getByUUID(requestId).pipe(
+      getResponseFromEntry(),
+      map((response: RestResponse) => {
+        if (!response.isSuccessful) {
+          if (hasValue((response as any).errorMessage)) {
+            this.notificationsService.error('Server Error:', (response as any).errorMessage, new NotificationOptions(-1));
+          }
+        } else {
+          this.notificationsService.success('Success', `Successfully ${isUpdate ? 'updated' : 'created'} metadata field "${field.schema.prefix}.${field.element}.${field.qualifier}"`);
+          return response;
+        }
+      }),
+      isNotEmptyOperator(),
+      map((response: MetadatafieldSuccessResponse) => {
+        if (isNotEmpty(response.metadatafield)) {
+          return response.metadatafield;
+        }
+      })
+    );
+  }
+
+  public deleteMetadataField(id: number): Observable<RestResponse> {
+    return this.delete(this.metadataFieldsPath, id);
+  }
+
+  public clearMetadataFieldRequests(): Observable<string> {
+    return this.halService.getEndpoint(this.metadataFieldsPath).pipe(
+      tap((href: string) => this.requestService.removeByHrefSubstring(href))
+    )
+  }
+
+  private delete(path: string, id: number): Observable<RestResponse> {
+    const requestId = this.requestService.generateRequestId();
+    const endpoint$ = this.halService.getEndpoint(path).pipe(
       isNotEmptyOperator(),
       map((endpoint: string) => `${endpoint}/${id}`),
       distinctUntilChanged()
@@ -387,10 +458,4 @@ export class RegistryService {
       getResponseFromEntry()
     );
   }
-
-  public clearMetadataSchemaRequests(): Observable<string> {
-    return this.halService.getEndpoint(this.metadataSchemasPath).pipe(
-      tap((href: string) => this.requestService.removeByHrefSubstring(href))
-    )
-  }
 }

From 7f991d2a068290aa6c7791f0f8c0c53050c0bc81 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 22 Jan 2019 17:52:32 +0100
Subject: [PATCH 19/44] 58789: Notifications loaded through messages

---
 resources/i18n/en.json                        | 18 +++++++++++++
 .../metadata-registry.component.ts            | 26 ++++++++++++++++---
 .../metadata-schema.component.ts              | 26 ++++++++++++++++---
 src/app/core/registry/registry.service.ts     | 26 ++++++++++++++++---
 4 files changed, 85 insertions(+), 11 deletions(-)

diff --git a/resources/i18n/en.json b/resources/i18n/en.json
index 169ff0efe9..0e2a15e099 100644
--- a/resources/i18n/en.json
+++ b/resources/i18n/en.json
@@ -181,6 +181,24 @@
             "scopenote": "Scope Note"
           },
           "no-items": "No metadata fields to show."
+        },
+        "notification": {
+          "success": "Success",
+          "failure": "Error",
+          "created": "Successfully created metadata schema \"{{prefix}}\"",
+          "edited": "Successfully edited metadata schema \"{{prefix}}\"",
+          "deleted": {
+            "success": "Successfully deleted {{amount}} metadata schemas",
+            "failure": "Failed to delete {{amount}} metadata schemas"
+          },
+          "field": {
+            "created": "Successfully created metadata field \"{{field}}\"",
+            "edited": "Successfully edited metadata field \"{{field}}\"",
+            "deleted": {
+              "success": "Successfully deleted {{amount}} metadata fields",
+              "failure": "Failed to delete {{amount}} metadata fields"
+            }
+          }
         }
       },
       "bitstream-formats": {
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
index 2b1ea9eba8..dbd09fa178 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -1,6 +1,6 @@
 import { Component } from '@angular/core';
 import { RegistryService } from '../../../core/registry/registry.service';
-import { Observable } from 'rxjs';
+import { Observable, combineLatest as observableCombineLatest } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { MetadataSchema } from '../../../core/metadata/metadataschema.model';
@@ -11,6 +11,7 @@ import { RestResponse } from '../../../core/cache/response.models';
 import { zip } from 'rxjs/internal/observable/zip';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { Route, Router } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'ds-metadata-registry',
@@ -28,7 +29,8 @@ export class MetadataRegistryComponent {
 
   constructor(private registryService: RegistryService,
               private notificationsService: NotificationsService,
-              private router: Router) {
+              private router: Router,
+              private translateService: TranslateService) {
     this.updateSchemas();
   }
 
@@ -91,10 +93,10 @@ export class MetadataRegistryComponent {
           const successResponses = responses.filter((response: RestResponse) => response.isSuccessful);
           const failedResponses = responses.filter((response: RestResponse) => !response.isSuccessful);
           if (successResponses.length > 0) {
-            this.notificationsService.success('Success', `Successfully deleted ${successResponses.length} metadata schemas`);
+            this.showNotification(true, successResponses.length);
           }
           if (failedResponses.length > 0) {
-            this.notificationsService.error('Error', `Failed to delete ${failedResponses.length} metadata schemas`);
+            this.showNotification(false, failedResponses.length);
           }
           this.registryService.deselectAllMetadataSchema();
           this.router.navigate([], { queryParams: { page: 1 }, queryParamsHandling: 'merge'});
@@ -103,4 +105,20 @@ export class MetadataRegistryComponent {
       }
     )
   }
+
+  showNotification(success: boolean, amount: number) {
+    const prefix = 'admin.registries.schema.notification';
+    const suffix = success ? 'success' : 'failure';
+    const messages = observableCombineLatest(
+      this.translateService.get(success ? `${prefix}.${suffix}` : `${prefix}.${suffix}`),
+      this.translateService.get(`${prefix}.deleted.${suffix}`, { amount: amount })
+    );
+    messages.subscribe(([head, content]) => {
+      if (success) {
+        this.notificationsService.success(head, content)
+      } else {
+        this.notificationsService.error(head, content)
+      }
+    });
+  }
 }
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
index 0411b505aa..2cdc9020ba 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { RegistryService } from '../../../core/registry/registry.service';
 import { ActivatedRoute, Router } from '@angular/router';
-import { Observable } from 'rxjs';
+import { Observable, combineLatest as observableCombineLatest } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { MetadataField } from '../../../core/metadata/metadatafield.model';
@@ -12,6 +12,7 @@ import { hasValue } from '../../../shared/empty.util';
 import { RestResponse } from '../../../core/cache/response.models';
 import { zip } from 'rxjs/internal/observable/zip';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'ds-metadata-schema',
@@ -33,7 +34,8 @@ export class MetadataSchemaComponent implements OnInit {
   constructor(private registryService: RegistryService,
               private route: ActivatedRoute,
               private notificationsService: NotificationsService,
-              private router: Router) {
+              private router: Router,
+              private translateService: TranslateService) {
 
   }
 
@@ -111,10 +113,10 @@ export class MetadataSchemaComponent implements OnInit {
           const successResponses = responses.filter((response: RestResponse) => response.isSuccessful);
           const failedResponses = responses.filter((response: RestResponse) => !response.isSuccessful);
           if (successResponses.length > 0) {
-            this.notificationsService.success('Success', `Successfully deleted ${successResponses.length} metadata fields`);
+            this.showNotification(true, successResponses.length);
           }
           if (failedResponses.length > 0) {
-            this.notificationsService.error('Error', `Failed to delete ${failedResponses.length} metadata fields`);
+            this.showNotification(false, failedResponses.length);
           }
           this.registryService.deselectAllMetadataField();
           this.router.navigate([], { queryParams: { page: 1 }, queryParamsHandling: 'merge'});
@@ -123,4 +125,20 @@ export class MetadataSchemaComponent implements OnInit {
       }
     )
   }
+
+  showNotification(success: boolean, amount: number) {
+    const prefix = 'admin.registries.schema.notification';
+    const suffix = success ? 'success' : 'failure';
+    const messages = observableCombineLatest(
+      this.translateService.get(success ? `${prefix}.${suffix}` : `${prefix}.${suffix}`),
+      this.translateService.get(`${prefix}.field.deleted.${suffix}`, { amount: amount })
+    );
+    messages.subscribe(([head, content]) => {
+      if (success) {
+        this.notificationsService.success(head, content)
+      } else {
+        this.notificationsService.error(head, content)
+      }
+    });
+  }
 }
diff --git a/src/app/core/registry/registry.service.ts b/src/app/core/registry/registry.service.ts
index f07a656de8..6cd3a7fa28 100644
--- a/src/app/core/registry/registry.service.ts
+++ b/src/app/core/registry/registry.service.ts
@@ -56,6 +56,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
 import { NotificationOptions } from '../../shared/notifications/models/notification-options.model';
 import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
 import { HttpHeaders } from '@angular/common/http';
+import { TranslateService } from '@ngx-translate/core';
 
 const metadataRegistryStateSelector = (state: AppState) => state.metadataRegistry;
 const editMetadataSchemaSelector = createSelector(metadataRegistryStateSelector, (metadataState: MetadataRegistryState) => metadataState.editSchema);
@@ -74,7 +75,8 @@ export class RegistryService {
               private rdb: RemoteDataBuildService,
               private halService: HALEndpointService,
               private store: Store<AppState>,
-              private notificationsService: NotificationsService) {
+              private notificationsService: NotificationsService,
+              private translateService: TranslateService) {
 
   }
 
@@ -352,7 +354,7 @@ export class RegistryService {
             this.notificationsService.error('Server Error:', (response as any).errorMessage, new NotificationOptions(-1));
           }
         } else {
-          this.notificationsService.success('Success', `Successfully ${isUpdate ? 'updated' : 'created'} metadata schema "${schema.prefix}"`);
+          this.showNotifications(true, isUpdate, false, { prefix: schema.prefix });
           return response;
         }
       }),
@@ -413,7 +415,8 @@ export class RegistryService {
             this.notificationsService.error('Server Error:', (response as any).errorMessage, new NotificationOptions(-1));
           }
         } else {
-          this.notificationsService.success('Success', `Successfully ${isUpdate ? 'updated' : 'created'} metadata field "${field.schema.prefix}.${field.element}.${field.qualifier}"`);
+          const fieldString = `${field.schema.prefix}.${field.element}${field.qualifier ? `.${field.qualifier}` : ''}`;
+          this.showNotifications(true, isUpdate, true, { field: fieldString });
           return response;
         }
       }),
@@ -458,4 +461,21 @@ export class RegistryService {
       getResponseFromEntry()
     );
   }
+
+  private showNotifications(success: boolean, edited: boolean, isField: boolean, options: any) {
+    const prefix = 'admin.registries.schema.notification';
+    const suffix = success ? 'success' : 'failure';
+    const editedString = edited ? 'edited' : 'created';
+    const messages = observableCombineLatest(
+      this.translateService.get(success ? `${prefix}.${suffix}` : `${prefix}.${suffix}`),
+      this.translateService.get(`${prefix}${isField ? '.field' : ''}.${editedString}`, options)
+    );
+    messages.subscribe(([head, content]) => {
+      if (success) {
+        this.notificationsService.success(head, content)
+      } else {
+        this.notificationsService.error(head, content)
+      }
+    });
+  }
 }

From 2521bafa92320f82e3e361fc59afcf652d9a5992 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 23 Jan 2019 11:06:20 +0100
Subject: [PATCH 20/44] 58789: Forms using messages

---
 resources/i18n/en.json                        | 13 +++
 .../metadata-schema-form.component.html       |  4 +-
 .../metadata-schema-form.component.ts         | 88 +++++++++++--------
 .../metadata-field-form.component.html        |  4 +-
 .../metadata-field-form.component.ts          | 81 ++++++++++-------
 5 files changed, 114 insertions(+), 76 deletions(-)

diff --git a/resources/i18n/en.json b/resources/i18n/en.json
index 0e2a15e099..6e3aa22e04 100644
--- a/resources/i18n/en.json
+++ b/resources/i18n/en.json
@@ -161,6 +161,12 @@
         "title": "DSpace Angular :: Metadata Registry",
         "head": "Metadata Registry",
         "description": "The metadata registry maintains a list of all metadata fields available in the repository. These fields may be divided amongst multiple schemas. However, DSpace requires the qualified Dublin Core schema.",
+        "form": {
+          "create": "Create metadata schema",
+          "edit": "Edit metadata schema",
+          "namespace": "Namespace",
+          "name": "Name"
+        },
         "schemas": {
           "table": {
             "id": "ID",
@@ -174,6 +180,13 @@
         "title": "DSpace Angular :: Metadata Schema Registry",
         "head": "Metadata Schema",
         "description": "This is the metadata schema for \"{{namespace}}\".",
+        "form": {
+          "create": "Create metadata field",
+          "edit": "Edit metadata field",
+          "element": "Element",
+          "qualifier": "Qualifier",
+          "scopenote": "Scope Note"
+        },
         "fields": {
           "head": "Schema metadata fields",
           "table": {
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
index c7d1a09fa8..a4a4613565 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.html
@@ -1,11 +1,11 @@
 <div *ngIf="registryService.getActiveMetadataSchema() | async; then editheader; else createHeader"></div>
 
 <ng-template #createHeader>
-    <h4>create metadataschema</h4>
+    <h4>{{messagePrefix + '.create' | translate}}</h4>
 </ng-template>
 
 <ng-template #editheader>
-    <h4>edit metadataschema</h4>
+    <h4>{{messagePrefix + '.edit' | translate}}</h4>
 </ng-template>
 
 <ds-form [formId]="formId"
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
index e5214977ca..f66ce85d11 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -10,6 +10,8 @@ import { RegistryService } from '../../../../core/registry/registry.service';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
 import { take } from 'rxjs/operators';
 import { MetadataSchema } from '../../../../core/metadata/metadataschema.model';
+import { TranslateService } from '@ngx-translate/core';
+import { combineLatest } from 'rxjs/internal/observable/combineLatest';
 
 @Component({
   selector: 'ds-metadata-schema-form',
@@ -18,37 +20,11 @@ import { MetadataSchema } from '../../../../core/metadata/metadataschema.model';
 export class MetadataSchemaFormComponent implements OnInit {
 
   formId = 'metadata-schema-form';
+  messagePrefix = 'admin.registries.metadata.form';
 
-  private name: DynamicInputModel = new DynamicInputModel({
-    id: 'name',
-    label: 'name',
-    name: 'name',
-    validators: {
-      required: null,
-      pattern: '^[^ ,_]{1,32}$'
-    },
-    required: true,
-  });
-  private namespace: DynamicInputModel = new DynamicInputModel({
-      id: 'namespace',
-      label: 'namespace',
-      name: 'namespace',
-      validators: {
-        required: null,
-      },
-      required: true,
-    });
-
-  formModel: DynamicFormControlModel[] = [
-    new DynamicFormGroupModel({
-      id: 'schema',
-      legend: 'schema',
-      group: [
-        this.namespace,
-        this.name
-      ]
-    })
-  ];
+  name: DynamicInputModel;
+  namespace: DynamicInputModel;
+  formModel: DynamicFormControlModel[];
 
   formLayout: DynamicFormLayout = {
     name: {
@@ -69,19 +45,53 @@ export class MetadataSchemaFormComponent implements OnInit {
 
   @Output() submitForm: EventEmitter<any> = new EventEmitter();
 
-  constructor(private registryService: RegistryService, private formBuilderService: FormBuilderService) {
+  constructor(private registryService: RegistryService, private formBuilderService: FormBuilderService, private translateService: TranslateService) {
   }
 
   ngOnInit() {
-    this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
-    this.registryService.getActiveMetadataSchema().subscribe((schema) => {
-      this.formGroup.patchValue({
-          schema: {
-            name: schema != null ? schema.prefix : '',
-            namespace: schema != null ? schema.namespace : ''
+    combineLatest(
+      this.translateService.get(`${this.messagePrefix}.name`),
+      this.translateService.get(`${this.messagePrefix}.namespace`)
+    ).subscribe(([name, namespace]) => {
+      this.name = new DynamicInputModel({
+          id: 'name',
+          label: name,
+          name: 'name',
+          validators: {
+            required: null,
+            pattern: '^[^ ,_]{1,32}$'
+          },
+          required: true,
+        });
+      this.namespace = new DynamicInputModel({
+          id: 'namespace',
+          label: namespace,
+          name: 'namespace',
+          validators: {
+            required: null,
+          },
+          required: true,
+        });
+      this.formModel = [
+        new DynamicFormGroupModel({
+          id: 'schema',
+          legend: 'schema',
+          group: [
+            this.namespace,
+            this.name
+          ]
+        })
+      ];
+      this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
+      this.registryService.getActiveMetadataSchema().subscribe((schema) => {
+        this.formGroup.patchValue({
+            schema: {
+              name: schema != null ? schema.prefix : '',
+              namespace: schema != null ? schema.namespace : ''
+            }
           }
-        }
-      );
+        );
+      });
     });
   }
 
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
index 3d4501e559..4e29fbb6e8 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.html
@@ -1,11 +1,11 @@
 <div *ngIf="registryService.getActiveMetadataField() | async; then editheader; else createHeader"></div>
 
 <ng-template #createHeader>
-    <h4>create metadatafield</h4>
+    <h4>{{messagePrefix + '.create' | translate}}</h4>
 </ng-template>
 
 <ng-template #editheader>
-    <h4>edit metadatafield</h4>
+    <h4>{{messagePrefix + '.edit' | translate}}</h4>
 </ng-template>
 
 <ds-form [formId]="formId"
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
index fbabbb722d..2bad3ed5ce 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
@@ -7,6 +7,8 @@ import { FormBuilderService } from '../../../../shared/form/builder/form-builder
 import { Observable } from 'rxjs/internal/Observable';
 import { MetadataField } from '../../../../core/metadata/metadatafield.model';
 import { take } from 'rxjs/operators';
+import { TranslateService } from '@ngx-translate/core';
+import { combineLatest } from 'rxjs/internal/observable/combineLatest';
 
 @Component({
   selector: 'ds-metadata-field-form',
@@ -15,48 +17,61 @@ import { take } from 'rxjs/operators';
 export class MetadataFieldFormComponent implements OnInit {
 
   formId = 'metadata-field-form';
+  messagePrefix = 'admin.registries.schema.form';
 
   @Input() metadataSchema: MetadataSchema;
 
-  private element: DynamicInputModel = new DynamicInputModel({
-    id: 'element',
-    label: 'element',
-    name: 'element',
-    validators: {
-      required: null,
-    },
-    required: false,
-  });
-  private qualifier: DynamicInputModel = new DynamicInputModel({
-    id: 'qualifier',
-    label: 'qualifier',
-    name: 'qualifier',
-    required: false,
-  });
-  private scopeNote: DynamicInputModel = new DynamicInputModel({
-    id: 'scopeNote',
-    label: 'scopeNote',
-    name: 'scopeNote',
-    required: false,
-  });
+  private element: DynamicInputModel;
+  private qualifier: DynamicInputModel;
+  private scopeNote: DynamicInputModel;
 
-  formModel: DynamicFormControlModel[] = [
-    new DynamicFormGroupModel({
-      id: 'field',
-      legend: 'field',
-      group: [
-        this.element,
-        this.qualifier,
-        this.scopeNote
-      ]
-    })
-  ];
+  formModel: DynamicFormControlModel[];
 
   formGroup: FormGroup;
 
   @Output() submitForm: EventEmitter<any> = new EventEmitter();
 
-  constructor(private registryService: RegistryService, private formBuilderService: FormBuilderService) {
+  constructor(private registryService: RegistryService,
+              private formBuilderService: FormBuilderService,
+              private translateService: TranslateService) {
+    combineLatest(
+      this.translateService.get(`${this.messagePrefix}.element`),
+      this.translateService.get(`${this.messagePrefix}.qualifier`),
+      this.translateService.get(`${this.messagePrefix}.scopenote`)
+    ).subscribe(([element, qualifier, scopenote]) => {
+      this.element = new DynamicInputModel({
+        id: 'element',
+        label: element,
+        name: 'element',
+        validators: {
+          required: null,
+        },
+        required: false,
+      });
+      this.qualifier = new DynamicInputModel({
+        id: 'qualifier',
+        label: qualifier,
+        name: 'qualifier',
+        required: false,
+      });
+      this.scopeNote = new DynamicInputModel({
+        id: 'scopeNote',
+        label: scopenote,
+        name: 'scopeNote',
+        required: false,
+      });
+      this.formModel = [
+        new DynamicFormGroupModel({
+          id: 'field',
+          legend: 'field',
+          group: [
+            this.element,
+            this.qualifier,
+            this.scopeNote
+          ]
+        })
+      ];
+    })
   }
 
   ngOnInit() {

From 54f88402a9cdc61502f14b851766d152fd1414cd Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 23 Jan 2019 11:51:03 +0100
Subject: [PATCH 21/44] 58789: Fixed alignment of input fields for both schema
 and field

---
 .../metadata-schema-form.component.ts         | 16 ++---
 .../metadata-field-form.component.ts          | 72 +++++++++++--------
 2 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
index f66ce85d11..dc7ee86f4b 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -29,14 +29,12 @@ export class MetadataSchemaFormComponent implements OnInit {
   formLayout: DynamicFormLayout = {
     name: {
       grid: {
-        control: 'col col-sm-5',
-        label: 'col col-sm-5'
+        host: 'col col-sm-6 d-inline-block'
       }
     },
     namespace: {
       grid: {
-        control: 'col col-sm-5',
-        label: 'col col-sm-5'
+        host: 'col col-sm-6 d-inline-block'
       }
     }
   };
@@ -73,14 +71,8 @@ export class MetadataSchemaFormComponent implements OnInit {
           required: true,
         });
       this.formModel = [
-        new DynamicFormGroupModel({
-          id: 'schema',
-          legend: 'schema',
-          group: [
-            this.namespace,
-            this.name
-          ]
-        })
+        this.namespace,
+        this.name
       ];
       this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
       this.registryService.getActiveMetadataSchema().subscribe((schema) => {
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
index 2bad3ed5ce..f8c4868b75 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
@@ -1,6 +1,11 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { MetadataSchema } from '../../../../core/metadata/metadataschema.model';
-import { DynamicFormControlModel, DynamicFormGroupModel, DynamicInputModel } from '@ng-dynamic-forms/core';
+import {
+  DynamicFormControlModel,
+  DynamicFormGroupModel,
+  DynamicFormLayout,
+  DynamicInputModel
+} from '@ng-dynamic-forms/core';
 import { FormGroup } from '@angular/forms';
 import { RegistryService } from '../../../../core/registry/registry.service';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
@@ -21,12 +26,29 @@ export class MetadataFieldFormComponent implements OnInit {
 
   @Input() metadataSchema: MetadataSchema;
 
-  private element: DynamicInputModel;
-  private qualifier: DynamicInputModel;
-  private scopeNote: DynamicInputModel;
-
+  element: DynamicInputModel;
+  qualifier: DynamicInputModel;
+  scopeNote: DynamicInputModel;
   formModel: DynamicFormControlModel[];
 
+  formLayout: DynamicFormLayout = {
+    element: {
+      grid: {
+        host: 'col col-sm-6 d-inline-block'
+      }
+    },
+    qualifier: {
+      grid: {
+        host: 'col col-sm-6 d-inline-block'
+      }
+    },
+    scopeNote: {
+      grid: {
+        host: 'col col-sm-12 d-inline-block'
+      }
+    }
+  };
+
   formGroup: FormGroup;
 
   @Output() submitForm: EventEmitter<any> = new EventEmitter();
@@ -34,6 +56,9 @@ export class MetadataFieldFormComponent implements OnInit {
   constructor(private registryService: RegistryService,
               private formBuilderService: FormBuilderService,
               private translateService: TranslateService) {
+  }
+
+  ngOnInit() {
     combineLatest(
       this.translateService.get(`${this.messagePrefix}.element`),
       this.translateService.get(`${this.messagePrefix}.qualifier`),
@@ -46,7 +71,7 @@ export class MetadataFieldFormComponent implements OnInit {
         validators: {
           required: null,
         },
-        required: false,
+        required: true,
       });
       this.qualifier = new DynamicInputModel({
         id: 'qualifier',
@@ -61,30 +86,21 @@ export class MetadataFieldFormComponent implements OnInit {
         required: false,
       });
       this.formModel = [
-        new DynamicFormGroupModel({
-          id: 'field',
-          legend: 'field',
-          group: [
-            this.element,
-            this.qualifier,
-            this.scopeNote
-          ]
-        })
+        this.element,
+        this.qualifier,
+        this.scopeNote
       ];
-    })
-  }
-
-  ngOnInit() {
-    this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
-    this.registryService.getActiveMetadataField().subscribe((field) => {
-      this.formGroup.patchValue({
-          field: {
-            element: field != null ? field.element : '',
-            qualifier: field != null ? field.qualifier : '',
-            scopeNote: field != null ? field.scopeNote : ''
+      this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
+      this.registryService.getActiveMetadataField().subscribe((field) => {
+        this.formGroup.patchValue({
+            field: {
+              element: field != null ? field.element : '',
+              qualifier: field != null ? field.qualifier : '',
+              scopeNote: field != null ? field.scopeNote : ''
+            }
           }
-        }
-      );
+        );
+      });
     });
   }
 

From 62b9a4854320d1a2d1e9b605847aa4aa04a98180 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 23 Jan 2019 13:23:10 +0100
Subject: [PATCH 22/44] 58789: JSDocs

---
 .../metadata-registry.component.ts            | 49 +++++++++++++++
 .../metadata-schema-form.component.ts         | 39 ++++++++++++
 .../metadata-field-form.component.ts          | 46 ++++++++++++++
 .../metadata-schema.component.ts              | 61 +++++++++++++++++++
 4 files changed, 195 insertions(+)

diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
index dbd09fa178..b19eb04718 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -18,10 +18,20 @@ import { TranslateService } from '@ngx-translate/core';
   templateUrl: './metadata-registry.component.html',
   styleUrls: ['./metadata-registry.component.scss']
 })
+/**
+ * A component used for managing all existing metadata schemas within the repository.
+ * The admin can create, edit or delete metadata schemas here.
+ */
 export class MetadataRegistryComponent {
 
+  /**
+   * A list of all the current metadata schemas within the repository
+   */
   metadataSchemas: Observable<RemoteData<PaginatedList<MetadataSchema>>>;
 
+  /**
+   * Pagination config used to display the list of metadata schemas
+   */
   config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'registry-metadataschemas-pagination',
     pageSize: 2
@@ -34,20 +44,35 @@ export class MetadataRegistryComponent {
     this.updateSchemas();
   }
 
+  /**
+   * Event triggered when the user changes page
+   * @param event
+   */
   onPageChange(event) {
     this.config.currentPage = event;
     this.updateSchemas();
   }
 
+  /**
+   * Update the list of schemas by fetching it from the rest api or cache
+   */
   private updateSchemas() {
     this.metadataSchemas = this.registryService.getMetadataSchemas(this.config);
   }
 
+  /**
+   * Force-update the list of schemas by first clearing the cache related to metadata schemas, then performing
+   * a new REST call
+   */
   private forceUpdateSchemas() {
     this.registryService.clearMetadataSchemaRequests().subscribe();
     this.updateSchemas();
   }
 
+  /**
+   * Start editing the selected metadata schema
+   * @param schema
+   */
   editSchema(schema: MetadataSchema) {
     this.getActiveSchema().pipe(take(1)).subscribe((activeSchema) => {
       if (schema === activeSchema) {
@@ -58,28 +83,47 @@ export class MetadataRegistryComponent {
     });
   }
 
+  /**
+   * Checks whether the given metadata schema is active (being edited)
+   * @param schema
+   */
   isActive(schema: MetadataSchema): Observable<boolean> {
     return this.getActiveSchema().pipe(
       map((activeSchema) => schema === activeSchema)
     );
   }
 
+  /**
+   * Gets the active metadata schema (being edited)
+   */
   getActiveSchema(): Observable<MetadataSchema> {
     return this.registryService.getActiveMetadataSchema();
   }
 
+  /**
+   * Select a metadata schema within the list (checkbox)
+   * @param schema
+   * @param event
+   */
   selectMetadataSchema(schema: MetadataSchema, event) {
     event.target.checked ?
       this.registryService.selectMetadataSchema(schema) :
       this.registryService.deselectMetadataSchema(schema);
   }
 
+  /**
+   * Checks whether a given metadata schema is selected in the list (checkbox)
+   * @param schema
+   */
   isSelected(schema: MetadataSchema): Observable<boolean> {
     return this.registryService.getSelectedMetadataSchemas().pipe(
       map((schemas) => schemas.find((selectedSchema) => selectedSchema === schema) != null)
     );
   }
 
+  /**
+   * Delete all the selected metadata schemas
+   */
   deleteSchemas() {
     this.registryService.getSelectedMetadataSchemas().pipe(take(1)).subscribe(
       (schemas) => {
@@ -106,6 +150,11 @@ export class MetadataRegistryComponent {
     )
   }
 
+  /**
+   * Show notifications for an amount of deleted metadata schemas
+   * @param success   Whether or not the notification should be a success message (error message when false)
+   * @param amount    The amount of deleted metadata schemas
+   */
   showNotification(success: boolean, amount: number) {
     const prefix = 'admin.registries.schema.notification';
     const suffix = success ? 'success' : 'failure';
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
index dc7ee86f4b..c8c1765947 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -17,15 +17,39 @@ import { combineLatest } from 'rxjs/internal/observable/combineLatest';
   selector: 'ds-metadata-schema-form',
   templateUrl: './metadata-schema-form.component.html'
 })
+/**
+ * A form used for creating and editing metadata schemas
+ */
 export class MetadataSchemaFormComponent implements OnInit {
 
+  /**
+   * A unique id used for ds-form
+   */
   formId = 'metadata-schema-form';
+
+  /**
+   * The prefix for all messages related to this form
+   */
   messagePrefix = 'admin.registries.metadata.form';
 
+  /**
+   * A dynamic input model for the name field
+   */
   name: DynamicInputModel;
+
+  /**
+   * A dynamic input model for the namespace field
+   */
   namespace: DynamicInputModel;
+
+  /**
+   * A list of all dynamic input models
+   */
   formModel: DynamicFormControlModel[];
 
+  /**
+   * Layout used for structuring the form inputs
+   */
   formLayout: DynamicFormLayout = {
     name: {
       grid: {
@@ -39,8 +63,14 @@ export class MetadataSchemaFormComponent implements OnInit {
     }
   };
 
+  /**
+   * A FormGroup that combines all inputs
+   */
   formGroup: FormGroup;
 
+  /**
+   * An EventEmitter that's fired whenever the form is being submitted
+   */
   @Output() submitForm: EventEmitter<any> = new EventEmitter();
 
   constructor(private registryService: RegistryService, private formBuilderService: FormBuilderService, private translateService: TranslateService) {
@@ -87,10 +117,19 @@ export class MetadataSchemaFormComponent implements OnInit {
     });
   }
 
+  /**
+   * Stop editing the currently selected metadata schema
+   */
   onCancel() {
     this.registryService.cancelEditMetadataSchema();
   }
 
+  /**
+   * Submit the form
+   * When the schema has an id attached -> Edit the schema
+   * When the schema has no id attached -> Create new schema
+   * Emit the updated/created schema using the EventEmitter submitForm
+   */
   onSubmit() {
     this.registryService.getActiveMetadataSchema().pipe(take(1)).subscribe(
       (schema) => {
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
index f8c4868b75..224e83f7bb 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
@@ -19,18 +19,49 @@ import { combineLatest } from 'rxjs/internal/observable/combineLatest';
   selector: 'ds-metadata-field-form',
   templateUrl: './metadata-field-form.component.html'
 })
+/**
+ * A form used for creating and editing metadata fields
+ */
 export class MetadataFieldFormComponent implements OnInit {
 
+  /**
+   * A unique id used for ds-form
+   */
   formId = 'metadata-field-form';
+
+  /**
+   * The prefix for all messages related to this form
+   */
   messagePrefix = 'admin.registries.schema.form';
 
+  /**
+   * The metadata schema this field is attached to
+   */
   @Input() metadataSchema: MetadataSchema;
 
+  /**
+   * A dynamic input model for the element field
+   */
   element: DynamicInputModel;
+
+  /**
+   * A dynamic input model for the qualifier field
+   */
   qualifier: DynamicInputModel;
+
+  /**
+   * A dynamic input model for the scopeNote field
+   */
   scopeNote: DynamicInputModel;
+
+  /**
+   * A list of all dynamic input models
+   */
   formModel: DynamicFormControlModel[];
 
+  /**
+   * Layout used for structuring the form inputs
+   */
   formLayout: DynamicFormLayout = {
     element: {
       grid: {
@@ -49,8 +80,14 @@ export class MetadataFieldFormComponent implements OnInit {
     }
   };
 
+  /**
+   * A FormGroup that combines all inputs
+   */
   formGroup: FormGroup;
 
+  /**
+   * An EventEmitter that's fired whenever the form is being submitted
+   */
   @Output() submitForm: EventEmitter<any> = new EventEmitter();
 
   constructor(private registryService: RegistryService,
@@ -104,10 +141,19 @@ export class MetadataFieldFormComponent implements OnInit {
     });
   }
 
+  /**
+   * Stop editing the currently selected metadata field
+   */
   onCancel() {
     this.registryService.cancelEditMetadataField();
   }
 
+  /**
+   * Submit the form
+   * When the field has an id attached -> Edit the field
+   * When the field has no id attached -> Create new field
+   * Emit the updated/created field using the EventEmitter submitForm
+   */
   onSubmit() {
     this.registryService.getActiveMetadataField().pipe(take(1)).subscribe(
       (field) => {
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
index 2cdc9020ba..b1dd87d2c6 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
@@ -19,12 +19,30 @@ import { TranslateService } from '@ngx-translate/core';
   templateUrl: './metadata-schema.component.html',
   styleUrls: ['./metadata-schema.component.scss']
 })
+/**
+ * A component used for managing all existing metadata fields within the current metadata schema.
+ * The admin can create, edit or delete metadata fields here.
+ */
 export class MetadataSchemaComponent implements OnInit {
 
+  /**
+   * The namespace of the metadata schema
+   */
   namespace;
 
+  /**
+   * The metadata schema
+   */
   metadataSchema: Observable<RemoteData<MetadataSchema>>;
+
+  /**
+   * A list of all the fields attached to this metadata schema
+   */
   metadataFields: Observable<RemoteData<PaginatedList<MetadataField>>>;
+
+  /**
+   * Pagination config used to display the list of metadata fields
+   */
   config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'registry-metadatafields-pagination',
     pageSize: 25,
@@ -45,16 +63,27 @@ export class MetadataSchemaComponent implements OnInit {
     });
   }
 
+  /**
+   * Initialize the component using the params within the url (schemaName)
+   * @param params
+   */
   initialize(params) {
     this.metadataSchema = this.registryService.getMetadataSchemaByName(params.schemaName);
     this.updateFields();
   }
 
+  /**
+   * Event triggered when the user changes page
+   * @param event
+   */
   onPageChange(event) {
     this.config.currentPage = event;
     this.updateFields();
   }
 
+  /**
+   * Update the list of fields by fetching it from the rest api or cache
+   */
   private updateFields() {
     this.metadataSchema.subscribe((schemaData) => {
       const schema = schemaData.payload;
@@ -63,11 +92,19 @@ export class MetadataSchemaComponent implements OnInit {
     });
   }
 
+  /**
+   * Force-update the list of fields by first clearing the cache related to metadata fields, then performing
+   * a new REST call
+   */
   private forceUpdateFields() {
     this.registryService.clearMetadataFieldRequests().subscribe();
     this.updateFields();
   }
 
+  /**
+   * Start editing the selected metadata field
+   * @param field
+   */
   editField(field: MetadataField) {
     this.getActiveField().pipe(take(1)).subscribe((activeField) => {
       if (field === activeField) {
@@ -78,28 +115,47 @@ export class MetadataSchemaComponent implements OnInit {
     });
   }
 
+  /**
+   * Checks whether the given metadata field is active (being edited)
+   * @param field
+   */
   isActive(field: MetadataField): Observable<boolean> {
     return this.getActiveField().pipe(
       map((activeField) => field === activeField)
     );
   }
 
+  /**
+   * Gets the active metadata field (being edited)
+   */
   getActiveField(): Observable<MetadataField> {
     return this.registryService.getActiveMetadataField();
   }
 
+  /**
+   * Select a metadata field within the list (checkbox)
+   * @param field
+   * @param event
+   */
   selectMetadataField(field: MetadataField, event) {
     event.target.checked ?
       this.registryService.selectMetadataField(field) :
       this.registryService.deselectMetadataField(field);
   }
 
+  /**
+   * Checks whether a given metadata field is selected in the list (checkbox)
+   * @param field
+   */
   isSelected(field: MetadataField): Observable<boolean> {
     return this.registryService.getSelectedMetadataFields().pipe(
       map((fields) => fields.find((selectedField) => selectedField === field) != null)
     );
   }
 
+  /**
+   * Delete all the selected metadata fields
+   */
   deleteFields() {
     this.registryService.getSelectedMetadataFields().pipe(take(1)).subscribe(
       (fields) => {
@@ -126,6 +182,11 @@ export class MetadataSchemaComponent implements OnInit {
     )
   }
 
+  /**
+   * Show notifications for an amount of deleted metadata fields
+   * @param success   Whether or not the notification should be a success message (error message when false)
+   * @param amount    The amount of deleted metadata fields
+   */
   showNotification(success: boolean, amount: number) {
     const prefix = 'admin.registries.schema.notification';
     const suffix = success ? 'success' : 'failure';

From 4e0678a0bdec1a2ef04fe4d1afdb9ce74994236f Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 23 Jan 2019 14:42:23 +0100
Subject: [PATCH 23/44] 58789: MetadataRegistryComponent tests

---
 .../metadata-registry.component.spec.ts       | 59 ++++++++++++++++---
 1 file changed, 51 insertions(+), 8 deletions(-)

diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
index 8b72afa083..efbefbd694 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
@@ -1,5 +1,5 @@
 import { MetadataRegistryComponent } from './metadata-registry.component';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, fakeAsync, inject, TestBed, tick } from '@angular/core/testing';
 import { of as observableOf } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
@@ -13,8 +13,11 @@ import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
 import { PaginationComponent } from '../../../shared/pagination/pagination.component';
 import { HostWindowServiceStub } from '../../../shared/testing/host-window-service-stub';
 import { HostWindowService } from '../../../shared/host-window.service';
+import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
 
-describe('MetadataRegistryComponent', () => {
+fdescribe('MetadataRegistryComponent', () => {
   let comp: MetadataRegistryComponent;
   let fixture: ComponentFixture<MetadataRegistryComponent>;
   let registryService: RegistryService;
@@ -33,9 +36,15 @@ describe('MetadataRegistryComponent', () => {
     }
   ];
   const mockSchemas = observableOf(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockSchemasList)));
+  /* tslint:disable:no-empty */
   const registryServiceStub = {
-    getMetadataSchemas: () => mockSchemas
+    getMetadataSchemas: () => mockSchemas,
+    getActiveMetadataSchema: () => observableOf(undefined),
+    getSelectedMetadataSchemas: () => observableOf([]),
+    editMetadataSchema: (schema) => {},
+    cancelEditMetadataSchema: () => {}
   };
+  /* tslint:enable:no-empty */
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
@@ -43,8 +52,12 @@ describe('MetadataRegistryComponent', () => {
       declarations: [MetadataRegistryComponent, PaginationComponent, EnumKeysPipe],
       providers: [
         { provide: RegistryService, useValue: registryServiceStub },
-        { provide: HostWindowService, useValue: new HostWindowServiceStub(0) }
-      ]
+        { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
+        { provide: NotificationsService, useValue: NotificationsServiceStub }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).overrideComponent(MetadataRegistryComponent, {
+      set: { changeDetection: ChangeDetectionStrategy.Default }
     }).compileComponents();
   }));
 
@@ -52,19 +65,49 @@ describe('MetadataRegistryComponent', () => {
     fixture = TestBed.createComponent(MetadataRegistryComponent);
     comp = fixture.componentInstance;
     fixture.detectChanges();
-    registryService = (comp as any).service;
   });
 
+  beforeEach(inject([RegistryService], (s) => {
+    registryService = s;
+  }));
+
   it('should contain two schemas', () => {
     const tbody: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas>tbody')).nativeElement;
     expect(tbody.children.length).toBe(2);
   });
 
   it('should contain the correct schemas', () => {
-    const dcName: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas tr:nth-child(1) td:nth-child(3)')).nativeElement;
+    const dcName: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas tr:nth-child(1) td:nth-child(4)')).nativeElement;
     expect(dcName.textContent).toBe('dc');
 
-    const mockName: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas tr:nth-child(2) td:nth-child(3)')).nativeElement;
+    const mockName: HTMLElement = fixture.debugElement.query(By.css('#metadata-schemas tr:nth-child(2) td:nth-child(4)')).nativeElement;
     expect(mockName.textContent).toBe('mock');
   });
+
+  describe('when clicking a metadata schema row', () => {
+    let row: HTMLElement;
+
+    beforeEach(() => {
+      spyOn(registryService, 'editMetadataSchema');
+      row = fixture.debugElement.query(By.css('.selectable-row')).nativeElement;
+      row.click();
+      fixture.detectChanges();
+    });
+
+    it('should start editing the selected schema', async(() => {
+      fixture.whenStable().then(() => {
+        expect(registryService.editMetadataSchema).toHaveBeenCalledWith(mockSchemasList[0]);
+      });
+    }));
+
+    it('should cancel editing the selected schema when clicked again', async(() => {
+      spyOn(registryService, 'getActiveMetadataSchema').and.returnValue(observableOf(mockSchemasList[0]));
+      spyOn(registryService, 'cancelEditMetadataSchema');
+      row.click();
+      fixture.detectChanges();
+      fixture.whenStable().then(() => {
+        expect(registryService.cancelEditMetadataSchema).toHaveBeenCalled();
+      });
+    }));
+  })
 });

From 6e9cad0fbaaeded835665bb329bbce8222e9e89a Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 23 Jan 2019 14:43:00 +0100
Subject: [PATCH 24/44] 58789: Remove f in fdescribe

---
 .../metadata-registry/metadata-registry.component.spec.ts       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
index efbefbd694..c129252644 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
@@ -17,7 +17,7 @@ import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
 
-fdescribe('MetadataRegistryComponent', () => {
+describe('MetadataRegistryComponent', () => {
   let comp: MetadataRegistryComponent;
   let fixture: ComponentFixture<MetadataRegistryComponent>;
   let registryService: RegistryService;

From cba07300d16393fe31a2e73918cedd6a96a023ea Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 23 Jan 2019 15:01:34 +0100
Subject: [PATCH 25/44] 58789: Fields not being filled in fixed

---
 .../metadata-schema-form.component.ts                 |  9 +++------
 .../metadata-field-form.component.ts                  | 11 ++++-------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
index c8c1765947..259c7430a6 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -107,12 +107,9 @@ export class MetadataSchemaFormComponent implements OnInit {
       this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
       this.registryService.getActiveMetadataSchema().subscribe((schema) => {
         this.formGroup.patchValue({
-            schema: {
-              name: schema != null ? schema.prefix : '',
-              namespace: schema != null ? schema.namespace : ''
-            }
-          }
-        );
+          name: schema != null ? schema.prefix : '',
+          namespace: schema != null ? schema.namespace : ''
+        });
       });
     });
   }
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
index 224e83f7bb..7b42484bb0 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
@@ -130,13 +130,10 @@ export class MetadataFieldFormComponent implements OnInit {
       this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
       this.registryService.getActiveMetadataField().subscribe((field) => {
         this.formGroup.patchValue({
-            field: {
-              element: field != null ? field.element : '',
-              qualifier: field != null ? field.qualifier : '',
-              scopeNote: field != null ? field.scopeNote : ''
-            }
-          }
-        );
+          element: field != null ? field.element : '',
+          qualifier: field != null ? field.qualifier : '',
+          scopeNote: field != null ? field.scopeNote : ''
+        });
       });
     });
   }

From 374f7acd7aaf23a4ed7f22a4006a5e14efc95afb Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 23 Jan 2019 15:27:49 +0100
Subject: [PATCH 26/44] 58789: MetadataSchemaComponent tests

---
 .../metadata-registry.component.spec.ts       |  2 +-
 .../metadata-schema.component.spec.ts         | 57 ++++++++++++++++---
 2 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
index c129252644..82fd560e4f 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
@@ -109,5 +109,5 @@ describe('MetadataRegistryComponent', () => {
         expect(registryService.cancelEditMetadataSchema).toHaveBeenCalled();
       });
     }));
-  })
+  });
 });
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
index 96777116f4..a73e2d889c 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
@@ -1,5 +1,5 @@
 import { MetadataSchemaComponent } from './metadata-schema.component';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
 import { of as observableOf } from 'rxjs';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
@@ -17,8 +17,11 @@ import { HostWindowService } from '../../../shared/host-window.service';
 import { RouterStub } from '../../../shared/testing/router-stub';
 import { RouterTestingModule } from '@angular/router/testing';
 import { ActivatedRouteStub } from '../../../shared/testing/active-router-stub';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
 
-describe('MetadataSchemaComponent', () => {
+fdescribe('MetadataSchemaComponent', () => {
   let comp: MetadataSchemaComponent;
   let fixture: ComponentFixture<MetadataSchemaComponent>;
   let registryService: RegistryService;
@@ -67,11 +70,17 @@ describe('MetadataSchemaComponent', () => {
     }
   ];
   const mockSchemas = observableOf(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockSchemasList)));
+  /* tslint:disable:no-empty */
   const registryServiceStub = {
     getMetadataSchemas: () => mockSchemas,
     getMetadataFieldsBySchema: (schema: MetadataSchema) => observableOf(new RemoteData(false, false, true, undefined, new PaginatedList(null, mockFieldsList.filter((value) => value.schema === schema)))),
-    getMetadataSchemaByName: (schemaName: string) => observableOf(new RemoteData(false, false, true, undefined, mockSchemasList.filter((value) => value.prefix === schemaName)[0]))
+    getMetadataSchemaByName: (schemaName: string) => observableOf(new RemoteData(false, false, true, undefined, mockSchemasList.filter((value) => value.prefix === schemaName)[0])),
+    getActiveMetadataField: () => observableOf(undefined),
+    getSelectedMetadataFields: () => observableOf([]),
+    editMetadataField: (schema) => {},
+    cancelEditMetadataField: () => {}
   };
+  /* tslint:enable:no-empty */
   const schemaNameParam = 'mock';
   const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
     params: observableOf({
@@ -87,8 +96,10 @@ describe('MetadataSchemaComponent', () => {
         { provide: RegistryService, useValue: registryServiceStub },
         { provide: ActivatedRoute, useValue: activatedRouteStub },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
-        { provide: Router, useValue: new RouterStub() }
-      ]
+        { provide: Router, useValue: new RouterStub() },
+        { provide: NotificationsService, useValue: NotificationsServiceStub }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
   }));
 
@@ -96,9 +107,12 @@ describe('MetadataSchemaComponent', () => {
     fixture = TestBed.createComponent(MetadataSchemaComponent);
     comp = fixture.componentInstance;
     fixture.detectChanges();
-    registryService = (comp as any).service;
   });
 
+  beforeEach(inject([RegistryService], (s) => {
+    registryService = s;
+  }));
+
   it('should contain the schema prefix in the header', () => {
     const header: HTMLElement = fixture.debugElement.query(By.css('.metadata-schema #header')).nativeElement;
     expect(header.textContent).toContain('mock');
@@ -110,10 +124,37 @@ describe('MetadataSchemaComponent', () => {
   });
 
   it('should contain the correct fields', () => {
-    const editorField: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields tr:nth-child(1) td:nth-child(1)')).nativeElement;
+    const editorField: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields tr:nth-child(1) td:nth-child(2)')).nativeElement;
     expect(editorField.textContent).toBe('mock.contributor.editor');
 
-    const illustratorField: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields tr:nth-child(2) td:nth-child(1)')).nativeElement;
+    const illustratorField: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields tr:nth-child(2) td:nth-child(2)')).nativeElement;
     expect(illustratorField.textContent).toBe('mock.contributor.illustrator');
   });
+
+  describe('when clicking a metadata field row', () => {
+    let row: HTMLElement;
+
+    beforeEach(() => {
+      spyOn(registryService, 'editMetadataField');
+      row = fixture.debugElement.query(By.css('.selectable-row')).nativeElement;
+      row.click();
+      fixture.detectChanges();
+    });
+
+    it('should start editing the selected field', async(() => {
+      fixture.whenStable().then(() => {
+        expect(registryService.editMetadataField).toHaveBeenCalledWith(mockFieldsList[2]);
+      });
+    }));
+
+    it('should cancel editing the selected field when clicked again', async(() => {
+      spyOn(registryService, 'getActiveMetadataField').and.returnValue(observableOf(mockFieldsList[2]));
+      spyOn(registryService, 'cancelEditMetadataField');
+      row.click();
+      fixture.detectChanges();
+      fixture.whenStable().then(() => {
+        expect(registryService.cancelEditMetadataField).toHaveBeenCalled();
+      });
+    }));
+  });
 });

From 25e4b46bc3d15b03d46002d2dfedb04b8bc7de03 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 23 Jan 2019 15:34:32 +0100
Subject: [PATCH 27/44] 58789: Remove f in fdescribe

---
 .../metadata-schema/metadata-schema.component.spec.ts           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
index a73e2d889c..f30475ea60 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
@@ -21,7 +21,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
 
-fdescribe('MetadataSchemaComponent', () => {
+describe('MetadataSchemaComponent', () => {
   let comp: MetadataSchemaComponent;
   let fixture: ComponentFixture<MetadataSchemaComponent>;
   let registryService: RegistryService;

From 7d36dfe3e7b83e9794ebaa6d3cfbeb8f546d69cf Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 23 Jan 2019 16:25:25 +0100
Subject: [PATCH 28/44] 58789: metadata-schema and field form-components tests

---
 .../metadata-schema-form.component.spec.ts    |  92 ++++++++++++++-
 .../metadata-field-form.component.spec.ts     | 106 +++++++++++++++++-
 2 files changed, 186 insertions(+), 12 deletions(-)

diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
index acf6f0b837..02cf168387 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.spec.ts
@@ -1,16 +1,46 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
 
 import { MetadataSchemaFormComponent } from './metadata-schema-form.component';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { EnumKeysPipe } from '../../../../shared/utils/enum-keys-pipe';
+import { RegistryService } from '../../../../core/registry/registry.service';
+import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
+import { of as observableOf } from 'rxjs/internal/observable/of';
+import { MetadataSchema } from '../../../../core/metadata/metadataschema.model';
 
 describe('MetadataSchemaFormComponent', () => {
   let component: MetadataSchemaFormComponent;
   let fixture: ComponentFixture<MetadataSchemaFormComponent>;
+  let registryService: RegistryService;
+
+  /* tslint:disable:no-empty */
+  const registryServiceStub = {
+    getActiveMetadataSchema: () => observableOf(undefined),
+    createOrUpdateMetadataSchema: (schema: MetadataSchema) => observableOf(schema)
+  };
+  const formBuilderServiceStub = {
+    createFormGroup: () => {
+      return {
+        patchValue: () => {}
+      };
+    }
+  };
+  /* tslint:enable:no-empty */
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ MetadataSchemaFormComponent ]
-    })
-    .compileComponents();
+      imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule.forRoot()],
+      declarations: [ MetadataSchemaFormComponent, EnumKeysPipe ],
+      providers: [
+        { provide: RegistryService, useValue: registryServiceStub },
+        { provide: FormBuilderService, useValue: formBuilderServiceStub }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
   }));
 
   beforeEach(() => {
@@ -19,7 +49,57 @@ describe('MetadataSchemaFormComponent', () => {
     fixture.detectChanges();
   });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
+  beforeEach(inject([RegistryService], (s) => {
+    registryService = s;
+  }));
+
+  describe('when submitting the form', () => {
+    const namespace = 'fake namespace';
+    const prefix = 'fake';
+
+    const expected = Object.assign(new MetadataSchema(), {
+      namespace: namespace,
+      prefix: prefix
+    });
+
+    beforeEach(() => {
+      spyOn(component.submitForm, 'emit');
+      component.name.value = prefix;
+      component.namespace.value = namespace;
+    });
+
+    describe('without an active schema', () => {
+      beforeEach(() => {
+        spyOn(registryService, 'getActiveMetadataSchema').and.returnValue(observableOf(undefined));
+        component.onSubmit();
+        fixture.detectChanges();
+      });
+
+      it('should emit a new schema using the correct values', async(() => {
+        fixture.whenStable().then(() => {
+          expect(component.submitForm.emit).toHaveBeenCalledWith(expected);
+        });
+      }));
+    });
+
+    describe('with an active schema', () => {
+      const expectedWithId = Object.assign(new MetadataSchema(), {
+        id: 1,
+        namespace: namespace,
+        prefix: prefix
+      });
+
+      beforeEach(() => {
+        spyOn(registryService, 'getActiveMetadataSchema').and.returnValue(observableOf(expectedWithId));
+        component.onSubmit();
+        fixture.detectChanges();
+      });
+
+      it('should edit the existing schema using the correct values', async(() => {
+        fixture.whenStable().then(() => {
+          expect(component.submitForm.emit).toHaveBeenCalledWith(expectedWithId);
+        });
+      }));
+    });
   });
 });
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
index 124d0ba163..25502a27c8 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts
@@ -1,25 +1,119 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
 
 import { MetadataFieldFormComponent } from './metadata-field-form.component';
+import { RegistryService } from '../../../../core/registry/registry.service';
+import { of as observableOf } from 'rxjs/internal/observable/of';
+import { MetadataField } from '../../../../core/metadata/metadatafield.model';
+import { CommonModule } from '@angular/common';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { EnumKeysPipe } from '../../../../shared/utils/enum-keys-pipe';
+import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { MetadataSchema } from '../../../../core/metadata/metadataschema.model';
 
 describe('MetadataFieldFormComponent', () => {
   let component: MetadataFieldFormComponent;
   let fixture: ComponentFixture<MetadataFieldFormComponent>;
+  let registryService: RegistryService;
+
+  const metadataSchema = Object.assign(new MetadataSchema(), {
+    id: 1,
+    namespace: 'fake schema',
+    prefix: 'fake'
+  });
+
+  /* tslint:disable:no-empty */
+  const registryServiceStub = {
+    getActiveMetadataField: () => observableOf(undefined),
+    createOrUpdateMetadataField: (field: MetadataField) => observableOf(field)
+  };
+  const formBuilderServiceStub = {
+    createFormGroup: () => {
+      return {
+        patchValue: () => {}
+      };
+    }
+  };
+  /* tslint:enable:no-empty */
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ MetadataFieldFormComponent ]
-    })
-    .compileComponents();
+      imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule.forRoot()],
+      declarations: [ MetadataFieldFormComponent, EnumKeysPipe ],
+      providers: [
+        { provide: RegistryService, useValue: registryServiceStub },
+        { provide: FormBuilderService, useValue: formBuilderServiceStub }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
   }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(MetadataFieldFormComponent);
     component = fixture.componentInstance;
+    component.metadataSchema = metadataSchema;
     fixture.detectChanges();
   });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
+  beforeEach(inject([RegistryService], (s) => {
+    registryService = s;
+  }));
+
+  describe('when submitting the form', () => {
+    const element = 'fakeElement';
+    const qualifier = 'fakeQualifier';
+    const scopeNote = 'fakeScopeNote';
+
+    const expected = Object.assign(new MetadataField(), {
+      schema: metadataSchema,
+      element: element,
+      qualifier: qualifier,
+      scopeNote: scopeNote
+    });
+
+    beforeEach(() => {
+      spyOn(component.submitForm, 'emit');
+      component.element.value = element;
+      component.qualifier.value = qualifier;
+      component.scopeNote.value = scopeNote;
+    });
+
+    describe('without an active field', () => {
+      beforeEach(() => {
+        spyOn(registryService, 'getActiveMetadataField').and.returnValue(observableOf(undefined));
+        component.onSubmit();
+        fixture.detectChanges();
+      });
+
+      it('should emit a new field using the correct values', async(() => {
+        fixture.whenStable().then(() => {
+          expect(component.submitForm.emit).toHaveBeenCalledWith(expected);
+        });
+      }));
+    });
+
+    describe('with an active field', () => {
+      const expectedWithId = Object.assign(new MetadataField(), {
+        id: 1,
+        schema: metadataSchema,
+        element: element,
+        qualifier: qualifier,
+        scopeNote: scopeNote
+      });
+
+      beforeEach(() => {
+        spyOn(registryService, 'getActiveMetadataField').and.returnValue(observableOf(expectedWithId));
+        component.onSubmit();
+        fixture.detectChanges();
+      });
+
+      it('should edit the existing field using the correct values', async(() => {
+        fixture.whenStable().then(() => {
+          expect(component.submitForm.emit).toHaveBeenCalledWith(expectedWithId);
+        });
+      }));
+    });
   });
 });

From 89894287ea386916ebef9da2fa1b2122d909b01a Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 23 Jan 2019 16:59:50 +0100
Subject: [PATCH 29/44] 58789: Tests for deleting metadata schema and fields

---
 .../metadata-registry.component.spec.ts       | 27 ++++++++++++--
 .../metadata-schema.component.spec.ts         | 37 ++++++++++++++++---
 .../metadata-schema.component.ts              |  2 +-
 3 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
index 82fd560e4f..d6b016f6fb 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
@@ -16,8 +16,9 @@ import { HostWindowService } from '../../../shared/host-window.service';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
+import { RestResponse } from '../../../core/cache/response.models';
 
-describe('MetadataRegistryComponent', () => {
+fdescribe('MetadataRegistryComponent', () => {
   let comp: MetadataRegistryComponent;
   let fixture: ComponentFixture<MetadataRegistryComponent>;
   let registryService: RegistryService;
@@ -42,7 +43,10 @@ describe('MetadataRegistryComponent', () => {
     getActiveMetadataSchema: () => observableOf(undefined),
     getSelectedMetadataSchemas: () => observableOf([]),
     editMetadataSchema: (schema) => {},
-    cancelEditMetadataSchema: () => {}
+    cancelEditMetadataSchema: () => {},
+    deleteMetadataSchema: () => observableOf(new RestResponse(true, '200')),
+    deselectAllMetadataSchema: () => {},
+    clearMetadataSchemaRequests: () => observableOf(undefined)
   };
   /* tslint:enable:no-empty */
 
@@ -53,7 +57,7 @@ describe('MetadataRegistryComponent', () => {
       providers: [
         { provide: RegistryService, useValue: registryServiceStub },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
-        { provide: NotificationsService, useValue: NotificationsServiceStub }
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(MetadataRegistryComponent, {
@@ -110,4 +114,21 @@ describe('MetadataRegistryComponent', () => {
       });
     }));
   });
+
+  describe('when deleting metadata schemas', () => {
+    const selectedSchemas = Array(mockSchemasList[0]);
+
+    beforeEach(() => {
+      spyOn(registryService, 'deleteMetadataSchema').and.callThrough();
+      spyOn(registryService, 'getSelectedMetadataSchemas').and.returnValue(observableOf(selectedSchemas));
+      comp.deleteSchemas();
+      fixture.detectChanges();
+    });
+
+    it('should call deleteMetadataSchema with the selected id', async(() => {
+      fixture.whenStable().then(() => {
+        expect(registryService.deleteMetadataSchema).toHaveBeenCalledWith(selectedSchemas[0].id);
+      });
+    }));
+  });
 });
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
index f30475ea60..37fb51e5c7 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts
@@ -20,6 +20,7 @@ import { ActivatedRouteStub } from '../../../shared/testing/active-router-stub';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
+import { RestResponse } from '../../../core/cache/response.models';
 
 describe('MetadataSchemaComponent', () => {
   let comp: MetadataSchemaComponent;
@@ -41,31 +42,35 @@ describe('MetadataSchemaComponent', () => {
   ];
   const mockFieldsList = [
     {
+      id: 1,
       self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/8',
       element: 'contributor',
       qualifier: 'advisor',
-      scopenote: null,
+      scopeNote: null,
       schema: mockSchemasList[0]
     },
     {
+      id: 2,
       self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/9',
       element: 'contributor',
       qualifier: 'author',
-      scopenote: null,
+      scopeNote: null,
       schema: mockSchemasList[0]
     },
     {
+      id: 3,
       self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/10',
       element: 'contributor',
       qualifier: 'editor',
-      scopenote: 'test scope note',
+      scopeNote: 'test scope note',
       schema: mockSchemasList[1]
     },
     {
+      id: 4,
       self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/11',
       element: 'contributor',
       qualifier: 'illustrator',
-      scopenote: null,
+      scopeNote: null,
       schema: mockSchemasList[1]
     }
   ];
@@ -78,7 +83,10 @@ describe('MetadataSchemaComponent', () => {
     getActiveMetadataField: () => observableOf(undefined),
     getSelectedMetadataFields: () => observableOf([]),
     editMetadataField: (schema) => {},
-    cancelEditMetadataField: () => {}
+    cancelEditMetadataField: () => {},
+    deleteMetadataField: () => observableOf(new RestResponse(true, '200')),
+    deselectAllMetadataField: () => {},
+    clearMetadataFieldRequests: () => observableOf(undefined)
   };
   /* tslint:enable:no-empty */
   const schemaNameParam = 'mock';
@@ -97,7 +105,7 @@ describe('MetadataSchemaComponent', () => {
         { provide: ActivatedRoute, useValue: activatedRouteStub },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
         { provide: Router, useValue: new RouterStub() },
-        { provide: NotificationsService, useValue: NotificationsServiceStub }
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
@@ -157,4 +165,21 @@ describe('MetadataSchemaComponent', () => {
       });
     }));
   });
+
+  describe('when deleting metadata fields', () => {
+    const selectedFields = Array(mockFieldsList[2]);
+
+    beforeEach(() => {
+      spyOn(registryService, 'deleteMetadataField').and.callThrough();
+      spyOn(registryService, 'getSelectedMetadataFields').and.returnValue(observableOf(selectedFields));
+      comp.deleteFields();
+      fixture.detectChanges();
+    });
+
+    it('should call deleteMetadataField with the selected id', async(() => {
+      fixture.whenStable().then(() => {
+        expect(registryService.deleteMetadataField).toHaveBeenCalledWith(selectedFields[0].id);
+      });
+    }));
+  });
 });
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
index b1dd87d2c6..cb3a667528 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
@@ -162,7 +162,7 @@ export class MetadataSchemaComponent implements OnInit {
         const tasks$ = [];
         for (const field of fields) {
           if (hasValue(field.id)) {
-            tasks$.push(this.registryService.deleteMetadataSchema(field.id));
+            tasks$.push(this.registryService.deleteMetadataField(field.id));
           }
         }
         zip(...tasks$).subscribe((responses: RestResponse[]) => {

From 826830ca07a0a1716df0de248c0ce0ebe07d4302 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 23 Jan 2019 18:05:12 +0100
Subject: [PATCH 30/44] 58789: RegistryService tests, small bugfixes and
 prod-build fixes

---
 .../metadata-registry.component.spec.ts       |   2 +-
 .../metadata-registry.component.ts            |   2 +-
 .../metadata-schema-form.component.ts         |   2 +-
 .../metadata-field-form.component.ts          |   2 +-
 .../metadata-schema.component.ts              |   2 +-
 src/app/core/data/request.service.spec.ts     |   5 +-
 .../core/metadata/metadata.service.spec.ts    |   4 +-
 .../core/registry/registry.service.spec.ts    | 222 +++++++++++++++++-
 src/app/shared/form/form.component.spec.ts    |   4 +-
 src/app/shared/mocks/mock-request.service.ts  |   5 +-
 10 files changed, 233 insertions(+), 17 deletions(-)

diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
index d6b016f6fb..66088236a4 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts
@@ -18,7 +18,7 @@ import { NotificationsService } from '../../../shared/notifications/notification
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
 import { RestResponse } from '../../../core/cache/response.models';
 
-fdescribe('MetadataRegistryComponent', () => {
+describe('MetadataRegistryComponent', () => {
   let comp: MetadataRegistryComponent;
   let fixture: ComponentFixture<MetadataRegistryComponent>;
   let registryService: RegistryService;
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
index b19eb04718..cf4e787dec 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -64,7 +64,7 @@ export class MetadataRegistryComponent {
    * Force-update the list of schemas by first clearing the cache related to metadata schemas, then performing
    * a new REST call
    */
-  private forceUpdateSchemas() {
+  public forceUpdateSchemas() {
     this.registryService.clearMetadataSchemaRequests().subscribe();
     this.updateSchemas();
   }
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
index 259c7430a6..d42847a5e7 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -73,7 +73,7 @@ export class MetadataSchemaFormComponent implements OnInit {
    */
   @Output() submitForm: EventEmitter<any> = new EventEmitter();
 
-  constructor(private registryService: RegistryService, private formBuilderService: FormBuilderService, private translateService: TranslateService) {
+  constructor(public registryService: RegistryService, private formBuilderService: FormBuilderService, private translateService: TranslateService) {
   }
 
   ngOnInit() {
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
index 7b42484bb0..ad50e6cd11 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
@@ -90,7 +90,7 @@ export class MetadataFieldFormComponent implements OnInit {
    */
   @Output() submitForm: EventEmitter<any> = new EventEmitter();
 
-  constructor(private registryService: RegistryService,
+  constructor(public registryService: RegistryService,
               private formBuilderService: FormBuilderService,
               private translateService: TranslateService) {
   }
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
index cb3a667528..295556374b 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
@@ -96,7 +96,7 @@ export class MetadataSchemaComponent implements OnInit {
    * Force-update the list of fields by first clearing the cache related to metadata fields, then performing
    * a new REST call
    */
-  private forceUpdateFields() {
+  public forceUpdateFields() {
     this.registryService.clearMetadataFieldRequests().subscribe();
     this.updateFields();
   }
diff --git a/src/app/core/data/request.service.spec.ts b/src/app/core/data/request.service.spec.ts
index 90d2edfc84..b28436f3a8 100644
--- a/src/app/core/data/request.service.spec.ts
+++ b/src/app/core/data/request.service.spec.ts
@@ -21,6 +21,8 @@ import { RequestService } from './request.service';
 import { ActionsSubject, Store } from '@ngrx/store';
 import { TestScheduler } from 'rxjs/testing';
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { MockStore } from '../../shared/testing/mock-store';
+import { IndexState } from '../index/index.reducer';
 
 describe('RequestService', () => {
   let scheduler: TestScheduler;
@@ -59,7 +61,8 @@ describe('RequestService', () => {
     service = new RequestService(
       objectCache,
       uuidService,
-      store
+      store,
+      undefined
     );
     serviceAsAny = service as any;
   });
diff --git a/src/app/core/metadata/metadata.service.spec.ts b/src/app/core/metadata/metadata.service.spec.ts
index 3be50a7450..254316aaec 100644
--- a/src/app/core/metadata/metadata.service.spec.ts
+++ b/src/app/core/metadata/metadata.service.spec.ts
@@ -32,6 +32,8 @@ import { MockTranslateLoader } from '../../shared/mocks/mock-translate-loader';
 import { BrowseService } from '../browse/browse.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { EmptyError } from 'rxjs/internal-compatibility';
+import { MockStore } from '../../shared/testing/mock-store';
+import { IndexState } from '../index/index.reducer';
 
 /* tslint:disable:max-classes-per-file */
 @Component({
@@ -82,7 +84,7 @@ describe('MetadataService', () => {
 
     objectCacheService = new ObjectCacheService(store);
     uuidService = new UUIDService();
-    requestService = new RequestService(objectCacheService, uuidService, store);
+    requestService = new RequestService(objectCacheService, uuidService, store, undefined);
     remoteDataBuildService = new RemoteDataBuildService(objectCacheService, requestService);
 
     TestBed.configureTestingModule({
diff --git a/src/app/core/registry/registry.service.spec.ts b/src/app/core/registry/registry.service.spec.ts
index c87597cffc..64de242eaa 100644
--- a/src/app/core/registry/registry.service.spec.ts
+++ b/src/app/core/registry/registry.service.spec.ts
@@ -14,13 +14,30 @@ import { getMockRequestService } from '../../shared/mocks/mock-request.service';
 import {
   RegistryBitstreamformatsSuccessResponse,
   RegistryMetadatafieldsSuccessResponse,
-  RegistryMetadataschemasSuccessResponse
+  RegistryMetadataschemasSuccessResponse, RestResponse
 } from '../cache/response.models';
 import { Component } from '@angular/core';
 import { RegistryMetadataschemasResponse } from './registry-metadataschemas-response.model';
 import { RegistryMetadatafieldsResponse } from './registry-metadatafields-response.model';
 import { RegistryBitstreamformatsResponse } from './registry-bitstreamformats-response.model';
 import { map } from 'rxjs/operators';
+import { Store } from '@ngrx/store';
+import { AppState } from '../../app.reducer';
+import { MockStore } from '../../shared/testing/mock-store';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service-stub';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  MetadataRegistryCancelFieldAction,
+  MetadataRegistryCancelSchemaAction, MetadataRegistryDeselectAllFieldAction,
+  MetadataRegistryDeselectAllSchemaAction, MetadataRegistryDeselectFieldAction,
+  MetadataRegistryDeselectSchemaAction,
+  MetadataRegistryEditFieldAction,
+  MetadataRegistryEditSchemaAction, MetadataRegistrySelectFieldAction,
+  MetadataRegistrySelectSchemaAction
+} from '../../+admin/admin-registries/metadata-registry/metadata-registry.actions';
+import { MetadataSchema } from '../metadata/metadataschema.model';
+import { MetadataField } from '../metadata/metadatafield.model';
 
 @Component({ template: '' })
 class DummyComponent {
@@ -49,31 +66,35 @@ describe('RegistryService', () => {
   ];
   const mockFieldsList = [
     {
+      id: 1,
       self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/8',
       element: 'contributor',
       qualifier: 'advisor',
-      scopenote: null,
+      scopeNote: null,
       schema: mockSchemasList[0]
     },
     {
+      id: 2,
       self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/9',
       element: 'contributor',
       qualifier: 'author',
-      scopenote: null,
+      scopeNote: null,
       schema: mockSchemasList[0]
     },
     {
+      id: 3,
       self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/10',
       element: 'contributor',
       qualifier: 'editor',
-      scopenote: 'test scope note',
+      scopeNote: 'test scope note',
       schema: mockSchemasList[1]
     },
     {
+      id: 4,
       self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/11',
       element: 'contributor',
       qualifier: 'illustrator',
-      scopenote: null,
+      scopeNote: null,
       schema: mockSchemasList[1]
     }
   ];
@@ -118,6 +139,7 @@ describe('RegistryService', () => {
 
   const endpoint = 'path';
   const endpointWithParams = `${endpoint}?size=${pageInfo.elementsPerPage}&page=${pageInfo.currentPage - 1}`;
+  const fieldEndpointWithParams = `${endpoint}?schema=${mockSchemasList[0].prefix}&size=${pageInfo.elementsPerPage}&page=${pageInfo.currentPage - 1}`;
 
   const halServiceStub = {
     getEndpoint: (link: string) => observableOf(endpoint)
@@ -136,9 +158,11 @@ describe('RegistryService', () => {
     }
   };
 
+  const mockStore = new MockStore<AppState>(Object.create(null));
+
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [CommonModule],
+      imports: [CommonModule, TranslateModule.forRoot()],
       declarations: [
         DummyComponent
       ],
@@ -146,6 +170,8 @@ describe('RegistryService', () => {
         { provide: RequestService, useValue: getMockRequestService() },
         { provide: RemoteDataBuildService, useValue: rdbStub },
         { provide: HALEndpointService, useValue: halServiceStub },
+        { provide: Store, useValue: mockStore },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
         RegistryService
       ]
     });
@@ -237,7 +263,7 @@ describe('RegistryService', () => {
     });
 
     it('should call getByHref on the request service with the correct request url', () => {
-      expect((registryService as any).requestService.getByHref).toHaveBeenCalledWith(endpointWithParams);
+      expect((registryService as any).requestService.getByHref).toHaveBeenCalledWith(fieldEndpointWithParams);
     });
   });
 
@@ -269,4 +295,186 @@ describe('RegistryService', () => {
       expect((registryService as any).requestService.getByHref).toHaveBeenCalledWith(endpointWithParams);
     });
   });
+
+  describe('when dispatching to the store', () => {
+    beforeEach(() => {
+      spyOn(mockStore, 'dispatch');
+    });
+
+    describe('when calling editMetadataSchema', () => {
+      beforeEach(() => {
+        registryService.editMetadataSchema(mockSchemasList[0]);
+      });
+
+      it('should dispatch a MetadataRegistryEditSchemaAction with the correct schema', () => {
+        expect(mockStore.dispatch).toHaveBeenCalledWith(new MetadataRegistryEditSchemaAction(mockSchemasList[0]));
+      })
+    });
+
+    describe('when calling cancelEditMetadataSchema', () => {
+      beforeEach(() => {
+        registryService.cancelEditMetadataSchema();
+      });
+
+      it('should dispatch a MetadataRegistryCancelSchemaAction', () => {
+        expect(mockStore.dispatch).toHaveBeenCalledWith(new MetadataRegistryCancelSchemaAction());
+      })
+    });
+
+    describe('when calling selectMetadataSchema', () => {
+      beforeEach(() => {
+        registryService.selectMetadataSchema(mockSchemasList[0]);
+      });
+
+      it('should dispatch a MetadataRegistrySelectSchemaAction with the correct schema', () => {
+        expect(mockStore.dispatch).toHaveBeenCalledWith(new MetadataRegistrySelectSchemaAction(mockSchemasList[0]));
+      })
+    });
+
+    describe('when calling deselectMetadataSchema', () => {
+      beforeEach(() => {
+        registryService.deselectMetadataSchema(mockSchemasList[0]);
+      });
+
+      it('should dispatch a MetadataRegistryDeselectSchemaAction with the correct schema', () => {
+        expect(mockStore.dispatch).toHaveBeenCalledWith(new MetadataRegistryDeselectSchemaAction(mockSchemasList[0]));
+      })
+    });
+
+    describe('when calling deselectAllMetadataSchema', () => {
+      beforeEach(() => {
+        registryService.deselectAllMetadataSchema();
+      });
+
+      it('should dispatch a MetadataRegistryDeselectAllSchemaAction', () => {
+        expect(mockStore.dispatch).toHaveBeenCalledWith(new MetadataRegistryDeselectAllSchemaAction());
+      })
+    });
+
+    describe('when calling editMetadataField', () => {
+      beforeEach(() => {
+        registryService.editMetadataField(mockFieldsList[0]);
+      });
+
+      it('should dispatch a MetadataRegistryEditFieldAction with the correct Field', () => {
+        expect(mockStore.dispatch).toHaveBeenCalledWith(new MetadataRegistryEditFieldAction(mockFieldsList[0]));
+      })
+    });
+
+    describe('when calling cancelEditMetadataField', () => {
+      beforeEach(() => {
+        registryService.cancelEditMetadataField();
+      });
+
+      it('should dispatch a MetadataRegistryCancelFieldAction', () => {
+        expect(mockStore.dispatch).toHaveBeenCalledWith(new MetadataRegistryCancelFieldAction());
+      })
+    });
+
+    describe('when calling selectMetadataField', () => {
+      beforeEach(() => {
+        registryService.selectMetadataField(mockFieldsList[0]);
+      });
+
+      it('should dispatch a MetadataRegistrySelectFieldAction with the correct Field', () => {
+        expect(mockStore.dispatch).toHaveBeenCalledWith(new MetadataRegistrySelectFieldAction(mockFieldsList[0]));
+      })
+    });
+
+    describe('when calling deselectMetadataField', () => {
+      beforeEach(() => {
+        registryService.deselectMetadataField(mockFieldsList[0]);
+      });
+
+      it('should dispatch a MetadataRegistryDeselectFieldAction with the correct Field', () => {
+        expect(mockStore.dispatch).toHaveBeenCalledWith(new MetadataRegistryDeselectFieldAction(mockFieldsList[0]));
+      })
+    });
+
+    describe('when calling deselectAllMetadataField', () => {
+      beforeEach(() => {
+        registryService.deselectAllMetadataField();
+      });
+
+      it('should dispatch a MetadataRegistryDeselectAllFieldAction', () => {
+        expect(mockStore.dispatch).toHaveBeenCalledWith(new MetadataRegistryDeselectAllFieldAction());
+      })
+    });
+  });
+
+  describe('when createOrUpdateMetadataSchema is called', () => {
+    let result: Observable<MetadataSchema>;
+
+    beforeEach(() => {
+      result = registryService.createOrUpdateMetadataSchema(mockSchemasList[0]);
+    });
+
+    it('should return the created/updated metadata schema', () => {
+      result.subscribe((schema: MetadataSchema) => {
+        expect(schema).toEqual(mockSchemasList[0]);
+      });
+    });
+  });
+
+  describe('when createOrUpdateMetadataField is called', () => {
+    let result: Observable<MetadataField>;
+
+    beforeEach(() => {
+      result = registryService.createOrUpdateMetadataField(mockFieldsList[0]);
+    });
+
+    it('should return the created/updated metadata field', () => {
+      result.subscribe((field: MetadataField) => {
+        expect(field).toEqual(mockFieldsList[0]);
+      });
+    });
+  });
+
+  describe('when deleteMetadataSchema is called', () => {
+    let result: Observable<RestResponse>;
+
+    beforeEach(() => {
+      result = registryService.deleteMetadataSchema(mockSchemasList[0].id);
+    });
+
+    it('should return a successful response', () => {
+      result.subscribe((response: RestResponse) => {
+        expect(response.isSuccessful).toBe(true);
+      });
+    })
+  });
+
+  describe('when deleteMetadataField is called', () => {
+    let result: Observable<RestResponse>;
+
+    beforeEach(() => {
+      result = registryService.deleteMetadataField(mockFieldsList[0].id);
+    });
+
+    it('should return a successful response', () => {
+      result.subscribe((response: RestResponse) => {
+        expect(response.isSuccessful).toBe(true);
+      });
+    })
+  });
+
+  describe('when clearMetadataSchemaRequests is called', () => {
+    beforeEach(() => {
+      registryService.clearMetadataSchemaRequests().subscribe();
+    });
+
+    it('should remove the requests related to metadata schemas from cache', () => {
+      expect((registryService as any).requestService.removeByHrefSubstring).toHaveBeenCalled();
+    });
+  });
+
+  describe('when clearMetadataFieldRequests is called', () => {
+    beforeEach(() => {
+      registryService.clearMetadataFieldRequests().subscribe();
+    });
+
+    it('should remove the requests related to metadata fields from cache', () => {
+      expect((registryService as any).requestService.removeByHrefSubstring).toHaveBeenCalled();
+    });
+  });
 });
diff --git a/src/app/shared/form/form.component.spec.ts b/src/app/shared/form/form.component.spec.ts
index 06676d191e..38e95b5c49 100644
--- a/src/app/shared/form/form.component.spec.ts
+++ b/src/app/shared/form/form.component.spec.ts
@@ -350,13 +350,13 @@ describe('FormComponent test suite', () => {
       const control = formComp.formGroup.get(['dc_title']);
       control.setValue('Test Title');
       formState.testForm.valid = true;
-      spyOn(formComp.submit, 'emit');
+      spyOn(formComp.submitForm, 'emit');
 
       form.next(formState.testForm);
       formFixture.detectChanges();
 
       formComp.onSubmit();
-      expect(formComp.submit.emit).toHaveBeenCalled();
+      expect(formComp.submitForm.emit).toHaveBeenCalled();
     });
 
     it('should not emit submit Event on form submit whether the form is not valid', () => {
diff --git a/src/app/shared/mocks/mock-request.service.ts b/src/app/shared/mocks/mock-request.service.ts
index c947618ea1..ce09f6d85e 100644
--- a/src/app/shared/mocks/mock-request.service.ts
+++ b/src/app/shared/mocks/mock-request.service.ts
@@ -7,6 +7,9 @@ export function getMockRequestService(requestEntry$: Observable<RequestEntry> =
     configure: false,
     generateRequestId: 'clients/b186e8ce-e99c-4183-bc9a-42b4821bdb78',
     getByHref: requestEntry$,
-    getByUUID: requestEntry$
+    getByUUID: requestEntry$,
+    /* tslint:disable:no-empty */
+    removeByHrefSubstring: () => {}
+    /* tslint:enable:no-empty */
   });
 }

From 552dce0960ad8a948d619fa7285ae29fde733967 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 24 Jan 2019 10:20:18 +0100
Subject: [PATCH 31/44] 58789: Fix AuthenticatedGuard and put on higher level
 route

---
 src/app/+admin/admin-routing.module.ts   | 4 +---
 src/app/app-routing.module.ts            | 3 ++-
 src/app/core/auth/authenticated.guard.ts | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/app/+admin/admin-routing.module.ts b/src/app/+admin/admin-routing.module.ts
index 061ed3f8a8..71af51c683 100644
--- a/src/app/+admin/admin-routing.module.ts
+++ b/src/app/+admin/admin-routing.module.ts
@@ -1,14 +1,12 @@
 import { RouterModule } from '@angular/router';
 import { NgModule } from '@angular/core';
-import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
       {
         path: 'registries',
-        loadChildren: './admin-registries/admin-registries.module#AdminRegistriesModule',
-        canActivate: [AuthenticatedGuard]
+        loadChildren: './admin-registries/admin-registries.module#AdminRegistriesModule'
       }
     ])
   ]
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 7de83651ff..1a477357c5 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 
 import { PageNotFoundComponent } from './pagenotfound/pagenotfound.component';
+import { AuthenticatedGuard } from './core/auth/authenticated.guard';
 
 @NgModule({
   imports: [
@@ -13,7 +14,7 @@ import { PageNotFoundComponent } from './pagenotfound/pagenotfound.component';
       { path: 'items', loadChildren: './+item-page/item-page.module#ItemPageModule' },
       { path: 'search', loadChildren: './+search-page/search-page.module#SearchPageModule' },
       { path: 'browse', loadChildren: './+browse-by/browse-by.module#BrowseByModule' },
-      { path: 'admin', loadChildren: './+admin/admin.module#AdminModule' },
+      { path: 'admin', loadChildren: './+admin/admin.module#AdminModule', canActivate: [AuthenticatedGuard] },
       { path: 'login', loadChildren: './+login-page/login-page.module#LoginPageModule' },
       { path: 'logout', loadChildren: './+logout-page/logout-page.module#LogoutPageModule' },
       { path: '**', pathMatch: 'full', component: PageNotFoundComponent },
diff --git a/src/app/core/auth/authenticated.guard.ts b/src/app/core/auth/authenticated.guard.ts
index 49ada7e735..af0622cd19 100644
--- a/src/app/core/auth/authenticated.guard.ts
+++ b/src/app/core/auth/authenticated.guard.ts
@@ -54,7 +54,7 @@ export class AuthenticatedGuard implements CanActivate, CanLoad {
 
   private handleAuth(url: string): Observable<boolean> {
     // get observable
-    const observable = of(true);
+    const observable = this.store.pipe(select(isAuthenticated));
 
     // redirect to sign in page if user is not authenticated
     observable.pipe(

From 03702dc0dcdf76f893c557e1b32527a4bb379bb1 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 24 Jan 2019 11:14:17 +0100
Subject: [PATCH 32/44] 58789: Empty page error fix and navigate to last page
 on delete

---
 .../metadata-registry/metadata-registry.component.ts        | 1 -
 .../metadata-schema/metadata-schema.component.ts            | 1 -
 .../registry-metadataschemas-response-parsing.service.ts    | 6 +++++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
index cf4e787dec..89db4970b6 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -143,7 +143,6 @@ export class MetadataRegistryComponent {
             this.showNotification(false, failedResponses.length);
           }
           this.registryService.deselectAllMetadataSchema();
-          this.router.navigate([], { queryParams: { page: 1 }, queryParamsHandling: 'merge'});
           this.forceUpdateSchemas();
         });
       }
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
index 295556374b..f577832a63 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
@@ -175,7 +175,6 @@ export class MetadataSchemaComponent implements OnInit {
             this.showNotification(false, failedResponses.length);
           }
           this.registryService.deselectAllMetadataField();
-          this.router.navigate([], { queryParams: { page: 1 }, queryParamsHandling: 'merge'});
           this.forceUpdateFields();
         });
       }
diff --git a/src/app/core/data/registry-metadataschemas-response-parsing.service.ts b/src/app/core/data/registry-metadataschemas-response-parsing.service.ts
index a1e9ac60ff..05a61f6b4f 100644
--- a/src/app/core/data/registry-metadataschemas-response-parsing.service.ts
+++ b/src/app/core/data/registry-metadataschemas-response-parsing.service.ts
@@ -6,6 +6,7 @@ import { RegistryMetadataschemasResponse } from '../registry/registry-metadatasc
 import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer';
 import { DSOResponseParsingService } from './dso-response-parsing.service';
 import { Injectable } from '@angular/core';
+import { hasValue } from '../../shared/empty.util';
 
 @Injectable()
 export class RegistryMetadataschemasResponseParsingService implements ResponseParsingService {
@@ -15,7 +16,10 @@ export class RegistryMetadataschemasResponseParsingService implements ResponsePa
   parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
     const payload = data.payload;
 
-    const metadataschemas = payload._embedded.metadataschemas;
+    let metadataschemas = [];
+    if (hasValue(payload._embedded)) {
+      metadataschemas = payload._embedded.metadataschemas;
+    }
     payload.metadataschemas = metadataschemas;
 
     const deserialized = new DSpaceRESTv2Serializer(RegistryMetadataschemasResponse).deserialize(payload);

From d2a918b8e9e0d70faf6fd8475891b99329d9c1bc Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 24 Jan 2019 11:18:56 +0100
Subject: [PATCH 33/44] 58789: Changed delete button labels to Delete selected

---
 resources/i18n/en.json                                      | 6 ++++--
 .../metadata-registry/metadata-registry.component.html      | 2 +-
 .../metadata-schema/metadata-schema.component.html          | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/resources/i18n/en.json b/resources/i18n/en.json
index 6e3aa22e04..5203dbfa46 100644
--- a/resources/i18n/en.json
+++ b/resources/i18n/en.json
@@ -171,7 +171,8 @@
           "table": {
             "id": "ID",
             "namespace": "Namespace",
-            "name": "Name"
+            "name": "Name",
+            "delete": "Delete selected"
           },
           "no-items": "No metadata schemas to show."
         }
@@ -191,7 +192,8 @@
           "head": "Schema metadata fields",
           "table": {
             "field": "Field",
-            "scopenote": "Scope Note"
+            "scopenote": "Scope Note",
+            "delete": "Delete selected"
           },
           "no-items": "No metadata fields to show."
         },
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
index 1da0b1090a..d956af2043 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
@@ -48,7 +48,7 @@
 
             </ds-pagination>
 
-            <button type="submit" class="btn btn-primary" (click)="deleteSchemas()">{{'form.submit' | translate}}
+            <button type="submit" class="btn btn-primary" (click)="deleteSchemas()">{{'admin.registries.metadata.schemas.table.delete' | translate}}
             </button>
 
             <div *ngIf="(metadataSchemas | async)?.payload?.totalElements == 0" class="alert alert-info"
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
index 81c4dcd414..50b139ff31 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
@@ -47,7 +47,7 @@
         </div>
       </ds-pagination>
 
-      <button type="submit" class="btn btn-primary" (click)="deleteFields()">{{'form.submit' | translate}}
+      <button type="submit" class="btn btn-primary" (click)="deleteFields()">{{'admin.registries.schema.fields.table.delete' | translate}}
       </button>
 
       <div *ngIf="(metadataFields | async)?.payload?.totalElements == 0" class="alert alert-info" role="alert">

From c150b5f3505ee96437589aad3de425458bcf47b2 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 24 Jan 2019 12:45:46 +0100
Subject: [PATCH 34/44] 58789: Feedback 2019-01-24

---
 resources/i18n/en.json                        |  1 +
 .../metadata-registry.component.html          | 10 ++++----
 .../metadata-registry.component.ts            |  3 ++-
 .../metadata-schema-form.component.ts         | 22 ++++++++++++++++--
 .../metadata-field-form.component.ts          | 23 +++++++++++++++++--
 .../metadata-schema.component.html            | 10 ++++----
 .../metadata-schema.component.ts              |  1 +
 7 files changed, 56 insertions(+), 14 deletions(-)

diff --git a/resources/i18n/en.json b/resources/i18n/en.json
index 5203dbfa46..90d37c5574 100644
--- a/resources/i18n/en.json
+++ b/resources/i18n/en.json
@@ -181,6 +181,7 @@
         "title": "DSpace Angular :: Metadata Schema Registry",
         "head": "Metadata Schema",
         "description": "This is the metadata schema for \"{{namespace}}\".",
+        "return": "Return",
         "form": {
           "create": "Create metadata field",
           "edit": "Edit metadata field",
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
index d956af2043..a254f20428 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.html
@@ -48,12 +48,12 @@
 
             </ds-pagination>
 
-            <button type="submit" class="btn btn-primary" (click)="deleteSchemas()">{{'admin.registries.metadata.schemas.table.delete' | translate}}
-            </button>
+            <div *ngIf="(metadataSchemas | async)?.payload?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
+              {{'admin.registries.metadata.schemas.no-items' | translate}}
+            </div>
 
-            <div *ngIf="(metadataSchemas | async)?.payload?.totalElements == 0" class="alert alert-info"
-                 role="alert">
-                {{'admin.registries.metadata.schemas.no-items' | translate}}
+            <div>
+              <button *ngIf="(metadataSchemas | async)?.payload?.page?.length > 0" type="submit" class="btn btn-danger float-right" (click)="deleteSchemas()">{{'admin.registries.metadata.schemas.table.delete' | translate}}</button>
             </div>
 
         </div>
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
index 89db4970b6..88c807e3bc 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.ts
@@ -34,7 +34,7 @@ export class MetadataRegistryComponent {
    */
   config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'registry-metadataschemas-pagination',
-    pageSize: 2
+    pageSize: 25
   });
 
   constructor(private registryService: RegistryService,
@@ -143,6 +143,7 @@ export class MetadataRegistryComponent {
             this.showNotification(false, failedResponses.length);
           }
           this.registryService.deselectAllMetadataSchema();
+          this.registryService.cancelEditMetadataSchema();
           this.forceUpdateSchemas();
         });
       }
diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
index d42847a5e7..23a5765058 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-schema-form/metadata-schema-form.component.ts
@@ -1,4 +1,4 @@
-import {Component, EventEmitter, OnInit, Output} from '@angular/core';
+import { Component, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core';
 import {
   DynamicFormControlModel,
   DynamicFormGroupModel,
@@ -20,7 +20,7 @@ import { combineLatest } from 'rxjs/internal/observable/combineLatest';
 /**
  * A form used for creating and editing metadata schemas
  */
-export class MetadataSchemaFormComponent implements OnInit {
+export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
 
   /**
    * A unique id used for ds-form
@@ -147,7 +147,25 @@ export class MetadataSchemaFormComponent implements OnInit {
             this.submitForm.emit(updatedSchema);
           });
         }
+        this.clearFields();
       }
     );
   }
+
+  /**
+   * Reset all input-fields to be empty
+   */
+  clearFields() {
+    this.formGroup.patchValue({
+      prefix: '',
+      namespace: ''
+    });
+  }
+
+  /**
+   * Cancel the current edit when component is destroyed
+   */
+  ngOnDestroy(): void {
+    this.onCancel();
+  }
 }
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
index ad50e6cd11..509af6609b 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
 import { MetadataSchema } from '../../../../core/metadata/metadataschema.model';
 import {
   DynamicFormControlModel,
@@ -22,7 +22,7 @@ import { combineLatest } from 'rxjs/internal/observable/combineLatest';
 /**
  * A form used for creating and editing metadata fields
  */
-export class MetadataFieldFormComponent implements OnInit {
+export class MetadataFieldFormComponent implements OnInit, OnDestroy {
 
   /**
    * A unique id used for ds-form
@@ -175,7 +175,26 @@ export class MetadataFieldFormComponent implements OnInit {
             this.submitForm.emit(updatedField);
           });
         }
+        this.clearFields();
       }
     );
   }
+
+  /**
+   * Reset all input-fields to be empty
+   */
+  clearFields() {
+    this.formGroup.patchValue({
+      element: '',
+      qualifier: '',
+      scopeNote: ''
+    });
+  }
+
+  /**
+   * Cancel the current edit when component is destroyed
+   */
+  ngOnDestroy(): void {
+    this.onCancel();
+  }
 }
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
index 50b139ff31..4a7a4cf34d 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.html
@@ -47,13 +47,15 @@
         </div>
       </ds-pagination>
 
-      <button type="submit" class="btn btn-primary" (click)="deleteFields()">{{'admin.registries.schema.fields.table.delete' | translate}}
-      </button>
-
-      <div *ngIf="(metadataFields | async)?.payload?.totalElements == 0" class="alert alert-info" role="alert">
+      <div *ngIf="(metadataFields | async)?.payload?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
         {{'admin.registries.schema.fields.no-items' | translate}}
       </div>
 
+      <div>
+        <button [routerLink]="['/admin/registries/metadata']" class="btn btn-primary">{{'admin.registries.schema.return' | translate}}</button>
+        <button *ngIf="(metadataFields | async)?.payload?.page?.length > 0" type="submit" class="btn btn-danger float-right" (click)="deleteFields()">{{'admin.registries.schema.fields.table.delete' | translate}}</button>
+      </div>
+
     </div>
   </div>
 </div>
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
index f577832a63..bdc7d5ed27 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
@@ -175,6 +175,7 @@ export class MetadataSchemaComponent implements OnInit {
             this.showNotification(false, failedResponses.length);
           }
           this.registryService.deselectAllMetadataField();
+          this.registryService.cancelEditMetadataField();
           this.forceUpdateFields();
         });
       }

From f08fda9bce616f8937be84b5de11043ea1f9b511 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 24 Jan 2019 15:08:59 +0100
Subject: [PATCH 35/44] 58789: Added more test coverage

---
 ...amformats-response-parsing.service.spec.ts | 41 +++++++++++
 ...atafields-response-parsing.service.spec.ts | 68 +++++++++++++++++++
 ...taschemas-response-parsing.service.spec.ts | 50 ++++++++++++++
 src/app/core/data/request.reducer.spec.ts     | 11 ++-
 src/app/core/index/index.reducer.spec.ts      | 11 ++-
 5 files changed, 179 insertions(+), 2 deletions(-)
 create mode 100644 src/app/core/data/registry-bitstreamformats-response-parsing.service.spec.ts
 create mode 100644 src/app/core/data/registry-metadatafields-response-parsing.service.spec.ts
 create mode 100644 src/app/core/data/registry-metadataschemas-response-parsing.service.spec.ts

diff --git a/src/app/core/data/registry-bitstreamformats-response-parsing.service.spec.ts b/src/app/core/data/registry-bitstreamformats-response-parsing.service.spec.ts
new file mode 100644
index 0000000000..6cc031f3c9
--- /dev/null
+++ b/src/app/core/data/registry-bitstreamformats-response-parsing.service.spec.ts
@@ -0,0 +1,41 @@
+import { PageInfo } from '../shared/page-info.model';
+import { DSOResponseParsingService } from './dso-response-parsing.service';
+import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
+import {
+  RegistryBitstreamformatsSuccessResponse
+} from '../cache/response.models';
+import { RegistryBitstreamformatsResponseParsingService } from './registry-bitstreamformats-response-parsing.service';
+
+describe('RegistryBitstreamformatsResponseParsingService', () => {
+  let service: RegistryBitstreamformatsResponseParsingService;
+
+  const mockDSOParser = Object.assign({
+    processPageInfo: () => new PageInfo()
+  }) as DSOResponseParsingService;
+
+  const data = Object.assign({
+    payload: {
+      _embedded: {
+        bitstreamformats: [
+          {
+            uuid: 'uuid-1',
+            description: 'a description'
+          },
+          {
+            uuid: 'uuid-2',
+            description: 'another description'
+          },
+        ]
+      }
+    }
+  }) as DSpaceRESTV2Response;
+
+  beforeEach(() => {
+    service = new RegistryBitstreamformatsResponseParsingService(mockDSOParser);
+  });
+
+  it('should parse the data correctly', () => {
+    const response = service.parse(null, data);
+    expect(response.constructor).toBe(RegistryBitstreamformatsSuccessResponse);
+  });
+});
diff --git a/src/app/core/data/registry-metadatafields-response-parsing.service.spec.ts b/src/app/core/data/registry-metadatafields-response-parsing.service.spec.ts
new file mode 100644
index 0000000000..5ede21954a
--- /dev/null
+++ b/src/app/core/data/registry-metadatafields-response-parsing.service.spec.ts
@@ -0,0 +1,68 @@
+import { PageInfo } from '../shared/page-info.model';
+import { DSOResponseParsingService } from './dso-response-parsing.service';
+import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
+import {
+  RegistryMetadatafieldsSuccessResponse
+} from '../cache/response.models';
+import { RegistryMetadatafieldsResponseParsingService } from './registry-metadatafields-response-parsing.service';
+
+describe('RegistryMetadatafieldsResponseParsingService', () => {
+  let service: RegistryMetadatafieldsResponseParsingService;
+
+  const mockDSOParser = Object.assign({
+    processPageInfo: () => new PageInfo()
+  }) as DSOResponseParsingService;
+
+  const data = Object.assign({
+    payload: {
+      _embedded: {
+        metadatafields: [
+          {
+            id: 1,
+            element: 'element',
+            qualifier: 'qualifier',
+            scopeNote: 'a scope note',
+            _embedded: {
+              schema: {
+                id: 1,
+                prefix: 'test',
+                namespace: 'test namespace'
+              }
+            }
+          },
+          {
+            id: 2,
+            element: 'secondelement',
+            qualifier: 'secondqualifier',
+            scopeNote: 'a second scope note',
+            _embedded: {
+              schema: {
+                id: 1,
+                prefix: 'test',
+                namespace: 'test namespace'
+              }
+            }
+          },
+        ]
+      }
+    }
+  }) as DSpaceRESTV2Response;
+
+  const emptyData = Object.assign({
+    payload: {}
+  }) as DSpaceRESTV2Response;
+
+  beforeEach(() => {
+    service = new RegistryMetadatafieldsResponseParsingService(mockDSOParser);
+  });
+
+  it('should parse the data correctly', () => {
+    const response = service.parse(null, data);
+    expect(response.constructor).toBe(RegistryMetadatafieldsSuccessResponse);
+  });
+
+  it('should not produce an error and parse the data correctly when the data is empty', () => {
+    const response = service.parse(null, emptyData);
+    expect(response.constructor).toBe(RegistryMetadatafieldsSuccessResponse);
+  });
+});
diff --git a/src/app/core/data/registry-metadataschemas-response-parsing.service.spec.ts b/src/app/core/data/registry-metadataschemas-response-parsing.service.spec.ts
new file mode 100644
index 0000000000..e49305d06a
--- /dev/null
+++ b/src/app/core/data/registry-metadataschemas-response-parsing.service.spec.ts
@@ -0,0 +1,50 @@
+import { RegistryMetadataschemasResponseParsingService } from './registry-metadataschemas-response-parsing.service';
+import { PageInfo } from '../shared/page-info.model';
+import { DSOResponseParsingService } from './dso-response-parsing.service';
+import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
+import { RegistryMetadataschemasSuccessResponse } from '../cache/response.models';
+
+describe('RegistryMetadataschemasResponseParsingService', () => {
+  let service: RegistryMetadataschemasResponseParsingService;
+
+  const mockDSOParser = Object.assign({
+    processPageInfo: () => new PageInfo()
+  }) as DSOResponseParsingService;
+
+  const data = Object.assign({
+    payload: {
+      _embedded: {
+        metadataschemas: [
+          {
+            id: 1,
+            prefix: 'test',
+            namespace: 'test namespace'
+          },
+          {
+            id: 2,
+            prefix: 'second',
+            namespace: 'second test namespace'
+          }
+        ]
+      }
+    }
+  }) as DSpaceRESTV2Response;
+
+  const emptyData = Object.assign({
+    payload: {}
+  }) as DSpaceRESTV2Response;
+
+  beforeEach(() => {
+    service = new RegistryMetadataschemasResponseParsingService(mockDSOParser);
+  });
+
+  it('should parse the data correctly', () => {
+    const response = service.parse(null, data);
+    expect(response.constructor).toBe(RegistryMetadataschemasSuccessResponse);
+  });
+
+  it('should not produce an error and parse the data correctly when the data is empty', () => {
+    const response = service.parse(null, emptyData);
+    expect(response.constructor).toBe(RegistryMetadataschemasSuccessResponse);
+  });
+});
diff --git a/src/app/core/data/request.reducer.spec.ts b/src/app/core/data/request.reducer.spec.ts
index 57fbb01ce1..5c35c0a398 100644
--- a/src/app/core/data/request.reducer.spec.ts
+++ b/src/app/core/data/request.reducer.spec.ts
@@ -4,7 +4,7 @@ import { requestReducer, RequestState } from './request.reducer';
 import {
   RequestCompleteAction,
   RequestConfigureAction,
-  RequestExecuteAction, ResetResponseTimestampsAction
+  RequestExecuteAction, RequestRemoveAction, ResetResponseTimestampsAction
 } from './request.actions';
 import { GetRequest } from './request.models';
 import { RestResponse } from '../cache/response.models';
@@ -110,4 +110,13 @@ describe('requestReducer', () => {
     expect(newState[id1].response.statusCode).toEqual(response.statusCode);
     expect(newState[id1].response.timeAdded).toBe(timeStamp);
   });
+
+  it('should remove the correct request, in response to a REMOVE action', () => {
+    const state = testState;
+
+    const action = new RequestRemoveAction(id1);
+    const newState = requestReducer(state, action);
+
+    expect(newState[id1]).toBeUndefined();
+  });
 });
diff --git a/src/app/core/index/index.reducer.spec.ts b/src/app/core/index/index.reducer.spec.ts
index ffc2c9fadc..d1403ac5bf 100644
--- a/src/app/core/index/index.reducer.spec.ts
+++ b/src/app/core/index/index.reducer.spec.ts
@@ -1,7 +1,7 @@
 import * as deepFreeze from 'deep-freeze';
 
 import { IndexName, indexReducer, IndexState } from './index.reducer';
-import { AddToIndexAction, RemoveFromIndexByValueAction } from './index.actions';
+import { AddToIndexAction, RemoveFromIndexBySubstringAction, RemoveFromIndexByValueAction } from './index.actions';
 
 class NullAction extends AddToIndexAction {
   type = null;
@@ -59,4 +59,13 @@ describe('requestReducer', () => {
 
     expect(newState[IndexName.OBJECT][key1]).toBeUndefined();
   });
+
+  it('should remove the given \'value\' from its corresponding \'key\' in the correct substate, in response to a REMOVE_BY_SUBSTRING action', () => {
+    const state = testState;
+
+    const action = new RemoveFromIndexBySubstringAction(IndexName.OBJECT, key1);
+    const newState = indexReducer(state, action);
+
+    expect(newState[IndexName.OBJECT][key1]).toBeUndefined();
+  });
 });

From 05bb5dc70b060e002724072e58c3643de4c5fdf2 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 13 Feb 2019 13:08:22 +0100
Subject: [PATCH 36/44] 58789: Authentication fix

---
 src/app/core/auth/auth.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts
index 2e6f68851a..3390997a1e 100644
--- a/src/app/core/auth/auth.service.ts
+++ b/src/app/core/auth/auth.service.ts
@@ -131,7 +131,7 @@ export class AuthService {
    * @returns {Observable<boolean>}
    */
   public isAuthenticated(): Observable<boolean> {
-    return of(true);
+    return this.store.pipe(select(isAuthenticated));
   }
 
   /**

From 2368df95136889008287bfdf141921c63cdc62b1 Mon Sep 17 00:00:00 2001
From: Chris Wilper <chris@atmire.com>
Date: Sat, 22 Dec 2018 23:03:45 -0500
Subject: [PATCH 37/44] DS-4107 Retrieve and model metadata as a map

---
 .../modify-item-overview.component.html       |  14 ++-
 .../modify-item-overview.component.ts         |   4 +-
 .../metadata-uri-values.component.html        |   4 +-
 .../metadata-uri-values.component.ts          |   3 +-
 .../metadata-values.component.html            |   4 +-
 .../metadata-values.component.ts              |   4 +-
 .../full-file-section.component.html          |   2 +-
 .../full/full-item-page.component.html        |  12 +-
 .../full/full-item-page.component.ts          |   4 +-
 .../item-page-specific-field.component.html   |   2 +-
 .../item-page-title-field.component.html      |   2 +-
 .../uri/item-page-uri-field.component.html    |   2 +-
 .../normalized-search-result.model.ts         |   4 +-
 src/app/+search-page/search-result.model.ts   |   4 +-
 src/app/core/browse/browse.service.ts         |  12 +-
 .../models/normalized-dspace-object.model.ts  |   9 +-
 .../data/search-response-parsing.service.ts   |  16 +--
 .../dspace-rest-v2/dspace-rest-v2.service.ts  |   6 +-
 src/app/core/metadata/metadata.service.ts     |  54 ++------
 src/app/core/shared/collection.model.ts       |  10 +-
 src/app/core/shared/community.model.ts        |   8 +-
 src/app/core/shared/dspace-object.model.ts    |  65 ++++------
 src/app/core/shared/metadata.interfaces.ts    |  30 +++++
 src/app/core/shared/metadata.model.ts         | 119 ++++++++++++++++++
 src/app/core/shared/metadatum.model.ts        |  23 ----
 .../comcol-form/comcol-form.component.ts      |  25 ++--
 .../abstract-listable-element.component.ts    |   5 -
 .../item-grid-element.component.html          |  10 +-
 ...-search-result-grid-element.component.html |  12 +-
 .../search-result-grid-element.component.ts   |  40 ++----
 .../item-list-element.component.html          |  14 +--
 ...-search-result-list-element.component.html |   4 +-
 ...-search-result-list-element.component.html |   4 +-
 ...-search-result-list-element.component.html |  20 +--
 .../search-result-list-element.component.ts   |  40 ++----
 35 files changed, 310 insertions(+), 281 deletions(-)
 create mode 100644 src/app/core/shared/metadata.interfaces.ts
 create mode 100644 src/app/core/shared/metadata.model.ts
 delete mode 100644 src/app/core/shared/metadatum.model.ts

diff --git a/src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html b/src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html
index d59d29ddbf..861c20ada7 100644
--- a/src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html
+++ b/src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html
@@ -7,10 +7,12 @@
   </tr>
   </thead>
   <tbody>
-  <tr *ngFor="let metadatum of metadata" class="metadata-row">
-    <td>{{metadatum.key}}</td>
-    <td>{{metadatum.value}}</td>
-    <td>{{metadatum.language}}</td>
-  </tr>
+  <ng-container *ngFor="let entry of metadata | keyvalue">
+    <tr *ngFor="let value of entry.value" class="metadata-row">
+      <td>{{entry.key}}</td>
+      <td>{{value.value}}</td>
+      <td>{{value.language}}</td>
+    </tr>
+  </ng-container>
   </tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts b/src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts
index d32a98d5e0..282f8687e1 100644
--- a/src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts
+++ b/src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts
@@ -1,6 +1,6 @@
 import {Component, Input, OnInit} from '@angular/core';
 import {Item} from '../../../core/shared/item.model';
-import {Metadatum} from '../../../core/shared/metadatum.model';
+import {MetadataMap} from '../../../core/shared/metadata.interfaces';
 
 @Component({
   selector: 'ds-modify-item-overview',
@@ -12,7 +12,7 @@ import {Metadatum} from '../../../core/shared/metadatum.model';
 export class ModifyItemOverviewComponent implements OnInit {
 
   @Input() item: Item;
-  metadata: Metadatum[];
+  metadata: MetadataMap;
 
   ngOnInit(): void {
     this.metadata = this.item.metadata;
diff --git a/src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.html b/src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
index cc618bcd50..344a32841b 100644
--- a/src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
+++ b/src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
@@ -1,5 +1,5 @@
 <ds-metadata-field-wrapper [label]="label | translate">
-    <a *ngFor="let metadatum of values; let last=last;" [href]="metadatum.value">
-       {{ linktext || metadatum.value }}<span *ngIf="!last" [innerHTML]="separator"></span>
+    <a *ngFor="let value of values; let last=last;" [href]="value.value">
+       {{ linktext || value.value }}<span *ngIf="!last" [innerHTML]="separator"></span>
     </a>
 </ds-metadata-field-wrapper>
diff --git a/src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts b/src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
index 212dcddee8..b5870f16b8 100644
--- a/src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
+++ b/src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
@@ -1,6 +1,7 @@
 import { Component, Input } from '@angular/core';
 
 import { MetadataValuesComponent } from '../metadata-values/metadata-values.component';
+import { MetadataValue } from '../../../core/shared/metadata.interfaces';
 
 /**
  * This component renders the configured 'values' into the ds-metadata-field-wrapper component as a link.
@@ -18,7 +19,7 @@ export class MetadataUriValuesComponent extends MetadataValuesComponent {
 
   @Input() linktext: any;
 
-  @Input() values: any;
+  @Input() values: MetadataValue[];
 
   @Input() separator: string;
 
diff --git a/src/app/+item-page/field-components/metadata-values/metadata-values.component.html b/src/app/+item-page/field-components/metadata-values/metadata-values.component.html
index f16655c63c..fbc1e11a07 100644
--- a/src/app/+item-page/field-components/metadata-values/metadata-values.component.html
+++ b/src/app/+item-page/field-components/metadata-values/metadata-values.component.html
@@ -1,5 +1,5 @@
 <ds-metadata-field-wrapper [label]="label | translate">
-    <span *ngFor="let metadatum of values; let last=last;">
-        {{metadatum.value}}<span *ngIf="!last" [innerHTML]="separator"></span>
+    <span *ngFor="let value of values; let last=last;">
+        {{value.value}}<span *ngIf="!last" [innerHTML]="separator"></span>
     </span>
 </ds-metadata-field-wrapper>
diff --git a/src/app/+item-page/field-components/metadata-values/metadata-values.component.ts b/src/app/+item-page/field-components/metadata-values/metadata-values.component.ts
index 1c94b56d57..2be7291dcd 100644
--- a/src/app/+item-page/field-components/metadata-values/metadata-values.component.ts
+++ b/src/app/+item-page/field-components/metadata-values/metadata-values.component.ts
@@ -1,5 +1,5 @@
 import { Component, Input } from '@angular/core';
-import { Metadatum } from '../../../core/shared/metadatum.model';
+import { MetadataValue } from '../../../core/shared/metadata.interfaces';
 
 /**
  * This component renders the configured 'values' into the ds-metadata-field-wrapper component.
@@ -12,7 +12,7 @@ import { Metadatum } from '../../../core/shared/metadatum.model';
 })
 export class MetadataValuesComponent {
 
-  @Input() values: Metadatum[];
+  @Input() values: MetadataValue[];
 
   @Input() separator: string;
 
diff --git a/src/app/+item-page/full/field-components/file-section/full-file-section.component.html b/src/app/+item-page/full/field-components/file-section/full-file-section.component.html
index d5a7febeb9..a68993cd16 100644
--- a/src/app/+item-page/full/field-components/file-section/full-file-section.component.html
+++ b/src/app/+item-page/full/field-components/file-section/full-file-section.component.html
@@ -17,7 +17,7 @@
 
 
                 <dt class="col-md-4">{{"item.page.filesection.description" | translate}}</dt>
-                <dd class="col-md-8">{{file.findMetadata("dc.description")}}</dd>
+                <dd class="col-md-8">{{file.firstMetadataValue("dc.description")}}</dd>
             </dl>
         </div>
         <div class="col-2">
diff --git a/src/app/+item-page/full/full-item-page.component.html b/src/app/+item-page/full/full-item-page.component.html
index 1d0c4ab812..7080ba2e96 100644
--- a/src/app/+item-page/full/full-item-page.component.html
+++ b/src/app/+item-page/full/full-item-page.component.html
@@ -9,11 +9,13 @@
       </div>
       <table class="table table-responsive table-striped">
         <tbody>
-        <tr *ngFor="let metadatum of (metadata$ | async)">
-          <td>{{metadatum.key}}</td>
-          <td>{{metadatum.value}}</td>
-          <td>{{metadatum.language}}</td>
-        </tr>
+          <ng-container *ngFor="let entry of (metadata$ | async) | keyvalue">
+            <tr *ngFor="let value of entry.value">
+              <td>{{entry.key}}</td>
+              <td>{{value.value}}</td>
+              <td>{{value.language}}</td>
+            </tr>
+          </ng-container>
         </tbody>
       </table>
       <ds-item-page-full-file-section [item]="item"></ds-item-page-full-file-section>
diff --git a/src/app/+item-page/full/full-item-page.component.ts b/src/app/+item-page/full/full-item-page.component.ts
index d09ac268ec..fcb724b564 100644
--- a/src/app/+item-page/full/full-item-page.component.ts
+++ b/src/app/+item-page/full/full-item-page.component.ts
@@ -6,7 +6,7 @@ import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
 
 import { ItemPageComponent } from '../simple/item-page.component';
-import { Metadatum } from '../../core/shared/metadatum.model';
+import { MetadataMap } from '../../core/shared/metadata.interfaces';
 import { ItemDataService } from '../../core/data/item-data.service';
 
 import { RemoteData } from '../../core/data/remote-data';
@@ -34,7 +34,7 @@ export class FullItemPageComponent extends ItemPageComponent implements OnInit {
 
   itemRD$: Observable<RemoteData<Item>>;
 
-  metadata$: Observable<Metadatum[]>;
+  metadata$: Observable<MetadataMap>;
 
   constructor(route: ActivatedRoute, items: ItemDataService, metadataService: MetadataService) {
     super(route, items, metadataService);
diff --git a/src/app/+item-page/simple/field-components/specific-field/item-page-specific-field.component.html b/src/app/+item-page/simple/field-components/specific-field/item-page-specific-field.component.html
index 4a27848ec6..c0d948fc76 100644
--- a/src/app/+item-page/simple/field-components/specific-field/item-page-specific-field.component.html
+++ b/src/app/+item-page/simple/field-components/specific-field/item-page-specific-field.component.html
@@ -1,3 +1,3 @@
 <div class="item-page-specific-field">
-  <ds-metadata-values [values]="item?.filterMetadata(fields)" [separator]="separator" [label]="label"></ds-metadata-values>
+  <ds-metadata-values [values]="item?.allMetadata(fields)" [separator]="separator" [label]="label"></ds-metadata-values>
 </div>
diff --git a/src/app/+item-page/simple/field-components/specific-field/title/item-page-title-field.component.html b/src/app/+item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
index 4c53e2e3e2..40f54ec636 100644
--- a/src/app/+item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
+++ b/src/app/+item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
@@ -1,3 +1,3 @@
 <h2 class="item-page-title-field">
-  <ds-metadata-values [values]="item?.filterMetadata(fields)"></ds-metadata-values>
+  <ds-metadata-values [values]="item?.allMetadata(fields)"></ds-metadata-values>
 </h2>
diff --git a/src/app/+item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.html b/src/app/+item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.html
index fde79d6a04..771fef53fc 100644
--- a/src/app/+item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.html
+++ b/src/app/+item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.html
@@ -1,3 +1,3 @@
 <div class="item-page-specific-field">
-  <ds-metadata-uri-values [values]="item?.filterMetadata(fields)" [separator]="separator" [label]="label"></ds-metadata-uri-values>
+  <ds-metadata-uri-values [values]="item?.allMetadata(fields)" [separator]="separator" [label]="label"></ds-metadata-uri-values>
 </div>
diff --git a/src/app/+search-page/normalized-search-result.model.ts b/src/app/+search-page/normalized-search-result.model.ts
index 0683c74aed..3c1a46872c 100644
--- a/src/app/+search-page/normalized-search-result.model.ts
+++ b/src/app/+search-page/normalized-search-result.model.ts
@@ -1,5 +1,5 @@
 import { autoserialize } from 'cerialize';
-import { Metadatum } from '../core/shared/metadatum.model';
+import { MetadataMap } from '../core/shared/metadata.interfaces';
 import { ListableObject } from '../shared/object-collection/shared/listable-object.model';
 
 /**
@@ -16,6 +16,6 @@ export class NormalizedSearchResult implements ListableObject {
    * The metadata that was used to find this item, hithighlighted
    */
   @autoserialize
-  hitHighlights: Metadatum[];
+  hitHighlights: MetadataMap;
 
 }
diff --git a/src/app/+search-page/search-result.model.ts b/src/app/+search-page/search-result.model.ts
index 00b1c62a99..b2e5eafdec 100644
--- a/src/app/+search-page/search-result.model.ts
+++ b/src/app/+search-page/search-result.model.ts
@@ -1,5 +1,5 @@
 import { DSpaceObject } from '../core/shared/dspace-object.model';
-import { Metadatum } from '../core/shared/metadatum.model';
+import { MetadataMap } from '../core/shared/metadata.interfaces';
 import { ListableObject } from '../shared/object-collection/shared/listable-object.model';
 
 /**
@@ -14,6 +14,6 @@ export class SearchResult<T extends DSpaceObject> implements ListableObject {
   /**
    * The metadata that was used to find this item, hithighlighted
    */
-  hitHighlights: Metadatum[];
+  hitHighlights: MetadataMap;
 
 }
diff --git a/src/app/core/browse/browse.service.ts b/src/app/core/browse/browse.service.ts
index b807a77e99..41675632dd 100644
--- a/src/app/core/browse/browse.service.ts
+++ b/src/app/core/browse/browse.service.ts
@@ -38,8 +38,8 @@ import { DSpaceObject } from '../shared/dspace-object.model';
 export class BrowseService {
   protected linkPath = 'browses';
 
-  private static toSearchKeyArray(metadatumKey: string): string[] {
-    const keyParts = metadatumKey.split('.');
+  private static toSearchKeyArray(metadataKey: string): string[] {
+    const keyParts = metadataKey.split('.');
     const searchFor = [];
     searchFor.push('*');
     for (let i = 0; i < keyParts.length - 1; i++) {
@@ -47,7 +47,7 @@ export class BrowseService {
       const nextPart = [...prevParts, '*'].join('.');
       searchFor.push(nextPart);
     }
-    searchFor.push(metadatumKey);
+    searchFor.push(metadataKey);
     return searchFor;
   }
 
@@ -179,8 +179,8 @@ export class BrowseService {
     return this.rdb.toRemoteDataObservable(requestEntry$, payload$);
   }
 
-  getBrowseURLFor(metadatumKey: string, linkPath: string): Observable<string> {
-    const searchKeyArray = BrowseService.toSearchKeyArray(metadatumKey);
+  getBrowseURLFor(metadataKey: string, linkPath: string): Observable<string> {
+    const searchKeyArray = BrowseService.toSearchKeyArray(metadataKey);
     return this.getBrowseDefinitions().pipe(
       getRemoteDataPayload(),
       map((browseDefinitions: BrowseDefinition[]) => browseDefinitions
@@ -191,7 +191,7 @@ export class BrowseService {
       ),
       map((def: BrowseDefinition) => {
         if (isEmpty(def) || isEmpty(def._links) || isEmpty(def._links[linkPath])) {
-          throw new Error(`A browse endpoint for ${linkPath} on ${metadatumKey} isn't configured`);
+          throw new Error(`A browse endpoint for ${linkPath} on ${metadataKey} isn't configured`);
         } else {
           return def._links[linkPath];
         }
diff --git a/src/app/core/cache/models/normalized-dspace-object.model.ts b/src/app/core/cache/models/normalized-dspace-object.model.ts
index 030e17364a..87bd4b4369 100644
--- a/src/app/core/cache/models/normalized-dspace-object.model.ts
+++ b/src/app/core/cache/models/normalized-dspace-object.model.ts
@@ -1,7 +1,6 @@
 import { autoserialize, autoserializeAs, deserialize, serialize } from 'cerialize';
 import { DSpaceObject } from '../../shared/dspace-object.model';
-
-import { Metadatum } from '../../shared/metadatum.model';
+import { MetadataMap } from '../../shared/metadata.interfaces';
 import { ResourceType } from '../../shared/resource-type';
 import { mapsTo } from '../builders/build-decorators';
 import { NormalizedObject } from './normalized-object.model';
@@ -46,10 +45,10 @@ export class NormalizedDSpaceObject extends NormalizedObject {
   type: ResourceType;
 
   /**
-   * An array containing all metadata of this DSpaceObject
+   * All metadata of this DSpaceObject
    */
-  @autoserializeAs(Metadatum)
-  metadata: Metadatum[];
+  @autoserialize
+  metadata: MetadataMap;
 
   /**
    * An array of DSpaceObjects that are direct parents of this DSpaceObject
diff --git a/src/app/core/data/search-response-parsing.service.ts b/src/app/core/data/search-response-parsing.service.ts
index 7ee2b60f89..46b2572c4e 100644
--- a/src/app/core/data/search-response-parsing.service.ts
+++ b/src/app/core/data/search-response-parsing.service.ts
@@ -7,7 +7,7 @@ import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.
 import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer';
 import { hasValue } from '../../shared/empty.util';
 import { SearchQueryResponse } from '../../+search-page/search-service/search-query-response.model';
-import { Metadatum } from '../shared/metadatum.model';
+import { MetadataMap, MetadataValue } from '../shared/metadata.interfaces';
 
 @Injectable()
 export class SearchResponseParsingService implements ResponseParsingService {
@@ -16,17 +16,17 @@ export class SearchResponseParsingService implements ResponseParsingService {
 
   parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
     const payload = data.payload._embedded.searchResult;
-    const hitHighlights = payload._embedded.objects
+    const hitHighlights: MetadataMap[] = payload._embedded.objects
       .map((object) => object.hitHighlights)
       .map((hhObject) => {
+        const mdMap: MetadataMap = {};
         if (hhObject) {
-          return Object.keys(hhObject).map((key) => Object.assign(new Metadatum(), {
-            key: key,
-            value: hhObject[key].join('...')
-          }))
-        } else {
-          return [];
+          for (const key of Object.keys(hhObject)) {
+            const value: MetadataValue = { value: hhObject[key].join('...'), language: null };
+            mdMap[key] = [ value ];
+          }
         }
+        return mdMap;
       });
 
     const dsoSelfLinks = payload._embedded.objects
diff --git a/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts b/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts
index 20d6b1dfb3..6bf5eb0818 100644
--- a/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts
+++ b/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts
@@ -91,9 +91,9 @@ export class DSpaceRESTv2Service {
     const form: FormData = new FormData();
     form.append('name', dso.name);
     if (dso.metadata) {
-      for (const i of Object.keys(dso.metadata)) {
-        if (isNotEmpty(dso.metadata[i].value)) {
-          form.append(dso.metadata[i].key, dso.metadata[i].value);
+      for (const key of Object.keys(dso.metadata)) {
+        for (const value of dso.allMetadataValues(key)) {
+          form.append(key, value);
         }
       }
     }
diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index 9dbfae3f90..736bf11923 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -294,6 +294,10 @@ export class MetadataService {
     }
   }
 
+  private hasType(value: string): boolean {
+    return this.currentObject.value.hasMetadata('dc.type', { value: value, ignoreCase: true });
+  }
+
   /**
    * Returns true if this._item is a dissertation
    *
@@ -301,14 +305,7 @@ export class MetadataService {
    *      true if this._item has a dc.type equal to 'Thesis'
    */
   private isDissertation(): boolean {
-    let isDissertation = false;
-    for (const metadatum of this.currentObject.value.metadata) {
-      if (metadatum.key === 'dc.type') {
-        isDissertation = metadatum.value.toLowerCase() === 'thesis';
-        break;
-      }
-    }
-    return isDissertation;
+    return this.hasType('thesis');
   }
 
   /**
@@ -318,40 +315,15 @@ export class MetadataService {
    *      true if this._item has a dc.type equal to 'Technical Report'
    */
   private isTechReport(): boolean {
-    let isTechReport = false;
-    for (const metadatum of this.currentObject.value.metadata) {
-      if (metadatum.key === 'dc.type') {
-        isTechReport = metadatum.value.toLowerCase() === 'technical report';
-        break;
-      }
-    }
-    return isTechReport;
+    return this.hasType('technical report');
   }
 
   private getMetaTagValue(key: string): string {
-    let value: string;
-    for (const metadatum of this.currentObject.value.metadata) {
-      if (metadatum.key === key) {
-        value = metadatum.value;
-      }
-    }
-    return value;
+    return this.currentObject.value.firstMetadataValue(key);
   }
 
   private getFirstMetaTagValue(keys: string[]): string {
-    let value: string;
-    for (const metadatum of this.currentObject.value.metadata) {
-      for (const key of keys) {
-        if (key === metadatum.key) {
-          value = metadatum.value;
-          break;
-        }
-      }
-      if (value !== undefined) {
-        break;
-      }
-    }
-    return value;
+    return this.currentObject.value.firstMetadataValue(keys);
   }
 
   private getMetaTagValuesAndCombine(key: string): string {
@@ -359,15 +331,7 @@ export class MetadataService {
   }
 
   private getMetaTagValues(keys: string[]): string[] {
-    const values: string[] = [];
-    for (const metadatum of this.currentObject.value.metadata) {
-      for (const key of keys) {
-        if (key === metadatum.key) {
-          values.push(metadatum.value);
-        }
-      }
-    }
-    return values;
+    return this.currentObject.value.allMetadataValues(keys);
   }
 
   private addMetaTag(property: string, content: string): void {
diff --git a/src/app/core/shared/collection.model.ts b/src/app/core/shared/collection.model.ts
index 8fdc14bd6e..c630c9dd57 100644
--- a/src/app/core/shared/collection.model.ts
+++ b/src/app/core/shared/collection.model.ts
@@ -16,7 +16,7 @@ export class Collection extends DSpaceObject {
    * Corresponds to the metadata field dc.description
    */
   get introductoryText(): string {
-    return this.findMetadata('dc.description');
+    return this.firstMetadataValue('dc.description');
   }
 
   /**
@@ -24,7 +24,7 @@ export class Collection extends DSpaceObject {
    * Corresponds to the metadata field dc.description.abstract
    */
   get shortDescription(): string {
-    return this.findMetadata('dc.description.abstract');
+    return this.firstMetadataValue('dc.description.abstract');
   }
 
   /**
@@ -32,7 +32,7 @@ export class Collection extends DSpaceObject {
    * Corresponds to the metadata field dc.rights
    */
   get copyrightText(): string {
-    return this.findMetadata('dc.rights');
+    return this.firstMetadataValue('dc.rights');
   }
 
   /**
@@ -40,7 +40,7 @@ export class Collection extends DSpaceObject {
    * Corresponds to the metadata field dc.rights.license
    */
   get license(): string {
-    return this.findMetadata('dc.rights.license');
+    return this.firstMetadataValue('dc.rights.license');
   }
 
   /**
@@ -48,7 +48,7 @@ export class Collection extends DSpaceObject {
    * Corresponds to the metadata field dc.description.tableofcontents
    */
   get sidebarText(): string {
-    return this.findMetadata('dc.description.tableofcontents');
+    return this.firstMetadataValue('dc.description.tableofcontents');
   }
 
   /**
diff --git a/src/app/core/shared/community.model.ts b/src/app/core/shared/community.model.ts
index c5f6e0ab87..c4e703fd7f 100644
--- a/src/app/core/shared/community.model.ts
+++ b/src/app/core/shared/community.model.ts
@@ -17,7 +17,7 @@ export class Community extends DSpaceObject {
    * Corresponds to the metadata field dc.description
    */
   get introductoryText(): string {
-    return this.findMetadata('dc.description');
+    return this.firstMetadataValue('dc.description');
   }
 
   /**
@@ -25,7 +25,7 @@ export class Community extends DSpaceObject {
    * Corresponds to the metadata field dc.description.abstract
    */
   get shortDescription(): string {
-    return this.findMetadata('dc.description.abstract');
+    return this.firstMetadataValue('dc.description.abstract');
   }
 
   /**
@@ -33,7 +33,7 @@ export class Community extends DSpaceObject {
    * Corresponds to the metadata field dc.rights
    */
   get copyrightText(): string {
-    return this.findMetadata('dc.rights');
+    return this.firstMetadataValue('dc.rights');
   }
 
   /**
@@ -41,7 +41,7 @@ export class Community extends DSpaceObject {
    * Corresponds to the metadata field dc.description.tableofcontents
    */
   get sidebarText(): string {
-    return this.findMetadata('dc.description.tableofcontents');
+    return this.firstMetadataValue('dc.description.tableofcontents');
   }
 
   /**
diff --git a/src/app/core/shared/dspace-object.model.ts b/src/app/core/shared/dspace-object.model.ts
index 3e08da151c..1dba79865f 100644
--- a/src/app/core/shared/dspace-object.model.ts
+++ b/src/app/core/shared/dspace-object.model.ts
@@ -1,5 +1,5 @@
-import { Metadatum } from './metadatum.model'
-import { isEmpty, isNotEmpty } from '../../shared/empty.util';
+import { MetadataMap, MetadataValue, MetadataValueFilter } from './metadata.interfaces';
+import { Metadata } from './metadata.model';
 import { CacheableObject } from '../cache/object-cache.reducer';
 import { RemoteData } from '../data/remote-data';
 import { ResourceType } from './resource-type';
@@ -35,14 +35,14 @@ export class DSpaceObject implements CacheableObject, ListableObject {
    * The name for this DSpaceObject
    */
   get name(): string {
-    return this.findMetadata('dc.title');
+    return this.firstMetadataValue('dc.title');
   }
 
   /**
-   * An array containing all metadata of this DSpaceObject
+   * All metadata of this DSpaceObject
    */
   @autoserialize
-  metadata: Metadatum[] = [];
+  metadata: MetadataMap;
 
   /**
    * An array of DSpaceObjects that are direct parents of this DSpaceObject
@@ -54,42 +54,29 @@ export class DSpaceObject implements CacheableObject, ListableObject {
    */
   owner: Observable<RemoteData<DSpaceObject>>;
 
-  /**
-   * Find a metadata field by key and language
-   *
-   * This method returns the value of the first element
-   * in the metadata array that matches the provided
-   * key and language
-   *
-   * @param key
-   * @param language
-   * @return string
-   */
-  findMetadata(key: string, language?: string): string {
-    const metadatum = this.metadata.find((m: Metadatum) => {
-      return m.key === key && (isEmpty(language) || m.language === language)
-    });
-    if (isNotEmpty(metadatum)) {
-      return metadatum.value;
-    } else {
-      return undefined;
-    }
+  /** Gets all matching metadata in this DSpaceObject. See `Metadata.all` for more information. */
+  allMetadata(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): MetadataValue[] {
+    return Metadata.all(this.metadata, keyOrKeys, valueFilter);
   }
 
-  /**
-   * Find metadata by an array of keys
-   *
-   * This method returns the values of the element
-   * in the metadata array that match the provided
-   * key(s)
-   *
-   * @param key(s)
-   * @return Array<Metadatum>
-   */
-  filterMetadata(keys: string[]): Metadatum[] {
-    return this.metadata.filter((metadatum: Metadatum) => {
-      return keys.some((key) => key === metadatum.key);
-    });
+  /** Like `allMetadata`, but only returns string values. */
+  allMetadataValues(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string[] {
+    return Metadata.allValues(this.metadata, keyOrKeys, valueFilter);
+  }
+
+  /** Gets the first matching metadata in this DSpaceObject, or `undefined`. */
+  firstMetadata(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): MetadataValue {
+    return Metadata.first(this.metadata, keyOrKeys, valueFilter);
+  }
+
+  /** Like `firstMetadata`, but only returns a string value, or `undefined`. */
+  firstMetadataValue(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string {
+    return Metadata.firstValue(this.metadata, keyOrKeys, valueFilter);
+  }
+
+  /** Checks for matching metadata in this DSpaceObject. */
+  hasMetadata(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): boolean {
+    return Metadata.has(this.metadata, keyOrKeys, valueFilter);
   }
 
 }
diff --git a/src/app/core/shared/metadata.interfaces.ts b/src/app/core/shared/metadata.interfaces.ts
new file mode 100644
index 0000000000..3590117ce8
--- /dev/null
+++ b/src/app/core/shared/metadata.interfaces.ts
@@ -0,0 +1,30 @@
+/** A map of metadata keys to an ordered list of MetadataValue objects. */
+export interface MetadataMap {
+  [ key: string ]: MetadataValue[];
+}
+
+/** A single metadata value and its properties. */
+export interface MetadataValue {
+
+  /** The language. */
+  language: string;
+
+  /** The string value. */
+  value: string;
+}
+
+/** Constraints for matching metadata values. */
+export interface MetadataValueFilter {
+
+  /** The language constraint. */
+  language?: string;
+
+  /** The value constraint. */
+  value?: string;
+
+  /** Whether the value constraint should match without regard to case. */
+  ignoreCase?: boolean;
+
+  /** Whether the value constraint should match as a substring. */
+  substring?: boolean;
+}
diff --git a/src/app/core/shared/metadata.model.ts b/src/app/core/shared/metadata.model.ts
new file mode 100644
index 0000000000..c774af189b
--- /dev/null
+++ b/src/app/core/shared/metadata.model.ts
@@ -0,0 +1,119 @@
+import { isEmpty } from '../../shared/empty.util';
+import { MetadataMap, MetadataValue, MetadataValueFilter } from './metadata.interfaces';
+
+/**
+ * Static utility methods for working with DSpace metadata.
+ */
+export class Metadata {
+
+  /**
+   * Gets all matching metadata.
+   *
+   * @param {MetadataMap|MetadataMap[]} mapOrMaps The source map(s). Values will only be returned from one map --
+   * the first with at least one match.
+   * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported, so `'*'` will
+   * match all keys, `'dc.date.*'` will match all qualified dc dates, and so on. Exact keys will be evaluated
+   * (and matches returned) in the order they are given in the parameter. When multiple keys match a wildcard,
+   * they are evaluated in the order they are stored in the map (alphanumeric if obtained from the REST api).
+   * If duplicate or overlapping keys are specified, the first one takes precedence. For example, specifying
+   * `['dc.date', 'dc.*', '*']` will cause any `dc.date` values to be evaluated (and returned, if matched)
+   * first, followed by any other `dc` metadata values, followed by any other (non-dc) metadata values.
+   * @param {MetadataValueFilter} filter The value filter to use.
+   * @returns {MetadataValue[]} the matching values or an empty array.
+   */
+  public static all(mapOrMaps: MetadataMap | MetadataMap[], keyOrKeys: string | string[],
+                    filter?: MetadataValueFilter): MetadataValue[] {
+    const mdMaps: MetadataMap[] = mapOrMaps instanceof Array ? mapOrMaps : [ mapOrMaps ];
+    const matches: MetadataValue[] = [];
+    for (const mdMap of mdMaps) {
+      for (const mdKey of Metadata.resolveKeys(mdMap, keyOrKeys)) {
+        const candidates = mdMap[mdKey];
+        if (candidates) {
+          for (const candidate of candidates) {
+            if (Metadata.valueMatches(candidate, filter)) {
+              matches.push(candidate);
+            }
+          }
+        }
+      }
+      if (!isEmpty(matches)) {
+        return matches;
+      }
+    }
+    return matches;
+  }
+
+  /** Like `all`, but only returns string values. */
+  public static allValues(mapOrMaps: MetadataMap | MetadataMap[], keyOrKeys: string | string[],
+                          filter?: MetadataValueFilter): string[] {
+    return Metadata.all(mapOrMaps, keyOrKeys, filter).map((mdValue) => mdValue.value);
+  }
+
+  /** Gets the first matching MetadataValue object in a map, or `undefined`. */
+  public static first(mdMapOrMaps: MetadataMap | MetadataMap[], keyOrKeys: string | string[],
+                      filter?: MetadataValueFilter): MetadataValue {
+    const mdMaps: MetadataMap[] = mdMapOrMaps instanceof Array ? mdMapOrMaps : [ mdMapOrMaps ];
+    for (const mdMap of mdMaps) {
+      for (const key of Metadata.resolveKeys(mdMap, keyOrKeys)) {
+        const values: MetadataValue[] = mdMap[key];
+        if (values) {
+          return values.find((value: MetadataValue) => Metadata.valueMatches(value, filter));
+        }
+      }
+    }
+  }
+
+  /** Like `first`, but only returns a string value, or `undefined`. */
+  public static firstValue(mdMapOrMaps: MetadataMap | MetadataMap[], keyOrKeys: string | string[],
+                           filter?: MetadataValueFilter): string {
+    const value = Metadata.first(mdMapOrMaps, keyOrKeys, filter);
+    return value === undefined ? undefined : value.value;
+  }
+
+  /** Checks the given map for a matching value. */
+  public static has(mdMapOrMaps: MetadataMap | MetadataMap[], keyOrKeys: string | string[],
+                    filter?: MetadataValueFilter): boolean {
+    return Metadata.first(mdMapOrMaps, keyOrKeys, filter) !== undefined;
+  }
+
+  /** Checks if a value matches a filter. */
+  public static valueMatches(mdValue: MetadataValue, filter: MetadataValueFilter) {
+    if (!filter) {
+      return true;
+    } else if (filter.language && filter.language !== mdValue.language) {
+      return false;
+    } else if (filter.value) {
+      let fValue = filter.value;
+      let mValue = mdValue.value;
+      if (filter.ignoreCase) {
+        fValue = filter.value.toLowerCase();
+        mValue = mdValue.value.toLowerCase();
+      }
+      if (filter.substring) {
+        return mValue.includes(fValue);
+      } else {
+        return mValue === fValue;
+      }
+    }
+    return true;
+  }
+
+  /** Gets the list of keys in the map limited by, and in the order given by `keyOrKeys` */
+  private static resolveKeys(mdMap: MetadataMap, keyOrKeys: string | string[]): string[] {
+    const inputKeys: string[] = keyOrKeys instanceof Array ? keyOrKeys : [ keyOrKeys ];
+    const outputKeys: string[] = [];
+    for (const inputKey of inputKeys) {
+      if (inputKey.includes('*')) {
+        const inputKeyRegex = new RegExp('^' + inputKey.replace('.', '\.').replace('*', '.*') + '$');
+        for (const mapKey of Object.keys(mdMap)) {
+          if (!outputKeys.includes(mapKey) && inputKeyRegex.test(mapKey)) {
+            outputKeys.push(mapKey);
+          }
+        }
+      } else if (mdMap.hasOwnProperty(inputKey) && !outputKeys.includes(inputKey)) {
+        outputKeys.push(inputKey);
+      }
+    }
+    return outputKeys;
+  }
+}
diff --git a/src/app/core/shared/metadatum.model.ts b/src/app/core/shared/metadatum.model.ts
deleted file mode 100644
index a3c5830608..0000000000
--- a/src/app/core/shared/metadatum.model.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { autoserialize } from 'cerialize';
-
-export class Metadatum {
-
-  /**
-   * The metadata field of this Metadatum
-   */
-  @autoserialize
-  key: string;
-
-  /**
-   * The language of this Metadatum
-   */
-  @autoserialize
-  language: string;
-
-  /**
-   * The value of this Metadatum
-   */
-  @autoserialize
-  value: string;
-
-}
diff --git a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.ts b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.ts
index 17710fd1c6..0e0195aaaa 100644
--- a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.ts
+++ b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.ts
@@ -8,6 +8,7 @@ import { FormGroup } from '@angular/forms';
 import { DynamicFormControlModel } from '@ng-dynamic-forms/core/src/model/dynamic-form-control.model';
 import { TranslateService } from '@ngx-translate/core';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { MetadataMap, MetadataValue } from '../../../core/shared/metadata.interfaces';
 import { isNotEmpty } from '../../empty.util';
 import { ResourceType } from '../../../core/shared/resource-type';
 
@@ -64,7 +65,7 @@ export class ComColFormComponent<T extends DSpaceObject> implements OnInit {
   ngOnInit(): void {
     this.formModel.forEach(
       (fieldModel: DynamicInputModel) => {
-        fieldModel.value = this.dso.findMetadata(fieldModel.name);
+        fieldModel.value = this.dso.firstMetadataValue(fieldModel.name);
       }
     );
     this.formGroup = this.formService.createFormGroup(this.formModel);
@@ -77,20 +78,24 @@ export class ComColFormComponent<T extends DSpaceObject> implements OnInit {
   }
 
   /**
-   * Checks which new fields where added and sends the updated version of the DSO to the parent component
+   * Checks which new fields were added and sends the updated version of the DSO to the parent component
    */
   onSubmit() {
-    const metadata = this.formModel.map(
-      (fieldModel: DynamicInputModel) => {
-        return { key: fieldModel.name, value: fieldModel.value }
+    const formMetadata = new Object() as MetadataMap;
+    this.formModel.forEach((fieldModel: DynamicInputModel) => {
+      const value: MetadataValue = { value: fieldModel.value as string, language: null };
+      if (formMetadata.hasOwnProperty(fieldModel.name)) {
+        formMetadata[fieldModel.name].push(value);
+      } else {
+        formMetadata[fieldModel.name] = [ value ];
       }
-    );
-    const filteredOldMetadata = this.dso.metadata.filter((filter) => !metadata.map((md) => md.key).includes(filter.key));
-    const filteredNewMetadata = metadata.filter((md) => isNotEmpty(md.value));
+    });
 
-    const newMetadata = [...filteredOldMetadata, ...filteredNewMetadata];
     const updatedDSO = Object.assign({}, this.dso, {
-      metadata: newMetadata,
+      metadata: {
+        ...this.dso.metadata,
+        ...formMetadata
+      },
       type: ResourceType.Community
     });
     this.submitForm.emit(updatedDSO);
diff --git a/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts b/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts
index 59df86fdff..d52036b5dc 100644
--- a/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts
+++ b/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts
@@ -1,6 +1,5 @@
 import { Component, Inject } from '@angular/core';
 import { ListableObject } from '../listable-object.model';
-import { hasValue } from '../../../empty.util';
 
 @Component({
   selector: 'ds-abstract-object-element',
@@ -11,8 +10,4 @@ export class AbstractListableElementComponent <T extends ListableObject> {
   public constructor(@Inject('objectElementProvider') public listableObject: ListableObject) {
     this.object = listableObject as T;
   }
-
-  hasValue(data) {
-    return hasValue(data);
-  }
 }
diff --git a/src/app/shared/object-grid/item-grid-element/item-grid-element.component.html b/src/app/shared/object-grid/item-grid-element/item-grid-element.component.html
index 728dba7549..6bb2cfa99d 100644
--- a/src/app/shared/object-grid/item-grid-element/item-grid-element.component.html
+++ b/src/app/shared/object-grid/item-grid-element/item-grid-element.component.html
@@ -5,19 +5,19 @@
       </ds-grid-thumbnail>
     </a>
     <div class="card-body">
-      <h4 class="card-title">{{object.findMetadata('dc.title')}}</h4>
+      <h4 class="card-title">{{object.firstMetadataValue('dc.title')}}</h4>
 
       <ds-truncatable-part [id]="object.id" [minLines]="2">
-        <p *ngIf="object.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0" class="item-authors card-text text-muted">
-            <span *ngFor="let authorMd of object.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">{{authorMd.value}}
+        <p *ngIf="object.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])" class="item-authors card-text text-muted">
+            <span *ngFor="let author of object.allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">{{author}}
                 <span *ngIf="!last">; </span>
             </span>
-          <span *ngIf="hasValue(object.findMetadata('dc.date.issued'))" class="item-date">{{object.findMetadata("dc.date.issued")}}</span>
+          <span *ngIf="object.hasMetadata('dc.date.issued')" class="item-date">{{object.firstMetadataValue("dc.date.issued")}}</span>
         </p>
       </ds-truncatable-part>
 
       <ds-truncatable-part [id]="object.id" [minLines]="5">
-        <p *ngIf="object.findMetadata('dc.description.abstract')" class="item-abstract card-text">{{object.findMetadata("dc.description.abstract") }}</p>
+        <p *ngIf="object.hasMetadata('dc.description.abstract')" class="item-abstract card-text">{{object.firstMetadataValue("dc.description.abstract")}}</p>
       </ds-truncatable-part>
 
       <div class="text-center pt-2">
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.html
index 1e4f6f3c64..c7e2f524f3 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.html
@@ -8,20 +8,20 @@
         </a>
         <div class="card-body">
             <ds-truncatable-part [fixedHeight]="true" [id]="dso.id" [minLines]="3" type="h4">
-                <h4 class="card-title" [innerHTML]="dso.findMetadata('dc.title')"></h4>
+                <h4 class="card-title" [innerHTML]="dso.firstMetadataValue('dc.title')"></h4>
             </ds-truncatable-part>
-            <p *ngIf="dso.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0"
+            <p *ngIf="dso.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])"
                class="item-authors card-text text-muted">
                 <ds-truncatable-part [fixedHeight]="true" [id]="dso.id" [minLines]="1">
-                    <span *ngIf="hasValue(dso.findMetadata('dc.date.issued'))" class="item-date">{{dso.findMetadata("dc.date.issued")}}</span>
-                    <span *ngFor="let authorMd of dso.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']);">,
-                        <span [innerHTML]="authorMd.value"></span>
+                    <span *ngIf="dso.hasMetadata('dc.date.issued')" class="item-date">{{dso.firstMetadataValue('dc.date.issued')}}</span>
+                    <span *ngFor="let author of dso.allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']);">,
+                        <span [innerHTML]="author"></span>
                     </span>
                 </ds-truncatable-part>
             </p>
             <p class="item-abstract card-text">
                 <ds-truncatable-part [fixedHeight]="true" [id]="dso.id" [minLines]="3">
-                    <span [innerHTML]="getFirstValue('dc.description.abstract')"></span>
+                    <span [innerHTML]="firstMetadataValue('dc.description.abstract')"></span>
                 </ds-truncatable-part>
             </p>
             <div class="text-center">
diff --git a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
index 5fd1c87edd..c3a80604db 100644
--- a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
@@ -2,12 +2,11 @@ import { Component, Inject } from '@angular/core';
 
 import { SearchResult } from '../../../+search-page/search-result.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { Metadatum } from '../../../core/shared/metadatum.model';
-import { isEmpty, hasNoValue, hasValue } from '../../empty.util';
 import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
 import { ListableObject } from '../../object-collection/shared/listable-object.model';
 import { TruncatableService } from '../../truncatable/truncatable.service';
 import { Observable } from 'rxjs';
+import { Metadata } from '../../../core/shared/metadata.model';
 
 @Component({
   selector: 'ds-search-result-grid-element',
@@ -22,39 +21,14 @@ export class SearchResultGridElementComponent<T extends SearchResult<K>, K exten
     this.dso = this.object.dspaceObject;
   }
 
-  getValues(keys: string[]): string[] {
-    const results: string[] = new Array<string>();
-    this.object.hitHighlights.forEach(
-      (md: Metadatum) => {
-        if (keys.indexOf(md.key) > -1) {
-          results.push(md.value);
-        }
-      }
-    );
-    if (isEmpty(results)) {
-      this.dso.filterMetadata(keys).forEach(
-        (md: Metadatum) => {
-          results.push(md.value);
-        }
-      );
-    }
-    return results;
+  /** Gets all matching metadata string values from hitHighlights or dso metadata, preferring hitHighlights. */
+  allMetadataValues(keyOrKeys: string | string[]): string[] {
+    return Metadata.allValues([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
   }
 
-  getFirstValue(key: string): string {
-    let result: string;
-    this.object.hitHighlights.some(
-      (md: Metadatum) => {
-        if (key === md.key) {
-          result = md.value;
-          return true;
-        }
-      }
-    );
-    if (hasNoValue(result)) {
-      result = this.dso.findMetadata(key);
-    }
-    return result;
+  /** Gets the first matching metadata string value from hitHighlights or dso metadata, preferring hitHighlights. */
+  firstMetadataValue(keyOrKeys: string | string[]): string {
+    return Metadata.firstValue([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
   }
 
   isCollapsed(): Observable<boolean> {
diff --git a/src/app/shared/object-list/item-list-element/item-list-element.component.html b/src/app/shared/object-list/item-list-element/item-list-element.component.html
index 711ce19037..8179b77629 100644
--- a/src/app/shared/object-list/item-list-element/item-list-element.component.html
+++ b/src/app/shared/object-list/item-list-element/item-list-element.component.html
@@ -1,23 +1,23 @@
 <ds-truncatable [id]="object.id">
   <a [routerLink]="['/items/' + object.id]" class="lead">
-      {{object.findMetadata("dc.title")}}
+    {{object.firstMetadataValue("dc.title")}}
   </a>
   <div>
     <ds-truncatable-part [id]="object.id" [minLines]="1">
       <span class="text-muted">
-        <span *ngIf="object.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0"
+        <span *ngIf="object.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])"
               class="item-list-authors">
-            <span *ngFor="let authorMd of object.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">{{authorMd.value}}
+            <span *ngFor="let author of object.allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">{{author}}
                 <span *ngIf="!last">; </span>
             </span>
         </span>
-        (<span *ngIf="hasValue(object.findMetadata('dc.publisher'))" class="item-list-publisher">{{object.findMetadata("dc.publisher")}}, </span><span
-              *ngIf="hasValue(object.findMetadata('dc.date.issued'))" class="item-list-date">{{object.findMetadata("dc.date.issued")}}</span>)
+        (<span *ngIf="object.hasMetadata('dc.publisher')" class="item-list-publisher">{{object.firstMetadataValue("dc.publisher")}}, </span><span
+        *ngIf="object.hasMetadata('dc.date.issued')" class="item-list-date">{{object.firstMetadataValue("dc.date.issued")}}</span>)
       </span>
     </ds-truncatable-part>
     <ds-truncatable-part [id]="object.id" [minLines]="3">
-      <div *ngIf="object.findMetadata('dc.description.abstract')" class="item-list-abstract">
-          {{object.findMetadata("dc.description.abstract")}}
+      <div *ngIf="object.hasMetadata('dc.description.abstract')" class="item-list-abstract">
+        {{object.firstMetadataValue("dc.description.abstract")}}
       </div>
     </ds-truncatable-part>
   </div>
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
index be549b2b76..b4af631e83 100644
--- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
@@ -1,2 +1,2 @@
-<a [routerLink]="['/collections/' + dso.id]" class="lead" [innerHTML]="getFirstValue('dc.title')"></a>
-<div *ngIf="dso.shortDescription" class="text-muted abstract-text" [innerHTML]="getFirstValue('dc.description.abstract')"></div>
+<a [routerLink]="['/collections/' + dso.id]" class="lead" [innerHTML]="firstMetadataValue('dc.title')"></a>
+<div *ngIf="dso.shortDescription" class="text-muted abstract-text" [innerHTML]="firstMetadataValue('dc.description.abstract')"></div>
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
index 150ca503cc..9444a63771 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.html
@@ -1,2 +1,2 @@
-<a [routerLink]="['/communities/' + dso.id]" class="lead" [innerHTML]="getFirstValue('dc.title')"></a>
-<div *ngIf="dso.shortDescription" class="text-muted abstract-text" [innerHTML]="getFirstValue('dc.description.abstract')"></div>
+<a [routerLink]="['/communities/' + dso.id]" class="lead" [innerHTML]="firstMetadataValue('dc.title')"></a>
+<div *ngIf="dso.shortDescription" class="text-muted abstract-text" [innerHTML]="firstMetadataValue('dc.description.abstract')"></div>
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.html
index 584d476e73..6261220459 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.html
@@ -1,24 +1,24 @@
 <ds-truncatable [id]="dso.id">
         <a
             [routerLink]="['/items/' + dso.id]" class="lead"
-            [innerHTML]="getFirstValue('dc.title')"></a>
+            [innerHTML]="firstMetadataValue('dc.title')"></a>
   <span class="text-muted">
     <ds-truncatable-part [id]="dso.id" [minLines]="1">
-            (<span *ngIf="dso.findMetadata('dc.publisher')" class="item-list-publisher"
-                   [innerHTML]="getFirstValue('dc.publisher') + ', '"></span><span
-            *ngIf="hasValue(dso.findMetadata('dc.date.issued'))" class="item-list-date"
-            [innerHTML]="getFirstValue('dc.date.issued')"></span>)
-            <span *ngIf="dso.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0"
+            (<span *ngIf="dso.hasMetadata('dc.publisher')" class="item-list-publisher"
+                   [innerHTML]="firstMetadataValue('dc.publisher') + ', '"></span><span
+      *ngIf="dso.hasMetadata('dc.date.issued')" class="item-list-date"
+      [innerHTML]="firstMetadataValue('dc.date.issued')"></span>)
+            <span *ngIf="dso.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])"
                   class="item-list-authors">
-                    <span *ngFor="let author of getValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">
+                    <span *ngFor="let author of allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">
                         <span [innerHTML]="author"><span [innerHTML]="author"></span></span>
                     </span>
             </span>
         </ds-truncatable-part>
   </span>
-            <div *ngIf="dso.findMetadata('dc.description.abstract')" class="item-list-abstract">
+            <div *ngIf="dso.hasMetadata('dc.description.abstract')" class="item-list-abstract">
                 <ds-truncatable-part [id]="dso.id" [minLines]="3"><span
-                        [innerHTML]="getFirstValue('dc.description.abstract')"></span>
+                        [innerHTML]="firstMetadataValue('dc.description.abstract')"></span>
                 </ds-truncatable-part>
             </div>
-</ds-truncatable>
\ No newline at end of file
+</ds-truncatable>
diff --git a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
index 6a3b698dd6..a9a3050ac8 100644
--- a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
@@ -3,11 +3,10 @@ import { Observable } from 'rxjs';
 
 import { SearchResult } from '../../../+search-page/search-result.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { Metadatum } from '../../../core/shared/metadatum.model';
-import { hasNoValue, isEmpty } from '../../empty.util';
 import { ListableObject } from '../../object-collection/shared/listable-object.model';
 import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
 import { TruncatableService } from '../../truncatable/truncatable.service';
+import { Metadata } from '../../../core/shared/metadata.model';
 
 @Component({
   selector: 'ds-search-result-list-element',
@@ -22,39 +21,14 @@ export class SearchResultListElementComponent<T extends SearchResult<K>, K exten
     this.dso = this.object.dspaceObject;
   }
 
-  getValues(keys: string[]): string[] {
-    const results: string[] = new Array<string>();
-    this.object.hitHighlights.forEach(
-      (md: Metadatum) => {
-        if (keys.indexOf(md.key) > -1) {
-          results.push(md.value);
-        }
-      }
-    );
-    if (isEmpty(results)) {
-      this.dso.filterMetadata(keys).forEach(
-        (md: Metadatum) => {
-          results.push(md.value);
-        }
-      );
-    }
-    return results;
+  /** Gets all matching metadata string values from hitHighlights or dso metadata, preferring hitHighlights. */
+  allMetadataValues(keyOrKeys: string | string[]): string[] {
+    return Metadata.allValues([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
   }
 
-  getFirstValue(key: string): string {
-    let result: string;
-    this.object.hitHighlights.some(
-      (md: Metadatum) => {
-        if (key === md.key) {
-          result = md.value;
-          return true;
-        }
-      }
-    );
-    if (hasNoValue(result)) {
-      result = this.dso.findMetadata(key);
-    }
-    return result;
+  /** Gets the first matching metadata string value from hitHighlights or dso metadata, preferring hitHighlights. */
+  firstMetadataValue(keyOrKeys: string | string[]): string {
+    return Metadata.firstValue([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
   }
 
   isCollapsed(): Observable<boolean> {

From ea9ce6194cf567b4e7522952c70388db66a1bd06 Mon Sep 17 00:00:00 2001
From: Chris Wilper <chris@atmire.com>
Date: Sat, 22 Dec 2018 23:05:57 -0500
Subject: [PATCH 38/44] DS-4107 Update tests and mocks for metadata as map

---
 ...-page-sub-community-list.component.spec.ts |  44 ++--
 .../modify-item-overview.component.spec.ts    |  28 ++-
 .../collections/collections.component.spec.ts |  14 +-
 .../search-results.component.spec.ts          | 118 +++++-----
 .../auth-response-parsing.service.spec.ts     |  37 +--
 src/app/core/browse/browse.service.spec.ts    |  28 +--
 .../remote-data-build.service.spec.ts         |  28 ++-
 ...wse-items-response-parsing-service.spec.ts |  45 ++--
 .../core/metadata/metadata.service.spec.ts    |  21 +-
 .../comcol-form/comcol-form.component.spec.ts |  42 ++--
 src/app/shared/mocks/mock-item.ts             | 222 +++++++++---------
 .../collection-grid-element.component.spec.ts |  28 ++-
 .../community-grid-element.component.spec.ts  |  28 ++-
 .../item-grid-element.component.spec.ts       |  50 ++--
 ...arch-result-grid-element.component.spec.ts |  32 +--
 ...arch-result-grid-element.component.spec.ts |  32 +--
 ...arch-result-grid-element.component.spec.ts |  54 +++--
 ...rowse-entry-list-element.component.spec.ts |   3 +-
 .../collection-list-element.component.spec.ts |  28 ++-
 .../community-list-element.component.spec.ts  |  28 ++-
 .../item-list-element.component.spec.ts       |  50 ++--
 ...arch-result-list-element.component.spec.ts |  32 +--
 ...arch-result-list-element.component.spec.ts |  32 +--
 ...arch-result-list-element.component.spec.ts |  54 +++--
 .../search-form/search-form.component.spec.ts | 119 +++++-----
 25 files changed, 646 insertions(+), 551 deletions(-)

diff --git a/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.spec.ts b/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.spec.ts
index ace748c7de..3e6190ae6d 100644
--- a/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.spec.ts
+++ b/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.spec.ts
@@ -18,42 +18,38 @@ describe('SubCommunityList Component', () => {
 
   const subcommunities = [Object.assign(new Community(), {
     id: '123456789-1',
-    metadata: [
-      {
-        key: 'dc.title',
-        language: 'en_US',
-        value: 'SubCommunity 1'
-      }]
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'SubCommunity 1' }
+      ]
+    }
   }),
     Object.assign(new Community(), {
       id: '123456789-2',
-      metadata: [
-        {
-          key: 'dc.title',
-          language: 'en_US',
-          value: 'SubCommunity 2'
-        }]
+      metadata: {
+        'dc.title': [
+          { language: 'en_US', value: 'SubCommunity 2' }
+        ]
+      }
     })
   ];
 
   const emptySubCommunitiesCommunity = Object.assign(new Community(), {
-    metadata: [
-      {
-        key: 'dc.title',
-        language: 'en_US',
-        value: 'Test title'
-      }],
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'Test title' }
+      ]
+    },
     subcommunities: observableOf(new RemoteData(true, true, true,
       undefined, new PaginatedList(new PageInfo(), [])))
   });
 
   const mockCommunity = Object.assign(new Community(), {
-      metadata: [
-        {
-          key: 'dc.title',
-          language: 'en_US',
-          value: 'Test title'
-        }],
+      metadata: {
+        'dc.title': [
+          { language: 'en_US', value: 'Test title' }
+        ]
+      },
       subcommunities: observableOf(new RemoteData(true, true, true,
         undefined, new PaginatedList(new PageInfo(), subcommunities)))
     })
diff --git a/src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.spec.ts b/src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.spec.ts
index 942357dc5a..07ad9a347c 100644
--- a/src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.spec.ts
+++ b/src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.spec.ts
@@ -11,10 +11,14 @@ const mockItem = Object.assign(new Item(), {
   id: 'fake-id',
   handle: 'fake/handle',
   lastModified: '2018',
-  metadata: [
-    {key: 'dc.title', value: 'Mock item title', language: 'en'},
-    {key: 'dc.contributor.author', value: 'Mayer, Ed', language: ''}
-  ]
+  metadata: {
+    'dc.title': [
+      { value: 'Mock item title', language: 'en' }
+    ],
+    'dc.contributor.author': [
+      { value: 'Mayer, Ed', language: '' }
+    ]
+  }
 });
 
 describe('ModifyItemOverviewComponent', () => {
@@ -37,19 +41,19 @@ describe('ModifyItemOverviewComponent', () => {
     const metadataRows = fixture.debugElement.queryAll(By.css('tr.metadata-row'));
     expect(metadataRows.length).toEqual(2);
 
-    const titleRow = metadataRows[0].queryAll(By.css('td'));
-    expect(titleRow.length).toEqual(3);
-
-    expect(titleRow[0].nativeElement.innerHTML).toContain('dc.title');
-    expect(titleRow[1].nativeElement.innerHTML).toContain('Mock item title');
-    expect(titleRow[2].nativeElement.innerHTML).toContain('en');
-
-    const authorRow = metadataRows[1].queryAll(By.css('td'));
+    const authorRow = metadataRows[0].queryAll(By.css('td'));
     expect(authorRow.length).toEqual(3);
 
     expect(authorRow[0].nativeElement.innerHTML).toContain('dc.contributor.author');
     expect(authorRow[1].nativeElement.innerHTML).toContain('Mayer, Ed');
     expect(authorRow[2].nativeElement.innerHTML).toEqual('');
 
+    const titleRow = metadataRows[1].queryAll(By.css('td'));
+    expect(titleRow.length).toEqual(3);
+
+    expect(titleRow[0].nativeElement.innerHTML).toContain('dc.title');
+    expect(titleRow[1].nativeElement.innerHTML).toContain('Mock item title');
+    expect(titleRow[2].nativeElement.innerHTML).toContain('en');
+
   });
 });
diff --git a/src/app/+item-page/field-components/collections/collections.component.spec.ts b/src/app/+item-page/field-components/collections/collections.component.spec.ts
index 865ce78a39..53fcded9e3 100644
--- a/src/app/+item-page/field-components/collections/collections.component.spec.ts
+++ b/src/app/+item-page/field-components/collections/collections.component.spec.ts
@@ -14,12 +14,14 @@ let collectionsComponent: CollectionsComponent;
 let fixture: ComponentFixture<CollectionsComponent>;
 
 const mockCollection1: Collection = Object.assign(new Collection(), {
-  metadata: [
-    {
-      key: 'dc.description.abstract',
-      language: 'en_US',
-      value: 'Short description'
-    }]
+  metadata: {
+    'dc.description.abstract': [
+      {
+        language: 'en_US',
+        value: 'Short description'
+      }
+    ]
+  }
 });
 
 const succeededMockItem: Item = Object.assign(new Item(), {owningCollection: observableOf(new RemoteData(false, false, true, null, mockCollection1))});
diff --git a/src/app/+search-page/search-results/search-results.component.spec.ts b/src/app/+search-page/search-results/search-results.component.spec.ts
index b7ac11553a..8d0566d1df 100644
--- a/src/app/+search-page/search-results/search-results.component.spec.ts
+++ b/src/app/+search-page/search-results/search-results.component.spec.ts
@@ -111,33 +111,38 @@ export const objects = [
     id: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
     uuid: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
     type: ResourceType.Community,
-    metadata: [
-      {
-        key: 'dc.description',
-        language: null,
-        value: ''
-      },
-      {
-        key: 'dc.description.abstract',
-        language: null,
-        value: 'This is a test community to hold content for the OR2017 demostration'
-      },
-      {
-        key: 'dc.description.tableofcontents',
-        language: null,
-        value: ''
-      },
-      {
-        key: 'dc.rights',
-        language: null,
-        value: ''
-      },
-      {
-        key: 'dc.title',
-        language: null,
-        value: 'OR2017 - Demonstration'
-      }
-    ]
+    metadata: {
+      'dc.description': [
+        {
+          language: null,
+          value: ''
+        }
+      ],
+      'dc.description.abstract': [
+        {
+          language: null,
+          value: 'This is a test community to hold content for the OR2017 demostration'
+        }
+      ],
+      'dc.description.tableofcontents': [
+        {
+          language: null,
+          value: ''
+        }
+      ],
+      'dc.rights': [
+        {
+          language: null,
+          value: ''
+        }
+      ],
+      'dc.title': [
+        {
+          language: null,
+          value: 'OR2017 - Demonstration'
+        }
+      ]
+    }
   }),
   Object.assign(new Community(),
     {
@@ -160,33 +165,38 @@ export const objects = [
       id: '9076bd16-e69a-48d6-9e41-0238cb40d863',
       uuid: '9076bd16-e69a-48d6-9e41-0238cb40d863',
       type: ResourceType.Community,
-      metadata: [
-        {
-          key: 'dc.description',
-          language: null,
-          value: '<p>This is the introductory text for the <em>Sample Community</em> on the DSpace Demonstration Site. It is editable by System or Community Administrators (of this Community).</p>\r\n<p><strong>DSpace Communities may contain one or more Sub-Communities or Collections (of Items).</strong></p>\r\n<p>This particular Community has its own logo (the <a href=\'http://www.duraspace.org/\'>DuraSpace</a> logo).</p>'
-        },
-        {
-          key: 'dc.description.abstract',
-          language: null,
-          value: 'This is a sample top-level community'
-        },
-        {
-          key: 'dc.description.tableofcontents',
-          language: null,
-          value: '<p>This is the <em>news section</em> for this <em>Sample Community</em>. System or Community Administrators (of this Community) can edit this News field.</p>'
-        },
-        {
-          key: 'dc.rights',
-          language: null,
-          value: '<p><em>If this Community had special copyright text to display, it would be displayed here.</em></p>'
-        },
-        {
-          key: 'dc.title',
-          language: null,
-          value: 'Sample Community'
-        }
-      ]
+      metadata: {
+        'dc.description': [
+          {
+            language: null,
+            value: '<p>This is the introductory text for the <em>Sample Community</em> on the DSpace Demonstration Site. It is editable by System or Community Administrators (of this Community).</p>\r\n<p><strong>DSpace Communities may contain one or more Sub-Communities or Collections (of Items).</strong></p>\r\n<p>This particular Community has its own logo (the <a href=\'http://www.duraspace.org/\'>DuraSpace</a> logo).</p>'
+          }
+        ],
+        'dc.description.abstract': [
+          {
+            language: null,
+            value: 'This is a sample top-level community'
+          }
+        ],
+        'dc.description.tableofcontents': [
+          {
+            language: null,
+            value: '<p>This is the <em>news section</em> for this <em>Sample Community</em>. System or Community Administrators (of this Community) can edit this News field.</p>'
+          }
+        ],
+        'dc.rights': [
+          {
+            language: null,
+            value: '<p><em>If this Community had special copyright text to display, it would be displayed here.</em></p>'
+          }
+        ],
+        'dc.title': [
+          {
+            language: null,
+            value: 'Sample Community'
+          }
+        ]
+      }
     }
   )
 ];
diff --git a/src/app/core/auth/auth-response-parsing.service.spec.ts b/src/app/core/auth/auth-response-parsing.service.spec.ts
index a4131db489..ee9f2e571b 100644
--- a/src/app/core/auth/auth-response-parsing.service.spec.ts
+++ b/src/app/core/auth/auth-response-parsing.service.spec.ts
@@ -60,23 +60,26 @@ describe('AuthResponseParsingService', () => {
             handle: null,
             id: '4dc70ab5-cd73-492f-b007-3179d2d9296b',
             lastActive: '2018-05-14T17:03:31.277+0000',
-            metadata: [
-              {
-                key: 'eperson.firstname',
-                language: null,
-                value: 'User'
-              },
-              {
-                key: 'eperson.lastname',
-                language: null,
-                value: 'Test'
-              },
-              {
-                key: 'eperson.language',
-                language: null,
-                value: 'en'
-              }
-            ],
+            metadata: {
+              'eperson.firstname': [
+                {
+                  language: null,
+                  value: 'User'
+                }
+              ],
+              'eperson.lastname': [
+                {
+                  language: null,
+                  value: 'Test'
+                }
+              ],
+              'eperson.language': [
+                {
+                  language: null,
+                  value: 'en'
+                }
+              ]
+            },
             name: 'User Test',
             netid: 'myself@testshib.org',
             requireCertificate: false,
diff --git a/src/app/core/browse/browse.service.spec.ts b/src/app/core/browse/browse.service.spec.ts
index da75e1a877..1ce0f6b156 100644
--- a/src/app/core/browse/browse.service.spec.ts
+++ b/src/app/core/browse/browse.service.spec.ts
@@ -219,44 +219,44 @@ describe('BrowseService', () => {
             }}));
       });
 
-      it('should return the URL for the given metadatumKey and linkPath', () => {
-        const metadatumKey = 'dc.date.issued';
+      it('should return the URL for the given metadataKey and linkPath', () => {
+        const metadataKey = 'dc.date.issued';
         const linkPath = 'items';
         const expectedURL = browseDefinitions[0]._links[linkPath];
 
-        const result = service.getBrowseURLFor(metadatumKey, linkPath);
+        const result = service.getBrowseURLFor(metadataKey, linkPath);
         const expected = cold('c-d-', { c: undefined, d: expectedURL });
 
         expect(result).toBeObservable(expected);
       });
 
-      it('should work when the definition uses a wildcard in the metadatumKey', () => {
-        const metadatumKey = 'dc.contributor.author';  // should match dc.contributor.* in the definition
+      it('should work when the definition uses a wildcard in the metadataKey', () => {
+        const metadataKey = 'dc.contributor.author';  // should match dc.contributor.* in the definition
         const linkPath = 'items';
         const expectedURL = browseDefinitions[1]._links[linkPath];
 
-        const result = service.getBrowseURLFor(metadatumKey, linkPath);
+        const result = service.getBrowseURLFor(metadataKey, linkPath);
         const expected = cold('c-d-', { c: undefined, d: expectedURL });
 
         expect(result).toBeObservable(expected);
       });
 
       it('should throw an error when the key doesn\'t match', () => {
-        const metadatumKey = 'dc.title'; // isn't in the definitions
+        const metadataKey = 'dc.title'; // isn't in the definitions
         const linkPath = 'items';
 
-        const result = service.getBrowseURLFor(metadatumKey, linkPath);
-        const expected = cold('c-#-', { c: undefined }, new Error(`A browse endpoint for ${linkPath} on ${metadatumKey} isn't configured`));
+        const result = service.getBrowseURLFor(metadataKey, linkPath);
+        const expected = cold('c-#-', { c: undefined }, new Error(`A browse endpoint for ${linkPath} on ${metadataKey} isn't configured`));
 
         expect(result).toBeObservable(expected);
       });
 
       it('should throw an error when the link doesn\'t match', () => {
-        const metadatumKey = 'dc.date.issued';
+        const metadataKey = 'dc.date.issued';
         const linkPath = 'collections'; // isn't in the definitions
 
-        const result = service.getBrowseURLFor(metadatumKey, linkPath);
-        const expected = cold('c-#-', { c: undefined }, new Error(`A browse endpoint for ${linkPath} on ${metadatumKey} isn't configured`));
+        const result = service.getBrowseURLFor(metadataKey, linkPath);
+        const expected = cold('c-#-', { c: undefined }, new Error(`A browse endpoint for ${linkPath} on ${metadataKey} isn't configured`));
 
         expect(result).toBeObservable(expected);
       });
@@ -271,10 +271,10 @@ describe('BrowseService', () => {
         spyOn(service, 'getBrowseDefinitions').and
           .returnValue(hot('----'));
 
-        const metadatumKey = 'dc.date.issued';
+        const metadataKey = 'dc.date.issued';
         const linkPath = 'items';
 
-        const result = service.getBrowseURLFor(metadatumKey, linkPath);
+        const result = service.getBrowseURLFor(metadataKey, linkPath);
         const expected = cold('b---', { b: undefined });
         expect(result).toBeObservable(expected);
       });
diff --git a/src/app/core/cache/builders/remote-data-build.service.spec.ts b/src/app/core/cache/builders/remote-data-build.service.spec.ts
index e4444ca803..272969050d 100644
--- a/src/app/core/cache/builders/remote-data-build.service.spec.ts
+++ b/src/app/core/cache/builders/remote-data-build.service.spec.ts
@@ -8,20 +8,24 @@ import { of as observableOf } from 'rxjs';
 const pageInfo = new PageInfo();
 const array = [
   Object.assign(new Item(), {
-    metadata: [
-      {
-        key: 'dc.title',
-        language: 'en_US',
-        value: 'Item nr 1'
-      }]
+    metadata: {
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Item nr 1'
+        }
+      ]
+    }
   }),
   Object.assign(new Item(), {
-    metadata: [
-      {
-        key: 'dc.title',
-        language: 'en_US',
-        value: 'Item nr 2'
-      }]
+    metadata: {
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Item nr 2'
+        }
+      ]
+    }
   })
 ];
 const paginatedList = new PaginatedList(pageInfo, array);
diff --git a/src/app/core/data/browse-items-response-parsing-service.spec.ts b/src/app/core/data/browse-items-response-parsing-service.spec.ts
index 99ea474dc6..f512a9af26 100644
--- a/src/app/core/data/browse-items-response-parsing-service.spec.ts
+++ b/src/app/core/data/browse-items-response-parsing-service.spec.ts
@@ -24,13 +24,14 @@ describe('BrowseItemsResponseParsingService', () => {
               uuid: 'd7b6bc6f-ff6c-444a-a0d3-0cd9b68043e7',
               name: 'Development of Local Supply Chain : A Critical Link for Concentrated Solar Power in India',
               handle: '10986/17472',
-              metadata: [
-                {
-                  key: 'dc.creator',
-                  value: 'World Bank',
-                  language: null
-                }
-              ],
+              metadata: {
+                'dc.creator': [
+                  {
+                    value: 'World Bank',
+                    language: null
+                  }
+                ]
+              },
               inArchive: true,
               discoverable: true,
               withdrawn: false,
@@ -56,13 +57,14 @@ describe('BrowseItemsResponseParsingService', () => {
               uuid: '27c6f976-257c-4ad0-a0ef-c5e34ffe4d5b',
               name: 'Development of Local Supply Chain : The Missing Link for Concentrated Solar Power Projects in India',
               handle: '10986/17475',
-              metadata: [
-                {
-                  key: 'dc.creator',
-                  value: 'World Bank',
-                  language: null
-                }
-              ],
+              metadata: {
+                'dc.creator': [
+                  {
+                    value: 'World Bank',
+                    language: null
+                  }
+                ]
+              },
               inArchive: true,
               discoverable: true,
               withdrawn: false,
@@ -115,13 +117,14 @@ describe('BrowseItemsResponseParsingService', () => {
         uuid: 'd7b6bc6f-ff6c-444a-a0d3-0cd9b68043e7',
         name: 'Development of Local Supply Chain : A Critical Link for Concentrated Solar Power in India',
         handle: '10986/17472',
-        metadata: [
-          {
-            key: 'dc.creator',
-            value: 'World Bank',
-            language: null
-          }
-        ],
+        metadata: {
+          'dc.creator': [
+            {
+              value: 'World Bank',
+              language: null
+            }
+          ]
+        },
         inArchive: true,
         discoverable: true,
         withdrawn: false,
diff --git a/src/app/core/metadata/metadata.service.spec.ts b/src/app/core/metadata/metadata.service.spec.ts
index 90c811db7a..f2dd0770ed 100644
--- a/src/app/core/metadata/metadata.service.spec.ts
+++ b/src/app/core/metadata/metadata.service.spec.ts
@@ -37,6 +37,7 @@ import { HttpClient } from '@angular/common/http';
 import { EmptyError } from 'rxjs/internal-compatibility';
 import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service';
 import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
+import { MetadataValue } from '../shared/metadata.interfaces';
 
 /* tslint:disable:max-classes-per-file */
 @Component({
@@ -152,7 +153,7 @@ describe('MetadataService', () => {
     expect(title.getTitle()).toEqual('Test PowerPoint Document');
     expect(tagStore.get('citation_title')[0].content).toEqual('Test PowerPoint Document');
     expect(tagStore.get('citation_author')[0].content).toEqual('Doe, Jane');
-    expect(tagStore.get('citation_date')[0].content).toEqual('1650-06-26T19:58:25Z');
+    expect(tagStore.get('citation_date')[0].content).toEqual('1650-06-26');
     expect(tagStore.get('citation_issn')[0].content).toEqual('123456789');
     expect(tagStore.get('citation_language')[0].content).toEqual('en');
     expect(tagStore.get('citation_keywords')[0].content).toEqual('keyword1; keyword2; keyword3');
@@ -216,22 +217,18 @@ describe('MetadataService', () => {
 
   const mockType = (mockItem: Item, type: string): Item => {
     const typedMockItem = Object.assign(new Item(), mockItem) as Item;
-    for (const metadatum of typedMockItem.metadata) {
-      if (metadatum.key === 'dc.type') {
-        metadatum.value = type;
-        break;
-      }
-    }
+    typedMockItem.metadata['dc.type'] = [ { value: type } ] as MetadataValue[];
     return typedMockItem;
   }
 
   const mockPublisher = (mockItem: Item): Item => {
     const publishedMockItem = Object.assign(new Item(), mockItem) as Item;
-    publishedMockItem.metadata.push({
-      key: 'dc.publisher',
-      language: 'en_US',
-      value: 'Mock Publisher'
-    });
+    publishedMockItem.metadata['dc.publisher'] = [
+      {
+        language: 'en_US',
+        value: 'Mock Publisher'
+      }
+    ] as MetadataValue[];
     return publishedMockItem;
   }
 
diff --git a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.spec.ts b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.spec.ts
index a6f5e0d45a..cc1e2063ff 100644
--- a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.spec.ts
+++ b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.spec.ts
@@ -11,7 +11,6 @@ import { ResourceType } from '../../../core/shared/resource-type';
 import { ComColFormComponent } from './comcol-form.component';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { hasValue } from '../../empty.util';
-import { Metadatum } from '../../../core/shared/metadatum.model';
 
 describe('ComColFormComponent', () => {
   let comp: ComColFormComponent<DSpaceObject>;
@@ -29,23 +28,24 @@ describe('ComColFormComponent', () => {
       return undefined;
     }
   };
-  const titleMD = { key: 'dc.title', value: 'Community Title' } as Metadatum;
-  const randomMD = { key: 'dc.random', value: 'Random metadata excluded from form' } as Metadatum;
-  const abstractMD = {
-    key: 'dc.description.abstract',
-    value: 'Community description'
-  } as Metadatum;
-  const newTitleMD = { key: 'dc.title', value: 'New Community Title' } as Metadatum;
+  const dcTitle = 'dc.title';
+  const dcRandom = 'dc.random';
+  const dcAbstract = 'dc.description.abstract';
+
+  const titleMD = { [dcTitle]: [ { value: 'Community Title', language: null } ] };
+  const randomMD = { [dcRandom]: [ { value: 'Random metadata excluded from form', language: null } ] };
+  const abstractMD = { [dcAbstract]: [ { value: 'Community description', language: null } ] };
+  const newTitleMD = { [dcTitle]: [ { value: 'New Community Title', language: null } ] };
   const formModel = [
     new DynamicInputModel({
       id: 'title',
-      name: newTitleMD.key,
-      value: 'New Community Title'
+      name: dcTitle,
+      value: newTitleMD[dcTitle][0].value
     }),
     new DynamicInputModel({
       id: 'abstract',
-      name: abstractMD.key,
-      value: abstractMD.value
+      name: dcAbstract,
+      value: abstractMD[dcAbstract][0].value
     })
   ];
 
@@ -87,10 +87,10 @@ describe('ComColFormComponent', () => {
       comp.dso = Object.assign(
         new Community(),
         {
-          metadata: [
-            titleMD,
-            randomMD
-          ]
+          metadata: {
+            ...titleMD,
+            ...randomMD
+          }
         }
       );
 
@@ -101,11 +101,11 @@ describe('ComColFormComponent', () => {
           {},
           new Community(),
           {
-            metadata: [
-              randomMD,
-              newTitleMD,
-              abstractMD
-            ],
+            metadata: {
+              ...newTitleMD,
+              ...randomMD,
+              ...abstractMD
+            },
             type: ResourceType.Community
           },
         )
diff --git a/src/app/shared/mocks/mock-item.ts b/src/app/shared/mocks/mock-item.ts
index 2e5c764ee2..98881436b9 100644
--- a/src/app/shared/mocks/mock-item.ts
+++ b/src/app/shared/mocks/mock-item.ts
@@ -51,13 +51,14 @@ export const MockItem: Item = Object.assign(new Item(), {
           id: 'cf9b0c8e-a1eb-4b65-afd0-567366448713',
           uuid: 'cf9b0c8e-a1eb-4b65-afd0-567366448713',
           type: 'bitstream',
-          metadata: [
-            {
-              key: 'dc.title',
-              language: null,
-              value: 'test_word.docx'
-            }
-          ]
+          metadata: {
+            'dc.title': [
+              {
+                language: null,
+                value: 'test_word.docx'
+              }
+            ]
+          }
         },
         {
           sizeBytes: 31302,
@@ -85,13 +86,14 @@ export const MockItem: Item = Object.assign(new Item(), {
           id: '99b00f3c-1cc6-4689-8158-91965bee6b28',
           uuid: '99b00f3c-1cc6-4689-8158-91965bee6b28',
           type: 'bitstream',
-          metadata: [
-            {
-              key: 'dc.title',
-              language: null,
-              value: 'test_pdf.pdf'
-            }
-          ]
+          metadata: {
+            'dc.title': [
+              {
+                language: null,
+                value: 'test_pdf.pdf'
+              }
+            ]
+          }
         }
       ]
     }
@@ -100,98 +102,106 @@ export const MockItem: Item = Object.assign(new Item(), {
   id: '0ec7ff22-f211-40ab-a69e-c819b0b1f357',
   uuid: '0ec7ff22-f211-40ab-a69e-c819b0b1f357',
   type: 'item',
-  metadata: [
-    {
-      key: 'dc.creator',
-      language: 'en_US',
-      value: 'Doe, Jane'
-    },
-    {
-      key: 'dc.date.accessioned',
-      language: null,
-      value: '1650-06-26T19:58:25Z'
-    },
-    {
-      key: 'dc.date.available',
-      language: null,
-      value: '1650-06-26T19:58:25Z'
-    },
-    {
-      key: 'dc.date.issued',
-      language: null,
-      value: '1650-06-26'
-    },
-    {
-      key: 'dc.identifier.issn',
-      language: 'en_US',
-      value: '123456789'
-    },
-    {
-      key: 'dc.identifier.uri',
-      language: null,
-      value: 'http://dspace7.4science.it/xmlui/handle/10673/6'
-    },
-    {
-      key: 'dc.description.abstract',
-      language: 'en_US',
-      value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!'
-    },
-    {
-      key: 'dc.description.provenance',
-      language: 'en',
-      value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)'
-    },
-    {
-      key: 'dc.description.provenance',
-      language: 'en',
-      value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).'
-    },
-    {
-      key: 'dc.description.provenance',
-      language: 'en',
-      value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).'
-    },
-    {
-      key: 'dc.description.provenance',
-      language: 'en',
-      value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).'
-    },
-    {
-      key: 'dc.language',
-      language: 'en_US',
-      value: 'en'
-    },
-    {
-      key: 'dc.rights',
-      language: 'en_US',
-      value: '© Jane Doe'
-    },
-    {
-      key: 'dc.subject',
-      language: 'en_US',
-      value: 'keyword1'
-    },
-    {
-      key: 'dc.subject',
-      language: 'en_US',
-      value: 'keyword2'
-    },
-    {
-      key: 'dc.subject',
-      language: 'en_US',
-      value: 'keyword3'
-    },
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Test PowerPoint Document'
-    },
-    {
-      key: 'dc.type',
-      language: 'en_US',
-      value: 'text'
-    }
-  ],
+  metadata: {
+    'dc.creator': [
+      {
+        language: 'en_US',
+        value: 'Doe, Jane'
+      }
+    ],
+    'dc.date.accessioned': [
+      {
+        language: null,
+        value: '1650-06-26T19:58:25Z'
+      }
+    ],
+    'dc.date.available': [
+      {
+        language: null,
+        value: '1650-06-26T19:58:25Z'
+      }
+    ],
+    'dc.date.issued': [
+      {
+        language: null,
+        value: '1650-06-26'
+      }
+    ],
+    'dc.identifier.issn': [
+      {
+        language: 'en_US',
+        value: '123456789'
+      }
+    ],
+    'dc.identifier.uri': [
+      {
+        language: null,
+        value: 'http://dspace7.4science.it/xmlui/handle/10673/6'
+      }
+    ],
+    'dc.description.abstract': [
+      {
+        language: 'en_US',
+        value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!'
+      }
+    ],
+    'dc.description.provenance': [
+      {
+        language: 'en',
+        value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)'
+      },
+      {
+        language: 'en',
+        value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).'
+      },
+      {
+        language: 'en',
+        value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).'
+      },
+      {
+        language: 'en',
+        value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).'
+      }
+    ],
+    'dc.language': [
+      {
+        language: 'en_US',
+        value: 'en'
+      }
+    ],
+    'dc.rights': [
+      {
+        language: 'en_US',
+        value: '© Jane Doe'
+      }
+    ],
+    'dc.subject': [
+      {
+        language: 'en_US',
+        value: 'keyword1'
+      },
+      {
+        language: 'en_US',
+        value: 'keyword2'
+      },
+      {
+        language: 'en_US',
+        value: 'keyword3'
+      }
+    ],
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'Test PowerPoint Document'
+      }
+    ],
+    'dc.type': [
+      {
+        language: 'en_US',
+        value: 'text'
+      }
+    ]
+  },
   owningCollection: observableOf({
       self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb',
       requestPending: false,
diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts
index cc72ff3043..66807c6b20 100644
--- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts
@@ -8,21 +8,25 @@ let collectionGridElementComponent: CollectionGridElementComponent;
 let fixture: ComponentFixture<CollectionGridElementComponent>;
 
 const mockCollectionWithAbstract: Collection = Object.assign(new Collection(), {
-  metadata: [
-    {
-      key: 'dc.description.abstract',
-      language: 'en_US',
-      value: 'Short description'
-    }]
+  metadata: {
+    'dc.description.abstract': [
+      {
+        language: 'en_US',
+        value: 'Short description'
+      }
+    ]
+  }
 });
 
 const mockCollectionWithoutAbstract: Collection = Object.assign(new Collection(), {
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Test title'
-    }]
+  metadata: {
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'Test title'
+      }
+    ]
+  }
 });
 
 describe('CollectionGridElementComponent', () => {
diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts
index dabb137ea7..bb6c81144a 100644
--- a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts
@@ -8,21 +8,25 @@ let communityGridElementComponent: CommunityGridElementComponent;
 let fixture: ComponentFixture<CommunityGridElementComponent>;
 
 const mockCommunityWithAbstract: Community = Object.assign(new Community(), {
-  metadata: [
-    {
-      key: 'dc.description.abstract',
-      language: 'en_US',
-      value: 'Short description'
-    }]
+  metadata: {
+    'dc.description.abstract': [
+      {
+        language: 'en_US',
+        value: 'Short description'
+      }
+    ]
+  }
 });
 
 const mockCommunityWithoutAbstract: Community = Object.assign(new Community(), {
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Test title'
-    }]
+  metadata: {
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'Test title'
+      }
+    ]
+  }
 });
 
 describe('CommunityGridElementComponent', () => {
diff --git a/src/app/shared/object-grid/item-grid-element/item-grid-element.component.spec.ts b/src/app/shared/object-grid/item-grid-element/item-grid-element.component.spec.ts
index f2aa594296..7b286cc415 100644
--- a/src/app/shared/object-grid/item-grid-element/item-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/item-grid-element/item-grid-element.component.spec.ts
@@ -11,31 +11,37 @@ let fixture: ComponentFixture<ItemGridElementComponent>;
 
 const mockItemWithAuthorAndDate: Item = Object.assign(new Item(), {
   bitstreams: observableOf({}),
-  metadata: [
-    {
-      key: 'dc.contributor.author',
-      language: 'en_US',
-      value: 'Smith, Donald'
-    },
-    {
-      key: 'dc.date.issued',
-      language: null,
-      value: '2015-06-26'
-    }]
+  metadata: {
+    'dc.contributor.author': [
+      {
+        language: 'en_US',
+        value: 'Smith, Donald'
+      }
+    ],
+    'dc.date.issued': [
+      {
+        language: null,
+        value: '2015-06-26'
+      }
+    ]
+  }
 });
 const mockItemWithoutAuthorAndDate: Item = Object.assign(new Item(), {
   bitstreams: observableOf({}),
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'This is just another title'
-    },
-    {
-      key: 'dc.type',
-      language: null,
-      value: 'Article'
-    }]
+  metadata: {
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'This is just another title'
+      }
+    ],
+    'dc.type': [
+      {
+        language: null,
+        value: 'Article'
+      }
+    ]
+  }
 });
 
 describe('ItemGridElementComponent', () => {
diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts
index 8e6ff0696f..e8f8b1330e 100644
--- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.spec.ts
@@ -16,25 +16,29 @@ const truncatableServiceStub: any = {
 };
 
 const mockCollectionWithAbstract: CollectionSearchResult = new CollectionSearchResult();
-mockCollectionWithAbstract.hitHighlights = [];
+mockCollectionWithAbstract.hitHighlights = {};
 mockCollectionWithAbstract.dspaceObject = Object.assign(new Collection(), {
-  metadata: [
-    {
-      key: 'dc.description.abstract',
-      language: 'en_US',
-      value: 'Short description'
-    } ]
+  metadata: {
+    'dc.description.abstract': [
+      {
+        language: 'en_US',
+        value: 'Short description'
+      }
+    ]
+  }
 });
 
 const mockCollectionWithoutAbstract: CollectionSearchResult = new CollectionSearchResult();
-mockCollectionWithoutAbstract.hitHighlights = [];
+mockCollectionWithoutAbstract.hitHighlights = {};
 mockCollectionWithoutAbstract.dspaceObject = Object.assign(new Collection(), {
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Test title'
-    } ]
+  metadata: {
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'Test title'
+      }
+    ]
+  }
 });
 
 describe('CollectionSearchResultGridElementComponent', () => {
diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts
index df8fdf026d..e111e624c5 100644
--- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.spec.ts
@@ -16,25 +16,29 @@ const truncatableServiceStub: any = {
 };
 
 const mockCommunityWithAbstract: CommunitySearchResult = new CommunitySearchResult();
-mockCommunityWithAbstract.hitHighlights = [];
+mockCommunityWithAbstract.hitHighlights = {};
 mockCommunityWithAbstract.dspaceObject = Object.assign(new Community(), {
-  metadata: [
-    {
-      key: 'dc.description.abstract',
-      language: 'en_US',
-      value: 'Short description'
-    } ]
+  metadata: {
+    'dc.description.abstract': [
+      {
+        language: 'en_US',
+        value: 'Short description'
+      }
+    ]
+  }
 });
 
 const mockCommunityWithoutAbstract: CommunitySearchResult = new CommunitySearchResult();
-mockCommunityWithoutAbstract.hitHighlights = [];
+mockCommunityWithoutAbstract.hitHighlights = {};
 mockCommunityWithoutAbstract.dspaceObject = Object.assign(new Community(), {
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Test title'
-    } ]
+  metadata: {
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'Test title'
+      }
+    ]
+  }
 });
 
 describe('CommunitySearchResultGridElementComponent', () => {
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.spec.ts
index ecc218f11d..0103fa5c49 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.spec.ts
@@ -17,37 +17,43 @@ const truncatableServiceStub: any = {
 };
 
 const mockItemWithAuthorAndDate: ItemSearchResult = new ItemSearchResult();
-mockItemWithAuthorAndDate.hitHighlights = [];
+mockItemWithAuthorAndDate.hitHighlights = {};
 mockItemWithAuthorAndDate.dspaceObject = Object.assign(new Item(), {
   bitstreams: observableOf({}),
-  metadata: [
-    {
-      key: 'dc.contributor.author',
-      language: 'en_US',
-      value: 'Smith, Donald'
-    },
-    {
-      key: 'dc.date.issued',
-      language: null,
-      value: '2015-06-26'
-    }]
+  metadata: {
+    'dc.contributor.author': [
+      {
+        language: 'en_US',
+        value: 'Smith, Donald'
+      }
+    ],
+    'dc.date.issued': [
+      {
+        language: null,
+        value: '2015-06-26'
+      }
+    ]
+  }
 });
 
 const mockItemWithoutAuthorAndDate: ItemSearchResult = new ItemSearchResult();
-mockItemWithoutAuthorAndDate.hitHighlights = [];
+mockItemWithoutAuthorAndDate.hitHighlights = {};
 mockItemWithoutAuthorAndDate.dspaceObject = Object.assign(new Item(), {
   bitstreams: observableOf({}),
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'This is just another title'
-    },
-    {
-      key: 'dc.type',
-      language: null,
-      value: 'Article'
-    }]
+  metadata: {
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'This is just another title'
+      }
+    ],
+    'dc.type': [
+      {
+        language: null,
+        value: 'Article'
+      }
+    ]
+  }
 });
 
 describe('ItemSearchResultGridElementComponent', () => {
diff --git a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.spec.ts b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.spec.ts
index de53f2e095..54b58e131a 100644
--- a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.spec.ts
+++ b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.spec.ts
@@ -2,7 +2,6 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
 import { TruncatePipe } from '../../utils/truncate.pipe';
-import { Metadatum } from '../../../core/shared/metadatum.model';
 import { BrowseEntryListElementComponent } from './browse-entry-list-element.component';
 import { BrowseEntry } from '../../../core/shared/browse-entry.model';
 
@@ -33,7 +32,7 @@ describe('MetadataListElementComponent', () => {
     browseEntryListElementComponent = fixture.componentInstance;
   }));
 
-  describe('When the metadatum is loaded', () => {
+  describe('When the metadata is loaded', () => {
     beforeEach(() => {
       browseEntryListElementComponent.object = mockValue;
       fixture.detectChanges();
diff --git a/src/app/shared/object-list/collection-list-element/collection-list-element.component.spec.ts b/src/app/shared/object-list/collection-list-element/collection-list-element.component.spec.ts
index a31af1e50c..bde6b4b97a 100644
--- a/src/app/shared/object-list/collection-list-element/collection-list-element.component.spec.ts
+++ b/src/app/shared/object-list/collection-list-element/collection-list-element.component.spec.ts
@@ -8,21 +8,25 @@ let collectionListElementComponent: CollectionListElementComponent;
 let fixture: ComponentFixture<CollectionListElementComponent>;
 
 const mockCollectionWithAbstract: Collection = Object.assign(new Collection(), {
-  metadata: [
-    {
-      key: 'dc.description.abstract',
-      language: 'en_US',
-      value: 'Short description'
-    }]
+  metadata: {
+    'dc.description.abstract': [
+      {
+        language: 'en_US',
+        value: 'Short description'
+      }
+    ]
+  }
 });
 
 const mockCollectionWithoutAbstract: Collection = Object.assign(new Collection(), {
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Test title'
-    }]
+  metadata: {
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'Test title'
+      }
+    ]
+  }
 });
 
 describe('CollectionListElementComponent', () => {
diff --git a/src/app/shared/object-list/community-list-element/community-list-element.component.spec.ts b/src/app/shared/object-list/community-list-element/community-list-element.component.spec.ts
index 08147d8573..46ba27eb00 100644
--- a/src/app/shared/object-list/community-list-element/community-list-element.component.spec.ts
+++ b/src/app/shared/object-list/community-list-element/community-list-element.component.spec.ts
@@ -8,21 +8,25 @@ let communityListElementComponent: CommunityListElementComponent;
 let fixture: ComponentFixture<CommunityListElementComponent>;
 
 const mockCommunityWithAbstract: Community = Object.assign(new Community(), {
-  metadata: [
-    {
-      key: 'dc.description.abstract',
-      language: 'en_US',
-      value: 'Short description'
-    }]
+  metadata: {
+    'dc.description.abstract': [
+      {
+        language: 'en_US',
+        value: 'Short description'
+      }
+    ]
+  }
 });
 
 const mockCommunityWithoutAbstract: Community = Object.assign(new Community(), {
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Test title'
-    }]
+  metadata: {
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'Test title'
+      }
+    ]
+  }
 });
 
 describe('CommunityListElementComponent', () => {
diff --git a/src/app/shared/object-list/item-list-element/item-list-element.component.spec.ts b/src/app/shared/object-list/item-list-element/item-list-element.component.spec.ts
index 64108fd5b0..392d81bee4 100644
--- a/src/app/shared/object-list/item-list-element/item-list-element.component.spec.ts
+++ b/src/app/shared/object-list/item-list-element/item-list-element.component.spec.ts
@@ -11,31 +11,37 @@ let fixture: ComponentFixture<ItemListElementComponent>;
 
 const mockItemWithAuthorAndDate: Item = Object.assign(new Item(), {
   bitstreams: observableOf({}),
-  metadata: [
-    {
-      key: 'dc.contributor.author',
-      language: 'en_US',
-      value: 'Smith, Donald'
-    },
-    {
-      key: 'dc.date.issued',
-      language: null,
-      value: '2015-06-26'
-    }]
+  metadata: {
+    'dc.contributor.author': [
+      {
+        language: 'en_US',
+        value: 'Smith, Donald'
+      }
+    ],
+    'dc.date.issued': [
+      {
+        language: null,
+        value: '2015-06-26'
+      }
+    ]
+  }
 });
 const mockItemWithoutAuthorAndDate: Item = Object.assign(new Item(), {
   bitstreams: observableOf({}),
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'This is just another title'
-    },
-    {
-      key: 'dc.type',
-      language: null,
-      value: 'Article'
-    }]
+  metadata: {
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'This is just another title'
+      }
+    ],
+    'dc.type': [
+      {
+        language: null,
+        value: 'Article'
+      }
+    ]
+  }
 });
 
 describe('ItemListElementComponent', () => {
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts
index 2ffaf38b53..e897071a00 100644
--- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts
@@ -16,25 +16,29 @@ const truncatableServiceStub: any = {
 };
 
 const mockCollectionWithAbstract: CollectionSearchResult = new CollectionSearchResult();
-mockCollectionWithAbstract.hitHighlights = [];
+mockCollectionWithAbstract.hitHighlights = {};
 mockCollectionWithAbstract.dspaceObject = Object.assign(new Collection(), {
-  metadata: [
-    {
-      key: 'dc.description.abstract',
-      language: 'en_US',
-      value: 'Short description'
-    } ]
+  metadata: {
+    'dc.description.abstract': [
+      {
+        language: 'en_US',
+        value: 'Short description'
+      }
+    ]
+  }
 });
 
 const mockCollectionWithoutAbstract: CollectionSearchResult = new CollectionSearchResult();
-mockCollectionWithoutAbstract.hitHighlights = [];
+mockCollectionWithoutAbstract.hitHighlights = {};
 mockCollectionWithoutAbstract.dspaceObject = Object.assign(new Collection(), {
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Test title'
-    } ]
+  metadata: {
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'Test title'
+      }
+    ]
+  }
 });
 
 describe('CollectionSearchResultListElementComponent', () => {
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts
index 70877d0744..75d5966767 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts
@@ -16,25 +16,29 @@ const truncatableServiceStub: any = {
 };
 
 const mockCommunityWithAbstract: CommunitySearchResult = new CommunitySearchResult();
-mockCommunityWithAbstract.hitHighlights = [];
+mockCommunityWithAbstract.hitHighlights = {};
 mockCommunityWithAbstract.dspaceObject = Object.assign(new Community(), {
-  metadata: [
-    {
-      key: 'dc.description.abstract',
-      language: 'en_US',
-      value: 'Short description'
-    } ]
+  metadata: {
+    'dc.description.abstract': [
+      {
+        language: 'en_US',
+        value: 'Short description'
+      }
+    ]
+  }
 });
 
 const mockCommunityWithoutAbstract: CommunitySearchResult = new CommunitySearchResult();
-mockCommunityWithoutAbstract.hitHighlights = [];
+mockCommunityWithoutAbstract.hitHighlights = {};
 mockCommunityWithoutAbstract.dspaceObject = Object.assign(new Community(), {
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'Test title'
-    } ]
+  metadata: {
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'Test title'
+      }
+    ]
+  }
 });
 
 describe('CommunitySearchResultListElementComponent', () => {
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts
index bdc8ebcecf..8567fc1782 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts
@@ -17,37 +17,43 @@ const truncatableServiceStub: any = {
 };
 
 const mockItemWithAuthorAndDate: ItemSearchResult = new ItemSearchResult();
-mockItemWithAuthorAndDate.hitHighlights = [];
+mockItemWithAuthorAndDate.hitHighlights = {};
 mockItemWithAuthorAndDate.dspaceObject = Object.assign(new Item(), {
   bitstreams: observableOf({}),
-  metadata: [
-    {
-      key: 'dc.contributor.author',
-      language: 'en_US',
-      value: 'Smith, Donald'
-    },
-    {
-      key: 'dc.date.issued',
-      language: null,
-      value: '2015-06-26'
-    }]
+  metadata: {
+    'dc.contributor.author': [
+      {
+        language: 'en_US',
+        value: 'Smith, Donald'
+      }
+    ],
+    'dc.date.issued': [
+      {
+        language: null,
+        value: '2015-06-26'
+      }
+    ]
+  }
 });
 
 const mockItemWithoutAuthorAndDate: ItemSearchResult = new ItemSearchResult();
-mockItemWithoutAuthorAndDate.hitHighlights = [];
+mockItemWithoutAuthorAndDate.hitHighlights = {};
 mockItemWithoutAuthorAndDate.dspaceObject = Object.assign(new Item(), {
   bitstreams: observableOf({}),
-  metadata: [
-    {
-      key: 'dc.title',
-      language: 'en_US',
-      value: 'This is just another title'
-    },
-    {
-      key: 'dc.type',
-      language: null,
-      value: 'Article'
-    }]
+  metadata: {
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'This is just another title'
+      }
+    ],
+    'dc.type': [
+      {
+        language: null,
+        value: 'Article'
+      }
+    ]
+  }
 });
 
 describe('ItemSearchResultListElementComponent', () => {
diff --git a/src/app/shared/search-form/search-form.component.spec.ts b/src/app/shared/search-form/search-form.component.spec.ts
index 004d0c5b21..b164abee1f 100644
--- a/src/app/shared/search-form/search-form.component.spec.ts
+++ b/src/app/shared/search-form/search-form.component.spec.ts
@@ -30,6 +30,7 @@ describe('SearchFormComponent', () => {
   });
 
   it('should display scopes when available with default and all scopes', () => {
+
     comp.scopes = objects;
     fixture.detectChanges();
     const select: HTMLElement = de.query(By.css('select')).nativeElement;
@@ -121,33 +122,38 @@ export const objects: DSpaceObject[] = [
     id: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
     uuid: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
     type: ResourceType.Community,
-    metadata: [
-      {
-        key: 'dc.description',
-        language: null,
-        value: ''
-      },
-      {
-        key: 'dc.description.abstract',
-        language: null,
-        value: 'This is a test community to hold content for the OR2017 demostration'
-      },
-      {
-        key: 'dc.description.tableofcontents',
-        language: null,
-        value: ''
-      },
-      {
-        key: 'dc.rights',
-        language: null,
-        value: ''
-      },
-      {
-        key: 'dc.title',
-        language: null,
-        value: 'OR2017 - Demonstration'
-      }
-    ]
+    metadata: {
+      'dc.description': [
+        {
+          language: null,
+          value: ''
+        }
+      ],
+      'dc.description.abstract': [
+        {
+          language: null,
+          value: 'This is a test community to hold content for the OR2017 demostration'
+        }
+      ],
+      'dc.description.tableofcontents': [
+        {
+          language: null,
+          value: ''
+        }
+      ],
+      'dc.rights': [
+        {
+          language: null,
+          value: ''
+        }
+      ],
+      'dc.title': [
+        {
+          language: null,
+          value: 'OR2017 - Demonstration'
+        }
+      ]
+    }
   }),
   Object.assign(new Community(),
     {
@@ -170,33 +176,38 @@ export const objects: DSpaceObject[] = [
       id: '9076bd16-e69a-48d6-9e41-0238cb40d863',
       uuid: '9076bd16-e69a-48d6-9e41-0238cb40d863',
       type: ResourceType.Community,
-      metadata: [
-        {
-          key: 'dc.description',
-          language: null,
-          value: '<p>This is the introductory text for the <em>Sample Community</em> on the DSpace Demonstration Site. It is editable by System or Community Administrators (of this Community).</p>\r\n<p><strong>DSpace Communities may contain one or more Sub-Communities or Collections (of Items).</strong></p>\r\n<p>This particular Community has its own logo (the <a href=\'http://www.duraspace.org/\'>DuraSpace</a> logo).</p>'
-        },
-        {
-          key: 'dc.description.abstract',
-          language: null,
-          value: 'This is a sample top-level community'
-        },
-        {
-          key: 'dc.description.tableofcontents',
-          language: null,
-          value: '<p>This is the <em>news section</em> for this <em>Sample Community</em>. System or Community Administrators (of this Community) can edit this News field.</p>'
-        },
-        {
-          key: 'dc.rights',
-          language: null,
-          value: '<p><em>If this Community had special copyright text to display, it would be displayed here.</em></p>'
-        },
-        {
-          key: 'dc.title',
-          language: null,
-          value: 'Sample Community'
-        }
-      ]
+      metadata: {
+        'dc.description': [
+          {
+            language: null,
+            value: '<p>This is the introductory text for the <em>Sample Community</em> on the DSpace Demonstration Site. It is editable by System or Community Administrators (of this Community).</p>\r\n<p><strong>DSpace Communities may contain one or more Sub-Communities or Collections (of Items).</strong></p>\r\n<p>This particular Community has its own logo (the <a href=\'http://www.duraspace.org/\'>DuraSpace</a> logo).</p>'
+          }
+        ],
+        'dc.description.abstract': [
+          {
+            language: null,
+            value: 'This is a sample top-level community'
+          }
+        ],
+        'dc.description.tableofcontents': [
+          {
+            language: null,
+            value: '<p>This is the <em>news section</em> for this <em>Sample Community</em>. System or Community Administrators (of this Community) can edit this News field.</p>'
+          }
+        ],
+        'dc.rights': [
+          {
+            language: null,
+            value: '<p><em>If this Community had special copyright text to display, it would be displayed here.</em></p>'
+          }
+        ],
+        'dc.title': [
+          {
+            language: null,
+            value: 'Sample Community'
+          }
+        ]
+      }
     }
   )
 ];

From 6474cbfafbf9a5859ad22eae474fd343feda8cc4 Mon Sep 17 00:00:00 2001
From: Chris Wilper <chris@atmire.com>
Date: Sat, 22 Dec 2018 23:08:00 -0500
Subject: [PATCH 39/44] DS-4107 Add tests for Metadata utility methods

---
 src/app/core/shared/metadata.model.spec.ts | 174 +++++++++++++++++++++
 1 file changed, 174 insertions(+)
 create mode 100644 src/app/core/shared/metadata.model.spec.ts

diff --git a/src/app/core/shared/metadata.model.spec.ts b/src/app/core/shared/metadata.model.spec.ts
new file mode 100644
index 0000000000..8f44dee5fd
--- /dev/null
+++ b/src/app/core/shared/metadata.model.spec.ts
@@ -0,0 +1,174 @@
+import { MetadataValue, MetadataValueFilter } from './metadata.interfaces';
+import { Metadata } from './metadata.model';
+
+const mdValue = (value: string, language?: string): MetadataValue => {
+  return { value: value, language: language === undefined ? null : language };
+}
+
+const dcDescription = mdValue('Some description');
+const dcAbstract = mdValue('Some abstract');
+const dcTitle0 = mdValue('Title 0');
+const dcTitle1 = mdValue('Title 1');
+const dcTitle2 = mdValue('Title 2', 'en_US');
+const bar = mdValue('Bar');
+
+const singleMap = { 'dc.title': [ dcTitle0 ] };
+
+const multiMap = {
+  'dc.description': [ dcDescription ],
+  'dc.description.abstract': [ dcAbstract ],
+  'dc.title': [ dcTitle1, dcTitle2 ],
+  'foo': [ bar ]
+};
+
+const testMethod = (fn, resultKind, mapOrMaps, keyOrKeys, expected, filter?) => {
+  const keys = keyOrKeys instanceof Array ? keyOrKeys : [ keyOrKeys ];
+  describe('and key' + (keys.length === 1 ? (' ' + keys[0]) : ('s ' + JSON.stringify(keys)))
+        + ' with ' + (filter === undefined ? 'no filter' : 'filter ' + JSON.stringify(filter)), () => {
+    const result = fn(mapOrMaps, keys, filter);
+    let shouldReturn;
+    if (resultKind === 'boolean') {
+      shouldReturn = expected;
+    } else if (expected === undefined) {
+      shouldReturn = 'undefined';
+    } else if (expected instanceof Array) {
+      shouldReturn = 'an array with ' + expected.length + ' ' + (expected.length > 1 ? 'ordered ' : '')
+          + resultKind + (expected.length !== 1 ? 's' : '');
+    } else {
+      shouldReturn = 'a ' + resultKind;
+    }
+    it('should return ' + shouldReturn, () => {
+      expect(result).toEqual(expected);
+    });
+  })
+};
+
+describe('Metadata', () => {
+
+  describe('all method', () => {
+
+    const testAll = (mapOrMaps, keyOrKeys, expected, filter?: MetadataValueFilter) =>
+      testMethod(Metadata.all, 'value', mapOrMaps, keyOrKeys, expected, filter);
+
+    describe('with emptyMap', () => {
+      testAll({}, 'foo', []);
+      testAll({}, '*', []);
+    });
+    describe('with singleMap', () => {
+      testAll(singleMap, 'foo', []);
+      testAll(singleMap, '*', [ dcTitle0 ]);
+      testAll(singleMap, '*', [], { value: 'baz' });
+      testAll(singleMap, 'dc.title', [ dcTitle0 ]);
+      testAll(singleMap, 'dc.*', [ dcTitle0 ]);
+    });
+    describe('with multiMap', () => {
+      testAll(multiMap, 'foo', [ bar ]);
+      testAll(multiMap, '*', [ dcDescription, dcAbstract, dcTitle1, dcTitle2, bar ]);
+      testAll(multiMap, 'dc.title', [ dcTitle1, dcTitle2 ]);
+      testAll(multiMap, 'dc.*', [ dcDescription, dcAbstract, dcTitle1, dcTitle2 ]);
+      testAll(multiMap, [ 'dc.title', 'dc.*' ], [ dcTitle1, dcTitle2, dcDescription, dcAbstract ]);
+    });
+    describe('with [ singleMap, multiMap ]', () => {
+      testAll([ singleMap, multiMap ], 'foo', [ bar ]);
+      testAll([ singleMap, multiMap ], '*', [ dcTitle0 ]);
+      testAll([ singleMap, multiMap ], 'dc.title', [ dcTitle0 ]);
+      testAll([ singleMap, multiMap ], 'dc.*', [ dcTitle0 ]);
+    });
+    describe('with [ multiMap, singleMap ]', () => {
+      testAll([ multiMap, singleMap ], 'foo', [ bar ]);
+      testAll([ multiMap, singleMap ], '*', [ dcDescription, dcAbstract, dcTitle1, dcTitle2, bar ]);
+      testAll([ multiMap, singleMap ], 'dc.title', [ dcTitle1, dcTitle2 ]);
+      testAll([ multiMap, singleMap ], 'dc.*', [ dcDescription, dcAbstract, dcTitle1, dcTitle2 ]);
+      testAll([ multiMap, singleMap ], [ 'dc.title', 'dc.*' ], [ dcTitle1, dcTitle2, dcDescription, dcAbstract ]);
+    });
+  });
+
+  describe('allValues method', () => {
+
+    const testAllValues = (mapOrMaps, keyOrKeys, expected) =>
+      testMethod(Metadata.allValues, 'string', mapOrMaps, keyOrKeys, expected);
+
+    describe('with emptyMap', () => {
+      testAllValues({}, '*', []);
+    });
+    describe('with singleMap', () => {
+      testAllValues([ singleMap, multiMap ], '*', [ dcTitle0.value ]);
+    });
+    describe('with [ multiMap, singleMap ]', () => {
+      testAllValues([ multiMap, singleMap ], '*', [ dcDescription.value, dcAbstract.value, dcTitle1.value, dcTitle2.value, bar.value ]);
+    });
+  });
+
+  describe('first method', () => {
+
+    const testFirst = (mapOrMaps, keyOrKeys, expected) =>
+      testMethod(Metadata.first, 'value', mapOrMaps, keyOrKeys, expected);
+
+    describe('with emptyMap', () => {
+      testFirst({}, '*', undefined);
+    });
+    describe('with singleMap', () => {
+      testFirst(singleMap, '*', dcTitle0);
+    });
+    describe('with [ multiMap, singleMap ]', () => {
+      testFirst([ multiMap, singleMap ], '*', dcDescription);
+    });
+  });
+
+  describe('firstValue method', () => {
+
+    const testFirstValue = (mapOrMaps, keyOrKeys, expected) =>
+      testMethod(Metadata.firstValue, 'value', mapOrMaps, keyOrKeys, expected);
+
+    describe('with emptyMap', () => {
+      testFirstValue({}, '*', undefined);
+    });
+    describe('with singleMap', () => {
+      testFirstValue(singleMap, '*', dcTitle0.value);
+    });
+    describe('with [ multiMap, singleMap ]', () => {
+      testFirstValue([ multiMap, singleMap ], '*', dcDescription.value);
+    });
+  });
+
+  describe('has method', () => {
+
+    const testHas = (mapOrMaps, keyOrKeys, expected, filter?: MetadataValueFilter) =>
+      testMethod(Metadata.has, 'boolean', mapOrMaps, keyOrKeys, expected, filter);
+
+    describe('with emptyMap', () => {
+      testHas({}, '*', false);
+    });
+    describe('with singleMap', () => {
+      testHas(singleMap, '*', true);
+      testHas(singleMap, '*', false, { value: 'baz' });
+    });
+    describe('with [ multiMap, singleMap ]', () => {
+      testHas([ multiMap, singleMap ], '*', true);
+    });
+  });
+
+  describe('valueMatches method', () => {
+
+    const testValueMatches = (value: MetadataValue, expected: boolean, filter?: MetadataValueFilter) => {
+      describe('with value ' + JSON.stringify(value) + ' and filter '
+          + (filter === undefined ? 'undefined' : JSON.stringify(filter)), () => {
+        const result = Metadata.valueMatches(value, filter);
+        it('should return ' + expected, () => {
+          expect(result).toEqual(expected);
+        });
+      });
+    };
+
+    testValueMatches(mdValue('a'), true);
+    testValueMatches(mdValue('a'), true, { value: 'a' });
+    testValueMatches(mdValue('a'), false, { value: 'A' });
+    testValueMatches(mdValue('a'), true, { value: 'A', ignoreCase: true });
+    testValueMatches(mdValue('ab'), false, { value: 'b' });
+    testValueMatches(mdValue('ab'), true, { value: 'b', substring: true });
+    testValueMatches(mdValue('a'), true, { language: null });
+    testValueMatches(mdValue('a'), false, { language: 'en_US' });
+    testValueMatches(mdValue('a', 'en_US'), true, { language: 'en_US' });
+  });
+
+});

From 4c8747a3455026b9ec363a7935d26e99d6e78b4c Mon Sep 17 00:00:00 2001
From: Chris Wilper <chris@atmire.com>
Date: Thu, 14 Feb 2019 14:46:27 -0500
Subject: [PATCH 40/44] DS-4107 Improve TypeDocs

---
 src/app/core/browse/browse.service.ts         |  3 +
 src/app/core/shared/dspace-object.model.ts    | 40 ++++++++--
 src/app/core/shared/metadata.model.ts         | 80 ++++++++++++++-----
 .../search-result-grid-element.component.ts   | 14 +++-
 .../search-result-list-element.component.ts   | 14 +++-
 5 files changed, 124 insertions(+), 27 deletions(-)

diff --git a/src/app/core/browse/browse.service.ts b/src/app/core/browse/browse.service.ts
index 41675632dd..f0d8935b5c 100644
--- a/src/app/core/browse/browse.service.ts
+++ b/src/app/core/browse/browse.service.ts
@@ -34,6 +34,9 @@ import { URLCombiner } from '../url-combiner/url-combiner';
 import { Item } from '../shared/item.model';
 import { DSpaceObject } from '../shared/dspace-object.model';
 
+/**
+ * Service that performs all actions that have to do with browse.
+ */
 @Injectable()
 export class BrowseService {
   protected linkPath = 'browses';
diff --git a/src/app/core/shared/dspace-object.model.ts b/src/app/core/shared/dspace-object.model.ts
index 1dba79865f..edd82eca85 100644
--- a/src/app/core/shared/dspace-object.model.ts
+++ b/src/app/core/shared/dspace-object.model.ts
@@ -54,27 +54,57 @@ export class DSpaceObject implements CacheableObject, ListableObject {
    */
   owner: Observable<RemoteData<DSpaceObject>>;
 
-  /** Gets all matching metadata in this DSpaceObject. See `Metadata.all` for more information. */
+  /**
+   * Gets all matching metadata in this DSpaceObject.
+   *
+   * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+   * @param {MetadataValueFilter} filter The value filter to use. If unspecified, no filtering will be done.
+   * @returns {MetadataValue[]} the matching values or an empty array.
+   */
   allMetadata(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): MetadataValue[] {
     return Metadata.all(this.metadata, keyOrKeys, valueFilter);
   }
 
-  /** Like `allMetadata`, but only returns string values. */
+  /**
+   * Like [[allMetadata]], but only returns string values.
+   *
+   * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+   * @param {MetadataValueFilter} filter The value filter to use. If unspecified, no filtering will be done.
+   * @returns {string[]} the matching string values or an empty array.
+   */
   allMetadataValues(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string[] {
     return Metadata.allValues(this.metadata, keyOrKeys, valueFilter);
   }
 
-  /** Gets the first matching metadata in this DSpaceObject, or `undefined`. */
+  /**
+   * Gets the first matching MetadataValue object in this DSpaceObject, or `undefined`.
+   *
+   * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+   * @param {MetadataValueFilter} filter The value filter to use. If unspecified, no filtering will be done.
+   * @returns {MetadataValue} the first matching value, or `undefined`.
+   */
   firstMetadata(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): MetadataValue {
     return Metadata.first(this.metadata, keyOrKeys, valueFilter);
   }
 
-  /** Like `firstMetadata`, but only returns a string value, or `undefined`. */
+  /**
+   * Like [[firstMetadata]], but only returns a string value, or `undefined`.
+   *
+   * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+   * @param {MetadataValueFilter} filter The value filter to use. If unspecified, no filtering will be done.
+   * @returns {string} the first matching string value, or `undefined`.
+   */
   firstMetadataValue(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string {
     return Metadata.firstValue(this.metadata, keyOrKeys, valueFilter);
   }
 
-  /** Checks for matching metadata in this DSpaceObject. */
+  /**
+   * Checks for a matching metadata value in this DSpaceObject.
+   *
+   * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+   * @param {MetadataValueFilter} filter The value filter to use. If unspecified, no filtering will be done.
+   * @returns {boolean} whether a match is found.
+   */
   hasMetadata(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): boolean {
     return Metadata.has(this.metadata, keyOrKeys, valueFilter);
   }
diff --git a/src/app/core/shared/metadata.model.ts b/src/app/core/shared/metadata.model.ts
index c774af189b..c64827ffdb 100644
--- a/src/app/core/shared/metadata.model.ts
+++ b/src/app/core/shared/metadata.model.ts
@@ -2,23 +2,27 @@ import { isEmpty } from '../../shared/empty.util';
 import { MetadataMap, MetadataValue, MetadataValueFilter } from './metadata.interfaces';
 
 /**
- * Static utility methods for working with DSpace metadata.
+ * Utility class for working with DSpace object metadata.
+ *
+ * When specifying metadata keys, wildcards are supported, so `'*'` will match all keys, `'dc.date.*'` will
+ * match all qualified dc dates, and so on. Exact keys will be evaluated (and matches returned) in the order
+ * they are given.
+ *
+ * When multiple keys in a map match a given wildcard, they are evaluated in the order they are stored in
+ * the map (alphanumeric if obtained from the REST api). If duplicate or overlapping keys are specified, the
+ * first one takes precedence. For example, specifying `['dc.date', 'dc.*', '*']` will cause any `dc.date`
+ * values to be evaluated (and returned, if matched) first, followed by any other `dc` metadata values,
+ * followed by any other (non-dc) metadata values.
  */
 export class Metadata {
 
   /**
-   * Gets all matching metadata.
+   * Gets all matching metadata in the map(s).
    *
-   * @param {MetadataMap|MetadataMap[]} mapOrMaps The source map(s). Values will only be returned from one map --
-   * the first with at least one match.
-   * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported, so `'*'` will
-   * match all keys, `'dc.date.*'` will match all qualified dc dates, and so on. Exact keys will be evaluated
-   * (and matches returned) in the order they are given in the parameter. When multiple keys match a wildcard,
-   * they are evaluated in the order they are stored in the map (alphanumeric if obtained from the REST api).
-   * If duplicate or overlapping keys are specified, the first one takes precedence. For example, specifying
-   * `['dc.date', 'dc.*', '*']` will cause any `dc.date` values to be evaluated (and returned, if matched)
-   * first, followed by any other `dc` metadata values, followed by any other (non-dc) metadata values.
-   * @param {MetadataValueFilter} filter The value filter to use.
+   * @param {MetadataMap|MetadataMap[]} mapOrMaps The source map(s). When multiple maps are given, they will be
+   * checked in order, and only values from the first with at least one match will be returned.
+   * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see above.
+   * @param {MetadataValueFilter} filter The value filter to use. If unspecified, no filtering will be done.
    * @returns {MetadataValue[]} the matching values or an empty array.
    */
   public static all(mapOrMaps: MetadataMap | MetadataMap[], keyOrKeys: string | string[],
@@ -43,13 +47,28 @@ export class Metadata {
     return matches;
   }
 
-  /** Like `all`, but only returns string values. */
+  /**
+   * Like [[Metadata.all]], but only returns string values.
+   *
+   * @param {MetadataMap|MetadataMap[]} mapOrMaps The source map(s). When multiple maps are given, they will be
+   * checked in order, and only values from the first with at least one match will be returned.
+   * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see above.
+   * @param {MetadataValueFilter} filter The value filter to use. If unspecified, no filtering will be done.
+   * @returns {string[]} the matching string values or an empty array.
+   */
   public static allValues(mapOrMaps: MetadataMap | MetadataMap[], keyOrKeys: string | string[],
                           filter?: MetadataValueFilter): string[] {
     return Metadata.all(mapOrMaps, keyOrKeys, filter).map((mdValue) => mdValue.value);
   }
 
-  /** Gets the first matching MetadataValue object in a map, or `undefined`. */
+  /**
+   * Gets the first matching MetadataValue object in the map(s), or `undefined`.
+   *
+   * @param {MetadataMap|MetadataMap[]} mapOrMaps The source map(s).
+   * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see above.
+   * @param {MetadataValueFilter} filter The value filter to use. If unspecified, no filtering will be done.
+   * @returns {MetadataValue} the first matching value, or `undefined`.
+   */
   public static first(mdMapOrMaps: MetadataMap | MetadataMap[], keyOrKeys: string | string[],
                       filter?: MetadataValueFilter): MetadataValue {
     const mdMaps: MetadataMap[] = mdMapOrMaps instanceof Array ? mdMapOrMaps : [ mdMapOrMaps ];
@@ -63,20 +82,40 @@ export class Metadata {
     }
   }
 
-  /** Like `first`, but only returns a string value, or `undefined`. */
+  /**
+   * Like [[Metadata.first]], but only returns a string value, or `undefined`.
+   *
+   * @param {MetadataMap|MetadataMap[]} mapOrMaps The source map(s).
+   * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see above.
+   * @param {MetadataValueFilter} filter The value filter to use. If unspecified, no filtering will be done.
+   * @returns {string} the first matching string value, or `undefined`.
+   */
   public static firstValue(mdMapOrMaps: MetadataMap | MetadataMap[], keyOrKeys: string | string[],
                            filter?: MetadataValueFilter): string {
     const value = Metadata.first(mdMapOrMaps, keyOrKeys, filter);
     return value === undefined ? undefined : value.value;
   }
 
-  /** Checks the given map for a matching value. */
+  /**
+   * Checks for a matching metadata value in the given map(s).
+   *
+   * @param {MetadataMap|MetadataMap[]} mapOrMaps The source map(s).
+   * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see above.
+   * @param {MetadataValueFilter} filter The value filter to use. If unspecified, no filtering will be done.
+   * @returns {boolean} whether a match is found.
+   */
   public static has(mdMapOrMaps: MetadataMap | MetadataMap[], keyOrKeys: string | string[],
                     filter?: MetadataValueFilter): boolean {
     return Metadata.first(mdMapOrMaps, keyOrKeys, filter) !== undefined;
   }
 
-  /** Checks if a value matches a filter. */
+  /**
+   * Checks if a value matches a filter.
+   *
+   * @param {MetadataValue} mdValue the value to check.
+   * @param {MetadataValueFilter} filter the filter to use.
+   * @returns {boolean} whether the filter matches, or true if no filter is given.
+   */
   public static valueMatches(mdValue: MetadataValue, filter: MetadataValueFilter) {
     if (!filter) {
       return true;
@@ -98,7 +137,12 @@ export class Metadata {
     return true;
   }
 
-  /** Gets the list of keys in the map limited by, and in the order given by `keyOrKeys` */
+  /**
+   * Gets the list of keys in the map limited by, and in the order given by `keyOrKeys`.
+   *
+   * @param {MetadataMap} mdMap The source map.
+   * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see above.
+   */
   private static resolveKeys(mdMap: MetadataMap, keyOrKeys: string | string[]): string[] {
     const inputKeys: string[] = keyOrKeys instanceof Array ? keyOrKeys : [ keyOrKeys ];
     const outputKeys: string[] = [];
diff --git a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
index c3a80604db..0901b7b8cc 100644
--- a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
@@ -21,12 +21,22 @@ export class SearchResultGridElementComponent<T extends SearchResult<K>, K exten
     this.dso = this.object.dspaceObject;
   }
 
-  /** Gets all matching metadata string values from hitHighlights or dso metadata, preferring hitHighlights. */
+  /**
+   * Gets all matching metadata string values from hitHighlights or dso metadata, preferring hitHighlights.
+   *
+   * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+   * @returns {string[]} the matching string values or an empty array.
+   */
   allMetadataValues(keyOrKeys: string | string[]): string[] {
     return Metadata.allValues([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
   }
 
-  /** Gets the first matching metadata string value from hitHighlights or dso metadata, preferring hitHighlights. */
+  /**
+   * Gets the first matching metadata string value from hitHighlights or dso metadata, preferring hitHighlights.
+   *
+   * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+   * @returns {string} the first matching string value, or `undefined`.
+   */
   firstMetadataValue(keyOrKeys: string | string[]): string {
     return Metadata.firstValue([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
   }
diff --git a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
index a9a3050ac8..2a16b0b754 100644
--- a/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
@@ -21,12 +21,22 @@ export class SearchResultListElementComponent<T extends SearchResult<K>, K exten
     this.dso = this.object.dspaceObject;
   }
 
-  /** Gets all matching metadata string values from hitHighlights or dso metadata, preferring hitHighlights. */
+  /**
+   * Gets all matching metadata string values from hitHighlights or dso metadata, preferring hitHighlights.
+   *
+   * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+   * @returns {string[]} the matching string values or an empty array.
+   */
   allMetadataValues(keyOrKeys: string | string[]): string[] {
     return Metadata.allValues([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
   }
 
-  /** Gets the first matching metadata string value from hitHighlights or dso metadata, preferring hitHighlights. */
+  /**
+   * Gets the first matching metadata string value from hitHighlights or dso metadata, preferring hitHighlights.
+   *
+   * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+   * @returns {string} the first matching string value, or `undefined`.
+   */
   firstMetadataValue(keyOrKeys: string | string[]): string {
     return Metadata.firstValue([this.object.hitHighlights, this.dso.metadata], keyOrKeys);
   }

From e499f792e87b26ace299fecc3f0e501843062778 Mon Sep 17 00:00:00 2001
From: Chris Wilper <chris@atmire.com>
Date: Thu, 14 Feb 2019 14:52:43 -0500
Subject: [PATCH 41/44] DS-4107 Use isUndefined and isNotUndefined where
 appropriate

---
 src/app/core/shared/metadata.model.spec.ts | 9 +++++----
 src/app/core/shared/metadata.model.ts      | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/app/core/shared/metadata.model.spec.ts b/src/app/core/shared/metadata.model.spec.ts
index 8f44dee5fd..dfeff8d600 100644
--- a/src/app/core/shared/metadata.model.spec.ts
+++ b/src/app/core/shared/metadata.model.spec.ts
@@ -1,8 +1,9 @@
+import { isUndefined } from '../../shared/empty.util';
 import { MetadataValue, MetadataValueFilter } from './metadata.interfaces';
 import { Metadata } from './metadata.model';
 
 const mdValue = (value: string, language?: string): MetadataValue => {
-  return { value: value, language: language === undefined ? null : language };
+  return { value: value, language: isUndefined(language) ? null : language };
 }
 
 const dcDescription = mdValue('Some description');
@@ -24,12 +25,12 @@ const multiMap = {
 const testMethod = (fn, resultKind, mapOrMaps, keyOrKeys, expected, filter?) => {
   const keys = keyOrKeys instanceof Array ? keyOrKeys : [ keyOrKeys ];
   describe('and key' + (keys.length === 1 ? (' ' + keys[0]) : ('s ' + JSON.stringify(keys)))
-        + ' with ' + (filter === undefined ? 'no filter' : 'filter ' + JSON.stringify(filter)), () => {
+        + ' with ' + (isUndefined(filter) ? 'no filter' : 'filter ' + JSON.stringify(filter)), () => {
     const result = fn(mapOrMaps, keys, filter);
     let shouldReturn;
     if (resultKind === 'boolean') {
       shouldReturn = expected;
-    } else if (expected === undefined) {
+    } else if (isUndefined(expected)) {
       shouldReturn = 'undefined';
     } else if (expected instanceof Array) {
       shouldReturn = 'an array with ' + expected.length + ' ' + (expected.length > 1 ? 'ordered ' : '')
@@ -152,7 +153,7 @@ describe('Metadata', () => {
 
     const testValueMatches = (value: MetadataValue, expected: boolean, filter?: MetadataValueFilter) => {
       describe('with value ' + JSON.stringify(value) + ' and filter '
-          + (filter === undefined ? 'undefined' : JSON.stringify(filter)), () => {
+          + (isUndefined(filter) ? 'undefined' : JSON.stringify(filter)), () => {
         const result = Metadata.valueMatches(value, filter);
         it('should return ' + expected, () => {
           expect(result).toEqual(expected);
diff --git a/src/app/core/shared/metadata.model.ts b/src/app/core/shared/metadata.model.ts
index c64827ffdb..2b29659252 100644
--- a/src/app/core/shared/metadata.model.ts
+++ b/src/app/core/shared/metadata.model.ts
@@ -1,4 +1,4 @@
-import { isEmpty } from '../../shared/empty.util';
+import { isEmpty, isNotUndefined, isUndefined } from '../../shared/empty.util';
 import { MetadataMap, MetadataValue, MetadataValueFilter } from './metadata.interfaces';
 
 /**
@@ -93,7 +93,7 @@ export class Metadata {
   public static firstValue(mdMapOrMaps: MetadataMap | MetadataMap[], keyOrKeys: string | string[],
                            filter?: MetadataValueFilter): string {
     const value = Metadata.first(mdMapOrMaps, keyOrKeys, filter);
-    return value === undefined ? undefined : value.value;
+    return isUndefined(value) ? undefined : value.value;
   }
 
   /**
@@ -106,7 +106,7 @@ export class Metadata {
    */
   public static has(mdMapOrMaps: MetadataMap | MetadataMap[], keyOrKeys: string | string[],
                     filter?: MetadataValueFilter): boolean {
-    return Metadata.first(mdMapOrMaps, keyOrKeys, filter) !== undefined;
+    return isNotUndefined(Metadata.first(mdMapOrMaps, keyOrKeys, filter));
   }
 
   /**

From c2c59cd85a63b63ce0db91c3e9959e85a60f4cff Mon Sep 17 00:00:00 2001
From: Chris Wilper <chris@atmire.com>
Date: Wed, 20 Feb 2019 16:36:09 -0500
Subject: [PATCH 42/44] DS-4107 Improve variable naming

---
 .../modify-item-overview.component.html                | 10 +++++-----
 .../metadata-uri-values.component.html                 |  4 ++--
 .../metadata-uri-values.component.ts                   |  2 +-
 .../metadata-values/metadata-values.component.html     |  4 ++--
 .../metadata-values/metadata-values.component.ts       |  2 +-
 src/app/+item-page/full/full-item-page.component.html  | 10 +++++-----
 .../item-page-specific-field.component.html            |  2 +-
 .../title/item-page-title-field.component.html         |  2 +-
 .../uri/item-page-uri-field.component.html             |  2 +-
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html b/src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html
index 861c20ada7..ce6e01df3d 100644
--- a/src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html
+++ b/src/app/+item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html
@@ -7,11 +7,11 @@
   </tr>
   </thead>
   <tbody>
-  <ng-container *ngFor="let entry of metadata | keyvalue">
-    <tr *ngFor="let value of entry.value" class="metadata-row">
-      <td>{{entry.key}}</td>
-      <td>{{value.value}}</td>
-      <td>{{value.language}}</td>
+  <ng-container *ngFor="let mdEntry of metadata | keyvalue">
+    <tr *ngFor="let mdValue of mdEntry.value" class="metadata-row">
+      <td>{{mdEntry.key}}</td>
+      <td>{{mdValue.value}}</td>
+      <td>{{mdValue.language}}</td>
     </tr>
   </ng-container>
   </tbody>
diff --git a/src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.html b/src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
index 344a32841b..b5d7c118dd 100644
--- a/src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
+++ b/src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.html
@@ -1,5 +1,5 @@
 <ds-metadata-field-wrapper [label]="label | translate">
-    <a *ngFor="let value of values; let last=last;" [href]="value.value">
-       {{ linktext || value.value }}<span *ngIf="!last" [innerHTML]="separator"></span>
+    <a *ngFor="let mdValue of mdValues; let last=last;" [href]="mdValue.value">
+       {{ linktext || mdValue.value }}<span *ngIf="!last" [innerHTML]="separator"></span>
     </a>
 </ds-metadata-field-wrapper>
diff --git a/src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts b/src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
index b5870f16b8..09d855e951 100644
--- a/src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
+++ b/src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
@@ -19,7 +19,7 @@ export class MetadataUriValuesComponent extends MetadataValuesComponent {
 
   @Input() linktext: any;
 
-  @Input() values: MetadataValue[];
+  @Input() mdValues: MetadataValue[];
 
   @Input() separator: string;
 
diff --git a/src/app/+item-page/field-components/metadata-values/metadata-values.component.html b/src/app/+item-page/field-components/metadata-values/metadata-values.component.html
index fbc1e11a07..980c940255 100644
--- a/src/app/+item-page/field-components/metadata-values/metadata-values.component.html
+++ b/src/app/+item-page/field-components/metadata-values/metadata-values.component.html
@@ -1,5 +1,5 @@
 <ds-metadata-field-wrapper [label]="label | translate">
-    <span *ngFor="let value of values; let last=last;">
-        {{value.value}}<span *ngIf="!last" [innerHTML]="separator"></span>
+    <span *ngFor="let mdValue of mdValues; let last=last;">
+        {{mdValue.value}}<span *ngIf="!last" [innerHTML]="separator"></span>
     </span>
 </ds-metadata-field-wrapper>
diff --git a/src/app/+item-page/field-components/metadata-values/metadata-values.component.ts b/src/app/+item-page/field-components/metadata-values/metadata-values.component.ts
index 2be7291dcd..708bdb49c7 100644
--- a/src/app/+item-page/field-components/metadata-values/metadata-values.component.ts
+++ b/src/app/+item-page/field-components/metadata-values/metadata-values.component.ts
@@ -12,7 +12,7 @@ import { MetadataValue } from '../../../core/shared/metadata.interfaces';
 })
 export class MetadataValuesComponent {
 
-  @Input() values: MetadataValue[];
+  @Input() mdValues: MetadataValue[];
 
   @Input() separator: string;
 
diff --git a/src/app/+item-page/full/full-item-page.component.html b/src/app/+item-page/full/full-item-page.component.html
index 7080ba2e96..7aec57da0c 100644
--- a/src/app/+item-page/full/full-item-page.component.html
+++ b/src/app/+item-page/full/full-item-page.component.html
@@ -9,11 +9,11 @@
       </div>
       <table class="table table-responsive table-striped">
         <tbody>
-          <ng-container *ngFor="let entry of (metadata$ | async) | keyvalue">
-            <tr *ngFor="let value of entry.value">
-              <td>{{entry.key}}</td>
-              <td>{{value.value}}</td>
-              <td>{{value.language}}</td>
+          <ng-container *ngFor="let mdEntry of (metadata$ | async) | keyvalue">
+            <tr *ngFor="let mdValue of mdEntry.value">
+              <td>{{mdEntry.key}}</td>
+              <td>{{mdValue.value}}</td>
+              <td>{{mdValue.language}}</td>
             </tr>
           </ng-container>
         </tbody>
diff --git a/src/app/+item-page/simple/field-components/specific-field/item-page-specific-field.component.html b/src/app/+item-page/simple/field-components/specific-field/item-page-specific-field.component.html
index c0d948fc76..d6a569198c 100644
--- a/src/app/+item-page/simple/field-components/specific-field/item-page-specific-field.component.html
+++ b/src/app/+item-page/simple/field-components/specific-field/item-page-specific-field.component.html
@@ -1,3 +1,3 @@
 <div class="item-page-specific-field">
-  <ds-metadata-values [values]="item?.allMetadata(fields)" [separator]="separator" [label]="label"></ds-metadata-values>
+  <ds-metadata-values [mdValues]="item?.allMetadata(fields)" [separator]="separator" [label]="label"></ds-metadata-values>
 </div>
diff --git a/src/app/+item-page/simple/field-components/specific-field/title/item-page-title-field.component.html b/src/app/+item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
index 40f54ec636..aac85d335f 100644
--- a/src/app/+item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
+++ b/src/app/+item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
@@ -1,3 +1,3 @@
 <h2 class="item-page-title-field">
-  <ds-metadata-values [values]="item?.allMetadata(fields)"></ds-metadata-values>
+  <ds-metadata-values [mdValues]="item?.allMetadata(fields)"></ds-metadata-values>
 </h2>
diff --git a/src/app/+item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.html b/src/app/+item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.html
index 771fef53fc..a5561b22e5 100644
--- a/src/app/+item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.html
+++ b/src/app/+item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.html
@@ -1,3 +1,3 @@
 <div class="item-page-specific-field">
-  <ds-metadata-uri-values [values]="item?.allMetadata(fields)" [separator]="separator" [label]="label"></ds-metadata-uri-values>
+  <ds-metadata-uri-values [mdValues]="item?.allMetadata(fields)" [separator]="separator" [label]="label"></ds-metadata-uri-values>
 </div>

From 3d1e6e63fb641102d2a3ba7fbe8daaef4bc685f8 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 21 Feb 2019 15:09:44 +0100
Subject: [PATCH 43/44] Added JDocs

---
 .../metadata-registry.reducers.ts             |  5 ++++
 .../metadata-field-form.component.ts          |  3 +++
 src/app/core/cache/response.models.ts         | 15 ++++++++++++
 .../core/data/metadata-schema-data.service.ts |  3 +++
 .../data/metadatafield-parsing.service.ts     |  3 +++
 src/app/core/data/request.models.ts           | 12 ++++++++++
 src/app/core/data/request.reducer.ts          |  5 ++++
 src/app/core/data/request.service.ts          |  7 ++++++
 src/app/core/index/index.reducer.ts           |  5 ++++
 .../normalized-metadata-schema.model.ts       | 15 ++++++++++++
 src/app/core/registry/registry.service.ts     | 23 ++++++++++++++++---
 11 files changed, 93 insertions(+), 3 deletions(-)

diff --git a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.ts b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.ts
index 3c68157a3e..f335c880ae 100644
--- a/src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.ts
+++ b/src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.ts
@@ -32,6 +32,11 @@ const initialState: MetadataRegistryState = {
   selectedFields: []
 };
 
+/**
+ * Reducer that handles MetadataRegistryActions to modify metadata schema and/or field states
+ * @param state   The current MetadataRegistryState
+ * @param action  The MetadataRegistryAction to perform on the state
+ */
 export function metadataRegistryReducer(state = initialState, action: MetadataRegistryAction): MetadataRegistryState {
 
   switch (action.type) {
diff --git a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
index 509af6609b..4c09428bd5 100644
--- a/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
+++ b/src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts
@@ -95,6 +95,9 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
               private translateService: TranslateService) {
   }
 
+  /**
+   * Initialize the component, setting up the necessary Models for the dynamic form
+   */
   ngOnInit() {
     combineLatest(
       this.translateService.get(`${this.messagePrefix}.element`),
diff --git a/src/app/core/cache/response.models.ts b/src/app/core/cache/response.models.ts
index d2531b03ab..bb150b3bcb 100644
--- a/src/app/core/cache/response.models.ts
+++ b/src/app/core/cache/response.models.ts
@@ -33,6 +33,9 @@ export class DSOSuccessResponse extends RestResponse {
   }
 }
 
+/**
+ * A successful response containing a list of MetadataSchemas wrapped in a RegistryMetadataschemasResponse
+ */
 export class RegistryMetadataschemasSuccessResponse extends RestResponse {
   constructor(
     public metadataschemasResponse: RegistryMetadataschemasResponse,
@@ -43,6 +46,9 @@ export class RegistryMetadataschemasSuccessResponse extends RestResponse {
   }
 }
 
+/**
+ * A successful response containing a list of MetadataFields wrapped in a RegistryMetadatafieldsResponse
+ */
 export class RegistryMetadatafieldsSuccessResponse extends RestResponse {
   constructor(
     public metadatafieldsResponse: RegistryMetadatafieldsResponse,
@@ -53,6 +59,9 @@ export class RegistryMetadatafieldsSuccessResponse extends RestResponse {
   }
 }
 
+/**
+ * A successful response containing a list of BitstreamFormats wrapped in a RegistryBitstreamformatsResponse
+ */
 export class RegistryBitstreamformatsSuccessResponse extends RestResponse {
   constructor(
     public bitstreamformatsResponse: RegistryBitstreamformatsResponse,
@@ -63,6 +72,9 @@ export class RegistryBitstreamformatsSuccessResponse extends RestResponse {
   }
 }
 
+/**
+ * A successful response containing exactly one MetadataSchema
+ */
 export class MetadataschemaSuccessResponse extends RestResponse {
   constructor(
     public metadataschema: MetadataSchema,
@@ -72,6 +84,9 @@ export class MetadataschemaSuccessResponse extends RestResponse {
   }
 }
 
+/**
+ * A successful response containing exactly one MetadataField
+ */
 export class MetadatafieldSuccessResponse extends RestResponse {
   constructor(
     public metadatafield: MetadataField,
diff --git a/src/app/core/data/metadata-schema-data.service.ts b/src/app/core/data/metadata-schema-data.service.ts
index 098b043d7f..f5a57ab978 100644
--- a/src/app/core/data/metadata-schema-data.service.ts
+++ b/src/app/core/data/metadata-schema-data.service.ts
@@ -17,6 +17,9 @@ import { HttpClient } from '@angular/common/http';
 import { ChangeAnalyzer } from './change-analyzer';
 import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service';
 
+/**
+ * A service responsible for fetching/sending data from/to the REST API on the metadataschemas endpoint
+ */
 @Injectable()
 export class MetadataSchemaDataService extends DataService<NormalizedMetadataSchema, MetadataSchema> {
   protected linkPath = 'metadataschemas';
diff --git a/src/app/core/data/metadatafield-parsing.service.ts b/src/app/core/data/metadatafield-parsing.service.ts
index 2ad95e920b..86a3c8a925 100644
--- a/src/app/core/data/metadatafield-parsing.service.ts
+++ b/src/app/core/data/metadatafield-parsing.service.ts
@@ -6,6 +6,9 @@ import { Injectable } from '@angular/core';
 import { MetadatafieldSuccessResponse, MetadataschemaSuccessResponse, RestResponse } from '../cache/response.models';
 import { MetadataField } from '../metadata/metadatafield.model';
 
+/**
+ * A service responsible for parsing DSpaceRESTV2Response data related to a single MetadataField to a valid RestResponse
+ */
 @Injectable()
 export class MetadatafieldParsingService implements ResponseParsingService {
 
diff --git a/src/app/core/data/request.models.ts b/src/app/core/data/request.models.ts
index 1126899279..18820dbd43 100644
--- a/src/app/core/data/request.models.ts
+++ b/src/app/core/data/request.models.ts
@@ -220,6 +220,9 @@ export class IntegrationRequest extends GetRequest {
   }
 }
 
+/**
+ * Request to create a MetadataSchema
+ */
 export class CreateMetadataSchemaRequest extends PostRequest {
   constructor(uuid: string, href: string, public body?: any, public options?: HttpOptions) {
     super(uuid, href, body, options);
@@ -230,6 +233,9 @@ export class CreateMetadataSchemaRequest extends PostRequest {
   }
 }
 
+/**
+ * Request to update a MetadataSchema
+ */
 export class UpdateMetadataSchemaRequest extends PutRequest {
   constructor(uuid: string, href: string, public body?: any, public options?: HttpOptions) {
     super(uuid, href, body, options);
@@ -240,6 +246,9 @@ export class UpdateMetadataSchemaRequest extends PutRequest {
   }
 }
 
+/**
+ * Request to create a MetadataField
+ */
 export class CreateMetadataFieldRequest extends PostRequest {
   constructor(uuid: string, href: string, public body?: any, public options?: HttpOptions) {
     super(uuid, href, body, options);
@@ -250,6 +259,9 @@ export class CreateMetadataFieldRequest extends PostRequest {
   }
 }
 
+/**
+ * Request to update a MetadataField
+ */
 export class UpdateMetadataFieldRequest extends PutRequest {
   constructor(uuid: string, href: string, public body?: any, public options?: HttpOptions) {
     super(uuid, href, body, options);
diff --git a/src/app/core/data/request.reducer.ts b/src/app/core/data/request.reducer.ts
index 7158b1818b..e324e4d5a2 100644
--- a/src/app/core/data/request.reducer.ts
+++ b/src/app/core/data/request.reducer.ts
@@ -110,6 +110,11 @@ function resetResponseTimestamps(state: RequestState, action: ResetResponseTimes
   return newState;
 }
 
+/**
+ * Remove a request from the RequestState
+ * @param state   The current RequestState
+ * @param action  The RequestRemoveAction to perform
+ */
 function removeRequest(state: RequestState, action: RequestRemoveAction): RequestState {
   const newState = Object.create(null);
   for (const value in state) {
diff --git a/src/app/core/data/request.service.ts b/src/app/core/data/request.service.ts
index 56a90d185f..0d66a8e45d 100644
--- a/src/app/core/data/request.service.ts
+++ b/src/app/core/data/request.service.ts
@@ -55,6 +55,13 @@ export class RequestService {
     return pathSelector<CoreState, string>(coreSelector, 'index', IndexName.UUID_MAPPING, uuid);
   }
 
+  /**
+   * Create a selector that fetches a list of request UUIDs from a given index substate of which the request href
+   * contains a given substring
+   * @param selector    MemoizedSelector to start from
+   * @param name        The name of the index substate we're fetching request UUIDs from
+   * @param href        Substring that the request's href should contain
+   */
   private uuidsFromHrefSubstringSelector(selector: MemoizedSelector<any, IndexState>, name: string, href: string): MemoizedSelector<any, string[]> {
     return createSelector(selector, (state: IndexState) => this.getUuidsFromHrefSubstring(state, name, href));
   }
diff --git a/src/app/core/index/index.reducer.ts b/src/app/core/index/index.reducer.ts
index 64b41e2111..3597c786d8 100644
--- a/src/app/core/index/index.reducer.ts
+++ b/src/app/core/index/index.reducer.ts
@@ -65,6 +65,11 @@ function removeFromIndexByValue(state: IndexState, action: RemoveFromIndexByValu
   });
 }
 
+/**
+ * Remove values from the IndexState's substate that contain a given substring
+ * @param state     The IndexState to remove values from
+ * @param action    The RemoveFromIndexByValueAction containing the necessary information to remove the values
+ */
 function removeFromIndexBySubstring(state: IndexState, action: RemoveFromIndexByValueAction): IndexState {
   const subState = state[action.payload.name];
   const newSubState = Object.create(null);
diff --git a/src/app/core/metadata/normalized-metadata-schema.model.ts b/src/app/core/metadata/normalized-metadata-schema.model.ts
index 432a8bfd5e..844efd232f 100644
--- a/src/app/core/metadata/normalized-metadata-schema.model.ts
+++ b/src/app/core/metadata/normalized-metadata-schema.model.ts
@@ -5,17 +5,32 @@ import { CacheableObject } from '../cache/object-cache.reducer';
 import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
 import { MetadataSchema } from './metadataschema.model';
 
+/**
+ * Normalized class for a DSpace MetadataSchema
+ */
 @mapsTo(MetadataSchema)
 export class NormalizedMetadataSchema extends NormalizedObject implements CacheableObject, ListableObject {
+  /**
+   * The unique identifier for this schema
+   */
   @autoserialize
   id: number;
 
+  /**
+   * The REST link to itself
+   */
   @autoserialize
   self: string;
 
+  /**
+   * A unique prefix that defines this schema
+   */
   @autoserialize
   prefix: string;
 
+  /**
+   * The namespace for this schema
+   */
   @autoserialize
   namespace: string;
 }
diff --git a/src/app/core/registry/registry.service.ts b/src/app/core/registry/registry.service.ts
index 6cd3a7fa28..969024e330 100644
--- a/src/app/core/registry/registry.service.ts
+++ b/src/app/core/registry/registry.service.ts
@@ -7,10 +7,11 @@ import { MetadataSchema } from '../metadata/metadataschema.model';
 import { MetadataField } from '../metadata/metadatafield.model';
 import { BitstreamFormat } from './mock-bitstream-format.model';
 import {
+  CreateMetadataFieldRequest,
   CreateMetadataSchemaRequest,
   DeleteRequest,
   GetRequest,
-  RestRequest,
+  RestRequest, UpdateMetadataFieldRequest,
   UpdateMetadataSchemaRequest
 } from '../data/request.models';
 import { GenericConstructor } from '../shared/generic-constructor';
@@ -314,6 +315,14 @@ export class RegistryService {
     return this.store.pipe(select(selectedMetadataFieldsSelector));
   }
 
+  /**
+   * Create or Update a MetadataSchema
+   *  If the MetadataSchema contains an id, it is assumed the schema already exists and is updated instead
+   *  Since creating or updating is nearly identical, the only real difference is the request (and slight difference in endpoint):
+   *  - On creation, a CreateMetadataSchemaRequest is used
+   *  - On update, a UpdateMetadataSchemaRequest is used
+   * @param schema    The MetadataSchema to create or update
+   */
   public createOrUpdateMetadataSchema(schema: MetadataSchema): Observable<MetadataSchema> {
     const isUpdate = hasValue(schema.id);
     const requestId = this.requestService.generateRequestId();
@@ -377,6 +386,14 @@ export class RegistryService {
     )
   }
 
+  /**
+   * Create or Update a MetadataField
+   *  If the MetadataField contains an id, it is assumed the field already exists and is updated instead
+   *  Since creating or updating is nearly identical, the only real difference is the request (and slight difference in endpoint):
+   *  - On creation, a CreateMetadataFieldRequest is used
+   *  - On update, a UpdateMetadataFieldRequest is used
+   * @param field    The MetadataField to create or update
+   */
   public createOrUpdateMetadataField(field: MetadataField): Observable<MetadataField> {
     const isUpdate = hasValue(field.id);
     const requestId = this.requestService.generateRequestId();
@@ -394,9 +411,9 @@ export class RegistryService {
           let headers = new HttpHeaders();
           headers = headers.append('Content-Type', 'application/json');
           options.headers = headers;
-          return new UpdateMetadataSchemaRequest(requestId, endpoint, JSON.stringify(field), options);
+          return new UpdateMetadataFieldRequest(requestId, endpoint, JSON.stringify(field), options);
         } else {
-          return new CreateMetadataSchemaRequest(requestId, endpoint, JSON.stringify(field));
+          return new CreateMetadataFieldRequest(requestId, endpoint, JSON.stringify(field));
         }
       })
     );

From efc761e6b8d728f731cad9e91a83e6127f48e287 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 21 Feb 2019 16:11:53 +0100
Subject: [PATCH 44/44] Missing JDocs

---
 src/app/core/data/request.service.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/app/core/data/request.service.ts b/src/app/core/data/request.service.ts
index 0d66a8e45d..93a7a10506 100644
--- a/src/app/core/data/request.service.ts
+++ b/src/app/core/data/request.service.ts
@@ -66,6 +66,12 @@ export class RequestService {
     return createSelector(selector, (state: IndexState) => this.getUuidsFromHrefSubstring(state, name, href));
   }
 
+  /**
+   * Fetch a list of request UUIDs from a given index substate of which the request href contains a given substring
+   * @param state   The IndexState
+   * @param name    The name of the index substate we're fetching request UUIDs from
+   * @param href    Substring that the request's href should contain
+   */
   private getUuidsFromHrefSubstring(state: IndexState, name: string, href: string): string[] {
     let result = [];
     if (isNotEmpty(state)) {