From bc9691fa5dd895d179471d91e3ff5b1201112c8c Mon Sep 17 00:00:00 2001
From: amentis <amentis@cite.gr>
Date: Wed, 7 Feb 2024 10:15:06 +0200
Subject: [PATCH] description templates validation small changes

---
 .../description-template-editor-field.component.html      | 5 +++--
 .../editor/description-template-editor.component.ts       | 8 ++++----
 .../editor/description-template-editor.model.ts           | 4 ++++
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/dmp-frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.html b/dmp-frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.html
index b90307448..e8aaad790 100644
--- a/dmp-frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.html
+++ b/dmp-frontend/src/app/ui/admin/description-template/editor/components/field/description-template-editor-field.component.html
@@ -166,8 +166,9 @@
 				</mat-optgroup>
 
 			</mat-select>
-			<!-- <mat-error *ngIf="this.form.get('data').get('fieldType').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error> -->
-			<mat-error>{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+			<mat-error *ngIf="this.form.get('data').get('fieldType').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
+			<mat-error *ngIf="form.get('data').get('fieldType').hasError('backendError')">{{form.get('data').get('fieldType').getError('backendError').message}}</mat-error> 
+			<!-- <mat-error>{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error> -->
 			<!-- <mat-error *ngIf="this.form.hasError('inputTypeNotValid')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error> -->
 
 		</mat-form-field>
diff --git a/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.ts b/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.ts
index 104b426a1..027bc2fd4 100644
--- a/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.ts
+++ b/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.ts
@@ -172,10 +172,10 @@ export class DescriptionTemplateEditorComponent extends BaseEditor<DescriptionTe
 		this.formGroup = this.editorModel.buildForm(null, this.isDeleted || !this.authService.hasPermission(AppPermission.EditDescriptionTemplate));
 		//this.selectedSystemFields = this.selectedSystemFieldDisabled();
 		this.descriptionTemplateEditorService.setValidationErrorModel(this.editorModel.validationErrorModel);
-		DescriptionTemplateEditorModel.reApplyDefinitionValidators({
-			formGroup: this.formGroup,
-			validationErrorModel: this.editorModel.validationErrorModel
-		});
+		// DescriptionTemplateEditorModel.reApplyDefinitionValidators({
+		// 	formGroup: this.formGroup,
+		// 	validationErrorModel: this.editorModel.validationErrorModel
+		// });
 		if (this.editorModel.status == DescriptionTemplateStatus.Finalized || this.isDeleted) {
 			this.formGroup.disable();
 		}
diff --git a/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.model.ts b/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.model.ts
index d13b2b195..09a8546b3 100644
--- a/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.model.ts
+++ b/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.model.ts
@@ -872,18 +872,21 @@ export class DescriptionTemplateFieldEditorModel implements DescriptionTemplateF
 						rootPath: `${rootPath}data.`,
 						validationErrorModel: validationErrorModel
 					});
+					break;
 				case DescriptionTemplateFieldType.RADIO_BOX:
 					DescriptionTemplateRadioBoxDataEditorModel.reapplyRadioBoxValidators({
 						formGroup: formGroup?.get('data') as UntypedFormGroup,
 						rootPath: `${rootPath}data.`,
 						validationErrorModel: validationErrorModel
 					});
+					break;
 				case DescriptionTemplateFieldType.SELECT:
 					DescriptionTemplateSelectDataEditorModel.reapplySelectValidators({
 						formGroup: formGroup?.get('data') as UntypedFormGroup,
 						rootPath: `${rootPath}data.`,
 						validationErrorModel: validationErrorModel
 					});
+					break;
 				case DescriptionTemplateFieldType.EXTERNAL_SELECT:
 					DescriptionTemplateExternalSelectDataEditorModel.reapplyValidators({
 						formGroup: formGroup?.get('data') as UntypedFormGroup,
@@ -896,6 +899,7 @@ export class DescriptionTemplateFieldEditorModel implements DescriptionTemplateF
 						rootPath: `${rootPath}data.`,
 						validationErrorModel: validationErrorModel
 					});
+					break;
 					
 			}
 		}