Skip to content

Commit 3fbc3dc

Browse files
authored
Merge pull request DSpace#2853 from 4Science/main-optimize-metadata-represenation-rendering
Avoid metadata representation element is rendered twice when checking the browse configuration
2 parents 2cfe7c0 + 07a03bf commit 3fbc3dc

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
@@ -9,7 +9,7 @@ import { map } from 'rxjs/operators';
99
import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
1010
import { BrowseDefinition } from '../../../../core/shared/browse-definition.model';
1111
import { Item } from '../../../../core/shared/item.model';
12-
import { getRemoteDataPayload } from '../../../../core/shared/operators';
12+
import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
1313
import { MetadataValuesComponent } from '../../../field-components/metadata-values/metadata-values.component';
1414
import { ImageField } from './image-field';
1515

@@ -75,8 +75,8 @@ export class ItemPageFieldComponent {
7575
*/
7676
get browseDefinition(): Observable<BrowseDefinition> {
7777
return this.browseDefinitionDataService.findByFields(this.fields).pipe(
78-
getRemoteDataPayload(),
79-
map((def) => def),
78+
getFirstCompletedRemoteData(),
79+
map((def) => def.payload),
8080
);
8181
}
8282
}

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
@@ -22,7 +22,7 @@ import { Item } from '../../../core/shared/item.model';
2222
import { MetadataValue } from '../../../core/shared/metadata.models';
2323
import { MetadataRepresentation } from '../../../core/shared/metadata-representation/metadata-representation.model';
2424
import { MetadatumRepresentation } from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
25-
import { getRemoteDataPayload } from '../../../core/shared/operators';
25+
import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
2626
import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component';
2727
import { MetadataFieldWrapperComponent } from '../../../shared/metadata-field-wrapper/metadata-field-wrapper.component';
2828
import { MetadataRepresentationLoaderComponent } from '../../../shared/metadata-representation/metadata-representation-loader.component';
@@ -112,8 +112,8 @@ export class MetadataRepresentationListComponent extends AbstractIncrementalList
112112
searchKeyArray = searchKeyArray.concat(BrowseService.toSearchKeyArray(field));
113113
});
114114
return this.browseDefinitionDataService.findByFields(this.metadataFields).pipe(
115-
getRemoteDataPayload(),
116-
map((def) => Object.assign(new MetadatumRepresentation(this.itemType, def), metadatum)),
115+
getFirstCompletedRemoteData(),
116+
map((def) => Object.assign(new MetadatumRepresentation(this.itemType, def.payload), metadatum)),
117117
);
118118
}
119119
}),

0 commit comments

Comments
 (0)