diff --git a/ui/src/app/common/types.constant.js b/ui/src/app/common/types.constant.js index 680d295687..7654b5d249 100644 --- a/ui/src/app/common/types.constant.js +++ b/ui/src/app/common/types.constant.js @@ -393,15 +393,7 @@ export default angular.module('thingsboard.types', []) edge: "EDGE", user: "USER", customer: "CUSTOMER", - relation: "RELATION", - entityGroup: "ENTITY_GROUP", - schedulerEvent: "SCHEDULER_EVENT", - whiteLabeling: "WHITE_LABELING", - loginWhiteLabeling: "LOGIN_WHITE_LABELING", - customTranslation: "CUSTOM_TRANSLATION", - widgetsBundle: "WIDGETS_BUNDLE", - widgetType: "WIDGET_TYPE", - adminSettings: "ADMIN_SETTINGS" + relation: "RELATION" }, edgeEventAction: { updated: "UPDATED", @@ -794,10 +786,8 @@ export default angular.module('thingsboard.types', []) clientSide: false } }, - ruleChainType: { - core: "CORE", - edge: "EDGE" - }, + coreRuleChainType: "CORE", + edgeRuleChainType: "EDGE", ruleNodeTypeComponentTypes: ["FILTER", "ENRICHMENT", "TRANSFORMATION", "ACTION", "EXTERNAL"], ruleChainNodeComponent: { type: 'RULE_CHAIN', diff --git a/ui/src/app/rulechain/rulechain.directive.js b/ui/src/app/rulechain/rulechain.directive.js index b9cb20d0fb..105c888063 100644 --- a/ui/src/app/rulechain/rulechain.directive.js +++ b/ui/src/app/rulechain/rulechain.directive.js @@ -23,7 +23,7 @@ import ruleChainFieldsetTemplate from './rulechain-fieldset.tpl.html'; export default function RuleChainDirective($compile, $templateCache, $mdDialog, $document, $q, $translate, types, toast) { var linker = function (scope, element) { var template = $templateCache.get(ruleChainFieldsetTemplate); - + element.html(template); scope.onRuleChainIdCopied = function() {