Skip to content

Commit 91de2e7

Browse files
committed
Avoid metadata representation element is rendered twice when checking the browse configuration
1 parent 761b0c2 commit 91de2e7

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/app/item-page/simple/field-components/specific-field/item-page-field.component.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { map } from 'rxjs/operators';
44
import { Observable } from 'rxjs';
55
import { BrowseDefinition } from '../../../../core/shared/browse-definition.model';
66
import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
7-
import { getRemoteDataPayload } from '../../../../core/shared/operators';
7+
import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
88

99
/**
1010
* Interface that encapsulate Image configuration for this component.
@@ -81,8 +81,8 @@ export class ItemPageFieldComponent {
8181
*/
8282
get browseDefinition(): Observable<BrowseDefinition> {
8383
return this.browseDefinitionDataService.findByFields(this.fields).pipe(
84-
getRemoteDataPayload(),
85-
map((def) => def)
84+
getFirstCompletedRemoteData(),
85+
map((def) => def.payload)
8686
);
8787
}
8888
}

src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { MetadataValue } from '../../../core/shared/metadata.models';
99
import { Item } from '../../../core/shared/item.model';
1010
import { AbstractIncrementalListComponent } from '../abstract-incremental-list/abstract-incremental-list.component';
1111
import { map } from 'rxjs/operators';
12-
import { getRemoteDataPayload } from '../../../core/shared/operators';
12+
import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
1313
import {
1414
MetadatumRepresentation
1515
} from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
@@ -96,8 +96,8 @@ export class MetadataRepresentationListComponent extends AbstractIncrementalList
9696
searchKeyArray = searchKeyArray.concat(BrowseService.toSearchKeyArray(field));
9797
});
9898
return this.browseDefinitionDataService.findByFields(this.metadataFields).pipe(
99-
getRemoteDataPayload(),
100-
map((def) => Object.assign(new MetadatumRepresentation(this.itemType, def), metadatum))
99+
getFirstCompletedRemoteData(),
100+
map((def) => Object.assign(new MetadatumRepresentation(this.itemType, def.payload), metadatum))
101101
);
102102
}
103103
}),

0 commit comments

Comments
 (0)