mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 18:14:17 +00:00
Avoid metadata representation element is rendered twice when checking the browse configuration
This commit is contained in:

committed by
Tim Donohue

parent
cbee67cd4b
commit
3f7e273597
@@ -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)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -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))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
|
Reference in New Issue
Block a user