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

Preserve the confidence value when loading the initial value of the model into the DsDynamicOneboxComponent. Previously, the accepted confidence value was always displayed if a valid vocabulary entry was retrieved, incorrectly displaying it for values without accepted authority.

Browse Source
This commit is contained in:
Toni Prieto
2024-02-23 11:05:26 +01:00
parent 7253a5917c
commit 1fc046249b
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-vocabulary.component.ts
View File

@@ -50,8 +50,9 @@ export abstract class DsDynamicVocabularyComponent extends DynamicFormControlCom
/** /**
* Retrieves the init form value from model * Retrieves the init form value from model
* @param preserveConfidence if the original model confidence value should be used after retrieving the vocabulary's entry
*/ */
getInitValueFromModel(): Observable<FormFieldMetadataValueObject> { getInitValueFromModel(preserveConfidence = false): Observable<FormFieldMetadataValueObject> {
let initValue$: Observable<FormFieldMetadataValueObject>; let initValue$: Observable<FormFieldMetadataValueObject>;
if (isNotEmpty(this.model.value) && (this.model.value instanceof FormFieldMetadataValueObject) && !this.model.value.hasAuthorityToGenerate()) { if (isNotEmpty(this.model.value) && (this.model.value instanceof FormFieldMetadataValueObject) && !this.model.value.hasAuthorityToGenerate()) {
let initEntry$: Observable<VocabularyEntry>; let initEntry$: Observable<VocabularyEntry>;
@@ -63,7 +64,7 @@ export abstract class DsDynamicVocabularyComponent extends DynamicFormControlCom
initValue$ = initEntry$.pipe(map((initEntry: VocabularyEntry) => { initValue$ = initEntry$.pipe(map((initEntry: VocabularyEntry) => {
if (isNotEmpty(initEntry)) { if (isNotEmpty(initEntry)) {
// Integrate FormFieldMetadataValueObject with retrieved information // Integrate FormFieldMetadataValueObject with retrieved information
return new FormFieldMetadataValueObject( let formField = new FormFieldMetadataValueObject(
initEntry.value, initEntry.value,
null, null,
initEntry.authority, initEntry.authority,
@@ -72,6 +73,11 @@ export abstract class DsDynamicVocabularyComponent extends DynamicFormControlCom
null, null,
initEntry.otherInformation || null initEntry.otherInformation || null
); );
// Preserve the original confidence
if (preserveConfidence) {
formField.confidence = (this.model.value as any).confidence;
}
return formField;
} else { } else {
return this.model.value as any; return this.model.value as any;
} }

2
src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
View File

@@ -273,7 +273,7 @@ export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent imple
let result: string; let result: string;
if (init) { if (init) {
this.changeLoadingInitialValueStatus(true); this.changeLoadingInitialValueStatus(true);
this.getInitValueFromModel() this.getInitValueFromModel(true)
.subscribe((formValue: FormFieldMetadataValueObject) => { .subscribe((formValue: FormFieldMetadataValueObject) => {
this.changeLoadingInitialValueStatus(false); this.changeLoadingInitialValueStatus(false);
this.currentValue = formValue; this.currentValue = formValue;