Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring

# Conflicts:
#	dmp-frontend/src/app/ui/description/editor/description-form/components/form-section/form-section.component.ts

dmp-frontend/src/app/ui/description/editor/description-editor.component.html

@@ -134,6 +134,7 @@
 					[TOCENTRY_ID_PREFIX]="TOCENTRY_ID_PREFIX"
 					[hidden]="this.step === 0"
 					[linkToScroll]="linkToScroll"
+					[validationErrorModel]="editorModel.validationErrorModel"
 					(fieldsetFocusChange)="fieldsetIdWithFocus = $event"></app-description-form>
 				</div>
 			{{formGroup?.value | json}}

dmp-frontend/src/app/ui/description/editor/description-editor.component.ts

@@ -783,7 +783,7 @@ export class DescriptionEditorComponent extends BaseEditor<DescriptionEditorMode
 
 			this.descriptionTemplateService.getSingle(descriptionTemplateId, DescriptionEditorResolver.descriptionTemplateLookupFields()).pipe(takeUntil(this._destroyed)).subscribe(descriptionTemplate => {
 
-				this.editorModel.properties = new DescriptionPropertyDefinitionEditorModel().fromModel(null, descriptionTemplate, null);
+				this.editorModel.properties = new DescriptionPropertyDefinitionEditorModel(this.editorModel.validationErrorModel).fromModel(null, descriptionTemplate, null);
 				this.formGroup.setControl('properties', this.editorModel.buildProperties());
 				this.item.descriptionTemplate = descriptionTemplate;
 

dmp-frontend/src/app/ui/description/editor/description-editor.model.ts

@@ -1,4 +1,4 @@
-import { FormControl, UntypedFormBuilder, UntypedFormGroup, Validators } from "@angular/forms";
+import { FormControl, UntypedFormArray, UntypedFormBuilder, UntypedFormGroup, Validators } from "@angular/forms";
 import { DescriptionStatus } from "@app/core/common/enum/description-status";
 import { IsActive } from "@app/core/common/enum/is-active.enum";
 import { DescriptionTemplate, DescriptionTemplateField, DescriptionTemplateFieldSet, DescriptionTemplateSection } from "@app/core/model/description-template/description-template";
@@ -17,7 +17,7 @@ export class DescriptionEditorModel extends BaseEditorModel implements Descripti
 	descriptionTemplateId: Guid;
 	status: DescriptionStatus;
 	description: string;
-	properties: DescriptionPropertyDefinitionEditorModel = new DescriptionPropertyDefinitionEditorModel();
+	properties: DescriptionPropertyDefinitionEditorModel = new DescriptionPropertyDefinitionEditorModel(this.validationErrorModel);
 	tags: string[];
 	references: DescriptionReferenceEditorModel[];
 	permissions: string[];
@@ -37,7 +37,7 @@ export class DescriptionEditorModel extends BaseEditorModel implements Descripti
 			this.status = item.status ?? DescriptionStatus.Draft;
 			this.description = item.description;
 			this.tags = item.descriptionTags?.map(x => x.tag?.label);
-			this.properties = new DescriptionPropertyDefinitionEditorModel().fromModel(item.properties, descriptionTemplate, item.descriptionReferences);
+			this.properties = new DescriptionPropertyDefinitionEditorModel(this.validationErrorModel).fromModel(item.properties, descriptionTemplate, item.descriptionReferences);
 			//if (item.references) { item.references.map(x => this.references.push(new DescriptionReferenceEditorModel().fromModel(x))); }
 		}
 		return this;
@@ -82,6 +82,20 @@ export class DescriptionEditorModel extends BaseEditorModel implements Descripti
 		baseContext.validation = baseValidationArray;
 		return baseContext;
 	}
+
+	static reApplyPropertiesValidators(params: {
+		formGroup: UntypedFormGroup,
+		validationErrorModel: ValidationErrorModel,
+	}): void {
+
+		const { formGroup, validationErrorModel } = params;
+		const control = formGroup?.get('properties');
+		DescriptionPropertyDefinitionEditorModel.reapplyValidators({
+			formArray: control.get('fieldSets') as UntypedFormArray,
+			rootPath: `properties.`,
+			validationErrorModel: validationErrorModel
+		});
+	}
 }
 
 export class DescriptionPropertyDefinitionEditorModel implements DescriptionPropertyDefinitionPersist {
@@ -136,6 +150,15 @@ export class DescriptionPropertyDefinitionEditorModel implements DescriptionProp
 		return baseContext;
 	}
 
