hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 01:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Task 72397] undo test consoles and fix pagination issue

Browse Source
This commit is contained in:
Raf Ponsaerts
2020-08-11 13:13:02 +02:00
parent 0553f68607
commit cb7335208f
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/+item-page/full/field-components/file-section/full-file-section.component.ts
View File

@@ -29,7 +29,7 @@ export class FullFileSectionComponent extends FileSectionComponent implements On
originals$: Observable<RemoteData<PaginatedList<Bitstream>>>;
licenses$: Observable<RemoteData<PaginatedList<Bitstream>>>;
pageSize = 2;
pageSize = 5;
originalOptions = Object.assign(new PaginationComponentOptions(),{
id: 'original-bitstreams-options',
currentPage: 1,

8
src/app/+item-page/simple/field-components/file-section/file-section.component.ts
View File

@@ -56,18 +56,14 @@ export class FileSectionComponent implements OnInit {
} else {
this.currentPage++;
}
console.log(this.isLastPage);
console.log(this.currentPage);
this.bitstreamDataService.findAllByItemAndBundleName(this.item, 'ORIGINAL', { currentPage: this.currentPage, elementsPerPage: 1 }).pipe(
this.bitstreamDataService.findAllByItemAndBundleName(this.item, 'ORIGINAL', { currentPage: this.currentPage }).pipe(
filter((bitstreamsRD: RemoteData<PaginatedList<Bitstream>>) => hasValue(bitstreamsRD)),
takeWhile((bitstreamsRD: RemoteData<PaginatedList<Bitstream>>) => hasNoValue(bitstreamsRD.payload) && hasNoValue(bitstreamsRD.error), true)
).subscribe((bitstreamsRD: RemoteData<PaginatedList<Bitstream>>) => {
const current: Bitstream[] = this.bitstreams$.getValue();
this.bitstreams$.next([...current, ...bitstreamsRD.payload.page]);
this.isLoading = false;
this.isLastPage = hasNoValue(bitstreamsRD.payload.next);
console.log("lel");
console.log(this.isLastPage);
this.isLastPage = this.currentPage === bitstreamsRD.payload.totalPages;
});
}
}