reworked items list on collection page

src/app/+collection-page/collection-page.component.ts

@@ -19,6 +19,10 @@ import { fadeIn, fadeInOut } from '../shared/animations/fade';
 import { hasValue, isNotEmpty } from '../shared/empty.util';
 import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
 import { filter, flatMap, map } from 'rxjs/operators';
+import { SearchService } from '../+search-page/search-service/search.service';
+import { PaginatedSearchOptions } from '../+search-page/paginated-search-options.model';
+import { SearchResult } from '../+search-page/search-result.model';
+import { toDSpaceObjectListRD } from '../core/shared/operators';
 
 @Component({
   selector: 'ds-collection-page',
@@ -41,7 +45,7 @@ export class CollectionPageComponent implements OnInit, OnDestroy {
 
   constructor(
     private collectionDataService: CollectionDataService,
-    private itemDataService: ItemDataService,
+    private searchService: SearchService,
     private metadata: MetadataService,
     private route: ActivatedRoute
   ) {
@@ -82,12 +86,13 @@ export class CollectionPageComponent implements OnInit, OnDestroy {
   }
 
   updatePage(searchOptions) {
-    this.itemRD$ = this.itemDataService.findAll({
+    this.itemRD$ = this.searchService.search(
-      scopeID: this.collectionId,
+      new PaginatedSearchOptions({
-      currentPage: searchOptions.pagination.currentPage,
+        scope: this.collectionId,
-      elementsPerPage: searchOptions.pagination.pageSize,
+        pagination: searchOptions.pagination,
-      sort: searchOptions.sort
+        sort: searchOptions.sort,
-    });
+        filters: {type: 2}
+      })).pipe(toDSpaceObjectListRD()) as Observable<RemoteData<PaginatedList<Item>>>;
   }
 
   ngOnDestroy(): void {

src/app/+collection-page/collection-page.module.ts

@@ -5,11 +5,13 @@ 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';
 
 @NgModule({
   imports: [
     CommonModule,
     SharedModule,
+    SearchPageModule,
     CollectionPageRoutingModule
   ],
   declarations: [

src/app/+search-page/paginated-search-options.model.spec.ts

@@ -12,12 +12,7 @@ describe('PaginatedSearchOptions', () => {
   const scope = '0fde1ecb-82cc-425a-b600-ac3576d76b47';
   const baseUrl = 'www.rest.com';
   beforeEach(() => {
-    options = new PaginatedSearchOptions();
+    options = new PaginatedSearchOptions({sort: sortOptions, pagination: pageOptions, filters: filters, query: query, scope: scope});
-    options.sort = sortOptions;
-    options.pagination = pageOptions;
-    options.filters = filters;
-    options.query = query;
-    options.scope = scope;
   });
 
   describe('when toRestUrl is called', () => {

src/app/+search-page/paginated-search-options.model.ts

@@ -10,6 +10,12 @@ export class PaginatedSearchOptions extends SearchOptions {
   pagination?: PaginationComponentOptions;
   sort?: SortOptions;
 
+  constructor(options: {scope?: string, query?: string, filters?: any, pagination?: PaginationComponentOptions, sort?: SortOptions}) {
+    super(options)
+    this.pagination = options.pagination;
+    this.sort = options.sort;
+  }
+
   /**
    * Method to generate the URL that can be used to request a certain page with specific sort options
    * @param {string} url The URL to the REST endpoint

src/app/+search-page/search-options.model.spec.ts

@@ -9,10 +9,7 @@ describe('SearchOptions', () => {
   const scope = '0fde1ecb-82cc-425a-b600-ac3576d76b47';
   const baseUrl = 'www.rest.com';
   beforeEach(() => {
-    options = new SearchOptions();
+    options = new SearchOptions({filters: filters, query: query, scope: scope});
-    options.filters = filters;
-    options.query = query;
-    options.scope = scope;
   });
 
   describe('when toRestUrl is called', () => {

src/app/+search-page/search-options.model.ts

@@ -10,6 +10,12 @@ export class SearchOptions {
   query?: string;
   filters?: any;
 
+  constructor(options: {scope?: string, query?: string, filters?: any}) {
+      this.scope = options.scope;
+      this.query = options.query;
+      this.filters = options.filters;
+  }
+
   /**
    * Method to generate the URL that can be used request information about a search request
    * @param {string} url The URL to the REST endpoint

src/app/+search-page/search-page.component.spec.ts

@@ -37,7 +37,7 @@ describe('SearchPageComponent', () => {
   pagination.currentPage = 1;
   pagination.pageSize = 10;
   const sort: SortOptions = new SortOptions('score', SortDirection.DESC);
-  const mockResults = Observable.of(new RemoteData(false, false, true, null,['test', 'data']));
+  const mockResults = Observable.of(new RemoteData(false, false, true, null, ['test', 'data']));
   const searchServiceStub = jasmine.createSpyObj('SearchService', {
     search: mockResults,
     getSearchLink: '/search',
@@ -46,11 +46,11 @@ describe('SearchPageComponent', () => {
   const queryParam = 'test query';
   const scopeParam = '7669c72a-3f2a-451f-a3b9-9210e7a4c02f';
   const paginatedSearchOptions = {
-      query: queryParam,
+    query: queryParam,
-      scope: scopeParam,
+    scope: scopeParam,
-      pagination,
+    pagination,
-      sort
+    sort
-    };
+  };
   const activatedRouteStub = {
     queryParams: Observable.of({
       query: queryParam,
@@ -178,5 +178,4 @@ describe('SearchPageComponent', () => {
     });
 
   });
-})
+});
-;

src/app/+search-page/search-service/search-configuration.service.spec.ts

@@ -14,7 +14,7 @@ describe('SearchConfigurationService', () => {
     'f.date.min': ['2013'],
     'f.date.max': ['2018']
   };
-  const defaults = Object.assign(new PaginatedSearchOptions(), {
+  const defaults = new PaginatedSearchOptions( {
     pagination: Object.assign(new PaginationComponentOptions(), { currentPage: 1, pageSize: 20 }),
     sort: new SortOptions('score', SortDirection.DESC),
     query: '',

src/app/+search-page/search-service/search-configuration.service.ts

@@ -174,7 +174,7 @@ export class SearchConfigurationService implements OnDestroy {
       this.getFiltersPart()
     ).subscribe((update) => {
       const currentValue: SearchOptions = this.searchOptions.getValue();
-      const updatedValue: SearchOptions = Object.assign(new SearchOptions(), currentValue, update);
+      const updatedValue: SearchOptions = Object.assign(currentValue, update);
       this.searchOptions.next(updatedValue);
     });
   }
@@ -193,7 +193,7 @@ export class SearchConfigurationService implements OnDestroy {
       this.getFiltersPart()
     ).subscribe((update) => {
       const currentValue: PaginatedSearchOptions = this.paginatedSearchOptions.getValue();
-      const updatedValue: PaginatedSearchOptions = Object.assign(new PaginatedSearchOptions(), currentValue, update);
+      const updatedValue: PaginatedSearchOptions = Object.assign(currentValue, update);
       this.paginatedSearchOptions.next(updatedValue);
     });
   }
@@ -203,7 +203,7 @@ export class SearchConfigurationService implements OnDestroy {
    */
   get defaults(): Observable<RemoteData<PaginatedSearchOptions>> {
     if (hasNoValue(this._defaults)) {
-      const options = Object.assign(new PaginatedSearchOptions(), {
+      const options = new PaginatedSearchOptions({
         pagination: this.defaultPagination,
         sort: this.defaultSort,
         scope: this.defaultScope,

src/app/+search-page/search-service/search.service.spec.ts

@@ -155,7 +155,7 @@ describe('SearchService', () => {
 
     describe('when search is called', () => {
       const endPoint = 'http://endpoint.com/test/test';
-      const searchOptions = new PaginatedSearchOptions();
+      const searchOptions = new PaginatedSearchOptions({});
       const queryResponse = Object.assign(new SearchQueryResponse(), { objects: [] });
       const response = new SearchSuccessResponse(queryResponse, '200');
       const responseEntry = Object.assign(new ResponseCacheEntry(), { response: response });

src/app/core/shared/operators.ts

@@ -8,6 +8,9 @@ import { RemoteData } from '../data/remote-data';
 import { RestRequest } from '../data/request.models';
 import { RequestEntry } from '../data/request.reducer';
 import { RequestService } from '../data/request.service';
+import { DSpaceObject } from './dspace-object.model';
+import { PaginatedList } from '../data/paginated-list';
+import { SearchResult } from '../../+search-page/search-result.model';
 
 /**
  * This file contains custom RxJS operators that can be used in multiple places
@@ -49,3 +52,13 @@ export const getRemoteDataPayload = () =>
 export const getSucceededRemoteData = () =>
   <T>(source: Observable<RemoteData<T>>): Observable<RemoteData<T>> =>
     source.pipe(first((rd: RemoteData<T>) => rd.hasSucceeded));
+
+export const toDSpaceObjectListRD = () =>
+  <T extends DSpaceObject>(source: Observable<RemoteData<PaginatedList<SearchResult<T>>>>): Observable<RemoteData<PaginatedList<T>>> =>
+    source.pipe(
+      map((rd: RemoteData<PaginatedList<SearchResult<T>>>) => {
+        const dsoPage: T[] = rd.payload.page.map((searchResult: SearchResult<T>) => searchResult.dspaceObject);
+        const payload = Object.assign(rd.payload, { page: dsoPage }) as PaginatedList<T>;
+        return Object.assign(rd, {payload: payload});
+      })
+    );