+	static reapplyValidators(params: {
+		formArray: UntypedFormArray,
+		validationErrorModel: ValidationErrorModel,
+		rootPath: string
+	}): void {
+		
+		//TODO
+	}
+
 	private calculateProperties(item: DescriptionPropertyDefinition, descriptionTemplate: DescriptionTemplate, descriptionReferences: DescriptionReference[]): Map<string, DescriptionPropertyDefinitionFieldSetEditorModel> {
 		let result: Map<string, DescriptionPropertyDefinitionFieldSetEditorModel> = new Map<string, DescriptionPropertyDefinitionFieldSetEditorModel>();
 		if (descriptionTemplate) (
@@ -199,7 +222,7 @@ export class DescriptionPropertyDefinitionEditorModel implements DescriptionProp
 			} as DescriptionPropertyDefinitionFieldSetItem]
 		}
 
-		return new DescriptionPropertyDefinitionFieldSetEditorModel().fromModel(fieldSetValue, descriptionReferences, definitionFieldSet);
+		return new DescriptionPropertyDefinitionFieldSetEditorModel(this.validationErrorModel).fromModel(fieldSetValue, descriptionReferences, definitionFieldSet);
 	}
 
 }
@@ -214,7 +237,7 @@ export class DescriptionPropertyDefinitionFieldSetEditorModel implements Descrip
 
 	public fromModel(item: DescriptionPropertyDefinitionFieldSet, descriptionReferences: DescriptionReference[], definitionFieldSet: DescriptionTemplateFieldSet): DescriptionPropertyDefinitionFieldSetEditorModel {
 		if (item) {
-			if (item.items) { item.items.map(x => this.items.push(new DescriptionPropertyDefinitionFieldSetItemEditorModel().fromModel(x, descriptionReferences, definitionFieldSet))); }
+			if (item.items) { item.items.map(x => this.items.push(new DescriptionPropertyDefinitionFieldSetItemEditorModel(this.validationErrorModel).fromModel(x, descriptionReferences, definitionFieldSet))); }
 		}
 		return this;
 	}
@@ -238,7 +261,7 @@ export class DescriptionPropertyDefinitionFieldSetEditorModel implements Descrip
 					(item, index) => item.buildForm({
 						rootPath: `${rootPath}items[${index}].`
 					})
-				), context.getValidation('items')
+				), context.getValidation('items').validators
 			)
 		});
 	}
@@ -257,6 +280,21 @@ export class DescriptionPropertyDefinitionFieldSetEditorModel implements Descrip
 		return baseContext;
 	}
 
+	static reapplyValidators(params: {
+		formArray: UntypedFormArray,
+		validationErrorModel: ValidationErrorModel,
+		rootPath: string
+	}): void {
+		const { validationErrorModel, rootPath, formArray } = params;
+		formArray?.controls?.forEach(
+			(control, index) => DescriptionPropertyDefinitionFieldSetItemEditorModel.reapplyValidators({
+				formGroup: control as UntypedFormGroup,
+				rootPath: `${rootPath}items[${index}].`,
+				validationErrorModel: validationErrorModel
+			})
+		);
+	}
+
 }
 
 export class DescriptionPropertyDefinitionFieldSetItemEditorModel implements DescriptionPropertyDefinitionFieldSetItemPersist {
@@ -273,7 +311,7 @@ export class DescriptionPropertyDefinitionFieldSetItemEditorModel implements Des
 		if (item) {
 			this.comment = item.comment;
 			this.ordinal = item.ordinal;
-			if (item.fields) { item.fields?.forEach((value, key) => this.fields.set(key, new DescriptionFieldEditorModel().fromModel(value, definitionFieldSet?.fields?.find(x => x.id == key), descriptionReferences))); }
+			if (item.fields) { item.fields?.forEach((value, key) => this.fields.set(key, new DescriptionFieldEditorModel(this.validationErrorModel).fromModel(value, definitionFieldSet?.fields?.find(x => x.id == key), descriptionReferences))); }
 		}
 		return this;
 	}
@@ -322,6 +360,27 @@ export class DescriptionPropertyDefinitionFieldSetItemEditorModel implements Des
 		return baseContext;
 	}
 
