Gauge bug fix nasa#6593: Value range and limit indicators and button …

…disable if value is invalid
sinisam92 · Apr 20, 2023 · 18498af · 18498af
1 parent 2820237
commit 18498af
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/src/api/forms/components/FormRow.vue b/src/api/forms/components/FormRow.vue
@@ -131,7 +131,12 @@ export default {
                     && data.value !== '';
             }
 
-            if (this.row.required && !valid) {
+            if (this.row.required && !valid
+                    || data.min < 0
+                    || data.max < data.min
+                    || data.limitLow < data.min
+                    || data.limitHigh > data.max
+                    || data.limitLow > data.limitHigh) {
                 return false;
             }
 

diff --git a/src/plugins/gauge/GaugePlugin.js b/src/plugins/gauge/GaugePlugin.js
@@ -132,7 +132,7 @@ export default function () {
                         "configuration",
                         "gaugeController"
                     ],
-                    validate: ({ value }, callback) => {
+                    validate: (value, callback) => {
                         if (value.isUseTelemetryLimits) {
                             return true;
                         }
@@ -145,11 +145,11 @@ export default function () {
                             limitHigh: true
                         };
 
-                        if (min === '') {
+                        if (min === '' || min < 0) {
                             valid.min = false;
                         }
 
-                        if (max === '') {
+                        if (max === '' || limitHigh > max) {
                             valid.max = false;
                         }
 
@@ -159,7 +159,8 @@ export default function () {
                         }
 
                         if (limitLow !== '') {
-                            valid.limitLow = min <= limitLow && limitLow < max;
+                            valid.limitLow = min <= limitLow || limitLow >= limitHigh;
+
                         }
 
                         if (limitHigh !== '') {

diff --git a/src/plugins/gauge/components/GaugeFormController.vue b/src/plugins/gauge/components/GaugeFormController.vue
@@ -121,7 +121,11 @@ export default {
     methods: {
         onChange(event) {
             let data = {
-                model: {}
+                model: {},
+                min: this.min,
+                max: this.max,
+                limitLow: this.limitLow,
+                limitHigh: this.limitHigh
             };
 
             if (event) {