55693: Intermediate commit

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>
 

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

src/app/shared/item-select/item-select.component.html

@@ -1,4 +1,10 @@
-<div class="table-responsive">
+<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>
@@ -9,7 +15,7 @@
         </tr>
       </thead>
       <tbody>
-      <tr *ngFor="let item of (items$ | async)?.payload?.page ; let i = index">
+        <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>
@@ -17,4 +23,5 @@
         </tr>
       </tbody>
     </table>
-</div>
+  </div>
+</ds-pagination>

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