From 412c778d8c8463255cfd307986763061102927a2 Mon Sep 17 00:00:00 2001
From: amentis <amentis@cite.gr>
Date: Tue, 16 Jan 2024 11:55:46 +0200
Subject: [PATCH] add backend validation in language, references,
 tenant,supportive material editor forms.

---
 .../commons/validation/BaseValidator.java     |  3 +
 .../eudat/model/persist/ReferencePersist.java |  3 -
 .../TenantDepositConfigPersist.java           |  2 +-
 .../TenantFileTransformersConfigPersist.java  |  2 +-
 .../tenantconfig/TenantSourcePersist.java     |  2 +-
 .../editor/language-editor.component.html     | 16 ++--
 .../editor/reference-editor.component.html    | 47 ++++++------
 .../editor/reference-editor.component.ts      | 11 ++-
 .../editor/reference-editor.model.ts          | 55 +++++++++++++-
 .../editor/tenant-editor.component.html       | 57 +++++++-------
 .../tenant/editor/tenant-editor.component.ts  | 24 +++++-
 .../tenant/editor/tenant-editor.model.ts      | 74 ++++++++++++++++++-
 .../supportive-material-editor.component.html | 10 ++-
 13 files changed, 229 insertions(+), 77 deletions(-)

diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/BaseValidator.java b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/BaseValidator.java
index 5992c55e3..3a2e5ac9c 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/commons/validation/BaseValidator.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/commons/validation/BaseValidator.java
@@ -40,6 +40,9 @@ public abstract class BaseValidator<T> extends AbstractValidator<T> {
 	protected Boolean isEmpty(String value) {
 		return this.conventionService.isNullOrEmpty(value);
 	}
+	protected Boolean isListNullOrEmpty(List<?> value) {
+		return this.conventionService.isListNullOrEmpty(value);
+	}
 	protected Boolean isNull(Object value) {
 		return value == null;
 	}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/ReferencePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/ReferencePersist.java
index 978cdc09b..95feb91e6 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/ReferencePersist.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/ReferencePersist.java
@@ -186,9 +186,6 @@ public class ReferencePersist {
                             .iff(() -> !this.isEmpty(item.getReference()))
                             .must(() -> this.lessEqualLength(item.getReference(), ReferenceEntity._referenceLength))
                             .failOn(ReferencePersist._reference).failWith(messageSource.getMessage("Validation_MaxLength", new Object[]{ReferencePersist._reference}, LocaleContextHolder.getLocale())),
-                    this.spec()
-                            .must(() -> !this.isEmpty(item.getAbbreviation()))
-                            .failOn(ReferencePersist._abbreviation).failWith(messageSource.getMessage("Validation_Required", new Object[]{ReferencePersist._abbreviation}, LocaleContextHolder.getLocale())),
                     this.spec()
                             .iff(() -> !this.isEmpty(item.getAbbreviation()))
                             .must(() -> this.lessEqualLength(item.getAbbreviation(), ReferenceEntity._abbreviationLength))
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantDepositConfigPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantDepositConfigPersist.java
index 431d422e0..e2bbd6ea0 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantDepositConfigPersist.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantDepositConfigPersist.java
@@ -47,7 +47,7 @@ public class TenantDepositConfigPersist {
         @Override
         protected List<Specification> specifications(TenantDepositConfigPersist item) {
             return Collections.singletonList(
-                    this.refSpec()
+                    this.navSpec()
                             .iff(() -> !this.isNull(item.getSources()))
                             .on(TenantDepositConfigPersist._sources)
                             .over(item.getSources())
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantFileTransformersConfigPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantFileTransformersConfigPersist.java
index e72b6ffa8..b8ede05c5 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantFileTransformersConfigPersist.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantFileTransformersConfigPersist.java
@@ -47,7 +47,7 @@ public class TenantFileTransformersConfigPersist {
         @Override
         protected List<Specification> specifications(TenantFileTransformersConfigPersist item) {
             return Collections.singletonList(
-                    this.refSpec()
+                    this.navSpec()
                             .iff(() -> !this.isNull(item.getSources()))
                             .on(TenantFileTransformersConfigPersist._sources)
                             .over(item.getSources())
diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantSourcePersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantSourcePersist.java
index 0185b7b10..46add9237 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantSourcePersist.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/tenantconfig/TenantSourcePersist.java
@@ -112,7 +112,7 @@ public class TenantSourcePersist {
                             .must(() -> !this.isEmpty(item.getUrl()))
                             .failOn(TenantSourcePersist._url).failWith(messageSource.getMessage("Validation_Required", new Object[]{TenantSourcePersist._url}, LocaleContextHolder.getLocale())),
                     this.spec()
-                            .must(() -> !this.isNull(item.getCodes()))
+                            .must(() -> !this.isListNullOrEmpty(item.getCodes()))
                             .failOn(TenantSourcePersist._codes).failWith(messageSource.getMessage("Validation_Required", new Object[]{TenantSourcePersist._codes}, LocaleContextHolder.getLocale())),
                     this.spec()
                             .must(() -> !this.isEmpty(item.getIssuerUrl()))
diff --git a/dmp-frontend/src/app/ui/admin/language/editor/language-editor.component.html b/dmp-frontend/src/app/ui/admin/language/editor/language-editor.component.html
index d63d0769c..3bc5faa99 100644
--- a/dmp-frontend/src/app/ui/admin/language/editor/language-editor.component.html
+++ b/dmp-frontend/src/app/ui/admin/language/editor/language-editor.component.html
@@ -33,8 +33,8 @@
 							<mat-form-field class="w-100">
 								<mat-label>{{'LANGUAGE-EDITOR.FIELDS.CODE' | translate}}</mat-label>
 								<input matInput type="text" name="code" [formControl]="formGroup.get('code')" required>
-								<mat-error *ngIf="formGroup.get('code').hasError('required')">
-									{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+								<mat-error *ngIf="formGroup.get('code').hasError('backendError')">{{formGroup.get('code').getError('backendError').message}}</mat-error>
+								<mat-error *ngIf="formGroup.get('code').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 							</mat-form-field>
 						</div>
 						<div class="col-4" *ngIf="!isNew">
@@ -45,24 +45,24 @@
 										{{languageCode}}
 									</mat-option>
 								</mat-select>
-								<mat-error *ngIf="formGroup.get('code').hasError('required')">
-									{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+								<mat-error *ngIf="formGroup.get('code').hasError('backendError')">{{formGroup.get('code').getError('backendError').message}}</mat-error>
+								<mat-error *ngIf="formGroup.get('code').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 							</mat-form-field>
 						</div>
 						<div class="col-4">
 							<mat-form-field class="w-100">
 								<mat-label>{{'LANGUAGE-EDITOR.FIELDS.ORDINAL' | translate}}</mat-label>
 								<input matInput type="text" name="ordinal" [formControl]="formGroup.get('ordinal')" required>
-								<mat-error *ngIf="formGroup.get('ordinal').hasError('required')">
-									{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+								<mat-error *ngIf="formGroup.get('ordinal').hasError('backendError')">{{formGroup.get('ordinal').getError('backendError').message}}</mat-error>
+								<mat-error *ngIf="formGroup.get('ordinal').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 							</mat-form-field>
 						</div>
 						<div class="col-12">
 							<mat-form-field class="w-100">
 								<mat-label>{{'LANGUAGE-EDITOR.FIELDS.PAYLOAD' | translate}}</mat-label>
 								<input matInput type="text" name="payload" [formControl]="formGroup.get('payload')">
-								<mat-error *ngIf="formGroup.get('payload').hasError('required')">
-									{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+								<mat-error *ngIf="formGroup.get('payload').hasError('backendError')">{{formGroup.get('payload').getError('backendError').message}}</mat-error>
+								<mat-error *ngIf="formGroup.get('payload').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 							</mat-form-field>
 							<h9 class="col-12">{{'LANGUAGE-EDITOR.FIELDS.OVERRIDE' | translate}}
 								<mat-checkbox (change)="overrideFromFile($event, formGroup.get('code').value)"></mat-checkbox>
diff --git a/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.html b/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.html
index 80e0cadbd..f527e3962 100644
--- a/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.html
+++ b/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.html
@@ -33,8 +33,8 @@
 							<mat-form-field class="w-100">
 								<mat-label>{{'REFERENCE-EDITOR.FIELDS.LABEL' | translate}}</mat-label>
 								<input matInput type="text" name="label" [formControl]="formGroup.get('label')" required>
-								<mat-error *ngIf="formGroup.get('label').hasError('required')">
-									{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+								<mat-error *ngIf="formGroup.get('label').hasError('backendError')">{{formGroup.get('label').getError('backendError').message}}</mat-error>
+								<mat-error *ngIf="formGroup.get('label').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 							</mat-form-field>
 						</div>
 						<div class="col-4">
@@ -44,9 +44,9 @@
 									<mat-option *ngFor="let type of referenceTypeEnum" [value]="type">
 										{{enumUtils.toReferenceTypeString(type)}}
 									</mat-option>
-								</mat-select>							
-								<mat-error *ngIf="formGroup.get('type').hasError('required')">
-									{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+								</mat-select>		
+								<mat-error *ngIf="formGroup.get('type').hasError('backendError')">{{formGroup.get('type').getError('backendError').message}}</mat-error>					
+								<mat-error *ngIf="formGroup.get('type').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 							</mat-form-field>
 						</div>
 						<div class="col-12">
@@ -55,9 +55,8 @@
 								<rich-text-editor-component [parentFormGroup]="formGroup" [controlName]="'description'" [placeholder]="'REFERENCE-EDITOR.FIELDS.DESCRIPTION-PLACEHOLDER'" [wrapperClasses]="(formGroup.get('description').touched && formGroup.get('description').hasError('required')) ? 'required' : ''" [editable]="formGroup.controls['description'].status !== 'DISABLED'">
 								</rich-text-editor-component>
 								<div [class]="(formGroup.get('description').touched && formGroup.get('description').hasError('required')) ? 'visible' : 'invisible'" class="mat-form-field formGroup-field-subscript-wrapper">
-									<mat-error>
-										{{'GENERAL.VALIDATION.REQUIRED'| translate}}
-									</mat-error>
+									<mat-error *ngIf="formGroup.get('description').hasError('backendError')">{{formGroup.get('description').getError('backendError').message}}</mat-error>					
+									<mat-error>{{'GENERAL.VALIDATION.REQUIRED'| translate}}</mat-error>
 								</div>
 							</div>
 						</div>
@@ -65,8 +64,8 @@
 							<mat-form-field class="w-100">
 								<mat-label>{{'REFERENCE-EDITOR.FIELDS.SOURCE' | translate}}</mat-label>
 								<input matInput type="text" name="source" [formControl]="formGroup.get('source')" required>
-								<mat-error *ngIf="formGroup.get('source').hasError('required')">
-									{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+								<mat-error *ngIf="formGroup.get('source').hasError('backendError')">{{formGroup.get('source').getError('backendError').message}}</mat-error>					
+								<mat-error *ngIf="formGroup.get('source').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 							</mat-form-field>
 						</div>
 						<div class="col-4">
@@ -76,25 +75,25 @@
 									<mat-option *ngFor="let sourceType of referenceSourceTypeEnum" [value]="sourceType">
 										{{enumUtils.toReferenceSourceTypeString(sourceType)}}
 									</mat-option>
-								</mat-select>							
-								<mat-error *ngIf="formGroup.get('sourceType').hasError('required')">
-									{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+								</mat-select>	
+								<mat-error *ngIf="formGroup.get('sourceType').hasError('backendError')">{{formGroup.get('sourceType').getError('backendError').message}}</mat-error>											
+								<mat-error *ngIf="formGroup.get('sourceType').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 							</mat-form-field>
 						</div>
 						<div class="col-6">
 							<mat-form-field class="w-100">
 								<mat-label>{{'REFERENCE-EDITOR.FIELDS.REFERENCE' | translate}}</mat-label>
 								<input matInput type="text" name="reference" [formControl]="formGroup.get('reference')" required>
-								<mat-error *ngIf="formGroup.get('reference').hasError('required')">
-									{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+								<mat-error *ngIf="formGroup.get('reference').hasError('backendError')">{{formGroup.get('reference').getError('backendError').message}}</mat-error>											
+								<mat-error *ngIf="formGroup.get('reference').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 							</mat-form-field>
 						</div>
 						<div class="col-4">
 							<mat-form-field class="w-100">
 								<mat-label>{{'REFERENCE-EDITOR.FIELDS.ABBREVIATION' | translate}}</mat-label>
 								<input matInput type="text" name="abbreviation" [formControl]="formGroup.get('abbreviation')">
-								<mat-error *ngIf="formGroup.get('abbreviation').hasError('required')">
-									{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+								<mat-error *ngIf="formGroup.get('abbreviation').hasError('backendError')">{{formGroup.get('abbreviation').getError('backendError').message}}</mat-error>											
+								<mat-error *ngIf="formGroup.get('abbreviation').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 							</mat-form-field>
 						</div>
 						
@@ -121,8 +120,8 @@
 											<mat-form-field class="w-100">
 												<mat-label>{{'REFERENCE-EDITOR.FIELDS.CODE' | translate}}</mat-label>
 												<input matInput type="text" name="code" [formControl]="field.get('code')" required>
-												<mat-error *ngIf="field.get('code').hasError('required')">
-													{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+												<mat-error *ngIf="field.get('code').hasError('backendError')">{{field.get('code').getError('backendError').message}}</mat-error>											
+												<mat-error *ngIf="field.get('code').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 											</mat-form-field>
 										</div>
 										<div class="col-6">
@@ -132,17 +131,17 @@
 													<mat-option *ngFor="let dataType of referenceFieldDataTypeEnum" [value]="dataType">
 														{{enumUtils.toReferenceFieldDataTypeString(dataType)}}
 													</mat-option>
-												</mat-select>												
-												<mat-error *ngIf="field.get('dataType').hasError('required')">
-													{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+												</mat-select>			
+												<mat-error *ngIf="field.get('dataType').hasError('backendError')">{{field.get('dataType').getError('backendError').message}}</mat-error>																				
+												<mat-error *ngIf="field.get('dataType').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 											</mat-form-field>
 										</div>
 										<div class="col-6">
 											<mat-form-field class="w-100">
 												<mat-label>{{'REFERENCE-EDITOR.FIELDS.VALUE' | translate}}</mat-label>
 												<input matInput type="text" name="value" [formControl]="field.get('value')" required>
-												<mat-error *ngIf="field.get('value').hasError('required')">
-													{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+												<mat-error *ngIf="field.get('value').hasError('backendError')">{{field.get('value').getError('backendError').message}}</mat-error>																				
+												<mat-error *ngIf="field.get('value').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 											</mat-form-field>
 										</div>
 									</div>
diff --git a/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.ts b/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.ts
index f18bb26e6..a5741084e 100644
--- a/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.ts
+++ b/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.ts
@@ -190,12 +190,19 @@ export class ReferenceEditorComponent extends BaseEditor<ReferenceEditorModel, R
 	// fields
 	//
 	addField(): void {
-		const field: FieldEditorModel = new FieldEditorModel();
-		(this.formGroup.get('definition').get('fields') as FormArray).push(field.buildForm());
+		(this.formGroup.get('definition').get('fields') as FormArray).push(this.editorModel.createChildField((this.formGroup.get('definition').get('fields') as FormArray).length));			
+
 	}
 
 	removeField(fieldIndex: number): void {
 		(this.formGroup.get('definition').get('fields') as FormArray).removeAt(fieldIndex);
+		ReferenceEditorModel.reApplyDefinitionFieldsValidators(
+			{
+				formGroup: this.formGroup,
+				validationErrorModel: this.editorModel.validationErrorModel
+			}
+		)
+		this.formGroup.get('definition').get('fields').markAsDirty();
 	}
 
 
diff --git a/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.model.ts b/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.model.ts
index 215f3f824..0e0a4fc1b 100644
--- a/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.model.ts
+++ b/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.model.ts
@@ -1,4 +1,4 @@
-import { UntypedFormBuilder, UntypedFormGroup, Validators } from "@angular/forms";
+import { UntypedFormArray, UntypedFormBuilder, UntypedFormGroup, Validators } from "@angular/forms";
 import { ReferenceFieldDataType } from "@app/core/common/enum/reference-field-data-type";
 import { ReferenceSourceType } from "@app/core/common/enum/reference-source-type";
 import { ReferenceType } from "@app/core/common/enum/reference-type";
@@ -76,6 +76,25 @@ export class ReferenceEditorModel extends BaseEditorModel implements ReferencePe
 		baseContext.validation = baseValidationArray;
 		return baseContext;
 	}
+
+	createChildField(index: number): UntypedFormGroup {
+		const field: FieldEditorModel = new FieldEditorModel(this.validationErrorModel);
+		return field.buildForm({ rootPath: 'definition.fields[' + index + '].' });
+	}
+
+	static reApplyDefinitionFieldsValidators(params: {
+		formGroup: UntypedFormGroup,
+		validationErrorModel: ValidationErrorModel,
+	}): void {
+
+		const { formGroup, validationErrorModel } = params;
+		const control = formGroup?.get('definition');
+		DefinitionEditorModel.reapplyFieldsValidators({
+			formArray: control.get('fields') as UntypedFormArray,
+			rootPath: `definition.`,
+			validationErrorModel: validationErrorModel
+		});
+	}
 }
 
 export class DefinitionEditorModel implements DefinitionPersist {
@@ -133,6 +152,21 @@ export class DefinitionEditorModel implements DefinitionPersist {
 		baseContext.validation = baseValidationArray;
 		return baseContext;
 	}
+
+	static reapplyFieldsValidators(params: {
+		formArray: UntypedFormArray,
+		validationErrorModel: ValidationErrorModel,
+		rootPath: string
+	}): void {
+		const { validationErrorModel, rootPath, formArray } = params;
+		formArray?.controls?.forEach(
+			(control, index) => FieldEditorModel.reapplyValidators({
+				formGroup: control as UntypedFormGroup,
+				rootPath: `${rootPath}fields[${index}].`,
+				validationErrorModel: validationErrorModel
+			})
+		);
+	}
 }
 
 export class FieldEditorModel implements FieldPersist {
@@ -191,5 +225,24 @@ export class FieldEditorModel implements FieldPersist {
 		baseContext.validation = baseValidationArray;
 		return baseContext;
 	}
+
+	static reapplyValidators(params: {
+		formGroup: UntypedFormGroup,
+		validationErrorModel: ValidationErrorModel,
+		rootPath: string
+	}): void {
+
+		const { formGroup, rootPath, validationErrorModel } = params;
+		const context = FieldEditorModel.createValidationContext({
+			rootPath,
+			validationErrorModel
+		});
+
+		['code', 'dataType', 'value'].forEach(keyField => {
+			const control = formGroup?.get(keyField);
+			control?.clearValidators();
+			control?.addValidators(context.getValidation(keyField).validators);
+		})
+	}
 }
 
diff --git a/dmp-frontend/src/app/ui/admin/tenant/editor/tenant-editor.component.html b/dmp-frontend/src/app/ui/admin/tenant/editor/tenant-editor.component.html
index 48e3f4bcd..377ee3ef5 100644
--- a/dmp-frontend/src/app/ui/admin/tenant/editor/tenant-editor.component.html
+++ b/dmp-frontend/src/app/ui/admin/tenant/editor/tenant-editor.component.html
@@ -32,16 +32,16 @@
 						<mat-form-field class="w-100">
 							<mat-label>{{'TENANT-EDITOR.FIELDS.NAME' | translate}}</mat-label>
 							<input matInput type="text" name="name" [formControl]="formGroup.get('name')" required>
-							<mat-error *ngIf="formGroup.get('name').hasError('required')">
-								{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+							<mat-error *ngIf="formGroup.get('name').hasError('backendError')">{{formGroup.get('name').getError('backendError').message}}</mat-error>
+							<mat-error *ngIf="formGroup.get('name').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 						</mat-form-field>
 					</div>
 					<div class="col-4">
 						<mat-form-field class="w-100">
 							<mat-label>{{'TENANT-EDITOR.FIELDS.CODE' | translate}}</mat-label>
 							<input matInput type="text" name="code" [formControl]="formGroup.get('code')" required>
-							<mat-error *ngIf="formGroup.get('code').hasError('required')">
-								{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+							<mat-error *ngIf="formGroup.get('code').hasError('backendError')">{{formGroup.get('code').getError('backendError').message}}</mat-error>
+							<mat-error *ngIf="formGroup.get('code').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 						</mat-form-field>
 					</div>
 					<div class="col-12">
@@ -50,9 +50,8 @@
 							<rich-text-editor-component [parentFormGroup]="formGroup" [controlName]="'description'" [placeholder]="'TENANT-EDITOR.FIELDS.DESCRIPTION-PLACEHOLDER'" [wrapperClasses]="(formGroup.get('description').touched && formGroup.get('description').hasError('required')) ? 'required' : ''" [editable]="formGroup.controls['description'].status !== 'DISABLED'">
 							</rich-text-editor-component>
 							<div [class]="(formGroup.get('description').touched && formGroup.get('description').hasError('required')) ? 'visible' : 'invisible'" class="mat-form-field formGroup-field-subscript-wrapper">
-								<mat-error>
-									{{'GENERAL.VALIDATION.REQUIRED'| translate}}
-								</mat-error>
+								<mat-error *ngIf="formGroup.get('description').hasError('backendError')">{{formGroup.get('description').getError('backendError').message}}</mat-error>
+								<mat-error>{{'GENERAL.VALIDATION.REQUIRED'| translate}}</mat-error>
 							</div>
 						</div>
 					</div>
@@ -79,40 +78,40 @@
 											<mat-form-field class="w-100">
 												<mat-label>{{'TENANT-EDITOR.FIELDS.URL' | translate}}</mat-label>
 												<input matInput type="text" name="url" [formControl]="source.get('url')" required>
-												<mat-error *ngIf="source.get('url').hasError('required')">
-													{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+												<mat-error *ngIf="source.get('url').hasError('backendError')">{{source.get('url').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="source.get('url').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 											</mat-form-field>
 										</div>
 										<div class="col-6">
 											<mat-form-field class="w-100">
 												<mat-label>{{'TENANT-EDITOR.FIELDS.ISSUER-URL' | translate}}</mat-label>
 												<input matInput type="text" name="issuerUrl" [formControl]="source.get('issuerUrl')" required>
-												<mat-error *ngIf="source.get('issuerUrl').hasError('required')">
-													{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+												<mat-error *ngIf="source.get('issuerUrl').hasError('backendError')">{{source.get('issuerUrl').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="source.get('issuerUrl').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 											</mat-form-field>
 										</div>
 										<div class="col-6">
 											<mat-form-field class="w-100">
 												<mat-label>{{'TENANT-EDITOR.FIELDS.CLIENT-ID' | translate}}</mat-label>
 												<input matInput type="text" name="clientId" [formControl]="source.get('clientId')" required>
-												<mat-error *ngIf="source.get('clientId').hasError('required')">
-													{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+												<mat-error *ngIf="source.get('clientId').hasError('backendError')">{{source.get('clientId').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="source.get('clientId').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 											</mat-form-field>
 										</div>
 										<div class="col-6">
 											<mat-form-field class="w-100">
 												<mat-label>{{'TENANT-EDITOR.FIELDS.CLIENT-SECRET' | translate}}</mat-label>
 												<input matInput type="text" name="clientSecret" [formControl]="source.get('clientSecret')" required>
-												<mat-error *ngIf="source.get('clientSecret').hasError('required')">
-													{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+												<mat-error *ngIf="source.get('clientSecret').hasError('backendError')">{{source.get('clientSecret').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="source.get('clientSecret').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 											</mat-form-field>
 										</div>
 										<div class="col-6">
 											<mat-form-field class="w-100">
 												<mat-label>{{'TENANT-EDITOR.FIELDS.SCOPE' | translate}}</mat-label>
 												<input matInput type="text" name="scope" [formControl]="source.get('scope')" required>
-												<mat-error *ngIf="source.get('scope').hasError('required')">
-													{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+												<mat-error *ngIf="source.get('scope').hasError('backendError')">{{source.get('scope').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="source.get('scope').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 											</mat-form-field>
 										</div>
 										<div class="col-6">
@@ -134,6 +133,8 @@
 														[matChipInputAddOnBlur]="true"
 														(matChipInputTokenEnd)="addDepositCode($event)"/>
 												</mat-chip-grid>
+												<mat-error *ngIf="source.get('codes').hasError('backendError')">{{source.get('codes').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="source.get('codes').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 											  </mat-form-field>
 										</div>
 									</div>
@@ -162,40 +163,40 @@
 											<mat-form-field class="w-100">
 												<mat-label>{{'TENANT-EDITOR.FIELDS.URL' | translate}}</mat-label>
 												<input matInput type="text" name="url" [formControl]="source.get('url')" required>
-												<mat-error *ngIf="source.get('url').hasError('required')">
-													{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+												<mat-error *ngIf="source.get('url').hasError('backendError')">{{source.get('url').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="source.get('url').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 											</mat-form-field>
 										</div>
 										<div class="col-6">
 											<mat-form-field class="w-100">
 												<mat-label>{{'TENANT-EDITOR.FIELDS.ISSUER-URL' | translate}}</mat-label>
 												<input matInput type="text" name="issuerUrl" [formControl]="source.get('issuerUrl')" required>
-												<mat-error *ngIf="source.get('issuerUrl').hasError('required')">
-													{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+												<mat-error *ngIf="source.get('issuerUrl').hasError('backendError')">{{source.get('issuerUrl').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="source.get('issuerUrl').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 											</mat-form-field>
 										</div>
 										<div class="col-6">
 											<mat-form-field class="w-100">
 												<mat-label>{{'TENANT-EDITOR.FIELDS.CLIENT-ID' | translate}}</mat-label>
 												<input matInput type="text" name="clientId" [formControl]="source.get('clientId')" required>
-												<mat-error *ngIf="source.get('clientId').hasError('required')">
-													{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+												<mat-error *ngIf="source.get('clientId').hasError('backendError')">{{source.get('clientId').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="source.get('clientId').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 											</mat-form-field>
 										</div>
 										<div class="col-6">
 											<mat-form-field class="w-100">
 												<mat-label>{{'TENANT-EDITOR.FIELDS.CLIENT-SECRET' | translate}}</mat-label>
 												<input matInput type="text" name="clientSecret" [formControl]="source.get('clientSecret')" required>
-												<mat-error *ngIf="source.get('clientSecret').hasError('required')">
-													{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+												<mat-error *ngIf="source.get('clientSecret').hasError('backendError')">{{source.get('clientSecret').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="source.get('clientSecret').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 											</mat-form-field>
 										</div>
 										<div class="col-6">
 											<mat-form-field class="w-100">
 												<mat-label>{{'TENANT-EDITOR.FIELDS.SCOPE' | translate}}</mat-label>
 												<input matInput type="text" name="scope" [formControl]="source.get('scope')" required>
-												<mat-error *ngIf="source.get('scope').hasError('required')">
-													{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+												<mat-error *ngIf="source.get('scope').hasError('backendError')">{{source.get('scope').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="source.get('scope').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 											</mat-form-field>
 										</div>
 										<div class="col-6">
@@ -217,6 +218,8 @@
 														[matChipInputAddOnBlur]="true"
 														(matChipInputTokenEnd)="addFileCode($event)"/>
 												</mat-chip-grid>
+												<mat-error *ngIf="source.get('codes').hasError('backendError')">{{source.get('codes').getError('backendError').message}}</mat-error>
+												<mat-error *ngIf="source.get('codes').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 											  </mat-form-field>
 										</div>
 									</div>
diff --git a/dmp-frontend/src/app/ui/admin/tenant/editor/tenant-editor.component.ts b/dmp-frontend/src/app/ui/admin/tenant/editor/tenant-editor.component.ts
index a2e83aadf..b3269e787 100644
--- a/dmp-frontend/src/app/ui/admin/tenant/editor/tenant-editor.component.ts
+++ b/dmp-frontend/src/app/ui/admin/tenant/editor/tenant-editor.component.ts
@@ -192,12 +192,20 @@ export class TenantEditorComponent extends BaseEditor<TenantEditorModel, Tenant>
 	// deposit source
 	//
 	addDepositSource(): void {
-		const source: TenantSourceEditorModel = new TenantSourceEditorModel();
-		(this.formGroup.get('config').get('deposit').get('sources') as FormArray).push(source.buildForm());
+		(this.formGroup.get('config').get('deposit').get('sources') as FormArray).push(this.editorModel.createChildDeposit((this.formGroup.get('config').get('deposit').get('sources') as FormArray).length));
 	}
 
 	removeDepositSource(sourceIndex: number): void {
 		(this.formGroup.get('config').get('deposit').get('sources') as FormArray).removeAt(sourceIndex);
+
+		//Reapply validators
+		TenantEditorModel.reApplyDepositSourcesValidators(
+			{
+				formGroup: this.formGroup,
+				validationErrorModel: this.editorModel.validationErrorModel
+			}
+		)
+		this.formGroup.get('config').get('deposit').get('sources').markAsDirty();
 	}
 
 	// deposit source codes
@@ -232,12 +240,20 @@ export class TenantEditorComponent extends BaseEditor<TenantEditorModel, Tenant>
 	// fileTransformers source
 	//
 	addFileSource(): void {
-		const source: TenantSourceEditorModel = new TenantSourceEditorModel();
-		(this.formGroup.get('config').get('fileTransformers').get('sources') as FormArray).push(source.buildForm());
+		(this.formGroup.get('config').get('fileTransformers').get('sources') as FormArray).push(this.editorModel.createChildFileTransformer((this.formGroup.get('config').get('fileTransformers').get('sources') as FormArray).length));			
 	}
 
 	removeFileSource(sourceIndex: number): void {
 		(this.formGroup.get('config').get('fileTransformers').get('sources') as FormArray).removeAt(sourceIndex);
+
+		//Reapply validators
+		TenantEditorModel.reApplyFileTransformerSourcesValidators(
+			{
+				formGroup: this.formGroup,
+				validationErrorModel: this.editorModel.validationErrorModel
+			}
+		)
+		this.formGroup.get('config').get('fileTransformers').get('sources').markAsDirty();
 	}
 
 	// fileTransformers source codes
diff --git a/dmp-frontend/src/app/ui/admin/tenant/editor/tenant-editor.model.ts b/dmp-frontend/src/app/ui/admin/tenant/editor/tenant-editor.model.ts
index 268d4554d..ec5775981 100644
--- a/dmp-frontend/src/app/ui/admin/tenant/editor/tenant-editor.model.ts
+++ b/dmp-frontend/src/app/ui/admin/tenant/editor/tenant-editor.model.ts
@@ -1,4 +1,4 @@
-import { UntypedFormBuilder, UntypedFormGroup, Validators } from "@angular/forms";
+import { UntypedFormArray, UntypedFormBuilder, UntypedFormGroup, Validators } from "@angular/forms";
 import { Tenant, TenantConfig, TenantConfigPersist, TenantDepositConfig, TenantDepositConfigPersist, TenantFileTransformersConfig, TenantFileTransformersConfigPersist, TenantPersist, TenantSource, TenantSourcePersist } from "@app/core/model/tenant/tenant";
 import { BaseEditorModel } from "@common/base/base-form-editor-model";
 import { BackendErrorValidator } from "@common/forms/validation/custom-validator";
@@ -55,6 +55,44 @@ export class TenantEditorModel extends BaseEditorModel implements TenantPersist
 		baseContext.validation = baseValidationArray;
 		return baseContext;
 	}
+
+	createChildDeposit(index: number): UntypedFormGroup {
+		const deposit: TenantSourceEditorModel = new TenantSourceEditorModel(this.validationErrorModel);
+		return deposit.buildForm({ rootPath: 'config.deposit.sources[' + index + '].' });
+	}
+
+	static reApplyDepositSourcesValidators(params: {
+		formGroup: UntypedFormGroup,
+		validationErrorModel: ValidationErrorModel,
+	}): void {
+
+		const { formGroup, validationErrorModel } = params;
+		const control = formGroup?.get('config').get('deposit');
+		TenantDepositConfigEditorModel.reapplySourcesFieldsValidators({
+			formArray: control.get('sources') as UntypedFormArray,
+			rootPath: `config.deposit.`,
+			validationErrorModel: validationErrorModel
+		});
+	}
+
+	createChildFileTransformer(index: number): UntypedFormGroup {
+		const deposit: TenantSourceEditorModel = new TenantSourceEditorModel(this.validationErrorModel);
+		return deposit.buildForm({ rootPath: 'config.fileTransformers.sources[' + index + '].' });
+	}
+
+	static reApplyFileTransformerSourcesValidators(params: {
+		formGroup: UntypedFormGroup,
+		validationErrorModel: ValidationErrorModel,
+	}): void {
+
+		const { formGroup, validationErrorModel } = params;
+		const control = formGroup?.get('config').get('fileTransformers');
+		TenantDepositConfigEditorModel.reapplySourcesFieldsValidators({
+			formArray: control.get('sources') as UntypedFormArray,
+			rootPath: `config.fileTransformers.`,
+			validationErrorModel: validationErrorModel
+		});
+	}
 }
 
 export class TenantConfigEditorModel implements TenantConfigPersist {
@@ -167,6 +205,21 @@ export class TenantDepositConfigEditorModel implements TenantDepositConfigPersis
 		baseContext.validation = baseValidationArray;
 		return baseContext;
 	}
+
+	static reapplySourcesFieldsValidators(params: {
+		formArray: UntypedFormArray,
+		validationErrorModel: ValidationErrorModel,
+		rootPath: string
+	}): void {
+		const { validationErrorModel, rootPath, formArray } = params;
+		formArray?.controls?.forEach(
+			(control, index) => TenantSourceEditorModel.reapplyValidators({
+				formGroup: control as UntypedFormGroup,
+				rootPath: `${rootPath}sources[${index}].`,
+				validationErrorModel: validationErrorModel
+			})
+		);
+	}
 }
 
 export class TenantFileTransformersConfigEditorModel implements TenantFileTransformersConfigPersist {
@@ -294,4 +347,23 @@ export class TenantSourceEditorModel implements TenantSourcePersist {
 		baseContext.validation = baseValidationArray;
 		return baseContext;
 	}
+
+	static reapplyValidators(params: {
+		formGroup: UntypedFormGroup,
+		validationErrorModel: ValidationErrorModel,
+		rootPath: string
+	}): void {
+
+		const { formGroup, rootPath, validationErrorModel } = params;
+		const context = TenantSourceEditorModel.createValidationContext({
+			rootPath,
+			validationErrorModel
+		});
+
+		['url', 'codes', 'issuerUrl', 'clientId', 'clientSecret', 'scope'].forEach(keyField => {
+			const control = formGroup?.get(keyField);
+			control?.clearValidators();
+			control?.addValidators(context.getValidation(keyField).validators);
+		})
+	}
 }
diff --git a/dmp-frontend/src/app/ui/supportive-material-editor/supportive-material-editor.component.html b/dmp-frontend/src/app/ui/supportive-material-editor/supportive-material-editor.component.html
index fc2b9ae43..82e7ea6c5 100644
--- a/dmp-frontend/src/app/ui/supportive-material-editor/supportive-material-editor.component.html
+++ b/dmp-frontend/src/app/ui/supportive-material-editor/supportive-material-editor.component.html
@@ -11,8 +11,8 @@
 									{{enumUtils.toSupportiveMaterialTypeString(type)}}
 								</mat-option>
 							</mat-select>
-							<mat-error *ngIf="formGroup.get('type').hasError('required')">
-								{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+							<mat-error *ngIf="formGroup.get('type').hasError('backendError')">{{formGroup.get('type').getError('backendError').message}}</mat-error>
+							<mat-error *ngIf="formGroup.get('type').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 						</mat-form-field>
 					</div>
 					<div class="col">
@@ -23,8 +23,8 @@
 									{{languageCode}}
 								</mat-option>
 							</mat-select>
-							<mat-error *ngIf="formGroup.get('languageCode').hasError('required')">
-								{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+							<mat-error *ngIf="formGroup.get('languageCode').hasError('backendError')">{{formGroup.get('languageCode').getError('backendError').message}}</mat-error>
+							<mat-error *ngIf="formGroup.get('languageCode').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 						</mat-form-field>
 					</div>
 				</div>
@@ -50,6 +50,8 @@
 						alignleft aligncenter alignright alignjustify | \
 						bullist numlist outdent indent | code codesample | searchreplace | preview | removeformat | help'
 					}" [formControl]="formGroup.get('payload')"></editor>
+					<mat-error *ngIf="formGroup.get('payload').hasError('backendError')">{{formGroup.get('payload').getError('backendError').message}}</mat-error>
+					<mat-error *ngIf="formGroup.get('payload').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
 					</div>
 				</div>
 			</mat-card>