Merge branch 'master' of https://github.com/ArtemHalushko/thingsboard into trip-select

Artem Halushko
2 parents 0ee3f77d 56fb09b9
Showing 60 changed files with 987 additions and 744 deletions
application/pom.xml
application/src/main/data/json/system/widget_bundles/maps.json
application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java
application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
application/src/main/java/org/thingsboard/server/config/ThingsboardMessageConfiguration.java
application/src/main/java/org/thingsboard/server/controller/UserController.java
application/src/main/java/org/thingsboard/server/controller/WidgetTypeController.java
application/src/main/java/org/thingsboard/server/controller/WidgetsBundleController.java
application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java
application/src/main/java/org/thingsboard/server/service/script/RemoteJsInvokeService.java
application/src/main/java/org/thingsboard/server/service/security/permission/CustomerUserPermissions.java
application/src/main/java/org/thingsboard/server/service/security/permission/SysAdminPermissions.java
application/src/main/java/org/thingsboard/server/service/security/permission/TenantAdminPermissions.java
application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java
application/src/main/java/org/thingsboard/server/service/subscription/TbAttributeSubscriptionScope.java
application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetryWebSocketService.java
application/src/main/resources/templates/account.activated.vm → application/src/main/resources/templates/account.activated.ftl
application/src/main/resources/templates/test.vm → application/src/main/resources/templates/account.lockout.ftl
application/src/main/resources/templates/activation.vm → application/src/main/resources/templates/activation.ftl
--- a/application/pom.xml
View file @8808d66
+++ b/application/pom.xml
View file @8808d66
@@ -153,12 +153,8 @@
             <artifactId>jjwt</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-tools</artifactId>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
--- a/application/src/main/data/json/system/widget_bundles/maps.json
View file @8808d66
+++ b/application/src/main/data/json/system/widget_bundles/maps.json
View file @8808d66
@@ -130,7 +130,7 @@
         "controllerScript": " self.onInit = function() {\n     var $scope = self.ctx.$scope;\n     $scope.self = self;\n }\n \n \n self.actionSources = function () {\n            return {\n                'tooltipAction': {\n                    name: 'widget-action.tooltip-tag-action',\n                    multiple: false\n                }\n            }\n        };\n        \n  self.getSettingsSchema = function() {\n   return TbTripAnimationWidget.getSettingsSchema();\n}\n",
         "settingsSchema": "",
         "dataKeySettingsSchema": "{}",
-        "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"entityAliasId\":null,\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"latitude\",\"color\":\"#2196f3\",\"settings\":{\"showLines\":true,\"fillLines\":true,\"showPoints\":false},\"_hash\":0.8587686344902596,\"funcBody\":\"var gpsData = [\\n37.771210000, -122.510960000,\\n    37.771990000, -122.497070000,\\n    37.772730000, -122.480740000,\\n    37.773360000, -122.466870000,\\n    37.774270000, -122.458520000,\\n    37.771980000, -122.454110000,\\n    37.768250000, -122.453380000,\\n    37.765920000, -122.456810000,\\n    37.765930000, -122.467680000,\\n    37.765500000, -122.477180000,\\n    37.765300000, -122.481660000,\\n    37.764780000, -122.493350000,\\n    37.764120000, -122.508360000,\\n    37.766410000, -122.510260000,\\n    37.770010000, -122.510830000,\\n    37.770980000, -122.510930000\\n];\\n let value = gpsData.indexOf(prevValue); \\nreturn gpsData[(value == -1 ? 0 : value + 2)];\",\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"longitude\",\"color\":\"#ffc107\",\"settings\":{\"showLines\":true,\"fillLines\":false,\"showPoints\":false},\"_hash\":0.12775350966079668,\"funcBody\":\"var gpsData = [\\n37.771210000, -122.510960000,\\n    37.771990000, -122.497070000,\\n    37.772730000, -122.480740000,\\n    37.773360000, -122.466870000,\\n    37.774270000, -122.458520000,\\n    37.771980000, -122.454110000,\\n    37.768250000, -122.453380000,\\n    37.765920000, -122.456810000,\\n    37.765930000, -122.467680000,\\n    37.765500000, -122.477180000,\\n    37.765300000, -122.481660000,\\n    37.764780000, -122.493350000,\\n    37.764120000, -122.508360000,\\n    37.766410000, -122.510260000,\\n    37.770010000, -122.510830000,\\n    37.770980000, -122.510930000\\n];\\n let value = gpsData.indexOf(prevValue); \\nreturn gpsData[(value == -1 ? 1 : value + 2)];\",\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null}]}],\"timewindow\":{\"history\":{\"interval\":1000,\"timewindowMs\":60000},\"aggregation\":{\"type\":\"NONE\",\"limit\":500}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"mapProvider\":\"OpenStreetMap.Mapnik\",\"latKeyName\":\"latitude\",\"lngKeyName\":\"longitude\",\"showLabel\":true,\"label\":\"${entityName}\",\"showTooltip\":true,\"tooltipColor\":\"#fff\",\"tooltipFontColor\":\"#000\",\"tooltipOpacity\":1,\"tooltipPattern\":\"<b>${entityName}</b><br/><br/><b>Latitude:</b> ${latitude:7}<br/><b>Longitude:</b> ${longitude:7}<br/><b>End Time:</b> ${maxTime}<br/><b>Start Time:</b> ${minTime}\",\"strokeWeight\":2,\"strokeOpacity\":1,\"pointSize\":10,\"markerImageSize\":34,\"rotationAngle\":180,\"provider\":\"openstreet-map\",\"normalizationStep\":1000,\"polKeyName\":\"coordinates\",\"decoratorSymbol\":\"arrowHead\",\"decoratorSymbolSize\":10,\"decoratorCustomColor\":\"#000\",\"decoratorOffset\":\"20px\",\"endDecoratorOffset\":\"20px\",\"decoratorRepeat\":\"20px\",\"polygonTooltipPattern\":\"<b>${entityName}</b><br/><br/><b>TimeStamp:</b> ${ts:7}\",\"polygonOpacity\":0.5,\"polygonStrokeOpacity\":1,\"polygonStrokeWeight\":1,\"pointTooltipOnRightPanel\":true,\"autocloseTooltip\":true},\"title\":\"Trip Animation\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"mobileHeight\":null,\"widgetStyle\":{},\"useDashboardTimewindow\":false,\"showLegend\":false,\"actions\":{},\"legendConfig\":{\"position\":\"bottom\",\"showMin\":false,\"showMax\":false,\"showAvg\":false,\"showTotal\":false},\"displayTimewindow\":true}"
+        "defaultConfig": "{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"entityAliasId\":null,\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"latitude\",\"color\":\"#2196f3\",\"settings\":{\"showLines\":true,\"fillLines\":true,\"showPoints\":false},\"_hash\":0.8587686344902596,\"funcBody\":\"var gpsData = [\\n37.771210000, -122.510960000,\\n    37.771990000, -122.497070000,\\n    37.772730000, -122.480740000,\\n    37.773360000, -122.466870000,\\n    37.774270000, -122.458520000,\\n    37.771980000, -122.454110000,\\n    37.768250000, -122.453380000,\\n    37.765920000, -122.456810000,\\n    37.765930000, -122.467680000,\\n    37.765500000, -122.477180000,\\n    37.765300000, -122.481660000,\\n    37.764780000, -122.493350000,\\n    37.764120000, -122.508360000,\\n    37.766410000, -122.510260000,\\n    37.770010000, -122.510830000,\\n    37.770980000, -122.510930000\\n];\\n let value = gpsData.indexOf(prevValue); \\nreturn gpsData[(value == -1 ? 0 : (value + 2) % gpsData.length)];\",\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"longitude\",\"color\":\"#ffc107\",\"settings\":{\"showLines\":true,\"fillLines\":false,\"showPoints\":false},\"_hash\":0.12775350966079668,\"funcBody\":\"var gpsData = [\\n37.771210000, -122.510960000,\\n    37.771990000, -122.497070000,\\n    37.772730000, -122.480740000,\\n    37.773360000, -122.466870000,\\n    37.774270000, -122.458520000,\\n    37.771980000, -122.454110000,\\n    37.768250000, -122.453380000,\\n    37.765920000, -122.456810000,\\n    37.765930000, -122.467680000,\\n    37.765500000, -122.477180000,\\n    37.765300000, -122.481660000,\\n    37.764780000, -122.493350000,\\n    37.764120000, -122.508360000,\\n    37.766410000, -122.510260000,\\n    37.770010000, -122.510830000,\\n    37.770980000, -122.510930000\\n];\\n let value = gpsData.indexOf(prevValue); \\nreturn gpsData[(value == -1 ? 1 : (value + 2) % gpsData.length)];\",\"units\":null,\"decimals\":null,\"usePostProcessing\":null,\"postFuncBody\":null}]}],\"timewindow\":{\"history\":{\"interval\":1000,\"timewindowMs\":60000},\"aggregation\":{\"type\":\"NONE\",\"limit\":500}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"mapProvider\":\"OpenStreetMap.Mapnik\",\"latKeyName\":\"latitude\",\"lngKeyName\":\"longitude\",\"showLabel\":true,\"label\":\"${entityName}\",\"showTooltip\":true,\"tooltipColor\":\"#fff\",\"tooltipFontColor\":\"#000\",\"tooltipOpacity\":1,\"tooltipPattern\":\"<b>${entityName}</b><br/><br/><b>Latitude:</b> ${latitude:7}<br/><b>Longitude:</b> ${longitude:7}<br/><b>End Time:</b> ${maxTime}<br/><b>Start Time:</b> ${minTime}\",\"strokeWeight\":2,\"strokeOpacity\":1,\"pointSize\":10,\"markerImageSize\":34,\"rotationAngle\":180,\"provider\":\"openstreet-map\",\"normalizationStep\":1000,\"polKeyName\":\"coordinates\",\"decoratorSymbol\":\"arrowHead\",\"decoratorSymbolSize\":10,\"decoratorCustomColor\":\"#000\",\"decoratorOffset\":\"20px\",\"endDecoratorOffset\":\"20px\",\"decoratorRepeat\":\"20px\",\"polygonTooltipPattern\":\"<b>${entityName}</b><br/><br/><b>TimeStamp:</b> ${ts:7}\",\"polygonOpacity\":0.5,\"polygonStrokeOpacity\":1,\"polygonStrokeWeight\":1,\"pointTooltipOnRightPanel\":true,\"autocloseTooltip\":true},\"title\":\"Trip Animation\",\"dropShadow\":true,\"enableFullscreen\":true,\"titleStyle\":{\"fontSize\":\"16px\",\"fontWeight\":400},\"mobileHeight\":null,\"widgetStyle\":{},\"useDashboardTimewindow\":false,\"showLegend\":false,\"actions\":{},\"legendConfig\":{\"position\":\"bottom\",\"showMin\":false,\"showMax\":false,\"showAvg\":false,\"showTotal\":false},\"displayTimewindow\":true}"
       }
     },
     {
@@ -150,4 +150,4 @@
       }
     }
   ]
-}
+}
--- a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java
View file @8808d66
+++ b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java
View file @8808d66
@@ -56,6 +56,7 @@ import org.thingsboard.server.dao.audit.AuditLogService;
 import org.thingsboard.server.dao.cassandra.CassandraCluster;
 import org.thingsboard.server.dao.customer.CustomerService;
 import org.thingsboard.server.dao.dashboard.DashboardService;
+import org.thingsboard.server.dao.device.ClaimDevicesService;
 import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.entityview.EntityViewService;
 import org.thingsboard.server.dao.event.EventService;
@@ -218,6 +219,10 @@ public class ActorSystemContext {
     @Getter
     private MailService mailService;
+    @Autowired
+    @Getter
+    private ClaimDevicesService claimDevicesService;
+
     //TODO: separate context for TbCore and TbRuleEngine
     @Autowired(required = false)
     @Getter
--- a/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
View file @8808d66
+++ b/application/src/main/java/org/thingsboard/server/actors/device/DeviceActorMessageProcessor.java
View file @8808d66
@@ -39,6 +39,7 @@ import org.thingsboard.server.common.msg.TbMsgMetaData;
 import org.thingsboard.server.common.msg.queue.TbCallback;
 import org.thingsboard.server.common.msg.rpc.ToDeviceRpcRequest;
 import org.thingsboard.server.common.msg.timeout.DeviceActorServerSideRpcTimeoutMsg;
+import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.gen.transport.TransportProtos.AttributeUpdateNotificationMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.DeviceSessionsCacheEntry;
 import org.thingsboard.server.gen.transport.TransportProtos.GetAttributeRequestMsg;
@@ -232,9 +233,17 @@ class DeviceActorMessageProcessor extends AbstractContextAwareMsgProcessor {
         if (msg.hasSubscriptionInfo()) {
             handleSessionActivity(context, msg.getSessionInfo(), msg.getSubscriptionInfo());
         }
+        if (msg.hasClaimDevice()) {
+            handleClaimDeviceMsg(context, msg.getSessionInfo(), msg.getClaimDevice());
+        }
         callback.onSuccess();
     }
+    private void handleClaimDeviceMsg(ActorContext context, SessionInfoProto sessionInfo, TransportProtos.ClaimDeviceMsg msg) {
+        DeviceId deviceId = new DeviceId(new UUID(msg.getDeviceIdMSB(), msg.getDeviceIdLSB()));
+        systemContext.getClaimDevicesService().registerClaimingInfo(tenantId, deviceId, msg.getSecretKey(), msg.getDurationMs());
+    }
+
     private void reportSessionOpen() {
         systemContext.getDeviceStateService().onDeviceConnect(deviceId);
     }
--- a/application/src/main/java/org/thingsboard/server/config/ThingsboardMessageConfiguration.java
View file @8808d66
+++ b/application/src/main/java/org/thingsboard/server/config/ThingsboardMessageConfiguration.java
View file @8808d66
@@ -15,28 +15,11 @@
  */
 package org.thingsboard.server.config;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.ExtendedProperties;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.exception.ResourceNotFoundException;
-import org.apache.velocity.runtime.RuntimeConstants;
-import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.context.support.ResourceBundleMessageSource;
-import org.springframework.core.io.DefaultResourceLoader;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.util.StringUtils;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
 @Configuration
 public class ThingsboardMessageConfiguration {
@@ -49,114 +32,4 @@ public class ThingsboardMessageConfiguration {
         messageSource.setDefaultEncoding("UTF-8");
         return messageSource;
     }
-
-    private static final String DEFAULT_RESOURCE_LOADER_PATH = "classpath:/templates/";
-
-    private ResourceLoader resourceLoader = new DefaultResourceLoader();
-
-    @Bean
-    public VelocityEngine velocityEngine() {
-        VelocityEngine velocityEngine = new VelocityEngine();
-        try {
-            Resource resource = resourceLoader.getResource(DEFAULT_RESOURCE_LOADER_PATH);
-            File file = resource.getFile();
-            velocityEngine.setProperty(RuntimeConstants.RESOURCE_LOADER, "file");
-            velocityEngine.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_CACHE, "true");
-            velocityEngine.setProperty(RuntimeConstants.FILE_RESOURCE_LOADER_PATH, file.getAbsolutePath());
-        } catch (IOException e) {
-            initSpringResourceLoader(velocityEngine, DEFAULT_RESOURCE_LOADER_PATH);
-        }
-        velocityEngine.init();
-        return velocityEngine;
-    }
-
-    private void initSpringResourceLoader(VelocityEngine velocityEngine, String resourceLoaderPath) {
-        velocityEngine.setProperty(
-                RuntimeConstants.RESOURCE_LOADER, SpringResourceLoader.NAME);
-        velocityEngine.setProperty(
-                SpringResourceLoader.SPRING_RESOURCE_LOADER_CLASS, SpringResourceLoader.class.getName());
-        velocityEngine.setProperty(
-                SpringResourceLoader.SPRING_RESOURCE_LOADER_CACHE, "true");
-        velocityEngine.setApplicationAttribute(
-                SpringResourceLoader.SPRING_RESOURCE_LOADER, resourceLoader);
-        velocityEngine.setApplicationAttribute(
-                SpringResourceLoader.SPRING_RESOURCE_LOADER_PATH, resourceLoaderPath);
-    }
-
-    @Slf4j
-    public static class SpringResourceLoader extends org.apache.velocity.runtime.resource.loader.ResourceLoader {
-
-        public static final String NAME = "spring";
-
-        public static final String SPRING_RESOURCE_LOADER_CLASS = "spring.resource.loader.class";
-
-        public static final String SPRING_RESOURCE_LOADER_CACHE = "spring.resource.loader.cache";
-
-        public static final String SPRING_RESOURCE_LOADER = "spring.resource.loader";
-
-        public static final String SPRING_RESOURCE_LOADER_PATH = "spring.resource.loader.path";
-
-        private org.springframework.core.io.ResourceLoader resourceLoader;
-
-        private String[] resourceLoaderPaths;
-
-
-        @Override
-        public void init(ExtendedProperties configuration) {
-            this.resourceLoader = (org.springframework.core.io.ResourceLoader)
-                    this.rsvc.getApplicationAttribute(SPRING_RESOURCE_LOADER);
-            String resourceLoaderPath = (String) this.rsvc.getApplicationAttribute(SPRING_RESOURCE_LOADER_PATH);
-            if (this.resourceLoader == null) {
-                throw new IllegalArgumentException(
-                        "'resourceLoader' application attribute must be present for SpringResourceLoader");
-            }
-            if (resourceLoaderPath == null) {
-                throw new IllegalArgumentException(
-                        "'resourceLoaderPath' application attribute must be present for SpringResourceLoader");
-            }
-            this.resourceLoaderPaths = StringUtils.commaDelimitedListToStringArray(resourceLoaderPath);
-            for (int i = 0; i < this.resourceLoaderPaths.length; i++) {
-                String path = this.resourceLoaderPaths[i];
-                if (!path.endsWith("/")) {
-                    this.resourceLoaderPaths[i] = path + "/";
-                }
-            }
-            if (log.isInfoEnabled()) {
-                log.info("SpringResourceLoader for Velocity: using resource loader [" + this.resourceLoader +
-                        "] and resource loader paths " + Arrays.asList(this.resourceLoaderPaths));
-            }
-        }
-
-        @Override
-        public InputStream getResourceStream(String source) throws ResourceNotFoundException {
-            if (log.isDebugEnabled()) {
-                log.debug("Looking for Velocity resource with name [" + source + "]");
-            }
-            for (String resourceLoaderPath : this.resourceLoaderPaths) {
-                org.springframework.core.io.Resource resource =
-                        this.resourceLoader.getResource(resourceLoaderPath + source);
-                try {
-                    return resource.getInputStream();
-                }
-                catch (IOException ex) {
-                    if (log.isDebugEnabled()) {
-                        log.debug("Could not find Velocity resource: " + resource);
-                    }
-                }
-            }
-            throw new ResourceNotFoundException(
-                    "Could not find resource [" + source + "] in Spring resource loader path");
-        }
-
-        @Override
-        public boolean isSourceModified(org.apache.velocity.runtime.resource.Resource resource) {
-            return false;
-        }
-
-        @Override
-        public long getLastModified(org.apache.velocity.runtime.resource.Resource resource) {
-            return 0;
-        }
-
-    }
 }
