Version set to 1.1.1-SNAPSHOT. UI Widgets: Performance improvements, timeseries zoom support.

10 years ago · cf22f6a4b3
26 changed files with 133 additions and 81 deletions
--- a/application/pom.xml
+++ b/application/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <groupId>org.thingsboard</groupId>
--- a/common/data/pom.xml
+++ b/common/data/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
        <artifactId>common</artifactId>
    </parent>
    <groupId>org.thingsboard.common</groupId>
--- a/common/message/pom.xml
+++ b/common/message/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
        <artifactId>common</artifactId>
    </parent>
    <groupId>org.thingsboard.common</groupId>
--- a/common/pom.xml
+++ b/common/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <groupId>org.thingsboard</groupId>
--- a/common/transport/pom.xml
+++ b/common/transport/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
        <artifactId>common</artifactId>
    </parent>
    <groupId>org.thingsboard.common</groupId>
--- a/dao/pom.xml
+++ b/dao/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <groupId>org.thingsboard</groupId>
--- a/dao/src/main/resources/system-data.cql
+++ b/dao/src/main/resources/system-data.cql
--- a/extensions-api/pom.xml
+++ b/extensions-api/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <groupId>org.thingsboard</groupId>
--- a/extensions-core/pom.xml
+++ b/extensions-core/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <groupId>org.thingsboard</groupId>
--- a/extensions/extension-kafka/pom.xml
+++ b/extensions/extension-kafka/pom.xml
@ -22,7 +22,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
        <artifactId>extensions</artifactId>
    </parent>
    <groupId>org.thingsboard.extensions</groupId>
--- a/extensions/extension-rabbitmq/pom.xml
+++ b/extensions/extension-rabbitmq/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
        <artifactId>extensions</artifactId>
    </parent>
    <groupId>org.thingsboard.extensions</groupId>
--- a/extensions/extension-rest-api-call/pom.xml
+++ b/extensions/extension-rest-api-call/pom.xml
@ -22,7 +22,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
        <artifactId>extensions</artifactId>
    </parent>
    <groupId>org.thingsboard.extensions</groupId>
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <groupId>org.thingsboard</groupId>
--- a/pom.xml
+++ b/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.thingsboard</groupId>
    <artifactId>thingsboard</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1-SNAPSHOT</version>
    <packaging>pom</packaging>

    <name>Thingsboard</name>
--- a/tools/pom.xml
+++ b/tools/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <groupId>org.thingsboard</groupId>
--- a/transport/coap/pom.xml
+++ b/transport/coap/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
        <artifactId>transport</artifactId>
    </parent>
    <groupId>org.thingsboard.transport</groupId>
--- a/transport/http/pom.xml
+++ b/transport/http/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
        <artifactId>transport</artifactId>
    </parent>
    <groupId>org.thingsboard.transport</groupId>
--- a/transport/mqtt/pom.xml
+++ b/transport/mqtt/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
        <artifactId>transport</artifactId>
    </parent>
    <groupId>org.thingsboard.transport</groupId>
