From ca8c1830aa7e25350d3cd497c442bf04d8da5855 Mon Sep 17 00:00:00 2001
From: Lotte Hofstede <lotte_hofstede@hotmail.com>
Date: Thu, 17 May 2018 17:10:38 +0200
Subject: [PATCH 01/16] intermediate commit

---
 ...ty-page-sub-collection-list.component.html |   2 +-
 ...nity-page-sub-collection-list.component.ts |   3 +-
 .../collections/collections.component.html    |   2 +-
 .../collections/collections.component.ts      |   4 +
 .../builders/remote-data-build.service.ts     |  10 +-
 .../normalized-bitstream-format.model.ts      |  46 ++++++
 .../models/normalized-collection.model.ts     |   2 +-
 .../cache/models/normalized-item.model.ts     |   1 +
 .../cache/models/normalized-object-factory.ts |   8 +
 .../normalized-resource-policy.model.ts       |  34 ++++
 .../data/base-response-parsing.service.ts     | 120 +++++++-------
 .../config-response-parsing.service.spec.ts   |   5 +-
 .../data/config-response-parsing.service.ts   |   3 +-
 .../core/data/dso-response-parsing.service.ts |  12 +-
 src/app/core/shared/bitstream-format.model.ts |  17 +-
 src/app/core/shared/community.model.ts        |   3 +-
 .../config-submission-definitions.model.ts    |   3 +-
 src/app/core/shared/item.model.ts             |   5 +-
 src/app/core/shared/resource-policy.model.ts  |  20 +++
 src/app/core/shared/resource-type.ts          |   1 +
 src/app/shared/mocks/mock-item.ts             | 150 +++++++++---------
 21 files changed, 293 insertions(+), 158 deletions(-)
 create mode 100644 src/app/core/cache/models/normalized-bitstream-format.model.ts
 create mode 100644 src/app/core/cache/models/normalized-resource-policy.model.ts
 create mode 100644 src/app/core/shared/resource-policy.model.ts

diff --git a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html
index b04e93ff71..12c2578d9c 100644
--- a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html
+++ b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html
@@ -2,7 +2,7 @@
   <div *ngIf="subCollectionsRD?.hasSucceeded" @fadeIn>
     <h2>{{'community.sub-collection-list.head' | translate}}</h2>
     <ul>
-      <li *ngFor="let collection of subCollectionsRD?.payload">
+      <li *ngFor="let collection of subCollectionsRD?.payload.page">
         <p>
           <span class="lead"><a [routerLink]="['/collections', collection.id]">{{collection.name}}</a></span><br>
           <span class="text-muted">{{collection.shortDescription}}</span>
diff --git a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts
index fc69719896..aed2b69a30 100644
--- a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts
+++ b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts
@@ -6,6 +6,7 @@ import { Collection } from '../../core/shared/collection.model';
 import { Community } from '../../core/shared/community.model';
 
 import { fadeIn } from '../../shared/animations/fade';
