hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-16 22:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

32180: fixed rebase issues

Browse Source
This commit is contained in:
lotte
2019-05-14 09:43:58 +02:00
parent 7a4edd1567
commit 32d4fbde12
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/+collection-page/collection-page.component.ts
View File

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

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

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