Merge branch 'master' of github.com:thingsboard/thingsboard

application/src/main/resources/thingsboard.yml

@@ -273,23 +273,17 @@ updates:
 spring.mvc.cors:
    mappings:
      # Intercept path
-      "/api/auth/**":
+      "[/api/**]":
          #Comma-separated list of origins to allow. '*' allows all origins. When not set,CORS support is disabled.
          allowed-origins: "*"
          #Comma-separated list of methods to allow. '*' allows all methods.
-         allowed-methods: "POST,GET,OPTIONS"
+         allowed-methods: "*"
          #Comma-separated list of headers to allow in a request. '*' allows all headers.
          allowed-headers: "*"
          #How long, in seconds, the response from a pre-flight request can be cached by clients.
          max-age: "1800"
          #Set whether credentials are supported. When not set, credentials are not supported.
          allow-credentials: "true"
-      "/api/v1/**":
-         allowed-origins: "*"
-         allowed-methods: "*"
-         allowed-headers: "*"
-         max-age: "1800"
-         allow-credentials: "true"
 
 # spring serve gzip compressed static resources
 spring.resources.chain:

ui/src/app/components/contact.directive.js

@@ -283,7 +283,7 @@ function Contact($compile, $templateCache) {
         "Austria": "[0-9]{4}",
         "Belgium": "[0-9]{4}",
         "Brazil": "[0-9]{5}[\\-]?[0-9]{3}",
-        "Canada": "[A-Za-z][0-9][A-Za-z] [0-9][A-Za-z][0-9]",
+        "Canada": "^(?!.*[DFIOQU])[A-VXY][0-9][A-Z][ -]?[0-9][A-Z][0-9]$",
         "Denmark": "[0-9]{3,4}",
         "Faroe Islands": "[0-9]{3,4}",
         "Netherlands": "[1-9][0-9]{3}\\s?[a-zA-Z]{2}",

ui/src/app/locale/locale.constant-en_US.json

@@ -1295,7 +1295,8 @@
         "metadata-required": "Metadata entries can't be empty.",
         "output": "Output",
         "test": "Test",
-        "help": "Help"
+        "help": "Help",
+        "reset-debug-mode": "Reset debug mode in all nodes"
     },
     "tenant": {
         "tenant": "Tenant",

ui/src/app/locale/locale.constant-ru_RU.json

@@ -1288,7 +1288,8 @@
         "metadata-required": "Метаданные объекта не могут быть пустыми.",
         "output": "Выход",
         "test": "Протестировать",
-        "help": "Помощь"
+        "help": "Помощь",
+        "reset-debug-mode": "Сбросить режим отладки во всех правилах"
     },
     "tenant": {
         "tenant": "Владелец",

ui/src/app/rulechain/rulechain.controller.js

@@ -108,6 +108,9 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time
     vm.objectsSelected = objectsSelected;
     vm.deleteSelected = deleteSelected;
 
+    vm.isDebugModeEnabled = isDebugModeEnabled;
+    vm.resetDebugModeInAllNodes = resetDebugModeInAllNodes;
+
     vm.triggerResize = triggerResize;
 
     vm.openRuleChainContextMenu = openRuleChainContextMenu;
@@ -1342,6 +1345,19 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time
         vm.modelservice.deleteSelected();
     }
 
+    function isDebugModeEnabled() {
+        var res = $filter('filter')(vm.ruleChainModel.nodes, {debugMode: true});
+        return (res && res.length);
+    }
+
+    function resetDebugModeInAllNodes() {
+        vm.ruleChainModel.nodes.forEach((node) => {
+            if (node.component.type != types.ruleNodeType.INPUT.value && node.component.type != types.ruleNodeType.RULE_CHAIN.value) {
+                node.debugMode = false;
+            }
+        });
+    }
+
     function triggerResize() {
         var w = angular.element($window);
         w.triggerHandler('resize');

ui/src/app/rulechain/rulechain.tpl.html

@@ -223,6 +223,15 @@
             </md-tooltip>
             <ng-md-icon icon="delete"></ng-md-icon>
         </md-button>
+        <md-button ng-disabled="$root.loading || !vm.isDebugModeEnabled()"
+                   class="tb-btn-footer md-accent md-hue-2 md-fab"
+                   aria-label="{{ 'rulenode.reset-debug-mode' | translate }}"
+                   ng-click="vm.resetDebugModeInAllNodes()">
+            <md-tooltip md-direction="top">
+                {{ 'rulenode.reset-debug-mode' | translate }}
+            </md-tooltip>
+            <ng-md-icon icon="bug_report"></ng-md-icon>
+        </md-button>
         <md-button ng-disabled="$root.loading  || vm.isInvalid || (!vm.isDirty && !vm.isImport)"
                    class="tb-btn-footer md-accent md-hue-2 md-fab"
                    aria-label="{{ 'action.apply' | translate }}"