diff --git a/dmp-frontend/src/app/ui/description/editor/description-editor.model.ts b/dmp-frontend/src/app/ui/description/editor/description-editor.model.ts index 678244664..096fc1cce 100644 --- a/dmp-frontend/src/app/ui/description/editor/description-editor.model.ts +++ b/dmp-frontend/src/app/ui/description/editor/description-editor.model.ts @@ -389,7 +389,7 @@ export class DescriptionPropertyDefinitionFieldSetItemEditorModel implements Des const control = fields?.get(key); DescriptionFieldEditorModel.reapplyValidators({ formGroup: control as UntypedFormGroup, - rootPath: `${rootPath}fields.`, + rootPath: `${rootPath}fields[${key}].`, validationErrorModel: validationErrorModel }) }); diff --git a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.model.ts b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.model.ts index e50816b13..d3aae0e42 100644 --- a/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.model.ts +++ b/dmp-frontend/src/app/ui/dmp/dmp-editor-blueprint/dmp-editor.model.ts @@ -234,16 +234,17 @@ export class DmpPropertiesEditorModel implements DmpPropertiesPersist { }): void { const { formGroup, rootPath, validationErrorModel } = params; - const context = DmpPropertiesEditorModel.createValidationContext({ - rootPath, - validationErrorModel - }); - ['dmpBlueprintValues'].forEach(keyField => { - const control = formGroup?.get(keyField); - control?.clearValidators(); - control?.addValidators(context.getValidation(keyField).validators); - }); + const dmpBlueprintValues = formGroup?.get('dmpBlueprintValues') as UntypedFormGroup; + const keys = Object.keys(dmpBlueprintValues.value as Object); + keys.forEach((key) => { + const control = dmpBlueprintValues?.get(key); + DmpBlueprintValueEditorModel.reapplyValidators({ + formGroup: control as UntypedFormGroup, + rootPath: `${rootPath}dmpBlueprintValues[${key}].`, + validationErrorModel: validationErrorModel + }) + }); (formGroup.get('contacts') as FormArray).controls?.forEach( (control, index) => DmpContactEditorModel.reapplyValidators({