From 3b2a71ec96523a7dbbcbf99331fa0a98586f6ef7 Mon Sep 17 00:00:00 2001
From: Sonja Happ <sonja.happ@eonerc.rwth-aachen.de>
Date: Fri, 27 Mar 2020 14:20:21 +0100
Subject: [PATCH] unit appears for value widget even if no data is available

---
 .../edit-widget-control-creator.js            |  2 +-
 .../edit-widget/edit-widget-signal-control.js |  2 +-
 src/widget/widgets/value.js                   | 21 +++++++++++--------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/widget/edit-widget/edit-widget-control-creator.js b/src/widget/edit-widget/edit-widget-control-creator.js
index 0b1ac15..7951ab2 100644
--- a/src/widget/edit-widget/edit-widget-control-creator.js
+++ b/src/widget/edit-widget/edit-widget-control-creator.js
@@ -52,7 +52,7 @@ export default function CreateControls(widgetType = null, widget = null, session
             break;
         case 'Value':
             DialogControls.push(
-                <EditWidgetTextControl key={0} widget={widget} controlId={'name'} label={'Text'} placeholder={'Enter text'} handleChange={e => handleChange(e)} />,
+                <EditWidgetTextControl key={0} widget={widget} controlId={'name'} label={'Signal name'} placeholder={'Enter text'} handleChange={e => handleChange(e)} />,
                 <EditWidgetSignalControl key={1} widget={widget} controlId={'signalIDs'} signals={signals} handleChange={(e) => handleChange(e)} />,
                 <EditWidgetTextSizeControl key={2} widget={widget} handleChange={e => handleChange(e)} />,
                 <EditWidgetCheckboxControl key={3} widget={widget} controlId={'customProperties.showUnit'} text="Show unit" handleChange={e => handleChange(e)} />
diff --git a/src/widget/edit-widget/edit-widget-signal-control.js b/src/widget/edit-widget/edit-widget-signal-control.js
index e87c689..b7d8da6 100644
--- a/src/widget/edit-widget/edit-widget-signal-control.js
+++ b/src/widget/edit-widget/edit-widget-signal-control.js
@@ -47,7 +47,7 @@ class EditWidgetSignalControl extends Component {
 
     return (
         <FormGroup controlId="signal">
-          <FormLabel>Signal</FormLabel>
+          <FormLabel>Select signal</FormLabel>
           <FormControl as="select" placeholder="Select signal" value={this.props.widget.signalIDs[0]} onChange={(e) => this.handleSignalChange(e)}>
             {
               this.props.signals.length === 0 ? (
diff --git a/src/widget/widgets/value.js b/src/widget/widgets/value.js
index 91756fa..c44a4fe 100644
--- a/src/widget/widgets/value.js
+++ b/src/widget/widgets/value.js
@@ -37,11 +37,18 @@ class WidgetValue extends Component {
     const ICid = props.icIDs[0];
 
     // update value
+    let value = '';
     if (props.data == null
       || props.data[ICid] == null
       || props.data[ICid].output == null
       || props.data[ICid].output.values == null) {
-      return{ value: '' };
+      value = '';
+    } else {
+      // check if value has changed
+      const signalData = props.data[ICid].output.values[signal.index];
+      if (signalData != null && state.value !== signalData[signalData.length - 1].y) {
+        value = signalData[signalData.length - 1].y
+      }
     }
 
     // Update unit (assuming there is exactly one signal for this widget)
@@ -52,14 +59,10 @@ class WidgetValue extends Component {
       unit = signal.unit;
     }
 
-    // check if value has changed
-    const signalData = props.data[ICid].output.values[signal.index];
-    if (signalData != null && state.value !== signalData[signalData.length - 1].y) {
-      return {
-        value: signalData[signalData.length - 1].y,
-        unit: unit,
-      };
-    }
+    return {
+      value: value,
+      unit: unit,
+    };
 
   }