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] 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));
   }
 
 }