Rule chains EDGE & CORE types refactored

deaflynx
1 parent 87601a4c
Showing 5 changed files with 19 additions and 17 deletions
ui/src/app/api/rule-chain.service.js
ui/src/app/common/types.constant.js
ui/src/app/rulechain/rulechain.controller.js
ui/src/app/rulechain/rulechain.routes.js
ui/src/app/rulechain/rulechains.controller.js
--- a/ui/src/app/api/rule-chain.service.js
View file @73ef6e0
+++ b/ui/src/app/api/rule-chain.service.js
View file @73ef6e0
@@ -311,7 +311,7 @@ function RuleChainService($http, $q, $filter, $ocLazyLoad, $translate, types, co
     }
     function getEdgesRuleChains(pageLink, config) {
-        return getRuleChains(pageLink, config, types.edgeRuleChainType);
+        return getRuleChains(pageLink, config, types.ruleChainType.edge);
     }
     function getEdgeRuleChains(edgeId, pageLink, config) {
--- a/ui/src/app/common/types.constant.js
View file @73ef6e0
+++ b/ui/src/app/common/types.constant.js
View file @73ef6e0
@@ -786,8 +786,10 @@ export default angular.module('thingsboard.types', [])
                     clientSide: false
                 }
             },
-            coreRuleChainType: "CORE",
-            edgeRuleChainType: "EDGE",
+            ruleChainType: {
+                core: "CORE",
+                edge: "EDGE"
+            },
             ruleNodeTypeComponentTypes: ["FILTER", "ENRICHMENT", "TRANSFORMATION", "ACTION", "EXTERNAL"],
             ruleChainNodeComponent: {
                 type: 'RULE_CHAIN',
--- a/ui/src/app/rulechain/rulechain.controller.js
View file @73ef6e0
+++ b/ui/src/app/rulechain/rulechain.controller.js
View file @73ef6e0
@@ -1180,7 +1180,7 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time
         var saveRuleChainPromise;
         if (vm.isImport) {
             if (angular.isUndefined(vm.ruleChain.type)) {
-                vm.ruleChain.type = types.coreRuleChainType;
+                vm.ruleChain.type = types.ruleChainType.core;
             }
             saveRuleChainPromise = ruleChainService.saveRuleChain(vm.ruleChain);
         } else {
@@ -1269,7 +1269,7 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time
                             vm.isDirty = false;
                             vm.isImport = false;
                             $mdUtil.nextTick(() => {
-                                if (vm.ruleChain.type === vm.types.coreRuleChainType) {
+                                if (vm.ruleChain.type === vm.types.ruleChainType.core) {
                                     $state.go('home.ruleChains.core.ruleChain', {ruleChainId: vm.ruleChain.id.id});
                                 } else {
                                     $state.go('home.ruleChains.edge.ruleChain', {ruleChainId: vm.ruleChain.id.id});
@@ -1293,7 +1293,7 @@ export function RuleChainController($state, $scope, $compile, $q, $mdUtil, $time
         ruleNode.configuration = angular.copy(ruleNode.component.configurationDescriptor.nodeDefinition.defaultConfiguration);
         var ruleChainId = vm.ruleChain.id ? vm.ruleChain.id.id : null;
-        var ruleChainType = vm.ruleChain.type ? vm.ruleChain.type : types.coreRuleChainType;
+        var ruleChainType = vm.ruleChain.type ? vm.ruleChain.type : types.ruleChainType.core;
         vm.enableHotKeys = false;
--- a/ui/src/app/rulechain/rulechain.routes.js
View file @73ef6e0
+++ b/ui/src/app/rulechain/rulechain.routes.js
View file @73ef6e0
@@ -82,7 +82,7 @@ export default function RuleChainRoutes($stateProvider, NodeTemplatePathProvider
                 ruleNodeComponents:
                 /*@ngInject*/
                     function($stateParams, ruleChainService) {
-                        return ruleChainService.getRuleNodeComponents(types.coreRuleChainType);
+                        return ruleChainService.getRuleNodeComponents(types.ruleChainType.core);
                     }
             },
             data: {
@@ -180,7 +180,7 @@ export default function RuleChainRoutes($stateProvider, NodeTemplatePathProvider
             ruleNodeComponents:
             /*@ngInject*/
                 function($stateParams, ruleChainService) {
-                    return ruleChainService.getRuleNodeComponents(types.edgeRuleChainType);
+                    return ruleChainService.getRuleNodeComponents(types.ruleChainType.edge);
                 }
         },
         data: {
@@ -237,7 +237,7 @@ export default function RuleChainRoutes($stateProvider, NodeTemplatePathProvider
             ruleNodeComponents:
             /*@ngInject*/
                 function($stateParams, ruleChainService) {
-                    return ruleChainService.getRuleNodeComponents(types.edgeRuleChainType);
+                    return ruleChainService.getRuleNodeComponents(types.ruleChainType.edge);
                 }
         },
         data: {
--- a/ui/src/app/rulechain/rulechains.controller.js
View file @73ef6e0
+++ b/ui/src/app/rulechain/rulechains.controller.js
View file @73ef6e0
@@ -114,7 +114,7 @@ export default function RuleChainsController(ruleChainService, userService, edge
         if (vm.ruleChainsScope === 'tenant') {
             fetchRuleChainsFunction = function (pageLink) {
-                return fetchRuleChains(pageLink, types.coreRuleChainType);
+                return fetchRuleChains(pageLink, types.ruleChainType.core);
             };
             deleteRuleChainFunction = function (ruleChainId) {
                 return deleteRuleChain(ruleChainId);
@@ -162,9 +162,9 @@ export default function RuleChainsController(ruleChainService, userService, edge
             });
             vm.ruleChainGridConfig.addItemActions.push({
                 onAction: function ($event) {
-                    importExport.importRuleChain($event, types.coreRuleChainType).then(
+                    importExport.importRuleChain($event, types.ruleChainType.core).then(
                         function(ruleChainImport) {
-                            $state.go('home.ruleChains.importRuleChain', {ruleChainImport:ruleChainImport, ruleChainType: types.coreRuleChainType});
+                            $state.go('home.ruleChains.importRuleChain', {ruleChainImport:ruleChainImport, ruleChainType: types.ruleChainType.core});
                         }
                     );
                 },
@@ -175,7 +175,7 @@ export default function RuleChainsController(ruleChainService, userService, edge
         } else if (vm.ruleChainsScope === 'edges') {
             fetchRuleChainsFunction = function (pageLink) {
-                return fetchRuleChains(pageLink, types.edgeRuleChainType);
+                return fetchRuleChains(pageLink, types.ruleChainType.edge);
             };
             deleteRuleChainFunction = function (ruleChainId) {
                 return deleteRuleChain(ruleChainId);
@@ -243,9 +243,9 @@ export default function RuleChainsController(ruleChainService, userService, edge
             });
             vm.ruleChainGridConfig.addItemActions.push({
                 onAction: function ($event) {
-                    importExport.importRuleChain($event, types.edgeRuleChainType).then(
+                    importExport.importRuleChain($event, types.ruleChainType.edge).then(
                         function(ruleChainImport) {
-                            $state.go('home.ruleChains.importRuleChain', {ruleChainImport:ruleChainImport, ruleChainType: types.edgeRuleChainType});
+                            $state.go('home.ruleChains.importRuleChain', {ruleChainImport:ruleChainImport, ruleChainType: types.ruleChainType.edge});
                         }
                     );
                 },
@@ -383,9 +383,9 @@ export default function RuleChainsController(ruleChainService, userService, edge
     function saveRuleChain(ruleChain) {
         if (angular.isUndefined(ruleChain.type)) {
             if (vm.ruleChainsScope === 'edges') {
-                ruleChain.type = types.edgeRuleChainType;
+                ruleChain.type = types.ruleChainType.edge;
             } else {
-                ruleChain.type = types.coreRuleChainType;
+                ruleChain.type = types.ruleChainType.core;
             }
         }
         return ruleChainService.saveRuleChain(ruleChain);