--- a/application/src/main/java/org/thingsboard/server/controller/UserController.java
View file @8808d66
+++ b/application/src/main/java/org/thingsboard/server/controller/UserController.java
View file @8808d66
@@ -135,7 +135,7 @@ public class UserController extends BaseController {
             HttpServletRequest request) throws ThingsboardException {
         try {
-            if (getCurrentUser().getAuthority() == Authority.TENANT_ADMIN) {
+            if (Authority.TENANT_ADMIN.equals(getCurrentUser().getAuthority())) {
                 user.setTenantId(getCurrentUser().getTenantId());
             }
--- a/application/src/main/java/org/thingsboard/server/controller/WidgetTypeController.java
View file @8808d66
+++ b/application/src/main/java/org/thingsboard/server/controller/WidgetTypeController.java
View file @8808d66
@@ -60,7 +60,7 @@ public class WidgetTypeController extends BaseController {
     @ResponseBody
     public WidgetType saveWidgetType(@RequestBody WidgetType widgetType) throws ThingsboardException {
         try {
-            if (getCurrentUser().getAuthority() == Authority.SYS_ADMIN) {
+            if (Authority.SYS_ADMIN.equals(getCurrentUser().getAuthority())) {
                 widgetType.setTenantId(TenantId.SYS_TENANT_ID);
             } else {
                 widgetType.setTenantId(getCurrentUser().getTenantId());
--- a/application/src/main/java/org/thingsboard/server/controller/WidgetsBundleController.java
View file @8808d66
+++ b/application/src/main/java/org/thingsboard/server/controller/WidgetsBundleController.java
View file @8808d66
@@ -61,7 +61,7 @@ public class WidgetsBundleController extends BaseController {
     @ResponseBody
     public WidgetsBundle saveWidgetsBundle(@RequestBody WidgetsBundle widgetsBundle) throws ThingsboardException {
         try {
-            if (getCurrentUser().getAuthority() == Authority.SYS_ADMIN) {
+            if (Authority.SYS_ADMIN.equals(getCurrentUser().getAuthority())) {
                 widgetsBundle.setTenantId(TenantId.SYS_TENANT_ID);
             } else {
                 widgetsBundle.setTenantId(getCurrentUser().getTenantId());
@@ -103,7 +103,7 @@ public class WidgetsBundleController extends BaseController {
             @RequestParam(required = false) String sortOrder) throws ThingsboardException {
         try {
             PageLink pageLink = createPageLink(pageSize, page, textSearch, sortProperty, sortOrder);
-            if (getCurrentUser().getAuthority() == Authority.SYS_ADMIN) {
+            if (Authority.SYS_ADMIN.equals(getCurrentUser().getAuthority())) {
                 return checkNotNull(widgetsBundleService.findSystemWidgetsBundlesByPageLink(getTenantId(), pageLink));
             } else {
                 TenantId tenantId = getCurrentUser().getTenantId();
@@ -119,7 +119,7 @@ public class WidgetsBundleController extends BaseController {
     @ResponseBody
     public List<WidgetsBundle> getWidgetsBundles() throws ThingsboardException {
         try {
-            if (getCurrentUser().getAuthority() == Authority.SYS_ADMIN) {
+            if (Authority.SYS_ADMIN.equals(getCurrentUser().getAuthority())) {
                 return checkNotNull(widgetsBundleService.findSystemWidgetsBundles(getTenantId()));
             } else {
                 TenantId tenantId = getCurrentUser().getTenantId();
--- a/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
View file @8808d66
+++ b/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
View file @8808d66
@@ -131,6 +131,7 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
         node.put("username", "");
         node.put("password", "");
         node.put("tlsVersion", "TLSv1.2");//NOSONAR, key used to identify password field (not password value itself)
+        node.put("enableProxy", false);
         mailSettings.setJsonValue(node);
         adminSettingsService.saveAdminSettings(TenantId.SYS_TENANT_ID, mailSettings);
     }
--- a/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java
View file @8808d66
+++ b/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java
View file @8808d66
@@ -16,18 +16,17 @@
 package org.thingsboard.server.service.mail;
 import com.fasterxml.jackson.databind.JsonNode;
+import freemarker.template.Configuration;
+import freemarker.template.Template;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.exception.VelocityException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.MessageSource;
 import org.springframework.core.NestedRuntimeException;
 import org.springframework.mail.javamail.JavaMailSenderImpl;
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Service;
+import org.springframework.ui.freemarker.FreeMarkerTemplateUtils;
 import org.thingsboard.rule.engine.api.MailService;
 import org.thingsboard.server.common.data.AdminSettings;
 import org.thingsboard.server.common.data.exception.ThingsboardErrorCode;
@@ -40,8 +39,6 @@ import org.thingsboard.server.dao.settings.AdminSettingsService;
 import javax.annotation.PostConstruct;
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
-import java.io.StringWriter;
-import java.io.Writer;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -58,8 +55,7 @@ public class DefaultMailService implements MailService {
     private MessageSource messages;
     @Autowired
-    @Qualifier("velocityEngine")
-    private VelocityEngine engine;
+    private Configuration freemarkerConfig;
     private JavaMailSenderImpl mailSender;
@@ -118,6 +114,21 @@ public class DefaultMailService implements MailService {
                 javaMailProperties.put(MAIL_PROP + protocol + ".ssl.protocols", tlsVersion);
             }
         }
+
+        boolean enableProxy = jsonConfig.has("enableProxy") && jsonConfig.get("enableProxy").asBoolean();
+
+        if (enableProxy) {
+            javaMailProperties.put(MAIL_PROP + protocol + ".proxy.host", jsonConfig.get("proxyHost").asText());
+            javaMailProperties.put(MAIL_PROP + protocol + ".proxy.port", jsonConfig.get("proxyPort").asText());
+            String proxyUser = jsonConfig.get("proxyUser").asText();
+            if (StringUtils.isNoneEmpty(proxyUser)) {
+                javaMailProperties.put(MAIL_PROP + protocol + ".proxy.user", proxyUser);
+            }
+            String proxyPassword = jsonConfig.get("proxyPassword").asText();
+            if (StringUtils.isNoneEmpty(proxyPassword)) {
+                javaMailProperties.put(MAIL_PROP + protocol + ".proxy.password", proxyPassword);
+            }
+        }
         return javaMailProperties;
     }
@@ -140,11 +151,10 @@ public class DefaultMailService implements MailService {
         String mailFrom = jsonConfig.get("mailFrom").asText();
         String subject = messages.getMessage("test.message.subject", null, Locale.US);
-        Map<String, Object> model = new HashMap<String, Object>();
+        Map<String, Object> model = new HashMap<>();
         model.put(TARGET_EMAIL, email);
-        String message = mergeTemplateIntoString(this.engine,
-                "test.vm", UTF_8, model);
+        String message = mergeTemplateIntoString("test.ftl", model);
         sendMail(testMailSender, mailFrom, email, subject, message);
     }
@@ -154,12 +164,11 @@ public class DefaultMailService implements MailService {
         String subject = messages.getMessage("activation.subject", null, Locale.US);
-        Map<String, Object> model = new HashMap<String, Object>();
+        Map<String, Object> model = new HashMap<>();
         model.put("activationLink", activationLink);
         model.put(TARGET_EMAIL, email);
-        String message = mergeTemplateIntoString(this.engine,
-                "activation.vm", UTF_8, model);
+        String message = mergeTemplateIntoString("activation.ftl", model);
         sendMail(mailSender, mailFrom, email, subject, message);
     }
@@ -169,12 +178,11 @@ public class DefaultMailService implements MailService {
         String subject = messages.getMessage("account.activated.subject", null, Locale.US);
-        Map<String, Object> model = new HashMap<String, Object>();
+        Map<String, Object> model = new HashMap<>();
         model.put("loginLink", loginLink);
         model.put(TARGET_EMAIL, email);
-        String message = mergeTemplateIntoString(this.engine,
-                "account.activated.vm", UTF_8, model);
+        String message = mergeTemplateIntoString("account.activated.ftl", model);
         sendMail(mailSender, mailFrom, email, subject, message);
     }
@@ -184,12 +192,11 @@ public class DefaultMailService implements MailService {
         String subject = messages.getMessage("reset.password.subject", null, Locale.US);
-        Map<String, Object> model = new HashMap<String, Object>();
+        Map<String, Object> model = new HashMap<>();
         model.put("passwordResetLink", passwordResetLink);
         model.put(TARGET_EMAIL, email);
-        String message = mergeTemplateIntoString(this.engine,
-                "reset.password.vm", UTF_8, model);
+        String message = mergeTemplateIntoString("reset.password.ftl", model);
         sendMail(mailSender, mailFrom, email, subject, message);
     }
@@ -199,12 +206,11 @@ public class DefaultMailService implements MailService {
         String subject = messages.getMessage("password.was.reset.subject", null, Locale.US);
-        Map<String, Object> model = new HashMap<String, Object>();
+        Map<String, Object> model = new HashMap<>();
         model.put("loginLink", loginLink);
         model.put(TARGET_EMAIL, email);
-        String message = mergeTemplateIntoString(this.engine,
-                "password.was.reset.vm", UTF_8, model);
+        String message = mergeTemplateIntoString("password.was.reset.ftl", model);
         sendMail(mailSender, mailFrom, email, subject, message);
     }
@@ -230,13 +236,12 @@ public class DefaultMailService implements MailService {
     public void sendAccountLockoutEmail(String lockoutEmail, String email, Integer maxFailedLoginAttempts) throws ThingsboardException {
         String subject = messages.getMessage("account.lockout.subject", null, Locale.US);
-        Map<String, Object> model = new HashMap<String, Object>();
+        Map<String, Object> model = new HashMap<>();
         model.put("lockoutAccount", lockoutEmail);
         model.put("maxFailedLoginAttempts", maxFailedLoginAttempts);
         model.put(TARGET_EMAIL, email);
-        String message = mergeTemplateIntoString(this.engine,
-                "account.lockout.vm", UTF_8, model);
+        String message = mergeTemplateIntoString("account.lockout.ftl", model);
         sendMail(mailSender, mailFrom, email, subject, message);
     }
@@ -257,20 +262,14 @@ public class DefaultMailService implements MailService {
         }
     }
-    private static String mergeTemplateIntoString(VelocityEngine velocityEngine, String templateLocation,
-                                                  String encoding, Map<String, Object> model) throws VelocityException {
-
-        StringWriter result = new StringWriter();
-        mergeTemplate(velocityEngine, templateLocation, encoding, model, result);
-        return result.toString();
-    }
-
-    private static void mergeTemplate(
-            VelocityEngine velocityEngine, String templateLocation, String encoding,
-            Map<String, Object> model, Writer writer) throws VelocityException {
-
-        VelocityContext velocityContext = new VelocityContext(model);
-        velocityEngine.mergeTemplate(templateLocation, encoding, velocityContext, writer);
+    private String mergeTemplateIntoString(String templateLocation,
+                                           Map<String, Object> model) throws ThingsboardException {
+        try {
+            Template template = freemarkerConfig.getTemplate(templateLocation);
+            return FreeMarkerTemplateUtils.processTemplateIntoString(template, model);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
     }
     protected ThingsboardException handleException(Exception exception) {
--- a/application/src/main/java/org/thingsboard/server/service/script/RemoteJsInvokeService.java
View file @8808d66
+++ b/application/src/main/java/org/thingsboard/server/service/script/RemoteJsInvokeService.java
View file @8808d66
@@ -46,6 +46,9 @@ import java.util.concurrent.atomic.AtomicInteger;
 @Service
 public class RemoteJsInvokeService extends AbstractJsInvokeService {
+    @Value("${queue.js.max_eval_requests_timeout}")
+    private long maxEvalRequestsTimeout;
+
     @Value("${queue.js.max_requests_timeout}")
     private long maxRequestsTimeout;
@@ -59,22 +62,22 @@ public class RemoteJsInvokeService extends AbstractJsInvokeService {
     @Value("${js.remote.stats.enabled:false}")
     private boolean statsEnabled;
-    private final AtomicInteger kafkaPushedMsgs = new AtomicInteger(0);
-    private final AtomicInteger kafkaInvokeMsgs = new AtomicInteger(0);
-    private final AtomicInteger kafkaEvalMsgs = new AtomicInteger(0);
-    private final AtomicInteger kafkaFailedMsgs = new AtomicInteger(0);
-    private final AtomicInteger kafkaTimeoutMsgs = new AtomicInteger(0);
+    private final AtomicInteger queuePushedMsgs = new AtomicInteger(0);
+    private final AtomicInteger queueInvokeMsgs = new AtomicInteger(0);
+    private final AtomicInteger queueEvalMsgs = new AtomicInteger(0);
+    private final AtomicInteger queueFailedMsgs = new AtomicInteger(0);
+    private final AtomicInteger queueTimeoutMsgs = new AtomicInteger(0);
     @Scheduled(fixedDelayString = "${js.remote.stats.print_interval_ms}")
     public void printStats() {
         if (statsEnabled) {
-            int pushedMsgs = kafkaPushedMsgs.getAndSet(0);
-            int invokeMsgs = kafkaInvokeMsgs.getAndSet(0);
-            int evalMsgs = kafkaEvalMsgs.getAndSet(0);
-            int failed = kafkaFailedMsgs.getAndSet(0);
-            int timedOut = kafkaTimeoutMsgs.getAndSet(0);
+            int pushedMsgs = queuePushedMsgs.getAndSet(0);
+            int invokeMsgs = queueInvokeMsgs.getAndSet(0);
+            int evalMsgs = queueEvalMsgs.getAndSet(0);
+            int failed = queueFailedMsgs.getAndSet(0);
+            int timedOut = queueTimeoutMsgs.getAndSet(0);
             if (pushedMsgs > 0 || invokeMsgs > 0 || evalMsgs > 0 || failed > 0 || timedOut > 0) {
-                log.info("Kafka JS Invoke Stats: pushed [{}] received [{}] invoke [{}] eval [{}] failed [{}] timedOut [{}]",
+                log.info("Queue JS Invoke Stats: pushed [{}] received [{}] invoke [{}] eval [{}] failed [{}] timedOut [{}]",
                         pushedMsgs, invokeMsgs + evalMsgs, invokeMsgs, evalMsgs, failed, timedOut);
             }
         }
@@ -113,22 +116,22 @@ public class RemoteJsInvokeService extends AbstractJsInvokeService {
         log.trace("Post compile request for scriptId [{}]", scriptId);
         ListenableFuture<TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>> future = requestTemplate.send(new TbProtoJsQueueMsg<>(UUID.randomUUID(), jsRequestWrapper));
-        if (maxRequestsTimeout > 0) {
-            future = Futures.withTimeout(future, maxRequestsTimeout, TimeUnit.MILLISECONDS, timeoutExecutorService);
+        if (maxEvalRequestsTimeout > 0) {
+            future = Futures.withTimeout(future, maxEvalRequestsTimeout, TimeUnit.MILLISECONDS, timeoutExecutorService);
         }
-        kafkaPushedMsgs.incrementAndGet();
+        queuePushedMsgs.incrementAndGet();
         Futures.addCallback(future, new FutureCallback<TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>>() {
             @Override
             public void onSuccess(@Nullable TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse> result) {
-                kafkaEvalMsgs.incrementAndGet();
+                queueEvalMsgs.incrementAndGet();
             }
             @Override
             public void onFailure(Throwable t) {
                 if (t instanceof TimeoutException || (t.getCause() != null && t.getCause() instanceof TimeoutException)) {
-                    kafkaTimeoutMsgs.incrementAndGet();
+                    queueTimeoutMsgs.incrementAndGet();
                 }
-                kafkaFailedMsgs.incrementAndGet();
+                queueFailedMsgs.incrementAndGet();
             }
         }, MoreExecutors.directExecutor());
         return Futures.transform(future, response -> {
@@ -170,20 +173,20 @@ public class RemoteJsInvokeService extends AbstractJsInvokeService {
         if (maxRequestsTimeout > 0) {
             future = Futures.withTimeout(future, maxRequestsTimeout, TimeUnit.MILLISECONDS, timeoutExecutorService);
         }
-        kafkaPushedMsgs.incrementAndGet();
+        queuePushedMsgs.incrementAndGet();
         Futures.addCallback(future, new FutureCallback<TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse>>() {
             @Override
             public void onSuccess(@Nullable TbProtoQueueMsg<JsInvokeProtos.RemoteJsResponse> result) {
-                kafkaInvokeMsgs.incrementAndGet();
+                queueInvokeMsgs.incrementAndGet();
             }
             @Override
             public void onFailure(Throwable t) {
                 onScriptExecutionError(scriptId);
                 if (t instanceof TimeoutException || (t.getCause() != null && t.getCause() instanceof TimeoutException)) {
-                    kafkaTimeoutMsgs.incrementAndGet();
+                    queueTimeoutMsgs.incrementAndGet();
                 }
-                kafkaFailedMsgs.incrementAndGet();
+                queueFailedMsgs.incrementAndGet();
             }
         }, MoreExecutors.directExecutor());
         return Futures.transform(future, response -> {
--- a/application/src/main/java/org/thingsboard/server/service/security/permission/CustomerUserPermissions.java
View file @8808d66
+++ b/application/src/main/java/org/thingsboard/server/service/security/permission/CustomerUserPermissions.java
View file @8808d66
@@ -105,7 +105,7 @@ public class CustomerUserPermissions extends AbstractPermissions {
         @Override
         public boolean hasPermission(SecurityUser user, Operation operation, UserId userId, User userEntity) {
-            if (userEntity.getAuthority() != Authority.CUSTOMER_USER) {
+            if (!Authority.CUSTOMER_USER.equals(userEntity.getAuthority())) {
                 return false;
             }
             if (!user.getId().equals(userId)) {
--- a/application/src/main/java/org/thingsboard/server/service/security/permission/SysAdminPermissions.java
View file @8808d66
+++ b/application/src/main/java/org/thingsboard/server/service/security/permission/SysAdminPermissions.java
View file @8808d66
@@ -57,7 +57,7 @@ public class SysAdminPermissions extends AbstractPermissions {
         @Override
         public boolean hasPermission(SecurityUser user, Operation operation, UserId userId, User userEntity) {
-            if (userEntity.getAuthority() == Authority.CUSTOMER_USER) {
+            if (Authority.CUSTOMER_USER.equals(userEntity.getAuthority())) {
                 return false;
             }
             return true;
--- a/application/src/main/java/org/thingsboard/server/service/security/permission/TenantAdminPermissions.java
View file @8808d66
+++ b/application/src/main/java/org/thingsboard/server/service/security/permission/TenantAdminPermissions.java
View file @8808d66
@@ -76,7 +76,7 @@ public class TenantAdminPermissions extends AbstractPermissions {
         @Override
         public boolean hasPermission(SecurityUser user, Operation operation, UserId userId, User userEntity) {
-            if (userEntity.getAuthority() == Authority.SYS_ADMIN) {
+            if (Authority.SYS_ADMIN.equals(userEntity.getAuthority())) {
                 return false;
             }
             if (!user.getTenantId().equals(userEntity.getTenantId())) {
--- a/application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java
View file @8808d66
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/DefaultSubscriptionManagerService.java
View file @8808d66
@@ -224,7 +224,7 @@ public class DefaultSubscriptionManagerService implements SubscriptionManagerSer
                         return null;
                     }
                 },
-                s -> (StringUtils.isEmpty(s.getScope()) || scope.equals(s.getScope().name())),
+                s -> (TbAttributeSubscriptionScope.ANY_SCOPE.equals(s.getScope()) || scope.equals(s.getScope().name())),
                 s -> {
                     List<TsKvEntry> subscriptionUpdate = null;
                     for (AttributeKvEntry kv : attributes) {
--- a/application/src/main/java/org/thingsboard/server/service/subscription/TbAttributeSubscriptionScope.java
View file @8808d66
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/TbAttributeSubscriptionScope.java
View file @8808d66
@@ -17,6 +17,6 @@ package org.thingsboard.server.service.subscription;
 public enum TbAttributeSubscriptionScope {
-    CLIENT_SCOPE, SHARED_SCOPE, SERVER_SCOPE
+    ANY_SCOPE, CLIENT_SCOPE, SHARED_SCOPE, SERVER_SCOPE
 }
--- a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetryWebSocketService.java
View file @8808d66
+++ b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetryWebSocketService.java
View file @8808d66
@@ -345,7 +345,7 @@ public class DefaultTelemetryWebSocketService implements TelemetryWebSocketServi
                 keys.forEach(key -> subState.put(key, 0L));
                 attributesData.forEach(v -> subState.put(v.getKey(), v.getTs()));
-                TbAttributeSubscriptionScope scope = StringUtils.isEmpty(cmd.getScope()) ? TbAttributeSubscriptionScope.SERVER_SCOPE : TbAttributeSubscriptionScope.valueOf(cmd.getScope());
+                TbAttributeSubscriptionScope scope = StringUtils.isEmpty(cmd.getScope()) ? TbAttributeSubscriptionScope.ANY_SCOPE : TbAttributeSubscriptionScope.valueOf(cmd.getScope());
                 TbAttributeSubscription sub = TbAttributeSubscription.builder()
                         .serviceId(serviceId)
@@ -442,7 +442,7 @@ public class DefaultTelemetryWebSocketService implements TelemetryWebSocketServi
                 Map<String, Long> subState = new HashMap<>(attributesData.size());
                 attributesData.forEach(v -> subState.put(v.getKey(), v.getTs()));
-                TbAttributeSubscriptionScope scope = StringUtils.isEmpty(cmd.getScope()) ? TbAttributeSubscriptionScope.SERVER_SCOPE : TbAttributeSubscriptionScope.valueOf(cmd.getScope());
+                TbAttributeSubscriptionScope scope = StringUtils.isEmpty(cmd.getScope()) ? TbAttributeSubscriptionScope.ANY_SCOPE : TbAttributeSubscriptionScope.valueOf(cmd.getScope());
                 TbAttributeSubscription sub = TbAttributeSubscription.builder()
                         .serviceId(serviceId)
--- a/application/src/main/resources/templates/account.activated.ftl renamed from application/src/main/resources/templates/account.activated.vm
View file @8808d66
+++ b/application/src/main/resources/templates/account.activated.ftl renamed from application/src/main/resources/templates/account.activated.vm
View file @8808d66
-#*
- * Copyright © 2016-2020 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *#
+<#--
+
+    Copyright © 2016-2020 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
 <head>
@@ -96,7 +98,7 @@ background-color: #f6f6f6;
 								</tr>
 								<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
 									<td class="content-block" itemprop="handler" itemscope itemtype="http://schema.org/HttpActionHandler" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
-										<a href="$loginLink" class="btn-primary" itemprop="url" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; color: #FFF; text-decoration: none; line-height: 2em; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 5px; text-transform: capitalize; background-color: #348eda; margin: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px;">Login</a>
+										<a href="${loginLink}" class="btn-primary" itemprop="url" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; color: #FFF; text-decoration: none; line-height: 2em; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 5px; text-transform: capitalize; background-color: #348eda; margin: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px;">Login</a>
 									</td>
 								</tr>
 								<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
@@ -109,7 +111,7 @@ background-color: #f6f6f6;
 				<div class="footer" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; width: 100%; clear: both; color: #999; margin: 0; padding: 20px;">
 					<table width="100%" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
 						<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
-							<td class="aligncenter content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top">This email was sent to <a href="mailto:$targetEmail" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;">$targetEmail</a> by Thingsboard.</td>
+							<td class="aligncenter content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top">This email was sent to <a href="mailto:${targetEmail}" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;">${targetEmail}</a> by Thingsboard.</td>
 						</tr>
 					</table>
 				</div>
--- a/application/src/main/resources/templates/account.lockout.ftl renamed from application/src/main/resources/templates/test.vm
View file @8808d66
+++ b/application/src/main/resources/templates/account.lockout.ftl renamed from application/src/main/resources/templates/test.vm
View file @8808d66
-#*
- * Copyright © 2016-2020 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *#
+<#--
+
+    Copyright © 2016-2020 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
 <head>
 <meta name="viewport" content="width=device-width" />
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Thingsboard - Test Message</title>
+<title>Thingsboard - Account Lockout</title>
 <style type="text/css">
@@ -81,12 +83,12 @@ background-color: #f6f6f6;
 							<meta itemprop="name" content="Confirm Email" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;" /><table width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">								
 								<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
 									<td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; color: #348eda; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
-										<h2>Test message from Thingsboard</h2>
+										<h2>Thingsboard user account has been locked out</h2>
 									</td>
 								</tr>
 								<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
 									<td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
-										This email is indicating that your outgoing mail settings were set up correctly.
+										Thingsboard user account ${lockoutAccount} has been lockout due to failed credentials were provided more than ${maxFailedLoginAttempts} times.
 									</td>
 								</tr>
 								<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
@@ -99,7 +101,7 @@ background-color: #f6f6f6;
 				<div class="footer" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; width: 100%; clear: both; color: #999; margin: 0; padding: 20px;">
 					<table width="100%" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
 						<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
-							<td class="aligncenter content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top">This email was sent to <a href="mailto:$targetEmail" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;">$targetEmail</a> by Thingsboard.</td>
+							<td class="aligncenter content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top">This email was sent to <a href="mailto:${targetEmail}" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;">${targetEmail}</a> by Thingsboard.</td>
 						</tr>
 					</table>
 				</div>
--- a/application/src/main/resources/templates/activation.ftl renamed from application/src/main/resources/templates/activation.vm
View file @8808d66
+++ b/application/src/main/resources/templates/activation.ftl renamed from application/src/main/resources/templates/activation.vm
View file @8808d66
-#*
- * Copyright © 2016-2020 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *#
+<#--
+
+    Copyright © 2016-2020 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
 <head>
@@ -96,7 +98,7 @@ background-color: #f6f6f6;
 								</tr>
 								<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
 									<td class="content-block" itemprop="handler" itemscope itemtype="http://schema.org/HttpActionHandler" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
-										<a href="$activationLink" class="btn-primary" itemprop="url" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; color: #FFF; text-decoration: none; line-height: 2em; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 5px; text-transform: capitalize; background-color: #348eda; margin: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px;">Activate your account</a>
+										<a href="${activationLink}" class="btn-primary" itemprop="url" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; color: #FFF; text-decoration: none; line-height: 2em; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 5px; text-transform: capitalize; background-color: #348eda; margin: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px;">Activate your account</a>
 									</td>
 								</tr>
 								<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
@@ -109,7 +111,7 @@ background-color: #f6f6f6;
 				<div class="footer" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; width: 100%; clear: both; color: #999; margin: 0; padding: 20px;">
 					<table width="100%" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
 						<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
-							<td class="aligncenter content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top">This email was sent to <a href="mailto:$targetEmail" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;">$targetEmail</a> by Thingsboard.</td>
+							<td class="aligncenter content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top">This email was sent to <a href="mailto:${targetEmail}" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;">${targetEmail}</a> by Thingsboard.</td>
 						</tr>
 					</table>
 				</div>
--- a/application/src/main/resources/templates/password.was.reset.ftl renamed from application/src/main/resources/templates/password.was.reset.vm
View file @8808d66
+++ b/application/src/main/resources/templates/password.was.reset.ftl renamed from application/src/main/resources/templates/password.was.reset.vm
View file @8808d66
-#*
- * Copyright © 2016-2020 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *#
+<#--
+
+    Copyright © 2016-2020 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
 <head>
@@ -96,7 +98,7 @@ background-color: #f6f6f6;
 								</tr>
 								<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
 									<td class="content-block" itemprop="handler" itemscope itemtype="http://schema.org/HttpActionHandler" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
-										<a href="$loginLink" class="btn-primary" itemprop="url" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; color: #FFF; text-decoration: none; line-height: 2em; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 5px; text-transform: capitalize; background-color: #348eda; margin: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px;">Login</a>
+										<a href="${loginLink}" class="btn-primary" itemprop="url" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; color: #FFF; text-decoration: none; line-height: 2em; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 5px; text-transform: capitalize; background-color: #348eda; margin: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px;">Login</a>
 									</td>
 								</tr>
 								<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
@@ -109,7 +111,7 @@ background-color: #f6f6f6;
 				<div class="footer" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; width: 100%; clear: both; color: #999; margin: 0; padding: 20px;">
 					<table width="100%" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
 						<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
-							<td class="aligncenter content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top">This email was sent to <a href="mailto:$targetEmail" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;">$targetEmail</a> by Thingsboard.</td>
+							<td class="aligncenter content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top">This email was sent to <a href="mailto:${targetEmail}" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;">${targetEmail}</a> by Thingsboard.</td>
 						</tr>
 					</table>
 				</div>
--- a/application/src/main/resources/templates/reset.password.ftl renamed from application/src/main/resources/templates/reset.password.vm
View file @8808d66
+++ b/application/src/main/resources/templates/reset.password.ftl renamed from application/src/main/resources/templates/reset.password.vm
View file @8808d66
-#*
- * Copyright © 2016-2020 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *#
+<#--
+
+    Copyright © 2016-2020 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
 <head>
@@ -96,7 +98,7 @@ background-color: #f6f6f6;
 								</tr>
 								<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
 									<td class="content-block" itemprop="handler" itemscope itemtype="http://schema.org/HttpActionHandler" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
-										<a href="$passwordResetLink" class="btn-primary" itemprop="url" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; color: #FFF; text-decoration: none; line-height: 2em; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 5px; text-transform: capitalize; background-color: #348eda; margin: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px;">Reset password</a>
+										<a href="${passwordResetLink}" class="btn-primary" itemprop="url" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; color: #FFF; text-decoration: none; line-height: 2em; font-weight: bold; text-align: center; cursor: pointer; display: inline-block; border-radius: 5px; text-transform: capitalize; background-color: #348eda; margin: 0; border-color: #348eda; border-style: solid; border-width: 10px 20px;">Reset password</a>
 									</td>
 								</tr>
 								<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
@@ -109,7 +111,7 @@ background-color: #f6f6f6;
 				<div class="footer" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; width: 100%; clear: both; color: #999; margin: 0; padding: 20px;">
 					<table width="100%" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
 						<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
-							<td class="aligncenter content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top">This email was sent to <a href="mailto:$targetEmail" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;">$targetEmail</a> by Thingsboard.</td>
+							<td class="aligncenter content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top">This email was sent to <a href="mailto:${targetEmail}" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;">${targetEmail}</a> by Thingsboard.</td>
 						</tr>
 					</table>
 				</div>
--- a/application/src/main/resources/templates/test.ftl renamed from application/src/main/resources/templates/account.lockout.vm
View file @8808d66
+++ b/application/src/main/resources/templates/test.ftl renamed from application/src/main/resources/templates/account.lockout.vm
View file @8808d66
-#*
- * Copyright © 2016-2020 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *#
+<#--
+
+    Copyright © 2016-2020 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
 <head>
 <meta name="viewport" content="width=device-width" />
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Thingsboard - Account Lockout</title>
+<title>Thingsboard - Test Message</title>
 <style type="text/css">
@@ -81,12 +83,12 @@ background-color: #f6f6f6;
 							<meta itemprop="name" content="Confirm Email" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;" /><table width="100%" cellpadding="0" cellspacing="0" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">								
 								<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
 									<td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; color: #348eda; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
-										<h2>Thingsboard user account has been locked out</h2>
+										<h2>Test message from Thingsboard</h2>
 									</td>
 								</tr>
 								<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
 									<td class="content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; vertical-align: top; margin: 0; padding: 0 0 20px;" valign="top">
-										Thingsboard user account $lockoutAccount has been lockout due to failed credentials were provided more than $maxFailedLoginAttempts times.
+										This email is indicating that your outgoing mail settings were set up correctly.
 									</td>
 								</tr>
 								<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
@@ -99,7 +101,7 @@ background-color: #f6f6f6;
 				<div class="footer" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; width: 100%; clear: both; color: #999; margin: 0; padding: 20px;">
 					<table width="100%" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
 						<tr style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 14px; margin: 0;">
-							<td class="aligncenter content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top">This email was sent to <a href="mailto:$targetEmail" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;">$targetEmail</a> by Thingsboard.</td>
+							<td class="aligncenter content-block" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; vertical-align: top; color: #999; text-align: center; margin: 0; padding: 0 0 20px;" align="center" valign="top">This email was sent to <a href="mailto:${targetEmail}" style="font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif; box-sizing: border-box; font-size: 12px; color: #999; text-decoration: underline; margin: 0;">${targetEmail}</a> by Thingsboard.</td>
 						</tr>
 					</table>
 				</div>
--- a/application/src/main/resources/thingsboard.yml
View file @8808d66
+++ b/application/src/main/resources/thingsboard.yml
View file @8808d66
@@ -668,6 +668,8 @@ queue:
     # JS Eval max pending requests
     max_pending_requests: "${REMOTE_JS_MAX_PENDING_REQUESTS:10000}"
     # JS Eval max request timeout
+    max_eval_requests_timeout: "${REMOTE_JS_MAX_EVAL_REQUEST_TIMEOUT:60000}"
+    # JS max request timeout
     max_requests_timeout: "${REMOTE_JS_MAX_REQUEST_TIMEOUT:10000}"
     # JS response poll interval
     response_poll_interval: "${REMOTE_JS_RESPONSE_POLL_INTERVAL_MS:25}"
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/cassandra/guava/GuavaMultiPageResultSet.java 0 → 100644
View file @8808d66
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/cassandra/guava/GuavaMultiPageResultSet.java 0 → 100644
View file @8808d66
+/**
+ * Copyright © 2016-2020 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.cassandra.guava;
+
+import com.datastax.oss.driver.api.core.cql.AsyncResultSet;
+import com.datastax.oss.driver.api.core.cql.ColumnDefinitions;
+import com.datastax.oss.driver.api.core.cql.ExecutionInfo;
+import com.datastax.oss.driver.api.core.cql.ResultSet;
+import com.datastax.oss.driver.api.core.cql.Row;
+import com.datastax.oss.driver.api.core.cql.Statement;
+import com.datastax.oss.driver.internal.core.util.CountingIterator;
+import com.datastax.oss.driver.internal.core.util.concurrent.BlockingOperation;
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+public class GuavaMultiPageResultSet implements ResultSet {
+
+    private final RowIterator iterator;
+    private final List<ExecutionInfo> executionInfos = new ArrayList<>();
+    private ColumnDefinitions columnDefinitions;
+
+    public GuavaMultiPageResultSet(@NonNull GuavaSession session, @NonNull Statement statement, @NonNull AsyncResultSet firstPage) {
+        assert firstPage.hasMorePages();
+        this.iterator = new RowIterator(session, statement, firstPage);
+        this.executionInfos.add(firstPage.getExecutionInfo());
+        this.columnDefinitions = firstPage.getColumnDefinitions();
+    }
+
+    @NonNull
+    @Override
+    public ColumnDefinitions getColumnDefinitions() {
+        return columnDefinitions;
+    }
+
+    @NonNull
+    @Override
+    public List<ExecutionInfo> getExecutionInfos() {
+        return executionInfos;
+    }
+
+    @Override
+    public boolean isFullyFetched() {
+        return iterator.isFullyFetched();
+    }
+
+    @Override
+    public int getAvailableWithoutFetching() {
+        return iterator.remaining();
+    }
+
+    @NonNull
+    @Override
+    public Iterator<Row> iterator() {
+        return iterator;
+    }
+
+    @Override
+    public boolean wasApplied() {
+        return iterator.wasApplied();
+    }
+
+    private class RowIterator extends CountingIterator<Row> {
+        private GuavaSession session;
+        private Statement statement;
+        private AsyncResultSet currentPage;
+        private Iterator<Row> currentRows;
+
+        private RowIterator(GuavaSession session, Statement statement, AsyncResultSet firstPage) {
+            super(firstPage.remaining());
+            this.session = session;
+            this.statement = statement;
+            this.currentPage = firstPage;
+            this.currentRows = firstPage.currentPage().iterator();
+        }
+
+        @Override
+        protected Row computeNext() {
+            maybeMoveToNextPage();
+            return currentRows.hasNext() ? currentRows.next() : endOfData();
+        }
+
+        private void maybeMoveToNextPage() {
+            if (!currentRows.hasNext() && currentPage.hasMorePages()) {
+                BlockingOperation.checkNotDriverThread();
+                ByteBuffer nextPagingState = currentPage.getExecutionInfo().getPagingState();
+                this.statement = this.statement.setPagingState(nextPagingState);
+                AsyncResultSet nextPage = GuavaSession.getSafe(this.session.executeAsync(this.statement));
+                currentPage = nextPage;
+                remaining += nextPage.remaining();
+                currentRows = nextPage.currentPage().iterator();
+                executionInfos.add(nextPage.getExecutionInfo());
+                // The definitions can change from page to page if this result set was built from a bound
+                // 'SELECT *', and the schema was altered.
+                columnDefinitions = nextPage.getColumnDefinitions();
+            }
+        }
+
+        private boolean isFullyFetched() {
+            return !currentPage.hasMorePages();
+        }
+
+        private boolean wasApplied() {
+            return currentPage.wasApplied();
+        }
+    }
+}
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/cassandra/guava/GuavaSession.java
View file @8808d66
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/cassandra/guava/GuavaSession.java
View file @8808d66
@@ -17,13 +17,18 @@ package org.thingsboard.server.dao.cassandra.guava;
 import com.datastax.oss.driver.api.core.cql.AsyncResultSet;
 import com.datastax.oss.driver.api.core.cql.PreparedStatement;
+import com.datastax.oss.driver.api.core.cql.ResultSet;
 import com.datastax.oss.driver.api.core.cql.SimpleStatement;
 import com.datastax.oss.driver.api.core.cql.Statement;
 import com.datastax.oss.driver.api.core.cql.SyncCqlSession;
 import com.datastax.oss.driver.api.core.session.Session;
 import com.datastax.oss.driver.api.core.type.reflect.GenericType;
 import com.datastax.oss.driver.internal.core.cql.DefaultPrepareRequest;
+import com.datastax.oss.driver.internal.core.cql.SinglePageResultSet;
 import com.google.common.util.concurrent.ListenableFuture;
+import edu.umd.cs.findbugs.annotations.NonNull;
+
+import java.util.concurrent.ExecutionException;
 public interface GuavaSession extends Session, SyncCqlSession {
@@ -33,6 +38,16 @@ public interface GuavaSession extends Session, SyncCqlSession {
     GenericType<ListenableFuture<PreparedStatement>> ASYNC_PREPARED =
             new GenericType<ListenableFuture<PreparedStatement>>() {};
+    @NonNull
+    default ResultSet execute(@NonNull Statement<?> statement) {
+        AsyncResultSet firstPage = getSafe(this.executeAsync(statement));
+        if (firstPage.hasMorePages()) {
+            return new GuavaMultiPageResultSet(this, statement, firstPage);
+        } else {
+            return new SinglePageResultSet(firstPage);
+        }
+    }
+
     default ListenableFuture<AsyncResultSet> executeAsync(Statement<?> statement) {
         return this.execute(statement, ASYNC);
     }
@@ -48,4 +63,12 @@ public interface GuavaSession extends Session, SyncCqlSession {
     default ListenableFuture<PreparedStatement> prepareAsync(String statement) {
         return this.prepareAsync(SimpleStatement.newInstance(statement));
     }
+
+    static AsyncResultSet getSafe(ListenableFuture<AsyncResultSet> future) {
+        try {
+            return future.get();
+        } catch (InterruptedException | ExecutionException e) {
+            throw new IllegalStateException(e);
+        }
+    }
 }
--- a/docker/docker-compose.pubsub.yml
View file @8808d66
+++ b/docker/docker-compose.pubsub.yml
View file @8808d66
@@ -19,10 +19,10 @@ version: '2.2'
 services:
   tb-js-executor:
     env_file:
-      - queue-pubsub.env.env
+      - queue-pubsub.env
   tb-core1:
     env_file:
-      - queue-pubsub.env.env
+      - queue-pubsub.env
     depends_on:
       - zookeeper
       - redis
--- a/docker/queue-pubsub.env
View file @8808d66
+++ b/docker/queue-pubsub.env
View file @8808d66
 TB_QUEUE_TYPE=pubsub
 TB_QUEUE_PUBSUB_PROJECT_ID=YOUR_PROJECT_ID
-TB_QUEUE_PUBSUB_SERVICE_ACCOUNT=YOUR_SERVICE_ACCOUNT
+TB_QUEUE_PUBSUB_SERVICE_ACCOUNT=YOUR_SERVICE_ACCOUNT
--- a/docker/queue-service-bus.env
View file @8808d66
+++ b/docker/queue-service-bus.env
View file @8808d66
 TB_QUEUE_TYPE=service-bus
 TB_QUEUE_SERVICE_BUS_NAMESPACE_NAME=YOUR_NAMESPACE_NAME
 TB_QUEUE_SERVICE_BUS_SAS_KEY_NAME=YOUR_SAS_KEY_NAME
-TB_QUEUE_SERVICE_BUS_SAS_KEY=YOUR_SAS_KEY
+TB_QUEUE_SERVICE_BUS_SAS_KEY=YOUR_SAS_KEY
--- a/msa/js-executor/package-lock.json
View file @8808d66
+++ b/msa/js-executor/package-lock.json
View file @8808d66
@@ -13,9 +13,9 @@
       }
     },
     "@azure/amqp-common": {
-      "version": "1.0.0-preview.13",
-      "resolved": "https://registry.npmjs.org/@azure/amqp-common/-/amqp-common-1.0.0-preview.13.tgz",
-      "integrity": "sha512-v19NGXFm8Hzr2bj/DSWYc2anaDcoAeFQXJGuBT8QO7eS13vaELQNGaynOGipEcI313A1778R/FFCk4o+dylIiw==",
+      "version": "1.0.0-preview.15",
+      "resolved": "https://registry.npmjs.org/@azure/amqp-common/-/amqp-common-1.0.0-preview.15.tgz",
+      "integrity": "sha512-EoxNsVR7yLioNKRz5JBwQAE9pEdPVGCmmQbPKkZHP72vE5NhaLnOwHOCrk/311cuhJ8aQ60eiLUtF9J2XrEZyA==",
       "requires": {
         "@types/async-lock": "^1.1.0",
         "@types/is-buffer": "^2.0.0",
@@ -53,9 +53,9 @@
       }
     },
     "@azure/core-http": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-1.1.1.tgz",
-      "integrity": "sha512-yBxH5CtYaCj0f1CKoi3OjQw5C5Go8TbgNA6Q2rX7XsDpN2eeKu0n3kRvzZnKW+brtO1u3YnBBuBLF2KcGoZv6g==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-1.1.2.tgz",
+      "integrity": "sha512-xeZpTs6caBIrRipqZs70jgrA+mAFxII5XrBzbOCELPs18n4QWfchB20F94ITAk3GuFVDaSBsOhVL3GP1J+ncGg==",
       "requires": {
         "@azure/abort-controller": "^1.0.0",
         "@azure/core-auth": "^1.1.2",
@@ -116,11 +116,11 @@
       }
     },
     "@azure/service-bus": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/@azure/service-bus/-/service-bus-1.1.6.tgz",
-      "integrity": "sha512-eCJXcJZGWdlVwLEqMcoIqtUrh/NtyFcDDfq/y8gdCOy3Dzuv8JkPTxjdjcxDthwG9mc5Qter3dGOTwh0U8gwiw==",
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/@azure/service-bus/-/service-bus-1.1.7.tgz",
+      "integrity": "sha512-wns3egBrP6UyT9CIPkM66KsOVJwit7VJT0P/t8PPPfUaO6yx3bEeZyVDq6WMiibnbIkgHtW85xXml4WDb+nPMw==",
       "requires": {
-        "@azure/amqp-common": "1.0.0-preview.13",
+        "@azure/amqp-common": "1.0.0-preview.15",
         "@azure/core-http": "^1.0.0",
         "@opentelemetry/types": "^0.2.0",
         "@types/is-buffer": "^2.0.0",
@@ -130,7 +130,7 @@
         "is-buffer": "^2.0.3",
         "long": "^4.0.0",
         "process": "^0.11.10",
-        "rhea": "^1.0.18",
+        "rhea": "^1.0.21",
         "rhea-promise": "^0.1.15",
         "tslib": "^1.10.0"
       },
@@ -151,18 +151,18 @@
       }
     },
     "@babel/parser": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.4.tgz",
-      "integrity": "sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz",
+      "integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==",
       "dev": true
     },
     "@babel/runtime": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.4.tgz",
-      "integrity": "sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==",
+      "version": "7.9.6",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz",
+      "integrity": "sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ==",
       "dev": true,
       "requires": {
-        "regenerator-runtime": "^0.13.2"
+        "regenerator-runtime": "^0.13.4"
       }
     },
     "@google-cloud/paginator": {
@@ -190,9 +190,9 @@
       "integrity": "sha512-VccZDcOql77obTnFh0TbNED/6ZbbmHDf8UMNnzO1d5g9V0Htfm4k5cllY8P1tJsRKC3zWYGRLaViiupcgVjBoQ=="
     },
     "@google-cloud/pubsub": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-1.7.2.tgz",
-      "integrity": "sha512-/TziioDSV4FS4wKF1sIaQ+1gvE+um83oHz1nRsZ3L87uWSoOciBjJAcocgPjqrpnW441+Nuw4w0QdSUV1Lka/g==",
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/@google-cloud/pubsub/-/pubsub-1.7.3.tgz",
+      "integrity": "sha512-v+KdeaOS17WtHnsDf2bPGxKDT9HIRPYo3n+WsAEmvAzDHnh8q65mFcuYoQxuy2iRhmN/1ql2a0UU2tAAL7XZ8Q==",
       "requires": {
         "@google-cloud/paginator": "^2.0.0",
         "@google-cloud/precise-date": "^1.0.0",
@@ -372,9 +372,9 @@
       "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w=="
     },
     "@types/node": {
-      "version": "13.13.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.4.tgz",
-      "integrity": "sha512-x26ur3dSXgv5AwKS0lNfbjpCakGIduWU1DU91Zz58ONRWrIKGunmZBNv4P7N+e27sJkiGDsw/3fT4AtsqQBrBA=="
+      "version": "14.0.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.1.tgz",
+      "integrity": "sha512-FAYBGwC+W6F9+huFIDtn43cpy7+SzG+atzRiTfdp3inUKL2hXnd4rG8hylJLIh4+hqrQy1P17kvJByE/z825hA=="
     },
     "@types/node-fetch": {
       "version": "2.5.7",
@@ -449,9 +449,9 @@
       }
     },
     "amqplib": {
-      "version": "0.5.5",
-      "resolved": "https://registry.npmjs.org/amqplib/-/amqplib-0.5.5.tgz",
-      "integrity": "sha512-sWx1hbfHbyKMw6bXOK2k6+lHL8TESWxjAx5hG8fBtT7wcxoXNIsFxZMnFyBjxt3yL14vn7WqBDe5U6BGOadtLg==",
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/amqplib/-/amqplib-0.5.6.tgz",
+      "integrity": "sha512-J4TR0WAMPBHN+tgTuhNsSObfM9eTVTZm/FNw0LyaGfbiLsBxqSameDNYpChUFXW4bnTKHDXy0ab+nuLhumnRrQ==",
       "requires": {
         "bitsyntax": "~0.1.0",
         "bluebird": "^3.5.2",
@@ -610,9 +610,9 @@
       "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ=="
     },
     "async-lock": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/async-lock/-/async-lock-1.2.2.tgz",
-      "integrity": "sha512-uczz62z2fMWOFbyo6rG4NlV2SdxugJT6sZA2QcfB1XaSjEiOh8CuOb/TttyMnYQCda6nkWecJe465tGQDPJiKw=="
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/async-lock/-/async-lock-1.2.4.tgz",
+      "integrity": "sha512-UBQJC2pbeyGutIfYmErGc9RaJYnpZ1FHaxuKwb0ahvGiiCkPUf3p67Io+YLPmmv3RHY+mF6JEtNW8FlHsraAaA=="
     },
     "asynckit": {
       "version": "0.4.0",
@@ -626,9 +626,9 @@
       "dev": true
     },
     "aws-sdk": {
-      "version": "2.669.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.669.0.tgz",
-      "integrity": "sha512-kuVcSRpDzvkgmeSmMX6Q32eTOb8UeihhUdavMrvUOP6fzSU19cNWS9HAIkYOi/jrEDK85cCZxXjxqE3JGZIGcw==",
+      "version": "2.677.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.677.0.tgz",
+      "integrity": "sha512-vzQWRh1sgM0HRNmbLXgxnFPySLQrtSNgs9dNQsksGiYrJtf1wYjJSh4UHhekeyMuorQqef3m4AY0vFWsWyZSMg==",
       "requires": {
         "buffer": "4.9.1",
         "events": "1.1.1",
@@ -1136,11 +1136,11 @@
       "dev": true
     },
     "config": {
-      "version": "3.2.5",
-      "resolved": "https://registry.npmjs.org/config/-/config-3.2.5.tgz",
-      "integrity": "sha512-8itpjyR01lAJanhAlPncBngYRZez/LoRLW8wnGi+6SEcsUyA1wvHvbpIrAJYDJT+W9BScnj4mYoUgbtp9I+0+Q==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/config/-/config-3.3.1.tgz",
+      "integrity": "sha512-+2/KaaaAzdwUBE3jgZON11L1ggLLhpf2FsGrfqYFHZW22ySGv/HqYIXrBwKKvn+XZh1UBUjHwAcrfsSkSygT+Q==",
       "requires": {
-        "json5": "^1.0.1"
+        "json5": "^2.1.1"
       }
     },
     "configstore": {
@@ -1680,16 +1680,17 @@
       "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA=="
     },
     "fast-glob": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.1.1.tgz",
-      "integrity": "sha512-nTCREpBY8w8r+boyFYAx21iL6faSsQynliPHM4Uf56SbkyohCNxpVPEH9xrF5TXKy+IsjkPUHDKiUkzBVRXn9g==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz",
+      "integrity": "sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==",
       "dev": true,
       "requires": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
         "glob-parent": "^5.1.0",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.2"
+        "micromatch": "^4.0.2",
+        "picomatch": "^2.2.1"
       },
       "dependencies": {
         "braces": {
@@ -1711,9 +1712,9 @@
           }
         },
         "glob-parent": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
-          "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
+          "version": "5.1.1",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
+          "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
           "dev": true,
           "requires": {
             "is-glob": "^4.0.1"
@@ -1768,12 +1769,12 @@
       "integrity": "sha512-5rQdinSsycpzvAoHga2EDn+LRX1d5xLFsuNG0Kg61JrAT/tASXcLL0nf/33v+sAxlQcfYmWbTURa1mmAf55jGw=="
     },
     "fastq": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.6.0.tgz",
-      "integrity": "sha512-jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz",
+      "integrity": "sha512-SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q==",
       "dev": true,
       "requires": {
-        "reusify": "^1.0.0"
+        "reusify": "^1.0.4"
       }
     },
     "fecha": {
@@ -3038,11 +3039,18 @@
       "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
     },
     "json5": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-      "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
+      "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
       "requires": {
-        "minimist": "^1.2.0"
+        "minimist": "^1.2.5"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+        }
       }
     },
     "jsonfile": {
@@ -3269,7 +3277,8 @@
     "minimist": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+      "dev": true
     },
     "mixin-deep": {
       "version": "1.3.2",
@@ -3293,18 +3302,18 @@
       }
     },
     "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
       "dev": true,
       "requires": {
-        "minimist": "0.0.8"
+        "minimist": "^1.2.5"
       },
       "dependencies": {
         "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
           "dev": true
         }
       }
@@ -3629,9 +3638,9 @@
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "picomatch": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz",
-      "integrity": "sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
       "dev": true
     },
     "pify": {
@@ -3641,23 +3650,23 @@
       "dev": true
     },
     "pkg": {
-      "version": "4.4.3",
-      "resolved": "https://registry.npmjs.org/pkg/-/pkg-4.4.3.tgz",
-      "integrity": "sha512-1M0KNVLxNUzr0CGMhccPxx02G05GL3h9czbQGLswRB2gOvHeKAbld+1S5SGDNLOoFt+IYNNxqHtBhZA6Rer7QQ==",
+      "version": "4.4.8",
+      "resolved": "https://registry.npmjs.org/pkg/-/pkg-4.4.8.tgz",
+      "integrity": "sha512-Fqqv0iaX48U3CFZxd6Dq6JKe7BrAWbgRAqMJkz/m8W3H5cqJ6suvsUWe5AJPRlN/AhbBYXBJ0XG9QlYPTXcVFA==",
       "dev": true,
       "requires": {
-        "@babel/parser": "^7.7.5",
-        "@babel/runtime": "^7.7.5",
+        "@babel/parser": "^7.9.4",
+        "@babel/runtime": "^7.9.2",
         "chalk": "^3.0.0",
-        "escodegen": "^1.13.0",
+        "escodegen": "^1.14.1",
         "fs-extra": "^8.1.0",
         "globby": "^11.0.0",
         "into-stream": "^5.1.1",
-        "minimist": "^1.2.0",
+        "minimist": "^1.2.5",
         "multistream": "^2.1.1",
-        "pkg-fetch": "^2.6.4",
+        "pkg-fetch": "^2.6.7",
         "progress": "^2.0.3",
-        "resolve": "^1.15.0",
+        "resolve": "^1.15.1",
         "stream-meter": "^1.0.4"
       },
       "dependencies": {
@@ -3713,6 +3722,12 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+          "dev": true
+        },
         "supports-color": {
           "version": "7.1.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
@@ -3725,17 +3740,17 @@
       }
     },
     "pkg-fetch": {
-      "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-2.6.4.tgz",
-      "integrity": "sha512-4j4jiuo6RRIuD9e9xUE6OQYnIkQCArZjkHXNYsSJjxhJeiHE16MA+rENMblvGLbeWsTY3BPfcYVCGFXzpfJetA==",
+      "version": "2.6.8",
+      "resolved": "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-2.6.8.tgz",
+      "integrity": "sha512-CFG7jOeVD38lltLGA7xCJxYsD//GKLjl1P9tc/n9By2a4WEHQjfkBMrYdMS8WOHVP+r9L20fsZNbaKcubDAiQg==",
       "dev": true,
       "requires": {
-        "@babel/runtime": "^7.7.5",
+        "@babel/runtime": "^7.9.2",
         "byline": "^5.0.0",
         "chalk": "^3.0.0",
         "expand-template": "^2.0.3",
         "fs-extra": "^8.1.0",
-        "minimist": "^1.2.0",
+        "minimist": "^1.2.5",
         "progress": "^2.0.3",
         "request": "^2.88.0",
         "request-progress": "^3.0.0",
@@ -3795,6 +3810,12 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "minimist": {
+          "version": "1.2.5",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+          "dev": true
+        },
         "supports-color": {
           "version": "7.1.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
@@ -3858,6 +3879,13 @@
         "@types/long": "^4.0.1",
         "@types/node": "^13.7.0",
         "long": "^4.0.0"
+      },
+      "dependencies": {
+        "@types/node": {
+          "version": "13.13.6",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-13.13.6.tgz",
+          "integrity": "sha512-zqRj8ugfROCjXCNbmPBe2mmQ0fJWP9lQaN519hwunOgpHgVykme4G6FW95++dyNFDvJUk4rtExkVkL0eciu5NA=="
+        }
       }
     },
     "pseudomap": {
@@ -3963,9 +3991,9 @@
       }
     },
     "regenerator-runtime": {
-      "version": "0.13.3",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
-      "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==",
+      "version": "0.13.5",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
+      "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==",
       "dev": true
     },
     "regex-not": {
@@ -4057,9 +4085,9 @@
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
     },
     "resolve": {
-      "version": "1.15.1",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz",
-      "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==",
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
       "dev": true,
       "requires": {
         "path-parse": "^1.0.6"
@@ -4103,9 +4131,9 @@
       "dev": true
     },
     "rhea": {
-      "version": "1.0.20",
-      "resolved": "https://registry.npmjs.org/rhea/-/rhea-1.0.20.tgz",
-      "integrity": "sha512-qj4LSEykJ0SEYESQLg9Vee6VXH5xHN1pYj7ozPeUk+l+S1OaGKx1FugAu+g+3pPwK46WXV1PJD9XiRx8+tS4cw==",
+      "version": "1.0.21",
+      "resolved": "https://registry.npmjs.org/rhea/-/rhea-1.0.21.tgz",
+      "integrity": "sha512-9ddxyJR0nlWmynukzZTWN+bSYWu7KLHVMkIH/7PpFG5RHfV5t7zXIfZ6rqJSJe9wBAgnNr2Xz41KM2nPujWiFQ==",
       "requires": {
         "debug": "0.8.0 - 3.5.0"
       }
@@ -4670,9 +4698,9 @@
       "integrity": "sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="
     },
     "tslib": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz",
-      "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA=="
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz",
+      "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="
     },
     "tunnel": {
       "version": "0.0.6",
--- a/msa/js-executor/package.json
View file @8808d66
+++ b/msa/js-executor/package.json
View file @8808d66
@@ -12,14 +12,14 @@
     "start-prod": "NODE_ENV=production nodemon server.js"
   },
   "dependencies": {
-    "config": "^3.2.2",
+    "@azure/service-bus": "^1.1.7",
+    "@google-cloud/pubsub": "^1.7.3",
+    "amqplib": "^0.5.6",
+    "aws-sdk": "^2.677.0",
+    "azure-sb": "^0.11.1",
+    "config": "^3.3.1",
     "js-yaml": "^3.12.0",
     "kafkajs": "^1.12.0",
-    "@google-cloud/pubsub": "^1.7.1",
-    "aws-sdk": "^2.663.0",
-    "amqplib": "^0.5.5",
-    "@azure/service-bus": "^1.1.6",
-    "azure-sb": "^0.11.1",
     "long": "^4.0.0",
     "uuid-parse": "^1.0.0",
     "uuid-random": "^1.3.0",
@@ -40,7 +40,7 @@
   "devDependencies": {
     "fs-extra": "^6.0.1",
     "nodemon": "^1.17.5",
-    "pkg": "^4.4.0"
+    "pkg": "^4.4.8"
   },
   "pkg": {
     "assets": [
--- a/msa/js-executor/queue/awsSqsTemplate.js
View file @8808d66
+++ b/msa/js-executor/queue/awsSqsTemplate.js
View file @8808d66
@@ -100,7 +100,7 @@ function AwsSqsProducer() {
         const params = {
             MaxNumberOfMessages: 10,
             QueueUrl: requestQueueURL,
-            WaitTimeSeconds: poolInterval / 1000
+            WaitTimeSeconds: pollInterval / 1000
         };
         while (!stopped) {
             let pollStartTs = new Date().getTime();
--- a/msa/js-executor/queue/rabbitmqTemplate.js
View file @8808d66
+++ b/msa/js-executor/queue/rabbitmqTemplate.js
View file @8808d66
@@ -68,9 +68,8 @@ function RabbitMqProducer() {
 (async () => {
     try {
         logger.info('Starting ThingsBoard JavaScript Executor Microservice...');
-        const url = `amqp://${host}:${port}${vhost}`;
+        const url = `amqp://${username}:${password}@${host}:${port}${vhost}`;
-        amqp.credentials.amqplain(username, password);
         connection = await new Promise((resolve, reject) => {
             amqp.connect(url, function (err, connection) {
                 if (err) {
--- a/pom.xml
View file @8808d66
+++ b/pom.xml
View file @8808d66
@@ -61,15 +61,14 @@
         <akka.version>2.6.3</akka.version>
         <californium.version>1.0.2</californium.version>
         <gson.version>2.6.2</gson.version>
-        <velocity.version>1.7</velocity.version>
-        <velocity-tools.version>2.0</velocity-tools.version>
+        <freemarker.version>2.3.30</freemarker.version>
         <mail.version>1.6.2</mail.version>
         <curator.version>4.2.0</curator.version>
         <zookeeper.version>3.5.5</zookeeper.version>
         <protobuf.version>3.11.4</protobuf.version>
         <grpc.version>1.22.1</grpc.version>
         <lombok.version>1.16.18</lombok.version>
-        <paho.client.version>1.1.0</paho.client.version>
+        <paho.client.version>1.2.4</paho.client.version>
         <netty.version>4.1.49.Final</netty.version>
         <os-maven-plugin.version>1.5.0</os-maven-plugin.version>
         <rabbitmq.version>4.8.0</rabbitmq.version>
@@ -565,28 +564,9 @@
                 <version>${jjwt.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.velocity</groupId>
-                <artifactId>velocity</artifactId>
-                <version>${velocity.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.velocity</groupId>
-                <artifactId>velocity-tools</artifactId>
-                <version>${velocity-tools.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>servlet-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>dom4j</groupId>
-                        <artifactId>dom4j</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>antlr</groupId>
-                        <artifactId>antlr</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>org.freemarker</groupId>
+                <artifactId>freemarker</artifactId>
+                <version>${freemarker.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.yaml</groupId>
@@ -975,11 +955,6 @@
                 <version>${commons-collections.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.yaml</groupId>
-                <artifactId>snakeyaml</artifactId>
-                <version>${snakeyaml.version}</version>
-            </dependency>
-            <dependency>
                 <groupId>org.apache.struts</groupId>
                 <artifactId>struts-core</artifactId>
                 <version>${struts.version}</version>
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbSendEmailNode.java
View file @8808d66
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbSendEmailNode.java
View file @8808d66
@@ -147,6 +147,16 @@ public class TbSendEmailNode implements TbNode {
         if (this.config.isEnableTls() && StringUtils.isNoneEmpty(this.config.getTlsVersion())) {
             javaMailProperties.put(MAIL_PROP + protocol + ".ssl.protocols", this.config.getTlsVersion());
         }
+        if (this.config.isEnableProxy()) {
+            javaMailProperties.put(MAIL_PROP + protocol + ".proxy.host", config.getProxyHost());
+            javaMailProperties.put(MAIL_PROP + protocol + ".proxy.port", config.getProxyPort());
+            if (StringUtils.isNoneEmpty(config.getProxyUser())) {
+                javaMailProperties.put(MAIL_PROP + protocol + ".proxy.user", config.getProxyUser());
+            }
+            if (StringUtils.isNoneEmpty(config.getProxyPassword())) {
+                javaMailProperties.put(MAIL_PROP + protocol + ".proxy.password", config.getProxyPassword());
+            }
+        }
         return javaMailProperties;
     }
 }
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbSendEmailNodeConfiguration.java
View file @8808d66
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbSendEmailNodeConfiguration.java
View file @8808d66
@@ -30,6 +30,11 @@ public class TbSendEmailNodeConfiguration implements NodeConfiguration {
     private int timeout;
     private boolean enableTls;
     private String tlsVersion;
+    private boolean enableProxy;
+    private String proxyHost;
+    private String proxyPort;
+    private String proxyUser;
+    private String proxyPassword;
     @Override
     public TbSendEmailNodeConfiguration defaultConfiguration() {
@@ -41,6 +46,7 @@ public class TbSendEmailNodeConfiguration implements NodeConfiguration {
         configuration.setTimeout(10000);
         configuration.setEnableTls(false);
         configuration.setTlsVersion("TLSv1.2");
+        configuration.setEnableProxy(false);
         return configuration;
     }
 }
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbSynchronizationBeginNode.java
View file @8808d66
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbSynchronizationBeginNode.java
View file @8808d66
@@ -48,7 +48,7 @@ public class TbSynchronizationBeginNode implements TbNode {
     @Override
     public void onMsg(TbContext ctx, TbMsg msg) {
-        log.warn("Synchronization Start/End nodes are deprecated since TB 2.5. Use queue with submit strategy SEQUENTIAL_WITHIN_ORIGINATOR instead.");
+        log.warn("Synchronization Start/End nodes are deprecated since TB 2.5. Use queue with submit strategy SEQUENTIAL_BY_ORIGINATOR instead.");
         ctx.tellSuccess(msg);
     }
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbSynchronizationEndNode.java
View file @8808d66
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/transaction/TbSynchronizationEndNode.java
View file @8808d66
@@ -49,7 +49,7 @@ public class TbSynchronizationEndNode implements TbNode {
     @Override
     public void onMsg(TbContext ctx, TbMsg msg) {
-        log.warn("Synchronization Start/End nodes are deprecated since TB 2.5. Use queue with submit strategy SEQUENTIAL_WITHIN_ORIGINATOR instead.");
+        log.warn("Synchronization Start/End nodes are deprecated since TB 2.5. Use queue with submit strategy SEQUENTIAL_BY_ORIGINATOR instead.");
         ctx.tellSuccess(msg);
     }
--- a/transport/coap/src/main/resources/tb-coap-transport.yml
View file @8808d66
+++ b/transport/coap/src/main/resources/tb-coap-transport.yml
View file @8808d66
@@ -155,19 +155,19 @@ queue:
     pack-processing-timeout: "${TB_QUEUE_RULE_ENGINE_PACK_PROCESSING_TIMEOUT_MS:60000}"
     stats:
       enabled: "${TB_QUEUE_RULE_ENGINE_STATS_ENABLED:true}"
-      print-interval-ms: "${TB_QUEUE_RULE_ENGINE_STATS_PRINT_INTERVAL_MS:10000}"
+      print-interval-ms: "${TB_QUEUE_RULE_ENGINE_STATS_PRINT_INTERVAL_MS:60000}"
     queues:
-      - name: "Main"
+      - name: "${TB_QUEUE_RE_MAIN_QUEUE_NAME:Main}"
         topic: "${TB_QUEUE_RE_MAIN_TOPIC:tb_rule_engine.main}"
         poll-interval: "${TB_QUEUE_RE_MAIN_POLL_INTERVAL_MS:25}"
         partitions: "${TB_QUEUE_RE_MAIN_PARTITIONS:10}"
         pack-processing-timeout: "${TB_QUEUE_RE_MAIN_PACK_PROCESSING_TIMEOUT_MS:60000}"
         submit-strategy:
-          type: "${TB_QUEUE_RE_MAIN_SUBMIT_STRATEGY_TYPE:BURST}" # BURST, BATCH, SEQUENTIAL_WITHIN_ORIGINATOR, SEQUENTIAL_WITHIN_TENANT, SEQUENTIAL
+          type: "${TB_QUEUE_RE_MAIN_SUBMIT_STRATEGY_TYPE:BURST}" # BURST, BATCH, SEQUENTIAL_BY_ORIGINATOR, SEQUENTIAL_BY_TENANT, SEQUENTIAL
           # For BATCH only
           batch-size: "${TB_QUEUE_RE_MAIN_SUBMIT_STRATEGY_BATCH_SIZE:1000}" # Maximum number of messages in batch
         processing-strategy:
-          type: "${TB_QUEUE_RE_MAIN_PROCESSING_STRATEGY_TYPE:RETRY_FAILED_AND_TIMED_OUT}" # SKIP_ALL_FAILURES, RETRY_ALL, RETRY_FAILED, RETRY_TIMED_OUT, RETRY_FAILED_AND_TIMED_OUT
+          type: "${TB_QUEUE_RE_MAIN_PROCESSING_STRATEGY_TYPE:SKIP_ALL_FAILURES}" # SKIP_ALL_FAILURES, RETRY_ALL, RETRY_FAILED, RETRY_TIMED_OUT, RETRY_FAILED_AND_TIMED_OUT
           # For RETRY_ALL, RETRY_FAILED, RETRY_TIMED_OUT, RETRY_FAILED_AND_TIMED_OUT
           retries: "${TB_QUEUE_RE_MAIN_PROCESSING_STRATEGY_RETRIES:3}" # Number of retries, 0 is unlimited
           failure-percentage: "${TB_QUEUE_RE_MAIN_PROCESSING_STRATEGY_FAILURE_PERCENTAGE:0}" # Skip retry if failures or timeouts are less then X percentage of messages;
@@ -175,10 +175,10 @@ queue:
       - name: "${TB_QUEUE_RE_HP_QUEUE_NAME:HighPriority}"
         topic: "${TB_QUEUE_RE_HP_TOPIC:tb_rule_engine.hp}"
         poll-interval: "${TB_QUEUE_RE_HP_POLL_INTERVAL_MS:25}"
-        partitions: "${TB_QUEUE_RE_HP_PARTITIONS:3}"
+        partitions: "${TB_QUEUE_RE_HP_PARTITIONS:10}"
         pack-processing-timeout: "${TB_QUEUE_RE_HP_PACK_PROCESSING_TIMEOUT_MS:60000}"
         submit-strategy:
-          type: "${TB_QUEUE_RE_HP_SUBMIT_STRATEGY_TYPE:SEQUENTIAL_WITHIN_ORIGINATOR}" # BURST, BATCH, SEQUENTIAL_WITHIN_ORIGINATOR, SEQUENTIAL_WITHIN_TENANT, SEQUENTIAL
+          type: "${TB_QUEUE_RE_HP_SUBMIT_STRATEGY_TYPE:BURST}" # BURST, BATCH, SEQUENTIAL_BY_ORIGINATOR, SEQUENTIAL_BY_TENANT, SEQUENTIAL
           # For BATCH only
           batch-size: "${TB_QUEUE_RE_HP_SUBMIT_STRATEGY_BATCH_SIZE:100}" # Maximum number of messages in batch
         processing-strategy:
@@ -187,6 +187,21 @@ queue:
           retries: "${TB_QUEUE_RE_HP_PROCESSING_STRATEGY_RETRIES:0}" # Number of retries, 0 is unlimited
           failure-percentage: "${TB_QUEUE_RE_HP_PROCESSING_STRATEGY_FAILURE_PERCENTAGE:0}" # Skip retry if failures or timeouts are less then X percentage of messages;
           pause-between-retries: "${TB_QUEUE_RE_HP_PROCESSING_STRATEGY_RETRY_PAUSE:5}"# Time in seconds to wait in consumer thread before retries;
+      - name: "${TB_QUEUE_RE_SQ_QUEUE_NAME:SequentialByOriginator}"
+        topic: "${TB_QUEUE_RE_SQ_TOPIC:tb_rule_engine.sq}"
+        poll-interval: "${TB_QUEUE_RE_SQ_POLL_INTERVAL_MS:25}"
+        partitions: "${TB_QUEUE_RE_SQ_PARTITIONS:10}"
+        pack-processing-timeout: "${TB_QUEUE_RE_SQ_PACK_PROCESSING_TIMEOUT_MS:60000}"
+        submit-strategy:
+          type: "${TB_QUEUE_RE_SQ_SUBMIT_STRATEGY_TYPE:SEQUENTIAL_BY_ORIGINATOR}" # BURST, BATCH, SEQUENTIAL_BY_ORIGINATOR, SEQUENTIAL_BY_TENANT, SEQUENTIAL
+          # For BATCH only
+          batch-size: "${TB_QUEUE_RE_SQ_SUBMIT_STRATEGY_BATCH_SIZE:100}" # Maximum number of messages in batch
+        processing-strategy:
+          type: "${TB_QUEUE_RE_SQ_PROCESSING_STRATEGY_TYPE:RETRY_FAILED_AND_TIMED_OUT}" # SKIP_ALL_FAILURES, RETRY_ALL, RETRY_FAILED, RETRY_TIMED_OUT, RETRY_FAILED_AND_TIMED_OUT
+          # For RETRY_ALL, RETRY_FAILED, RETRY_TIMED_OUT, RETRY_FAILED_AND_TIMED_OUT
+          retries: "${TB_QUEUE_RE_SQ_PROCESSING_STRATEGY_RETRIES:3}" # Number of retries, 0 is unlimited
+          failure-percentage: "${TB_QUEUE_RE_SQ_PROCESSING_STRATEGY_FAILURE_PERCENTAGE:0}" # Skip retry if failures or timeouts are less then X percentage of messages;
+          pause-between-retries: "${TB_QUEUE_RE_SQ_PROCESSING_STRATEGY_RETRY_PAUSE:5}"# Time in seconds to wait in consumer thread before retries;
   transport:
     # For high priority notifications that require minimum latency and processing time
     notifications_topic: "${TB_QUEUE_TRANSPORT_NOTIFICATIONS_TOPIC:tb_transport.notifications}"
--- a/transport/http/src/main/resources/tb-http-transport.yml
View file @8808d66
+++ b/transport/http/src/main/resources/tb-http-transport.yml
View file @8808d66
@@ -156,19 +156,19 @@ queue:
     pack-processing-timeout: "${TB_QUEUE_RULE_ENGINE_PACK_PROCESSING_TIMEOUT_MS:60000}"
     stats:
       enabled: "${TB_QUEUE_RULE_ENGINE_STATS_ENABLED:true}"
-      print-interval-ms: "${TB_QUEUE_RULE_ENGINE_STATS_PRINT_INTERVAL_MS:10000}"
+      print-interval-ms: "${TB_QUEUE_RULE_ENGINE_STATS_PRINT_INTERVAL_MS:60000}"
     queues:
-      - name: "Main"
+      - name: "${TB_QUEUE_RE_MAIN_QUEUE_NAME:Main}"
         topic: "${TB_QUEUE_RE_MAIN_TOPIC:tb_rule_engine.main}"
         poll-interval: "${TB_QUEUE_RE_MAIN_POLL_INTERVAL_MS:25}"
         partitions: "${TB_QUEUE_RE_MAIN_PARTITIONS:10}"
         pack-processing-timeout: "${TB_QUEUE_RE_MAIN_PACK_PROCESSING_TIMEOUT_MS:60000}"
         submit-strategy:
-          type: "${TB_QUEUE_RE_MAIN_SUBMIT_STRATEGY_TYPE:BURST}" # BURST, BATCH, SEQUENTIAL_WITHIN_ORIGINATOR, SEQUENTIAL_WITHIN_TENANT, SEQUENTIAL
+          type: "${TB_QUEUE_RE_MAIN_SUBMIT_STRATEGY_TYPE:BURST}" # BURST, BATCH, SEQUENTIAL_BY_ORIGINATOR, SEQUENTIAL_BY_TENANT, SEQUENTIAL
           # For BATCH only
           batch-size: "${TB_QUEUE_RE_MAIN_SUBMIT_STRATEGY_BATCH_SIZE:1000}" # Maximum number of messages in batch
         processing-strategy:
-          type: "${TB_QUEUE_RE_MAIN_PROCESSING_STRATEGY_TYPE:RETRY_FAILED_AND_TIMED_OUT}" # SKIP_ALL_FAILURES, RETRY_ALL, RETRY_FAILED, RETRY_TIMED_OUT, RETRY_FAILED_AND_TIMED_OUT
+          type: "${TB_QUEUE_RE_MAIN_PROCESSING_STRATEGY_TYPE:SKIP_ALL_FAILURES}" # SKIP_ALL_FAILURES, RETRY_ALL, RETRY_FAILED, RETRY_TIMED_OUT, RETRY_FAILED_AND_TIMED_OUT
           # For RETRY_ALL, RETRY_FAILED, RETRY_TIMED_OUT, RETRY_FAILED_AND_TIMED_OUT
           retries: "${TB_QUEUE_RE_MAIN_PROCESSING_STRATEGY_RETRIES:3}" # Number of retries, 0 is unlimited
           failure-percentage: "${TB_QUEUE_RE_MAIN_PROCESSING_STRATEGY_FAILURE_PERCENTAGE:0}" # Skip retry if failures or timeouts are less then X percentage of messages;
@@ -176,10 +176,10 @@ queue:
       - name: "${TB_QUEUE_RE_HP_QUEUE_NAME:HighPriority}"
         topic: "${TB_QUEUE_RE_HP_TOPIC:tb_rule_engine.hp}"
         poll-interval: "${TB_QUEUE_RE_HP_POLL_INTERVAL_MS:25}"
-        partitions: "${TB_QUEUE_RE_HP_PARTITIONS:3}"
+        partitions: "${TB_QUEUE_RE_HP_PARTITIONS:10}"
         pack-processing-timeout: "${TB_QUEUE_RE_HP_PACK_PROCESSING_TIMEOUT_MS:60000}"
         submit-strategy:
-          type: "${TB_QUEUE_RE_HP_SUBMIT_STRATEGY_TYPE:SEQUENTIAL_WITHIN_ORIGINATOR}" # BURST, BATCH, SEQUENTIAL_WITHIN_ORIGINATOR, SEQUENTIAL_WITHIN_TENANT, SEQUENTIAL
+          type: "${TB_QUEUE_RE_HP_SUBMIT_STRATEGY_TYPE:BURST}" # BURST, BATCH, SEQUENTIAL_BY_ORIGINATOR, SEQUENTIAL_BY_TENANT, SEQUENTIAL
           # For BATCH only
           batch-size: "${TB_QUEUE_RE_HP_SUBMIT_STRATEGY_BATCH_SIZE:100}" # Maximum number of messages in batch
         processing-strategy:
@@ -188,6 +188,21 @@ queue:
           retries: "${TB_QUEUE_RE_HP_PROCESSING_STRATEGY_RETRIES:0}" # Number of retries, 0 is unlimited
           failure-percentage: "${TB_QUEUE_RE_HP_PROCESSING_STRATEGY_FAILURE_PERCENTAGE:0}" # Skip retry if failures or timeouts are less then X percentage of messages;
           pause-between-retries: "${TB_QUEUE_RE_HP_PROCESSING_STRATEGY_RETRY_PAUSE:5}"# Time in seconds to wait in consumer thread before retries;
+      - name: "${TB_QUEUE_RE_SQ_QUEUE_NAME:SequentialByOriginator}"
+        topic: "${TB_QUEUE_RE_SQ_TOPIC:tb_rule_engine.sq}"
+        poll-interval: "${TB_QUEUE_RE_SQ_POLL_INTERVAL_MS:25}"
+        partitions: "${TB_QUEUE_RE_SQ_PARTITIONS:10}"
+        pack-processing-timeout: "${TB_QUEUE_RE_SQ_PACK_PROCESSING_TIMEOUT_MS:60000}"
+        submit-strategy:
+          type: "${TB_QUEUE_RE_SQ_SUBMIT_STRATEGY_TYPE:SEQUENTIAL_BY_ORIGINATOR}" # BURST, BATCH, SEQUENTIAL_BY_ORIGINATOR, SEQUENTIAL_BY_TENANT, SEQUENTIAL
+          # For BATCH only
+          batch-size: "${TB_QUEUE_RE_SQ_SUBMIT_STRATEGY_BATCH_SIZE:100}" # Maximum number of messages in batch
+        processing-strategy:
+          type: "${TB_QUEUE_RE_SQ_PROCESSING_STRATEGY_TYPE:RETRY_FAILED_AND_TIMED_OUT}" # SKIP_ALL_FAILURES, RETRY_ALL, RETRY_FAILED, RETRY_TIMED_OUT, RETRY_FAILED_AND_TIMED_OUT
+          # For RETRY_ALL, RETRY_FAILED, RETRY_TIMED_OUT, RETRY_FAILED_AND_TIMED_OUT
+          retries: "${TB_QUEUE_RE_SQ_PROCESSING_STRATEGY_RETRIES:3}" # Number of retries, 0 is unlimited
+          failure-percentage: "${TB_QUEUE_RE_SQ_PROCESSING_STRATEGY_FAILURE_PERCENTAGE:0}" # Skip retry if failures or timeouts are less then X percentage of messages;
+          pause-between-retries: "${TB_QUEUE_RE_SQ_PROCESSING_STRATEGY_RETRY_PAUSE:5}"# Time in seconds to wait in consumer thread before retries;
   transport:
     # For high priority notifications that require minimum latency and processing time
     notifications_topic: "${TB_QUEUE_TRANSPORT_NOTIFICATIONS_TOPIC:tb_transport.notifications}"
--- a/transport/mqtt/src/main/resources/tb-mqtt-transport.yml
View file @8808d66
+++ b/transport/mqtt/src/main/resources/tb-mqtt-transport.yml
View file @8808d66
@@ -176,19 +176,19 @@ queue:
     pack-processing-timeout: "${TB_QUEUE_RULE_ENGINE_PACK_PROCESSING_TIMEOUT_MS:60000}"
     stats:
       enabled: "${TB_QUEUE_RULE_ENGINE_STATS_ENABLED:true}"
-      print-interval-ms: "${TB_QUEUE_RULE_ENGINE_STATS_PRINT_INTERVAL_MS:10000}"
+      print-interval-ms: "${TB_QUEUE_RULE_ENGINE_STATS_PRINT_INTERVAL_MS:60000}"
     queues:
-      - name: "Main"
+      - name: "${TB_QUEUE_RE_MAIN_QUEUE_NAME:Main}"
         topic: "${TB_QUEUE_RE_MAIN_TOPIC:tb_rule_engine.main}"
         poll-interval: "${TB_QUEUE_RE_MAIN_POLL_INTERVAL_MS:25}"
         partitions: "${TB_QUEUE_RE_MAIN_PARTITIONS:10}"
         pack-processing-timeout: "${TB_QUEUE_RE_MAIN_PACK_PROCESSING_TIMEOUT_MS:60000}"
         submit-strategy:
-          type: "${TB_QUEUE_RE_MAIN_SUBMIT_STRATEGY_TYPE:BURST}" # BURST, BATCH, SEQUENTIAL_WITHIN_ORIGINATOR, SEQUENTIAL_WITHIN_TENANT, SEQUENTIAL
+          type: "${TB_QUEUE_RE_MAIN_SUBMIT_STRATEGY_TYPE:BURST}" # BURST, BATCH, SEQUENTIAL_BY_ORIGINATOR, SEQUENTIAL_BY_TENANT, SEQUENTIAL
           # For BATCH only
           batch-size: "${TB_QUEUE_RE_MAIN_SUBMIT_STRATEGY_BATCH_SIZE:1000}" # Maximum number of messages in batch
         processing-strategy:
-          type: "${TB_QUEUE_RE_MAIN_PROCESSING_STRATEGY_TYPE:RETRY_FAILED_AND_TIMED_OUT}" # SKIP_ALL_FAILURES, RETRY_ALL, RETRY_FAILED, RETRY_TIMED_OUT, RETRY_FAILED_AND_TIMED_OUT
+          type: "${TB_QUEUE_RE_MAIN_PROCESSING_STRATEGY_TYPE:SKIP_ALL_FAILURES}" # SKIP_ALL_FAILURES, RETRY_ALL, RETRY_FAILED, RETRY_TIMED_OUT, RETRY_FAILED_AND_TIMED_OUT
           # For RETRY_ALL, RETRY_FAILED, RETRY_TIMED_OUT, RETRY_FAILED_AND_TIMED_OUT
           retries: "${TB_QUEUE_RE_MAIN_PROCESSING_STRATEGY_RETRIES:3}" # Number of retries, 0 is unlimited
           failure-percentage: "${TB_QUEUE_RE_MAIN_PROCESSING_STRATEGY_FAILURE_PERCENTAGE:0}" # Skip retry if failures or timeouts are less then X percentage of messages;
@@ -196,10 +196,10 @@ queue:
       - name: "${TB_QUEUE_RE_HP_QUEUE_NAME:HighPriority}"
         topic: "${TB_QUEUE_RE_HP_TOPIC:tb_rule_engine.hp}"
         poll-interval: "${TB_QUEUE_RE_HP_POLL_INTERVAL_MS:25}"
-        partitions: "${TB_QUEUE_RE_HP_PARTITIONS:3}"
+        partitions: "${TB_QUEUE_RE_HP_PARTITIONS:10}"
         pack-processing-timeout: "${TB_QUEUE_RE_HP_PACK_PROCESSING_TIMEOUT_MS:60000}"
         submit-strategy:
-          type: "${TB_QUEUE_RE_HP_SUBMIT_STRATEGY_TYPE:SEQUENTIAL_WITHIN_ORIGINATOR}" # BURST, BATCH, SEQUENTIAL_WITHIN_ORIGINATOR, SEQUENTIAL_WITHIN_TENANT, SEQUENTIAL
+          type: "${TB_QUEUE_RE_HP_SUBMIT_STRATEGY_TYPE:BURST}" # BURST, BATCH, SEQUENTIAL_BY_ORIGINATOR, SEQUENTIAL_BY_TENANT, SEQUENTIAL
           # For BATCH only
           batch-size: "${TB_QUEUE_RE_HP_SUBMIT_STRATEGY_BATCH_SIZE:100}" # Maximum number of messages in batch
         processing-strategy:
@@ -208,6 +208,21 @@ queue:
           retries: "${TB_QUEUE_RE_HP_PROCESSING_STRATEGY_RETRIES:0}" # Number of retries, 0 is unlimited
           failure-percentage: "${TB_QUEUE_RE_HP_PROCESSING_STRATEGY_FAILURE_PERCENTAGE:0}" # Skip retry if failures or timeouts are less then X percentage of messages;
           pause-between-retries: "${TB_QUEUE_RE_HP_PROCESSING_STRATEGY_RETRY_PAUSE:5}"# Time in seconds to wait in consumer thread before retries;
+      - name: "${TB_QUEUE_RE_SQ_QUEUE_NAME:SequentialByOriginator}"
+        topic: "${TB_QUEUE_RE_SQ_TOPIC:tb_rule_engine.sq}"
+        poll-interval: "${TB_QUEUE_RE_SQ_POLL_INTERVAL_MS:25}"
+        partitions: "${TB_QUEUE_RE_SQ_PARTITIONS:10}"
+        pack-processing-timeout: "${TB_QUEUE_RE_SQ_PACK_PROCESSING_TIMEOUT_MS:60000}"
+        submit-strategy:
+          type: "${TB_QUEUE_RE_SQ_SUBMIT_STRATEGY_TYPE:SEQUENTIAL_BY_ORIGINATOR}" # BURST, BATCH, SEQUENTIAL_BY_ORIGINATOR, SEQUENTIAL_BY_TENANT, SEQUENTIAL
+          # For BATCH only
+          batch-size: "${TB_QUEUE_RE_SQ_SUBMIT_STRATEGY_BATCH_SIZE:100}" # Maximum number of messages in batch
+        processing-strategy:
+          type: "${TB_QUEUE_RE_SQ_PROCESSING_STRATEGY_TYPE:RETRY_FAILED_AND_TIMED_OUT}" # SKIP_ALL_FAILURES, RETRY_ALL, RETRY_FAILED, RETRY_TIMED_OUT, RETRY_FAILED_AND_TIMED_OUT
+          # For RETRY_ALL, RETRY_FAILED, RETRY_TIMED_OUT, RETRY_FAILED_AND_TIMED_OUT
+          retries: "${TB_QUEUE_RE_SQ_PROCESSING_STRATEGY_RETRIES:3}" # Number of retries, 0 is unlimited
+          failure-percentage: "${TB_QUEUE_RE_SQ_PROCESSING_STRATEGY_FAILURE_PERCENTAGE:0}" # Skip retry if failures or timeouts are less then X percentage of messages;
+          pause-between-retries: "${TB_QUEUE_RE_SQ_PROCESSING_STRATEGY_RETRY_PAUSE:5}"# Time in seconds to wait in consumer thread before retries;
   transport:
     # For high priority notifications that require minimum latency and processing time
     notifications_topic: "${TB_QUEUE_TRANSPORT_NOTIFICATIONS_TOPIC:tb_transport.notifications}"
--- a/ui-ngx/package-lock.json
View file @8808d66
+++ b/ui-ngx/package-lock.json
View file @8808d66
@@ -7969,14 +7969,6 @@
       "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.6.0.tgz",
       "integrity": "sha512-CPkhyqWUKZKFJ6K8umN5/D2wrJ2+/8UIpXppY7QDnUZW5bZL5+SEI2J7GBpwh4LIupOKqbNSQXgqmrEJopHVNQ=="
     },
-    "leaflet-geometryutil": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/leaflet-geometryutil/-/leaflet-geometryutil-0.9.3.tgz",
-      "integrity": "sha512-Wi6YvfNx/Xu9q35AEfXpsUXmIFLen/MO+C2qimxHRnjyeyOxBhdcZa6kSiReaOX0cGK7yQInqrzz0dkIqZ8Dpg==",
-      "requires": {
-        "leaflet": ">=0.7.0"
-      }
-    },
     "leaflet-polylinedecorator": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/leaflet-polylinedecorator/-/leaflet-polylinedecorator-1.6.0.tgz",
--- a/ui-ngx/package.json
View file @8808d66
+++ b/ui-ngx/package.json
View file @8808d66
@@ -58,7 +58,6 @@
     "jstree-bootstrap-theme": "^1.0.1",
     "jszip": "^3.4.0",
     "leaflet": "^1.6.0",
-    "leaflet-geometryutil": "^0.9.3",
     "leaflet-polylinedecorator": "^1.6.0",
     "leaflet-providers": "^1.9.1",
     "leaflet.gridlayer.googlemutant": "0.8.0",
--- a/ui-ngx/src/app/core/utils.ts
View file @8808d66
+++ b/ui-ngx/src/app/core/utils.ts
View file @8808d66
@@ -496,7 +496,7 @@ export function padValue(val: any, dec: number): string {
   val = Math.abs(val);
   if (dec > 0) {
-    strVal = val.toFixed(dec).toString()
+    strVal = val.toFixed(dec);
   } else {
     strVal = Math.round(val).toString();
   }
--- a/ui-ngx/src/app/modules/home/components/widget/dialog/custom-dialog-container.component.ts
View file @8808d66
+++ b/ui-ngx/src/app/modules/home/components/widget/dialog/custom-dialog-container.component.ts
View file @8808d66
@@ -18,7 +18,7 @@ import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import {
   Component,
   ComponentFactory,
-  ComponentRef,
+  ComponentRef, HostBinding,
   Inject,
   Injector,
   OnDestroy,
@@ -46,6 +46,8 @@ export interface CustomDialogContainerData {
 })
 export class CustomDialogContainerComponent extends DialogComponent<CustomDialogContainerComponent> implements OnDestroy {
+  @HostBinding('style.height') height = '0px';
+
   private readonly customComponentRef: ComponentRef<CustomDialogComponent>;
   constructor(protected store: Store<AppState>,
--- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts
View file @8808d66
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts
View file @8808d66
@@ -20,12 +20,12 @@ import 'leaflet-providers';
 import 'leaflet.markercluster/dist/leaflet.markercluster';
 import {
-    FormattedData,
-    MapSettings,
-    MarkerSettings,
-    PolygonSettings,
-    PolylineSettings,
-    UnitedMapSettings
+  FormattedData,
+  MapSettings,
+  MarkerSettings,
+  PolygonSettings,
+  PolylineSettings,
+  UnitedMapSettings
 } from './map-models';
 import { Marker } from './markers';
 import { BehaviorSubject, Observable } from 'rxjs';
@@ -345,12 +345,12 @@ export default abstract class LeafletMap {
     // Polyline
-    updatePolylines(polyData: FormattedData[][]) {
-        polyData.forEach((data: FormattedData[]) => {
-            if (data.length) {
-                const dataSource = polyData.map(arr => arr[0]);
-                if (this.polylines.get(data[0].entityName)) {
-                    this.updatePolyline(data[0].entityName, data, dataSource, this.options);
+    updatePolylines(polyData: FormattedData[][], data?: FormattedData) {
+        polyData.forEach((dataSource) => {
+            if (dataSource.length) {
+                data = data || dataSource[0];
+                if (this.polylines.get(data.$datasource.entityName)) {
+                    this.updatePolyline(data, dataSource, this.options);
                 }
                 else {
                     this.createPolyline(data, dataSource, this.options);
@@ -359,28 +359,27 @@ export default abstract class LeafletMap {
         })
     }
-    createPolyline(data: FormattedData[], dataSources: FormattedData[], settings: PolylineSettings) {
-        if (data.length)
-            this.ready$.subscribe(() => {
-                const poly = new Polyline(this.map,
-                    data.map(el => this.convertPosition(el)).filter(el => !!el), data, dataSources, settings);
-                const bounds = poly.leafletPoly.getBounds();
-                this.fitBounds(bounds);
-                this.polylines.set(data[0].entityName, poly);
-            });
+    createPolyline(data: FormattedData, dataSources: FormattedData[], settings: PolylineSettings) {
+        this.ready$.subscribe(() => {
+            const poly = new Polyline(this.map,
+              dataSources.map(el => this.convertPosition(el)).filter(el => !!el), data, dataSources, settings);
+            const bounds = poly.leafletPoly.getBounds();
+            this.fitBounds(bounds);
+            this.polylines.set(data.$datasource.entityName, poly);
+        });
     }
-    updatePolyline(key: string, data: FormattedData[], dataSources: FormattedData[], settings: PolylineSettings) {
+    updatePolyline(data: FormattedData, dataSources: FormattedData[], settings: PolylineSettings) {
         this.ready$.subscribe(() => {
-            const poly = this.polylines.get(key);
+            const poly = this.polylines.get(data.entityName);
             const oldBounds = poly.leafletPoly.getBounds();
-            poly.updatePolyline(settings, data.map(el => this.convertPosition(el)), dataSources);
+            poly.updatePolyline(settings, data.map(el => this.convertPosition(el)).filter(el => !!el), dataSources);
             const newBounds = poly.leafletPoly.getBounds();
             if (oldBounds.toBBoxString() !== newBounds.toBBoxString()) {
                 this.fitBounds(newBounds);
             }
         });
-    }
+    }Я
     // Polygon
--- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts
View file @8808d66
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts
View file @8808d66
@@ -14,22 +14,28 @@
 /// limitations under the License.
 ///
-import { MapProviders, UnitedMapSettings, providerSets, hereProviders, defaultSettings } from './map-models';
+import { defaultSettings, hereProviders, MapProviders, providerSets, UnitedMapSettings } from './map-models';
 import LeafletMap from './leaflet-map';
 import {
-    commonMapSettingsSchema,
-    routeMapSettingsSchema,
-    markerClusteringSettingsSchema,
-    markerClusteringSettingsSchemaLeaflet,
-    mapProviderSchema,
-    mapPolygonSchema
+  commonMapSettingsSchema,
+  mapPolygonSchema,
+  mapProviderSchema,
+  markerClusteringSettingsSchema,
+  markerClusteringSettingsSchemaLeaflet,
+  routeMapSettingsSchema
 } from './schemes';
-import { MapWidgetStaticInterface, MapWidgetInterface } from './map-widget.interface';
-import { initSchema, addToSchema, mergeSchemes, addCondition, addGroupInfo } from '@core/schema-utils';
+import { MapWidgetInterface, MapWidgetStaticInterface } from './map-widget.interface';
+import { addCondition, addGroupInfo, addToSchema, initSchema, mergeSchemes } from '@core/schema-utils';
 import { of, Subject } from 'rxjs';
 import { WidgetContext } from '@app/modules/home/models/widget-component.models';
 import { getDefCenterPosition, parseArray, parseData, parseFunction, parseWithTranslation } from './maps-utils';
-import { JsonSettingsSchema, WidgetActionDescriptor, DatasourceType, widgetType, Datasource } from '@shared/models/widget.models';
+import {
+  Datasource,
+  DatasourceType,
+  JsonSettingsSchema,
+  WidgetActionDescriptor,
+  widgetType
+} from '@shared/models/widget.models';
 import { EntityId } from '@shared/models/id/entity-id';
 import { AttributeScope, DataKeyType, LatestTelemetry } from '@shared/models/telemetry/telemetry.models';
 import { AttributeService } from '@core/http/attribute.service';
@@ -39,7 +45,13 @@ import { UtilsService } from '@core/services/utils.service';
 // @dynamic
 export class MapWidgetController implements MapWidgetInterface {
-    constructor(public mapProvider: MapProviders, private drawRoutes: boolean, public ctx: WidgetContext, $element: HTMLElement, isEdit?) {
+    constructor(
+        public mapProvider: MapProviders,
+        private drawRoutes: boolean,
+        public ctx: WidgetContext,
+        $element: HTMLElement,
+        isEdit?: boolean
+    ) {
         if (this.map) {
             this.map.map.remove();
             delete this.map;
--- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/maps-utils.ts
View file @8808d66
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/maps-utils.ts
View file @8808d66
@@ -20,7 +20,7 @@ import { Datasource } from '@app/shared/models/widget.models';
 import _ from 'lodash';
 import { Observable, Observer, of } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { createLabelFromDatasource, hashCode, padValue } from '@core/utils';
+import { createLabelFromDatasource, hashCode, isNumber, isUndefined, padValue } from '@core/utils';
 export function createTooltip(target: L.Layer,
     settings: MarkerSettings | PolylineSettings | PolygonSettings,
@@ -43,8 +43,9 @@ export function createTooltip(target: L.Layer,
         const actions = document.getElementsByClassName('tb-custom-action');
         Array.from(actions).forEach(
             (element: HTMLElement) => {
-                if (element && settings.tooltipAction[element.id]) {
-                    element.addEventListener('click', ($event) => settings.tooltipAction[element.id]($event, datasource));
+                const actionName = element.getAttribute('data-action-name');
+                if (element && settings.tooltipAction[actionName]) {
+                    element.addEventListener('click', ($event) => settings.tooltipAction[actionName]($event, datasource));
                 }
             });
     });
@@ -55,10 +56,26 @@ export function getRatio(firsMoment: number, secondMoment: number, intermediateM
     return (intermediateMoment - firsMoment) / (secondMoment - firsMoment);
 }
-export function findAngle(startPoint, endPoint) {
-    let angle = -Math.atan2(endPoint.latitude - startPoint.latitude, endPoint.longitude - startPoint.longitude);
-    angle = angle * 180 / Math.PI;
-    return parseInt(angle.toFixed(2), 10);
+export function interpolateOnLineSegment(
+  pointA: FormattedData,
+  oointB: FormattedData,
+  latKeyName: string,
+  lngKeyName: string,
+  ratio: number
+): { [key: string]: number } {
+   return {
+    [latKeyName]: (pointA[latKeyName] + (oointB[latKeyName] - pointA[latKeyName]) * ratio),
+    [lngKeyName]: (pointA[lngKeyName] + (oointB[lngKeyName] - pointA[lngKeyName]) * ratio)
+  };
+}
+
+export function findAngle(startPoint: FormattedData, endPoint: FormattedData, latKeyName: string, lngKeyName: string): number {
+  if(isUndefined(startPoint) || isUndefined(endPoint)){
+    return 0;
+  }
+  let angle = -Math.atan2(endPoint[latKeyName] - startPoint[latKeyName], endPoint[lngKeyName] - startPoint[lngKeyName]);
+  angle = angle * 180 / Math.PI;
+  return parseInt(angle.toFixed(2), 10);
 }
@@ -111,38 +128,81 @@ export function aspectCache(imageUrl: string): Observable<number> {
 export type TranslateFunc = (key: string, defaultTranslation?: string) => string;
+const varsRegex = /\${([^}]*)}/g;
+const linkActionRegex = /<link-act name=['"]([^['"]*)['"]>([^<]*)<\/link-act>/g;
+const buttonActionRegex = /<button-act name=['"]([^['"]*)['"]>([^<]*)<\/button-act>/g;
+
+function createLinkElement(actionName: string, actionText: string): string {
+  return `<a href="#" class="tb-custom-action" data-action-name=${actionName}>${actionText}</a>`;
+}
+
+function createButtonElement(actionName: string, actionText: string) {
+  return `<button mat-button class="tb-custom-action" data-action-name=${actionName}>${actionText}</button>`;
+}
+
 function parseTemplate(template: string, data: { $datasource?: Datasource, [key: string]: any },
-                              translateFn?: TranslateFunc) {
+                       translateFn?: TranslateFunc) {
   let res = '';
   try {
-    if (template.match(/<link-act/g)) {
-      template = template.replace(/<link-act/g, '<a href="#"').replace(/link-act>/g, 'a>')
-        .replace(/name=(['"])(.*?)(['"])/g, `class='tb-custom-action' id='$2'`);
-    }
     if (translateFn) {
       template = translateFn(template);
     }
     template = createLabelFromDatasource(data.$datasource, template);
-    const formatted = template.match(/\${([^}]*):\d*}/g);
-    if (formatted)
-      formatted.forEach(value => {
-        const [variable, digits] = value.replace('${', '').replace('}', '').split(':');
-        data[variable] = padValue(data[variable], +digits);
-        if (data[variable] === 'NaN') data[variable] = '';
-        template = template.replace(value, '${' + variable + '}');
-      });
-    const variables = template.match(/\${.*?}/g);
-    if (variables) {
-      variables.forEach(variable => {
-        variable = variable.replace('${', '').replace('}', '');
-        if (!data[variable])
-          data[variable] = '';
-      })
+
+    let match = varsRegex.exec(template);
+    while (match !== null) {
+      const variable = match[0];
+      let label = match[1];
+      let valDec = 2;
+      const splitValues = label.split(':');
+      if (splitValues.length > 1) {
+        label = splitValues[0];
+        valDec = parseFloat(splitValues[1]);
+      }
+
+      if (label.startsWith('#')) {
+        const keyIndexStr = label.substring(1);
+        const n = Math.floor(Number(keyIndexStr));
+        if (String(n) === keyIndexStr && n >= 0) {
+          label = data.$datasource.dataKeys[n].label;
+        }
+      }
+
+      const value = data[label] || '';
+      let textValue: string;
+      if (isNumber(value)) {
+        textValue = padValue(value, valDec);
+      } else {
+        textValue = value;
+      }
+      template = template.split(variable).join(textValue);
+      match = varsRegex.exec(template);
     }
+
+    let actionTags: string;
+    let actionText: string;
+    let actionName: string;
+    let action: string;
+
+    match = linkActionRegex.exec(template);
+    while (match !== null) {
+      [actionTags, actionName, actionText] = match;
+      action = createLinkElement(actionName, actionText);
+      template = template.split(actionTags).join(action);
+      match = linkActionRegex.exec(template);
+    }
+
+    match = buttonActionRegex.exec(template);
+    while (match !== null) {
+      [actionTags, actionName, actionText] = match;
+      action = createButtonElement(actionName, actionText);
+      template = template.split(actionTags).join(action);
+      match = buttonActionRegex.exec(template);
+    }
+
     const compiled = _.template(template);
     res = compiled(data);
-  }
-  catch (ex) {
+  } catch (ex) {
     console.log(ex, template)
   }
   return res;
--- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/polygon.ts
View file @8808d66
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/polygon.ts
View file @8808d66
@@ -14,18 +14,18 @@
 /// limitations under the License.
 ///
-import L, { LatLngExpression, LatLngTuple, LeafletMouseEvent } from 'leaflet';
+import L, { LatLngExpression, LeafletMouseEvent } from 'leaflet';
 import { createTooltip, parseWithTranslation, safeExecute } from './maps-utils';
 import { FormattedData, PolygonSettings } from './map-models';
 export class Polygon {
     leafletPoly: L.Polygon;
-    tooltip;
-    data;
-    dataSources;
+    tooltip: L.Popup;
+    data: FormattedData;
+    dataSources: FormattedData[];
-    constructor(public map, polyData: FormattedData, dataSources, private settings: PolygonSettings) {
+    constructor(public map, polyData: FormattedData, dataSources: FormattedData[], private settings: PolygonSettings) {
         this.dataSources = dataSources;
         this.data = polyData;
         const polygonColor = this.getPolygonColor(settings);
@@ -61,7 +61,7 @@ export class Polygon {
         this.tooltip.setContent(parseWithTranslation.parseTemplate(pattern, data, true));
     }
-    updatePolygon(data:{[coordinates:string]: LatLngTuple[]}, dataSources: FormattedData[], settings: PolygonSettings) {
+    updatePolygon(data: FormattedData, dataSources: FormattedData[], settings: PolygonSettings) {
         this.data = data;
         this.dataSources = dataSources;
         this.leafletPoly.setLatLngs(data[this.settings.polygonKeyName]);
--- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/polyline.ts
View file @8808d66
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/polyline.ts
View file @8808d66
@@ -17,82 +17,83 @@
 import L, { PolylineDecoratorOptions } from 'leaflet';
 import 'leaflet-polylinedecorator';
-import { PolylineSettings } from './map-models';
+import { FormattedData, PolylineSettings } from './map-models';
 import { safeExecute } from '@home/components/widget/lib/maps/maps-utils';
 export class Polyline {
-    leafletPoly: L.Polyline;
-    polylineDecorator: L.PolylineDecorator;
-    dataSources;
-    data;
+  leafletPoly: L.Polyline;
+  polylineDecorator: L.PolylineDecorator;
+  dataSources: FormattedData[];
+  data: FormattedData;
-    constructor(private map: L.Map, locations, data, dataSources, settings: PolylineSettings) {
-        this.dataSources = dataSources;
-        this.data = data;
+  constructor(private map: L.Map, locations: L.LatLng[], data: FormattedData, dataSources: FormattedData[], settings: PolylineSettings) {
+    this.dataSources = dataSources;
+    this.data = data;
-        this.leafletPoly = L.polyline(locations,
-            this.getPolyStyle(settings)
-        ).addTo(this.map);
+    this.leafletPoly = L.polyline(locations,
+      this.getPolyStyle(settings)
+    ).addTo(this.map);
-        if (settings.usePolylineDecorator) {
-            this.polylineDecorator = L.polylineDecorator(this.leafletPoly, this.getDecoratorSettings(settings)).addTo(this.map);
-        }
+    if (settings.usePolylineDecorator) {
+      this.polylineDecorator = L.polylineDecorator(this.leafletPoly, this.getDecoratorSettings(settings)).addTo(this.map);
     }
+  }
-    getDecoratorSettings(settings: PolylineSettings): PolylineDecoratorOptions {
-        return {
-            patterns: [
-                {
-                    offset: settings.decoratorOffset,
-                    endOffset: settings.endDecoratorOffset,
-                    repeat: settings.decoratorRepeat,
-                    symbol: L.Symbol[settings.decoratorSymbol]({
-                        pixelSize: settings.decoratorSymbolSize,
-                        polygon: false,
-                        pathOptions: {
-                            color: settings.useDecoratorCustomColor ? settings.decoratorCustomColor : this.getPolyStyle(settings).color,
-                            stroke: true
-                        }
-                    })
-                }
-            ],
-            interactive: false,
-        } as PolylineDecoratorOptions
+  getDecoratorSettings(settings: PolylineSettings): PolylineDecoratorOptions {
+    return {
+      patterns: [
+        {
+          offset: settings.decoratorOffset,
+          endOffset: settings.endDecoratorOffset,
+          repeat: settings.decoratorRepeat,
+          symbol: L.Symbol[settings.decoratorSymbol]({
+            pixelSize: settings.decoratorSymbolSize,
+            polygon: false,
+            pathOptions: {
+              color: settings.useDecoratorCustomColor ? settings.decoratorCustomColor : this.getPolyStyle(settings).color,
+              stroke: true
+            }
+          })
+        }
+      ]
     }
+  }
-    updatePolyline(settings, data, dataSources) {
-        this.data = data;
-        this.dataSources = dataSources;
-        this.leafletPoly.setStyle(this.getPolyStyle(settings));
-        //  this.setPolylineLatLngs(data);
-        if (this.polylineDecorator)
-            this.polylineDecorator.setPaths(this.leafletPoly);
-    }
+  updatePolyline(locations: L.LatLng[], data: FormattedData, dataSources: FormattedData[], settings: PolylineSettings) {
+    this.data = data;
+    this.dataSources = dataSources;
+    this.leafletPoly.setLatLngs(locations);
+    this.leafletPoly.setStyle(this.getPolyStyle(settings));
+    //  this.setPolylineLatLngs(data);
+    if (this.polylineDecorator)
+      this.polylineDecorator.setPaths(this.leafletPoly);
+  }
-    getPolyStyle(settings: PolylineSettings): L.PolylineOptions {
-        return {
-            color: settings.useColorFunction ?
-                safeExecute(settings.colorFunction,
-                    [this.data, this.dataSources, this.dataSources[0]?.dsIndex]) : settings.color,
-            opacity: settings.useStrokeOpacityFunction ?
-                safeExecute(settings.strokeOpacityFunction,
-                    [this.data, this.dataSources, this.dataSources[0]?.dsIndex]) : settings.strokeOpacity,
-            weight: settings.useStrokeWeightFunction ?
-                safeExecute(settings.strokeWeightFunction,
-                    [this.data, this.dataSources, this.dataSources[0]?.dsIndex]) : settings.strokeWeight,
-        }
+  getPolyStyle(settings: PolylineSettings): L.PolylineOptions {
+    return {
+      interactive: false,
+      color: settings.useColorFunction ?
+        safeExecute(settings.colorFunction,
+          [this.data, this.dataSources, this.data.dsIndex]) : settings.color,
+      opacity: settings.useStrokeOpacityFunction ?
+        safeExecute(settings.strokeOpacityFunction,
+          [this.data, this.dataSources, this.data.dsIndex]) : settings.strokeOpacity,
+      weight: settings.useStrokeWeightFunction ?
+        safeExecute(settings.strokeWeightFunction,
+          [this.data, this.dataSources, this.data.dsIndex]) : settings.strokeWeight,
     }
+  }
-    removePolyline() {
-        this.map.removeLayer(this.leafletPoly);
-    }
+  removePolyline() {
+    this.map.removeLayer(this.leafletPoly);
+  }
-    getPolylineLatLngs() {
-        return this.leafletPoly.getLatLngs();
-    }
+  getPolylineLatLngs() {
+    return this.leafletPoly.getLatLngs();
+  }
-    setPolylineLatLngs(latLngs) {
-        this.leafletPoly.setLatLngs(latLngs);
-    }
+  setPolylineLatLngs(latLngs) {
+    this.leafletPoly.setLatLngs(latLngs);
+  }
 }
--- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/schemes.ts
View file @8808d66
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/schemes.ts
View file @8808d66
@@ -841,52 +841,57 @@ export const pathSchema =
 };
 export const pointSchema =
-{
+  {
     schema: {
-        title: 'Trip Animation Path Configuration',
-        type: 'object',
-        properties: {
-            showPoints: {
-                title: 'Show points',
-                type: 'boolean',
-                default: false
-            },
-            pointColor: {
-                title: 'Point color',
-                type: 'string'
-            },
-            pointSize: {
-                title: 'Point size (px)',
-                type: 'number',
-                default: 10
-            },
-            usePointAsAnchor: {
-                title: 'Use point as anchor',
-                type: 'boolean',
-                default: false
-            },
-            pointAsAnchorFunction: {
-                title: 'Point as anchor function: f(data, dsData, dsIndex)',
-                type: 'string'
-            },
-            pointTooltipOnRightPanel: {
-                title: 'Independant point tooltip',
-                type: 'boolean',
-                default: true
-            },
+      title: 'Trip Animation Path Configuration',
+      type: 'object',
+      properties: {
+        showPoints: {
+          title: 'Show points',
+          type: 'boolean',
+          default: false
         },
-        required: []
+        pointColor: {
+          title: 'Point color',
+          type: 'string'
+        },
+        pointSize: {
+          title: 'Point size (px)',
+          type: 'number',
+          default: 10
+        },
+        usePointAsAnchor: {
+            title: 'Use point as anchor',
+            type: 'boolean',
+            default: false
+        },
+        pointAsAnchorFunction: {
+            title: 'Point as anchor function: f(data, dsData, dsIndex)',
+            type: 'string'
+        },
+        pointTooltipOnRightPanel: {
+          title: 'Independant point tooltip',
+          type: 'boolean',
+          default: true
+        },
+      },
+      required: []
     },
     form: [
-        'showPoints', {
-            key: 'pointColor',
-            type: 'color'
-        }, 'pointSize', 'usePointAsAnchor', {
-            key: 'pointAsAnchorFunction',
-            type: 'javascript'
-        }, 'pointTooltipOnRightPanel',
+      'showPoints',
+      {
+        key: 'pointColor',
+        type: 'color'
+      },
+      'pointSize',
+      'usePointAsAnchor',
+      {
+        key: 'pointAsAnchorFunction',
+        type: 'javascript'
+      },
+      'pointTooltipOnRightPanel',
     ]
-};
+  };
 export const mapProviderSchema =
 {
--- a/ui-ngx/src/app/modules/home/components/widget/trip-animation/trip-animation.component.html
View file @8808d66
+++ b/ui-ngx/src/app/modules/home/components/widget/trip-animation/trip-animation.component.html
View file @8808d66
@@ -32,6 +32,12 @@
             [ngStyle]="{'background-color': settings.tooltipColor, 'opacity': settings.tooltipOpacity, 'color': settings.tooltipFontColor}">
         </div>
     </div>
-    <tb-history-selector *ngIf="historicalData" [settings]="settings" [intervals]="intervals" [anchors]="anchors" [useAnchors]="useAnchors"
-        (timeUpdated)="timeUpdated($event)"></tb-history-selector>
-</div>
+  <tb-history-selector *ngIf="historicalData"
+                       [settings]="settings"
+                       [minTime]="minTime"
+                       [maxTime]="maxTime"
+                       [step]="normalizationStep"
+                       [anchors]="anchors"
+                       [useAnchors]="useAnchors"
+                       (timeUpdated)="timeUpdated($event)"></tb-history-selector>
+</div>
--- a/ui-ngx/src/app/modules/home/components/widget/trip-animation/trip-animation.component.ts
View file @8808d66
+++ b/ui-ngx/src/app/modules/home/components/widget/trip-animation/trip-animation.component.ts
View file @8808d66
@@ -14,21 +14,28 @@
 /// limitations under the License.
 ///
-import L from 'leaflet';
 import _ from 'lodash';
 import tinycolor from 'tinycolor2';
-import { interpolateOnPointSegment } from 'leaflet-geometryutil';
 import { AfterViewInit, ChangeDetectorRef, Component, Input, OnInit, SecurityContext, ViewChild } from '@angular/core';
 import { MapWidgetController, TbMapWidgetV2 } from '../lib/maps/map-widget2';
-import { MapProviders, FormattedData } from '../lib/maps/map-models';
-import { initSchema, addToSchema, addGroupInfo, addCondition } from '@app/core/schema-utils';
-import { tripAnimationSchema, mapPolygonSchema, pathSchema, pointSchema } from '../lib/maps/schemes';
+import { FormattedData, MapProviders } from '../lib/maps/map-models';
+import { addCondition, addGroupInfo, addToSchema, initSchema } from '@app/core/schema-utils';
+import { mapPolygonSchema, pathSchema, pointSchema, tripAnimationSchema } from '../lib/maps/schemes';
 import { DomSanitizer } from '@angular/platform-browser';
 import { WidgetContext } from '@app/modules/home/models/widget-component.models';
-import { findAngle, getRatio, parseArray, parseWithTranslation, safeExecute } from '../lib/maps/maps-utils';
+import {
+  findAngle,
+  getRatio,
+  interpolateOnLineSegment,
+  parseArray,
+  parseFunction,
+  parseWithTranslation,
+  safeExecute
+} from '../lib/maps/maps-utils';
 import { JsonSettingsSchema, WidgetConfig } from '@shared/models/widget.models';
 import moment from 'moment';
+import { isUndefined } from '@core/utils';
 @Component({
@@ -46,20 +53,22 @@ export class TripAnimationComponent implements OnInit, AfterViewInit {
   @ViewChild('map') mapContainer;
   mapWidget: MapWidgetController;
-  historicalData;
+  historicalData: FormattedData[][];
+  normalizationStep: number;
+  interpolatedTimeData = [];
   intervals = [];
-  normalizationStep = 1000;
-  interpolatedData = [];
   widgetConfig: WidgetConfig;
   settings;
   mainTooltip = '';
   visibleTooltip = false;
-  activeTrip;
+  activeTrip: FormattedData;
   label;
-  minTime;
-  maxTime;
-  anchors = [];
-  useAnchors = false;
+  minTime: number;
+  minTimeFormat: string;
+  maxTime: number;
+  maxTimeFormat: string;
+  anchors: number[] = [];
+  useAnchors: boolean;
   static getSettingsSchema(): JsonSettingsSchema {
     const schema = initSchema();
@@ -86,7 +95,8 @@ export class TripAnimationComponent implements OnInit, AfterViewInit {
       rotationAngle: 0
     }
     this.settings = { ...settings, ...this.ctx.settings };
-    this.useAnchors = this.settings.usePointAsAnchor && this.settings.showPoints;
+    this.useAnchors = this.settings.showPoints && this.settings.usePointAsAnchor;
+    this.settings.pointAsAnchorFunction = parseFunction(this.settings.pointAsAnchorFunction, ['data', 'dsData', 'dsIndex']);
     this.settings.fitMapBounds = true;
     this.normalizationStep = this.settings.normalizationStep;
     const subscription = this.ctx.subscriptions[Object.keys(this.ctx.subscriptions)[0]];
@@ -95,7 +105,7 @@ export class TripAnimationComponent implements OnInit, AfterViewInit {
       if (this.historicalData.length) {
         this.activeTrip = this.historicalData[0][0];
         this.calculateIntervals();
-        this.timeUpdated(this.intervals[0]);
+        this.timeUpdated(this.minTime);
       }
       this.mapWidget.map.map?.invalidateSize();
       this.cd.detectChanges();
@@ -108,30 +118,40 @@ export class TripAnimationComponent implements OnInit, AfterViewInit {
   }
   timeUpdated(time: number) {
-    this.minTime = moment(this.intervals[this.intervals.length - 1]).format('YYYY-MM-DD HH:mm:ss');
-    this.maxTime = moment(this.intervals[0]).format('YYYY-MM-DD HH:mm:ss');
-    const currentPosition = this.interpolatedData
+    const currentPosition = this.interpolatedTimeData
       .map(dataSource => dataSource[time])
       .filter(ds => ds)
       .map(ds => {
-        ds.minTime = this.minTime;
-        ds.maxTime = this.maxTime;
+        ds.minTime = this.minTimeFormat;
+        ds.maxTime = this.maxTimeFormat;
         return ds;
       });
+    if (isUndefined(currentPosition[0])) {
+      const timePoints = Object.keys(this.interpolatedTimeData[0]).map(item => parseInt(item, 10));
+      for (let i = 1; i < timePoints.length; i++) {
+        if (timePoints[i - 1] < time && timePoints[i] > time) {
+          const beforePosition = this.interpolatedTimeData[0][timePoints[i - 1]];
+          const afterPosition = this.interpolatedTimeData[0][timePoints[i]];
+          const ratio = getRatio(timePoints[i - 1], timePoints[i], time);
+          currentPosition[0] = {
+            ...beforePosition,
+            time,
+            ...interpolateOnLineSegment(beforePosition, afterPosition, this.settings.latKeyName, this.settings.lngKeyName, ratio)
+          }
+          break;
+        }
+      }
+    }
     this.activeTrip = currentPosition[0];
     this.calcLabel();
     this.calcTooltip();
     if (this.mapWidget) {
-      this.mapWidget.map.updatePolylines(this.interpolatedData.map(ds => _.values(ds)));
+      this.mapWidget.map.updatePolylines(this.interpolatedTimeData.map(ds => _.values(ds)), this.activeTrip);
       if (this.settings.showPolygon) {
-        this.mapWidget.map.updatePolygons(this.interpolatedData);
+        this.mapWidget.map.updatePolygons(this.interpolatedTimeData);
       }
       if (this.settings.showPoints) {
-        this.mapWidget.map.updatePoints(this.historicalData[0], this.calcTooltip);
-        this.anchors = this.historicalData[0]
-          .filter(data =>
-            this.settings.usePointAsAnchor ||
-            safeExecute(this.settings.pointAsAnchorFunction, [this.historicalData, data, data.dsIndex])).map(data => data.time);
+        this.mapWidget.map.updatePoints(_.values(_.union(this.interpolatedTimeData)[0]), this.calcTooltip);
       }
       this.mapWidget.map.updateMarkers(currentPosition, this.calcTooltip);
     }
@@ -142,22 +162,31 @@ export class TripAnimationComponent implements OnInit, AfterViewInit {
   calculateIntervals() {
     this.historicalData.forEach((dataSource, index) => {
-      this.intervals = [];
-      for (let time = dataSource[0]?.time; time < dataSource[dataSource.length - 1]?.time; time += this.normalizationStep) {
-        this.intervals.push(time);
-      }
-      this.intervals.push(dataSource[dataSource.length - 1]?.time);
-      this.interpolatedData[index] = this.interpolateArray(dataSource, this.intervals);
+      this.minTime = dataSource[0]?.time || Infinity;
+      this.minTimeFormat = this.minTime !== Infinity ? moment(this.minTime).format('YYYY-MM-DD HH:mm:ss') : '';
+      this.maxTime = dataSource[dataSource.length - 1]?.time || -Infinity;
+      this.maxTimeFormat = this.maxTime !== -Infinity ? moment(this.maxTime).format('YYYY-MM-DD HH:mm:ss') : '';
+      this.interpolatedTimeData[index] = this.interpolateArray(dataSource);
     });
+    if (this.useAnchors) {
+      const anchorDate = Object.entries(_.union(this.interpolatedTimeData)[0]);
+      this.anchors = anchorDate
+        .filter((data: [string, FormattedData]) => safeExecute(this.settings.pointAsAnchorFunction, [data[1], anchorDate, data[1].dsIndex]))
+        .map(data => parseInt(data[0], 10));
+    }
   }
   calcTooltip = (point?: FormattedData, setTooltip = true) => {
     if (!point) {
       point = this.activeTrip;
     }
-    const data = { ...point, maxTime: this.maxTime, minTime: this.minTime }
+    const data = {
+      ...this.activeTrip,
+      maxTime: this.maxTimeFormat,
+      minTime: this.minTimeFormat
+    }
     const tooltipPattern: string = this.settings.useTooltipFunction ?
-      safeExecute(this.settings.tooolTipFunction, [data, this.historicalData, 0]) : this.settings.tooltipPattern;
+      safeExecute(this.settings.tooolTipFunction, [data, this.historicalData, point.dsIndex]) : this.settings.tooltipPattern;
     const tooltipText = parseWithTranslation.parseTemplate(tooltipPattern, data, true);
     if (setTooltip) {
       this.mainTooltip = this.sanitizer.sanitize(
@@ -168,34 +197,34 @@ export class TripAnimationComponent implements OnInit, AfterViewInit {
   }
   calcLabel() {
-    const data = { ...this.activeTrip, maxTime: this.maxTime, minTime: this.minTime }
+    const data = {
+      ...this.activeTrip,
+      maxTime: this.maxTimeFormat,
+      minTime: this.minTimeFormat
+    }
     const labelText: string = this.settings.useLabelFunction ?
-      safeExecute(this.settings.labelFunction, [data, this.historicalData, 0]) : this.settings.label;
+      safeExecute(this.settings.labelFunction, [data, this.historicalData, data.dsIndex]) : this.settings.label;
     this.label = (parseWithTranslation.parseTemplate(labelText, data, true));
   }
-  interpolateArray(originData, interpolatedIntervals) {
+  interpolateArray(originData: FormattedData[]) {
     const result = {};
-    for (let i = 1, j = 0; i < originData.length && j < interpolatedIntervals.length;) {
-      const currentTime = interpolatedIntervals[j];
-      while (originData[i].time < currentTime) i++;
-      const before = originData[i - 1];
-      const after = originData[i];
-      const interpolation = interpolateOnPointSegment(
-        new L.Point(before.latitude, before.longitude),
-        new L.Point(after.latitude, after.longitude),
-        getRatio(before.time, after.time, currentTime));
-      result[currentTime] = ({
-        ...originData[i],
-        rotationAngle: findAngle(before, after) + this.settings.rotationAngle,
-        latitude: interpolation.x,
-        longitude: interpolation.y
-      });
-      j++;
+    const latKeyName = this.settings.latKeyName;
+    const lngKeyName = this.settings.lngKeyName;
+    for (const data of originData) {
+      const currentTime = data.time;
+      const normalizeTime = this.minTime + Math.ceil((currentTime - this.minTime) / this.normalizationStep) * this.normalizationStep;
+      result[normalizeTime] = {
+        ...data,
+        rotationAngle: this.settings.rotationAngle
+      };
+    }
+    const timeStamp = Object.keys(result);
+    for (let i = 0; i < timeStamp.length - 1; i++) {
+      result[timeStamp[i]].rotationAngle += findAngle(result[timeStamp[i]], result[timeStamp[i + 1]], latKeyName, lngKeyName)
     }
     return result;
   }
 }
 export let TbTripAnimationWidget = TripAnimationComponent;
-
--- a/ui-ngx/src/app/shared/components/json-content.component.html
View file @8808d66
+++ b/ui-ngx/src/app/shared/components/json-content.component.html
View file @8808d66
@@ -19,7 +19,7 @@
      tb-fullscreen
      [fullscreen]="fullscreen" (fullscreenChanged)="onFullscreen()" fxLayout="column">
   <div fxLayout="row" fxLayoutAlign="start center" style="height: 40px;" class="tb-json-content-toolbar">
-    <label class="tb-title no-padding">{{ label }}</label>
+    <label class="tb-title no-padding" [ngClass]="{'tb-error': !contentValid}">{{ label }}</label>
     <span fxFlex></span>
     <button type="button"
             mat-button *ngIf="!readonly && !disabled" class="tidy" (click)="beautifyJSON()">
--- a/ui-ngx/src/app/shared/components/json-content.component.ts
View file @8808d66
+++ b/ui-ngx/src/app/shared/components/json-content.component.ts
View file @8808d66
@@ -92,6 +92,15 @@ export class JsonContentComponent implements OnInit, ControlValueAccessor, Valid
     this.validateContentValue = coerceBooleanProperty(value);
   }
+  private validateOnChangeValue: boolean;
+  get validateOnChange(): boolean {
+    return this.validateOnChangeValue;
+  }
+  @Input()
+  set validateOnChange(value: boolean) {
+    this.validateOnChangeValue = coerceBooleanProperty(value);
+  }
+
   fullscreen = false;
   contentBody: string;
@@ -256,7 +265,7 @@ export class JsonContentComponent implements OnInit, ControlValueAccessor, Valid
     const editorValue = this.jsonEditor.getValue();
     if (this.contentBody !== editorValue) {
       this.contentBody = editorValue;
-      this.contentValid = true;
+      this.contentValid = !this.validateOnChange || this.doValidate();
       this.propagateChange(this.contentBody);
     }
   }
--- a/ui-ngx/src/app/shared/components/kv-map.component.ts
View file @8808d66
+++ b/ui-ngx/src/app/shared/components/kv-map.component.ts
View file @8808d66
@@ -117,6 +117,11 @@ export class KeyValMapComponent extends PageComponent implements ControlValueAcc
     this.valueChangeSubscription = this.kvListFormGroup.valueChanges.subscribe(() => {
       this.updateModel();
     });
+    if (this.disabled) {
+      this.kvListFormGroup.disable({emitEvent: false});
+    } else {
+      this.kvListFormGroup.enable({emitEvent: false});
+    }
   }
   public removeKeyVal(index: number) {
--- a/ui-ngx/src/app/shared/components/time/history-selector/history-selector.component.html
View file @8808d66
+++ b/ui-ngx/src/app/shared/components/time/history-selector/history-selector.component.html
View file @8808d66
@@ -27,8 +27,8 @@
             <mat-slider [(ngModel)]="index" [min]="minTimeIndex" [max]="maxTimeIndex" (change)="changeIndex()">
             </mat-slider>
             <div class="panel-timer">
-                <span *ngIf="this.intervals[this.index]">{{ this.intervals[this.index] | date:'medium'}}</span>
-                <span *ngIf="!this.intervals[this.index]">{{ "widget.no-data-found" | translate}}</span>
+                <span *ngIf="this.currentTime">{{ this.currentTime | date:'medium'}}</span>
+                <span *ngIf="!this.currentTime">{{ "widget.no-data-found" | translate}}</span>
             </div>
         </div>
         <button mat-icon-button class="mat-icon-button" aria-label="Next" (click)="moveNext()">
@@ -47,8 +47,9 @@
                 pause_circle_outline
             </mat-icon>
         </button>
-        <mat-select matInput [(ngModel)]="speed" (selectionChange)="reeneble()" class="speed-select"
+        <mat-select [(ngModel)]="speed" (selectionChange)="reeneble()" class="speed-select"
             aria-label="Speed selector">
             <mat-option [value]="speedValue" *ngFor="let speedValue of speeds">{{speedValue}} </mat-option>
         </mat-select>
-    </div>  
+    </div>
+</div>
--- a/ui-ngx/src/app/shared/components/time/history-selector/history-selector.component.scss
View file @8808d66
+++ b/ui-ngx/src/app/shared/components/time/history-selector/history-selector.component.scss
View file @8808d66
@@ -126,7 +126,7 @@
 }
 .speed-select {
-  width: 50px;
+  width: 70px;
   margin-left: 10px;
   margin-top: 10px;
 }
--- a/ui-ngx/src/app/shared/components/time/history-selector/history-selector.component.ts
View file @8808d66
+++ b/ui-ngx/src/app/shared/components/time/history-selector/history-selector.component.ts
View file @8808d66
@@ -14,7 +14,7 @@
 /// limitations under the License.
 ///
-import { Component, OnInit, OnChanges, Input, Output, EventEmitter, ChangeDetectorRef } from '@angular/core';
+import { ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core';
 import { interval } from 'rxjs';
 import { filter } from 'rxjs/operators';
 import { HistorySelectSettings } from '@app/modules/home/components/widget/lib/maps/map-models';
@@ -27,13 +27,14 @@ import { HistorySelectSettings } from '@app/modules/home/components/widget/lib/m
 export class HistorySelectorComponent implements OnInit, OnChanges {
   @Input() settings: HistorySelectSettings
-  @Input() intervals = [];
+  @Input() minTime: number;
+  @Input() maxTime: number;
+  @Input() step = 1000;
   @Input() anchors = [];
   @Input() useAnchors = false;
   @Output() timeUpdated: EventEmitter<number> = new EventEmitter();
-  animationTime;
   minTimeIndex = 0;
   maxTimeIndex = 0;
   speed = 1;
@@ -41,6 +42,7 @@ export class HistorySelectorComponent implements OnInit, OnChanges {
   playing = false;
   interval;
   speeds = [1, 5, 10, 25];
+  currentTime = null;
   constructor(private cd: ChangeDetectorRef) { }
@@ -49,7 +51,8 @@ export class HistorySelectorComponent implements OnInit, OnChanges {
   }
   ngOnChanges() {
-    this.maxTimeIndex = this.intervals?.length - 1;
+    this.maxTimeIndex =  Math.ceil((this.maxTime - this.minTime) / this.step);
+    this.currentTime = this.minTime === Infinity ? null : this.minTime;
   }
   play() {
@@ -59,17 +62,18 @@ export class HistorySelectorComponent implements OnInit, OnChanges {
         .pipe(
           filter(() => this.playing)).subscribe(() => {
             this.index++;
-            if (this.index < this.maxTimeIndex) {
+            this.currentTime = this.minTime + this.index * this.step;
+            if (this.index <= this.maxTimeIndex) {
               this.cd.detectChanges();
-              this.timeUpdated.emit(this.intervals[this.index]);
+              this.timeUpdated.emit(this.currentTime);
             }
             else {
               this.interval.complete();
             }
           }, err => {
-            console.log(err);
+            console.error(err);
           }, () => {
-            this.index = this.minTimeIndex;
+            this.currentTime = this.index = this.minTimeIndex;
             this.playing = false;
             this.interval = null;
             this.cd.detectChanges();
@@ -87,18 +91,19 @@ export class HistorySelectorComponent implements OnInit, OnChanges {
   pause() {
     this.playing = false;
+    this.currentTime = this.minTime + this.index * this.step;
     this.cd.detectChanges();
-    this.timeUpdated.emit(this.intervals[this.index]);
+    this.timeUpdated.emit(this.currentTime);
   }
   moveNext() {
     if (this.index < this.maxTimeIndex) {
       if (this.useAnchors) {
-        const anchorIndex = this.findIndex(this.intervals[this.index], this.anchors)+1;
-        this.index = this.findIndex(this.anchors[anchorIndex], this.intervals);
-      }
-      else
+        const anchorIndex = this.findIndex(this.currentTime, this.anchors) + 1;
+        this.index = Math.floor((this.anchors[anchorIndex] - this.minTime) / this.step);
+      } else {
         this.index++;
+      }
     }
     this.pause();
   }
@@ -106,15 +111,23 @@ export class HistorySelectorComponent implements OnInit, OnChanges {
   movePrev() {
     if (this.index > this.minTimeIndex) {
       if (this.useAnchors) {
-        const anchorIndex = this.findIndex(this.intervals[this.index], this.anchors) - 1;
-        this.index = this.findIndex(this.anchors[anchorIndex], this.intervals);
-      }
-      else
+        const anchorIndex = this.findIndex(this.currentTime, this.anchors) - 1;
+        this.index = Math.floor((this.anchors[anchorIndex] - this.minTime) / this.step);
+      } else {
         this.index--;
+      }
     }
     this.pause();
   }
+  findIndex(value: number, array: number[]): number {
+    let i = 0;
+    while (array[i] < value) {
+      i++;
+    }
+    return i;
+  }
+
   moveStart() {
     this.index = this.minTimeIndex;
     this.pause();
@@ -125,15 +138,8 @@ export class HistorySelectorComponent implements OnInit, OnChanges {
     this.pause();
   }
-  findIndex(value, array: any[]) {
-    let i = 0;
-    while (array[i] < value) {
-      i++;
-    };
-    return i;
-  }
-
   changeIndex() {
-    this.timeUpdated.emit(this.intervals[this.index]);
+    this.currentTime = this.minTime + this.index * this.step;
+    this.timeUpdated.emit(this.currentTime);
   }
 }
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
View file @8808d66
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
View file @8808d66
@@ -90,6 +90,14 @@
         "timeout-invalid": "That doesn't look like a valid timeout.",
         "enable-tls": "Enable TLS",
         "tls-version": "TLS version",
+        "enable-proxy": "Enable proxy",
+        "proxy-host": "Proxy host",
+        "proxy-host-required": "Proxy host is required.",
+        "proxy-port": "Proxy port",
+        "proxy-port-required": "You must supply a proxy port.",
+        "proxy-port-invalid": "That doesn't look like a valid proxy port.",
+        "proxy-user": "Proxy user",
+        "proxy-password": "Proxy password",
         "send-test-mail": "Send test mail",
         "security-settings": "Security settings",
         "password-policy": "Password policy",