diff --git a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
index 19f0924989..87aab109a0 100644
--- a/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
+++ b/src/app/+item-page/edit-item-page/item-bitstreams/item-edit-bitstream/item-edit-bitstream.component.ts
@@ -8,6 +8,7 @@ import { Observable } from 'rxjs/internal/Observable';
import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
import { getRemoteDataPayload, getSucceededRemoteData } from '../../../../core/shared/operators';
import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
@Component({
selector: 'ds-item-edit-bitstream',
@@ -22,7 +23,7 @@ export class ItemEditBitstreamComponent implements OnChanges, OnInit {
/**
* The view on the bitstream
*/
- @ViewChild('bitstreamView', {static: false}) bitstreamView;
+ @ViewChild('bitstreamView', {static: true}) bitstreamView;
/**
* The current field, value and state of the bitstream
@@ -44,12 +45,18 @@ export class ItemEditBitstreamComponent implements OnChanges, OnInit {
*/
bitstream: Bitstream;
+ /**
+ * The bitstream's name
+ */
+ bitstreamName: string;
+
/**
* The format of the bitstream
*/
format$: Observable
;
constructor(private objectUpdatesService: ObjectUpdatesService,
+ private dsoNameService: DSONameService,
private viewContainerRef: ViewContainerRef) {
}
@@ -63,6 +70,7 @@ export class ItemEditBitstreamComponent implements OnChanges, OnInit {
*/
ngOnChanges(changes: SimpleChanges): void {
this.bitstream = cloneDeep(this.fieldUpdate.field) as Bitstream;
+ this.bitstreamName = this.dsoNameService.getName(this.bitstream);
this.format$ = this.bitstream.format.pipe(
getSucceededRemoteData(),
getRemoteDataPayload()
diff --git a/src/app/core/data/bundle-data.service.ts b/src/app/core/data/bundle-data.service.ts
index 498c3d48ff..160ea0ff0d 100644
--- a/src/app/core/data/bundle-data.service.ts
+++ b/src/app/core/data/bundle-data.service.ts
@@ -99,8 +99,9 @@ export class BundleDataService extends DataService {
* Get a bundle's bitstreams using paginated search options
* @param bundleId The bundle's ID
* @param searchOptions The search options to use
+ * @param linksToFollow The {@link FollowLinkConfig}s for the request
*/
- getBitstreams(bundleId: string, searchOptions?: PaginatedSearchOptions): Observable>> {
+ getBitstreams(bundleId: string, searchOptions?: PaginatedSearchOptions, ...linksToFollow: Array>): Observable>> {
const hrefObs = this.getBitstreamsEndpoint(bundleId).pipe(
map((href) => searchOptions ? searchOptions.toRestUrl(href) : href)
);
@@ -111,6 +112,6 @@ export class BundleDataService extends DataService {
this.requestService.configure(request);
});
- return this.rdbService.buildList(hrefObs);
+ return this.rdbService.buildList(hrefObs, ...linksToFollow);
}
}
diff --git a/src/app/core/shared/bitstream.model.ts b/src/app/core/shared/bitstream.model.ts
index 231d44eeff..ab9d1548b7 100644
--- a/src/app/core/shared/bitstream.model.ts
+++ b/src/app/core/shared/bitstream.model.ts
@@ -54,7 +54,7 @@ export class Bitstream extends DSpaceObject implements HALResource {
* The BitstreamFormat of this Bitstream
* Will be undefined unless the format {@link HALLink} has been resolved.
*/
- @link(BITSTREAM_FORMAT)
+ @link(BITSTREAM_FORMAT, false, 'format')
format?: Observable>;
}