Remove duplicate error message (#631)

qbicsoftware · Jun 18, 2024 · 6af5380 · 6af5380
1 parent ec2fca1
commit 6af5380
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 8 deletions.
diff --git a/user-interface/src/main/java/life/qbic/datamanager/views/general/HasBinderValidation.java b/user-interface/src/main/java/life/qbic/datamanager/views/general/HasBinderValidation.java
@@ -8,8 +8,8 @@
 import com.vaadin.flow.data.binder.ValidationResult;
 
 /**
- * Mixin interface for components that provide a binder for validation.
- * Sets properties for invalid state and error message string to show when invalid.
+ * Mixin interface for components that provide a binder for validation. Sets properties for invalid
+ * state and error message string to show when invalid.
  */
 public interface HasBinderValidation<T> extends HasValidationProperties {
 
@@ -48,15 +48,30 @@ default HasBinderValidation<T> validate() {
     requireNonNull(getBinder(), "getBinder() must not be null");
     BinderValidationStatus<T> validationStatus = getBinder().validate();
     setInvalid(validationStatus.hasErrors());
-    setErrorMessage(validationStatus
-        .getValidationErrors().stream()
-        .filter(it -> !it.getErrorMessage().isBlank())
-        .findFirst()
-        .map(ValidationResult::getErrorMessage)
-        .orElse(getDefaultErrorMessage()));
+    if (useBinderErrorMessage()) {
+      setErrorMessage(validationStatus
+          .getValidationErrors().stream()
+          .filter(it -> !it.getErrorMessage().isBlank())
+          .findFirst()
+          .map(ValidationResult::getErrorMessage)
+          .orElse(getDefaultErrorMessage()));
+    } else {
+      setErrorMessage(getDefaultErrorMessage());
+    }
     return this;
   }
 
+  /**
+   * True if the binder error message should be used. If false, then the default error message is
+   * used always.
+   *
+   * @return true if the binder error message is used; false if the default error message is used
+   * only.
+   */
+  default boolean useBinderErrorMessage() {
+    return true;
+  }
+
   /**
    * Missing method from HasValidationProperties. Indiates whether this is marked as invalid.
    * <p>

diff --git a/...e/src/main/java/life/qbic/datamanager/views/general/contact/AutocompleteContactField.java b/...e/src/main/java/life/qbic/datamanager/views/general/contact/AutocompleteContactField.java
@@ -178,6 +178,16 @@ public Contact getEmptyValue() {
     return new Contact(nameField.getEmptyValue(), emailField.getEmptyValue());
   }
 
+  @Override
+  public String getDefaultErrorMessage() {
+    return ""; // we do not show an error message on this field as this is part of the contained fields.
+  }
+
+  @Override
+  public boolean useBinderErrorMessage() {
+    return false;
+  }
+
   @Override
   public Binder<Contact> getBinder() {
     return binder;