Merge pull request #256 from FlowFuse/145-chart-x-0

Better checking of x value before datetime assignment
FlowFuse · Oct 10, 2023 · d4f9f10 · d4f9f10
2 parents 9005e0f + 1a0e9bd
commit d4f9f10
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/nodes/widgets/ui_chart.js b/nodes/widgets/ui_chart.js
@@ -38,7 +38,11 @@ module.exports = function (RED) {
                         datapoint.y = payload
                     } else if (typeof payload === 'object' && 'y' in payload) {
                         // may have been given an x/y object already
-                        datapoint.x = payload.x || (new Date()).getTime()
+                        let x = payload.x
+                        if (x === undefined || x === null) {
+                            x = (new Date()).getTime()
+                        }
+                        datapoint.x = x
                         datapoint.y = payload.y
                     }
                     return datapoint