Fixing an issue where falsey values where masked by the GDS UI

nasa · Oct 4, 2023 · f2f7fd1 · f2f7fd1
1 parent 89a28c8
commit f2f7fd1
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/fprime_gds/flask/static/addons/channel-render/channel-render.js b/src/fprime_gds/flask/static/addons/channel-render/channel-render.js
@@ -107,7 +107,13 @@ Vue.component("channel-render", {
          * @returns: display text of item/child item
          */
         displayText() {
-            return this.item?.display_text || this.item?.val || this.val || "";
+            let possibles = [this.item?.display_text, this.item?.val, this.val];
+            for (let i = 0; i < possibles.length; i++) {
+                if (typeof(possibles[i]) !== "undefined" && possibles[i] !== null) {
+                    return possibles[i];
+                }
+            }
+            return "";
         }
 
     }
@@ -120,4 +126,4 @@ let channel_row_data = {
 /**
  * channel-row replaces fp-row in display template only.
  */
-Vue.component("channel-row", channel_row_data);
+Vue.component("channel-row", channel_row_data);