diff --git a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts index 39faae5ca4..58521569f1 100644 --- a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts +++ b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts @@ -9,7 +9,7 @@ import { map } from 'rxjs/operators'; import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service'; import { BrowseDefinition } from '../../../../core/shared/browse-definition.model'; import { Item } from '../../../../core/shared/item.model'; -import { getRemoteDataPayload } from '../../../../core/shared/operators'; +import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; import { MetadataValuesComponent } from '../../../field-components/metadata-values/metadata-values.component'; import { ImageField } from './image-field'; @@ -75,8 +75,8 @@ export class ItemPageFieldComponent { */ get browseDefinition(): Observable { return this.browseDefinitionDataService.findByFields(this.fields).pipe( - getRemoteDataPayload(), - map((def) => def), + getFirstCompletedRemoteData(), + map((def) => def.payload), ); } } diff --git a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts index 39d393a6e0..d8e5cb0e53 100644 --- a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts +++ b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts @@ -22,7 +22,7 @@ import { Item } from '../../../core/shared/item.model'; import { MetadataValue } from '../../../core/shared/metadata.models'; import { MetadataRepresentation } from '../../../core/shared/metadata-representation/metadata-representation.model'; import { MetadatumRepresentation } from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model'; -import { getRemoteDataPayload } from '../../../core/shared/operators'; +import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component'; import { MetadataFieldWrapperComponent } from '../../../shared/metadata-field-wrapper/metadata-field-wrapper.component'; import { MetadataRepresentationLoaderComponent } from '../../../shared/metadata-representation/metadata-representation-loader.component'; @@ -112,8 +112,8 @@ export class MetadataRepresentationListComponent extends AbstractIncrementalList searchKeyArray = searchKeyArray.concat(BrowseService.toSearchKeyArray(field)); }); return this.browseDefinitionDataService.findByFields(this.metadataFields).pipe( - getRemoteDataPayload(), - map((def) => Object.assign(new MetadatumRepresentation(this.itemType, def), metadatum)), + getFirstCompletedRemoteData(), + map((def) => Object.assign(new MetadatumRepresentation(this.itemType, def.payload), metadatum)), ); } }),