hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3102 from tdonohue/port_2953_to_7x

Browse Source 
[Port dspace-7_x] Avoid metadata representation element is rendered twice when checking the browse configuration
This commit is contained in:
Tim Donohue
2024-06-05 15:52:56 -05:00
committed by GitHub
parent cbee67cd4b 3f7e273597
commit 27c57d6f4e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@ import { map } from 'rxjs/operators';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { BrowseDefinition } from '../../../../core/shared/browse-definition.model'; import { BrowseDefinition } from '../../../../core/shared/browse-definition.model';
import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service'; 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. * This component can be used to represent metadata on a simple item page.
@@ -57,8 +57,8 @@ export class ItemPageFieldComponent {
*/ */
get browseDefinition(): Observable<BrowseDefinition> { get browseDefinition(): Observable<BrowseDefinition> {
return this.browseDefinitionDataService.findByFields(this.fields).pipe( return this.browseDefinitionDataService.findByFields(this.fields).pipe(
getRemoteDataPayload(), getFirstCompletedRemoteData(),
map((def) => def) map((def) => def.payload)
); );
} }
} }

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

@@ -9,7 +9,7 @@ import { MetadataValue } from '../../../core/shared/metadata.models';
import { Item } from '../../../core/shared/item.model'; import { Item } from '../../../core/shared/item.model';
import { AbstractIncrementalListComponent } from '../abstract-incremental-list/abstract-incremental-list.component'; import { AbstractIncrementalListComponent } from '../abstract-incremental-list/abstract-incremental-list.component';
import { map } from 'rxjs/operators'; import { map } from 'rxjs/operators';
import { getRemoteDataPayload } from '../../../core/shared/operators'; import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
import { import {
MetadatumRepresentation MetadatumRepresentation
} from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model'; } from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
@@ -96,8 +96,8 @@ export class MetadataRepresentationListComponent extends AbstractIncrementalList
searchKeyArray = searchKeyArray.concat(BrowseService.toSearchKeyArray(field)); searchKeyArray = searchKeyArray.concat(BrowseService.toSearchKeyArray(field));
}); });
return this.browseDefinitionDataService.findByFields(this.metadataFields).pipe( return this.browseDefinitionDataService.findByFields(this.metadataFields).pipe(
getRemoteDataPayload(), getFirstCompletedRemoteData(),
map((def) => Object.assign(new MetadatumRepresentation(this.itemType, def), metadatum)) map((def) => Object.assign(new MetadatumRepresentation(this.itemType, def.payload), metadatum))
); );
} }
}), }),