Merge pull request #167 from CWolfs/bugfix/CT-166-fixed-viewable-logi…

…c-empty-viewlabel-showing-value Fixed empty viewLabel showing value instead of nothing
CWolfs · Jun 5, 2023 · 3135882 · 3135882
2 parents 4d7ac68 + edb715d
commit 3135882
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/app/src/components/ViewableLogic/ViewableLogic.tsx b/app/src/components/ViewableLogic/ViewableLogic.tsx
@@ -53,14 +53,15 @@ function ViewableLogic({ logic }: Props) {
 
           const { value: valueFromArg } = argValue;
           let displayValue = valueFromArg;
-          if (viewLabel) {
+
+          if (viewLabel != null) {
             if (viewLabel.includes('{value}')) {
               if (!displayValue) {
                 return displayValue;
               }
               displayValue = viewLabel.replace('{value}', displayValue.toString());
             } else {
-              displayValue = viewLabel;
+              displayValue = viewLabel.trim();
             }
           }
 
@@ -73,12 +74,14 @@ function ViewableLogic({ logic }: Props) {
 
             if (inputVal) {
               displayValue = inputVal.text;
-              if (inputVal.viewLabel) {
+
+              if (inputVal.viewLabel != null) {
                 const inputValueViewLabel = inputVal.viewLabel;
+
                 if (inputValueViewLabel.includes('{value}')) {
                   displayValue = inputValueViewLabel.replace('{value}', displayValue);
                 } else {
-                  displayValue = inputVal.viewLabel;
+                  displayValue = inputVal.viewLabel.trim();
                 }
               }
             }