From a3350b2f2c40a083c045baa035274064152a05d6 Mon Sep 17 00:00:00 2001
From: amentis <amentis@cite.gr>
Date: Tue, 23 Apr 2024 18:52:41 +0300
Subject: [PATCH] fix description checkBox bug and add hash conflict to
 callback errors

---
 .../model/persist/descriptionproperties/FieldPersist.java      | 2 +-
 .../components/form-field/form-field.component.ts              | 3 +++
 dmp-frontend/src/common/base/base-editor.ts                    | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptionproperties/FieldPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptionproperties/FieldPersist.java
index 88abd5a5f..bf5506efa 100644
--- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptionproperties/FieldPersist.java
+++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/descriptionproperties/FieldPersist.java
@@ -113,7 +113,7 @@ public class FieldPersist {
 	        boolean required = this.fieldEntity != null && this.fieldEntity.getValidations() != null ? this.fieldEntity.getValidations().contains(FieldValidationType.Required) : false;
             return Arrays.asList(
                     this.spec()
-                            .iff(()-> FieldType.isTextType(fieldType) && DescriptionStatus.Finalized.equals(this.status) && required)
+                            .iff(()-> FieldType.isTextType(fieldType) && !fieldType.equals(FieldType.CHECK_BOX) && DescriptionStatus.Finalized.equals(this.status) && required)
                             .must(() -> !this.isEmpty(item.getTextValue()))
                             .failOn(FieldPersist._textValue).failWith(messageSource.getMessage("Validation_Required", new Object[]{FieldPersist._textValue}, LocaleContextHolder.getLocale())),
                     this.spec()
diff --git a/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field/form-field.component.ts b/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field/form-field.component.ts
index e378cc7dc..0b7f93b1d 100644
--- a/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field/form-field.component.ts
+++ b/dmp-frontend/src/app/ui/description/editor/description-form/components/form-field/form-field.component.ts
@@ -163,6 +163,9 @@ export class DescriptionFormFieldComponent extends BaseComponent implements OnIn
 				// 	this.form.disable();
 				// }
 				break;
+			case DescriptionTemplateFieldType.CHECK_BOX:
+				if (this.propertiesFormGroup?.get(this.field.id).get('textValue').value == "false") this.propertiesFormGroup?.get(this.field.id).get('textValue').setValue(undefined);
+				break;
 		}
 
 		// this.form = this.visibilityRulesService.getFormGroup(this.field.id);
diff --git a/dmp-frontend/src/common/base/base-editor.ts b/dmp-frontend/src/common/base/base-editor.ts
index 98260c44f..54f7c672a 100644
--- a/dmp-frontend/src/common/base/base-editor.ts
+++ b/dmp-frontend/src/common/base/base-editor.ts
@@ -132,6 +132,9 @@ export abstract class BaseEditor<EditorModelType extends BaseEditorModel, Entity
 		const error: HttpError = this.httpErrorHandlingService.getError(errorResponse);
 		if (error.statusCode === 400) {
 			this.editorModel.validationErrorModel.fromJSONObject(errorResponse.error);
+			if(errorResponse.error.code === ResponseErrorCode.HashConflict){
+				this.uiNotificationService.snackBarNotification(errorResponse.error.error, SnackBarNotificationLevel.Error);
+			}
 			if(errorResponse.error.code === ResponseErrorCode.DmpBlueprintHasNoDescriptionTemplates){
 				this.uiNotificationService.snackBarNotification(errorResponse.error.error, SnackBarNotificationLevel.Error);
 			}