+import { PaginatedList } from '../../core/data/paginated-list';
 
 @Component({
   selector: 'ds-community-page-sub-collection-list',
@@ -15,7 +16,7 @@ import { fadeIn } from '../../shared/animations/fade';
 })
 export class CommunityPageSubCollectionListComponent implements OnInit {
   @Input() community: Community;
-  subCollectionsRDObs: Observable<RemoteData<Collection[]>>;
+  subCollectionsRDObs: Observable<RemoteData<PaginatedList<Collection>>>;
 
   ngOnInit(): void {
     this.subCollectionsRDObs = this.community.collections;
diff --git a/src/app/+item-page/field-components/collections/collections.component.html b/src/app/+item-page/field-components/collections/collections.component.html
index bb7ab63341..6e5f9a350c 100644
--- a/src/app/+item-page/field-components/collections/collections.component.html
+++ b/src/app/+item-page/field-components/collections/collections.component.html
@@ -1,4 +1,4 @@
-<ds-metadata-field-wrapper [label]="label | translate">
+<ds-metadata-field-wrapper *ngIf="hasSucceeded() | async" [label]="label | translate">
     <div class="collections">
         <a *ngFor="let collection of (collections | async); let last=last;" [routerLink]="['/collections', collection.id]">
             <span>{{collection?.name}}</span><span *ngIf="!last" [innerHTML]="separator"></span>
diff --git a/src/app/+item-page/field-components/collections/collections.component.ts b/src/app/+item-page/field-components/collections/collections.component.ts
index 8b7b5d7f58..f3cef1ff0d 100644
--- a/src/app/+item-page/field-components/collections/collections.component.ts
+++ b/src/app/+item-page/field-components/collections/collections.component.ts
@@ -38,4 +38,8 @@ export class CollectionsComponent implements OnInit {
     this.collections = this.item.owner.map((rd: RemoteData<Collection>) => [rd.payload]);
   }
 
+  hasSucceeded() {
+    this.item.owner.map((rd: RemoteData<Collection>) => rd.hasSucceeded)
+  }
+
 }
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 ece80cf4ca..4c29a14675 100644
--- a/src/app/core/cache/builders/remote-data-build.service.ts
+++ b/src/app/core/cache/builders/remote-data-build.service.ts
@@ -85,6 +85,7 @@ export class RemoteDataBuildService {
   }
 
   toRemoteDataObservable<T>(requestEntryObs: Observable<RequestEntry>, responseCacheObs: Observable<ResponseCacheEntry>, payloadObs: Observable<T>) {
+
     return Observable.combineLatest(requestEntryObs, responseCacheObs.startWith(undefined), payloadObs,
       (reqEntry: RequestEntry, resEntry: ResponseCacheEntry, payload: T) => {
         const requestPending = hasValue(reqEntry.requestPending) ? reqEntry.requestPending : true;
@@ -98,7 +99,6 @@ export class RemoteDataBuildService {
             error = new RemoteDataError(resEntry.response.statusCode, errorMessage);
           }
         }
-
         return new RemoteData(
           requestPending,
           responsePending,
@@ -109,7 +109,7 @@ export class RemoteDataBuildService {
       });
   }
 
-  buildList<TNormalized extends NormalizedObject, TDomain>(hrefObs: string | Observable<string>): Observable<RemoteData<TDomain[] | PaginatedList<TDomain>>> {
+  buildList<TNormalized extends NormalizedObject, TDomain>(hrefObs: string | Observable<string>): Observable<RemoteData<PaginatedList<TDomain>>> {
     if (typeof hrefObs === 'string') {
       hrefObs = Observable.of(hrefObs);
     }
@@ -147,11 +147,7 @@ export class RemoteDataBuildService {
       });
 
     const payloadObs = Observable.combineLatest(tDomainListObs, pageInfoObs, (tDomainList, pageInfo) => {
-      if (hasValue(pageInfo)) {
-        return new PaginatedList(pageInfo, tDomainList);
-      } else {
-        return tDomainList;
-      }
+      return new PaginatedList(pageInfo, tDomainList);
     });
 
     return this.toRemoteDataObservable(requestEntryObs, responseCacheObs, payloadObs);
diff --git a/src/app/core/cache/models/normalized-bitstream-format.model.ts b/src/app/core/cache/models/normalized-bitstream-format.model.ts
new file mode 100644
index 0000000000..8126c6f850
--- /dev/null
+++ b/src/app/core/cache/models/normalized-bitstream-format.model.ts
@@ -0,0 +1,46 @@
+import { autoserialize, autoserializeAs, inheritSerialization } from 'cerialize';
+
+import { mapsTo } from '../builders/build-decorators';
+import { BitstreamFormat } from '../../shared/bitstream-format.model';
+import { NormalizedObject } from './normalized-object.model';
+import { NormalizedDSpaceObject } from './normalized-dspace-object.model';
+
+// While BitstreamFormats don't have a UUID, but need to be cachable: use this serializer. Remove it when the REST API returns them with UUID
+const BitstreamFormatUUIDSerializer = {
+  Serialize(json: any): any {
+    // No need to serialize again, de ID is already serialized by the id field itself
+    return {};
+  },
+  Deserialize(json: any): any {
+    return 'bitstream-format-' + json.id;
+  }
+};
+
+@mapsTo(BitstreamFormat)
+@inheritSerialization(NormalizedObject)
+export class NormalizedBitstreamFormat extends NormalizedObject {
+
+  @autoserialize
+  shortDescription: string;
+
+  @autoserialize
+  description: string;
+
+  @autoserialize
+  mimetype: string;
+
+  @autoserialize
+  supportLevel: number;
+
+  @autoserialize
+  internal: boolean;
+
+  @autoserialize
+  extensions: string;
+
+  @autoserialize
+  id: string;
+
+  @autoserializeAs(BitstreamFormatUUIDSerializer)
+  uuid: string;
+}
diff --git a/src/app/core/cache/models/normalized-collection.model.ts b/src/app/core/cache/models/normalized-collection.model.ts
index 22e0d20eaa..add0795ec5 100644
--- a/src/app/core/cache/models/normalized-collection.model.ts
+++ b/src/app/core/cache/models/normalized-collection.model.ts
@@ -1,4 +1,4 @@
-import { autoserialize, inheritSerialization, autoserializeAs } from 'cerialize';
+import { autoserialize, inheritSerialization } from 'cerialize';
 
 import { NormalizedDSpaceObject } from './normalized-dspace-object.model';
 import { Collection } from '../../shared/collection.model';
diff --git a/src/app/core/cache/models/normalized-item.model.ts b/src/app/core/cache/models/normalized-item.model.ts
index a4a14e424c..d6e9165471 100644
--- a/src/app/core/cache/models/normalized-item.model.ts
+++ b/src/app/core/cache/models/normalized-item.model.ts
@@ -49,6 +49,7 @@ export class NormalizedItem extends NormalizedDSpaceObject {
   /**
    * The Collection that owns this Item
    */
+  @autoserialize
   @relationship(ResourceType.Collection, false)
   owningCollection: string;
 
diff --git a/src/app/core/cache/models/normalized-object-factory.ts b/src/app/core/cache/models/normalized-object-factory.ts
index 5b13d55ac8..df67a1f2ce 100644
--- a/src/app/core/cache/models/normalized-object-factory.ts
+++ b/src/app/core/cache/models/normalized-object-factory.ts
@@ -6,6 +6,8 @@ import { GenericConstructor } from '../../shared/generic-constructor';
 import { NormalizedCommunity } from './normalized-community.model';
 import { ResourceType } from '../../shared/resource-type';
 import { NormalizedObject } from './normalized-object.model';
+import { NormalizedBitstreamFormat } from './normalized-bitstream-format.model';
+import { NormalizedResourcePolicy } from './normalized-resource-policy.model';
 
 export class NormalizedObjectFactory {
   public static getConstructor(type: ResourceType): GenericConstructor<NormalizedObject> {
@@ -25,6 +27,12 @@ export class NormalizedObjectFactory {
       case ResourceType.Community: {
         return NormalizedCommunity
       }
+      case ResourceType.BitstreamFormat: {
+        return NormalizedBitstreamFormat
+      }
+      case ResourceType.ResourcePolicy: {
+        return NormalizedResourcePolicy
+      }
       default: {
         return undefined;
       }
diff --git a/src/app/core/cache/models/normalized-resource-policy.model.ts b/src/app/core/cache/models/normalized-resource-policy.model.ts
new file mode 100644
index 0000000000..253019fc23
--- /dev/null
+++ b/src/app/core/cache/models/normalized-resource-policy.model.ts
@@ -0,0 +1,34 @@
+import { autoserialize, autoserializeAs, inheritSerialization } from 'cerialize';
+
+import { mapsTo } from '../builders/build-decorators';
+import { BitstreamFormat } from '../../shared/bitstream-format.model';
+import { NormalizedObject } from './normalized-object.model';
+import { ResourcePolicy } from '../../shared/resource-policy.model';
+
+// While ResourcePolicyUUIDSerializer don't have a UUID, but need to be cachable: use this serializer. Remove it when the REST API returns them with UUID
+const ResourcePolicyUUIDSerializer = {
+  Serialize(json: any): any {
+    // No need to serialize again, de ID is already serialized by the id field itself
+    return {};
+  },
+  Deserialize(json: any): any {
+    return 'resource-policy-' + json.id;
+  }
+};
+
+@mapsTo(ResourcePolicy)
+@inheritSerialization(NormalizedObject)
+export class NormalizedResourcePolicy extends NormalizedObject {
+
+  @autoserialize
+  name: string;
+
+  @autoserializeAs(String, 'groupUUID')
+  group: string;
+
+  @autoserialize
+  id: string;
+
+  @autoserializeAs(ResourcePolicyUUIDSerializer)
+  uuid: string;
+}
diff --git a/src/app/core/data/base-response-parsing.service.ts b/src/app/core/data/base-response-parsing.service.ts
index bde0857946..b683a1dff0 100644
--- a/src/app/core/data/base-response-parsing.service.ts
+++ b/src/app/core/data/base-response-parsing.service.ts
@@ -4,8 +4,9 @@ import { CacheableObject } from '../cache/object-cache.reducer';
 import { PageInfo } from '../shared/page-info.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { GlobalConfig } from '../../../config/global-config.interface';
-import { NormalizedObject } from '../cache/models/normalized-object.model';
 import { GenericConstructor } from '../shared/generic-constructor';
+import { PaginatedList } from './paginated-list';
+import { NormalizedObject } from '../cache/models/normalized-object.model';
 
 function isObjectLevel(halObj: any) {
   return isNotEmpty(halObj._links) && hasValue(halObj._links.self);
@@ -17,96 +18,93 @@ function isPaginatedResponse(halObj: any) {
 
 /* tslint:disable:max-classes-per-file */
 
-class ProcessRequestDTO<ObjectDomain> {
-  [key: string]: ObjectDomain[]
-}
-
 export abstract class BaseResponseParsingService {
   protected abstract EnvConfig: GlobalConfig;
   protected abstract objectCache: ObjectCacheService;
   protected abstract objectFactory: any;
   protected abstract toCache: boolean;
 
-  protected process<ObjectDomain,ObjectType>(data: any, requestHref: string): ProcessRequestDTO<ObjectDomain> {
+  protected process<ObjectDomain, ObjectType>(data: any, requestHref: string): any {
 
     if (isNotEmpty(data)) {
-      if (isPaginatedResponse(data)) {
-        return this.process(data._embedded, requestHref);
+      if (hasNoValue(data) || (typeof data !== 'object')) {
+        return data;
+      } else if (isPaginatedResponse(data)) {
+        return this.processPaginatedList(data, requestHref);
+      } else if (Array.isArray(data)) {
+        return this.processArray(data, requestHref);
       } else if (isObjectLevel(data)) {
-        return { topLevel: this.deserializeAndCache(data, requestHref) };
-      } else {
-        const result = new ProcessRequestDTO<ObjectDomain>();
-        if (Array.isArray(data)) {
-          result.topLevel = [];
-          data.forEach((datum) => {
-            if (isPaginatedResponse(datum)) {
-              const obj = this.process(datum, requestHref);
-              result.topLevel = [...result.topLevel, ...this.flattenSingleKeyObject(obj)];
-            } else {
-              result.topLevel = [...result.topLevel, ...this.deserializeAndCache<ObjectDomain,ObjectType>(datum, requestHref)];
-            }
-          });
-        } else {
-          Object.keys(data)
-            .filter((property) => data.hasOwnProperty(property))
-            .filter((property) => hasValue(data[property]))
+        const object = this.deserialize(data, requestHref);
+        this.cache(object, requestHref);
+        if (isNotEmpty(data._embedded)) {
+          const list = {};
+          Object
+            .keys(data._embedded)
+            .filter((property) => data._embedded.hasOwnProperty(property))
             .forEach((property) => {
-              if (isPaginatedResponse(data[property])) {
-                const obj = this.process(data[property], requestHref);
-                result[property] = this.flattenSingleKeyObject(obj);
-              } else {
-                result[property] = this.deserializeAndCache(data[property], requestHref);
-              }
+              console.log(data._embedded[property]);
+              const parsedObj = this.process<ObjectDomain, ObjectType>(data._embedded[property], requestHref);
+              list[property] = parsedObj;
             });
+          console.log(list);
+          Object.assign(object, list);
         }
-        return result;
+        return object;
       }
+      const result = {};
+      Object.keys(data)
+        .filter((property) => data.hasOwnProperty(property))
+        .filter((property) => hasValue(data[property]))
+        .forEach((property) => {
+          const obj = this.process(data[property], requestHref);
+          result[property] = obj;
+        });
+      return result;
+
     }
   }
 
-  protected deserializeAndCache<ObjectDomain,ObjectType>(obj, requestHref: string): ObjectDomain[] {
-    if (Array.isArray(obj)) {
-      let result = [];
-      obj.forEach((o) => result = [...result, ...this.deserializeAndCache<ObjectDomain,ObjectType>(o, requestHref)]);
-      return result;
-    }
+  protected processPaginatedList<ObjectDomain, ObjectType>(data: any, requestHref: string): PaginatedList<ObjectDomain> {
+    const pageInfo: PageInfo = this.processPageInfo(data);
+    const list = this.flattenSingleKeyObject(data._embedded);
+    const page: ObjectDomain[] = this.processArray(list, requestHref);
+    return new PaginatedList<ObjectDomain>(pageInfo, page);
+  }
 
+  protected processArray<ObjectDomain, ObjectType>(data: any, requestHref: string): ObjectDomain[] {
+    let array: ObjectDomain[] = [];
+    data.forEach((datum) => {
+        array = [...array, this.process(datum, requestHref)];
+      }
+    );
+    return array;
+  }
+
+  protected deserialize<ObjectDomain, ObjectType>(obj, requestHref) {
     const type: ObjectType = obj.type;
     if (hasValue(type)) {
       const normObjConstructor = this.objectFactory.getConstructor(type) as GenericConstructor<ObjectDomain>;
 
       if (hasValue(normObjConstructor)) {
         const serializer = new DSpaceRESTv2Serializer(normObjConstructor);
-
-        let processed;
-        if (isNotEmpty(obj._embedded)) {
-          processed = this.process<ObjectDomain,ObjectType>(obj._embedded, requestHref);
-        }
-        const normalizedObj: any = serializer.deserialize(obj);
-
-        if (isNotEmpty(processed)) {
-          const processedList = {};
-          Object.keys(processed).forEach((key) => {
-            processedList[key] = processed[key].map((no: NormalizedObject) => (this.toCache) ? no.self : no);
-          });
-          Object.assign(normalizedObj, processedList);
-        }
-
-        if (this.toCache) {
-          this.addToObjectCache(normalizedObj, requestHref);
-        }
-        return [normalizedObj] as any;
-
+        const res = serializer.deserialize(obj);
+        return res;
       } else {
         // TODO: move check to Validator?
         // throw new Error(`The server returned an object with an unknown a known type: ${type}`);
-        return [];
+        return null;
       }
 
     } else {
       // TODO: move check to Validator
       // throw new Error(`The server returned an object without a type: ${JSON.stringify(obj)}`);
-      return [];
+      return null;
+    }
+  }
+
+  protected cache<ObjectDomain, ObjectType>(obj, requestHref) {
+    if (this.toCache) {
+      this.addToObjectCache(obj, requestHref);
     }
   }
 
@@ -119,7 +117,7 @@ export abstract class BaseResponseParsingService {
 
   processPageInfo(payload: any): PageInfo {
     if (isNotEmpty(payload.page)) {
-      const pageObj = Object.assign({}, payload.page, {_links: payload._links});
+      const pageObj = Object.assign({}, payload.page, { _links: payload._links });
       const pageInfoObject = new DSpaceRESTv2Serializer(PageInfo).deserialize(pageObj);
       if (pageInfoObject.currentPage >= 0) {
         Object.assign(pageInfoObject, { currentPage: pageInfoObject.currentPage + 1 });
diff --git a/src/app/core/data/config-response-parsing.service.spec.ts b/src/app/core/data/config-response-parsing.service.spec.ts
index 3a09de6e4c..9be31024c1 100644
--- a/src/app/core/data/config-response-parsing.service.spec.ts
+++ b/src/app/core/data/config-response-parsing.service.spec.ts
@@ -232,8 +232,11 @@ describe('ConfigResponseParsingService', () => {
       expect(response.constructor).toBe(ErrorResponse);
     });
 
-    it('should return a ConfigSuccessResponse with the ConfigDefinitions in data', () => {
+    fit('should return a ConfigSuccessResponse with the ConfigDefinitions in data', () => {
       const response = service.parse(validRequest, validResponse);
+      debugger;
+      console.log(definitions);
+      console.log((response as any).configDefinition);
       expect((response as any).configDefinition).toEqual(definitions);
     });
 
diff --git a/src/app/core/data/config-response-parsing.service.ts b/src/app/core/data/config-response-parsing.service.ts
index 033c9ddc68..320d931c29 100644
--- a/src/app/core/data/config-response-parsing.service.ts
+++ b/src/app/core/data/config-response-parsing.service.ts
@@ -27,9 +27,10 @@ export class ConfigResponseParsingService extends BaseResponseParsingService imp
   }
 
   parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
+    console.log(data);
     if (isNotEmpty(data.payload) && isNotEmpty(data.payload._links) && data.statusCode === '200') {
       const configDefinition = this.process<ConfigObject,ConfigType>(data.payload, request.href);
-      return new ConfigSuccessResponse(configDefinition[Object.keys(configDefinition)[0]], data.statusCode, this.processPageInfo(data.payload));
+      return new ConfigSuccessResponse(configDefinition, data.statusCode, this.processPageInfo(data.payload));
     } else {
       return new ErrorResponse(
         Object.assign(
diff --git a/src/app/core/data/dso-response-parsing.service.ts b/src/app/core/data/dso-response-parsing.service.ts
index 9651eb3157..cadec2e918 100644
--- a/src/app/core/data/dso-response-parsing.service.ts
+++ b/src/app/core/data/dso-response-parsing.service.ts
@@ -12,6 +12,7 @@ import { RestRequest } from './request.models';
 
 import { ResponseParsingService } from './parsing.service';
 import { BaseResponseParsingService } from './base-response-parsing.service';
+import { hasNoValue, hasValue } from '../../shared/empty.util';
 
 @Injectable()
 export class DSOResponseParsingService extends BaseResponseParsingService implements ResponseParsingService {
@@ -27,7 +28,16 @@ export class DSOResponseParsingService extends BaseResponseParsingService implem
 
   parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
     const processRequestDTO = this.process<NormalizedObject,ResourceType>(data.payload, request.href);
-    const selfLinks = this.flattenSingleKeyObject(processRequestDTO).map((no) => no.self);
+    let objectList = processRequestDTO;
+    if (hasNoValue(processRequestDTO)) {
+      return new DSOSuccessResponse(undefined, data.statusCode, undefined)
+    }
+    if (hasValue(processRequestDTO.page)) {
+      objectList = processRequestDTO.page;
+    } else if (!Array.isArray(processRequestDTO)) {
+      objectList = [processRequestDTO];
+    }
+    const selfLinks = objectList.map((no) => no.self);
     return new DSOSuccessResponse(selfLinks, data.statusCode, this.processPageInfo(data.payload))
   }
 
diff --git a/src/app/core/shared/bitstream-format.model.ts b/src/app/core/shared/bitstream-format.model.ts
index b85d9e2053..0089abce4a 100644
--- a/src/app/core/shared/bitstream-format.model.ts
+++ b/src/app/core/shared/bitstream-format.model.ts
@@ -1,24 +1,25 @@
 
-import { autoserialize } from 'cerialize';
+import { CacheableObject } from '../cache/object-cache.reducer';
+import { ResourceType } from './resource-type';
 
-export class BitstreamFormat {
+export class BitstreamFormat implements CacheableObject {
 
-  @autoserialize
   shortDescription: string;
 
-  @autoserialize
   description: string;
 
-  @autoserialize
   mimetype: string;
 
-  @autoserialize
   supportLevel: number;
 
-  @autoserialize
   internal: boolean;
 
-  @autoserialize
   extensions: string;
 
+  self: string;
+
+  type: ResourceType;
+
+  uuid: string;
+
 }
diff --git a/src/app/core/shared/community.model.ts b/src/app/core/shared/community.model.ts
index c34666b0f0..8fd55d312f 100644
--- a/src/app/core/shared/community.model.ts
+++ b/src/app/core/shared/community.model.ts
@@ -3,6 +3,7 @@ import { Bitstream } from './bitstream.model';
 import { Collection } from './collection.model';
 import { RemoteData } from '../data/remote-data';
 import { Observable } from 'rxjs/Observable';
+import { PaginatedList } from '../data/paginated-list';
 
 export class Community extends DSpaceObject {
 
@@ -58,6 +59,6 @@ export class Community extends DSpaceObject {
    */
   owner: Observable<RemoteData<Community>>;
 
-  collections: Observable<RemoteData<Collection[]>>;
+  collections: Observable<RemoteData<PaginatedList<Collection>>>;
 
 }
diff --git a/src/app/core/shared/config/config-submission-definitions.model.ts b/src/app/core/shared/config/config-submission-definitions.model.ts
index 8249d2b118..0247f13944 100644
--- a/src/app/core/shared/config/config-submission-definitions.model.ts
+++ b/src/app/core/shared/config/config-submission-definitions.model.ts
@@ -1,6 +1,7 @@
 import { autoserialize, autoserializeAs, inheritSerialization } from 'cerialize';
 import { ConfigObject } from './config.model';
 import { SubmissionSectionModel } from './config-submission-section.model';
+import { PaginatedList } from '../../data/paginated-list';
 
 @inheritSerialization(ConfigObject)
 export class SubmissionDefinitionsModel extends ConfigObject {
@@ -9,6 +10,6 @@ export class SubmissionDefinitionsModel extends ConfigObject {
   isDefault: boolean;
 
   @autoserializeAs(SubmissionSectionModel)
-  sections: SubmissionSectionModel[];
+  sections: PaginatedList<SubmissionSectionModel>;
 
 }
diff --git a/src/app/core/shared/item.model.ts b/src/app/core/shared/item.model.ts
index dd60ad9b01..cc84694e84 100644
--- a/src/app/core/shared/item.model.ts
+++ b/src/app/core/shared/item.model.ts
@@ -5,6 +5,7 @@ import { Collection } from './collection.model';
 import { RemoteData } from '../data/remote-data';
 import { Bitstream } from './bitstream.model';
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
+import { PaginatedList } from '../data/paginated-list';
 
 export class Item extends DSpaceObject {
 
@@ -47,7 +48,7 @@ export class Item extends DSpaceObject {
     return this.owningCollection;
   }
 
-  bitstreams: Observable<RemoteData<Bitstream[]>>;
+  bitstreams: Observable<RemoteData<PaginatedList<Bitstream>>>;
 
   /**
    * Retrieves the thumbnail of this item
@@ -88,7 +89,7 @@ export class Item extends DSpaceObject {
    */
   getBitstreamsByBundleName(bundleName: string): Observable<Bitstream[]> {
     return this.bitstreams
-      .map((rd: RemoteData<Bitstream[]>) => rd.payload)
+      .map((rd: RemoteData<PaginatedList<Bitstream>>) => rd.payload.page)
       .filter((bitstreams: Bitstream[]) => hasValue(bitstreams))
       .startWith([])
       .map((bitstreams) => {
diff --git a/src/app/core/shared/resource-policy.model.ts b/src/app/core/shared/resource-policy.model.ts
new file mode 100644
index 0000000000..3bca324a47
--- /dev/null
+++ b/src/app/core/shared/resource-policy.model.ts
@@ -0,0 +1,20 @@
+
+import { CacheableObject } from '../cache/object-cache.reducer';
+import { ResourceType } from './resource-type';
+
+export class ResourcePolicy implements CacheableObject {
+
+  action: string;
+
+  name: string;
+
+  // TODO group should ofcourse become a group object
+  group: string;
+
+  self: string;
+
+  type: ResourceType;
+
+  uuid: string;
+
+}
diff --git a/src/app/core/shared/resource-type.ts b/src/app/core/shared/resource-type.ts
index 1b73cb0bba..c7e41c5744 100644
--- a/src/app/core/shared/resource-type.ts
+++ b/src/app/core/shared/resource-type.ts
@@ -6,4 +6,5 @@ export enum ResourceType {
   Item = 'item',
   Collection = 'collection',
   Community = 'community',
+  ResourcePolicy = 'resourcePolicy'
 }
diff --git a/src/app/shared/mocks/mock-item.ts b/src/app/shared/mocks/mock-item.ts
index 81c1fcf26c..f6dd0be861 100644
--- a/src/app/shared/mocks/mock-item.ts
+++ b/src/app/shared/mocks/mock-item.ts
@@ -17,78 +17,86 @@ export const MockItem: Item = Object.assign(new Item(), {
     errorMessage: '',
     statusCode: '202',
     pageInfo: {},
-    payload: [
-      {
-        sizeBytes: 10201,
-        content: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713/content',
-        format: Observable.of({
-          self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/10',
-          requestPending: false,
-          responsePending: false,
-          isSuccessful: true,
-          errorMessage: '',
-          statusCode: '202',
-          pageInfo: {},
-          payload: {
-            shortDescription: 'Microsoft Word XML',
-            description: 'Microsoft Word XML',
-            mimetype: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-            supportLevel: 0,
-            internal: false,
-            extensions: null,
-            self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/10'
-          }
-        }),
-        bundleName: 'ORIGINAL',
-        self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713',
-        id: 'cf9b0c8e-a1eb-4b65-afd0-567366448713',
-        uuid: 'cf9b0c8e-a1eb-4b65-afd0-567366448713',
-        type: 'bitstream',
-        name: 'test_word.docx',
-        metadata: [
-          {
-            key: 'dc.title',
-            language: null,
-            value: 'test_word.docx'
-          }
-        ]
+    payload: {
+      pageInfo: {
+        elementsPerPage: 20,
+        totalElements: 3,
+        totalPages: 1,
+        currentPage: 2
       },
-      {
-        sizeBytes: 31302,
-        content: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28/content',
-        format: Observable.of({
-          self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/4',
-          requestPending: false,
-          responsePending: false,
-          isSuccessful: true,
-          errorMessage: '',
-          statusCode: '202',
-          pageInfo: {},
-          payload: {
-            shortDescription: 'Adobe PDF',
-            description: 'Adobe Portable Document Format',
-            mimetype: 'application/pdf',
-            supportLevel: 0,
-            internal: false,
-            extensions: null,
-            self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/4'
-          }
-        }),
-        bundleName: 'ORIGINAL',
-        self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28',
-        id: '99b00f3c-1cc6-4689-8158-91965bee6b28',
-        uuid: '99b00f3c-1cc6-4689-8158-91965bee6b28',
-        type: 'bitstream',
-        name: 'test_pdf.pdf',
-        metadata: [
-          {
-            key: 'dc.title',
-            language: null,
-            value: 'test_pdf.pdf'
-          }
-        ]
-      }
-    ]
+      page: [
+        {
+          sizeBytes: 10201,
+          content: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713/content',
+          format: Observable.of({
+            self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/10',
+            requestPending: false,
+            responsePending: false,
+            isSuccessful: true,
+            errorMessage: '',
+            statusCode: '202',
+            pageInfo: {},
+            payload: {
+              shortDescription: 'Microsoft Word XML',
+              description: 'Microsoft Word XML',
+              mimetype: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+              supportLevel: 0,
+              internal: false,
+              extensions: null,
+              self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/10'
+            }
+          }),
+          bundleName: 'ORIGINAL',
+          self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713',
+          id: 'cf9b0c8e-a1eb-4b65-afd0-567366448713',
+          uuid: 'cf9b0c8e-a1eb-4b65-afd0-567366448713',
+          type: 'bitstream',
+          name: 'test_word.docx',
+          metadata: [
+            {
+              key: 'dc.title',
+              language: null,
+              value: 'test_word.docx'
+            }
+          ]
+        },
+        {
+          sizeBytes: 31302,
+          content: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28/content',
+          format: Observable.of({
+            self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/4',
+            requestPending: false,
+            responsePending: false,
+            isSuccessful: true,
+            errorMessage: '',
+            statusCode: '202',
+            pageInfo: {},
+            payload: {
+              shortDescription: 'Adobe PDF',
+              description: 'Adobe Portable Document Format',
+              mimetype: 'application/pdf',
+              supportLevel: 0,
+              internal: false,
+              extensions: null,
+              self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/4'
+            }
+          }),
+          bundleName: 'ORIGINAL',
+          self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28',
+          id: '99b00f3c-1cc6-4689-8158-91965bee6b28',
+          uuid: '99b00f3c-1cc6-4689-8158-91965bee6b28',
+          type: 'bitstream',
+          name: 'test_pdf.pdf',
+          metadata: [
+            {
+              key: 'dc.title',
+              language: null,
+              value: 'test_pdf.pdf'
+            }
+          ]
+        }
+      ]
+    }
   }),
   self: 'https://dspace7.4science.it/dspace-spring-rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
   id: '0ec7ff22-f211-40ab-a69e-c819b0b1f357',

From 2a8de6dc491b728e30997d3fb32204676f2e2c21 Mon Sep 17 00:00:00 2001
From: Lotte Hofstede <lotte_hofstede@hotmail.com>
Date: Fri, 18 May 2018 16:34:04 +0200
Subject: [PATCH 02/16] another intermediate commit

---
 .../collections/collections.component.ts            |  2 +-
 src/app/core/data/base-response-parsing.service.ts  | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/app/+item-page/field-components/collections/collections.component.ts b/src/app/+item-page/field-components/collections/collections.component.ts
index f3cef1ff0d..83bb0d464d 100644
--- a/src/app/+item-page/field-components/collections/collections.component.ts
+++ b/src/app/+item-page/field-components/collections/collections.component.ts
@@ -39,7 +39,7 @@ export class CollectionsComponent implements OnInit {
   }
 
   hasSucceeded() {
-    this.item.owner.map((rd: RemoteData<Collection>) => rd.hasSucceeded)
+    return this.item.owner.map((rd: RemoteData<Collection>) => rd.hasSucceeded);
   }
 
 }
diff --git a/src/app/core/data/base-response-parsing.service.ts b/src/app/core/data/base-response-parsing.service.ts
index b683a1dff0..018f9f5adb 100644
--- a/src/app/core/data/base-response-parsing.service.ts
+++ b/src/app/core/data/base-response-parsing.service.ts
@@ -34,7 +34,7 @@ export abstract class BaseResponseParsingService {
       } else if (Array.isArray(data)) {
         return this.processArray(data, requestHref);
       } else if (isObjectLevel(data)) {
-        const object = this.deserialize(data, requestHref);
+        let object = this.deserialize(data, requestHref);
         this.cache(object, requestHref);
         if (isNotEmpty(data._embedded)) {
           const list = {};
@@ -42,12 +42,10 @@ export abstract class BaseResponseParsingService {
             .keys(data._embedded)
             .filter((property) => data._embedded.hasOwnProperty(property))
             .forEach((property) => {
-              console.log(data._embedded[property]);
               const parsedObj = this.process<ObjectDomain, ObjectType>(data._embedded[property], requestHref);
               list[property] = parsedObj;
             });
-          console.log(list);
-          Object.assign(object, list);
+          object = Object.assign({}, object, list);
         }
         return object;
       }
@@ -66,7 +64,12 @@ export abstract class BaseResponseParsingService {
 
   protected processPaginatedList<ObjectDomain, ObjectType>(data: any, requestHref: string): PaginatedList<ObjectDomain> {
     const pageInfo: PageInfo = this.processPageInfo(data);
-    const list = this.flattenSingleKeyObject(data._embedded);
+    let list = data._embedded;
+
+    // Workaround for inconsistancy in rest response - sometimes page embeds are wrapped in another object
+    if (!Array.isArray(list)) {
+      list = this.flattenSingleKeyObject(list);
+    }
     const page: ObjectDomain[] = this.processArray(list, requestHref);
     return new PaginatedList<ObjectDomain>(pageInfo, page);
   }

From 0bcc8ee0072591b3e5c5fda0a58f11f4543c3562 Mon Sep 17 00:00:00 2001
From: Lotte Hofstede <lotte_hofstede@hotmail.com>
Date: Fri, 25 May 2018 12:48:00 +0200
Subject: [PATCH 03/16] finished embedded object fixes

---
 .../paginated-search-options.model.ts         |   1 -
 .../builders/remote-data-build.service.ts     |  38 ++-
 .../core/cache/response-cache.service.spec.ts |   1 -
 .../data/base-response-parsing.service.ts     |  19 +-
 .../config-response-parsing.service.spec.ts   | 310 ++++++++----------
 .../data/config-response-parsing.service.ts   |   1 -
 6 files changed, 172 insertions(+), 198 deletions(-)

diff --git a/src/app/+search-page/paginated-search-options.model.ts b/src/app/+search-page/paginated-search-options.model.ts
index 0c403af827..4f04480391 100644
--- a/src/app/+search-page/paginated-search-options.model.ts
+++ b/src/app/+search-page/paginated-search-options.model.ts
@@ -1,7 +1,6 @@
 import { SortOptions } from '../core/cache/models/sort-options.model';
 import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
 import { isNotEmpty } from '../shared/empty.util';
-import { URLCombiner } from '../core/url-combiner/url-combiner';
 import { SearchOptions } from './search-options.model';
 
 export class PaginatedSearchOptions extends SearchOptions {
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 4c29a14675..a9f5223014 100644
--- a/src/app/core/cache/builders/remote-data-build.service.ts
+++ b/src/app/core/cache/builders/remote-data-build.service.ts
@@ -8,21 +8,17 @@ import { hasValue, isEmpty, isNotEmpty } from '../../../shared/empty.util';
 import { PaginatedList } from '../../data/paginated-list';
 import { RemoteData } from '../../data/remote-data';
 import { RemoteDataError } from '../../data/remote-data-error';
-import { GetRequest, RestRequest } from '../../data/request.models';
+import { GetRequest } from '../../data/request.models';
 import { RequestEntry } from '../../data/request.reducer';
 import { RequestService } from '../../data/request.service';
-import { DSpaceObject } from '../../shared/dspace-object.model';
-import { GenericConstructor } from '../../shared/generic-constructor';
-import { NormalizedDSpaceObject } from '../models/normalized-dspace-object.model';
-import { NormalizedObjectFactory } from '../models/normalized-object-factory';
 
-import { CacheableObject } from '../object-cache.reducer';
 import { ObjectCacheService } from '../object-cache.service';
-import { DSOSuccessResponse, ErrorResponse, SearchSuccessResponse } from '../response-cache.models';
+import { DSOSuccessResponse, ErrorResponse } from '../response-cache.models';
 import { ResponseCacheEntry } from '../response-cache.reducer';
 import { ResponseCacheService } from '../response-cache.service';
 import { getMapsTo, getRelationMetadata, getRelationships } from './build-decorators';
 import { NormalizedObject } from '../models/normalized-object.model';
+import { PageInfo } from '../../shared/page-info.model';
 
 @Injectable()
 export class RemoteDataBuildService {
@@ -159,35 +155,43 @@ export class RemoteDataBuildService {
     const relationships = getRelationships(normalized.constructor) || [];
 
     relationships.forEach((relationship: string) => {
+      let result;
       if (hasValue(normalized[relationship])) {
         const { resourceType, isList } = getRelationMetadata(normalized, relationship);
-        if (Array.isArray(normalized[relationship])) {
-          normalized[relationship].forEach((href: string) => {
+        const objectList = normalized[relationship].page || normalized[relationship];
+        if (typeof objectList !== 'string') {
+          objectList.forEach((href: string) => {
             this.requestService.configure(new GetRequest(this.requestService.generateRequestId(), href))
           });
 
           const rdArr = [];
-          normalized[relationship].forEach((href: string) => {
+          objectList.forEach((href: string) => {
             rdArr.push(this.buildSingle(href));
           });
 
           if (isList) {
-            links[relationship] = this.aggregate(rdArr);
+            result = this.aggregate(rdArr);
           } else if (rdArr.length === 1) {
-            links[relationship] = rdArr[0];
+            result = rdArr[0];
           }
         } else {
-          this.requestService.configure(new GetRequest(this.requestService.generateRequestId(), normalized[relationship]));
+          this.requestService.configure(new GetRequest(this.requestService.generateRequestId(), objectList));
 
           // The rest API can return a single URL to represent a list of resources (e.g. /items/:id/bitstreams)
           // in that case only 1 href will be stored in the normalized obj (so the isArray above fails),
           // but it should still be built as a list
           if (isList) {
-            links[relationship] = this.buildList(normalized[relationship]);
+            result = this.buildList(objectList);
           } else {
-            links[relationship] = this.buildSingle(normalized[relationship]);
+            result = this.buildSingle(objectList);
           }
         }
+
+        if (hasValue(normalized[relationship].page)) {
+          links[relationship] = this.aggregatePaginatedList(result, normalized[relationship].pageInfo);
+        } else {
+          links[relationship] = result;
+        }
       }
     });
 
@@ -248,4 +252,8 @@ export class RemoteDataBuildService {
       })
   }
 
+  aggregatePaginatedList<T>(input: Observable<RemoteData<T[]>>, pageInfo: PageInfo): Observable<RemoteData<PaginatedList<T>>> {
+    return input.map((rd) => Object.assign(rd, {payload: new PaginatedList(pageInfo, rd.payload)}));
+  }
+
 }
diff --git a/src/app/core/cache/response-cache.service.spec.ts b/src/app/core/cache/response-cache.service.spec.ts
index 1def7faa02..77838b6eb6 100644
--- a/src/app/core/cache/response-cache.service.spec.ts
+++ b/src/app/core/cache/response-cache.service.spec.ts
@@ -46,7 +46,6 @@ describe('ResponseCacheService', () => {
 
       let testObj: ResponseCacheEntry;
       service.get(keys[1]).first().subscribe((entry) => {
-        console.log(entry);
         testObj = entry;
       });
       expect(testObj.key).toEqual(keys[1]);
diff --git a/src/app/core/data/base-response-parsing.service.ts b/src/app/core/data/base-response-parsing.service.ts
index 018f9f5adb..b7bb5b5784 100644
--- a/src/app/core/data/base-response-parsing.service.ts
+++ b/src/app/core/data/base-response-parsing.service.ts
@@ -34,19 +34,26 @@ export abstract class BaseResponseParsingService {
       } else if (Array.isArray(data)) {
         return this.processArray(data, requestHref);
       } else if (isObjectLevel(data)) {
-        let object = this.deserialize(data, requestHref);
-        this.cache(object, requestHref);
+        const object = this.deserialize(data);
         if (isNotEmpty(data._embedded)) {
-          const list = {};
           Object
             .keys(data._embedded)
             .filter((property) => data._embedded.hasOwnProperty(property))
             .forEach((property) => {
               const parsedObj = this.process<ObjectDomain, ObjectType>(data._embedded[property], requestHref);
-              list[property] = parsedObj;
+              if (isNotEmpty(parsedObj)) {
+                if (isPaginatedResponse(data._embedded[property])) {
+                  object[property] = parsedObj;
+                  object[property].page = parsedObj.page.map((obj) => obj.self);
+                } else if (isObjectLevel(data._embedded[property])) {
+                  object[property] = parsedObj.self;
+                } else if (Array.isArray(parsedObj)) {
+                  object[property] = parsedObj.map((obj) => obj.self)
+                }
+              }
             });
-          object = Object.assign({}, object, list);
         }
+        this.cache(object, requestHref);
         return object;
       }
       const result = {};
@@ -83,7 +90,7 @@ export abstract class BaseResponseParsingService {
     return array;
   }
 
-  protected deserialize<ObjectDomain, ObjectType>(obj, requestHref) {
+  protected deserialize<ObjectDomain, ObjectType>(obj): any {
     const type: ObjectType = obj.type;
     if (hasValue(type)) {
       const normObjConstructor = this.objectFactory.getConstructor(type) as GenericConstructor<ObjectDomain>;
diff --git a/src/app/core/data/config-response-parsing.service.spec.ts b/src/app/core/data/config-response-parsing.service.spec.ts
index 9be31024c1..654ee53651 100644
--- a/src/app/core/data/config-response-parsing.service.spec.ts
+++ b/src/app/core/data/config-response-parsing.service.spec.ts
@@ -1,5 +1,4 @@
 import { ConfigSuccessResponse, ErrorResponse } from '../cache/response-cache.models';
-import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
 import { ConfigResponseParsingService } from './config-response-parsing.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { GlobalConfig } from '../../../config/global-config.interface';
@@ -8,7 +7,8 @@ import { ConfigRequest } from './request.models';
 import { Store } from '@ngrx/store';
 import { CoreState } from '../core.reducers';
 import { SubmissionDefinitionsModel } from '../shared/config/config-submission-definitions.model';
-import { SubmissionSectionModel } from '../shared/config/config-submission-section.model';
+import { PaginatedList } from './paginated-list';
+import { PageInfo } from '../shared/page-info.model';
 
 describe('ConfigResponseParsingService', () => {
   let service: ConfigResponseParsingService;
@@ -16,141 +16,143 @@ describe('ConfigResponseParsingService', () => {
   const EnvConfig = {} as GlobalConfig;
   const store = {} as Store<CoreState>;
   const objectCacheService = new ObjectCacheService(store);
-
+  let validResponse;
   beforeEach(() => {
     service = new ConfigResponseParsingService(EnvConfig, objectCacheService);
+    validResponse = {
+      payload: {
+        id: 'traditional',
+        name: 'traditional',
+        type: 'submissiondefinition',
+        isDefault: true,
+        _links: {
+          sections: {
+            href: 'https://rest.api/config/submissiondefinitions/traditional/sections'
+          },
+          self: {
+            href: 'https://rest.api/config/submissiondefinitions/traditional'
+          }
+        },
+        _embedded: {
+          sections: {
+            page: {
+              number: 0,
+              size: 4,
+              totalPages: 1, totalElements: 4
+            },
+            _embedded: [
+              {
+                id: 'traditionalpageone', header: 'submit.progressbar.describe.stepone',
+                mandatory: true,
+                sectionType: 'submission-form',
+                visibility: {
+                  main: null,
+                  other: 'READONLY'
+                },
+                type: 'submissionsection',
+                _links: {
+                  self: {
+                    href: 'https://rest.api/config/submissionsections/traditionalpageone'
+                  },
+                  config: {
+                    href: 'https://rest.api/config/submissionforms/traditionalpageone'
+                  }
+                }
+              }, {
+                id: 'traditionalpagetwo',
+                header: 'submit.progressbar.describe.steptwo',
+                mandatory: true,
+                sectionType: 'submission-form',
+                visibility: {
+                  main: null,
+                  other: 'READONLY'
+                },
+                type: 'submissionsection',
+                _links: {
+                  self: {
+                    href: 'https://rest.api/config/submissionsections/traditionalpagetwo'
+                  },
+                  config: {
+                    href: 'https://rest.api/config/submissionforms/traditionalpagetwo'
+                  }
+                }
+              }, {
+                id: 'upload',
+                header: 'submit.progressbar.upload',
+                mandatory: false,
+                sectionType: 'upload',
+                visibility: {
+                  main: null,
+                  other: 'READONLY'
+                },
+                type: 'submissionsection',
+                _links: {
+                  self: {
+                    href: 'https://rest.api/config/submissionsections/upload'
+                  },
+                  config: {
+                    href: 'https://rest.api/config/submissionuploads/upload'
+                  }
+                }
+              }, {
+                id: 'license',
+                header: 'submit.progressbar.license',
+                mandatory: true,
+                sectionType: 'license',
+                visibility: {
+                  main: null,
+                  other: 'READONLY'
+                },
+                type: 'submissionsection',
+                _links: {
+                  self: {
+                    href: 'https://rest.api/config/submissionsections/license'
+                  }
+                }
+              }
+            ],
+            _links: {
+              self: {
+                href: 'https://rest.api/config/submissiondefinitions/traditional/sections'
+              }
+            }
+          }
+        }
+      },
+      statusCode: '200'
+    };
   });
 
   describe('parse', () => {
     const validRequest = new ConfigRequest('69f375b5-19f4-4453-8c7a-7dc5c55aafbb', 'https://rest.api/config/submissiondefinitions/traditional');
 
-    const validResponse = {
-      payload: {
-        id:'traditional',
-        name:'traditional',
-        type:'submissiondefinition',
-        isDefault:true,
-        _links:{
-          sections:{
-            href:'https://rest.api/config/submissiondefinitions/traditional/sections'
-          },self:{
-            href:'https://rest.api/config/submissiondefinitions/traditional'
-          }
-        },
-        _embedded:{
-          sections:{
-            page:{
-              number:0,
-              size:4,
-              totalPages:1,totalElements:4
-            },
-            _embedded:[
-              {
-                id:'traditionalpageone',header:'submit.progressbar.describe.stepone',
-                mandatory:true,
-                sectionType:'submission-form',
-                visibility:{
-                  main:null,
-                  other:'READONLY'
-                },
-                type:'submissionsection',
-                _links:{
-                  self:{
-                    href:'https://rest.api/config/submissionsections/traditionalpageone'
-                  },
-                  config:{
-                    href:'https://rest.api/config/submissionforms/traditionalpageone'
-                  }
-                }
-              }, {
-                id:'traditionalpagetwo',
-                header:'submit.progressbar.describe.steptwo',
-                mandatory:true,
-                sectionType:'submission-form',
-                visibility:{
-                  main:null,
-                  other:'READONLY'
-                },
-                type:'submissionsection',
-                _links:{
-                  self:{
-                    href:'https://rest.api/config/submissionsections/traditionalpagetwo'
-                  },
-                  config:{
-                    href:'https://rest.api/config/submissionforms/traditionalpagetwo'
-                  }
-                }
-              }, {
-                id:'upload',
-                header:'submit.progressbar.upload',
-                mandatory:false,
-                sectionType:'upload',
-                visibility:{
-                  main:null,
-                  other:'READONLY'
-                },
-                type:'submissionsection',
-                _links:{
-                  self:{
-                    href:'https://rest.api/config/submissionsections/upload'
-                  },
-                  config: {
-                    href:'https://rest.api/config/submissionuploads/upload'
-                  }
-                }
-              }, {
-                id:'license',
-                header:'submit.progressbar.license',
-                mandatory:true,
-                sectionType:'license',
-                visibility:{
-                  main:null,
-                  other:'READONLY'
-                },
-                type:'submissionsection',
-                _links:{
-                  self:{
-                    href:'https://rest.api/config/submissionsections/license'
-                  }
-                }
-              }
-            ],
-            _links:{
-              self:'https://rest.api/config/submissiondefinitions/traditional/sections'
-            }
-          }
-        }
-      },
-      statusCode:'200'
-    };
-
     const invalidResponse1 = {
       payload: {},
-      statusCode:'200'
+      statusCode: '200'
     };
 
     const invalidResponse2 = {
       payload: {
-        id:'traditional',
-        name:'traditional',
-        type:'submissiondefinition',
-        isDefault:true,
-        _links:{},
-        _embedded:{
-          sections:{
-            page:{
-              number:0,
-              size:4,
-              totalPages:1,totalElements:4
+        id: 'traditional',
+        name: 'traditional',
+        type: 'submissiondefinition',
+        isDefault: true,
+        _links: {},
+        _embedded: {
+          sections: {
+            page: {
+              number: 0,
+              size: 4,
+              totalPages: 1, totalElements: 4
             },
-            _embedded:[{},{}],
-            _links:{
-              self:'https://rest.api/config/submissiondefinitions/traditional/sections'
+            _embedded: [{}, {}],
+            _links: {
+              self: 'https://rest.api/config/submissiondefinitions/traditional/sections'
             }
           }
         }
       },
-      statusCode:'200'
+      statusCode: '200'
     };
 
     const invalidResponse3 = {
@@ -159,61 +161,24 @@ describe('ConfigResponseParsingService', () => {
         page: { size: 20, totalElements: 2, totalPages: 1, number: 0 }
       }, statusCode: '500'
     };
-
-    const definitions = [
+    const pageinfo = Object.assign(new PageInfo(), { elementsPerPage: 4, totalElements: 4, totalPages: 1, currentPage: 1 });
+    const definitions =
       Object.assign(new SubmissionDefinitionsModel(), {
         isDefault: true,
         name: 'traditional',
         type: 'submissiondefinition',
-        _links: {},
-        sections: [
-          Object.assign(new SubmissionSectionModel(), {
-            header: 'submit.progressbar.describe.stepone',
-            mandatory: true,
-            sectionType: 'submission-form',
-            visibility:{
-              main:null,
-              other:'READONLY'
-            },
-            type: 'submissionsection',
-            _links: {}
-          }),
-          Object.assign(new SubmissionSectionModel(), {
-            header: 'submit.progressbar.describe.steptwo',
-            mandatory: true,
-            sectionType: 'submission-form',
-            visibility:{
-              main:null,
-              other:'READONLY'
-            },
-            type: 'submissionsection',
-            _links: {}
-          }),
-          Object.assign(new SubmissionSectionModel(), {
-            header: 'submit.progressbar.upload',
-            mandatory: false,
-            sectionType: 'upload',
-            visibility:{
-              main:null,
-              other:'READONLY'
-            },
-            type: 'submissionsection',
-            _links: {}
-          }),
-          Object.assign(new SubmissionSectionModel(), {
-            header: 'submit.progressbar.license',
-            mandatory: true,
-            sectionType: 'license',
-            visibility:{
-              main:null,
-              other:'READONLY'
-            },
-            type: 'submissionsection',
-            _links: {}
-          })
-        ]
-      })
-    ];
+        _links: {
+          sections: 'https://rest.api/config/submissiondefinitions/traditional/sections',
+          self: 'https://rest.api/config/submissiondefinitions/traditional'
+        },
+        self: 'https://rest.api/config/submissiondefinitions/traditional',
+        sections: new PaginatedList(pageinfo, [
+          'https://rest.api/config/submissionsections/traditionalpageone',
+          'https://rest.api/config/submissionsections/traditionalpagetwo',
+          'https://rest.api/config/submissionsections/upload',
+          'https://rest.api/config/submissionsections/license'
+        ])
+      });
 
     it('should return a ConfigSuccessResponse if data contains a valid config endpoint response', () => {
       const response = service.parse(validRequest, validResponse);
@@ -232,11 +197,8 @@ describe('ConfigResponseParsingService', () => {
       expect(response.constructor).toBe(ErrorResponse);
     });
 
-    fit('should return a ConfigSuccessResponse with the ConfigDefinitions in data', () => {
+    it('should return a ConfigSuccessResponse with the ConfigDefinitions in data', () => {
       const response = service.parse(validRequest, validResponse);
-      debugger;
-      console.log(definitions);
-      console.log((response as any).configDefinition);
       expect((response as any).configDefinition).toEqual(definitions);
     });
 
diff --git a/src/app/core/data/config-response-parsing.service.ts b/src/app/core/data/config-response-parsing.service.ts
index 320d931c29..b67fa2caf1 100644
--- a/src/app/core/data/config-response-parsing.service.ts
+++ b/src/app/core/data/config-response-parsing.service.ts
@@ -27,7 +27,6 @@ export class ConfigResponseParsingService extends BaseResponseParsingService imp
   }
 
   parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
-    console.log(data);
     if (isNotEmpty(data.payload) && isNotEmpty(data.payload._links) && data.statusCode === '200') {
       const configDefinition = this.process<ConfigObject,ConfigType>(data.payload, request.href);
       return new ConfigSuccessResponse(configDefinition, data.statusCode, this.processPageInfo(data.payload));

From a99402c6b662962253434b06578719dff9ba827d Mon Sep 17 00:00:00 2001
From: LotteHofstede <lotte_hofstede@hotmail.com>
Date: Fri, 25 May 2018 13:05:47 +0200
Subject: [PATCH 04/16] Changed workaround comment for clarification

---
 src/app/core/data/base-response-parsing.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/core/data/base-response-parsing.service.ts b/src/app/core/data/base-response-parsing.service.ts
index b7bb5b5784..050b3c2da5 100644
--- a/src/app/core/data/base-response-parsing.service.ts
+++ b/src/app/core/data/base-response-parsing.service.ts
@@ -73,7 +73,7 @@ export abstract class BaseResponseParsingService {
     const pageInfo: PageInfo = this.processPageInfo(data);
     let list = data._embedded;
 
-    // Workaround for inconsistancy in rest response - sometimes page embeds are wrapped in another object
+    // Workaround for inconsistency in rest response. Issue: https://github.com/DSpace/dspace-angular/issues/238
     if (!Array.isArray(list)) {
       list = this.flattenSingleKeyObject(list);
     }

From 8b8f067a6cf596f779a989b9c5ebfdd5ab683861 Mon Sep 17 00:00:00 2001
From: Lotte Hofstede <lotte_hofstede@hotmail.com>
Date: Mon, 28 May 2018 12:07:22 +0200
Subject: [PATCH 05/16] added tests for collections component

---
 .../collections/collections.component.spec.ts | 74 +++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 src/app/+item-page/field-components/collections/collections.component.spec.ts

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
new file mode 100644
index 0000000000..911a90175c
--- /dev/null
+++ b/src/app/+item-page/field-components/collections/collections.component.spec.ts
@@ -0,0 +1,74 @@
+import { CollectionsComponent } from './collections.component';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import { By } from '@angular/platform-browser';
+import { Collection } from '../../../core/shared/collection.model';
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
+import { getMockRemoteDataBuildService } from '../../../shared/mocks/mock-remote-data-build.service';
+import { Item } from '../../../core/shared/item.model';
+import { Observable } from 'rxjs/Observable';
+import { RemoteData } from '../../../core/data/remote-data';
+import { TranslateModule } from '@ngx-translate/core';
+
+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'
+    }]
+});
+
+const succeededMockItem: Item = Object.assign(new Item(), {owningCollection: Observable.of(new RemoteData(false, false, true, null, mockCollection1))});
+const failedMockItem: Item = Object.assign(new Item(), {owningCollection: Observable.of(new RemoteData(false, false, false, null, mockCollection1))});
+
+describe('CollectionsComponent', () => {
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [ CollectionsComponent ],
+      providers: [
+        { provide: RemoteDataBuildService, useValue: getMockRemoteDataBuildService()}
+      ],
+
+      schemas: [ NO_ERRORS_SCHEMA ]
+    }).overrideComponent(CollectionsComponent, {
+      set: { changeDetection: ChangeDetectionStrategy.Default }
+    }).compileComponents();
+  }));
+
+  beforeEach(async(() => {
+    fixture = TestBed.createComponent(CollectionsComponent);
+    collectionsComponent = fixture.componentInstance;
+    collectionsComponent.label = 'test.test';
+    collectionsComponent.separator = '<br/>';
+
+  }));
+
+  describe('When the requested item request has succeeded', () => {
+    beforeEach(() => {
+      collectionsComponent.item = succeededMockItem;
+      fixture.detectChanges();
+    });
+
+    it('should show the collection', () => {
+      const collectionField = fixture.debugElement.query(By.css('ds-metadata-field-wrapper div.collections'));
+      expect(collectionField).not.toBeNull();
+    });
+  });
+
+  describe('When the requested item request has succeeded', () => {
+    beforeEach(() => {
+      collectionsComponent.item = failedMockItem;
+      fixture.detectChanges();
+    });
+
+    it('should not show the collection', () => {
+      const collectionField = fixture.debugElement.query(By.css('ds-metadata-field-wrapper div.collections'));
+      expect(collectionField).toBeNull();
+    });
+  });
+});

From 101921ceac142a2e4a7958f07843c48891635cac Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel+gitkraken@gmail.com>
Date: Tue, 29 May 2018 15:03:40 +0200
Subject: [PATCH 06/16] refactored IDToUUIDSerializer

---
 .../core/cache/it-to-uuid-serializer.spec.ts  | 34 +++++++++++++++++++
 src/app/core/cache/it-to-uuid-serializer.ts   | 19 +++++++++++
 .../normalized-bitstream-format.model.ts      | 17 ++--------
 .../normalized-resource-policy.model.ts       | 19 +++--------
 4 files changed, 60 insertions(+), 29 deletions(-)
 create mode 100644 src/app/core/cache/it-to-uuid-serializer.spec.ts
 create mode 100644 src/app/core/cache/it-to-uuid-serializer.ts

diff --git a/src/app/core/cache/it-to-uuid-serializer.spec.ts b/src/app/core/cache/it-to-uuid-serializer.spec.ts
new file mode 100644
index 0000000000..425aa26c5b
--- /dev/null
+++ b/src/app/core/cache/it-to-uuid-serializer.spec.ts
@@ -0,0 +1,34 @@
+import { IDToUUIDSerializer } from './it-to-uuid-serializer';
+
+fdescribe('IDToUUIDSerializer', () => {
+  let serializer: IDToUUIDSerializer;
+  const prefix = 'test-prefix';
+
+  beforeEach(() => {
+    serializer = new IDToUUIDSerializer(prefix);
+  });
+
+  describe('Serialize', () => {
+    it('should return undefined', () => {
+      expect(serializer.Serialize('some-uuid')).toBeUndefined()
+    });
+  });
+
+  describe('Deserialize', () => {
+    describe('when ID is defined', () => {
+      it('should prepend the prefix to the ID', () => {
+        const id = 'some-id';
+        expect(serializer.Deserialize(id)).toBe(`${prefix}-${id}`);
+      });
+    });
+
+    describe('when ID is null or undefined', () => {
+      it('should return null or undefined', () => {
+        expect(serializer.Deserialize(null)).toBeNull();
+        expect(serializer.Deserialize(undefined)).toBeUndefined();
+      });
+    });
+
+  });
+
+});
diff --git a/src/app/core/cache/it-to-uuid-serializer.ts b/src/app/core/cache/it-to-uuid-serializer.ts
new file mode 100644
index 0000000000..0d619f457b
--- /dev/null
+++ b/src/app/core/cache/it-to-uuid-serializer.ts
@@ -0,0 +1,19 @@
+import { hasValue } from '../../shared/empty.util';
+
+export class IDToUUIDSerializer {
+  constructor(private prefix: string) {
+  }
+
+  Serialize(uuid: string): any {
+    return undefined; // ui-only uuid doesn't need to be sent back to the server
+  }
+
+  Deserialize(id: string): string {
+    if (hasValue(id)) {
+      return `${this.prefix}-${id}`;
+    } else {
+      return id;
+    }
+
+  }
+}
diff --git a/src/app/core/cache/models/normalized-bitstream-format.model.ts b/src/app/core/cache/models/normalized-bitstream-format.model.ts
index 8126c6f850..db9fa571f1 100644
--- a/src/app/core/cache/models/normalized-bitstream-format.model.ts
+++ b/src/app/core/cache/models/normalized-bitstream-format.model.ts
@@ -1,20 +1,9 @@
 import { autoserialize, autoserializeAs, inheritSerialization } from 'cerialize';
+import { BitstreamFormat } from '../../shared/bitstream-format.model';
 
 import { mapsTo } from '../builders/build-decorators';
-import { BitstreamFormat } from '../../shared/bitstream-format.model';
+import { IDToUUIDSerializer } from '../it-to-uuid-serializer';
 import { NormalizedObject } from './normalized-object.model';
-import { NormalizedDSpaceObject } from './normalized-dspace-object.model';
-
-// While BitstreamFormats don't have a UUID, but need to be cachable: use this serializer. Remove it when the REST API returns them with UUID
-const BitstreamFormatUUIDSerializer = {
-  Serialize(json: any): any {
-    // No need to serialize again, de ID is already serialized by the id field itself
-    return {};
-  },
-  Deserialize(json: any): any {
-    return 'bitstream-format-' + json.id;
-  }
-};
 
 @mapsTo(BitstreamFormat)
 @inheritSerialization(NormalizedObject)
@@ -41,6 +30,6 @@ export class NormalizedBitstreamFormat extends NormalizedObject {
   @autoserialize
   id: string;
 
-  @autoserializeAs(BitstreamFormatUUIDSerializer)
+  @autoserializeAs(new IDToUUIDSerializer('bitstream-format'), 'id')
   uuid: string;
 }
diff --git a/src/app/core/cache/models/normalized-resource-policy.model.ts b/src/app/core/cache/models/normalized-resource-policy.model.ts
index 253019fc23..3a874da46b 100644
--- a/src/app/core/cache/models/normalized-resource-policy.model.ts
+++ b/src/app/core/cache/models/normalized-resource-policy.model.ts
@@ -1,20 +1,9 @@
 import { autoserialize, autoserializeAs, inheritSerialization } from 'cerialize';
-
-import { mapsTo } from '../builders/build-decorators';
-import { BitstreamFormat } from '../../shared/bitstream-format.model';
-import { NormalizedObject } from './normalized-object.model';
 import { ResourcePolicy } from '../../shared/resource-policy.model';
 
-// While ResourcePolicyUUIDSerializer don't have a UUID, but need to be cachable: use this serializer. Remove it when the REST API returns them with UUID
-const ResourcePolicyUUIDSerializer = {
-  Serialize(json: any): any {
-    // No need to serialize again, de ID is already serialized by the id field itself
-    return {};
-  },
-  Deserialize(json: any): any {
-    return 'resource-policy-' + json.id;
-  }
-};
+import { mapsTo } from '../builders/build-decorators';
+import { IDToUUIDSerializer } from '../it-to-uuid-serializer';
+import { NormalizedObject } from './normalized-object.model';
 
 @mapsTo(ResourcePolicy)
 @inheritSerialization(NormalizedObject)
@@ -29,6 +18,6 @@ export class NormalizedResourcePolicy extends NormalizedObject {
   @autoserialize
   id: string;
 
-  @autoserializeAs(ResourcePolicyUUIDSerializer)
+  @autoserializeAs(new IDToUUIDSerializer('resource-policy'), 'id')
   uuid: string;
 }

From 26b82bed300f45a946c9f6b4dd955fc1712e3161 Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel+gitkraken@gmail.com>
Date: Tue, 29 May 2018 17:03:16 +0200
Subject: [PATCH 07/16] accidentally left focus on a unit test

---
 src/app/core/cache/it-to-uuid-serializer.spec.ts  | 2 +-
 src/app/core/data/dso-response-parsing.service.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/core/cache/it-to-uuid-serializer.spec.ts b/src/app/core/cache/it-to-uuid-serializer.spec.ts
index 425aa26c5b..662d79cdce 100644
--- a/src/app/core/cache/it-to-uuid-serializer.spec.ts
+++ b/src/app/core/cache/it-to-uuid-serializer.spec.ts
@@ -1,6 +1,6 @@
 import { IDToUUIDSerializer } from './it-to-uuid-serializer';
 
-fdescribe('IDToUUIDSerializer', () => {
+describe('IDToUUIDSerializer', () => {
   let serializer: IDToUUIDSerializer;
   const prefix = 'test-prefix';
 
diff --git a/src/app/core/data/dso-response-parsing.service.ts b/src/app/core/data/dso-response-parsing.service.ts
index cadec2e918..aff450781f 100644
--- a/src/app/core/data/dso-response-parsing.service.ts
+++ b/src/app/core/data/dso-response-parsing.service.ts
@@ -30,7 +30,7 @@ export class DSOResponseParsingService extends BaseResponseParsingService implem
     const processRequestDTO = this.process<NormalizedObject,ResourceType>(data.payload, request.href);
     let objectList = processRequestDTO;
     if (hasNoValue(processRequestDTO)) {
-      return new DSOSuccessResponse(undefined, data.statusCode, undefined)
+      return new DSOSuccessResponse([], data.statusCode, undefined)
     }
     if (hasValue(processRequestDTO.page)) {
       objectList = processRequestDTO.page;

From f4fde748dc5d88e50d46f89fe5734c74e832f0b2 Mon Sep 17 00:00:00 2001
From: Lotte Hofstede <lotte_hofstede@hotmail.com>
Date: Wed, 13 Jun 2018 09:39:24 +0200
Subject: [PATCH 08/16] resolved issue where the grid view of the search page
 would break when an item did not have a issue date

---
 .../abstract-listable-element.component.ts                   | 5 +++++
 .../item-grid-element/item-grid-element.component.html       | 2 +-
 .../item-search-result-grid-element.component.html           | 2 +-
 .../search-result-grid-element.component.ts                  | 3 ++-
 .../item-list-element/item-list-element.component.html       | 4 ++--
 .../item-search-result-list-element.component.html           | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)

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 d52036b5dc..59df86fdff 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,5 +1,6 @@
 import { Component, Inject } from '@angular/core';
 import { ListableObject } from '../listable-object.model';
+import { hasValue } from '../../../empty.util';
 
 @Component({
   selector: 'ds-abstract-object-element',
@@ -10,4 +11,8 @@ 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 cc2f2efdb1..5100b984e0 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
@@ -10,7 +10,7 @@
         <span *ngFor="let authorMd of object.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">{{authorMd.value}}
             <span *ngIf="!last">; </span>
         </span>
-      <span *ngIf="object.findMetadata('dc.date.issued')" class="item-date">{{object.findMetadata("dc.date.issued")}}</span>
+      <span *ngIf="hasValue(object.findMetadata('dc.date.issued'))" class="item-date">{{object.findMetadata("dc.date.issued")}}</span>
     </p>
 
     <p *ngIf="object.findMetadata('dc.description.abstract')" class="item-abstract card-text">{{object.findMetadata("dc.description.abstract") | dsTruncate:[200] }}</p>
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 1cf14587ad..1e4f6f3c64 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
@@ -13,7 +13,7 @@
             <p *ngIf="dso.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0"
                class="item-authors card-text text-muted">
                 <ds-truncatable-part [fixedHeight]="true" [id]="dso.id" [minLines]="1">
-                    <span *ngIf="dso.findMetadata('dc.date.issued').length > 0" class="item-date">{{dso.findMetadata("dc.date.issued")}}</span>
+                    <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>
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 e6217eb0bb..5ab9f472b4 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
@@ -3,7 +3,7 @@ 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 } from '../../empty.util';
+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';
@@ -60,4 +60,5 @@ export class SearchResultGridElementComponent<T extends SearchResult<K>, K exten
   isCollapsed(): Observable<boolean> {
     return this.truncatableService.isCollapsed(this.dso.id);
   }
+
 }
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 b4259c25c2..1e4a944ffa 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
@@ -9,8 +9,8 @@
             <span *ngIf="!last">; </span>
         </span>
     </span>
-    (<span *ngIf="object.findMetadata('dc.publisher')" class="item-list-publisher">{{object.findMetadata("dc.publisher")}}, </span><span
-          *ngIf="object.findMetadata('dc.date.issued')" class="item-list-date">{{object.findMetadata("dc.date.issued")}}</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>
     <div *ngIf="object.findMetadata('dc.description.abstract')" class="item-list-abstract">
         {{object.findMetadata("dc.description.abstract") | dsTruncate:[200] }}
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 b8f3197a7c..e1f559dd66 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
@@ -6,7 +6,7 @@
     <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="dso.findMetadata('dc.date.issued')" class="item-list-date"
+            *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"
                   class="item-list-authors">

From f4c2b88ffd0cfd6d0721dd8a9a235739a6eb2c8c Mon Sep 17 00:00:00 2001
From: Terry Brady <terrywbrady@gmail.com>
Date: Thu, 26 Jul 2018 14:08:17 -0700
Subject: [PATCH 09/16] move dockerfile into codebase

---
 .dockerignore |  2 ++
 Dockerfile    | 10 ++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 .dockerignore
 create mode 100644 Dockerfile

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000000..29d02b9caf
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+.git
+node-modules/
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000000..4dff02ffd3
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,10 @@
+# This image will be published as dspace/dspace-angular
+# See https://dspace-labs.github.io/DSpace-Docker-Images/ for usage details
+
+FROM node:8
+WORKDIR /app
+ADD . /app/
+EXPOSE 3000
+
+RUN yarn install
+CMD yarn run watch

From 08c2aaaa51bb4903d778e5ee208ac806bae825d0 Mon Sep 17 00:00:00 2001
From: Terry Brady <terrywbrady@gmail.com>
Date: Fri, 27 Jul 2018 11:20:07 -0700
Subject: [PATCH 10/16] use alpine-node

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 4dff02ffd3..bd2f4cda3a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # This image will be published as dspace/dspace-angular
 # See https://dspace-labs.github.io/DSpace-Docker-Images/ for usage details
 
-FROM node:8
+FROM alpine-node:8
 WORKDIR /app
 ADD . /app/
 EXPOSE 3000

From 033927bb74b88c0fec0a739466f6abd43ba91ab7 Mon Sep 17 00:00:00 2001
From: Terry Brady <terrywbrady@gmail.com>
Date: Fri, 27 Jul 2018 15:02:46 -0700
Subject: [PATCH 11/16] fix base image name

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index bd2f4cda3a..f10164ebd0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # This image will be published as dspace/dspace-angular
 # See https://dspace-labs.github.io/DSpace-Docker-Images/ for usage details
 
-FROM alpine-node:8
+FROM node:8-alpine
 WORKDIR /app
 ADD . /app/
 EXPOSE 3000

From f83e907b84552cc0452b20b6710855ad9b2d7e94 Mon Sep 17 00:00:00 2001
From: Terry Brady <terrywbrady@gmail.com>
Date: Fri, 27 Jul 2018 17:28:54 -0700
Subject: [PATCH 12/16] expand dockeringore based on gitignore

---
 .dockerignore | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/.dockerignore b/.dockerignore
index 29d02b9caf..5889e7a85c 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,21 @@
 .git
-node-modules/
+node-modules
+__build__
+__server_build__
+typings
+tsd_typings
+npm-debug.log
+dist
+coverage
+.idea
+*.iml
+*.ngfactory.ts
+*.css.shim.ts
+*.scss.shim.ts
+.DS_Store
+webpack.records.json
+npm-debug.log.*
+morgan.log
+yarn-error.log
+*.css
+package-lock.json

From 2d224bffc26e9395108ff0cbde648fb04ab31688 Mon Sep 17 00:00:00 2001
From: Mohamed Abdul Rasheed <mohamedr@outlook.com>
Date: Wed, 8 Aug 2018 09:56:46 -0400
Subject: [PATCH 13/16] Added test for DataService getFindAllHref

---
 src/app/core/data/data.service.spec.ts | 123 +++++++++++++++++++++++++
 1 file changed, 123 insertions(+)
 create mode 100644 src/app/core/data/data.service.spec.ts

diff --git a/src/app/core/data/data.service.spec.ts b/src/app/core/data/data.service.spec.ts
new file mode 100644
index 0000000000..72c79c23bd
--- /dev/null
+++ b/src/app/core/data/data.service.spec.ts
@@ -0,0 +1,123 @@
+import { DataService } from './data.service';
+import { NormalizedObject } from '../cache/models/normalized-object.model';
+import { ResponseCacheService } from '../cache/response-cache.service';
+import { RequestService } from './request.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { CoreState } from '../core.reducers';
+import { Store } from '@ngrx/store';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { Observable } from 'rxjs/Observable';
+import { FindAllOptions } from './request.models';
+import { SortOptions, SortDirection } from '../cache/models/sort-options.model';
+
+const LINK_NAME = 'test'
+
+// tslint:disable:max-classes-per-file
+class NormalizedTestObject extends NormalizedObject {
+}
+
+class TestService extends DataService<NormalizedTestObject, any> {
+    constructor(
+        protected responseCache: ResponseCacheService,
+        protected requestService: RequestService,
+        protected rdbService: RemoteDataBuildService,
+        protected store: Store<CoreState>,
+        protected linkPath: string,
+        protected halService: HALEndpointService
+    ) {
+        super();
+    }
+
+    public getScopedEndpoint(scope: string): Observable<string> {
+        throw new Error('getScopedEndpoint is abstract in DataService');
+    }
+
+}
+
+describe('DataService', () => {
+    let service: TestService;
+    let options: FindAllOptions;
+    const responseCache = {} as ResponseCacheService;
+    const requestService = {} as RequestService;
+    const halService = {} as HALEndpointService;
+    const rdbService = {} as RemoteDataBuildService;
+    const store = {} as Store<CoreState>;
+    const endpoint = 'https://rest.api/core';
+
+    function initTestService(): TestService {
+        return new TestService(
+            responseCache,
+            requestService,
+            rdbService,
+            store,
+            LINK_NAME,
+            halService
+          );
+    }
+
+    service = initTestService();
+
+    describe('getFindAllHref', () => {
+
+        it('should return an observable with the endpoint', () => {
+            options = {};
+
+            (service as any).getFindAllHref(endpoint).subscribe((value) => {
+                    expect(value).toBe(endpoint);
+                }
+            );
+        });
+
+        // getScopedEndpoint is not implemented in abstract DataService
+        it('should throw error if scopeID provided in options', () => {
+            options = { scopeID: 'somevalue' };
+
+            expect(() => { (service as any).getFindAllHref(endpoint, options) })
+                .toThrowError('getScopedEndpoint is abstract in DataService');
+        });
+
+        it('should include page in href if currentPage provided in options', () => {
+            options = { currentPage: 2 };
+            const expected = `${endpoint}?page=${options.currentPage - 1}`;
+
+            (service as any).getFindAllHref(endpoint, options).subscribe((value) => {
+                expect(value).toBe(expected);
+            });
+        });
+
+        it('should include size in href if elementsPerPage provided in options', () => {
+            options = { elementsPerPage: 5 };
+            const expected = `${endpoint}?size=${options.elementsPerPage}`;
+
+            (service as any).getFindAllHref(endpoint, options).subscribe((value) => {
+                expect(value).toBe(expected);
+            });
+        });
+
+        it('should include sort href if SortOptions provided in options', () => {
+            const sortOptions = new SortOptions('field1', SortDirection.ASC);
+            options = { sort:  sortOptions};
+            const expected = `${endpoint}?sort=${sortOptions.field},${sortOptions.direction}`;
+
+            (service as any).getFindAllHref(endpoint, options).subscribe((value) => {
+                expect(value).toBe(expected);
+            });
+        });
+
+        it('should include all provided options in href', () => {
+            const sortOptions = new SortOptions('field1', SortDirection.DESC)
+            options = {
+                currentPage: 6,
+                elementsPerPage: 10,
+                sort: sortOptions
+            }
+            const expected = `${endpoint}?page=${options.currentPage - 1}&size=${options.elementsPerPage}` +
+                `&sort=${sortOptions.field},${sortOptions.direction}`;
+
+            (service as any).getFindAllHref(endpoint, options).subscribe((value) => {
+                expect(value).toBe(expected);
+        });
+        })
+    });
+
+});

From c11dcb14d159dd24ad836dd9345f14d83046b828 Mon Sep 17 00:00:00 2001
From: Mohamed Abdul Rasheed <mohamedr@outlook.com>
Date: Wed, 8 Aug 2018 10:12:11 -0400
Subject: [PATCH 14/16] Added startsWith param to getFindAllHref

---
 src/app/core/data/data.service.spec.ts | 14 ++++++++++++--
 src/app/core/data/data.service.ts      |  4 ++++
 src/app/core/data/request.models.ts    |  1 +
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/app/core/data/data.service.spec.ts b/src/app/core/data/data.service.spec.ts
index 72c79c23bd..8377afe92e 100644
--- a/src/app/core/data/data.service.spec.ts
+++ b/src/app/core/data/data.service.spec.ts
@@ -104,15 +104,25 @@ describe('DataService', () => {
             });
         });
 
+        it('should include startsWith in href if startsWith provided in options', () => {
+            options = { startsWith: 'ab' };
+            const expected = `${endpoint}?startsWith=${options.startsWith}`;
+
+            (service as any).getFindAllHref(endpoint, options).subscribe((value) => {
+                expect(value).toBe(expected);
+            });
+        });
+
         it('should include all provided options in href', () => {
             const sortOptions = new SortOptions('field1', SortDirection.DESC)
             options = {
                 currentPage: 6,
                 elementsPerPage: 10,
-                sort: sortOptions
+                sort: sortOptions,
+                startsWith: 'ab'
             }
             const expected = `${endpoint}?page=${options.currentPage - 1}&size=${options.elementsPerPage}` +
-                `&sort=${sortOptions.field},${sortOptions.direction}`;
+                `&sort=${sortOptions.field},${sortOptions.direction}&startsWith=${options.startsWith}`;
 
             (service as any).getFindAllHref(endpoint, options).subscribe((value) => {
                 expect(value).toBe(expected);
diff --git a/src/app/core/data/data.service.ts b/src/app/core/data/data.service.ts
index f532ff05ba..06e7f25926 100644
--- a/src/app/core/data/data.service.ts
+++ b/src/app/core/data/data.service.ts
@@ -45,6 +45,10 @@ export abstract class DataService<TNormalized extends NormalizedObject, TDomain>
       args.push(`sort=${options.sort.field},${options.sort.direction}`);
     }
 
+    if (hasValue(options.startsWith)) {
+      args.push(`startsWith=${options.startsWith}`);
+    }
+
     if (isNotEmpty(args)) {
       return result.map((href: string) => new URLCombiner(href, `?${args.join('&')}`).toString());
     } else {
diff --git a/src/app/core/data/request.models.ts b/src/app/core/data/request.models.ts
index 7015b0b0f1..ce45d5b41c 100644
--- a/src/app/core/data/request.models.ts
+++ b/src/app/core/data/request.models.ts
@@ -141,6 +141,7 @@ export class FindAllOptions {
   elementsPerPage?: number;
   currentPage?: number;
   sort?: SortOptions;
+  startsWith?: string;
 }
 
 export class FindAllRequest extends GetRequest {

From 87dcdac5518b7988f638aa69880fd4d807aaf615 Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Thu, 9 Aug 2018 11:15:58 +0200
Subject: [PATCH 15/16] Added comments and some refactoring to new files

---
 .../collections/collections.component.spec.ts |  2 +-
 ....spec.ts => id-to-uuid-serializer.spec.ts} |  0
 src/app/core/cache/id-to-uuid-serializer.ts   | 35 ++++++++++
 src/app/core/cache/it-to-uuid-serializer.ts   | 19 ------
 .../core/cache/models/action-type.model.ts    | 64 +++++++++++++++++++
 .../normalized-bitstream-format.model.ts      | 35 +++++++++-
 .../models/normalized-bitstream.model.ts      |  3 +
 .../cache/models/normalized-bundle.model.ts   |  6 ++
 .../models/normalized-collection.model.ts     |  6 ++
 .../models/normalized-community.model.ts      |  8 ++-
 .../cache/models/normalized-item.model.ts     |  6 ++
 .../normalized-resource-policy.model.ts       | 30 ++++++++-
 .../core/cache/models/support-level.model.ts  | 19 ++++++
 src/app/core/shared/bitstream-format.model.ts | 30 +++++++++
 src/app/core/shared/resource-policy.model.ts  | 30 +++++++--
 15 files changed, 263 insertions(+), 30 deletions(-)
 rename src/app/core/cache/{it-to-uuid-serializer.spec.ts => id-to-uuid-serializer.spec.ts} (100%)
 create mode 100644 src/app/core/cache/id-to-uuid-serializer.ts
 delete mode 100644 src/app/core/cache/it-to-uuid-serializer.ts
 create mode 100644 src/app/core/cache/models/action-type.model.ts
 create mode 100644 src/app/core/cache/models/support-level.model.ts

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 911a90175c..871018a9d8 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
@@ -60,7 +60,7 @@ describe('CollectionsComponent', () => {
     });
   });
 
-  describe('When the requested item request has succeeded', () => {
+  describe('When the requested item request has failed', () => {
     beforeEach(() => {
       collectionsComponent.item = failedMockItem;
       fixture.detectChanges();
diff --git a/src/app/core/cache/it-to-uuid-serializer.spec.ts b/src/app/core/cache/id-to-uuid-serializer.spec.ts
similarity index 100%
rename from src/app/core/cache/it-to-uuid-serializer.spec.ts
rename to src/app/core/cache/id-to-uuid-serializer.spec.ts
diff --git a/src/app/core/cache/id-to-uuid-serializer.ts b/src/app/core/cache/id-to-uuid-serializer.ts
new file mode 100644
index 0000000000..79576d448e
--- /dev/null
+++ b/src/app/core/cache/id-to-uuid-serializer.ts
@@ -0,0 +1,35 @@
+import { hasValue } from '../../shared/empty.util';
+
+/**
+ * Serializer to create unique fake UUID's from id's that might otherwise be the same across multiple object types
+ */
+export class IDToUUIDSerializer {
+  /**
+   * @param {string} prefix To prepend the original ID with
+   */
+  constructor(private prefix: string) {
+  }
+
+  /**
+   * Method to serialize a UUID
+   * @param {string} uuid
+   * @returns {any} undefined Fake UUID's should not be sent back to the server, but only be used in the UI
+   */
+  Serialize(uuid: string): any {
+    return undefined;
+  }
+
+  /**
+   * Method to deserialize a UUID
+   * @param {string} id Identifier to transform in to a UUID
+   * @returns {string} UUID based on the prefix and the given id
+   */
+  Deserialize(id: string): string {
+    if (hasValue(id)) {
+      return `${this.prefix}-${id}`;
+    } else {
+      return id;
+    }
+
+  }
+}
diff --git a/src/app/core/cache/it-to-uuid-serializer.ts b/src/app/core/cache/it-to-uuid-serializer.ts
deleted file mode 100644
index 0d619f457b..0000000000
--- a/src/app/core/cache/it-to-uuid-serializer.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { hasValue } from '../../shared/empty.util';
-
-export class IDToUUIDSerializer {
-  constructor(private prefix: string) {
-  }
-
-  Serialize(uuid: string): any {
-    return undefined; // ui-only uuid doesn't need to be sent back to the server
-  }
-
-  Deserialize(id: string): string {
-    if (hasValue(id)) {
-      return `${this.prefix}-${id}`;
-    } else {
-      return id;
-    }
-
-  }
-}
diff --git a/src/app/core/cache/models/action-type.model.ts b/src/app/core/cache/models/action-type.model.ts
new file mode 100644
index 0000000000..4965f93e89
--- /dev/null
+++ b/src/app/core/cache/models/action-type.model.ts
@@ -0,0 +1,64 @@
+/**
+ * Enum representing the Action Type of a Resource Policy
+ */
+export enum ActionType {
+  /**
+   * Action of reading, viewing or downloading something
+   */
+  READ = 0,
+
+  /**
+   * Action of modifying something
+   */
+  WRITE = 1,
+
+  /**
+   * Action of deleting something
+   */
+  DELETE = 2,
+
+  /**
+   * Action of adding something to a container
+   */
+  ADD = 3,
+
+  /**
+   * Action of removing something from a container
+   */
+  REMOVE = 4,
+
+  /**
+   * Action of performing workflow step 1
+   */
+  WORKFLOW_STEP_1 = 5,
+
+  /**
+   * Action of performing workflow step 2
+   */
+  WORKFLOW_STEP_2 = 6,
+
+  /**
+   *  Action of performing workflow step 3
+   */
+  WORKFLOW_STEP_3 = 7,
+
+  /**
+   *  Action of performing a workflow abort
+   */
+  WORKFLOW_ABORT = 8,
+
+  /**
+   * Default Read policies for Bitstreams submitted to container
+   */
+  DEFAULT_BITSTREAM_READ = 9,
+
+  /**
+   *  Default Read policies for Items submitted to container
+   */
+  DEFAULT_ITEM_READ = 10,
+
+  /**
+   * Administrative actions
+   */
+  ADMIN = 11,
+}
diff --git a/src/app/core/cache/models/normalized-bitstream-format.model.ts b/src/app/core/cache/models/normalized-bitstream-format.model.ts
index db9fa571f1..5d11c97107 100644
--- a/src/app/core/cache/models/normalized-bitstream-format.model.ts
+++ b/src/app/core/cache/models/normalized-bitstream-format.model.ts
@@ -2,34 +2,65 @@ import { autoserialize, autoserializeAs, inheritSerialization } from 'cerialize'
 import { BitstreamFormat } from '../../shared/bitstream-format.model';
 
 import { mapsTo } from '../builders/build-decorators';
-import { IDToUUIDSerializer } from '../it-to-uuid-serializer';
+import { IDToUUIDSerializer } from '../id-to-uuid-serializer';
 import { NormalizedObject } from './normalized-object.model';
+import { SupportLevel } from './support-level.model';
 
+/**
+ * Normalized model class for a Bitstream Format
+ */
 @mapsTo(BitstreamFormat)
 @inheritSerialization(NormalizedObject)
 export class NormalizedBitstreamFormat extends NormalizedObject {
 
+  /**
+   * Short description of this Bitstream Format
+   */
   @autoserialize
   shortDescription: string;
 
+  /**
+   * Description of this Bitstream Format
+   */
   @autoserialize
   description: string;
 
+  /**
+   * String representing the MIME type of this Bitstream Format
+   */
   @autoserialize
   mimetype: string;
 
+  /**
+   * The level of support the system offers for this Bitstream Format
+   */
   @autoserialize
-  supportLevel: number;
+  supportLevel: SupportLevel;
 
+  /**
+   * True if the Bitstream Format is used to store system information, rather than the content of items in the system
+   */
   @autoserialize
   internal: boolean;
 
+  /**
+   * String representing this Bitstream Format's file extension
+   */
   @autoserialize
   extensions: string;
 
+  /**
+   * Identifier for this Bitstream Format
+   * Note that this ID is unique for bitstream formats,
+   * but might not be unique across different object types
+   */
   @autoserialize
   id: string;
 
+  /**
+   * Universally unique identifier for this Bitstream Format
+   * Consist of a prefix and the id field to ensure the identifier is unique across all object types
+   */
   @autoserializeAs(new IDToUUIDSerializer('bitstream-format'), 'id')
   uuid: string;
 }
diff --git a/src/app/core/cache/models/normalized-bitstream.model.ts b/src/app/core/cache/models/normalized-bitstream.model.ts
index db8002a874..63f84add41 100644
--- a/src/app/core/cache/models/normalized-bitstream.model.ts
+++ b/src/app/core/cache/models/normalized-bitstream.model.ts
@@ -5,6 +5,9 @@ import { Bitstream } from '../../shared/bitstream.model';
 import { mapsTo, relationship } from '../builders/build-decorators';
 import { ResourceType } from '../../shared/resource-type';
 
+/**
+ * Normalized model class for a DSpace Bitstream
+ */
 @mapsTo(Bitstream)
 @inheritSerialization(NormalizedDSpaceObject)
 export class NormalizedBitstream extends NormalizedDSpaceObject {
diff --git a/src/app/core/cache/models/normalized-bundle.model.ts b/src/app/core/cache/models/normalized-bundle.model.ts
index 3b594dd308..5535ab57e5 100644
--- a/src/app/core/cache/models/normalized-bundle.model.ts
+++ b/src/app/core/cache/models/normalized-bundle.model.ts
@@ -5,6 +5,9 @@ import { Bundle } from '../../shared/bundle.model';
 import { mapsTo, relationship } from '../builders/build-decorators';
 import { ResourceType } from '../../shared/resource-type';
 
+/**
+ * Normalized model class for a DSpace Bundle
+ */
 @mapsTo(Bundle)
 @inheritSerialization(NormalizedDSpaceObject)
 export class NormalizedBundle extends NormalizedDSpaceObject {
@@ -25,6 +28,9 @@ export class NormalizedBundle extends NormalizedDSpaceObject {
    */
   owner: string;
 
+  /**
+   * List of Bitstreams that are part of this Bundle
+   */
   @autoserialize
   @relationship(ResourceType.Bitstream, true)
   bitstreams: string[];
diff --git a/src/app/core/cache/models/normalized-collection.model.ts b/src/app/core/cache/models/normalized-collection.model.ts
index add0795ec5..a2c634c3e5 100644
--- a/src/app/core/cache/models/normalized-collection.model.ts
+++ b/src/app/core/cache/models/normalized-collection.model.ts
@@ -5,6 +5,9 @@ import { Collection } from '../../shared/collection.model';
 import { mapsTo, relationship } from '../builders/build-decorators';
 import { ResourceType } from '../../shared/resource-type';
 
+/**
+ * Normalized model class for a DSpace Collection
+ */
 @mapsTo(Collection)
 @inheritSerialization(NormalizedDSpaceObject)
 export class NormalizedCollection extends NormalizedDSpaceObject {
@@ -36,6 +39,9 @@ export class NormalizedCollection extends NormalizedDSpaceObject {
   @relationship(ResourceType.Community, false)
   owner: string;
 
+  /**
+   * List of Items that are part of (not necessarily owned by) this Collection
+   */
   @autoserialize
   @relationship(ResourceType.Item, true)
   items: string[];
diff --git a/src/app/core/cache/models/normalized-community.model.ts b/src/app/core/cache/models/normalized-community.model.ts
index 03784e414b..b1c2fe3cdd 100644
--- a/src/app/core/cache/models/normalized-community.model.ts
+++ b/src/app/core/cache/models/normalized-community.model.ts
@@ -1,10 +1,13 @@
-import { autoserialize, inheritSerialization, autoserializeAs } from 'cerialize';
+import { autoserialize, inheritSerialization } from 'cerialize';
 
 import { NormalizedDSpaceObject } from './normalized-dspace-object.model';
 import { Community } from '../../shared/community.model';
 import { mapsTo, relationship } from '../builders/build-decorators';
 import { ResourceType } from '../../shared/resource-type';
 
+/**
+ * Normalized model class for a DSpace Community
+ */
 @mapsTo(Community)
 @inheritSerialization(NormalizedDSpaceObject)
 export class NormalizedCommunity extends NormalizedDSpaceObject {
@@ -36,6 +39,9 @@ export class NormalizedCommunity extends NormalizedDSpaceObject {
   @relationship(ResourceType.Community, false)
   owner: string;
 
+  /**
+   * List of Collections that are owned by this Community
+   */
   @autoserialize
   @relationship(ResourceType.Collection, true)
   collections: string[];
diff --git a/src/app/core/cache/models/normalized-item.model.ts b/src/app/core/cache/models/normalized-item.model.ts
index d6e9165471..7d518bd048 100644
--- a/src/app/core/cache/models/normalized-item.model.ts
+++ b/src/app/core/cache/models/normalized-item.model.ts
@@ -5,6 +5,9 @@ import { Item } from '../../shared/item.model';
 import { mapsTo, relationship } from '../builders/build-decorators';
 import { ResourceType } from '../../shared/resource-type';
 
+/**
+ * Normalized model class for a DSpace Item
+ */
 @mapsTo(Item)
 @inheritSerialization(NormalizedDSpaceObject)
 export class NormalizedItem extends NormalizedDSpaceObject {
@@ -53,6 +56,9 @@ export class NormalizedItem extends NormalizedDSpaceObject {
   @relationship(ResourceType.Collection, false)
   owningCollection: string;
 
+  /**
+   * List of Bitstreams that are owned by this Item
+   */
   @autoserialize
   @relationship(ResourceType.Bitstream, true)
   bitstreams: string[];
diff --git a/src/app/core/cache/models/normalized-resource-policy.model.ts b/src/app/core/cache/models/normalized-resource-policy.model.ts
index 3a874da46b..b767ca6491 100644
--- a/src/app/core/cache/models/normalized-resource-policy.model.ts
+++ b/src/app/core/cache/models/normalized-resource-policy.model.ts
@@ -1,23 +1,49 @@
 import { autoserialize, autoserializeAs, inheritSerialization } from 'cerialize';
 import { ResourcePolicy } from '../../shared/resource-policy.model';
 
-import { mapsTo } from '../builders/build-decorators';
-import { IDToUUIDSerializer } from '../it-to-uuid-serializer';
+import { mapsTo, relationship } from '../builders/build-decorators';
 import { NormalizedObject } from './normalized-object.model';
+import { IDToUUIDSerializer } from '../id-to-uuid-serializer';
+import { ResourceType } from '../../shared/resource-type';
+import { ActionType } from './action-type.model';
 
+/**
+ * Normalized model class for a Resource Policy
+ */
 @mapsTo(ResourcePolicy)
 @inheritSerialization(NormalizedObject)
 export class NormalizedResourcePolicy extends NormalizedObject {
 
+  /**
+   * The action that is allowed by this Resource Policy
+   */
+  action: ActionType;
+
+  /**
+   * The name for this Resource Policy
+   */
   @autoserialize
   name: string;
 
+  /**
+   * The uuid of the Group this Resource Policy applies to
+   */
+  @relationship(ResourceType.Group, false)
   @autoserializeAs(String, 'groupUUID')
   group: string;
 
+  /**
+   * Identifier for this Resource Policy
+   * Note that this ID is unique for resource policies,
+   * but might not be unique across different object types
+   */
   @autoserialize
   id: string;
 
+  /**
+   * The universally unique identifier for this Resource Policy
+   * Consist of a prefix and the id field to ensure the identifier is unique across all object types
+   */
   @autoserializeAs(new IDToUUIDSerializer('resource-policy'), 'id')
   uuid: string;
 }
diff --git a/src/app/core/cache/models/support-level.model.ts b/src/app/core/cache/models/support-level.model.ts
new file mode 100644
index 0000000000..30f759d55f
--- /dev/null
+++ b/src/app/core/cache/models/support-level.model.ts
@@ -0,0 +1,19 @@
+/**
+ * Enum representing the Support Level of a Bitstream Format
+ */
+export enum SupportLevel {
+  /**
+   * Unknown for Bitstream Formats that are unknown to the system
+   */
+  Unknown = 0,
+
+  /**
+   * Unknown for Bitstream Formats that are known to the system, but not fully supported
+   */
+  Known = 1,
+
+  /**
+   * Supported for Bitstream Formats that are known to the system and fully supported
+   */
+  Supported = 2,
+}
diff --git a/src/app/core/shared/bitstream-format.model.ts b/src/app/core/shared/bitstream-format.model.ts
index 0089abce4a..9af345e607 100644
--- a/src/app/core/shared/bitstream-format.model.ts
+++ b/src/app/core/shared/bitstream-format.model.ts
@@ -2,24 +2,54 @@
 import { CacheableObject } from '../cache/object-cache.reducer';
 import { ResourceType } from './resource-type';
 
+/**
+ * Model class for a Bitstream Format
+ */
 export class BitstreamFormat implements CacheableObject {
 
+  /**
+   * Short description of this Bitstream Format
+   */
   shortDescription: string;
 
+  /**
+   * Description of this Bitstream Format
+   */
   description: string;
 
+  /**
+   * String representing the MIME type of this Bitstream Format
+   */
   mimetype: string;
 
+  /**
+   * The level of support the system offers for this Bitstream Format
+   */
   supportLevel: number;
 
+  /**
+   * True if the Bitstream Format is used to store system information, rather than the content of items in the system
+   */
   internal: boolean;
 
+  /**
+   * String representing this Bitstream Format's file extension
+   */
   extensions: string;
 
+  /**
+   * The link to the rest endpoint where this Bitstream Format can be found
+   */
   self: string;
 
+  /**
+   * A ResourceType representing the kind of Object of this BitstreamFormat
+   */
   type: ResourceType;
 
+  /**
+   * Universally unique identifier for this Bitstream Format
+   */
   uuid: string;
 
 }
diff --git a/src/app/core/shared/resource-policy.model.ts b/src/app/core/shared/resource-policy.model.ts
index 3bca324a47..cccbea1e89 100644
--- a/src/app/core/shared/resource-policy.model.ts
+++ b/src/app/core/shared/resource-policy.model.ts
@@ -1,20 +1,40 @@
-
 import { CacheableObject } from '../cache/object-cache.reducer';
 import { ResourceType } from './resource-type';
+import { Group } from '../eperson/models/group.model';
+import { ActionType } from '../cache/models/action-type.model';
 
+/**
+ * Model class for a Resource Policy
+ */
 export class ResourcePolicy implements CacheableObject {
+  /**
+   * The action that is allowed by this Resource Policy
+   */
+  action: ActionType;
 
-  action: string;
-
+  /**
+   * The name for this Resource Policy
+   */
   name: string;
 
-  // TODO group should ofcourse become a group object
-  group: string;
+  /**
+   * The Group this Resource Policy applies to
+   */
+  group: Group;
 
+  /**
+   * The link to the rest endpoint where this Resource Policy can be found
+   */
   self: string;
 
+  /**
+   * A ResourceType representing the kind of Object of this ResourcePolicy
+   */
   type: ResourceType;
 
+  /**
+   * The universally unique identifier for this Resource Policy
+   */
   uuid: string;
 
 }

From a4855ce9ea6bdd4eecd62999a21ef63e64b5a952 Mon Sep 17 00:00:00 2001
From: lotte <lotte_hofstede@hotmail.com>
Date: Thu, 9 Aug 2018 11:50:42 +0200
Subject: [PATCH 16/16] fixed some tests after merge

---
 .../core/cache/id-to-uuid-serializer.spec.ts  |  2 +-
 ...tegration-response-parsing.service.spec.ts | 35 +++++++++++--------
 .../integration-response-parsing.service.ts   |  2 +-
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/app/core/cache/id-to-uuid-serializer.spec.ts b/src/app/core/cache/id-to-uuid-serializer.spec.ts
index 662d79cdce..e7f6929ddd 100644
--- a/src/app/core/cache/id-to-uuid-serializer.spec.ts
+++ b/src/app/core/cache/id-to-uuid-serializer.spec.ts
@@ -1,4 +1,4 @@
-import { IDToUUIDSerializer } from './it-to-uuid-serializer';
+import { IDToUUIDSerializer } from './id-to-uuid-serializer';
 
 describe('IDToUUIDSerializer', () => {
   let serializer: IDToUUIDSerializer;
diff --git a/src/app/core/integration/integration-response-parsing.service.spec.ts b/src/app/core/integration/integration-response-parsing.service.spec.ts
index e2e2f92d5a..9c3e5b0344 100644
--- a/src/app/core/integration/integration-response-parsing.service.spec.ts
+++ b/src/app/core/integration/integration-response-parsing.service.spec.ts
@@ -8,6 +8,8 @@ import { CoreState } from '../core.reducers';
 import { IntegrationResponseParsingService } from './integration-response-parsing.service';
 import { IntegrationRequest } from '../data/request.models';
 import { AuthorityValueModel } from './models/authority-value.model';
+import { PageInfo } from '../shared/page-info.model';
+import { PaginatedList } from '../data/paginated-list';
 
 describe('IntegrationResponseParsingService', () => {
   let service: IntegrationResponseParsingService;
@@ -78,7 +80,7 @@ describe('IntegrationResponseParsingService', () => {
 
         },
         _links: {
-          self: 'https://rest.api/integration/authorities/type/entries'
+          self: { href: 'https://rest.api/integration/authorities/type/entries' }
         }
       },
       statusCode: '200'
@@ -141,39 +143,44 @@ describe('IntegrationResponseParsingService', () => {
       },
       statusCode: '200'
     };
-
-    const definitions = [
-      Object.assign(new AuthorityValueModel(), {
+    const pageinfo = Object.assign(new PageInfo(), { elementsPerPage: 5, totalElements: 5, totalPages: 1, currentPage: 1 });
+    const definitions = new PaginatedList(pageinfo,[
+      Object.assign({}, new AuthorityValueModel(), {
+        type: 'authority',
         display: 'One',
         id: 'One',
-        otherInformation: {},
+        otherInformation: undefined,
         value: 'One'
       }),
-      Object.assign(new AuthorityValueModel(), {
+      Object.assign({}, new AuthorityValueModel(), {
+        type: 'authority',
         display: 'Two',
         id: 'Two',
-        otherInformation: {},
+        otherInformation: undefined,
         value: 'Two'
       }),
-      Object.assign(new AuthorityValueModel(), {
+      Object.assign({}, new AuthorityValueModel(), {
+        type: 'authority',
         display: 'Three',
         id: 'Three',
-        otherInformation: {},
+        otherInformation: undefined,
         value: 'Three'
       }),
-      Object.assign(new AuthorityValueModel(), {
+      Object.assign({}, new AuthorityValueModel(), {
+        type: 'authority',
         display: 'Four',
         id: 'Four',
-        otherInformation: {},
+        otherInformation: undefined,
         value: 'Four'
       }),
-      Object.assign(new AuthorityValueModel(), {
+      Object.assign({}, new AuthorityValueModel(), {
+        type: 'authority',
         display: 'Five',
         id: 'Five',
-        otherInformation: {},
+        otherInformation: undefined,
         value: 'Five'
       })
-    ];
+    ]);
 
     it('should return a IntegrationSuccessResponse if data contains a valid endpoint response', () => {
       const response = service.parse(validRequest, validResponse);
diff --git a/src/app/core/integration/integration-response-parsing.service.ts b/src/app/core/integration/integration-response-parsing.service.ts
index 5d6ce09114..06c6b9620d 100644
--- a/src/app/core/integration/integration-response-parsing.service.ts
+++ b/src/app/core/integration/integration-response-parsing.service.ts
@@ -33,7 +33,7 @@ export class IntegrationResponseParsingService extends BaseResponseParsingServic
   parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
     if (isNotEmpty(data.payload) && isNotEmpty(data.payload._links)) {
       const dataDefinition = this.process<IntegrationModel,IntegrationType>(data.payload, request.href);
-      return new IntegrationSuccessResponse(dataDefinition[Object.keys(dataDefinition)[0]], data.statusCode, this.processPageInfo(data.payload.page));
+      return new IntegrationSuccessResponse(dataDefinition, data.statusCode, this.processPageInfo(data.payload.page));
     } else {
       return new ErrorResponse(
         Object.assign(