Commit 45d1c0e223ebabeb36d63d2c867f1cfce9de2dba

Authored by deaflynx
1 parent 1c550539

types refactored

@@ -393,15 +393,7 @@ export default angular.module('thingsboard.types', []) @@ -393,15 +393,7 @@ export default angular.module('thingsboard.types', [])
393 edge: "EDGE", 393 edge: "EDGE",
394 user: "USER", 394 user: "USER",
395 customer: "CUSTOMER", 395 customer: "CUSTOMER",
396 - relation: "RELATION",  
397 - entityGroup: "ENTITY_GROUP",  
398 - schedulerEvent: "SCHEDULER_EVENT",  
399 - whiteLabeling: "WHITE_LABELING",  
400 - loginWhiteLabeling: "LOGIN_WHITE_LABELING",  
401 - customTranslation: "CUSTOM_TRANSLATION",  
402 - widgetsBundle: "WIDGETS_BUNDLE",  
403 - widgetType: "WIDGET_TYPE",  
404 - adminSettings: "ADMIN_SETTINGS" 396 + relation: "RELATION"
405 }, 397 },
406 edgeEventAction: { 398 edgeEventAction: {
407 updated: "UPDATED", 399 updated: "UPDATED",
@@ -794,10 +786,8 @@ export default angular.module('thingsboard.types', []) @@ -794,10 +786,8 @@ export default angular.module('thingsboard.types', [])
794 clientSide: false 786 clientSide: false
795 } 787 }
796 }, 788 },
797 - ruleChainType: {  
798 - core: "CORE",  
799 - edge: "EDGE"  
800 - }, 789 + coreRuleChainType: "CORE",
  790 + edgeRuleChainType: "EDGE",
801 ruleNodeTypeComponentTypes: ["FILTER", "ENRICHMENT", "TRANSFORMATION", "ACTION", "EXTERNAL"], 791 ruleNodeTypeComponentTypes: ["FILTER", "ENRICHMENT", "TRANSFORMATION", "ACTION", "EXTERNAL"],
802 ruleChainNodeComponent: { 792 ruleChainNodeComponent: {
803 type: 'RULE_CHAIN', 793 type: 'RULE_CHAIN',
@@ -23,7 +23,7 @@ import ruleChainFieldsetTemplate from './rulechain-fieldset.tpl.html'; @@ -23,7 +23,7 @@ import ruleChainFieldsetTemplate from './rulechain-fieldset.tpl.html';
23 export default function RuleChainDirective($compile, $templateCache, $mdDialog, $document, $q, $translate, types, toast) { 23 export default function RuleChainDirective($compile, $templateCache, $mdDialog, $document, $q, $translate, types, toast) {
24 var linker = function (scope, element) { 24 var linker = function (scope, element) {
25 var template = $templateCache.get(ruleChainFieldsetTemplate); 25 var template = $templateCache.get(ruleChainFieldsetTemplate);
26 - 26 +
27 element.html(template); 27 element.html(template);
28 28
29 scope.onRuleChainIdCopied = function() { 29 scope.onRuleChainIdCopied = function() {