From ea075fbd8f286b11f3760b5eaec153b3ed0230f9 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Mon, 10 Sep 2018 08:44:56 +0200
Subject: [PATCH 01/23] Correct parsing of AuthStatus and small changes

---
 src/app/core/auth/auth-response-parsing.service.ts       | 5 +++--
 src/app/core/auth/auth.service.ts                        | 2 +-
 src/app/core/auth/models/auth-status.model.ts            | 2 +-
 src/app/core/auth/models/normalized-auth-status.model.ts | 2 +-
 src/app/core/auth/server-auth.service.ts                 | 2 +-
 src/app/shared/testing/auth-request-service-stub.ts      | 4 ++--
 src/app/shared/testing/auth-service-stub.ts              | 2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/app/core/auth/auth-response-parsing.service.ts b/src/app/core/auth/auth-response-parsing.service.ts
index 80c1b2eeca..f024035c06 100644
--- a/src/app/core/auth/auth-response-parsing.service.ts
+++ b/src/app/core/auth/auth-response-parsing.service.ts
@@ -26,8 +26,9 @@ export class AuthResponseParsingService extends BaseResponseParsingService imple
 
   parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
     if (isNotEmpty(data.payload) && isNotEmpty(data.payload._links) && (data.statusCode === '200' || data.statusCode === 'OK')) {
-      const response = this.process<AuthStatus, AuthType>(data.payload, request.href);
-      return new AuthStatusResponse(response[Object.keys(response)[0]][0], data.statusCode);
+      const response: AuthStatus = this.process<AuthStatus, AuthType>(data.payload, request.href);
+      response.eperson = data.payload._embedded.eperson;
+      return new AuthStatusResponse(response, data.statusCode);
     } else {
       return new AuthStatusResponse(data.payload as AuthStatus, data.statusCode);
     }
diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts
index 2848b54b50..2eb6736d89 100644
--- a/src/app/core/auth/auth.service.ts
+++ b/src/app/core/auth/auth.service.ts
@@ -126,7 +126,7 @@ export class AuthService {
     return this.authRequestService.getRequest('status', options)
       .map((status: AuthStatus) => {
         if (status.authenticated) {
-          return status.eperson[0];
+          return status.eperson;
         } else {
           throw(new Error('Not authenticated'));
         }
diff --git a/src/app/core/auth/models/auth-status.model.ts b/src/app/core/auth/models/auth-status.model.ts
index 22c9d14718..9d69c18388 100644
--- a/src/app/core/auth/models/auth-status.model.ts
+++ b/src/app/core/auth/models/auth-status.model.ts
@@ -13,7 +13,7 @@ export class AuthStatus {
 
   error?: AuthError;
 
-  eperson: Eperson[];
+  eperson: Eperson;
 
   token?: AuthTokenInfo;
 
diff --git a/src/app/core/auth/models/normalized-auth-status.model.ts b/src/app/core/auth/models/normalized-auth-status.model.ts
index 19952f7c70..c63c611a75 100644
--- a/src/app/core/auth/models/normalized-auth-status.model.ts
+++ b/src/app/core/auth/models/normalized-auth-status.model.ts
@@ -21,6 +21,6 @@ export class NormalizedAuthStatus extends NormalizedDSpaceObject {
   authenticated: boolean;
 
   @autoserializeAs(Eperson)
-  eperson: Eperson[];
+  eperson: Eperson;
 
 }
diff --git a/src/app/core/auth/server-auth.service.ts b/src/app/core/auth/server-auth.service.ts
index 96ee2e355a..00dfbc5615 100644
--- a/src/app/core/auth/server-auth.service.ts
+++ b/src/app/core/auth/server-auth.service.ts
@@ -35,7 +35,7 @@ export class ServerAuthService extends AuthService {
     return this.authRequestService.getRequest('status', options)
       .map((status: AuthStatus) => {
         if (status.authenticated) {
-          return status.eperson[0];
+          return status.eperson;
         } else {
           throw(new Error('Not authenticated'));
         }
diff --git a/src/app/shared/testing/auth-request-service-stub.ts b/src/app/shared/testing/auth-request-service-stub.ts
index 2c47068af4..9703f49967 100644
--- a/src/app/shared/testing/auth-request-service-stub.ts
+++ b/src/app/shared/testing/auth-request-service-stub.ts
@@ -26,7 +26,7 @@ export class AuthRequestServiceStub {
       if (this.validateToken(token)) {
         authStatusStub.authenticated = true;
         authStatusStub.token = this.mockTokenInfo;
-        authStatusStub.eperson = [this.mockUser];
+        authStatusStub.eperson = this.mockUser;
       } else {
         authStatusStub.authenticated = false;
       }
@@ -45,7 +45,7 @@ export class AuthRequestServiceStub {
         if (this.validateToken(token)) {
           authStatusStub.authenticated = true;
           authStatusStub.token = this.mockTokenInfo;
-          authStatusStub.eperson = [this.mockUser];
+          authStatusStub.eperson = this.mockUser;
         } else {
           authStatusStub.authenticated = false;
         }
diff --git a/src/app/shared/testing/auth-service-stub.ts b/src/app/shared/testing/auth-service-stub.ts
index c7d5556910..9e830930c1 100644
--- a/src/app/shared/testing/auth-service-stub.ts
+++ b/src/app/shared/testing/auth-service-stub.ts
@@ -19,7 +19,7 @@ export class AuthServiceStub {
       authStatus.okay = true;
       authStatus.authenticated = true;
       authStatus.token = this.token;
-      authStatus.eperson = [EpersonMock];
+      authStatus.eperson = EpersonMock;
       return Observable.of(authStatus);
     } else {
       console.log('error');

From 6b986c8c9172549b8a90c84401213c76b33d1c74 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 26 Sep 2018 09:44:01 +0200
Subject: [PATCH 02/23] 55693: Item mapper page + ItemSelectComponent

---
 resources/i18n/en.json                        | 13 ++++
 .../collection-item-mapper.component.html     | 45 ++++++++++++
 .../collection-item-mapper.component.scss     |  5 ++
 .../collection-item-mapper.component.spec.ts  |  0
 .../collection-item-mapper.component.ts       | 69 +++++++++++++++++++
 .../collection-page-routing.module.ts         |  9 +++
 .../collection-page.module.ts                 |  2 +
 .../item-select/item-select.component.html    | 20 ++++++
 .../item-select/item-select.component.scss    |  0
 .../item-select/item-select.component.spec.ts |  0
 .../item-select/item-select.component.ts      | 28 ++++++++
 src/app/shared/shared.module.ts               |  4 +-
 12 files changed, 194 insertions(+), 1 deletion(-)
 create mode 100644 src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
 create mode 100644 src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.scss
 create mode 100644 src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
 create mode 100644 src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
 create mode 100644 src/app/shared/item-select/item-select.component.html
 create mode 100644 src/app/shared/item-select/item-select.component.scss
 create mode 100644 src/app/shared/item-select/item-select.component.spec.ts
 create mode 100644 src/app/shared/item-select/item-select.component.ts

diff --git a/resources/i18n/en.json b/resources/i18n/en.json
index c7cb9a5ba7..e75441c477 100644
--- a/resources/i18n/en.json
+++ b/resources/i18n/en.json
@@ -13,6 +13,12 @@
           "head": "Recent Submissions"
         }
       }
+    },
+    "item-mapper": {
+      "head": "Item Mapper - Map Items from Other Collections",
+      "collection": "Collection: \"<b>{{name}}</b>\"",
+      "description": "This is the item mapper tool that allows collection administrators to map items from other collections into this collection. You can search for items from other collections and map them, or browse the list of currently mapped items.",
+      "return": "Return"
     }
   },
   "community": {
@@ -43,6 +49,13 @@
         "simple": "Simple item page",
         "full": "Full item page"
       }
+    },
+    "select": {
+      "table": {
+        "collection": "Collection",
+        "author": "Author",
+        "title": "Title"
+      }
     }
   },
   "nav": {
diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
new file mode 100644
index 0000000000..078eabd1c7
--- /dev/null
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
@@ -0,0 +1,45 @@
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      <h2>{{'collection.item-mapper.head' | translate}}</h2>
+      <p [innerHTML]="'collection.item-mapper.collection' | translate:{ name: (collectionRD$ | async)?.payload?.name }"></p>
+      <p>{{'collection.item-mapper.description' | translate}}</p>
+
+      <div class="row">
+        <div class="col-12 col-lg-6">
+          <ds-search-form id="search-form"
+                          [query]="(searchOptions$ | async)?.query"
+                          [scope]="(searchOptions$ | async)?.scope"
+                          [currentUrl]="getCurrentUrl()">
+          </ds-search-form>
+        </div>
+      </div>
+      <ul class="nav nav-tabs mb-2">
+        <li class="nav-item">
+          <span class="tab nav-link" id="tab-browse-content" (click)="activeTab = 0" [ngClass]="(activeTab == 0)?'active':''">Browse</span>
+        </li>
+        <li class="nav-item">
+          <span class="tab nav-link" id="tab-map-content" (click)="activeTab = 1" [ngClass]="(activeTab == 1)?'active':''">Map</span>
+        </li>
+      </ul>
+
+      <div class="tab-content">
+        <!-- Browse Tab -->
+        <div *ngIf="activeTab == 0" id="tab-browse">
+          <ds-viewable-collection
+            [config]="(searchOptions$ | async)?.pagination"
+            [sortConfig]="(searchOptions$ | async)?.sort"
+            [objects]="collectionItemsRD$ | async">
+          </ds-viewable-collection>
+        </div>
+
+        <!-- Map Tab -->
+        <div *ngIf="activeTab == 1" id="tab-map">
+          <ds-item-select [items$]="mappingItemsRD$"></ds-item-select>
+        </div>
+      </div>
+
+      <button [routerLink]="['/collections/', (collectionRD$ | async)?.payload?.id]" class="btn btn-outline-secondary">{{'collection.item-mapper.return' | translate}}</button>
+    </div>
+  </div>
+</div>
diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.scss b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.scss
new file mode 100644
index 0000000000..4414c21645
--- /dev/null
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.scss
@@ -0,0 +1,5 @@
+@import '../../../styles/variables.scss';
+
+.tab:hover {
+  cursor: pointer;
+}
diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
new file mode 100644
index 0000000000..4456d3138e
--- /dev/null
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
@@ -0,0 +1,69 @@
+import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import { fadeIn, fadeInOut } from '../../shared/animations/fade';
+import { CollectionDataService } from '../../core/data/collection-data.service';
+import { ActivatedRoute, PRIMARY_OUTLET, Router, UrlSegmentGroup } from '@angular/router';
+import { RemoteData } from '../../core/data/remote-data';
+import { Observable } from 'rxjs/Observable';
+import { Collection } from '../../core/shared/collection.model';
+import { SearchConfigurationService } from '../../+search-page/search-service/search-configuration.service';
+import { PaginatedSearchOptions } from '../../+search-page/paginated-search-options.model';
+import { PaginatedList } from '../../core/data/paginated-list';
+import { Item } from '../../core/shared/item.model';
+import { combineLatest, flatMap, map, tap } from 'rxjs/operators';
+import { getSucceededRemoteData, toDSpaceObjectListRD } from '../../core/shared/operators';
+import { SearchService } from '../../+search-page/search-service/search.service';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
+
+@Component({
+  selector: 'ds-collection-item-mapper',
+  styleUrls: ['./collection-item-mapper.component.scss'],
+  templateUrl: './collection-item-mapper.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  animations: [
+    fadeIn,
+    fadeInOut
+  ]
+})
+export class CollectionItemMapperComponent implements OnInit {
+
+  collectionRD$: Observable<RemoteData<Collection>>;
+  searchOptions$: Observable<PaginatedSearchOptions>;
+  collectionItemsRD$: Observable<RemoteData<PaginatedList<DSpaceObject>>>;
+  mappingItemsRD$: Observable<RemoteData<PaginatedList<DSpaceObject>>>;
+
+  activeTab = 0;
+
+  constructor(private collectionDataService: CollectionDataService,
+              private route: ActivatedRoute,
+              private router: Router,
+              private searchConfigService: SearchConfigurationService,
+              private searchService: SearchService) {
+  }
+
+  ngOnInit(): void {
+    this.collectionRD$ = this.route.data.map((data) => data.collection);
+    this.searchOptions$ = this.searchConfigService.paginatedSearchOptions;
+    this.collectionItemsRD$ = this.collectionRD$.pipe(
+      getSucceededRemoteData(),
+      combineLatest(this.searchOptions$),
+      flatMap(([collectionRD, options]) => {
+        return this.searchService.search(Object.assign(options, {
+          scope: collectionRD.payload.id
+        }));
+      }),
+      toDSpaceObjectListRD()
+    );
+    this.mappingItemsRD$ = this.searchOptions$.pipe(
+      flatMap((options: PaginatedSearchOptions) => this.searchService.search(options)),
+      toDSpaceObjectListRD()
+    );
+  }
+
+  getCurrentUrl(): string {
+    const urlTree = this.router.parseUrl(this.router.url);
+    const g: UrlSegmentGroup = urlTree.root.children[PRIMARY_OUTLET];
+    return '/' + g.toString();
+  }
+
+}
diff --git a/src/app/+collection-page/collection-page-routing.module.ts b/src/app/+collection-page/collection-page-routing.module.ts
index ca56bca2cd..c85d102437 100644
--- a/src/app/+collection-page/collection-page-routing.module.ts
+++ b/src/app/+collection-page/collection-page-routing.module.ts
@@ -3,6 +3,7 @@ import { RouterModule } from '@angular/router';
 
 import { CollectionPageComponent } from './collection-page.component';
 import { CollectionPageResolver } from './collection-page.resolver';
+import { CollectionItemMapperComponent } from './collection-item-mapper/collection-item-mapper.component';
 
 @NgModule({
   imports: [
@@ -14,6 +15,14 @@ import { CollectionPageResolver } from './collection-page.resolver';
         resolve: {
           collection: CollectionPageResolver
         }
+      },
+      {
+        path: ':id/mapper',
+        component: CollectionItemMapperComponent,
+        pathMatch: 'full',
+        resolve: {
+          collection: CollectionPageResolver
+        }
       }
     ])
   ],
diff --git a/src/app/+collection-page/collection-page.module.ts b/src/app/+collection-page/collection-page.module.ts
index 85462e67a3..79efea46c0 100644
--- a/src/app/+collection-page/collection-page.module.ts
+++ b/src/app/+collection-page/collection-page.module.ts
@@ -6,6 +6,7 @@ import { SharedModule } from '../shared/shared.module';
 import { CollectionPageComponent } from './collection-page.component';
 import { CollectionPageRoutingModule } from './collection-page-routing.module';
 import { SearchPageModule } from '../+search-page/search-page.module';
+import { CollectionItemMapperComponent } from './collection-item-mapper/collection-item-mapper.component';
 
 @NgModule({
   imports: [
@@ -16,6 +17,7 @@ import { SearchPageModule } from '../+search-page/search-page.module';
   ],
   declarations: [
     CollectionPageComponent,
+    CollectionItemMapperComponent
   ]
 })
 export class CollectionPageModule {
diff --git a/src/app/shared/item-select/item-select.component.html b/src/app/shared/item-select/item-select.component.html
new file mode 100644
index 0000000000..c2d02b4529
--- /dev/null
+++ b/src/app/shared/item-select/item-select.component.html
@@ -0,0 +1,20 @@
+<div class="table-responsive">
+  <table id="item-select" class="table table-striped table-hover">
+    <thead>
+      <tr>
+        <th></th>
+        <th scope="col">{{'item.select.table.collection' | translate}}</th>
+        <th scope="col">{{'item.select.table.author' | translate}}</th>
+        <th scope="col">{{'item.select.table.title' | translate}}</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr *ngFor="let item of (items$ | async)?.payload?.page ; let i = index">
+        <td><input [(ngModel)]="checked[i]" type="checkbox"></td>
+        <td><a [routerLink]="['/items', item.id]">{{(item.owningCollection | async)?.payload?.name}}</a></td>
+        <td><a [routerLink]="['/items', item.id]">{{item.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])[0].value}}</a></td>
+        <td><a [routerLink]="['/items', item.id]">{{item.findMetadata("dc.title")}}</a></td>
+      </tr>
+    </tbody>
+  </table>
+</div>
diff --git a/src/app/shared/item-select/item-select.component.scss b/src/app/shared/item-select/item-select.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/item-select/item-select.component.spec.ts b/src/app/shared/item-select/item-select.component.spec.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/item-select/item-select.component.ts b/src/app/shared/item-select/item-select.component.ts
new file mode 100644
index 0000000000..7159d94962
--- /dev/null
+++ b/src/app/shared/item-select/item-select.component.ts
@@ -0,0 +1,28 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { PaginatedList } from '../../core/data/paginated-list';
+import { RemoteData } from '../../core/data/remote-data';
+import { Observable } from 'rxjs/Observable';
+import { Item } from '../../core/shared/item.model';
+
+@Component({
+  selector: 'ds-item-select',
+  styleUrls: ['./item-select.component.scss'],
+  templateUrl: './item-select.component.html'
+})
+
+export class ItemSelectComponent implements OnInit {
+
+  @Input()
+  items$: Observable<RemoteData<PaginatedList<Item>>>;
+
+  checked: boolean[] = [];
+
+  constructor(private itemDataService: ItemDataService) {
+  }
+
+  ngOnInit(): void {
+    this.items$ = this.itemDataService.findAll({});
+  }
+
+}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index b6122dc70a..c5c6cad09b 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -83,6 +83,7 @@ import { InputSuggestionsComponent } from './input-suggestions/input-suggestions
 import { CapitalizePipe } from './utils/capitalize.pipe';
 import { MomentModule } from 'angular2-moment';
 import { ObjectKeysPipe } from './utils/object-keys-pipe';
+import { ItemSelectComponent } from './item-select/item-select.component';
 
 const MODULES = [
   // Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -156,7 +157,8 @@ const COMPONENTS = [
   TruncatableComponent,
   TruncatablePartComponent,
   BrowseByComponent,
-  InputSuggestionsComponent
+  InputSuggestionsComponent,
+  ItemSelectComponent
 ];
 
 const ENTRY_COMPONENTS = [

From 315b6a9690fa7f3c7f0ed72a57c0ea2e37d60b22 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 26 Sep 2018 11:02:11 +0200
Subject: [PATCH 03/23] 55693: Intermediate commit

---
 .../collection-item-mapper.component.html     |  2 +-
 .../collection-item-mapper.component.ts       |  9 +++-
 .../item-select/item-select.component.html    | 47 +++++++++++--------
 .../item-select/item-select.component.ts      | 10 ++--
 4 files changed, 42 insertions(+), 26 deletions(-)

diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
index 078eabd1c7..1f7dd29396 100644
--- a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
@@ -35,7 +35,7 @@
 
         <!-- Map Tab -->
         <div *ngIf="activeTab == 1" id="tab-map">
-          <ds-item-select [items$]="mappingItemsRD$"></ds-item-select>
+          <ds-item-select [itemsRD$]="mappingItemsRD$" [paginationOptions]="(searchOptions$ | async)?.pagination"></ds-item-select>
         </div>
       </div>
 
diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
index 4456d3138e..81b964de36 100644
--- a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
@@ -49,13 +49,18 @@ export class CollectionItemMapperComponent implements OnInit {
       combineLatest(this.searchOptions$),
       flatMap(([collectionRD, options]) => {
         return this.searchService.search(Object.assign(options, {
-          scope: collectionRD.payload.id
+          scope: collectionRD.payload.id,
+          dsoType: DSpaceObjectType.ITEM
         }));
       }),
       toDSpaceObjectListRD()
     );
     this.mappingItemsRD$ = this.searchOptions$.pipe(
-      flatMap((options: PaginatedSearchOptions) => this.searchService.search(options)),
+      flatMap((options: PaginatedSearchOptions) => {
+        return this.searchService.search(Object.assign(options, {
+          dsoType: DSpaceObjectType.ITEM
+        }));
+      }),
       toDSpaceObjectListRD()
     );
   }
diff --git a/src/app/shared/item-select/item-select.component.html b/src/app/shared/item-select/item-select.component.html
index c2d02b4529..1705495a20 100644
--- a/src/app/shared/item-select/item-select.component.html
+++ b/src/app/shared/item-select/item-select.component.html
@@ -1,20 +1,27 @@
-<div class="table-responsive">
-  <table id="item-select" class="table table-striped table-hover">
-    <thead>
-      <tr>
-        <th></th>
-        <th scope="col">{{'item.select.table.collection' | translate}}</th>
-        <th scope="col">{{'item.select.table.author' | translate}}</th>
-        <th scope="col">{{'item.select.table.title' | translate}}</th>
-      </tr>
-    </thead>
-    <tbody>
-      <tr *ngFor="let item of (items$ | async)?.payload?.page ; let i = index">
-        <td><input [(ngModel)]="checked[i]" type="checkbox"></td>
-        <td><a [routerLink]="['/items', item.id]">{{(item.owningCollection | async)?.payload?.name}}</a></td>
-        <td><a [routerLink]="['/items', item.id]">{{item.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])[0].value}}</a></td>
-        <td><a [routerLink]="['/items', item.id]">{{item.findMetadata("dc.title")}}</a></td>
-      </tr>
-    </tbody>
-  </table>
-</div>
+<ds-pagination
+  *ngIf="(itemsRD$ | async)?.payload?.totalElements > 0"
+  [paginationOptions]="paginationOptions"
+  [pageInfoState]="(itemsRD$ | async)?.payload"
+  [collectionSize]="(itemsRD$ | async)?.payload?.totalElements"
+  [hidePagerWhenSinglePage]="true">
+  <div class="table-responsive">
+    <table id="item-select" class="table table-striped table-hover">
+      <thead>
+        <tr>
+          <th></th>
+          <th scope="col">{{'item.select.table.collection' | translate}}</th>
+          <th scope="col">{{'item.select.table.author' | translate}}</th>
+          <th scope="col">{{'item.select.table.title' | translate}}</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr *ngFor="let item of (itemsRD$ | async)?.payload?.page ; let i = index">
+          <td><input [(ngModel)]="checked[i]" type="checkbox"></td>
+          <td><a [routerLink]="['/items', item.id]">{{(item.owningCollection | async)?.payload?.name}}</a></td>
+          <td><a [routerLink]="['/items', item.id]">{{item.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])[0].value}}</a></td>
+          <td><a [routerLink]="['/items', item.id]">{{item.findMetadata("dc.title")}}</a></td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</ds-pagination>
diff --git a/src/app/shared/item-select/item-select.component.ts b/src/app/shared/item-select/item-select.component.ts
index 7159d94962..e8ac0eb6f4 100644
--- a/src/app/shared/item-select/item-select.component.ts
+++ b/src/app/shared/item-select/item-select.component.ts
@@ -1,9 +1,10 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { ItemDataService } from '../../core/data/item-data.service';
 import { PaginatedList } from '../../core/data/paginated-list';
 import { RemoteData } from '../../core/data/remote-data';
 import { Observable } from 'rxjs/Observable';
 import { Item } from '../../core/shared/item.model';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 
 @Component({
   selector: 'ds-item-select',
@@ -14,7 +15,10 @@ import { Item } from '../../core/shared/item.model';
 export class ItemSelectComponent implements OnInit {
 
   @Input()
-  items$: Observable<RemoteData<PaginatedList<Item>>>;
+  itemsRD$: Observable<RemoteData<PaginatedList<Item>>>;
+
+  @Input()
+  paginationOptions: PaginationComponentOptions;
 
   checked: boolean[] = [];
 
@@ -22,7 +26,7 @@ export class ItemSelectComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.items$ = this.itemDataService.findAll({});
+    this.itemsRD$.subscribe((value) => console.log(value));
   }
 
 }

From 3dc09062d043ac27b133a203dce1fe34820e40dc Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 26 Sep 2018 11:45:10 +0200
Subject: [PATCH 04/23] 55693: Tabset

---
 resources/i18n/en.json                        |  4 ++
 .../collection-item-mapper.component.html     | 39 ++++++++-----------
 .../collection-item-mapper.component.scss     |  4 --
 .../collection-item-mapper.component.ts       |  2 -
 4 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/resources/i18n/en.json b/resources/i18n/en.json
index e75441c477..63ee598199 100644
--- a/resources/i18n/en.json
+++ b/resources/i18n/en.json
@@ -18,6 +18,10 @@
       "head": "Item Mapper - Map Items from Other Collections",
       "collection": "Collection: \"<b>{{name}}</b>\"",
       "description": "This is the item mapper tool that allows collection administrators to map items from other collections into this collection. You can search for items from other collections and map them, or browse the list of currently mapped items.",
+      "tabs": {
+        "browse": "Browse",
+        "map": "Map"
+      },
       "return": "Return"
     }
   },
diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
index 1f7dd29396..3fdbdb4e7e 100644
--- a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
@@ -14,30 +14,23 @@
           </ds-search-form>
         </div>
       </div>
-      <ul class="nav nav-tabs mb-2">
-        <li class="nav-item">
-          <span class="tab nav-link" id="tab-browse-content" (click)="activeTab = 0" [ngClass]="(activeTab == 0)?'active':''">Browse</span>
-        </li>
-        <li class="nav-item">
-          <span class="tab nav-link" id="tab-map-content" (click)="activeTab = 1" [ngClass]="(activeTab == 1)?'active':''">Map</span>
-        </li>
-      </ul>
 
-      <div class="tab-content">
-        <!-- Browse Tab -->
-        <div *ngIf="activeTab == 0" id="tab-browse">
-          <ds-viewable-collection
-            [config]="(searchOptions$ | async)?.pagination"
-            [sortConfig]="(searchOptions$ | async)?.sort"
-            [objects]="collectionItemsRD$ | async">
-          </ds-viewable-collection>
-        </div>
-
-        <!-- Map Tab -->
-        <div *ngIf="activeTab == 1" id="tab-map">
-          <ds-item-select [itemsRD$]="mappingItemsRD$" [paginationOptions]="(searchOptions$ | async)?.pagination"></ds-item-select>
-        </div>
-      </div>
+      <ngb-tabset>
+        <ngb-tab title="{{'collection.item-mapper.tabs.browse' | translate}}">
+          <ng-template ngbTabContent>
+            <ds-viewable-collection
+              [config]="(searchOptions$ | async)?.pagination"
+              [sortConfig]="(searchOptions$ | async)?.sort"
+              [objects]="collectionItemsRD$ | async">
+            </ds-viewable-collection>
+          </ng-template>
+        </ngb-tab>
+        <ngb-tab title="{{'collection.item-mapper.tabs.map' | translate}}">
+          <ng-template ngbTabContent>
+            <ds-item-select [itemsRD$]="mappingItemsRD$" [paginationOptions]="(searchOptions$ | async)?.pagination"></ds-item-select>
+          </ng-template>
+        </ngb-tab>
+      </ngb-tabset>
 
       <button [routerLink]="['/collections/', (collectionRD$ | async)?.payload?.id]" class="btn btn-outline-secondary">{{'collection.item-mapper.return' | translate}}</button>
     </div>
diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.scss b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.scss
index 4414c21645..50be6f5ad0 100644
--- a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.scss
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.scss
@@ -1,5 +1 @@
 @import '../../../styles/variables.scss';
