From 3f7e273597f14e9a5cff6c3307b792706c2bd29c Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Tue, 5 Mar 2024 17:18:25 +0100 Subject: [PATCH] Avoid metadata representation element is rendered twice when checking the browse configuration --- .../specific-field/item-page-field.component.ts | 6 +++--- .../metadata-representation-list.component.ts | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) 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 fc526dabcc5..3a18666a81f 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 @@ -4,7 +4,7 @@ import { map } from 'rxjs/operators'; import { Observable } from 'rxjs'; import { BrowseDefinition } from '../../../../core/shared/browse-definition.model'; import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service'; -import { getRemoteDataPayload } from '../../../../core/shared/operators'; +import { getFirstCompletedRemoteData } from '../../../../core/shared/operators'; /** * This component can be used to represent metadata on a simple item page. @@ -57,8 +57,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 59a5377f772..30ec064e68b 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 @@ -9,7 +9,7 @@ import { MetadataValue } from '../../../core/shared/metadata.models'; import { Item } from '../../../core/shared/item.model'; import { AbstractIncrementalListComponent } from '../abstract-incremental-list/abstract-incremental-list.component'; import { map } from 'rxjs/operators'; -import { getRemoteDataPayload } from '../../../core/shared/operators'; +import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; import { MetadatumRepresentation } from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model'; @@ -96,8 +96,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)) ); } }),