[Gauge plugin] Addresses identified issues (nasa#6593)

fix: OK button not properly disabling when data is invalid note: (implementation works around the broken validation mechanism)
TheFuturist32 · Apr 12, 2024 · 4c00e1c · 4c00e1c
1 parent 82ac311
commit 4c00e1c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/src/api/forms/components/FormRow.vue b/src/api/forms/components/FormRow.vue
@@ -120,9 +120,13 @@ export default {
         valid = regex.test(data.value);
       }
 
-      const validate = data.model.validate;
-      if (valid && validate) {
-        valid = validate(data);
+      if (data.isValid !== undefined && data.isValid !== null && !data.isValid) {
+        return false;
+      } else {
+        const validate = data.model.validate;
+        if (valid && validate) {
+          valid = validate(data);
+        }
       }
 
       return Boolean(valid);

diff --git a/src/plugins/gauge/components/GaugeFormController.vue b/src/plugins/gauge/components/GaugeFormController.vue
@@ -117,7 +117,8 @@ export default {
         min: this.min,
         max: this.max,
         limitLow: this.limitLow,
-        limitHigh: this.limitHigh
+        limitHigh: this.limitHigh,
+        isValid: true
       };
 
       if (event) {
@@ -132,6 +133,10 @@ export default {
 
         this.model.validate(data, (valid) => {
           Object.entries(valid).forEach(([key, isValid]) => {
+            if (!isValid) {
+              data.isValid = false;
+            }
+
             const element = this.$refs[key];
             const reqIndicatorElement = element.parentElement.querySelector('.req-indicator');
             reqIndicatorElement.classList.toggle('invalid', !isValid);