-
-.tab:hover {
-  cursor: pointer;
-}
diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
index 81b964de36..af0735acf7 100644
--- a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
@@ -32,8 +32,6 @@ export class CollectionItemMapperComponent implements OnInit {
   collectionItemsRD$: Observable<RemoteData<PaginatedList<DSpaceObject>>>;
   mappingItemsRD$: Observable<RemoteData<PaginatedList<DSpaceObject>>>;
 
-  activeTab = 0;
-
   constructor(private collectionDataService: CollectionDataService,
               private route: ActivatedRoute,
               private router: Router,

From 9440401ca34e49a7cfa89aed69b221bae760a56f Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 26 Sep 2018 13:16:56 +0200
Subject: [PATCH 05/23] 55693: Fixed scope being passed between tabs

---
 .../collection-item-mapper.component.html        | 16 ++++++++++------
 .../collection-item-mapper.component.ts          | 11 +++++++++--
 .../item-select/item-select.component.html       |  5 +++--
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
index 3fdbdb4e7e..f8d770423b 100644
--- a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
@@ -18,16 +18,20 @@
       <ngb-tabset>
         <ngb-tab title="{{'collection.item-mapper.tabs.browse' | translate}}">
           <ng-template ngbTabContent>
-            <ds-viewable-collection
-              [config]="(searchOptions$ | async)?.pagination"
-              [sortConfig]="(searchOptions$ | async)?.sort"
-              [objects]="collectionItemsRD$ | async">
-            </ds-viewable-collection>
+            <div class="mt-2">
+              <ds-viewable-collection
+                [config]="(searchOptions$ | async)?.pagination"
+                [sortConfig]="(searchOptions$ | async)?.sort"
+                [objects]="collectionItemsRD$ | async">
+              </ds-viewable-collection>
+            </div>
           </ng-template>
         </ngb-tab>
         <ngb-tab title="{{'collection.item-mapper.tabs.map' | translate}}">
           <ng-template ngbTabContent>
-            <ds-item-select [itemsRD$]="mappingItemsRD$" [paginationOptions]="(searchOptions$ | async)?.pagination"></ds-item-select>
+            <div class="mt-2">
+              <ds-item-select class="mt-2" [itemsRD$]="mappingItemsRD$" [paginationOptions]="(searchOptions$ | async)?.pagination"></ds-item-select>
+            </div>
           </ng-template>
         </ngb-tab>
       </ngb-tabset>
diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
index af0735acf7..622bd14547 100644
--- a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
@@ -14,6 +14,7 @@ import { getSucceededRemoteData, toDSpaceObjectListRD } from '../../core/shared/
 import { SearchService } from '../../+search-page/search-service/search.service';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
+import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 
 @Component({
   selector: 'ds-collection-item-mapper',
@@ -32,6 +33,8 @@ export class CollectionItemMapperComponent implements OnInit {
   collectionItemsRD$: Observable<RemoteData<PaginatedList<DSpaceObject>>>;
   mappingItemsRD$: Observable<RemoteData<PaginatedList<DSpaceObject>>>;
 
+  defaultSortOptions: SortOptions = new SortOptions('dc.title', SortDirection.ASC);
+
   constructor(private collectionDataService: CollectionDataService,
               private route: ActivatedRoute,
               private router: Router,
@@ -48,15 +51,19 @@ export class CollectionItemMapperComponent implements OnInit {
       flatMap(([collectionRD, options]) => {
         return this.searchService.search(Object.assign(options, {
           scope: collectionRD.payload.id,
-          dsoType: DSpaceObjectType.ITEM
+          dsoType: DSpaceObjectType.ITEM,
+          sort: this.defaultSortOptions
         }));
       }),
       toDSpaceObjectListRD()
     );
     this.mappingItemsRD$ = this.searchOptions$.pipe(
       flatMap((options: PaginatedSearchOptions) => {
+        options.sort.field = 'dc.title';
         return this.searchService.search(Object.assign(options, {
-          dsoType: DSpaceObjectType.ITEM
+          scope: undefined,
+          dsoType: DSpaceObjectType.ITEM,
+          sort: this.defaultSortOptions
         }));
       }),
       toDSpaceObjectListRD()
diff --git a/src/app/shared/item-select/item-select.component.html b/src/app/shared/item-select/item-select.component.html
index 1705495a20..d92d87e156 100644
--- a/src/app/shared/item-select/item-select.component.html
+++ b/src/app/shared/item-select/item-select.component.html
@@ -3,7 +3,8 @@
   [paginationOptions]="paginationOptions"
   [pageInfoState]="(itemsRD$ | async)?.payload"
   [collectionSize]="(itemsRD$ | async)?.payload?.totalElements"
-  [hidePagerWhenSinglePage]="true">
+  [hidePagerWhenSinglePage]="true"
+  [hideGear]="true">
   <div class="table-responsive">
     <table id="item-select" class="table table-striped table-hover">
       <thead>
@@ -18,7 +19,7 @@
         <tr *ngFor="let item of (itemsRD$ | async)?.payload?.page ; let i = index">
           <td><input [(ngModel)]="checked[i]" type="checkbox"></td>
           <td><a [routerLink]="['/items', item.id]">{{(item.owningCollection | async)?.payload?.name}}</a></td>
-          <td><a [routerLink]="['/items', item.id]">{{item.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])[0].value}}</a></td>
+          <td><a *ngIf="item.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0" [routerLink]="['/items', item.id]">{{item.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])[0].value}}</a></td>
           <td><a [routerLink]="['/items', item.id]">{{item.findMetadata("dc.title")}}</a></td>
         </tr>
       </tbody>

From 5040d230fb46568bceb5ca85a12ae7f3dce7d9eb Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Wed, 26 Sep 2018 17:30:24 +0200
Subject: [PATCH 06/23] 55693: (incomplete) store interraction for selecting
 items

---
 src/app/app.reducer.ts                        |   7 +-
 src/app/core/core.module.ts                   |   2 +
 .../shared/item-select/item-select.actions.ts |  75 +++++++++++++
 .../item-select/item-select.component.html    |   4 +-
 .../item-select/item-select.component.ts      |  11 +-
 .../shared/item-select/item-select.reducer.ts |  84 +++++++++++++++
 .../shared/item-select/item-select.service.ts | 101 ++++++++++++++++++
 7 files changed, 279 insertions(+), 5 deletions(-)
 create mode 100644 src/app/shared/item-select/item-select.actions.ts
 create mode 100644 src/app/shared/item-select/item-select.reducer.ts
 create mode 100644 src/app/shared/item-select/item-select.service.ts

diff --git a/src/app/app.reducer.ts b/src/app/app.reducer.ts
index 8dc82dfb6f..ba882b50b8 100644
--- a/src/app/app.reducer.ts
+++ b/src/app/app.reducer.ts
@@ -14,6 +14,7 @@ import {
 } from './+search-page/search-filters/search-filter/search-filter.reducer';
 import { notificationsReducer, NotificationsState } from './shared/notifications/notifications.reducers';
 import { truncatableReducer, TruncatablesState } from './shared/truncatable/truncatable.reducer';
+import { itemSelectionReducer, ItemSelectionsState } from './shared/item-select/item-select.reducer';
 
 export interface AppState {
   router: fromRouter.RouterReducerState;
@@ -23,7 +24,8 @@ export interface AppState {
   notifications: NotificationsState;
   searchSidebar: SearchSidebarState;
   searchFilter: SearchFiltersState;
-  truncatable: TruncatablesState;
+  truncatable: TruncatablesState,
+  itemSelection: ItemSelectionsState
 }
 
 export const appReducers: ActionReducerMap<AppState> = {
@@ -34,7 +36,8 @@ export const appReducers: ActionReducerMap<AppState> = {
   notifications: notificationsReducer,
   searchSidebar: sidebarReducer,
   searchFilter: filterReducer,
-  truncatable: truncatableReducer
+  truncatable: truncatableReducer,
+  itemSelection: itemSelectionReducer
 };
 
 export const routerStateSelector = (state: AppState) => state.router;
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index 73e97c7933..31b9b31244 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -64,6 +64,7 @@ import { NotificationsService } from '../shared/notifications/notifications.serv
 import { UploaderService } from '../shared/uploader/uploader.service';
 import { BrowseItemsResponseParsingService } from './data/browse-items-response-parsing-service';
 import { DSpaceObjectDataService } from './data/dspace-object-data.service';
+import { ItemSelectService } from '../shared/item-select/item-select.service';
 
 const IMPORTS = [
   CommonModule,
@@ -128,6 +129,7 @@ const PROVIDERS = [
   UploaderService,
   UUIDService,
   DSpaceObjectDataService,
+  ItemSelectService,
   // register AuthInterceptor as HttpInterceptor
   {
     provide: HTTP_INTERCEPTORS,
diff --git a/src/app/shared/item-select/item-select.actions.ts b/src/app/shared/item-select/item-select.actions.ts
new file mode 100644
index 0000000000..0f17575a28
--- /dev/null
+++ b/src/app/shared/item-select/item-select.actions.ts
@@ -0,0 +1,75 @@
+import { type } from '../ngrx/type';
+import { Action } from '@ngrx/store';
+
+export const ItemSelectionActionTypes = {
+  INITIAL_DESELECT: type('dspace/item-select/INITIAL_DESELECT'),
+  INITIAL_SELECT: type('dspace/item-select/INITIAL_SELECT'),
+  SELECT: type('dspace/item-select/SELECT'),
+  DESELECT: type('dspace/item-select/DESELECT'),
+  SWITCH: type('dspace/item-select/SWITCH'),
+  RESET: type('dspace/item-select/RESET')
+};
+
+export class ItemSelectionAction implements Action {
+  /**
+   * UUID of the item a select action can be performed on
+   */
+  id: string;
+
+  /**
+   * Type of action that will be performed
+   */
+  type;
+
+  /**
+   * Initialize with the item's UUID
+   * @param {string} id of the item
+   */
+  constructor(id: string) {
+    this.id = id;
+  }
+}
+
+/* tslint:disable:max-classes-per-file */
+/**
+ * Used to set the initial state to deselected
+ */
+export class ItemSelectionInitialDeselectAction extends ItemSelectionAction {
+  type = ItemSelectionActionTypes.INITIAL_DESELECT;
+}
+
+/**
+ * Used to set the initial state to selected
+ */
+export class ItemSelectionInitialSelectAction extends ItemSelectionAction {
+  type = ItemSelectionActionTypes.INITIAL_SELECT;
+}
+
+/**
+ * Used to select an item
+ */
+export class ItemSelectionSelectAction extends ItemSelectionAction {
+  type = ItemSelectionActionTypes.SELECT;
+}
+
+/**
+ * Used to deselect an item
+ */
+export class ItemSelectionDeselectAction extends ItemSelectionAction {
+  type = ItemSelectionActionTypes.DESELECT;
+}
+
+/**
+ * Used to switch an item between selected and deselected
+ */
+export class ItemSelectionSwitchAction extends ItemSelectionAction {
+  type = ItemSelectionActionTypes.SWITCH;
+}
+
+/**
+ * Used to reset all item's selected to be deselected
+ */
+export class ItemSelectionResetAction extends ItemSelectionAction {
+  type = ItemSelectionActionTypes.RESET;
+}
+/* tslint:enable:max-classes-per-file */
diff --git a/src/app/shared/item-select/item-select.component.html b/src/app/shared/item-select/item-select.component.html
index d92d87e156..c20e2cd6c1 100644
--- a/src/app/shared/item-select/item-select.component.html
+++ b/src/app/shared/item-select/item-select.component.html
@@ -16,8 +16,8 @@
         </tr>
       </thead>
       <tbody>
-        <tr *ngFor="let item of (itemsRD$ | async)?.payload?.page ; let i = index">
-          <td><input [(ngModel)]="checked[i]" type="checkbox"></td>
+        <tr *ngFor="let item of (itemsRD$ | async)?.payload?.page">
+          <td><input [ngModel]="getSelected(item.id) | async" (change)="switch(item.id)" type="checkbox"></td>
           <td><a [routerLink]="['/items', item.id]">{{(item.owningCollection | async)?.payload?.name}}</a></td>
           <td><a *ngIf="item.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0" [routerLink]="['/items', item.id]">{{item.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])[0].value}}</a></td>
           <td><a [routerLink]="['/items', item.id]">{{item.findMetadata("dc.title")}}</a></td>
diff --git a/src/app/shared/item-select/item-select.component.ts b/src/app/shared/item-select/item-select.component.ts
index e8ac0eb6f4..e24ce1c4fa 100644
--- a/src/app/shared/item-select/item-select.component.ts
+++ b/src/app/shared/item-select/item-select.component.ts
@@ -5,6 +5,7 @@ import { RemoteData } from '../../core/data/remote-data';
 import { Observable } from 'rxjs/Observable';
 import { Item } from '../../core/shared/item.model';
 import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import { ItemSelectService } from './item-select.service';
 
 @Component({
   selector: 'ds-item-select',
@@ -22,11 +23,19 @@ export class ItemSelectComponent implements OnInit {
 
   checked: boolean[] = [];
 
-  constructor(private itemDataService: ItemDataService) {
+  constructor(private itemSelectService: ItemSelectService) {
   }
 
   ngOnInit(): void {
     this.itemsRD$.subscribe((value) => console.log(value));
   }
 
+  switch(id: string) {
+    this.itemSelectService.switch(id);
+  }
+
+  getSelected(id: string): Observable<boolean> {
+    return this.itemSelectService.getSelected(id);
+  }
+
 }
diff --git a/src/app/shared/item-select/item-select.reducer.ts b/src/app/shared/item-select/item-select.reducer.ts
new file mode 100644
index 0000000000..1ea443850b
--- /dev/null
+++ b/src/app/shared/item-select/item-select.reducer.ts
@@ -0,0 +1,84 @@
+import { isEmpty } from '../empty.util';
+import { ItemSelectionAction, ItemSelectionActionTypes } from './item-select.actions';
+
+/**
+ * Interface that represents the state for a single filters
+ */
+export interface ItemSelectionState {
+  checked: boolean;
+}
+
+/**
+ * Interface that represents the state for all available filters
+ */
+export interface ItemSelectionsState {
+  [id: string]: ItemSelectionState
+}
+
+const initialState: ItemSelectionsState = Object.create(null);
+
+/**
+ * Performs a search filter action on the current state
+ * @param {SearchFiltersState} state The state before the action is performed
+ * @param {SearchFilterAction} action The action that should be performed
+ * @returns {SearchFiltersState} The state after the action is performed
+ */
+export function itemSelectionReducer(state = initialState, action: ItemSelectionAction): ItemSelectionsState {
+
+  switch (action.type) {
+
+    case ItemSelectionActionTypes.INITIAL_SELECT: {
+      if (isEmpty(state) || isEmpty(state[action.id])) {
+        return Object.assign({}, state, {
+          [action.id]: {
+            checked: true
+          }
+        });
+      }
+      return state;
+    }
+
+    case ItemSelectionActionTypes.INITIAL_DESELECT: {
+      if (isEmpty(state) || isEmpty(state[action.id])) {
+        return Object.assign({}, state, {
+          [action.id]: {
+            checked: false
+          }
+        });
+      }
+      return state;
+    }
+
+    case ItemSelectionActionTypes.SELECT: {
+      return Object.assign({}, state, {
+        [action.id]: {
+          checked: true
+        }
+      });
+    }
+
+    case ItemSelectionActionTypes.DESELECT: {
+      return Object.assign({}, state, {
+        [action.id]: {
+          checked: false
+        }
+      });
+    }
+
+    case ItemSelectionActionTypes.SWITCH: {
+      return Object.assign({}, state, {
+        [action.id]: {
+          checked: !state.checked
+        }
+      });
+    }
+
+    case ItemSelectionActionTypes.RESET: {
+      return {};
+    }
+
+    default: {
+      return state;
+    }
+  }
+}
diff --git a/src/app/shared/item-select/item-select.service.ts b/src/app/shared/item-select/item-select.service.ts
new file mode 100644
index 0000000000..3ba9f9a579
--- /dev/null
+++ b/src/app/shared/item-select/item-select.service.ts
@@ -0,0 +1,101 @@
+import { Injectable } from '@angular/core';
+import { createSelector, MemoizedSelector, Store } from '@ngrx/store';
+import { ItemSelectionsState, ItemSelectionState } from './item-select.reducer';
+import {
+  ItemSelectionDeselectAction,
+  ItemSelectionInitialDeselectAction,
+  ItemSelectionInitialSelectAction, ItemSelectionResetAction,
+  ItemSelectionSelectAction, ItemSelectionSwitchAction
+} from './item-select.actions';
+import { Observable } from 'rxjs/Observable';
+import { hasValue } from '../empty.util';
+
+const selectionStateSelector = (state: ItemSelectionsState) => state.selectionItem;
+
+/**
+ * Service that takes care of selecting and deselecting items
+ */
+@Injectable()
+export class ItemSelectService {
+
+  constructor(private store: Store<ItemSelectionsState>) {
+  }
+
+  /**
+   * Request the current selection of a given item
+   * @param {string} id The UUID of the item
+   * @returns {Observable<boolean>} Emits the current selection state of the given item, if it's unavailable, return false
+   */
+  getSelected(id: string): Observable<boolean> {
+    return this.store.select(selectionByIdSelector(id))
+      .map((object: ItemSelectionState) => {
+        if (object) {
+          return object.checked;
+        } else {
+          return false;
+        }
+      });
+  }
+
+  /**
+   * Dispatches an initial select action to the store for a given item
+   * @param {string} id The UUID of the item to select
+   */
+  public initialSelect(id: string): void {
+    this.store.dispatch(new ItemSelectionInitialSelectAction(id));
+  }
+
+  /**
+   * Dispatches an initial deselect action to the store for a given item
+   * @param {string} id The UUID of the item to deselect
+   */
+  public initialDeselect(id: string): void {
+    this.store.dispatch(new ItemSelectionInitialDeselectAction(id));
+  }
+
+  /**
+   * Dispatches a select action to the store for a given item
+   * @param {string} id The UUID of the item to select
+   */
+  public select(id: string): void {
+    this.store.dispatch(new ItemSelectionSelectAction(id));
+  }
+
+  /**
+   * Dispatches a deselect action to the store for a given item
+   * @param {string} id The UUID of the item to deselect
+   */
+  public deselect(id: string): void {
+    this.store.dispatch(new ItemSelectionDeselectAction(id));
+  }
+
+  /**
+   * Dispatches a switch action to the store for a given item
+   * @param {string} id The UUID of the item to select
+   */
+  public switch(id: string): void {
+    this.store.dispatch(new ItemSelectionSwitchAction(id));
+  }
+
+  /**
+   * Dispatches a reset action to the store for all items
+   */
+  public reset(): void {
+    this.store.dispatch(new ItemSelectionResetAction(null));
+  }
+
+}
+
+function selectionByIdSelector(id: string): MemoizedSelector<ItemSelectionsState, ItemSelectionState> {
+  return keySelector<ItemSelectionState>(id);
+}
+
+export function keySelector<T>(key: string): MemoizedSelector<ItemSelectionsState, T> {
+  return createSelector(selectionStateSelector, (state: ItemSelectionState) => {
+    if (hasValue(state)) {
+      return state[key];
+    } else {
+      return undefined;
+    }
+  });
+}

From 09a84edb090893e3717df93988f8f537a8176656 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 27 Sep 2018 11:09:36 +0200
Subject: [PATCH 07/23] 55693: Working store interaction for selecting items

---
 resources/i18n/en.json                        |  3 +-
 .../collection-item-mapper.component.html     |  2 +-
 .../collection-item-mapper.component.ts       |  4 +++
 .../item-select/item-select.component.html    |  3 +-
 .../item-select/item-select.component.ts      | 15 ++++++++--
 .../shared/item-select/item-select.reducer.ts |  2 +-
 .../shared/item-select/item-select.service.ts | 28 +++++++++++++++----
 7 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/resources/i18n/en.json b/resources/i18n/en.json
index 63ee598199..948f538e9a 100644
--- a/resources/i18n/en.json
+++ b/resources/i18n/en.json
@@ -59,7 +59,8 @@
         "collection": "Collection",
         "author": "Author",
         "title": "Title"
-      }
+      },
+      "confirm": "Confirm selected"
     }
   },
   "nav": {
diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
index f8d770423b..d201ce0ad6 100644
--- a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
@@ -30,7 +30,7 @@
         <ngb-tab title="{{'collection.item-mapper.tabs.map' | translate}}">
           <ng-template ngbTabContent>
             <div class="mt-2">
-              <ds-item-select class="mt-2" [itemsRD$]="mappingItemsRD$" [paginationOptions]="(searchOptions$ | async)?.pagination"></ds-item-select>
+              <ds-item-select class="mt-2" [itemsRD$]="mappingItemsRD$" [paginationOptions]="(searchOptions$ | async)?.pagination" (confirm)="mapItems($event)"></ds-item-select>
             </div>
           </ng-template>
         </ngb-tab>
diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
index 622bd14547..f796abc54a 100644
--- a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
@@ -70,6 +70,10 @@ export class CollectionItemMapperComponent implements OnInit {
     );
   }
 
+  mapItems(ids: string[]) {
+    console.log(ids);
+  }
+
   getCurrentUrl(): string {
     const urlTree = this.router.parseUrl(this.router.url);
     const g: UrlSegmentGroup = urlTree.root.children[PRIMARY_OUTLET];
diff --git a/src/app/shared/item-select/item-select.component.html b/src/app/shared/item-select/item-select.component.html
index c20e2cd6c1..4047884bc4 100644
--- a/src/app/shared/item-select/item-select.component.html
+++ b/src/app/shared/item-select/item-select.component.html
@@ -17,7 +17,7 @@
       </thead>
       <tbody>
         <tr *ngFor="let item of (itemsRD$ | async)?.payload?.page">
-          <td><input [ngModel]="getSelected(item.id) | async" (change)="switch(item.id)" type="checkbox"></td>
+          <td><input [ngModel]="getSelected(item.id) | async" (change)="switch(item.id)" type="checkbox" name="{{item.id}}"></td>
           <td><a [routerLink]="['/items', item.id]">{{(item.owningCollection | async)?.payload?.name}}</a></td>
           <td><a *ngIf="item.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0" [routerLink]="['/items', item.id]">{{item.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])[0].value}}</a></td>
           <td><a [routerLink]="['/items', item.id]">{{item.findMetadata("dc.title")}}</a></td>
@@ -26,3 +26,4 @@
     </table>
   </div>
 </ds-pagination>
+<button class="btn btn-outline-secondary" (click)="confirmSelected()">{{'item.select.confirm' | translate}}</button>
diff --git a/src/app/shared/item-select/item-select.component.ts b/src/app/shared/item-select/item-select.component.ts
index e24ce1c4fa..93128aa1d5 100644
--- a/src/app/shared/item-select/item-select.component.ts
+++ b/src/app/shared/item-select/item-select.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
 import { ItemDataService } from '../../core/data/item-data.service';
 import { PaginatedList } from '../../core/data/paginated-list';
 import { RemoteData } from '../../core/data/remote-data';
@@ -21,13 +21,16 @@ export class ItemSelectComponent implements OnInit {
   @Input()
   paginationOptions: PaginationComponentOptions;
 
-  checked: boolean[] = [];
+  @Output()
+  confirm: EventEmitter<string[]> = new EventEmitter<string[]>();
+
+  selectedIds$: Observable<string[]>;
 
   constructor(private itemSelectService: ItemSelectService) {
   }
 
   ngOnInit(): void {
-    this.itemsRD$.subscribe((value) => console.log(value));
+    this.selectedIds$ = this.itemSelectService.getAllSelected();
   }
 
   switch(id: string) {
@@ -38,4 +41,10 @@ export class ItemSelectComponent implements OnInit {
     return this.itemSelectService.getSelected(id);
   }
 
+  confirmSelected() {
+    this.selectedIds$.subscribe((ids: string[]) => {
+      this.confirm.emit(ids);
+    });
+  }
+
 }
diff --git a/src/app/shared/item-select/item-select.reducer.ts b/src/app/shared/item-select/item-select.reducer.ts
index 1ea443850b..6306adf0c4 100644
--- a/src/app/shared/item-select/item-select.reducer.ts
+++ b/src/app/shared/item-select/item-select.reducer.ts
@@ -68,7 +68,7 @@ export function itemSelectionReducer(state = initialState, action: ItemSelection
     case ItemSelectionActionTypes.SWITCH: {
       return Object.assign({}, state, {
         [action.id]: {
-          checked: !state.checked
+          checked: (isEmpty(state) || isEmpty(state[action.id])) ? true : !state[action.id].checked
         }
       });
     }
diff --git a/src/app/shared/item-select/item-select.service.ts b/src/app/shared/item-select/item-select.service.ts
index 3ba9f9a579..bf4c7ba239 100644
--- a/src/app/shared/item-select/item-select.service.ts
+++ b/src/app/shared/item-select/item-select.service.ts
@@ -9,8 +9,11 @@ import {
 } from './item-select.actions';
 import { Observable } from 'rxjs/Observable';
 import { hasValue } from '../empty.util';
+import { map } from 'rxjs/operators';
+import { AppState } from '../../app.reducer';
 
-const selectionStateSelector = (state: ItemSelectionsState) => state.selectionItem;
+const selectionStateSelector = (state: ItemSelectionsState) => state.itemSelection;
+const itemSelectionsStateSelector = (state: AppState) => state.itemSelection;
 
 /**
  * Service that takes care of selecting and deselecting items
@@ -18,7 +21,10 @@ const selectionStateSelector = (state: ItemSelectionsState) => state.selectionIt
 @Injectable()
 export class ItemSelectService {
 
-  constructor(private store: Store<ItemSelectionsState>) {
+  constructor(
+    private store: Store<ItemSelectionsState>,
+    private appStore: Store<AppState>
+  ) {
   }
 
   /**
@@ -27,14 +33,26 @@ export class ItemSelectService {
    * @returns {Observable<boolean>} Emits the current selection state of the given item, if it's unavailable, return false
    */
   getSelected(id: string): Observable<boolean> {
-    return this.store.select(selectionByIdSelector(id))
-      .map((object: ItemSelectionState) => {
+    return this.store.select(selectionByIdSelector(id)).pipe(
+      map((object: ItemSelectionState) => {
         if (object) {
           return object.checked;
         } else {
           return false;
         }
-      });
+      })
+    );
+  }
+
+  /**
+   * Request the current selection of a given item
+   * @param {string} id The UUID of the item
+   * @returns {Observable<boolean>} Emits the current selection state of the given item, if it's unavailable, return false
+   */
+  getAllSelected(): Observable<string[]> {
+    return this.appStore.select(itemSelectionsStateSelector).pipe(
+      map((state: ItemSelectionsState) => Object.keys(state).filter((key) => state[key].checked))
+    );
   }
 
   /**

From ce134bbd107bb494f51146b9e456b7df2e42fc89 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 27 Sep 2018 11:46:26 +0200
Subject: [PATCH 08/23] 55693: emit only once and reset selected items +
 notification

---
 .../collection-item-mapper.component.ts               | 11 +++++++----
 src/app/shared/item-select/item-select.component.ts   |  6 +++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
index f796abc54a..b06f486072 100644
--- a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
@@ -15,6 +15,7 @@ import { SearchService } from '../../+search-page/search-service/search.service'
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 
 @Component({
   selector: 'ds-collection-item-mapper',
@@ -35,11 +36,11 @@ export class CollectionItemMapperComponent implements OnInit {
 
   defaultSortOptions: SortOptions = new SortOptions('dc.title', SortDirection.ASC);
 
-  constructor(private collectionDataService: CollectionDataService,
-              private route: ActivatedRoute,
+  constructor(private route: ActivatedRoute,
               private router: Router,
               private searchConfigService: SearchConfigurationService,
-              private searchService: SearchService) {
+              private searchService: SearchService,
+              private notificationsService: NotificationsService) {
   }
 
   ngOnInit(): void {
@@ -71,7 +72,9 @@ export class CollectionItemMapperComponent implements OnInit {
   }
 
   mapItems(ids: string[]) {
-    console.log(ids);
+    this.collectionRD$.subscribe((collectionRD: RemoteData<Collection>) => {
+      this.notificationsService.success('Mapping completed', `Successfully mapped ${ids.length} items to collection "${collectionRD.payload.name}".`);
+    });
   }
 
   getCurrentUrl(): string {
diff --git a/src/app/shared/item-select/item-select.component.ts b/src/app/shared/item-select/item-select.component.ts
index 93128aa1d5..01a4c2e6f1 100644
--- a/src/app/shared/item-select/item-select.component.ts
+++ b/src/app/shared/item-select/item-select.component.ts
@@ -6,6 +6,7 @@ import { Observable } from 'rxjs/Observable';
 import { Item } from '../../core/shared/item.model';
 import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 import { ItemSelectService } from './item-select.service';
+import { take } from 'rxjs/operators';
 
 @Component({
   selector: 'ds-item-select',
@@ -42,8 +43,11 @@ export class ItemSelectComponent implements OnInit {
   }
 
   confirmSelected() {
-    this.selectedIds$.subscribe((ids: string[]) => {
+    this.selectedIds$.pipe(
+      take(1)
+    ).subscribe((ids: string[]) => {
       this.confirm.emit(ids);
+      this.itemSelectService.reset();
     });
   }
 

From 4731da83cd31ce5aa36969f259e169ef56e33d35 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 27 Sep 2018 13:16:26 +0200
Subject: [PATCH 09/23] 55693: Intermediate Commit

---
 .../collection-item-mapper.component.ts       | 12 +++++++-
 src/app/core/data/item-data.service.ts        | 30 +++++++++++++++++--
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
index b06f486072..04657fe4fd 100644
--- a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
@@ -16,6 +16,8 @@ import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { forkJoin } from 'rxjs/observable/forkJoin';
 
 @Component({
   selector: 'ds-collection-item-mapper',
@@ -40,7 +42,8 @@ export class CollectionItemMapperComponent implements OnInit {
               private router: Router,
               private searchConfigService: SearchConfigurationService,
               private searchService: SearchService,
-              private notificationsService: NotificationsService) {
+              private notificationsService: NotificationsService,
+              private itemDataService: ItemDataService) {
   }
 
   ngOnInit(): void {
@@ -72,6 +75,13 @@ export class CollectionItemMapperComponent implements OnInit {
   }
 
   mapItems(ids: string[]) {
+    const responses = this.collectionRD$.pipe(
+      map((collectionRD: RemoteData<Collection>) => collectionRD.payload),
+      flatMap((collection: Collection) => forkJoin(ids.map((id: string) => this.itemDataService.mapToCollection(id, collection.id))))
+    );
+
+    responses.subscribe((value) => console.log(value));
+
     this.collectionRD$.subscribe((collectionRD: RemoteData<Collection>) => {
       this.notificationsService.success('Mapping completed', `Successfully mapped ${ids.length} items to collection "${collectionRD.payload.name}".`);
     });
diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts
index f984dceb12..5b26c8f252 100644
--- a/src/app/core/data/item-data.service.ts
+++ b/src/app/core/data/item-data.service.ts
@@ -3,7 +3,7 @@ import { Inject, Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs/Observable';
 import { GLOBAL_CONFIG, GlobalConfig } from '../../../config';
-import { isEmpty, isNotEmpty } from '../../shared/empty.util';
+import { isEmpty, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
 import { BrowseService } from '../browse/browse.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { NormalizedItem } from '../cache/models/normalized-item.model';
@@ -15,7 +15,11 @@ import { URLCombiner } from '../url-combiner/url-combiner';
 import { DataService } from './data.service';
 import { RequestService } from './request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { FindAllOptions } from './request.models';
+import { FindAllOptions, PostRequest, RestRequest } from './request.models';
+import { distinctUntilChanged, map } from 'rxjs/operators';
+import { configureRequest, getResponseFromSelflink } from '../shared/operators';
+import { ResponseCacheEntry } from '../cache/response-cache.reducer';
+import { RestResponse } from '../cache/response-cache.models';
 
 @Injectable()
 export class ItemDataService extends DataService<NormalizedItem, Item> {
@@ -48,4 +52,26 @@ export class ItemDataService extends DataService<NormalizedItem, Item> {
       .distinctUntilChanged();
   }
 
+  public getMappingCollectionsEndpoint(itemId: string, collectionId?: string): Observable<string> {
+    return this.halService.getEndpoint(this.linkPath).pipe(
+      map((endpoint: string) => this.getFindByIDHref(endpoint, itemId)),
+      map((endpoint: string) => `${endpoint}/mappingCollections${collectionId ? `/${collectionId}` : ''}`)
+    );
+  }
+
+  public mapToCollection(itemId: string, collectionId: string): Observable<RestResponse> {
+    const request$ = this.getMappingCollectionsEndpoint(itemId, collectionId).pipe(
+      isNotEmptyOperator(),
+      distinctUntilChanged(),
+      map((endpointURL: string) => new PostRequest(this.requestService.generateRequestId(), endpointURL)),
+      configureRequest(this.requestService)
+    );
+
+    return request$.pipe(
+      map((request: RestRequest) => request.href),
+      getResponseFromSelflink(this.responseCache),
+      map((responseCacheEntry: ResponseCacheEntry) => responseCacheEntry.response)
+    );
+  }
+
 }

From 7b74d9c07752df3f26e7f58ebd14be03af4818ec Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Thu, 27 Sep 2018 17:08:52 +0200
Subject: [PATCH 10/23] 55693: Notifications on success/failure and small
 refactoring

---
 .../collection-item-mapper.component.ts       | 39 ++++++++++++-------
 src/app/core/data/item-data.service.ts        |  7 +---
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
index 04657fe4fd..6d250d63eb 100644
--- a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
@@ -9,8 +9,8 @@ import { SearchConfigurationService } from '../../+search-page/search-service/se
 import { PaginatedSearchOptions } from '../../+search-page/paginated-search-options.model';
 import { PaginatedList } from '../../core/data/paginated-list';
 import { Item } from '../../core/shared/item.model';
-import { combineLatest, flatMap, map, tap } from 'rxjs/operators';
-import { getSucceededRemoteData, toDSpaceObjectListRD } from '../../core/shared/operators';
+import { combineLatest, filter, flatMap, map, switchMap, take, tap } from 'rxjs/operators';
+import { filterSuccessfulResponses, getSucceededRemoteData, toDSpaceObjectListRD } from '../../core/shared/operators';
 import { SearchService } from '../../+search-page/search-service/search.service';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
@@ -18,6 +18,7 @@ import { SortDirection, SortOptions } from '../../core/cache/models/sort-options
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { ItemDataService } from '../../core/data/item-data.service';
 import { forkJoin } from 'rxjs/observable/forkJoin';
+import { RestResponse } from '../../core/cache/response-cache.models';
 
 @Component({
   selector: 'ds-collection-item-mapper',
@@ -47,12 +48,16 @@ export class CollectionItemMapperComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    this.collectionRD$ = this.route.data.map((data) => data.collection);
+    this.collectionRD$ = this.route.data.map((data) => data.collection).pipe(getSucceededRemoteData()) as Observable<RemoteData<Collection>>;
     this.searchOptions$ = this.searchConfigService.paginatedSearchOptions;
-    this.collectionItemsRD$ = this.collectionRD$.pipe(
-      getSucceededRemoteData(),
-      combineLatest(this.searchOptions$),
-      flatMap(([collectionRD, options]) => {
+
+    const collectionAndOptions$ = Observable.combineLatest(
+      this.collectionRD$,
+      this.searchOptions$
+    );
+
+    this.collectionItemsRD$ = collectionAndOptions$.pipe(
+      switchMap(([collectionRD, options]) => {
         return this.searchService.search(Object.assign(options, {
           scope: collectionRD.payload.id,
           dsoType: DSpaceObjectType.ITEM,
@@ -75,15 +80,21 @@ export class CollectionItemMapperComponent implements OnInit {
   }
 
   mapItems(ids: string[]) {
-    const responses = this.collectionRD$.pipe(
-      map((collectionRD: RemoteData<Collection>) => collectionRD.payload),
-      flatMap((collection: Collection) => forkJoin(ids.map((id: string) => this.itemDataService.mapToCollection(id, collection.id))))
+    const responses$ = this.collectionRD$.pipe(
+      getSucceededRemoteData(),
+      map((collectionRD: RemoteData<Collection>) => collectionRD.payload.id),
+      switchMap((collectionId: string) => Observable.combineLatest(ids.map((id: string) => this.itemDataService.mapToCollection(id, collectionId))))
     );
 
-    responses.subscribe((value) => console.log(value));
-
-    this.collectionRD$.subscribe((collectionRD: RemoteData<Collection>) => {
-      this.notificationsService.success('Mapping completed', `Successfully mapped ${ids.length} items to collection "${collectionRD.payload.name}".`);
+    responses$.subscribe((responses: RestResponse[]) => {
+      const successful = responses.filter((response: RestResponse) => response.isSuccessful);
+      const unsuccessful = responses.filter((response: RestResponse) => !response.isSuccessful);
+      if (successful.length > 0) {
+        this.notificationsService.success('Mapping completed', `Successfully mapped ${successful.length} items.`);
+      }
+      if (unsuccessful.length > 0) {
+        this.notificationsService.error('Mapping errors', `Errors occurred for mapping of ${unsuccessful.length} items.`);
+      }
     });
   }
 
diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts
index 5b26c8f252..7c2c4e572d 100644
--- a/src/app/core/data/item-data.service.ts
+++ b/src/app/core/data/item-data.service.ts
@@ -60,14 +60,11 @@ export class ItemDataService extends DataService<NormalizedItem, Item> {
   }
 
   public mapToCollection(itemId: string, collectionId: string): Observable<RestResponse> {
-    const request$ = this.getMappingCollectionsEndpoint(itemId, collectionId).pipe(
+    return this.getMappingCollectionsEndpoint(itemId, collectionId).pipe(
       isNotEmptyOperator(),
       distinctUntilChanged(),
       map((endpointURL: string) => new PostRequest(this.requestService.generateRequestId(), endpointURL)),
-      configureRequest(this.requestService)
-    );
-
-    return request$.pipe(
+      configureRequest(this.requestService),
       map((request: RestRequest) => request.href),
       getResponseFromSelflink(this.responseCache),
       map((responseCacheEntry: ResponseCacheEntry) => responseCacheEntry.response)

From ba8be3f57d6e507e0e02519e5b7542606df935d0 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Fri, 28 Sep 2018 10:56:17 +0200
Subject: [PATCH 11/23] 55693: Temporary pagination fix (remove url params on
 tab change)

---
 .../collection-item-mapper.component.html       |  5 +++--
 .../collection-item-mapper.component.ts         | 17 +++++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
index d201ce0ad6..f18c76f04d 100644
--- a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
@@ -15,14 +15,15 @@
         </div>
       </div>
 
-      <ngb-tabset>
+      <ngb-tabset (tabChange)="tabChange($event)">
         <ngb-tab title="{{'collection.item-mapper.tabs.browse' | translate}}">
           <ng-template ngbTabContent>
             <div class="mt-2">
               <ds-viewable-collection
                 [config]="(searchOptions$ | async)?.pagination"
                 [sortConfig]="(searchOptions$ | async)?.sort"
-                [objects]="collectionItemsRD$ | async">
+                [objects]="collectionItemsRD$ | async"
+                [hideGear]="true">
               </ds-viewable-collection>
             </div>
           </ng-template>
diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
index 6d250d63eb..eab9292e98 100644
--- a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
@@ -1,6 +1,5 @@
 import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { fadeIn, fadeInOut } from '../../shared/animations/fade';
-import { CollectionDataService } from '../../core/data/collection-data.service';
 import { ActivatedRoute, PRIMARY_OUTLET, Router, UrlSegmentGroup } from '@angular/router';
 import { RemoteData } from '../../core/data/remote-data';
 import { Observable } from 'rxjs/Observable';
@@ -8,16 +7,14 @@ import { Collection } from '../../core/shared/collection.model';
 import { SearchConfigurationService } from '../../+search-page/search-service/search-configuration.service';
 import { PaginatedSearchOptions } from '../../+search-page/paginated-search-options.model';
 import { PaginatedList } from '../../core/data/paginated-list';
-import { Item } from '../../core/shared/item.model';
-import { combineLatest, filter, flatMap, map, switchMap, take, tap } from 'rxjs/operators';
-import { filterSuccessfulResponses, getSucceededRemoteData, toDSpaceObjectListRD } from '../../core/shared/operators';
+import { flatMap, map, switchMap } from 'rxjs/operators';
+import { getSucceededRemoteData, toDSpaceObjectListRD } from '../../core/shared/operators';
 import { SearchService } from '../../+search-page/search-service/search.service';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { ItemDataService } from '../../core/data/item-data.service';
-import { forkJoin } from 'rxjs/observable/forkJoin';
 import { RestResponse } from '../../core/cache/response-cache.models';
 
 @Component({
@@ -68,7 +65,6 @@ export class CollectionItemMapperComponent implements OnInit {
     );
     this.mappingItemsRD$ = this.searchOptions$.pipe(
       flatMap((options: PaginatedSearchOptions) => {
-        options.sort.field = 'dc.title';
         return this.searchService.search(Object.assign(options, {
           scope: undefined,
           dsoType: DSpaceObjectType.ITEM,
@@ -98,6 +94,15 @@ export class CollectionItemMapperComponent implements OnInit {
     });
   }
 
+  tabChange(event) {
+    // TODO: Fix tabs to maintain their own pagination options (once the current pagination system is improved)
+    // Temporary solution: Clear url params when changing tabs
+    if (this.router.url.indexOf('?') > -1) {
+      const url: string = this.router.url.substring(0, this.router.url.indexOf('?'));
+      this.router.navigateByUrl(url);
+    }
+  }
+
   getCurrentUrl(): string {
     const urlTree = this.router.parseUrl(this.router.url);
     const g: UrlSegmentGroup = urlTree.root.children[PRIMARY_OUTLET];

From 0a8a6bb7209ceca4c7131e395bade976182fee5a Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Fri, 28 Sep 2018 11:27:53 +0200
Subject: [PATCH 12/23] 55693: Messages improvement

---
 resources/i18n/en.json                        | 11 ++++++++
 .../collection-item-mapper.component.html     |  6 ++++-
 .../collection-item-mapper.component.ts       | 26 ++++++++++++++++---
 .../item-select/item-select.component.html    |  2 +-
 .../item-select/item-select.component.ts      |  3 +++
 5 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/resources/i18n/en.json b/resources/i18n/en.json
index 948f538e9a..86ff55da66 100644
--- a/resources/i18n/en.json
+++ b/resources/i18n/en.json
@@ -18,10 +18,21 @@
       "head": "Item Mapper - Map Items from Other Collections",
       "collection": "Collection: \"<b>{{name}}</b>\"",
       "description": "This is the item mapper tool that allows collection administrators to map items from other collections into this collection. You can search for items from other collections and map them, or browse the list of currently mapped items.",
+      "confirm": "Map selected items",
       "tabs": {
         "browse": "Browse",
         "map": "Map"
       },
+      "notifications": {
+        "success": {
+          "head": "Mapping completed",
+          "content": "Successfully mapped {{amount}} items."
+        },
+        "error": {
+          "head": "Mapping errors",
+          "content": "Errors occurred for mapping of {{amount}} items."
+        }
+      },
       "return": "Return"
     }
   },
diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
index f18c76f04d..88a39f3be9 100644
--- a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
@@ -31,7 +31,11 @@
         <ngb-tab title="{{'collection.item-mapper.tabs.map' | translate}}">
           <ng-template ngbTabContent>
             <div class="mt-2">
-              <ds-item-select class="mt-2" [itemsRD$]="mappingItemsRD$" [paginationOptions]="(searchOptions$ | async)?.pagination" (confirm)="mapItems($event)"></ds-item-select>
+              <ds-item-select class="mt-2"
+                [itemsRD$]="mappingItemsRD$"
+                [paginationOptions]="(searchOptions$ | async)?.pagination"
+                [confirmButton]="'collection.item-mapper.confirm'"
+                (confirm)="mapItems($event)"></ds-item-select>
             </div>
           </ng-template>
         </ngb-tab>
diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
index eab9292e98..806e535e5f 100644
--- a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
@@ -16,6 +16,7 @@ import { SortDirection, SortOptions } from '../../core/cache/models/sort-options
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { ItemDataService } from '../../core/data/item-data.service';
 import { RestResponse } from '../../core/cache/response-cache.models';
+import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'ds-collection-item-mapper',
@@ -41,18 +42,21 @@ export class CollectionItemMapperComponent implements OnInit {
               private searchConfigService: SearchConfigurationService,
               private searchService: SearchService,
               private notificationsService: NotificationsService,
-              private itemDataService: ItemDataService) {
+              private itemDataService: ItemDataService,
+              private translateService: TranslateService) {
   }
 
   ngOnInit(): void {
     this.collectionRD$ = this.route.data.map((data) => data.collection).pipe(getSucceededRemoteData()) as Observable<RemoteData<Collection>>;
     this.searchOptions$ = this.searchConfigService.paginatedSearchOptions;
+    this.loadItemLists();
+  }
 
+  loadItemLists() {
     const collectionAndOptions$ = Observable.combineLatest(
       this.collectionRD$,
       this.searchOptions$
     );
-
     this.collectionItemsRD$ = collectionAndOptions$.pipe(
       switchMap(([collectionRD, options]) => {
         return this.searchService.search(Object.assign(options, {
@@ -86,10 +90,24 @@ export class CollectionItemMapperComponent implements OnInit {
       const successful = responses.filter((response: RestResponse) => response.isSuccessful);
       const unsuccessful = responses.filter((response: RestResponse) => !response.isSuccessful);
       if (successful.length > 0) {
-        this.notificationsService.success('Mapping completed', `Successfully mapped ${successful.length} items.`);
+        const successMessages = Observable.combineLatest(
+          this.translateService.get('collection.item-mapper.notifications.success.head'),
+          this.translateService.get('collection.item-mapper.notifications.success.content', { amount: successful.length })
+        );
+
+        successMessages.subscribe(([head, content]) => {
+          this.notificationsService.success(head, content);
+        });
       }
       if (unsuccessful.length > 0) {
-        this.notificationsService.error('Mapping errors', `Errors occurred for mapping of ${unsuccessful.length} items.`);
+        const unsuccessMessages = Observable.combineLatest(
+          this.translateService.get('collection.item-mapper.notifications.error.head'),
+          this.translateService.get('collection.item-mapper.notifications.error.content', { amount: unsuccessful.length })
+        );
+
+        unsuccessMessages.subscribe(([head, content]) => {
+          this.notificationsService.error(head, content);
+        });
       }
     });
   }
diff --git a/src/app/shared/item-select/item-select.component.html b/src/app/shared/item-select/item-select.component.html
index 4047884bc4..76fc118282 100644
--- a/src/app/shared/item-select/item-select.component.html
+++ b/src/app/shared/item-select/item-select.component.html
@@ -26,4 +26,4 @@
     </table>
   </div>
 </ds-pagination>
-<button class="btn btn-outline-secondary" (click)="confirmSelected()">{{'item.select.confirm' | translate}}</button>
+<button class="btn btn-outline-secondary" (click)="confirmSelected()">{{confirmButton | translate}}</button>
diff --git a/src/app/shared/item-select/item-select.component.ts b/src/app/shared/item-select/item-select.component.ts
index 01a4c2e6f1..00ca078bfa 100644
--- a/src/app/shared/item-select/item-select.component.ts
+++ b/src/app/shared/item-select/item-select.component.ts
@@ -22,6 +22,9 @@ export class ItemSelectComponent implements OnInit {
   @Input()
   paginationOptions: PaginationComponentOptions;
 
+  @Input()
+  confirmButton = 'item.select.confirm';
+
   @Output()
   confirm: EventEmitter<string[]> = new EventEmitter<string[]>();
 

From e1c734e1137d605dc81111ad9e65048f7ac09476 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Fri, 28 Sep 2018 12:43:38 +0200
Subject: [PATCH 13/23] 55693: CollectionItemMapperComponent test intermediate

---
 .../collection-item-mapper.component.spec.ts  | 83 +++++++++++++++++++
 src/app/shared/testing/active-router-stub.ts  | 20 ++++-
 2 files changed, 102 insertions(+), 1 deletion(-)

diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
index e69de29bb2..18558c6314 100644
--- a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
@@ -0,0 +1,83 @@
+import { CollectionItemMapperComponent } from './collection-item-mapper.component';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { CommonModule } from '@angular/common';
+import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import { SearchFormComponent } from '../../shared/search-form/search-form.component';
+import { SearchPageModule } from '../../+search-page/search-page.module';
+import { ObjectCollectionComponent } from '../../shared/object-collection/object-collection.component';
+import { ItemSelectComponent } from '../../shared/item-select/item-select.component';
+import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRouteStub } from '../../shared/testing/active-router-stub';
+import { RouterStub } from '../../shared/testing/router-stub';
+import { SearchConfigurationService } from '../../+search-page/search-service/search-configuration.service';
+import { SearchService } from '../../+search-page/search-service/search.service';
+import { SearchServiceStub } from '../../shared/testing/search-service-stub';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service-stub';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { FormsModule } from '@angular/forms';
+import { SharedModule } from '../../shared/shared.module';
+import { Collection } from '../../core/shared/collection.model';
+
+fdescribe('CollectionItemMapperComponent', () => {
+  let comp: CollectionItemMapperComponent;
+  let fixture: ComponentFixture<CollectionItemMapperComponent>;
+
+  let route: ActivatedRoute;
+  let router: Router;
+  let searchConfigService: SearchConfigurationService;
+  let searchService: SearchService;
+  let notificationsService: NotificationsService;
+  let itemDataService: ItemDataService;
+
+  const searchConfigServiceStub = {
+
+  };
+  const itemDataServiceStub = {
+
+  };
+  const mockCollection: Collection = Object.assign(new Collection(), {
+    metadata: [
+      {
+        key: 'dc.title',
+        language: 'en_US',
+        value: 'Test title'
+      }]
+  });
+  const activatedRouteStub = new ActivatedRouteStub({}, { collection: mockCollection });
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [CommonModule, FormsModule, SharedModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule.forRoot()],
+      declarations: [CollectionItemMapperComponent],
+      providers: [
+        { provide: ActivatedRoute, useValue: activatedRouteStub },
+        { provide: Router, useValue: new RouterStub() },
+        { provide: SearchConfigurationService, useValue: searchConfigServiceStub },
+        { provide: SearchService, useValue: new SearchServiceStub() },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: ItemDataService, useValue: itemDataServiceStub },
+        { provide: TranslateService, useValue: {} }
+      ]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CollectionItemMapperComponent);
+    comp = fixture.componentInstance;
+    fixture.detectChanges();
+    route = (comp as any).route;
+    router = (comp as any).router;
+    searchConfigService = (comp as any).searchConfigService;
+    searchService = (comp as any).searchService;
+    notificationsService = (comp as any).notificationsService;
+    itemDataService = (comp as any).itemDataService;
+  });
+
+  it('should test', () => {
+
+  });
+
+});
diff --git a/src/app/shared/testing/active-router-stub.ts b/src/app/shared/testing/active-router-stub.ts
index 22c4060855..2ed3f367d3 100644
--- a/src/app/shared/testing/active-router-stub.ts
+++ b/src/app/shared/testing/active-router-stub.ts
@@ -5,19 +5,27 @@ import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 export class ActivatedRouteStub {
 
   private _testParams?: any;
+  private _testData?: any;
   // ActivatedRoute.params is Observable
   private subject?: BehaviorSubject<any> = new BehaviorSubject(this.testParams);
+  private dataSubject?: BehaviorSubject<any> = new BehaviorSubject(this.testData);
 
   params = this.subject.asObservable();
   queryParams = this.subject.asObservable();
   queryParamMap = this.subject.asObservable().map((params: Params) => convertToParamMap(params));
+  data = this.dataSubject.asObservable();
 
-  constructor(params?: Params) {
+  constructor(params?: Params, data?: any) {
     if (params) {
       this.testParams = params;
     } else {
       this.testParams = {};
     }
+    if (data) {
+      this.testData = data;
+    } else {
+      this.testData = {};
+    }
   }
 
   // Test parameters
@@ -30,6 +38,16 @@ export class ActivatedRouteStub {
     this.subject.next(params);
   }
 
+  // Test data
+  get testData() {
+    return this._testParams;
+  }
+
+  set testData(data: {}) {
+    this._testData = data;
+    this.dataSubject.next(data);
+  }
+
   // ActivatedRoute.snapshot.params
   get snapshot() {
     return {

From 95b46352918b391ff611288a1b0d998d3c622a0d Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Fri, 28 Sep 2018 16:02:39 +0200
Subject: [PATCH 14/23] 55693: CollectionItemMapperComponent tests

---
 .../collection-item-mapper.component.html     |  2 +-
 .../collection-item-mapper.component.spec.ts  | 84 +++++++++++++++----
 .../collection-item-mapper.component.ts       | 12 ++-
 3 files changed, 75 insertions(+), 23 deletions(-)

diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
index 88a39f3be9..a7a1416cb0 100644
--- a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html
@@ -2,7 +2,7 @@
   <div class="row">
     <div class="col-12">
       <h2>{{'collection.item-mapper.head' | translate}}</h2>
-      <p [innerHTML]="'collection.item-mapper.collection' | translate:{ name: (collectionRD$ | async)?.payload?.name }"></p>
+      <p [innerHTML]="'collection.item-mapper.collection' | translate:{ name: (collectionRD$ | async)?.payload?.name }" id="collection-name"></p>
       <p>{{'collection.item-mapper.description' | translate}}</p>
 
       <div class="row">
diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
index 18558c6314..a08322dc1b 100644
--- a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
@@ -1,5 +1,5 @@
 import { CollectionItemMapperComponent } from './collection-item-mapper.component';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { CommonModule } from '@angular/common';
@@ -20,6 +20,18 @@ import { ItemDataService } from '../../core/data/item-data.service';
 import { FormsModule } from '@angular/forms';
 import { SharedModule } from '../../shared/shared.module';
 import { Collection } from '../../core/shared/collection.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { Observable } from 'rxjs/Observable';
+import { PaginatedSearchOptions } from '../../+search-page/paginated-search-options.model';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import { EventEmitter } from '@angular/core';
+import { HostWindowService } from '../../shared/host-window.service';
+import { HostWindowServiceStub } from '../../shared/testing/host-window-service-stub';
+import { By } from '@angular/platform-browser';
+import { RestResponse } from '../../core/cache/response-cache.models';
+import { PaginatedList } from '../../core/data/paginated-list';
+import { PageInfo } from '../../core/shared/page-info.model';
 
 fdescribe('CollectionItemMapperComponent', () => {
   let comp: CollectionItemMapperComponent;
@@ -32,21 +44,39 @@ fdescribe('CollectionItemMapperComponent', () => {
   let notificationsService: NotificationsService;
   let itemDataService: ItemDataService;
 
+  const mockCollection: Collection = Object.assign(new Collection(), {
+    id: 'ce41d451-97ed-4a9c-94a1-7de34f16a9f4',
+    name: 'test-collection'
+  });
+  const mockCollectionRD: RemoteData<Collection> = new RemoteData<Collection>(false, false, true, null, mockCollection);
+  const mockSearchOptions = Observable.of(new PaginatedSearchOptions({
+    pagination: Object.assign(new PaginationComponentOptions(), {
+      id: 'search-page-configuration',
+      pageSize: 10,
+      currentPage: 1
+    }),
+    sort: new SortOptions('dc.title', SortDirection.ASC),
+    scope: mockCollection.id
+  }));
+  const routerStub = Object.assign(new RouterStub(), {
+    url: 'http://test.url'
+  });
   const searchConfigServiceStub = {
-
+    paginatedSearchOptions: mockSearchOptions
   };
   const itemDataServiceStub = {
-
+    mapToCollection: () => Observable.of(new RestResponse(true, '200'))
   };
-  const mockCollection: Collection = Object.assign(new Collection(), {
-    metadata: [
-      {
-        key: 'dc.title',
-        language: 'en_US',
-        value: 'Test title'
-      }]
+  const activatedRouteStub = new ActivatedRouteStub({}, { collection: mockCollectionRD });
+  const translateServiceStub = {
+    get: () => Observable.of('test-message of collection ' + mockCollection.name),
+    onLangChange: new EventEmitter(),
+    onTranslationChange: new EventEmitter(),
+    onDefaultLangChange: new EventEmitter()
+  };
+  const searchServiceStub = Object.assign(new SearchServiceStub(), {
+    search: () => Observable.of(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), [])))
   });
-  const activatedRouteStub = new ActivatedRouteStub({}, { collection: mockCollection });
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
@@ -54,12 +84,13 @@ fdescribe('CollectionItemMapperComponent', () => {
       declarations: [CollectionItemMapperComponent],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
-        { provide: Router, useValue: new RouterStub() },
+        { provide: Router, useValue: routerStub },
         { provide: SearchConfigurationService, useValue: searchConfigServiceStub },
-        { provide: SearchService, useValue: new SearchServiceStub() },
+        { provide: SearchService, useValue: searchServiceStub },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
         { provide: ItemDataService, useValue: itemDataServiceStub },
-        { provide: TranslateService, useValue: {} }
+        { provide: TranslateService, useValue: translateServiceStub },
+        { provide: HostWindowService, useValue: new HostWindowServiceStub(0) }
       ]
     }).compileComponents();
   }));
@@ -76,8 +107,31 @@ fdescribe('CollectionItemMapperComponent', () => {
     itemDataService = (comp as any).itemDataService;
   });
 
-  it('should test', () => {
+  it('should display the correct collection name', () => {
+    const name: HTMLElement = fixture.debugElement.query(By.css('#collection-name')).nativeElement;
+    expect(name.innerHTML).toContain(mockCollection.name);
+  });
 
+  describe('mapItems', () => {
+    const ids = ['id1', 'id2', 'id3', 'id4'];
+
+    beforeEach(() => {
+      spyOn(notificationsService, 'success').and.callThrough();
+      spyOn(notificationsService, 'error').and.callThrough();
+    });
+
+    it('should display a success message if at least one mapping was successful', () => {
+      comp.mapItems(ids);
+      expect(notificationsService.success).toHaveBeenCalled();
+      expect(notificationsService.error).not.toHaveBeenCalled();
+    });
+
+    it('should display an error message if at least one mapping was unsuccessful', () => {
+      spyOn(itemDataService, 'mapToCollection').and.returnValue(Observable.of(new RestResponse(false, '404')));
+      comp.mapItems(ids);
+      expect(notificationsService.success).not.toHaveBeenCalled();
+      expect(notificationsService.error).toHaveBeenCalled();
+    });
   });
 
 });
diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
index 806e535e5f..9367dbd5b5 100644
--- a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
@@ -115,16 +115,14 @@ export class CollectionItemMapperComponent implements OnInit {
   tabChange(event) {
     // TODO: Fix tabs to maintain their own pagination options (once the current pagination system is improved)
     // Temporary solution: Clear url params when changing tabs
-    if (this.router.url.indexOf('?') > -1) {
-      const url: string = this.router.url.substring(0, this.router.url.indexOf('?'));
-      this.router.navigateByUrl(url);
-    }
+    this.router.navigateByUrl(this.getCurrentUrl());
   }
 
   getCurrentUrl(): string {
-    const urlTree = this.router.parseUrl(this.router.url);
-    const g: UrlSegmentGroup = urlTree.root.children[PRIMARY_OUTLET];
-    return '/' + g.toString();
+    if (this.router.url.indexOf('?') > -1) {
+      return this.router.url.substring(0, this.router.url.indexOf('?'));
+    }
+    return this.router.url;
   }
 
 }

From c3add84d860f0761ba334a25cf8303da58c6a365 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Fri, 28 Sep 2018 17:31:05 +0200
Subject: [PATCH 15/23] 55693: ItemSelectComponent tests intermediate +
 ItemSelectServiceStub

---
 .../collection-item-mapper.component.spec.ts  |   2 +-
 .../item-select/item-select.component.spec.ts | 102 ++++++++++++++++++
 .../testing/item-select-service-stub.ts       |  37 +++++++
 3 files changed, 140 insertions(+), 1 deletion(-)
 create mode 100644 src/app/shared/testing/item-select-service-stub.ts

diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
index a08322dc1b..d7ae41f023 100644
--- a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
@@ -33,7 +33,7 @@ import { RestResponse } from '../../core/cache/response-cache.models';
 import { PaginatedList } from '../../core/data/paginated-list';
 import { PageInfo } from '../../core/shared/page-info.model';
 
-fdescribe('CollectionItemMapperComponent', () => {
+describe('CollectionItemMapperComponent', () => {
   let comp: CollectionItemMapperComponent;
   let fixture: ComponentFixture<CollectionItemMapperComponent>;
 
diff --git a/src/app/shared/item-select/item-select.component.spec.ts b/src/app/shared/item-select/item-select.component.spec.ts
index e69de29bb2..97132672e2 100644
--- a/src/app/shared/item-select/item-select.component.spec.ts
+++ b/src/app/shared/item-select/item-select.component.spec.ts
@@ -0,0 +1,102 @@
+import { ItemSelectComponent } from './item-select.component';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { SharedModule } from '../shared.module';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { TranslateModule } from '@ngx-translate/core';
+import { ItemSelectService } from './item-select.service';
+import { ItemSelectServiceStub } from '../testing/item-select-service-stub';
+import { Observable } from 'rxjs/Observable';
+import { RemoteData } from '../../core/data/remote-data';
+import { PaginatedList } from '../../core/data/paginated-list';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { Item } from '../../core/shared/item.model';
+import { By } from '@angular/platform-browser';
+import { ActivatedRoute, Route, Router } from '@angular/router';
+import { ActivatedRouteStub } from '../testing/active-router-stub';
+import { RouterStub } from '../testing/router-stub';
+import { HostWindowService } from '../host-window.service';
+import { HostWindowServiceStub } from '../testing/host-window-service-stub';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import { LocationStrategy } from '@angular/common';
+import { MockLocationStrategy } from '@angular/common/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+
+fdescribe('ItemSelectComponent', () => {
+  let comp: ItemSelectComponent;
+  let fixture: ComponentFixture<ItemSelectComponent>;
+  let itemSelectService: ItemSelectService;
+
+  const mockItemList = [
+    Object.assign(new Item(), {
+      id: 'id1',
+      bitstreams: Observable.of({}),
+      metadata: [
+        {
+          key: 'dc.title',
+          language: 'en_US',
+          value: 'This is just a title'
+        },
+        {
+          key: 'dc.type',
+          language: null,
+          value: 'Article'
+        }]
+    }),
+    Object.assign(new Item(), {
+      id: 'id2',
+      bitstreams: Observable.of({}),
+      metadata: [
+        {
+          key: 'dc.title',
+          language: 'en_US',
+          value: 'This is just another title'
+        },
+        {
+          key: 'dc.type',
+          language: null,
+          value: 'Article'
+        }]
+    })
+  ];
+  const mockCheckedItems= [mockItemList[0].id];
+  const mockItems = Observable.of(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), mockItemList)));
+  const mockPaginationOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'search-page-configuration',
+    pageSize: 10,
+    currentPage: 1
+  });
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot(), SharedModule, RouterTestingModule.withRoutes([])],
+      declarations: [],
+      providers: [
+        { provide: ItemSelectService, useValue: new ItemSelectServiceStub(mockCheckedItems) },
+        { provide: HostWindowService, useValue: new HostWindowServiceStub(0) }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ItemSelectComponent);
+    comp = fixture.componentInstance;
+    comp.itemsRD$ = mockItems;
+    comp.paginationOptions = mockPaginationOptions;
+    fixture.detectChanges();
+    itemSelectService = (comp as any).itemSelectService;
+  });
+
+  it(`should show a list of ${mockItemList.length} items`, () => {
+    const tbody: HTMLElement = fixture.debugElement.query(By.css('table#item-select tbody')).nativeElement;
+    expect(tbody.children.length).toBe(mockItemList.length);
+  });
+
+  it('should have the correct items selected', () => {
+    for (const item of mockItemList) {
+      const checked = (mockCheckedItems.indexOf(item.id) > -1);
+      const checkbox: HTMLElement = fixture.debugElement.query(By.css(`input[name=${item.id}]`)).nativeElement;
+      expect(checkbox.getAttribute('checked')).toBe(checked);
+    }
+  });
+});
diff --git a/src/app/shared/testing/item-select-service-stub.ts b/src/app/shared/testing/item-select-service-stub.ts
new file mode 100644
index 0000000000..690d1e1435
--- /dev/null
+++ b/src/app/shared/testing/item-select-service-stub.ts
@@ -0,0 +1,37 @@
+import { Observable } from 'rxjs/Observable';
+
+export class ItemSelectServiceStub {
+
+  ids: string[] = [];
+
+  constructor(ids?: string[]) {
+    if (ids) {
+      this.ids = ids;
+    }
+  }
+
+  getSelected(id: string): Observable<boolean> {
+    if (this.ids.indexOf(id) > -1) {
+      return Observable.of(true);
+    } else {
+      return Observable.of(false);
+    }
+  }
+
+  getAllSelected(): Observable<string[]> {
+    return Observable.of(this.ids);
+  }
+
+  switch(id: string) {
+    const index = this.ids.indexOf(id);
+    if (index > -1) {
+      this.ids.splice(index, 1);
+    } else {
+      this.ids.push(id);
+    }
+  }
+
+  reset() {
+    this.ids = [];
+  }
+}

From 8b99ea44b2f1edb66305e7af6b533bade4064aaf Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Mon, 1 Oct 2018 10:30:05 +0200
Subject: [PATCH 16/23] ItemSelectComponent tests

---
 .../item-select/item-select.component.html    |  4 +-
 .../item-select/item-select.component.spec.ts | 47 +++++++++++++++----
 2 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/src/app/shared/item-select/item-select.component.html b/src/app/shared/item-select/item-select.component.html
index 76fc118282..9c08cfae87 100644
--- a/src/app/shared/item-select/item-select.component.html
+++ b/src/app/shared/item-select/item-select.component.html
@@ -17,7 +17,7 @@
       </thead>
       <tbody>
         <tr *ngFor="let item of (itemsRD$ | async)?.payload?.page">
-          <td><input [ngModel]="getSelected(item.id) | async" (change)="switch(item.id)" type="checkbox" name="{{item.id}}"></td>
+          <td><input class="item-checkbox" [ngModel]="getSelected(item.id) | async" (change)="switch(item.id)" type="checkbox" name="{{item.id}}"></td>
           <td><a [routerLink]="['/items', item.id]">{{(item.owningCollection | async)?.payload?.name}}</a></td>
           <td><a *ngIf="item.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0" [routerLink]="['/items', item.id]">{{item.filterMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*'])[0].value}}</a></td>
           <td><a [routerLink]="['/items', item.id]">{{item.findMetadata("dc.title")}}</a></td>
@@ -26,4 +26,4 @@
     </table>
   </div>
 </ds-pagination>
-<button class="btn btn-outline-secondary" (click)="confirmSelected()">{{confirmButton | translate}}</button>
+<button class="btn btn-outline-secondary item-confirm" (click)="confirmSelected()">{{confirmButton | translate}}</button>
diff --git a/src/app/shared/item-select/item-select.component.spec.ts b/src/app/shared/item-select/item-select.component.spec.ts
index 97132672e2..4ca4317eba 100644
--- a/src/app/shared/item-select/item-select.component.spec.ts
+++ b/src/app/shared/item-select/item-select.component.spec.ts
@@ -1,5 +1,5 @@
 import { ItemSelectComponent } from './item-select.component';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { SharedModule } from '../shared.module';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
@@ -58,7 +58,6 @@ fdescribe('ItemSelectComponent', () => {
         }]
     })
   ];
-  const mockCheckedItems= [mockItemList[0].id];
   const mockItems = Observable.of(new RemoteData(false, false, true, null, new PaginatedList(new PageInfo(), mockItemList)));
   const mockPaginationOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'search-page-configuration',
@@ -71,7 +70,7 @@ fdescribe('ItemSelectComponent', () => {
       imports: [TranslateModule.forRoot(), SharedModule, RouterTestingModule.withRoutes([])],
       declarations: [],
       providers: [
-        { provide: ItemSelectService, useValue: new ItemSelectServiceStub(mockCheckedItems) },
+        { provide: ItemSelectService, useValue: new ItemSelectServiceStub() },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) }
       ],
       schemas: [NO_ERRORS_SCHEMA]
@@ -92,11 +91,41 @@ fdescribe('ItemSelectComponent', () => {
     expect(tbody.children.length).toBe(mockItemList.length);
   });
 
-  it('should have the correct items selected', () => {
-    for (const item of mockItemList) {
-      const checked = (mockCheckedItems.indexOf(item.id) > -1);
-      const checkbox: HTMLElement = fixture.debugElement.query(By.css(`input[name=${item.id}]`)).nativeElement;
-      expect(checkbox.getAttribute('checked')).toBe(checked);
-    }
+  describe('checkboxes', () => {
+    let checkbox: HTMLInputElement;
+
+    beforeEach(() => {
+      checkbox = fixture.debugElement.query(By.css('input.item-checkbox')).nativeElement;
+    });
+
+    it('should initially be unchecked',() => {
+      expect(checkbox.checked).toBeFalsy();
+    });
+
+    it('should be checked when clicked', () => {
+      checkbox.click();
+      fixture.detectChanges();
+      expect(checkbox.checked).toBeTruthy();
+    });
+
+    it('should switch the value through item-select-service', () => {
+      spyOn((comp as any).itemSelectService, 'switch').and.callThrough();
+      checkbox.click();
+      expect((comp as any).itemSelectService.switch).toHaveBeenCalled();
+    });
+  });
+
+  describe('when confirm is clicked', () => {
+    let confirmButton: HTMLButtonElement;
+
+    beforeEach(() => {
+      confirmButton = fixture.debugElement.query(By.css('button.item-confirm')).nativeElement;
+      spyOn(comp.confirm, 'emit').and.callThrough();
+    });
+
+    it('should emit the selected items',() => {
+      confirmButton.click();
+      expect(comp.confirm.emit).toHaveBeenCalled();
+    });
   });
 });

From 7934b87336ba9390f83bf7f20cd662c904c48871 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Mon, 1 Oct 2018 11:38:13 +0200
Subject: [PATCH 17/23] 55693: ItemSelectService tests

---
 .../item-select/item-select.component.spec.ts |  2 +-
 .../item-select/item-select.service.spec.ts   | 96 +++++++++++++++++++
 2 files changed, 97 insertions(+), 1 deletion(-)
 create mode 100644 src/app/shared/item-select/item-select.service.spec.ts

diff --git a/src/app/shared/item-select/item-select.component.spec.ts b/src/app/shared/item-select/item-select.component.spec.ts
index 4ca4317eba..0f3a9d5fae 100644
--- a/src/app/shared/item-select/item-select.component.spec.ts
+++ b/src/app/shared/item-select/item-select.component.spec.ts
@@ -21,7 +21,7 @@ import { LocationStrategy } from '@angular/common';
 import { MockLocationStrategy } from '@angular/common/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 
-fdescribe('ItemSelectComponent', () => {
+describe('ItemSelectComponent', () => {
   let comp: ItemSelectComponent;
   let fixture: ComponentFixture<ItemSelectComponent>;
   let itemSelectService: ItemSelectService;
diff --git a/src/app/shared/item-select/item-select.service.spec.ts b/src/app/shared/item-select/item-select.service.spec.ts
new file mode 100644
index 0000000000..f7b28a5b04
--- /dev/null
+++ b/src/app/shared/item-select/item-select.service.spec.ts
@@ -0,0 +1,96 @@
+import { ItemSelectService } from './item-select.service';
+import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs/Observable';
+import { ItemSelectionsState } from './item-select.reducer';
+import { AppState } from '../../app.reducer';
+import {
+  ItemSelectionDeselectAction,
+  ItemSelectionInitialDeselectAction,
+  ItemSelectionInitialSelectAction, ItemSelectionResetAction,
+  ItemSelectionSelectAction, ItemSelectionSwitchAction
+} from './item-select.actions';
+
+describe('ItemSelectService', () => {
+  let service: ItemSelectService;
+
+  const mockItemId = 'id1';
+
+  const store: Store<ItemSelectionsState> = jasmine.createSpyObj('store', {
+    /* tslint:disable:no-empty */
+    dispatch: {},
+    /* tslint:enable:no-empty */
+    select: Observable.of(true)
+  });
+
+  const appStore: Store<AppState> = jasmine.createSpyObj('appStore', {
+    /* tslint:disable:no-empty */
+    dispatch: {},
+    /* tslint:enable:no-empty */
+    select: Observable.of(true)
+  });
+
+  beforeEach(() => {
+    service = new ItemSelectService(store, appStore);
+  });
+
+  describe('when the initialSelect method is triggered', () => {
+    beforeEach(() => {
+      service.initialSelect(mockItemId);
+    });
+
+    it('ItemSelectionInitialSelectAction should be dispatched to the store', () => {
+      expect(store.dispatch).toHaveBeenCalledWith(new ItemSelectionInitialSelectAction(mockItemId));
+    });
+  });
+
+  describe('when the initialDeselect method is triggered', () => {
+    beforeEach(() => {
+      service.initialDeselect(mockItemId);
+    });
+
+    it('ItemSelectionInitialDeselectAction should be dispatched to the store', () => {
+      expect(store.dispatch).toHaveBeenCalledWith(new ItemSelectionInitialDeselectAction(mockItemId));
+    });
+  });
+
+  describe('when the select method is triggered', () => {
+    beforeEach(() => {
+      service.select(mockItemId);
+    });
+
+    it('ItemSelectionSelectAction should be dispatched to the store', () => {
+      expect(store.dispatch).toHaveBeenCalledWith(new ItemSelectionSelectAction(mockItemId));
+    });
+  });
+
+  describe('when the deselect method is triggered', () => {
+    beforeEach(() => {
+      service.deselect(mockItemId);
+    });
+
+    it('ItemSelectionDeselectAction should be dispatched to the store', () => {
+      expect(store.dispatch).toHaveBeenCalledWith(new ItemSelectionDeselectAction(mockItemId));
+    });
+  });
+
+  describe('when the switch method is triggered', () => {
+    beforeEach(() => {
+      service.switch(mockItemId);
+    });
+
+    it('ItemSelectionSwitchAction should be dispatched to the store', () => {
+      expect(store.dispatch).toHaveBeenCalledWith(new ItemSelectionSwitchAction(mockItemId));
+    });
+  });
+
+  describe('when the reset method is triggered', () => {
+    beforeEach(() => {
+      service.reset();
+    });
+
+    it('ItemSelectionInitialSelectAction should be dispatched to the store', () => {
+      expect(store.dispatch).toHaveBeenCalledWith(new ItemSelectionResetAction(null));
+    });
+  });
+
+});

From 199e6c729943b74554ff1cf749b259d991a16f86 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Mon, 1 Oct 2018 11:43:37 +0200
Subject: [PATCH 18/23] 55693: Empty ItemSelectReducer test file

---
 .../shared/item-select/item-select.reducer.spec.ts  | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 src/app/shared/item-select/item-select.reducer.spec.ts

diff --git a/src/app/shared/item-select/item-select.reducer.spec.ts b/src/app/shared/item-select/item-select.reducer.spec.ts
new file mode 100644
index 0000000000..3067a4e93a
--- /dev/null
+++ b/src/app/shared/item-select/item-select.reducer.spec.ts
@@ -0,0 +1,13 @@
+import { ItemSelectionSelectAction } from './item-select.actions';
+
+class NullAction extends ItemSelectionSelectAction {
+  type = null;
+
+  constructor() {
+    super(undefined);
+  }
+}
+
+fdescribe('itemSelectionReducer', () => {
+
+});

From 5f56d5959da5b86db7a32c7117ce8a8f2edb1d5e Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Mon, 1 Oct 2018 13:40:29 +0200
Subject: [PATCH 19/23] 55693: ItemSelectReducer tests

---
 .../item-select/item-select.reducer.spec.ts   | 89 ++++++++++++++++++-
 1 file changed, 87 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/item-select/item-select.reducer.spec.ts b/src/app/shared/item-select/item-select.reducer.spec.ts
index 3067a4e93a..10c5db9b7f 100644
--- a/src/app/shared/item-select/item-select.reducer.spec.ts
+++ b/src/app/shared/item-select/item-select.reducer.spec.ts
@@ -1,4 +1,12 @@
-import { ItemSelectionSelectAction } from './item-select.actions';
+import {
+  ItemSelectionDeselectAction, ItemSelectionInitialDeselectAction,
+  ItemSelectionInitialSelectAction, ItemSelectionResetAction,
+  ItemSelectionSelectAction, ItemSelectionSwitchAction
+} from './item-select.actions';
+import { itemSelectionReducer } from './item-select.reducer';
+
+const itemId1 = 'id1';
+const itemId2 = 'id2';
 
 class NullAction extends ItemSelectionSelectAction {
   type = null;
@@ -8,6 +16,83 @@ class NullAction extends ItemSelectionSelectAction {
   }
 }
 
-fdescribe('itemSelectionReducer', () => {
+describe('itemSelectionReducer', () => {
+
+  it('should return the current state when no valid actions have been made', () => {
+    const state = {};
+    state[itemId1] = { checked: true };
+    const action = new NullAction();
+    const newState = itemSelectionReducer(state, action);
+
+    expect(newState).toEqual(state);
+  });
+
+  it('should start with an empty object', () => {
+    const state = {};
+    const action = new NullAction();
+    const newState = itemSelectionReducer(undefined, action);
+
+    expect(newState).toEqual(state);
+  });
+
+  it('should set checked to true in response to the INITIAL_SELECT action', () => {
+    const action = new ItemSelectionInitialSelectAction(itemId1);
+    const newState = itemSelectionReducer(undefined, action);
+
+    expect(newState[itemId1].checked).toBeTruthy();
+  });
+
+  it('should set checked to true in response to the INITIAL_DESELECT action', () => {
+    const action = new ItemSelectionInitialDeselectAction(itemId1);
+    const newState = itemSelectionReducer(undefined, action);
+
+    expect(newState[itemId1].checked).toBeFalsy();
+  });
+
+  it('should set checked to true in response to the SELECT action', () => {
+    const state = {};
+    state[itemId1] = { checked: false };
+    const action = new ItemSelectionSelectAction(itemId1);
+    const newState = itemSelectionReducer(state, action);
+
+    expect(newState[itemId1].checked).toBeTruthy();
+  });
+
+  it('should set checked to false in response to the DESELECT action', () => {
+    const state = {};
+    state[itemId1] = { checked: true };
+    const action = new ItemSelectionDeselectAction(itemId1);
+    const newState = itemSelectionReducer(state, action);
+
+    expect(newState[itemId1].checked).toBeFalsy();
+  });
+
+  it('should set checked from false to true in response to the SWITCH action', () => {
+    const state = {};
+    state[itemId1] = { checked: false };
+    const action = new ItemSelectionSwitchAction(itemId1);
+    const newState = itemSelectionReducer(state, action);
+
+    expect(newState[itemId1].checked).toBeTruthy();
+  });
+
+  it('should set checked from true to false in response to the SWITCH action', () => {
+    const state = {};
+    state[itemId1] = { checked: true };
+    const action = new ItemSelectionSwitchAction(itemId1);
+    const newState = itemSelectionReducer(state, action);
+
+    expect(newState[itemId1].checked).toBeFalsy();
+  });
+
+  it('should set reset the state in response to the RESET action', () => {
+    const state = {};
+    state[itemId1] = { checked: true };
+    state[itemId2] = { checked: false };
+    const action = new ItemSelectionResetAction(undefined);
+    const newState = itemSelectionReducer(state, action);
+
+    expect(newState).toEqual({});
+  });
 
 });

From 24f6f982e90bd43fa0434674edcafaa7834c93b0 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Mon, 1 Oct 2018 14:14:26 +0200
Subject: [PATCH 20/23] 55693: Authentication Guard and TSDocs

---
 .../collection-item-mapper.component.ts       | 41 +++++++++++++++++++
 .../collection-page-routing.module.ts         |  4 +-
 .../item-select/item-select.component.ts      | 33 +++++++++++++++
 3 files changed, 77 insertions(+), 1 deletion(-)

diff --git a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
index 9367dbd5b5..15f7db63b4 100644
--- a/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
+++ b/src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts
@@ -28,13 +28,37 @@ import { TranslateService } from '@ngx-translate/core';
     fadeInOut
   ]
 })
+/**
+ * Collection used to map items to a collection
+ */
 export class CollectionItemMapperComponent implements OnInit {
 
+  /**
+   * The collection to map items to
+   */
   collectionRD$: Observable<RemoteData<Collection>>;
+
+  /**
+   * Search options
+   */
   searchOptions$: Observable<PaginatedSearchOptions>;
+
+  /**
+   * List of items to show under the "Browse" tab
+   * Items inside the collection
+   */
   collectionItemsRD$: Observable<RemoteData<PaginatedList<DSpaceObject>>>;
+
+  /**
+   * List of items to show under the "Map" tab
+   * Items outside the collection
+   */
   mappingItemsRD$: Observable<RemoteData<PaginatedList<DSpaceObject>>>;
 
+  /**
+   * Sort on title ASC by default
+   * @type {SortOptions}
+   */
   defaultSortOptions: SortOptions = new SortOptions('dc.title', SortDirection.ASC);
 
   constructor(private route: ActivatedRoute,
@@ -52,6 +76,11 @@ export class CollectionItemMapperComponent implements OnInit {
     this.loadItemLists();
   }
 
+  /**
+   * Load collectionItemsRD$ with a fixed scope to only obtain the items this collection owns
+   * Load mappingItemsRD$ to only obtain items this collection doesn't own
+   *  TODO: When the API support it, fetch items excluding the collection's scope (currently fetches all items)
+   */
   loadItemLists() {
     const collectionAndOptions$ = Observable.combineLatest(
       this.collectionRD$,
@@ -79,6 +108,10 @@ export class CollectionItemMapperComponent implements OnInit {
     );
   }
 
+  /**
+   * Map the selected items to the collection and display notifications
+   * @param {string[]} ids  The list of item UUID's to map to the collection
+   */
   mapItems(ids: string[]) {
     const responses$ = this.collectionRD$.pipe(
       getSucceededRemoteData(),
@@ -112,12 +145,20 @@ export class CollectionItemMapperComponent implements OnInit {
     });
   }
 
+  /**
+   * Clear url parameters on tab change (temporary fix until pagination is improved)
+   * @param event
+   */
   tabChange(event) {
     // TODO: Fix tabs to maintain their own pagination options (once the current pagination system is improved)
     // Temporary solution: Clear url params when changing tabs
     this.router.navigateByUrl(this.getCurrentUrl());
   }
 
+  /**
+   * Get current url without parameters
+   * @returns {string}
+   */
   getCurrentUrl(): string {
     if (this.router.url.indexOf('?') > -1) {
       return this.router.url.substring(0, this.router.url.indexOf('?'));
diff --git a/src/app/+collection-page/collection-page-routing.module.ts b/src/app/+collection-page/collection-page-routing.module.ts
index c85d102437..f04d40e234 100644
--- a/src/app/+collection-page/collection-page-routing.module.ts
+++ b/src/app/+collection-page/collection-page-routing.module.ts
@@ -4,6 +4,7 @@ import { RouterModule } from '@angular/router';
 import { CollectionPageComponent } from './collection-page.component';
 import { CollectionPageResolver } from './collection-page.resolver';
 import { CollectionItemMapperComponent } from './collection-item-mapper/collection-item-mapper.component';
+import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
 
 @NgModule({
   imports: [
@@ -22,7 +23,8 @@ import { CollectionItemMapperComponent } from './collection-item-mapper/collecti
         pathMatch: 'full',
         resolve: {
           collection: CollectionPageResolver
-        }
+        },
+        canActivate: [AuthenticatedGuard]
       }
     ])
   ],
diff --git a/src/app/shared/item-select/item-select.component.ts b/src/app/shared/item-select/item-select.component.ts
index 00ca078bfa..3a2003a327 100644
--- a/src/app/shared/item-select/item-select.component.ts
+++ b/src/app/shared/item-select/item-select.component.ts
@@ -14,20 +14,40 @@ import { take } from 'rxjs/operators';
   templateUrl: './item-select.component.html'
 })
 
+/**
+ * A component used to select items from a specific list and returning the UUIDs of the selected items
+ */
 export class ItemSelectComponent implements OnInit {
 
+  /**
+   * The list of items to display
+   */
   @Input()
   itemsRD$: Observable<RemoteData<PaginatedList<Item>>>;
 
+  /**
+   * The pagination options used to display the items
+   */
   @Input()
   paginationOptions: PaginationComponentOptions;
 
+  /**
+   * The message key used for the confirm button
+   * @type {string}
+   */
   @Input()
   confirmButton = 'item.select.confirm';
 
+  /**
+   * EventEmitter to return the selected UUIDs when the confirm button is pressed
+   * @type {EventEmitter<string[]>}
+   */
   @Output()
   confirm: EventEmitter<string[]> = new EventEmitter<string[]>();
 
+  /**
+   * The list of selected UUIDs
+   */
   selectedIds$: Observable<string[]>;
 
   constructor(private itemSelectService: ItemSelectService) {
@@ -37,14 +57,27 @@ export class ItemSelectComponent implements OnInit {
     this.selectedIds$ = this.itemSelectService.getAllSelected();
   }
 
+  /**
+   * Switch the state of a checkbox
+   * @param {string} id
+   */
   switch(id: string) {
     this.itemSelectService.switch(id);
   }
 
+  /**
+   * Get the current state of a checkbox
+   * @param {string} id   The item's UUID
+   * @returns {Observable<boolean>}
+   */
   getSelected(id: string): Observable<boolean> {
     return this.itemSelectService.getSelected(id);
   }
 
+  /**
+   * Called when the confirm button is pressed
+   * Sends the selected UUIDs to the parent component
+   */
   confirmSelected() {
     this.selectedIds$.pipe(
       take(1)

From ba4d2861f5d95fd827c0e0c6de5731314a0074ee Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Mon, 8 Oct 2018 17:50:52 +0200
Subject: [PATCH 21/23] 55946: Start of Edit Item Page

---
 resources/i18n/en.json                        | 53 ++++++++++++++++++
 .../edit-item-page.component.html             | 52 ++++++++++++++++++
 .../edit-item-page.component.scss             |  0
 .../edit-item-page.component.spec.ts          |  0
 .../edit-item-page.component.ts               | 55 +++++++++++++++++++
 .../+item-page/item-page-routing.module.ts    | 10 ++++
 src/app/+item-page/item-page.module.ts        |  4 +-
 7 files changed, 173 insertions(+), 1 deletion(-)
 create mode 100644 src/app/+item-page/edit-item-page/edit-item-page.component.html
 create mode 100644 src/app/+item-page/edit-item-page/edit-item-page.component.scss
 create mode 100644 src/app/+item-page/edit-item-page/edit-item-page.component.spec.ts
 create mode 100644 src/app/+item-page/edit-item-page/edit-item-page.component.ts

diff --git a/resources/i18n/en.json b/resources/i18n/en.json
index 86ff55da66..7c45b612f7 100644
--- a/resources/i18n/en.json
+++ b/resources/i18n/en.json
@@ -72,6 +72,59 @@
         "title": "Title"
       },
       "confirm": "Confirm selected"
+    },
+    "edit": {
+      "head": "Edit Item",
+      "tabs": {
+        "status": {
+          "head": "Item Status",
+          "description": "Welcome to the item management page. From here you can withdraw, reinstate, move or delete the item. You may also update or add new metadata / bitstreams on the other tabs.",
+          "labels": {
+            "id": "Item Internal ID",
+            "handle": "Handle",
+            "lastModified": "Last Modified",
+            "itemPage": "Item Page"
+          },
+          "buttons": {
+            "authorizations": {
+              "label": "Edit item's authorization policies",
+              "button": "Authorizations..."
+            },
+            "withdraw": {
+              "label": "Withdraw item from the repository",
+              "button": "Withdraw..."
+            },
+            "move": {
+              "label": "Move item to another collection",
+              "button": "Move..."
+            },
+            "private": {
+              "label": "Make item private",
+              "button": "Make it private..."
+            },
+            "delete": {
+              "label": "Completely expunge item",
+              "button": "Permanently delete"
+            },
+            "mapped-collections": {
+              "label": "Manage mapped collections",
+              "button": "Mapped collections"
+            }
+          }
+        },
+        "bitstreams": {
+          "head": "Item Bitstreams"
+        },
+        "metadata": {
+          "head": "Item Metadata"
+        },
+        "view": {
+          "head": "View Item"
+        },
+        "curate": {
+          "head": "Curate"
+        }
+      }
     }
   },
   "nav": {
diff --git a/src/app/+item-page/edit-item-page/edit-item-page.component.html b/src/app/+item-page/edit-item-page/edit-item-page.component.html
new file mode 100644
index 0000000000..ca15e83ab9
--- /dev/null
+++ b/src/app/+item-page/edit-item-page/edit-item-page.component.html
@@ -0,0 +1,52 @@
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      <h2 class="border-bottom">{{'item.edit.head' | translate}}</h2>
+      <div class="pt-2">
+        <ngb-tabset>
+          <ngb-tab title="{{'item.edit.tabs.status.head' | translate}}">
+            <ng-template ngbTabContent>
+              <p class="mt-2">{{'item.edit.tabs.status.description' | translate}}</p>
+              <div class="row">
+                <div *ngFor="let statusKey of objectKeys(statusData$ | async)" class="w-100">
+                  <div class="col-3 float-left">
+                    {{'item.edit.tabs.status.labels.' + statusKey | translate}}:
+                  </div>
+                  <div class="col-9 float-left">
+                    {{(statusData$ | async)[statusKey]}}
+                  </div>
+                </div>
+                <div class="col-3 float-left">
+                  {{'item.edit.tabs.status.labels.itemPage' | translate}}:
+                </div>
+                <div class="col-9 float-left">
+                  <a href="{{getItemPage()}}">{{getItemPage()}}</a>
+                </div>
+              </div>
+            </ng-template>
+          </ngb-tab>
+          <ngb-tab title="{{'item.edit.tabs.bitstreams.head' | translate}}">
+            <ng-template ngbTabContent>
+
+            </ng-template>
+          </ngb-tab>
+          <ngb-tab title="{{'item.edit.tabs.metadata.head' | translate}}">
+            <ng-template ngbTabContent>
+
+            </ng-template>
+          </ngb-tab>
+          <ngb-tab title="{{'item.edit.tabs.view.head' | translate}}">
+            <ng-template ngbTabContent>
+
+            </ng-template>
+          </ngb-tab>
+          <ngb-tab title="{{'item.edit.tabs.curate.head' | translate}}">
+            <ng-template ngbTabContent>
+
+            </ng-template>
+          </ngb-tab>
+        </ngb-tabset>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/+item-page/edit-item-page/edit-item-page.component.scss b/src/app/+item-page/edit-item-page/edit-item-page.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/+item-page/edit-item-page/edit-item-page.component.spec.ts b/src/app/+item-page/edit-item-page/edit-item-page.component.spec.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/+item-page/edit-item-page/edit-item-page.component.ts b/src/app/+item-page/edit-item-page/edit-item-page.component.ts
new file mode 100644
index 0000000000..eb017669fc
--- /dev/null
+++ b/src/app/+item-page/edit-item-page/edit-item-page.component.ts
@@ -0,0 +1,55 @@
+import { fadeIn, fadeInOut } from '../../shared/animations/fade';
+import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { ActivatedRoute, Router } from '@angular/router';
+import { Observable } from 'rxjs/Observable';
+import { RemoteData } from '../../core/data/remote-data';
+import { Item } from '../../core/shared/item.model';
+import { getSucceededRemoteData } from '../../core/shared/operators';
+import { map } from 'rxjs/operators';
+
+@Component({
+  selector: 'ds-edit-item-page',
+  styleUrls: ['./edit-item-page.component.scss'],
+  templateUrl: './edit-item-page.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  animations: [
+    fadeIn,
+    fadeInOut
+  ]
+})
+/**
+ * Page component for editing an item
+ */
+export class EditItemPageComponent implements OnInit {
+
+  objectKeys = Object.keys;
+
+  /**
+   * The item to edit
+   */
+  itemRD$: Observable<RemoteData<Item>>;
+  statusData$: Observable<any>;
+
+  constructor(private route: ActivatedRoute,
+              private router: Router) {
+  }
+
+  ngOnInit(): void {
+    this.itemRD$ = this.route.data.map((data) => data.item);
+    this.statusData$ = this.itemRD$.pipe(
+      getSucceededRemoteData(),
+      map((itemRD: RemoteData<Item>) => itemRD.payload),
+      map((item: Item) => Object.assign({
+        id: item.id,
+        handle: item.handle,
+        lastModified: item.lastModified
+      }))
+    )
+  }
+
+  getItemPage(): string {
+    return this.router.url.substr(0, this.router.url.lastIndexOf('/'));
+  }
+
+}
diff --git a/src/app/+item-page/item-page-routing.module.ts b/src/app/+item-page/item-page-routing.module.ts
index 96158b867e..0105c947e9 100644
--- a/src/app/+item-page/item-page-routing.module.ts
+++ b/src/app/+item-page/item-page-routing.module.ts
@@ -4,6 +4,8 @@ import { RouterModule } from '@angular/router';
 import { ItemPageComponent } from './simple/item-page.component';
 import { FullItemPageComponent } from './full/full-item-page.component';
 import { ItemPageResolver } from './item-page.resolver';
+import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
+import { EditItemPageComponent } from './edit-item-page/edit-item-page.component';
 
 @NgModule({
   imports: [
@@ -22,6 +24,14 @@ import { ItemPageResolver } from './item-page.resolver';
         resolve: {
           item: ItemPageResolver
         }
+      },
+      {
+        path: ':id/edit',
+        component: EditItemPageComponent,
+        resolve: {
+          item: ItemPageResolver
+        },
+        canActivate: [AuthenticatedGuard]
       }
     ])
   ],
diff --git a/src/app/+item-page/item-page.module.ts b/src/app/+item-page/item-page.module.ts
index bd801923e3..45251bb1d8 100644
--- a/src/app/+item-page/item-page.module.ts
+++ b/src/app/+item-page/item-page.module.ts
@@ -18,6 +18,7 @@ import { FileSectionComponent } from './simple/field-components/file-section/fil
 import { CollectionsComponent } from './field-components/collections/collections.component';
 import { FullItemPageComponent } from './full/full-item-page.component';
 import { FullFileSectionComponent } from './full/field-components/file-section/full-file-section.component';
+import { EditItemPageComponent } from './edit-item-page/edit-item-page.component';
 
 @NgModule({
   imports: [
@@ -39,7 +40,8 @@ import { FullFileSectionComponent } from './full/field-components/file-section/f
     ItemPageSpecificFieldComponent,
     FileSectionComponent,
     CollectionsComponent,
-    FullFileSectionComponent
+    FullFileSectionComponent,
+    EditItemPageComponent
   ]
 })
 export class ItemPageModule {

From 3a809cc6710eb9e54d1bc7c49a2d41c321013c87 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 9 Oct 2018 11:51:52 +0200
Subject: [PATCH 22/23] 55946: Finished edit-item-page and start of collection
 mapper

---
 resources/i18n/en.json                        |  2 +-
 .../edit-item-page.component.html             | 18 +---
 .../edit-item-page.component.ts               | 24 +-----
 .../edit-item-page/edit-item-page.module.ts   | 23 ++++++
 .../edit-item-page.routing.module.ts          | 32 ++++++++
 .../item-collection-mapper.component.html     |  7 ++
 .../item-collection-mapper.component.scss     |  0
 .../item-collection-mapper.component.spec.ts  |  0
 .../item-collection-mapper.component.ts       | 19 +++++
 .../item-status/item-status.component.html    | 30 +++++++
 .../item-status/item-status.component.scss    |  0
 .../item-status/item-status.component.spec.ts |  0
 .../item-status/item-status.component.ts      | 82 +++++++++++++++++++
 .../+item-page/item-page-routing.module.ts    |  6 +-
 src/app/+item-page/item-page.module.ts        |  6 +-
 15 files changed, 201 insertions(+), 48 deletions(-)
 create mode 100644 src/app/+item-page/edit-item-page/edit-item-page.module.ts
 create mode 100644 src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
 create mode 100644 src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
 create mode 100644 src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.scss
 create mode 100644 src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts
 create mode 100644 src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
 create mode 100644 src/app/+item-page/edit-item-page/item-status/item-status.component.html
 create mode 100644 src/app/+item-page/edit-item-page/item-status/item-status.component.scss
 create mode 100644 src/app/+item-page/edit-item-page/item-status/item-status.component.spec.ts
 create mode 100644 src/app/+item-page/edit-item-page/item-status/item-status.component.ts

diff --git a/resources/i18n/en.json b/resources/i18n/en.json
index 7c45b612f7..69c4a4174b 100644
--- a/resources/i18n/en.json
+++ b/resources/i18n/en.json
@@ -106,7 +106,7 @@
               "label": "Completely expunge item",
               "button": "Permanently delete"
             },
-            "mapped-collections": {
+            "mappedCollections": {
               "label": "Manage mapped collections",
               "button": "Mapped collections"
             }
diff --git a/src/app/+item-page/edit-item-page/edit-item-page.component.html b/src/app/+item-page/edit-item-page/edit-item-page.component.html
index ca15e83ab9..001b484c2c 100644
--- a/src/app/+item-page/edit-item-page/edit-item-page.component.html
+++ b/src/app/+item-page/edit-item-page/edit-item-page.component.html
@@ -6,23 +6,7 @@
         <ngb-tabset>
           <ngb-tab title="{{'item.edit.tabs.status.head' | translate}}">
             <ng-template ngbTabContent>
-              <p class="mt-2">{{'item.edit.tabs.status.description' | translate}}</p>
-              <div class="row">
-                <div *ngFor="let statusKey of objectKeys(statusData$ | async)" class="w-100">
-                  <div class="col-3 float-left">
-                    {{'item.edit.tabs.status.labels.' + statusKey | translate}}:
-                  </div>
-                  <div class="col-9 float-left">
-                    {{(statusData$ | async)[statusKey]}}
-                  </div>
-                </div>
-                <div class="col-3 float-left">
-                  {{'item.edit.tabs.status.labels.itemPage' | translate}}:
-                </div>
-                <div class="col-9 float-left">
-                  <a href="{{getItemPage()}}">{{getItemPage()}}</a>
-                </div>
-              </div>
+              <ds-item-status [item]="(itemRD$ | async)?.payload"></ds-item-status>
             </ng-template>
           </ngb-tab>
           <ngb-tab title="{{'item.edit.tabs.bitstreams.head' | translate}}">
diff --git a/src/app/+item-page/edit-item-page/edit-item-page.component.ts b/src/app/+item-page/edit-item-page/edit-item-page.component.ts
index eb017669fc..7702fc94e8 100644
--- a/src/app/+item-page/edit-item-page/edit-item-page.component.ts
+++ b/src/app/+item-page/edit-item-page/edit-item-page.component.ts
@@ -1,12 +1,9 @@
 import { fadeIn, fadeInOut } from '../../shared/animations/fade';
 import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
-import { ItemDataService } from '../../core/data/item-data.service';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs/Observable';
 import { RemoteData } from '../../core/data/remote-data';
 import { Item } from '../../core/shared/item.model';
-import { getSucceededRemoteData } from '../../core/shared/operators';
-import { map } from 'rxjs/operators';
 
 @Component({
   selector: 'ds-edit-item-page',
@@ -23,33 +20,16 @@ import { map } from 'rxjs/operators';
  */
 export class EditItemPageComponent implements OnInit {
 
-  objectKeys = Object.keys;
-
   /**
    * The item to edit
    */
   itemRD$: Observable<RemoteData<Item>>;
-  statusData$: Observable<any>;
 
-  constructor(private route: ActivatedRoute,
-              private router: Router) {
+  constructor(private route: ActivatedRoute) {
   }
 
   ngOnInit(): void {
     this.itemRD$ = this.route.data.map((data) => data.item);
-    this.statusData$ = this.itemRD$.pipe(
-      getSucceededRemoteData(),
-      map((itemRD: RemoteData<Item>) => itemRD.payload),
-      map((item: Item) => Object.assign({
-        id: item.id,
-        handle: item.handle,
-        lastModified: item.lastModified
-      }))
-    )
-  }
-
-  getItemPage(): string {
-    return this.router.url.substr(0, this.router.url.lastIndexOf('/'));
   }
 
 }
diff --git a/src/app/+item-page/edit-item-page/edit-item-page.module.ts b/src/app/+item-page/edit-item-page/edit-item-page.module.ts
new file mode 100644
index 0000000000..70f6fc7d3b
--- /dev/null
+++ b/src/app/+item-page/edit-item-page/edit-item-page.module.ts
@@ -0,0 +1,23 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { SharedModule } from '../../shared/shared.module';
+import { EditItemPageRoutingModule } from './edit-item-page.routing.module';
+import { EditItemPageComponent } from './edit-item-page.component';
+import { ItemCollectionMapperComponent } from './item-collection-mapper/item-collection-mapper.component';
+import { ItemStatusComponent } from './item-status/item-status.component';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    SharedModule,
+    EditItemPageRoutingModule
+  ],
+  declarations: [
+    EditItemPageComponent,
+    ItemStatusComponent,
+    ItemCollectionMapperComponent
+  ]
+})
+export class EditItemPageModule {
+
+}
diff --git a/src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts b/src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
new file mode 100644
index 0000000000..f2209cddcc
--- /dev/null
+++ b/src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
@@ -0,0 +1,32 @@
+import { ItemPageResolver } from '../item-page.resolver';
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { EditItemPageComponent } from './edit-item-page.component';
+import { ItemCollectionMapperComponent } from './item-collection-mapper/item-collection-mapper.component';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      {
+        path: '',
+        component: EditItemPageComponent,
+        resolve: {
+          item: ItemPageResolver
+        }
+      },
+      {
+        path: 'map',
+        component: ItemCollectionMapperComponent,
+        resolve: {
+          item: ItemPageResolver
+        }
+      }
+    ])
+  ],
+  providers: [
+    ItemPageResolver,
+  ]
+})
+export class EditItemPageRoutingModule {
+
+}
diff --git a/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html b/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
new file mode 100644
index 0000000000..3fb829fe8b
--- /dev/null
+++ b/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
@@ -0,0 +1,7 @@
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      <p>It works!</p>
+    </div>
+  </div>
+</div>
diff --git a/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.scss b/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts b/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts b/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
new file mode 100644
index 0000000000..592e3bd26c
--- /dev/null
+++ b/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
@@ -0,0 +1,19 @@
+import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { fadeIn, fadeInOut } from '../../../shared/animations/fade';
+
+@Component({
+  selector: 'ds-item-collection-mapper',
+  styleUrls: ['./item-collection-mapper.component.scss'],
+  templateUrl: './item-collection-mapper.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  animations: [
+    fadeIn,
+    fadeInOut
+  ]
+})
+/**
+ * Component for mapping collections to an item
+ */
+export class ItemCollectionMapperComponent {
+
+}
diff --git a/src/app/+item-page/edit-item-page/item-status/item-status.component.html b/src/app/+item-page/edit-item-page/item-status/item-status.component.html
new file mode 100644
index 0000000000..0a93e7659d
--- /dev/null
+++ b/src/app/+item-page/edit-item-page/item-status/item-status.component.html
@@ -0,0 +1,30 @@
+<p class="mt-2">{{'item.edit.tabs.status.description' | translate}}</p>
+<div class="row">
+  <div *ngFor="let statusKey of statusDataKeys" class="w-100">
+    <div class="col-3 float-left">
+      {{'item.edit.tabs.status.labels.' + statusKey | translate}}:
+    </div>
+    <div class="col-9 float-left">
+      {{statusData[statusKey]}}
+    </div>
+  </div>
+  <div class="col-3 float-left">
+    {{'item.edit.tabs.status.labels.itemPage' | translate}}:
+  </div>
+  <div class="col-9 float-left">
+    <a href="{{getItemPage()}}">{{getItemPage()}}</a>
+  </div>
+
+  <div *ngFor="let actionKey of actionsKeys" class="w-100 pt-3">
+    <div class="col-3 float-left d-flex h-100">
+      <span class="justify-content-center align-self-center">
+        {{'item.edit.tabs.status.buttons.' + actionKey + '.label' | translate}}
+      </span>
+    </div>
+    <div class="col-9 float-left">
+      <a class="btn btn-outline-secondary" href="{{actions[actionKey]}}">
+        {{'item.edit.tabs.status.buttons.' + actionKey + '.button' | translate}}
+      </a>
+    </div>
+  </div>
+</div>
diff --git a/src/app/+item-page/edit-item-page/item-status/item-status.component.scss b/src/app/+item-page/edit-item-page/item-status/item-status.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/+item-page/edit-item-page/item-status/item-status.component.spec.ts b/src/app/+item-page/edit-item-page/item-status/item-status.component.spec.ts
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/+item-page/edit-item-page/item-status/item-status.component.ts b/src/app/+item-page/edit-item-page/item-status/item-status.component.ts
new file mode 100644
index 0000000000..715614c1d9
--- /dev/null
+++ b/src/app/+item-page/edit-item-page/item-status/item-status.component.ts
@@ -0,0 +1,82 @@
+import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core';
+import { fadeIn, fadeInOut } from '../../../shared/animations/fade';
+import { Item } from '../../../core/shared/item.model';
+import { Router } from '@angular/router';
+
+@Component({
+  selector: 'ds-item-status',
+  styleUrls: ['./item-status.component.scss'],
+  templateUrl: './item-status.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  animations: [
+    fadeIn,
+    fadeInOut
+  ]
+})
+/**
+ * Component for displaying an item's status
+ */
+export class ItemStatusComponent implements OnInit {
+
+  /**
+   * The item to display the status for
+   */
+  @Input() item: Item;
+
+  /**
+   * The data to show in the status
+   */
+  statusData: any;
+  /**
+   * The keys of the data (to loop over)
+   */
+  statusDataKeys;
+
+  /**
+   * The possible actions that can be performed on the item
+   *  key: id   value: url to action's component
+   */
+  actions: any;
+  /**
+   * The keys of the actions (to loop over)
+   */
+  actionsKeys;
+
+  constructor(private router: Router) {
+  }
+
+  ngOnInit(): void {
+    this.statusData = Object.assign({
+      id: this.item.id,
+      handle: this.item.handle,
+      lastModified: this.item.lastModified
+    });
+    this.statusDataKeys = Object.keys(this.statusData);
+
+    this.actions = Object.assign({
+      mappedCollections: this.getCurrentUrl() + '/map'
+    });
+    this.actionsKeys = Object.keys(this.actions);
+  }
+
+  /**
+   * Get the url to the simple item page
+   * @returns {string}  url
+   */
+  getItemPage(): string {
+    return this.router.url.substr(0, this.router.url.lastIndexOf('/'));
+  }
+
+  /**
+   * Get the current url without query params
+   * @returns {string}  url
+   */
+  getCurrentUrl(): string {
+    if (this.router.url.indexOf('?') > -1) {
+      return this.router.url.substr(0, this.router.url.indexOf('?'));
+    } else {
+      return this.router.url;
+    }
+  }
+
+}
diff --git a/src/app/+item-page/item-page-routing.module.ts b/src/app/+item-page/item-page-routing.module.ts
index 0105c947e9..be31b0a82d 100644
--- a/src/app/+item-page/item-page-routing.module.ts
+++ b/src/app/+item-page/item-page-routing.module.ts
@@ -5,7 +5,6 @@ import { ItemPageComponent } from './simple/item-page.component';
 import { FullItemPageComponent } from './full/full-item-page.component';
 import { ItemPageResolver } from './item-page.resolver';
 import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
