Enhance base input validation (#184)

Icinga · Aug 10, 2023 · f515e9a · f515e9a
2 parents 2bdc270 + 20afc0e
commit f515e9a
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/asset/js/widget/BaseInput.js b/asset/js/widget/BaseInput.js
@@ -10,6 +10,7 @@ define(["../notjQuery", "Completer"], function ($, Completer) {
             this.usedTerms = [];
             this.completer = null;
             this.lastCompletedTerm = null;
+            this.manageRequired = input.required;
             this._dataInput = null;
             this._termInput = null;
             this._termContainer = null;
@@ -147,7 +148,15 @@ define(["../notjQuery", "Completer"], function ($, Completer) {
                 this.togglePlaceholder();
             }
 
-            return this.hasTerms();
+            if (this.hasTerms()) {
+                if (this.manageRequired) {
+                    this.input.required = false;
+                }
+
+                return true;
+            }
+
+            return false;
         }
 
         registerTerms() {
@@ -951,13 +960,19 @@ define(["../notjQuery", "Completer"], function ($, Completer) {
             }
 
             if (this.hasTerms()) {
-                this.input.required = false;
+                if (this.manageRequired) {
+                    this.input.required = false;
+                }
 
                 // This is not part of `onSubmit()` because otherwise it would override what `autoSubmit()` does
                 this.dataInput.value = JSON.stringify({ type: 'submit', terms: this.usedTerms });
-            } else if (typeof this.input.dataset.manageRequired !== 'undefined') {
+
+                return;
+            } else if (this.manageRequired && ! this.hasTerms()) {
                 this.input.required = true;
             }
+
+            this.dataInput.value = '';
         }
 
         onPaste(event) {