--- a/transport/pom.xml
+++ b/transport/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <groupId>org.thingsboard</groupId>
--- a/ui/pom.xml
+++ b/ui/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>1.1.0</version>
+        <version>1.1.1-SNAPSHOT</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <groupId>org.thingsboard</groupId>
--- a/ui/src/app/api/datasource.service.js
+++ b/ui/src/app/api/datasource.service.js
@ -61,7 +61,7 @@ function DatasourceService($timeout, $log, telemetryWebsocketService, types, uti
        };

        if (listener.widget.type === types.widgetType.timeseries.value) {
-            datasourceSubscription.subscriptionTimewindow = listener.subscriptionTimewindow;
+            datasourceSubscription.subscriptionTimewindow = angular.copy(listener.subscriptionTimewindow);
        }
        if (datasourceSubscription.datasourceType === types.datasourceType.device) {
            datasourceSubscription.deviceId = listener.deviceId;
--- a/ui/src/app/api/telemetry-websocket.service.js
+++ b/ui/src/app/api/telemetry-websocket.service.js
@ -220,7 +220,7 @@ function TelemetryWebsocketService($rootScope, $websocket, $timeout, $window, ty
        dataStream.onError(onError);
        dataStream.onOpen(onOpen);
        dataStream.onClose(onClose);
-        dataStream.onMessage(onMessage);
+        dataStream.onMessage(onMessage, {autoApply: false});
    }

    function closeSocket() {
--- a/ui/src/app/components/dashboard.directive.js
+++ b/ui/src/app/components/dashboard.directive.js
@ -164,13 +164,14 @@ function DashboardController($scope, $rootScope, $element, $timeout, $log, toast
    gridsterParent = $('#gridster-parent', $element);
    gridsterElement = angular.element($('#gridster-child', gridsterParent));

-    gridsterParent.scroll(function () {
+    //TODO: widgets visibility
+    /*gridsterParent.scroll(function () {
        updateVisibleRect();
    });

    gridsterParent.resize(function () {
        updateVisibleRect();
-    });
+    });*/

    $scope.$watch('vm.isMobile', function () {
        vm.gridsterOpts.isMobile = vm.isMobileDisabled ? false : vm.isMobile;
@ -188,7 +189,8 @@ function DashboardController($scope, $rootScope, $element, $timeout, $log, toast
            gridster.columns = vm.columns;
            updateGridsterParams();
        }
-        updateVisibleRect();
+        //TODO: widgets visibility
+        //updateVisibleRect();
    });

    $scope.$watch('vm.margins', function () {
@ -197,7 +199,8 @@ function DashboardController($scope, $rootScope, $element, $timeout, $log, toast
            gridster.margins = vm.margins;
            updateGridsterParams();
        }
-        updateVisibleRect();
+        //TODO: widgets visibility
+        //updateVisibleRect();
    });

    $scope.$watch('vm.isEdit', function () {
@ -213,7 +216,8 @@ function DashboardController($scope, $rootScope, $element, $timeout, $log, toast
    $scope.$on('gridster-resized', function (event, sizes, theGridster) {
        if (checkIsLocalGridsterElement(theGridster)) {
            gridster = theGridster;
-            updateVisibleRect(false, true);
+            //TODO: widgets visibility
+            //updateVisibleRect(false, true);
        }
    });

@ -225,9 +229,10 @@ function DashboardController($scope, $rootScope, $element, $timeout, $log, toast
            } else {
                vm.gridsterOpts.rowHeight = 'match';
            }
-            $timeout(function () {
+            //TODO: widgets visibility
+            /*$timeout(function () {
                updateVisibleRect(true);
-            }, 500, false);
+            }, 500, false);*/
        }
    });

@ -283,7 +288,8 @@ function DashboardController($scope, $rootScope, $element, $timeout, $log, toast
        }
    }

-    function updateVisibleRect (force, containerResized) {
+    //TODO: widgets visibility
+    /*function updateVisibleRect (force, containerResized) {
        if (gridster) {
            var position = $(gridster.$element).position()
            if (position) {
@ -321,7 +327,7 @@ function DashboardController($scope, $rootScope, $element, $timeout, $log, toast
                }
            }
        }
-    }
+    }*/

    function checkIsLocalGridsterElement (gridster) {
        return gridsterElement[0] == gridster.$element[0];
--- a/ui/src/app/components/widget.controller.js
+++ b/ui/src/app/components/widget.controller.js
@ -44,16 +44,18 @@ export default function WidgetController($scope, $timeout, $window, $element, $q
    var targetDeviceAliasId = null;
    var targetDeviceId = null;

-    var visible = false;

-    var bounds = {top: 0, left: 0, bottom: 0, right: 0};
+    //var bounds = {top: 0, left: 0, bottom: 0, right: 0};
+    //TODO: widgets visibility
+    /*var visible = false;*/
+
    var lastWidth, lastHeight;
    var containerParent = $($element);
    var container = $('#container', $element);
    var containerElement = container[0];
    var inited = false;

-    var gridsterItemElement;
+   // var gridsterItemElement;
    var timer;

    var init = fns.init || function () {
@ -160,18 +162,20 @@ export default function WidgetController($scope, $timeout, $window, $element, $q
    };

    vm.gridsterItemInitialized = gridsterItemInitialized;
-    vm.visibleRectChanged = visibleRectChanged;
-
-    function gridsterItemInitialized(item) {
-        if (item) {
-            gridsterItemElement = $(item.$element);
-            updateVisibility();
-        }
-    }
+    //TODO: widgets visibility
+    /*vm.visibleRectChanged = visibleRectChanged;

    function visibleRectChanged(newVisibleRect) {
        visibleRect = newVisibleRect;
        updateVisibility();
+    }*/
+
+    function gridsterItemInitialized(item) {
+        if (item) {
+           // gridsterItemElement = $(item.$element);
+            //updateVisibility();
+            onRedraw();
+        }
    }

    initWidget();
@ -282,7 +286,8 @@ export default function WidgetController($scope, $timeout, $window, $element, $q
        }
    }

-    function updateVisibility(forceRedraw) {
+    //TODO: widgets visibility
+    /*function updateVisibility(forceRedraw) {
        if (visibleRect) {
            forceRedraw = forceRedraw || visibleRect.containerResized;
            var newVisible = false;
@ -306,21 +311,49 @@ export default function WidgetController($scope, $timeout, $window, $element, $q
                onRedraw(50);
            }
        }
-    }
+    }*/

    function updateBounds() {
-        bounds = {
+        /*bounds = {
            top: widget.row,
            left: widget.col,
            bottom: widget.row + widget.sizeY,
            right: widget.col + widget.sizeX
        };
-        updateVisibility(true);
+        updateVisibility(true);*/
+        onRedraw();
    }

+    var originalTimewindow;

-    function onRedraw(delay, dataUpdate) {
-        //TODO:
+    var timewindowFunctions = {
+        onUpdateTimewindow: onUpdateTimewindow,
+        onResetTimewindow: onResetTimewindow
+    };
+
+    function onResetTimewindow() {
+        if (originalTimewindow) {
+            widget.config.timewindow = angular.copy(originalTimewindow);
+            originalTimewindow = null;
+        }
+    }
+
+    function onUpdateTimewindow(startTimeMs, endTimeMs) {
+        if (!originalTimewindow) {
+            originalTimewindow = angular.copy(widget.config.timewindow);
+        }
+        widget.config.timewindow = {
+            history: {
+                fixedTimewindow: {
+                    startTimeMs: startTimeMs,
+                    endTimeMs: endTimeMs
+                }
+            }
+        };
+    }
+
+    function onRedraw(delay, dataUpdate, tickUpdate) {
+        //TODO: widgets visibility
        /*if (!visible) {
            return;
        }*/
@ -344,7 +377,7 @@ export default function WidgetController($scope, $timeout, $window, $element, $q

            if (width > 20 && height > 20) {
                if (!inited) {
-                    init(containerElement, widget.config.settings, widget.config.datasources, data, $scope, controlApi);
+                    init(containerElement, widget.config.settings, widget.config.datasources, data, $scope, controlApi, timewindowFunctions);
                    inited = true;
                }
                if (widget.type === types.widgetType.timeseries.value) {
@ -360,7 +393,7 @@ export default function WidgetController($scope, $timeout, $window, $element, $q
                        timeWindow.minTime = subscriptionTimewindow.fixedWindow.startTimeMs;
                    }
                }
-                redraw(containerElement, width, height, data, timeWindow, sizeChanged, $scope);
+                redraw(containerElement, width, height, data, timeWindow, sizeChanged, $scope, dataUpdate, tickUpdate);
            }
        }, delay, false);
    }
@ -406,11 +439,12 @@ export default function WidgetController($scope, $timeout, $window, $element, $q
                var listener = datasourceListeners[i];
                datasourceService.unsubscribeFromDatasource(listener);
            }
+            datasourceListeners = [];
        }
    }

    function onTick() {
-        onRedraw();
+        onRedraw(0, false, true);
        timer = $timeout(onTick, 1000, false);
    }

--- a/ui/src/app/components/widget.directive.js
+++ b/ui/src/app/components/widget.directive.js
@ -29,17 +29,19 @@ function Widget($controller, $compile, widgetService) {
        scope: true,
        link: function (scope, elem, attrs) {

-            var widgetController;
            var locals = scope.$eval(attrs.locals);
            var widget = locals.widget;
+
+            var widgetController;
            var gridsterItem;

-            scope.$on('visibleRectChanged', function (event, newVisibleRect) {
+            //TODO: widgets visibility
+            /*scope.$on('visibleRectChanged', function (event, newVisibleRect) {
                locals.visibleRect = newVisibleRect;
                if (widgetController) {
                    widgetController.visibleRectChanged(newVisibleRect);
                }
-            });
+            });*/

            scope.$on('gridster-item-initialized', function (event, item) {
                gridsterItem = item;
@ -125,6 +127,7 @@ function Widget($controller, $compile, widgetService) {
                    "deviceAliasList"];

                widgetController = $controller(controllerFunction, locals);
+
                if (gridsterItem) {
                    widgetController.gridsterItemInitialized(gridsterItem);
                }
--- a/ui/src/app/widget/lib/map-widget.js
+++ b/ui/src/app/widget/lib/map-widget.js
@ -31,6 +31,7 @@ export default class TbMapWidget {
        }
        this.locationsSettings = [];
        this.varsRegex = /\$\{([^\}]*)\}/g;
+        this.tooltipsUpdated = false;

        if (settings.defaultZoomLevel) {
            if (settings.defaultZoomLevel > 0 && settings.defaultZoomLevel < 21) {
@ -169,7 +170,7 @@ export default class TbMapWidget {

    }

-    redraw(data, sizeChanged) {
+    redraw(data, sizeChanged, dataUpdate) {

        var tbMap = this;

@ -406,7 +407,7 @@ export default class TbMapWidget {
            if (data) {
                if (!this.locations) {
                    loadLocations(data);
-                } else {
+                } else if (dataUpdate) {
                    updateLocations(data);
                }
            }
@ -426,29 +427,31 @@ export default class TbMapWidget {
                }
            }

-            var tooltips = this.map.getTooltips();
-
-            for (var t in tooltips) {
-                var tooltip = tooltips[t];
-                var text = tooltip.pattern;
-                var replaceInfo = tooltip.replaceInfo;
-                for (var v in replaceInfo.variables) {
-                    var variableInfo = replaceInfo.variables[v];
-                    var txtVal = '';
-                    if (variableInfo.dataKeyIndex > -1) {
-                        var varData = data[variableInfo.dataKeyIndex].data;
-                        if (varData.length > 0) {
-                            var val = varData[varData.length-1][1];
-                            if (isNumber(val)) {
-                                txtVal = padValue(val, variableInfo.valDec, 0);
-                            } else {
-                                txtVal = val;
+            if (!this.tooltipsUpdated || dataUpdate) {
+                this.tooltipsUpdated = true;
+                var tooltips = this.map.getTooltips();
+                for (var t in tooltips) {
+                    var tooltip = tooltips[t];
+                    var text = tooltip.pattern;
+                    var replaceInfo = tooltip.replaceInfo;
+                    for (var v in replaceInfo.variables) {
+                        var variableInfo = replaceInfo.variables[v];
+                        var txtVal = '';
+                        if (variableInfo.dataKeyIndex > -1) {
+                            var varData = data[variableInfo.dataKeyIndex].data;
+                            if (varData.length > 0) {
+                                var val = varData[varData.length - 1][1];
+                                if (isNumber(val)) {
+                                    txtVal = padValue(val, variableInfo.valDec, 0);
+                                } else {
+                                    txtVal = val;
+                                }
                            }
                        }
+                        text = text.split(variableInfo.variable).join(txtVal);
                    }
-                    text = text.split(variableInfo.variable).join(txtVal);
+                    tooltip.popup.setContent(text);
                }
-                tooltip.popup.setContent(text);
            }

        }