+	static reapplyValidators(params: {
+		formGroup: UntypedFormGroup,
+		validationErrorModel: ValidationErrorModel,
+		rootPath: string
+	}): void {
+
+		const { formGroup, rootPath, validationErrorModel } = params;
+		const context = DescriptionPropertyDefinitionFieldSetItemEditorModel.createValidationContext({
+			rootPath,
+			validationErrorModel
+		});
+
+		//TODO
+
+		['comment', 'ordinal'].forEach(keyField => {
+			const control = formGroup?.get(keyField);
+			control?.clearValidators();
+			control?.addValidators(context.getValidation(keyField).validators);
+		})
+	}
+
 }
 
 export class DescriptionFieldEditorModel implements DescriptionFieldPersist {
@@ -345,7 +404,7 @@ export class DescriptionFieldEditorModel implements DescriptionFieldPersist {
 			this.dateValue = item.dateValue;
 			this.references = descriptionReferences?.filter(x => x.data?.fieldId == descriptionTemplateField?.id && x.isActive == IsActive.Active).map(x => x.reference);
 			this.reference = descriptionReferences?.find(x => x.data?.fieldId == descriptionTemplateField?.id && x.isActive == IsActive.Active)?.reference;
-			this.externalIdentifier = new DescriptionExternalIdentifierEditorModel().fromModel(item.externalIdentifier);
+			this.externalIdentifier = new DescriptionExternalIdentifierEditorModel(this.validationErrorModel).fromModel(item.externalIdentifier);
 		}
 		return this;
 	}
@@ -388,6 +447,31 @@ export class DescriptionFieldEditorModel implements DescriptionFieldPersist {
 		baseContext.validation = baseValidationArray;
 		return baseContext;
 	}
+
+	static reapplyValidators(params: {
+		formGroup: UntypedFormGroup,
+		validationErrorModel: ValidationErrorModel,
+		rootPath: string
+	}): void {
+
+		const { formGroup, rootPath, validationErrorModel } = params;
+		const context = DescriptionPropertyDefinitionFieldSetItemEditorModel.createValidationContext({
+			rootPath,
+			validationErrorModel
+		});
+
+		['textValue', 'textListValue', 'dateValue'].forEach(keyField => {
+			const control = formGroup?.get(keyField);
+			control?.clearValidators();
+			control?.addValidators(context.getValidation(keyField).validators);
+		})
+
+		DescriptionExternalIdentifierEditorModel.reapplyValidators({
+			formGroup: formGroup?.get('externalIdentifier') as UntypedFormGroup,
+			rootPath: `${rootPath}externalIdentifier.`,
+			validationErrorModel: validationErrorModel
+		});
+	}
 }
 
 export class DescriptionExternalIdentifierEditorModel implements DescriptionExternalIdentifierPersist {
@@ -440,6 +524,25 @@ export class DescriptionExternalIdentifierEditorModel implements DescriptionExte
 		baseContext.validation = baseValidationArray;
 		return baseContext;
 	}
+
+	static reapplyValidators(params: {
+		formGroup: UntypedFormGroup,
+		validationErrorModel: ValidationErrorModel,
+		rootPath: string
+	}): void {
+
+		const { formGroup, rootPath, validationErrorModel } = params;
+		const context = DescriptionExternalIdentifierEditorModel.createValidationContext({
+			rootPath,
+			validationErrorModel
+		});
+
+		['identifier', 'type'].forEach(keyField => {
+			const control = formGroup?.get(keyField);
+			control?.clearValidators();
+			control?.addValidators(context.getValidation(keyField).validators);
+		});
+	}
 }
 
 export class DescriptionReferenceEditorModel implements DescriptionReferencePersist {
@@ -496,4 +599,23 @@ export class DescriptionReferenceEditorModel implements DescriptionReferencePers
 		baseContext.validation = baseValidationArray;
 		return baseContext;
 	}
+
+	static reapplyValidators(params: {
+		formGroup: UntypedFormGroup,
+		validationErrorModel: ValidationErrorModel,
+		rootPath: string
+	}): void {
+
+		const { formGroup, rootPath, validationErrorModel } = params;
+		const context = DescriptionExternalIdentifierEditorModel.createValidationContext({
+			rootPath,
+			validationErrorModel
+		});
+
+		['id', 'reference'].forEach(keyField => {
+			const control = formGroup?.get(keyField);
+			control?.clearValidators();
+			control?.addValidators(context.getValidation(keyField).validators);
+		});
+	}
 }

