dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Default edge rule chains code optimization

Browse Source
This commit is contained in:
deaflynx 2020-06-01 15:10:24 +03:00
parent ec767765a5
commit 0af0422a92
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ui/src/app/rulechain/rulechains.controller.js
View File

@ -93,7 +93,6 @@ export default function RuleChainsController(ruleChainService, userService, edge
vm.isRootRuleChain = isRootRuleChain; vm.isRootRuleChain = isRootRuleChain;
vm.isNonRootRuleChain = isNonRootRuleChain; vm.isNonRootRuleChain = isNonRootRuleChain;
vm.isDefaultEdgeRuleChain = isDefaultEdgeRuleChain; vm.isDefaultEdgeRuleChain = isDefaultEdgeRuleChain;
var defaultEdgeRuleChainIds = [];
vm.exportRuleChain = exportRuleChain; vm.exportRuleChain = exportRuleChain;
vm.setRootRuleChain = setRootRuleChain; vm.setRootRuleChain = setRootRuleChain;
@ -340,15 +339,13 @@ export default function RuleChainsController(ruleChainService, userService, edge
var deferred = $q.defer(); var deferred = $q.defer();
ruleChainService.getDefaultEdgeRuleChains(null).then( ruleChainService.getDefaultEdgeRuleChains(null).then(
function success(response) { function success(response) {
defaultEdgeRuleChainIds = []; let defaultEdgeRuleChainIds = [];
response.map(function (ruleChain) { response.map(function (ruleChain) {
defaultEdgeRuleChainIds.push(ruleChain.id.id) defaultEdgeRuleChainIds.push(ruleChain.id.id)
}); });
const data = ruleChains.data; const data = ruleChains.data;
data.map(function (ruleChain) { data.map(function (ruleChain) {
ruleChain.isDefault = defaultEdgeRuleChainIds.some( ruleChain.isDefault = defaultEdgeRuleChainIds.some(id => ruleChain.id.id.includes(id));
id => ruleChain.id.id.includes(id));
return ruleChain; return ruleChain;
}); });
ruleChains.data = data; ruleChains.data = data;
@ -433,11 +430,11 @@ export default function RuleChainsController(ruleChainService, userService, edge
} }
function isDefaultEdgeRuleChain(ruleChain) { function isDefaultEdgeRuleChain(ruleChain) {
return angular.isDefined(ruleChain) && !ruleChain.root && defaultEdgeRuleChainIds.includes(ruleChain.id.id) === true; return angular.isDefined(ruleChain) && ruleChain.isDefault;
} }
function isNonDefaultEdgeRuleChain(ruleChain) { function isNonDefaultEdgeRuleChain(ruleChain) {
return angular.isDefined(ruleChain) && !ruleChain.root && defaultEdgeRuleChainIds.includes(ruleChain.id.id) === false; return angular.isDefined(ruleChain) && !ruleChain.isDefault;
} }
function exportRuleChain($event, ruleChain) { function exportRuleChain($event, ruleChain) {