fixed loading issue

This commit is contained in:
lotte
2019-05-16 10:20:35 +02:00
parent 2852ef0364
commit 3afa288c58

View File

@@ -1,7 +1,7 @@
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { BehaviorSubject, of as observableOf, Observable, Subject } from 'rxjs'; import { BehaviorSubject, of as observableOf, Observable, Subject } from 'rxjs';
import { filter, flatMap, map, switchMap, take, tap } from 'rxjs/operators'; import { filter, flatMap, map, startWith, switchMap, take, tap } from 'rxjs/operators';
import { PaginatedSearchOptions } from '../+search-page/paginated-search-options.model'; import { PaginatedSearchOptions } from '../+search-page/paginated-search-options.model';
import { SearchService } from '../+search-page/search-service/search.service'; import { SearchService } from '../+search-page/search-service/search.service';
import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model'; import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
@@ -78,7 +78,6 @@ export class CollectionPageComponent implements OnInit {
}); });
this.itemRD$ = this.paginationChanges$.pipe( this.itemRD$ = this.paginationChanges$.pipe(
tap((dto) => console.log('dto', dto)),
switchMap((dto) => this.collectionRD$.pipe( switchMap((dto) => this.collectionRD$.pipe(
getSucceededRemoteData(), getSucceededRemoteData(),
map((rd) => rd.payload.id), map((rd) => rd.payload.id),
@@ -90,7 +89,8 @@ export class CollectionPageComponent implements OnInit {
sort: dto.sortConfig, sort: dto.sortConfig,
dsoType: DSpaceObjectType.ITEM dsoType: DSpaceObjectType.ITEM
})).pipe(toDSpaceObjectListRD()) as Observable<RemoteData<PaginatedList<Item>>> })).pipe(toDSpaceObjectListRD()) as Observable<RemoteData<PaginatedList<Item>>>
}) }),
startWith(undefined) // Make sure switching page shows loading component
) )
) )
); );