-import { EditItemPageComponent } from './edit-item-page/edit-item-page.component';
 
 @NgModule({
   imports: [
@@ -27,10 +26,7 @@ import { EditItemPageComponent } from './edit-item-page/edit-item-page.component
       },
       {
         path: ':id/edit',
-        component: EditItemPageComponent,
-        resolve: {
-          item: ItemPageResolver
-        },
+        loadChildren: './edit-item-page/edit-item-page.module#EditItemPageModule',
         canActivate: [AuthenticatedGuard]
       }
     ])
diff --git a/src/app/+item-page/item-page.module.ts b/src/app/+item-page/item-page.module.ts
index 45251bb1d8..d383189a9c 100644
--- a/src/app/+item-page/item-page.module.ts
+++ b/src/app/+item-page/item-page.module.ts
@@ -18,12 +18,13 @@ import { FileSectionComponent } from './simple/field-components/file-section/fil
 import { CollectionsComponent } from './field-components/collections/collections.component';
 import { FullItemPageComponent } from './full/full-item-page.component';
 import { FullFileSectionComponent } from './full/field-components/file-section/full-file-section.component';
-import { EditItemPageComponent } from './edit-item-page/edit-item-page.component';
+import { EditItemPageModule } from './edit-item-page/edit-item-page.module';
 
 @NgModule({
   imports: [
     CommonModule,
     SharedModule,
+    EditItemPageModule,
     ItemPageRoutingModule
   ],
   declarations: [
@@ -40,8 +41,7 @@ import { EditItemPageComponent } from './edit-item-page/edit-item-page.component
     ItemPageSpecificFieldComponent,
     FileSectionComponent,
     CollectionsComponent,
-    FullFileSectionComponent,
-    EditItemPageComponent
+    FullFileSectionComponent
   ]
 })
 export class ItemPageModule {

From 6bc4d061f10bd49bb6c1a5ef3dbe914abc30e858 Mon Sep 17 00:00:00 2001
From: Kristof De Langhe <kristof.delanghe@atmire.com>
Date: Tue, 9 Oct 2018 14:09:56 +0200
Subject: [PATCH 23/23] 55946: Intermediate commit

---
 resources/i18n/en.json                        | 21 +++++
 .../edit-item-page/edit-item-page.module.ts   |  2 +
 .../edit-item-page.routing.module.ts          |  2 +-
 .../item-collection-mapper.component.html     | 33 ++++++-
 .../item-collection-mapper.component.ts       | 94 ++++++++++++++++++-
 .../item-status/item-status.component.ts      |  2 +-
 src/app/core/core.module.ts                   |  2 +
 src/app/core/data/item-data.service.ts        | 30 +++++-
 ...ing-collections-reponse-parsing.service.ts | 24 +++++
 src/app/core/data/request.models.ts           |  7 ++
 10 files changed, 208 insertions(+), 9 deletions(-)
 create mode 100644 src/app/core/data/mapping-collections-reponse-parsing.service.ts

diff --git a/resources/i18n/en.json b/resources/i18n/en.json
index 69c4a4174b..f1e6c2b9ed 100644
--- a/resources/i18n/en.json
+++ b/resources/i18n/en.json
@@ -124,6 +124,27 @@
         "curate": {
           "head": "Curate"
         }
+      },
+      "item-mapper": {
+        "head": "Item Mapper - Map Item to Collections",
+        "item": "Item: \"<b>{{name}}</b>\"",
+        "description": "This is the item mapper tool that allows administrators to map this item to other collections. You can search for collections and map them, or browse the list of collections the item is currently mapped to.",
+        "confirm": "Map item to selected collections",
+        "tabs": {
+          "browse": "Browse",
+          "map": "Map"
+        },
+        "notifications": {
+          "success": {
+            "head": "Mapping completed",
+            "content": "Successfully mapped item to {{amount}} collections."
+          },
+          "error": {
+            "head": "Mapping errors",
+            "content": "Errors occurred for mapping of item to {{amount}} collections."
+          }
+        },
+        "return": "Return"
       }
     }
   },
