Merged in DSC-975 (pull request DSpace#570)

DSC-975

Approved-by: Davide Negretti

Author: enea4science

src/app/core/data/bitstream-data.service.ts

@@ -352,7 +352,7 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
     uuid: string,
     bundlename: string,
     metadataFilters: MetadataFilter[],
-    options: FindListOptions,
+    options?: FindListOptions,
     useCachedVersionIfAvailable = true,
     reRequestOnStale = true,
     ...linksToFollow: FollowLinkConfig<Bitstream>[]

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/row/metadata-container/metadata-container.component.spec.ts

@@ -145,7 +145,7 @@ describe('MetadataContainerComponent', () => {
   });
 
   const mockBitstreamDataService = jasmine.createSpyObj('BitstreamDataService', {
-    findAllByItemAndBundleName: jasmine.createSpy('findAllByItemAndBundleName')
+    findShowableBitstreamsByItem: jasmine.createSpy('findShowableBitstreamsByItem')
   });
 
   beforeEach(async () => {
@@ -172,7 +172,10 @@ describe('MetadataContainerComponent', () => {
     component = fixture.componentInstance;
     component.item = testItem;
     component.box = boxMetadata;
-    mockBitstreamDataService.findAllByItemAndBundleName.and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList([])));
+
+    mockBitstreamDataService.findShowableBitstreamsByItem.and.returnValue(
+      createSuccessfulRemoteDataObject$(createPaginatedList([]))
+    );
   });
 
   describe('When field rendering type is not structured', () => {
@@ -283,15 +286,15 @@ describe('MetadataContainerComponent', () => {
     describe('and item has bitstream', () => {
 
       beforeEach(() => {
-        mockBitstreamDataService.findAllByItemAndBundleName.and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1])));
+        mockBitstreamDataService.findShowableBitstreamsByItem.and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1])));
         fixture.detectChanges();
       });
 
       it('should create', () => {
         expect(component).toBeTruthy();
       });
 
-      it('should not render metadata ', (done) => {
+      it('should render metadata ', (done) => {
         const spanValueFound = fixture.debugElement.queryAll(By.css('.test-style-label'));
         expect(spanValueFound.length).toBe(1);
 
@@ -301,6 +304,35 @@ describe('MetadataContainerComponent', () => {
       });
     });
 
+    describe('and bitstream has metadata', () => {
+      beforeEach(() => {
+        component.field.bitstream.metadataField = 'metadataFieldTest';
+        component.field.bitstream.metadataValue = 'metadataValueTest';
+        fixture.detectChanges();
+      });
+
+      it('should use the metadata in filters', () => {
+        expect(mockBitstreamDataService.findShowableBitstreamsByItem).toHaveBeenCalledWith(
+          testItem.uuid,
+          bitstreamField.bitstream.bundle,
+          [ { metadataName: 'metadataFieldTest', metadataValue: 'metadataValueTest' } ]
+        );
+      });
+    });
+
+    describe('and bitstream doesnt have metadataValue', () => {
+      beforeEach(() => {
+        component.field.bitstream.metadataValue = undefined;
+        fixture.detectChanges();
+      });
+
+      it('should use empty array in filters', () => {
+        expect(mockBitstreamDataService.findShowableBitstreamsByItem).toHaveBeenCalledWith(
+          testItem.uuid,
+          bitstreamField.bitstream.bundle,
+          [] // <--- empty array of filters
+        );
+      });
+    });
   });
-})
-  ;
+});

src/app/cris-layout/cris-layout-matrix/cris-layout-box-container/boxes/metadata/row/metadata-container/metadata-container.component.ts

@@ -14,6 +14,7 @@ import { Bitstream } from '../../../../../../../core/shared/bitstream.model';
 import { getFirstCompletedRemoteData } from '../../../../../../../core/shared/operators';
 import { map, take } from 'rxjs/operators';
 import { BitstreamDataService } from '../../../../../../../core/data/bitstream-data.service';
+import { MetadataFilter } from '../../../../../../../core/data/bitstream-data.service';
 import { RemoteData } from '../../../../../../../core/data/remote-data';
 import { PaginatedList } from '../../../../../../../core/data/paginated-list.model';
 import { Observable } from 'rxjs';
@@ -126,7 +127,14 @@ export class MetadataContainerComponent implements OnInit {
   }
 
   hasBitstream(): Observable<boolean> {
-    return this.bitstreamDataService.findAllByItemAndBundleName(this.item, this.field.bitstream.bundle)
+    let filters: MetadataFilter[] = [];
+    if (isNotEmpty(this.field.bitstream.metadataValue)) {
+      filters.push({
+        metadataName: this.field.bitstream.metadataField,
+        metadataValue: this.field.bitstream.metadataValue
+      });
+    }
+    return this.bitstreamDataService.findShowableBitstreamsByItem(this.item.uuid, this.field.bitstream.bundle, filters)
       .pipe(
         getFirstCompletedRemoteData(),
         map((response: RemoteData<PaginatedList<Bitstream>>) => {