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

130081: Fix pagination on 'Select bistreams' modal on 'Access Control' tab

Browse Source
This commit is contained in:
Nona Luypaert
2025-04-09 12:03:11 +02:00
parent 404ccd9b0e
commit c03bbb01a2
2 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.html
View File

@@ -8,20 +8,19 @@
</button> </button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<ng-container *ngIf="data$ | async as data"> <ng-container *ngIf="bitstreams$ | async as bitstreams">
<ds-viewable-collection <ds-viewable-collection
*ngIf="data.payload.page.length > 0" *ngIf="bitstreams.payload?.page?.length > 0"
[config]="paginationConfig" [config]="paginationConfig"
[context]="context" [context]="context"
[objects]="data" [objects]="bitstreams"
[selectable]="true" [selectable]="true"
[selectionConfig]="{ repeatable: true, listId: LIST_ID }" [selectionConfig]="{ repeatable: true, listId: LIST_ID }"
[showPaginator]="true" [showPaginator]="true">
(pageChange)="loadForPage($event)">
</ds-viewable-collection> </ds-viewable-collection>
<div *ngIf="data && data.payload.page.length === 0" <div *ngIf="bitstreams && bitstreams.payload?.page?.length === 0"
class="alert alert-info w-100" role="alert"> class="alert alert-info w-100" role="alert">
{{'access-control-select-bitstreams-modal.no-items' | translate}} {{'access-control-select-bitstreams-modal.no-items' | translate}}
</div> </div>

47
src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts
View File

@@ -1,6 +1,6 @@
import { Component, Input, OnInit } from '@angular/core'; import { Component, Input, OnInit, OnDestroy } from '@angular/core';
import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
import { BehaviorSubject } from 'rxjs'; import { Observable } from 'rxjs';
import { PaginatedList } from 'src/app/core/data/paginated-list.model'; import { PaginatedList } from 'src/app/core/data/paginated-list.model';
import { RemoteData } from 'src/app/core/data/remote-data'; import { RemoteData } from 'src/app/core/data/remote-data';
import { Bitstream } from 'src/app/core/shared/bitstream.model'; import { Bitstream } from 'src/app/core/shared/bitstream.model';
@@ -10,8 +10,7 @@ import { Item } from '../../../core/shared/item.model';
import { BitstreamDataService } from '../../../core/data/bitstream-data.service'; import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
import { PaginationService } from '../../../core/pagination/pagination.service'; import { PaginationService } from '../../../core/pagination/pagination.service';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
import { hasValue } from '../../empty.util'; import { switchMap } from 'rxjs/operators';
import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
export const ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID = 'item-access-control-select-bitstreams'; export const ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID = 'item-access-control-select-bitstreams';
@@ -20,19 +19,22 @@ export const ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID = 'item-access-contro
templateUrl: './item-access-control-select-bitstreams-modal.component.html', templateUrl: './item-access-control-select-bitstreams-modal.component.html',
styleUrls: [ './item-access-control-select-bitstreams-modal.component.scss' ] styleUrls: [ './item-access-control-select-bitstreams-modal.component.scss' ]
}) })
export class ItemAccessControlSelectBitstreamsModalComponent implements OnInit { export class ItemAccessControlSelectBitstreamsModalComponent implements OnInit, OnDestroy {
LIST_ID = ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID; LIST_ID = ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID;
@Input() item!: Item; @Input() item!: Item;
@Input() selectedBitstreams: string[] = []; @Input() selectedBitstreams: string[] = [];
data$ = new BehaviorSubject<RemoteData<PaginatedList<Bitstream>> | null>(null); bitstreams$: Observable<RemoteData<PaginatedList<Bitstream>>>;
paginationConfig: PaginationComponentOptions;
pageSize = 5;
context: Context = Context.Bitstream; context: Context = Context.Bitstream;
paginationConfig = Object.assign(new PaginationComponentOptions(), {
id: 'iacsbm',
currentPage: 1,
pageSize: 5
});
constructor( constructor(
private bitstreamService: BitstreamDataService, private bitstreamService: BitstreamDataService,
protected paginationService: PaginationService, protected paginationService: PaginationService,
@@ -40,23 +42,20 @@ export class ItemAccessControlSelectBitstreamsModalComponent implements OnInit {
public activeModal: NgbActiveModal public activeModal: NgbActiveModal
) { } ) { }
ngOnInit() { ngOnInit(): void {
this.loadForPage(1); this.bitstreams$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig).pipe(
switchMap((options: PaginationComponentOptions) => this.bitstreamService.findAllByItemAndBundleName(
this.paginationConfig = new PaginationComponentOptions(); this.item,
this.paginationConfig.id = 'iacsbm'; 'ORIGINAL',
this.paginationConfig.currentPage = 1; { elementsPerPage: options.pageSize, currentPage: options.currentPage },
if (hasValue(this.pageSize)) { true,
this.paginationConfig.pageSize = this.pageSize; true,
} ))
);
} }
loadForPage(page: number) { ngOnDestroy(): void {
this.bitstreamService.findAllByItemAndBundleName(this.item, 'ORIGINAL', { currentPage: page}, false) this.paginationService.clearPagination(this.paginationConfig.id);
.pipe(
getFirstCompletedRemoteData(),
)
.subscribe(this.data$);
} }
} }