Merged in DSC-1482 (pull request DSpace#1467)

[DSC-1482]

Approved-by: Giuseppe Digilio

Author: Simone-Ramundi

src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts

@@ -22,6 +22,7 @@ import { APP_CONFIG } from 'src/config/app-config.interface';
 import { environment } from 'src/environments/environment';
 import { UUIDService } from '../../../../core/shared/uuid.service';
 import { getMockUUIDService } from '../../../../shared/mocks/uuid.service.mock';
+import { Item } from '../../../../core/shared/item.model';
 import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
 
 describe('FullFileSectionComponent', () => {
@@ -56,7 +57,7 @@ describe('FullFileSectionComponent', () => {
     });
 
   const bitstreamDataService = jasmine.createSpyObj('bitstreamDataService', {
-    findAllByItemAndBundleName: createSuccessfulRemoteDataObject$(createPaginatedList([mockBitstream, mockBitstream, mockBitstream]))
+    showableByItem: createSuccessfulRemoteDataObject$(createPaginatedList([mockBitstream, mockBitstream, mockBitstream])),
   });
 
   const authorizedDataService = jasmine.createSpyObj('authorizedDataService',{
@@ -91,6 +92,7 @@ describe('FullFileSectionComponent', () => {
   beforeEach(waitForAsync(() => {
     fixture = TestBed.createComponent(FullFileSectionComponent);
     comp = fixture.componentInstance;
+    comp.item = new Item();
     fixture.detectChanges();
   }));
 
@@ -109,6 +111,7 @@ describe('FullFileSectionComponent', () => {
       authorizedDataService.isAuthorized.and.returnValue(observableOf(false));
       comp.canDownload(mockBitstream).subscribe(canDownload => expect(canDownload).toBeFalse());
     }));
+
     it('canDownload should return an observable with true value, if user is authorized to download bitstream', waitForAsync(() => {
       authorizedDataService.isAuthorized.and.returnValue(observableOf(true));
       comp.canDownload(mockBitstream).subscribe(canDownload => expect(canDownload).toBeTrue());

src/app/item-page/full/field-components/file-section/full-file-section.component.ts

@@ -70,9 +70,10 @@ export class FullFileSectionComponent extends FileSectionComponent implements On
 
   initialize(): void {
     this.originals$ = this.paginationService.getCurrentPagination(this.originalOptions.id, this.originalOptions).pipe(
-      switchMap((options: PaginationComponentOptions) => this.bitstreamDataService.findAllByItemAndBundleName(
-        this.item,
+      switchMap((options: PaginationComponentOptions) => this.bitstreamDataService.showableByItem(
+        this.item.uuid,
         'ORIGINAL',
+        [],
         {elementsPerPage: options.pageSize, currentPage: options.currentPage},
         true,
         true,
@@ -88,9 +89,10 @@ export class FullFileSectionComponent extends FileSectionComponent implements On
     );
 
     this.licenses$ = this.paginationService.getCurrentPagination(this.licenseOptions.id, this.licenseOptions).pipe(
-      switchMap((options: PaginationComponentOptions) => this.bitstreamDataService.findAllByItemAndBundleName(
-        this.item,
+      switchMap((options: PaginationComponentOptions) => this.bitstreamDataService.showableByItem(
+        this.item.uuid,
         'LICENSE',
+        [],
         {elementsPerPage: options.pageSize, currentPage: options.currentPage},
         true,
         true,