diff --git a/src/app/+item-page/edit-item-page/edit-item-page.module.ts b/src/app/+item-page/edit-item-page/edit-item-page.module.ts
index 70f6fc7d3b..d11eb7ec7d 100644
--- a/src/app/+item-page/edit-item-page/edit-item-page.module.ts
+++ b/src/app/+item-page/edit-item-page/edit-item-page.module.ts
@@ -5,11 +5,13 @@ import { EditItemPageRoutingModule } from './edit-item-page.routing.module';
 import { EditItemPageComponent } from './edit-item-page.component';
 import { ItemCollectionMapperComponent } from './item-collection-mapper/item-collection-mapper.component';
 import { ItemStatusComponent } from './item-status/item-status.component';
+import { SearchPageModule } from '../../+search-page/search-page.module';
 
 @NgModule({
   imports: [
     CommonModule,
     SharedModule,
+    SearchPageModule,
     EditItemPageRoutingModule
   ],
   declarations: [
diff --git a/src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts b/src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
index f2209cddcc..dc3f975468 100644
--- a/src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
+++ b/src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
@@ -15,7 +15,7 @@ import { ItemCollectionMapperComponent } from './item-collection-mapper/item-col
         }
       },
       {
-        path: 'map',
+        path: 'mapper',
         component: ItemCollectionMapperComponent,
         resolve: {
           item: ItemPageResolver
diff --git a/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html b/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
index 3fb829fe8b..21149eafaf 100644
--- a/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
+++ b/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.html
@@ -1,7 +1,38 @@
 <div class="container">
   <div class="row">
     <div class="col-12">
-      <p>It works!</p>
+      <h2>{{'item.edit.item-mapper.head' | translate}}</h2>
+      <p [innerHTML]="'item.edit.item-mapper.item' | translate:{ name: (itemRD$ | async)?.payload?.name }" id="item-name"></p>
+      <p>{{'item.edit.item-mapper.description' | translate}}</p>
+
+      <div class="row">
+        <div class="col-12 col-lg-6">
+          <ds-search-form id="search-form"
+                          [query]="(searchOptions$ | async)?.query"
+                          [scope]="(searchOptions$ | async)?.scope"
+                          [currentUrl]="getCurrentUrl()">
+          </ds-search-form>
+        </div>
+      </div>
+
+      <ngb-tabset (tabChange)="tabChange($event)">
+        <ngb-tab title="{{'item.edit.item-mapper.tabs.browse' | translate}}">
+          <ng-template ngbTabContent>
+            <div class="mt-2">
+              <div *ngFor="let col of (itemCollectionsRD$ | async)?.payload">{{col.name}}</div>
+            </div>
+          </ng-template>
+        </ngb-tab>
+        <ngb-tab title="{{'item.edit.item-mapper.tabs.map' | translate}}">
+          <ng-template ngbTabContent>
+            <div class="mt-2">
+
+            </div>
+          </ng-template>
+        </ngb-tab>
+      </ngb-tabset>
+
+      <button [routerLink]="['/items/', (itemRD$ | async)?.payload?.id]" class="btn btn-outline-secondary">{{'item.edit.item-mapper.return' | translate}}</button>
     </div>
   </div>
 </div>
diff --git a/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts b/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
index 592e3bd26c..eeb602292d 100644
--- a/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
+++ b/src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
@@ -1,5 +1,20 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { fadeIn, fadeInOut } from '../../../shared/animations/fade';
+import { Observable } from 'rxjs/Observable';
+import { PaginatedSearchOptions } from '../../../+search-page/paginated-search-options.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { PaginatedList } from '../../../core/data/paginated-list';
+import { Collection } from '../../../core/shared/collection.model';
+import { Item } from '../../../core/shared/item.model';
+import { getSucceededRemoteData } from '../../../core/shared/operators';
+import { ActivatedRoute, Router } from '@angular/router';
+import { SearchService } from '../../../+search-page/search-service/search.service';
+import { SearchConfigurationService } from '../../../+search-page/search-service/search-configuration.service';
+import { map, switchMap } from 'rxjs/operators';
+import { CollectionDataService } from '../../../core/data/collection-data.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
 
 @Component({
   selector: 'ds-item-collection-mapper',
@@ -14,6 +29,81 @@ import { fadeIn, fadeInOut } from '../../../shared/animations/fade';
 /**
  * Component for mapping collections to an item
  */
-export class ItemCollectionMapperComponent {
+export class ItemCollectionMapperComponent implements OnInit {
+  /**
+   * The item to map to collections
+   */
+  itemRD$: Observable<RemoteData<Item>>;
+
+  /**
+   * Search options
+   */
+  searchOptions$: Observable<PaginatedSearchOptions>;
+
+  /**
+   * List of collections to show under the "Browse" tab
+   * Collections that are mapped to the item
+   */
+  itemCollectionsRD$: Observable<RemoteData<Collection[]>>;
+
+  /**
+   * List of collections to show under the "Map" tab
+   * Collections that are not mapped to the item
+   */
+  mappingCollectionsRD$: Observable<RemoteData<PaginatedList<Collection>>>;
+
+  /**
+   * Sort on title ASC by default
+   * @type {SortOptions}
+   */
+  defaultSortOptions: SortOptions = new SortOptions('dc.title', SortDirection.ASC);
+
+  constructor(private route: ActivatedRoute,
+              private router: Router,
+              private searchConfigService: SearchConfigurationService,
+              private searchService: SearchService,
+              private collectionDataService: CollectionDataService,
+              private itemDataService: ItemDataService) {
+  }
+
+  ngOnInit(): void {
+    this.itemRD$ = this.route.data.map((data) => data.item).pipe(getSucceededRemoteData()) as Observable<RemoteData<Item>>;
+    this.searchOptions$ = this.searchConfigService.paginatedSearchOptions;
+    this.loadCollectionLists();
+  }
+
+  /**
+   * Load itemCollectionsRD$ with a fixed scope to only obtain the collections that own this item
+   * Load mappingCollectionsRD$ to only obtain collections that don't own this item
+   *  TODO: When the API support it, fetch collections excluding the item's scope (currently fetches all collections)
+   */
+  loadCollectionLists() {
+    this.itemCollectionsRD$ = this.itemRD$.pipe(
+      map((itemRD: RemoteData<Item>) => itemRD.payload),
+      switchMap((item: Item) => this.itemDataService.getMappedCollections(item.id))
+    );
+    this.mappingCollectionsRD$ = this.collectionDataService.findAll();
+  }
+
+  /**
+   * Clear url parameters on tab change (temporary fix until pagination is improved)
+   * @param event
+   */
+  tabChange(event) {
+    // TODO: Fix tabs to maintain their own pagination options (once the current pagination system is improved)
+    // Temporary solution: Clear url params when changing tabs
+    this.router.navigateByUrl(this.getCurrentUrl());
+  }
+
+  /**
+   * Get current url without parameters
+   * @returns {string}
+   */
+  getCurrentUrl(): string {
+    if (this.router.url.indexOf('?') > -1) {
+      return this.router.url.substring(0, this.router.url.indexOf('?'));
+    }
+    return this.router.url;
+  }
 
 }
diff --git a/src/app/+item-page/edit-item-page/item-status/item-status.component.ts b/src/app/+item-page/edit-item-page/item-status/item-status.component.ts
index 715614c1d9..545ca17b6e 100644
--- a/src/app/+item-page/edit-item-page/item-status/item-status.component.ts
+++ b/src/app/+item-page/edit-item-page/item-status/item-status.component.ts
@@ -54,7 +54,7 @@ export class ItemStatusComponent implements OnInit {
     this.statusDataKeys = Object.keys(this.statusData);
 
     this.actions = Object.assign({
-      mappedCollections: this.getCurrentUrl() + '/map'
+      mappedCollections: this.getCurrentUrl() + '/mapper'
     });
     this.actionsKeys = Object.keys(this.actions);
   }
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index 31b9b31244..4ea3aa8df7 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -65,6 +65,7 @@ import { UploaderService } from '../shared/uploader/uploader.service';
 import { BrowseItemsResponseParsingService } from './data/browse-items-response-parsing-service';
 import { DSpaceObjectDataService } from './data/dspace-object-data.service';
 import { ItemSelectService } from '../shared/item-select/item-select.service';
+import { MappingCollectionsReponseParsingService } from './data/mapping-collections-reponse-parsing.service';
 
 const IMPORTS = [
   CommonModule,
@@ -111,6 +112,7 @@ const PROVIDERS = [
   RegistryMetadataschemasResponseParsingService,
   RegistryMetadatafieldsResponseParsingService,
   RegistryBitstreamformatsResponseParsingService,
+  MappingCollectionsReponseParsingService,
   MetadataschemaParsingService,
   DebugResponseParsingService,
   SearchResponseParsingService,
diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts
index 7c2c4e572d..250d8c1303 100644
--- a/src/app/core/data/item-data.service.ts
+++ b/src/app/core/data/item-data.service.ts
@@ -3,7 +3,7 @@ import { Inject, Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs/Observable';
 import { GLOBAL_CONFIG, GlobalConfig } from '../../../config';
-import { isEmpty, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
+import { ensureArrayHasValue, isEmpty, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
 import { BrowseService } from '../browse/browse.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { NormalizedItem } from '../cache/models/normalized-item.model';
@@ -15,11 +15,21 @@ import { URLCombiner } from '../url-combiner/url-combiner';
 import { DataService } from './data.service';
 import { RequestService } from './request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { FindAllOptions, PostRequest, RestRequest } from './request.models';
+import { FindAllOptions, GetRequest, MappingCollectionsRequest, PostRequest, RestRequest } from './request.models';
 import { distinctUntilChanged, map } from 'rxjs/operators';
-import { configureRequest, getResponseFromSelflink } from '../shared/operators';
+import {
+  configureRequest,
+  filterSuccessfulResponses,
+  getRequestFromSelflink,
+  getResponseFromSelflink
+} from '../shared/operators';
 import { ResponseCacheEntry } from '../cache/response-cache.reducer';
-import { RestResponse } from '../cache/response-cache.models';
+import { DSOSuccessResponse, GenericSuccessResponse, RestResponse } from '../cache/response-cache.models';
+import { BrowseDefinition } from '../shared/browse-definition.model';
+import { Collection } from '../shared/collection.model';
+import { NormalizedCollection } from '../cache/models/normalized-collection.model';
+import { RemoteData } from './remote-data';
+import { PaginatedList } from './paginated-list';
 
 @Injectable()
 export class ItemDataService extends DataService<NormalizedItem, Item> {
@@ -71,4 +81,16 @@ export class ItemDataService extends DataService<NormalizedItem, Item> {
     );
   }
 
+  public getMappedCollections(itemId: string): Observable<RemoteData<Collection[]>> {
+    const request$ = this.getMappingCollectionsEndpoint(itemId).pipe(
+      isNotEmptyOperator(),
+      distinctUntilChanged(),
+      map((endpointURL: string) => new MappingCollectionsRequest(this.requestService.generateRequestId(), endpointURL)),
+      configureRequest(this.requestService)
+    );
+
+    // TODO: Create a remotedata object
+    return undefined;
+  }
+
 }
diff --git a/src/app/core/data/mapping-collections-reponse-parsing.service.ts b/src/app/core/data/mapping-collections-reponse-parsing.service.ts
new file mode 100644
index 0000000000..1b1ff3368f
--- /dev/null
+++ b/src/app/core/data/mapping-collections-reponse-parsing.service.ts
@@ -0,0 +1,24 @@
+import { Injectable } from '@angular/core';
+import { ResponseParsingService } from './parsing.service';
+import { RestRequest } from './request.models';
+import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
+import { ErrorResponse, GenericSuccessResponse, RestResponse } from '../cache/response-cache.models';
+
+@Injectable()
+export class MappingCollectionsReponseParsingService implements ResponseParsingService {
+  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
+    const payload = data.payload;
+
+    if (payload._embedded && payload._embedded.mappingCollections) {
+      const mappingCollections = payload._embedded.mappingCollections;
+      return new GenericSuccessResponse(mappingCollections, data.statusCode);
+    } else {
+      return new ErrorResponse(
+        Object.assign(
+          new Error('Unexpected response from mappingCollections endpoint'),
+          { statusText: data.statusCode }
+        )
+      );
+    }
+  }
+}
diff --git a/src/app/core/data/request.models.ts b/src/app/core/data/request.models.ts
index b87f9cefc8..001c416f69 100644
--- a/src/app/core/data/request.models.ts
+++ b/src/app/core/data/request.models.ts
@@ -13,6 +13,7 @@ import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
 import { HttpHeaders } from '@angular/common/http';
 import { IntegrationResponseParsingService } from '../integration/integration-response-parsing.service';
 import { BrowseItemsResponseParsingService } from './browse-items-response-parsing-service';
+import { MappingCollectionsReponseParsingService } from './mapping-collections-reponse-parsing.service';
 
 /* tslint:disable:max-classes-per-file */
 
@@ -191,6 +192,12 @@ export class BrowseItemsRequest extends GetRequest {
   }
 }
 
+export class MappingCollectionsRequest extends GetRequest {
+  getResponseParser(): GenericConstructor<ResponseParsingService> {
+    return MappingCollectionsReponseParsingService;
+  }
+}
+
 export class ConfigRequest extends GetRequest {
   constructor(uuid: string, href: string) {
     super(uuid, href);