Merge remote-tracking branch 'contributions/w2p-130081_access-control-bitstreams-pagination-fix-7.6' into w2p-130081_access-control-bitstreams-pagination-fix-8.x

 Conflicts:
	src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts

Author: nona-luypaert

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

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

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 },
       ],
     })

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

@@ -5,14 +5,16 @@ import {
 import {
   Component,
   Input,
+  OnDestroy,
   OnInit,
 } from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 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,43 +35,43 @@ 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<RemoteData<PaginatedList<Bitstream>> | null>(null);
-  paginationConfig: PaginationComponentOptions;
-  pageSize = 5;
-
+  bitstreams$: Observable<RemoteData<PaginatedList<Bitstream>>>;
   context: Context = Context.Bitstream;
 
+  paginationConfig = Object.assign(new PaginationComponentOptions(), {
+    id: 'iacsbm',
+    currentPage: 1,
+    pageSize: 5,
+  });
+
   constructor(
     private bitstreamService: BitstreamDataService,
     protected paginationService: PaginationService,
     protected translateService: TranslateService,
     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);
   }
 
 }