+
{{'access-control-select-bitstreams-modal.no-items' | translate}}
diff --git a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.spec.ts b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.spec.ts
index 453ec5ea4b..decf0af856 100644
--- a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.spec.ts
+++ b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.spec.ts
@@ -23,6 +23,7 @@ import { Bitstream } from '../../../core/shared/bitstream.model';
import { Item } from '../../../core/shared/item.model';
import { ObjectCollectionComponent } from '../../object-collection/object-collection.component';
import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
+import { PaginationServiceStub } from '../../testing/pagination-service.stub';
import { createPaginatedList } from '../../testing/utils.test';
import { FollowLinkConfig } from '../../utils/follow-link-config.model';
import { ItemAccessControlSelectBitstreamsModalComponent } from './item-access-control-select-bitstreams-modal.component';
@@ -37,6 +38,8 @@ describe('ItemAccessControlSelectBitstreamsModalComponent', () => {
},
};
+ const mockPaginationService = new PaginationServiceStub();
+
const translateServiceStub = {
get: () => observableOf('test-message'),
onLangChange: new EventEmitter(),
@@ -50,7 +53,7 @@ describe('ItemAccessControlSelectBitstreamsModalComponent', () => {
providers: [
NgbActiveModal,
{ provide: BitstreamDataService, useValue: mockBitstreamDataService },
- { provide: PaginationService, useValue: {} },
+ { provide: PaginationService, useValue: mockPaginationService },
{ provide: TranslateService, useValue: translateServiceStub },
],
})
diff --git a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts
index 12b38a419b..2cbecf7cbd 100644
--- a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts
+++ b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts
@@ -5,6 +5,7 @@ import {
import {
Component,
Input,
+ OnDestroy,
OnInit,
} from '@angular/core';
import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
@@ -12,7 +13,8 @@ import {
TranslateModule,
TranslateService,
} from '@ngx-translate/core';
-import { BehaviorSubject } from 'rxjs';
+import { Observable } from 'rxjs';
+import { switchMap } from 'rxjs/operators';
import { PaginatedList } from 'src/app/core/data/paginated-list.model';
import { RemoteData } from 'src/app/core/data/remote-data';
import { Bitstream } from 'src/app/core/shared/bitstream.model';
@@ -21,8 +23,6 @@ import { Context } from 'src/app/core/shared/context.model';
import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
import { PaginationService } from '../../../core/pagination/pagination.service';
import { Item } from '../../../core/shared/item.model';
-import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
-import { hasValue } from '../../empty.util';
import { ObjectCollectionComponent } from '../../object-collection/object-collection.component';
import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
@@ -35,19 +35,22 @@ export const ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID = 'item-access-contro
standalone: true,
imports: [NgIf, ObjectCollectionComponent, AsyncPipe, TranslateModule],
})
-export class ItemAccessControlSelectBitstreamsModalComponent implements OnInit {
+export class ItemAccessControlSelectBitstreamsModalComponent implements OnInit, OnDestroy {
LIST_ID = ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID;
@Input() item!: Item;
@Input() selectedBitstreams: string[] = [];
- data$ = new BehaviorSubject
> | null>(null);
- paginationConfig: PaginationComponentOptions;
- pageSize = 5;
-
+ bitstreams$: Observable>>;
context: Context = Context.Bitstream;
+ paginationConfig = Object.assign(new PaginationComponentOptions(), {
+ id: 'iacsbm',
+ currentPage: 1,
+ pageSize: 5,
+ });
+
constructor(
private bitstreamService: BitstreamDataService,
protected paginationService: PaginationService,
@@ -55,23 +58,20 @@ export class ItemAccessControlSelectBitstreamsModalComponent implements OnInit {
public activeModal: NgbActiveModal,
) { }
- ngOnInit() {
- this.loadForPage(1);
-
- this.paginationConfig = new PaginationComponentOptions();
- this.paginationConfig.id = 'iacsbm';
- this.paginationConfig.currentPage = 1;
- if (hasValue(this.pageSize)) {
- this.paginationConfig.pageSize = this.pageSize;
- }
+ ngOnInit(): void {
+ this.bitstreams$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig).pipe(
+ switchMap((options: PaginationComponentOptions) => this.bitstreamService.findAllByItemAndBundleName(
+ this.item,
+ 'ORIGINAL',
+ { elementsPerPage: options.pageSize, currentPage: options.currentPage },
+ true,
+ true,
+ )),
+ );
}
- loadForPage(page: number) {
- this.bitstreamService.findAllByItemAndBundleName(this.item, 'ORIGINAL', { currentPage: page }, false)
- .pipe(
- getFirstCompletedRemoteData(),
- )
- .subscribe(this.data$);
+ ngOnDestroy(): void {
+ this.paginationService.clearPagination(this.paginationConfig.id);
}
}