dmp-frontend/src/app/ui/description/editor/description-form/components/form-field-set/form-field-set.component.ts

@@ -9,6 +9,7 @@ import { VisibilityRulesService } from '../../visibility-rules/visibility-rules.
 import { DescriptionPropertyDefinitionEditorModel, DescriptionPropertyDefinitionFieldSetEditorModel } from '../../../description-editor.model';
 import { FormFieldSetEditorDialogComponent } from './dialog-editor/form-fieldset-editor-dialog.component';
 import { cloneAbstractControl } from '@app/utilities/enhancers/utils';
+import { ValidationErrorModel } from '@common/forms/validation/error-model/validation-error-model';
 
 @Component({
 	selector: 'app-description-form-field-set',
@@ -43,6 +44,7 @@ export class DescriptionFormFieldSetComponent extends BaseComponent {
 	@Input() tableRow: boolean = false;
 	@Input() showTitle: boolean = true;
 	@Input() placeholderTitle: boolean = false;
+	@Input() validationErrorModel: ValidationErrorModel;
 
 	constructor(
 		private dialog: MatDialog,
@@ -72,9 +74,9 @@ export class DescriptionFormFieldSetComponent extends BaseComponent {
 			return;
 		}
 
-		const item: DescriptionPropertyDefinitionFieldSetEditorModel = new DescriptionPropertyDefinitionEditorModel().calculateFieldSetProperties(this.fieldSet, null, null);
+		const item: DescriptionPropertyDefinitionFieldSetEditorModel = new DescriptionPropertyDefinitionEditorModel(this.validationErrorModel).calculateFieldSetProperties(this.fieldSet, null, null);
 		//TODO: akis
-		formArray.push((item.buildForm().get('items') as UntypedFormArray).at(0));
+		formArray.push((item.buildForm({rootPath: ''}).get('items') as UntypedFormArray).at(0));
 	}
 
 	deleteMultiplicityField(fieldSetIndex: number): void {
@@ -86,12 +88,14 @@ export class DescriptionFormFieldSetComponent extends BaseComponent {
 
 		//TODO: akis
 		//Reapply validators
-		// DmpBlueprintEditorModel.reApplySectionValidators(
+		DescriptionPropertyDefinitionFieldSetEditorModel.reapplyValidators(
-		// 	{
+			{
-		// 		formGroup: this.formGroup,
+				formArray: this.propertiesFormGroup.get('items') as UntypedFormArray,
-		// 		validationErrorModel: this.editorModel.validationErrorModel
+				validationErrorModel: this.validationErrorModel,
-		// 	}
+				//TODO 
-		// );
+				rootPath: ''
+			}
+		);
 		formArray.markAsDirty();
 	}
 

dmp-frontend/src/app/ui/description/editor/description-form/components/form-field/form-field.component.html

@@ -7,8 +7,10 @@
 	<h5 *ngIf="fieldSet.extendedDescription && !isChild" class="col-12">
 		<i>{{fieldSet.extendedDescription}}</i>
 	</h5>
+	{{propertiesFormGroup.value | json}}
 	<mat-form-field *ngSwitchCase="descriptionTemplateFieldTypeEnum.FREE_TEXT" class="col-12">
 		<input matInput [formControl]="propertiesFormGroup?.get(field.id).get('textValue')" placeholder="{{(field.data.label) + (isRequired? ' *': '')}}" [required]="isRequired">
+		<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textValue').hasError('backendError')">{{propertiesFormGroup?.get(field.id).get('textValue').getError('backendError').message}}</mat-error>
 		<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textValue').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 		<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textValue').hasError('pattern')">{{'GENERAL.VALIDATION.URL.MESSAGE' | translate}}</mat-error>
 	</mat-form-field>
@@ -19,11 +21,13 @@
 				<ng-container *ngIf="field.data.multipleSelect">
 					<app-multiple-auto-complete placeholder="{{ (field.data.label | translate) + (isRequired? ' *': '')}}" [formControl]="propertiesFormGroup?.get(field.id).get('textListValue')" [configuration]="multipleAutoCompleteConfiguration">
 					</app-multiple-auto-complete>
+					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textListValue').hasError('backendError')">{{propertiesFormGroup?.get(field.id).get('textListValue').getError('backendError').message}}</mat-error>
 					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textListValue').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 				</ng-container>
 				<ng-container *ngIf="!(field.data.multipleSelect)">
 					<app-single-auto-complete placeholder="{{ (field.data.label | translate) + (isRequired? ' *': '')}}" [formControl]="propertiesFormGroup?.get(field.id).get('textValue')" [configuration]="singleAutoCompleteConfiguration" [required]="isRequired">
 					</app-single-auto-complete>
+					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textValue').hasError('backendError')">{{propertiesFormGroup?.get(field.id).get('textValue').getError('backendError').message}}</mat-error>
 					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textValue').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 				</ng-container>
 				<mat-hint>{{ "TYPES.DATASET-PROFILE-COMBO-BOX-TYPE.EXTERNAL-SOURCE-HINT" | translate }}</mat-hint>
@@ -38,6 +42,7 @@
 						<mat-option *ngFor="let opt of field.data.options" [value]="opt.value">{{opt.label}}
 						</mat-option>
 					</mat-select>
+					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textListValue').hasError('backendError')">{{propertiesFormGroup?.get(field.id).get('textListValue').getError('backendError').message}}</mat-error>
 					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textListValue').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 				</ng-container>
 				<ng-container *ngIf="!(field.data.multipleSelect)">
@@ -45,6 +50,7 @@
 						<mat-option *ngFor="let opt of field.data.options" [value]="opt.value">{{opt.label}}
 						</mat-option>
 					</mat-select>
+					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textValue').hasError('backendError')">{{propertiesFormGroup?.get(field.id).get('textValue').getError('backendError').message}}</mat-error>
 					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textValue').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 				</ng-container>
 			</mat-form-field>
@@ -56,11 +62,13 @@
 				<ng-container *ngIf="field.data.multipleSelect">
 					<app-multiple-auto-complete placeholder="{{ (field.data.label | translate) + (isRequired? ' *': '') }}" [formControl]="propertiesFormGroup?.get(field.id).get('textListValue')" [configuration]="multipleAutoCompleteConfiguration">
 					</app-multiple-auto-complete>
+					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textListValue').hasError('backendError')">{{propertiesFormGroup?.get(field.id).get('textListValue').getError('backendError').message}}</mat-error>
 					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textListValue').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 				</ng-container>
 				<ng-container *ngIf="!(field.data.multipleSelect)">
 					<app-single-auto-complete placeholder="{{ (field.data.label | translate) + (isRequired? ' *': '') }}" [formControl]="propertiesFormGroup?.get(field.id).get('textValue')" [configuration]="singleAutoCompleteConfiguration" [required]="isRequired">
 					</app-single-auto-complete>
+					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textValue').hasError('backendError')">{{propertiesFormGroup?.get(field.id).get('textValue').getError('backendError').message}}</mat-error>
 					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textValue').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 				</ng-container>
 				<mat-hint>{{ "TYPES.DATASET-PROFILE-COMBO-BOX-TYPE.EXTERNAL-SOURCE-HINT" | translate }}</mat-hint>
@@ -73,11 +81,13 @@
 				<ng-container *ngIf="field.data.multipleSelect">
 					<app-multiple-auto-complete placeholder="{{ (field.data.label | translate) + (isRequired? ' *': '') }}" [formControl]="propertiesFormGroup?.get(field.id).get('textListValue')" [configuration]="multipleAutoCompleteConfiguration">
 					</app-multiple-auto-complete>
+					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textListValue').hasError('backendError')">{{propertiesFormGroup?.get(field.id).get('textListValue').getError('backendError').message}}</mat-error>
 					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textListValue').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 				</ng-container>
 				<ng-container *ngIf="!(field.data.multipleSelect)">
 					<app-single-auto-complete placeholder="{{ (field.data.label | translate) + (isRequired? ' *': '') }}" [formControl]="propertiesFormGroup?.get(field.id).get('textValue')" [configuration]="singleAutoCompleteConfiguration" [required]="isRequired">
 					</app-single-auto-complete>
+					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textValue').hasError('backendError')">{{propertiesFormGroup?.get(field.id).get('textValue').getError('backendError').message}}</mat-error>
 					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textValue').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 				</ng-container>
 				<mat-hint>{{ "TYPES.DATASET-PROFILE-COMBO-BOX-TYPE.EXTERNAL-SOURCE-HINT" | translate }}</mat-hint>
@@ -90,11 +100,13 @@
 				<ng-container *ngIf="field.data.multipleSelect">
 					<app-multiple-auto-complete placeholder="{{ (field.data.label | translate) + (isRequired? ' *': '') }}" [formControl]="propertiesFormGroup?.get(field.id).get('textListValue')" [configuration]="multipleAutoCompleteConfiguration">
 					</app-multiple-auto-complete>
+					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textListValue').hasError('backendError')">{{propertiesFormGroup?.get(field.id).get('textListValue').getError('backendError').message}}</mat-error>
 					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textListValue').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 				</ng-container>
 				<ng-container *ngIf="!(field.data.multipleSelect)">
 					<app-single-auto-complete placeholder="{{ (field.data.label | translate) + (isRequired? ' *': '') }}" [formControl]="propertiesFormGroup?.get(field.id).get('textValue')" [configuration]="singleAutoCompleteConfiguration" [required]="isRequired">
 					</app-single-auto-complete>
+					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textValue').hasError('backendError')">{{propertiesFormGroup?.get(field.id).get('textValue').getError('backendError').message}}</mat-error>
 					<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textValue').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 				</ng-container>
 				<mat-hint>{{ "TYPES.DATASET-PROFILE-COMBO-BOX-TYPE.EXTERNAL-SOURCE-HINT" | translate }}</mat-hint>
@@ -104,12 +116,14 @@
 	<div *ngSwitchCase="descriptionTemplateFieldTypeEnum.CHECK_BOX" class="col-12">
 		<mat-checkbox [formControl]="propertiesFormGroup?.get(field.id).get('textValue')" [required]="isRequired">
 			{{field.data.label}}</mat-checkbox>
+		<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textValue').hasError('backendError')">{{propertiesFormGroup?.get(field.id).get('textValue').getError('backendError').message}}</mat-error>	
 	</div>
 	<mat-form-field *ngSwitchCase="descriptionTemplateFieldTypeEnum.TEXT_AREA" class="col-12">
 		<textarea matInput class="text-area" [formControl]="propertiesFormGroup?.get(field.id).get('textValue')" matTextareaAutosize matAutosizeMinRows="3" matAutosizeMaxRows="15" [required]="isRequired" placeholder="{{ (field.data.label | translate) + (isRequired? ' *': '') }}"></textarea>
 		<button mat-icon-button type="button" *ngIf="!propertiesFormGroup?.get(field.id).get('textValue').disabled && propertiesFormGroup?.get(field.id).get('textValue').value" matSuffix aria-label="Clear" (click)="this.propertiesFormGroup?.get(field.id).get('textValue').patchValue('')">
 			<mat-icon>close</mat-icon>
 		</button>
+		<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textValue').hasError('backendError')">{{propertiesFormGroup?.get(field.id).get('textValue').getError('backendError').message}}</mat-error>
 		<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textValue')['errors'] && propertiesFormGroup?.get(field.id).get('textValue').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 	</mat-form-field>
 	<ng-container *ngSwitchCase="descriptionTemplateFieldTypeEnum.RICH_TEXT_AREA">
@@ -118,6 +132,7 @@
 		</rich-text-editor-component>
 		<div [class]="(propertiesFormGroup?.get(field.id).get('textValue')['errors'] && propertiesFormGroup?.get(field.id).get('textValue').hasError('required') && propertiesFormGroup?.get(field.id).get('textValue').touched) ? 'visible' : 'invisible'" class="col-12">
 			<div class="mat-form-field form-field-subscript-wrapper">
+				<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textValue').hasError('backendError')">{{propertiesFormGroup?.get(field.id).get('textValue').getError('backendError').message}}</mat-error>
 				<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textValue')['errors'] && propertiesFormGroup?.get(field.id).get('textValue').hasError('required') && propertiesFormGroup?.get(field.id).get('textValue').touched">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 			</div>
 		</div>
@@ -146,6 +161,7 @@
 		<mat-radio-group [formControl]="propertiesFormGroup?.get(field.id).get('textValue')" [required]="isRequired">
 			<mat-radio-button class="radio-button-item" name="{{propertiesFormGroup?.get(field.id).value}}" value="true">{{ "TYPES.DATASET-PROFILE-COMBO-BOX-TYPE.ACTIONS.YES" | translate }}</mat-radio-button>
 			<mat-radio-button class="radio-button-item" name="{{propertiesFormGroup?.get(field.id).value}}" value="false">{{ "TYPES.DATASET-PROFILE-COMBO-BOX-TYPE.ACTIONS.NO" | translate }}</mat-radio-button>
+			<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textValue').hasError('backendError')">{{propertiesFormGroup?.get(field.id).get('textValue').getError('backendError').message}}</mat-error>
 		</mat-radio-group>
 		<small class="text-danger d-block" *ngIf="propertiesFormGroup?.get(field.id).get('textValue').hasError('required') && propertiesFormGroup?.get(field.id).get('textValue').touched">{{'GENERAL.VALIDATION.REQUIRED' | translate}}
 		</small>
@@ -155,6 +171,7 @@
 	<div *ngSwitchCase="descriptionTemplateFieldTypeEnum.RADIO_BOX" class="col-12">
 		<mat-radio-group [formControl]="propertiesFormGroup?.get(field.id).get('textValue')" [required]="isRequired">
 			<mat-radio-button *ngFor="let option of field.data.options let index = index" class="radio-button-item" [value]="option.value">{{option.label}}</mat-radio-button>
+			<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textValue').hasError('backendError')">{{propertiesFormGroup?.get(field.id).get('textValue').getError('backendError').message}}</mat-error>
 		</mat-radio-group>
 		<small class="text-danger d-block" *ngIf="propertiesFormGroup?.get(field.id).get('textValue').hasError('required') && propertiesFormGroup?.get(field.id).get('textValue').touched">{{'GENERAL.VALIDATION.REQUIRED' | translate}}
 		</small>
@@ -165,9 +182,8 @@
 		<input matInput placeholder="{{ (field.data.label | translate) + (isRequired? ' *': '') }}" class="table-input" [matDatepicker]="date" [required]="isRequired" [formControl]="propertiesFormGroup?.get(field.id).get('dateValue')">
 		<mat-datepicker-toggle matSuffix [for]="date"></mat-datepicker-toggle>
 		<mat-datepicker #date></mat-datepicker>
-		<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('dateValue').hasError('required')">
+		<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('dateValue').hasError('backendError')">{{propertiesFormGroup?.get(field.id).get('dateValue').getError('backendError').message}}</mat-error>
-			{{'GENERAL.VALIDATION.REQUIRED' | translate}}
+		<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('dateValue').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
-		</mat-error>
 	</mat-form-field>
 
 	<div *ngSwitchCase="descriptionTemplateFieldTypeEnum.EXTERNAL_DATASETS" class="col-12">
@@ -381,8 +397,8 @@
 		<div class="row" *ngIf="datasetIdInitialized">
 			<mat-form-field class="col-md-12">
 				<input matInput class="col-md-12" [formControl]="propertiesFormGroup?.get(field.id).get('externalIdentifier')?.get('identifier')" placeholder="{{(field.data.label) + (isRequired? ' *': '')}}" [required]="isRequired" [disabled]="propertiesFormGroup?.get(field.id).get('externalIdentifier')?.get('identifier').disabled">
-				<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('externalIdentifier')?.get('identifier').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}
+				<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('externalIdentifier')?.get('identifier').hasError('backendError')">{{propertiesFormGroup?.get(field.id).get('externalIdentifier')?.get('identifier').getError('backendError').message}}</mat-error>
-				</mat-error>
+				<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('externalIdentifier')?.get('identifier').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 			</mat-form-field>
 			<mat-form-field class="col-md-12">
 				<mat-select class="col-md-12" [formControl]="propertiesFormGroup?.get(field.id).get('externalIdentifier')?.get('type')" [placeholder]="('TYPES.DATASET-PROFILE-IDENTIFIER.IDENTIFIER-TYPE' | translate) + (isRequired? ' *': '')" [disabled]="propertiesFormGroup?.get(field.id).get('externalIdentifier')?.get('type').disabled">
@@ -390,8 +406,8 @@
 						{{ type.name }}
 					</mat-option>
 				</mat-select>
-				<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('externalIdentifier')?.get('type').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}
+				<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('externalIdentifier')?.get('type').hasError('backendError')">{{propertiesFormGroup?.get(field.id).get('externalIdentifier')?.get('type').getError('backendError').message}}</mat-error>
-				</mat-error>
+				<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('externalIdentifier')?.get('type').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 			</mat-form-field>
 		</div>
 	</div>
@@ -401,8 +417,8 @@
 			<mat-form-field class="col-md-12">
 				<app-single-auto-complete placeholder="{{ (field.data.label | translate) + (isRequired? ' *': '') }}" [formControl]="propertiesFormGroup?.get(field.id).get('textValue')" [configuration]="currencyAutoCompleteConfiguration" [required]="isRequired">
 				</app-single-auto-complete>
-				<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textValue').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}
+				<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textValue').hasError('backendError')">{{propertiesFormGroup?.get(field.id).get('textValue').getError('backendError').message}}</mat-error>
-				</mat-error>
+				<mat-error *ngIf="propertiesFormGroup?.get(field.id).get('textValue').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 			</mat-form-field>
 		</div>
 	</div>

dmp-frontend/src/app/ui/description/editor/description-form/components/form-section/form-section.component.html

@@ -19,6 +19,7 @@
 							[fieldSet]="fieldSet" 
 							[path]="path + '.' + (i+1)" 
 							[visibilityRulesService]="visibilityRulesService" 
+							[validationErrorModel]="validationErrorModel"
 							[isChild]="false"></app-description-form-field-set>
 						</div>
 					</div>

dmp-frontend/src/app/ui/description/editor/description-form/components/form-section/form-section.component.ts

@@ -12,11 +12,11 @@ import {
 import { UntypedFormGroup } from '@angular/forms';
 import { DescriptionTemplateSection } from '@app/core/model/description-template/description-template';
 import { BaseComponent } from '@common/base/base.component';
+import { ValidationErrorModel } from '@common/forms/validation/error-model/validation-error-model';
 import { ToCEntry } from '../../../table-of-contents/models/toc-entry';
 import { ToCEntryType } from '../../../table-of-contents/models/toc-entry-type.enum';
 import { LinkToScroll } from '../../../table-of-contents/table-of-contents.component';
 import { VisibilityRulesService } from '../../visibility-rules/visibility-rules.service';
-import { MatExpansionPanel } from '@angular/material/expansion';
 
 
 @Component({
@@ -43,6 +43,7 @@ export class DescriptionFormSectionComponent extends BaseComponent implements On
 	@Output() askedToScroll = new EventEmitter<string>();
 	tocentriesType = ToCEntryType;
 	@Input() TOCENTRY_ID_PREFIX = "";
+	@Input() validationErrorModel: ValidationErrorModel;
 
 	constructor(
 		private changeDetector: ChangeDetectorRef

dmp-frontend/src/app/ui/description/editor/description-form/description-form.component.html

@@ -15,7 +15,7 @@
 							</mat-expansion-panel-header>
 							<ng-container *ngFor="let section of page.sections; let i = index;">
 								<div class="row">
-									<app-description-form-section class="col-12" [section]="section" [path]="(z+1)+'.'+(i+1)" [pathName]="'pages.'+z+'.sections.'+i" [propertiesFormGroup]="propertiesFormGroup" [visibilityRulesService]="visibilityRulesService" (askedToScroll)="onAskedToScroll(expansionPanel, $event)" [linkToScroll]="linkToScroll"></app-description-form-section>
+									<app-description-form-section class="col-12" [section]="section" [path]="(z+1)+'.'+(i+1)" [pathName]="'pages.'+z+'.sections.'+i" [propertiesFormGroup]="propertiesFormGroup" [visibilityRulesService]="visibilityRulesService" (askedToScroll)="onAskedToScroll(expansionPanel, $event)" [linkToScroll]="linkToScroll" [validationErrorModel]="validationErrorModel"></app-description-form-section>
 								</div>
 							</ng-container>
 						</mat-expansion-panel>

dmp-frontend/src/app/ui/description/editor/description-form/description-form.component.ts

@@ -6,6 +6,7 @@ import { BaseComponent } from '@common/base/base.component';
 import { LinkToScroll } from '../table-of-contents/table-of-contents.component';
 import { Rule } from './visibility-rules/models/rule';
 import { VisibilityRulesService } from './visibility-rules/visibility-rules.service';
+import { ValidationErrorModel } from '@common/forms/validation/error-model/validation-error-model';
 
 @Component({
 	selector: 'app-description-form',
@@ -31,6 +32,7 @@ export class DescriptionFormComponent extends BaseComponent implements OnInit, A
 
 	@Input() TOCENTRY_ID_PREFIX = "";
 	@Output() visibilityRulesInstance = new EventEmitter<VisibilityRulesService>();
+	@Input() validationErrorModel: ValidationErrorModel;
 
 	// public hiddenEntriesIds: string[] = [];