Merge branch 'master' into feature/wizard

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/profile/TbDeviceProfileNode.java

@@ -53,7 +53,9 @@ import java.util.concurrent.TimeUnit;
         relationTypes = {"Alarm Created", "Alarm Updated", "Alarm Severity Updated", "Alarm Cleared", "Success", "Failure"},
         configClazz = TbDeviceProfileNodeConfiguration.class,
         nodeDescription = "Process device messages based on device profile settings",
-        nodeDetails = "Create and clear alarms based on alarm rules defined in device profile. Generates "
+        nodeDetails = "Create and clear alarms based on alarm rules defined in device profile. Generates ",
+        uiResources = {"static/rulenode/rulenode-core-config.js"},
+        configDirective = "tbDeviceProfileConfig"
 )
 public class TbDeviceProfileNode implements TbNode {
     private static final String PERIODIC_MSG_TYPE = "TbDeviceProfilePeriodicMsg";

ui-ngx/src/app/modules/home/components/profile/alarm/device-profile-alarms.component.scss

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@import '../scss/constants';
+@import '../../../../../../scss/constants';
 
 :host {
   .tb-device-profile-alarms {

ui-ngx/src/app/shared/components/nav-tree.component.ts

@@ -150,13 +150,13 @@ export class NavTreeComponent implements OnInit {
     this.treeElement.on('changed.jstree', (e: any, data) => {
       const node: NavTreeNode = data.instance.get_selected(true)[0];
       if (this.onNodeSelected) {
-        this.onNodeSelected(node, e as Event);
+        this.ngZone.run(() => this.onNodeSelected(node, e as Event));
       }
     });
 
     this.treeElement.on('model.jstree', (e: any, data) => {
       if (this.onNodesInserted) {
-        this.onNodesInserted(data.nodes, data.parent);
+        this.ngZone.run(() => this.onNodesInserted(data.nodes, data.parent));
       }
     });