Commit 66066904fb3d84d3a4b540edc70b8337fbc37196
1 parent
b86e377b
UI: Widgets: Fix latest values processing.
Showing
2 changed files
with
11 additions
and
8 deletions
... | ... | @@ -266,7 +266,7 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic |
266 | 266 | type: types.dataKeyType.timeseries, |
267 | 267 | onData: function (data) { |
268 | 268 | if (data.data) { |
269 | - onData(data.data, types.dataKeyType.timeseries, null, null, true); | |
269 | + onData(data.data, types.dataKeyType.timeseries, true); | |
270 | 270 | } |
271 | 271 | }, |
272 | 272 | onReconnected: function() {} |
... | ... | @@ -310,7 +310,7 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic |
310 | 310 | subscriber.onReconnected = function() {} |
311 | 311 | subscriber.onData = function(data) { |
312 | 312 | if (data.data) { |
313 | - onData(data.data, types.dataKeyType.timeseries, null, null, true); | |
313 | + onData(data.data, types.dataKeyType.timeseries, true); | |
314 | 314 | } |
315 | 315 | } |
316 | 316 | } |
... | ... | @@ -333,7 +333,7 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic |
333 | 333 | type: types.dataKeyType.attribute, |
334 | 334 | onData: function (data) { |
335 | 335 | if (data.data) { |
336 | - onData(data.data, types.dataKeyType.attribute, null, null, true); | |
336 | + onData(data.data, types.dataKeyType.attribute, true); | |
337 | 337 | } |
338 | 338 | }, |
339 | 339 | onReconnected: function() {} |
... | ... | @@ -372,8 +372,8 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic |
372 | 372 | |
373 | 373 | function createRealtimeDataAggregator(subsTw, tsKeyNames, dataKeyType) { |
374 | 374 | return new DataAggregator( |
375 | - function(data, startTs, endTs, apply) { | |
376 | - onData(data, dataKeyType, startTs, endTs, apply); | |
375 | + function(data, apply) { | |
376 | + onData(data, dataKeyType, apply); | |
377 | 377 | }, |
378 | 378 | tsKeyNames, |
379 | 379 | subsTw.startTs, |
... | ... | @@ -541,7 +541,7 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic |
541 | 541 | } |
542 | 542 | } |
543 | 543 | |
544 | - function onData(sourceData, type, startTs, endTs, apply) { | |
544 | + function onData(sourceData, type, apply) { | |
545 | 545 | for (var keyName in sourceData) { |
546 | 546 | var keyData = sourceData[keyName]; |
547 | 547 | var key = keyName + '_' + type; |
... | ... | @@ -553,6 +553,7 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic |
553 | 553 | var data = []; |
554 | 554 | var prevSeries; |
555 | 555 | var datasourceKeyData; |
556 | + var update = false; | |
556 | 557 | if (realtime) { |
557 | 558 | datasourceKeyData = []; |
558 | 559 | } else { |
... | ... | @@ -576,6 +577,7 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic |
576 | 577 | data.push(series); |
577 | 578 | prevSeries = series; |
578 | 579 | } |
580 | + update = true; | |
579 | 581 | } else if (datasourceSubscription.type === types.widgetType.latest.value) { |
580 | 582 | if (keyData.length > 0) { |
581 | 583 | series = keyData[0]; |
... | ... | @@ -586,9 +588,10 @@ function DatasourceSubscription(datasourceSubscription, telemetryWebsocketServic |
586 | 588 | } |
587 | 589 | series = [time, value]; |
588 | 590 | data.push(series); |
591 | + update = true; | |
589 | 592 | } |
590 | 593 | } |
591 | - if (data || (startTs && endTs)) { | |
594 | + if (update) { | |
592 | 595 | datasourceData[datasourceKey].data = data; |
593 | 596 | for (var i2 in listeners) { |
594 | 597 | var listener = listeners[i2]; | ... | ... |