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

76654: Feedback to pagination

Browse Source
This commit is contained in:
Yana De Pauw
2021-02-23 11:01:40 +01:00
parent fab226912f
commit d07f44ac41
31 changed files with 184 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/app/shared/item/item-versions/item-versions.component.ts
View File

@@ -13,6 +13,7 @@ import { PaginatedSearchOptions } from '../../search/paginated-search-options.mo
import { AlertType } from '../../alert/aletr-type';
import { followLink } from '../../utils/follow-link-config.model';
import { hasValueOperator } from '../../empty.util';
import { PaginationService } from '../../../core/pagination/pagination.service';
@Component({
selector: 'ds-item-versions',
@@ -76,17 +77,14 @@ export class ItemVersionsComponent implements OnInit {
* Start at page 1 and always use the set page size
*/
options = Object.assign(new PaginationComponentOptions(),{
id: 'item-versions-options',
id: 'ivo',
currentPage: 1,
pageSize: this.pageSize
});
/**
* The current page being displayed
*/
currentPage$ = new BehaviorSubject<number>(1);
constructor(private versionHistoryService: VersionHistoryDataService) {
constructor(private versionHistoryService: VersionHistoryDataService,
private paginationService: PaginationService
) {
}
/**
@@ -105,10 +103,11 @@ export class ItemVersionsComponent implements OnInit {
getRemoteDataPayload(),
hasValueOperator(),
);
this.versionsRD$ = observableCombineLatest(versionHistory$, this.currentPage$).pipe(
switchMap(([versionHistory, page]: [VersionHistory, number]) =>
const currentPagination = this.paginationService.getCurrentPagination(this.options.id, this.options);
this.versionsRD$ = observableCombineLatest(versionHistory$, currentPagination).pipe(
switchMap(([versionHistory, options]: [VersionHistory, PaginationComponentOptions]) =>
this.versionHistoryService.getVersions(versionHistory.id,
new PaginatedSearchOptions({pagination: Object.assign({}, this.options, { currentPage: page })}),
new PaginatedSearchOptions({pagination: Object.assign({}, options, { currentPage: options.currentPage })}),
true, true, followLink('item'), followLink('eperson')))
);
this.hasEpersons$ = this.versionsRD$.pipe(
@@ -120,13 +119,9 @@ export class ItemVersionsComponent implements OnInit {
);
}
/**
* Update the current page
* @param page
*/
switchPage(page: number) {
this.options.currentPage = page;
this.currentPage$.next(page);
ngOnDestroy(): void {
this.paginationService.clearPagination(this.options.id);
}
}