32180: fixed rebase issues

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

@@ -17,8 +17,8 @@ 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, first, flatMap, map, switchMap } from 'rxjs/operators';
-import { PaginatedSearchOptions } from '../+search-page/paginated-search-options.model';
 import { getSucceededRemoteData, redirectToPageNotFoundOn404 } from '../core/shared/operators';
+import { FindAllOptions } from '../core/data/request.models';
 
 @Component({
   selector: 'ds-collection-page',
@@ -91,12 +91,12 @@ export class CollectionPageComponent implements OnInit, OnDestroy {
       map((rd) => rd.payload.id),
       switchMap((id: string) => {
         return this.itemDataService.findAll(
-          new PaginatedSearchOptions({
-            scope: id,
+          {
+            scopeID: id,
             currentPage: searchOptions.pagination.currentPage,
             elementsPerPage: searchOptions.pagination.pageSize,
             sort: searchOptions.sort
-          }));
+          });
       })
     )
   }

src/app/+item-page/simple/item-page.component.spec.ts

@@ -4,7 +4,7 @@ import { MockTranslateLoader } from '../../shared/mocks/mock-translate-loader';
 import { ItemDataService } from '../../core/data/item-data.service';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { ItemPageComponent } from './item-page.component';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { ActivatedRouteStub } from '../../shared/testing/active-router-stub';
 import { MetadataService } from '../../core/metadata/metadata.service';
 import { VarDirective } from '../../shared/utils/var.directive';
@@ -48,7 +48,8 @@ describe('ItemPageComponent', () => {
       providers: [
         {provide: ActivatedRoute, useValue: mockRoute},
         {provide: ItemDataService, useValue: {}},
-        {provide: MetadataService, useValue: mockMetadataService}
+        {provide: MetadataService, useValue: mockMetadataService},
+        {provide: Router, useValue: {}}
       ],
 
       schemas: [NO_ERRORS_SCHEMA]