diff --git a/ui/src/app/locale/locale.constant-en_US.json b/ui/src/app/locale/locale.constant-en_US.json index 6815b249df..cb1fc2e7ad 100644 --- a/ui/src/app/locale/locale.constant-en_US.json +++ b/ui/src/app/locale/locale.constant-en_US.json @@ -1589,10 +1589,10 @@ "set-default-root-edge-rulechain-title": "Are you sure you want to make the rule chain '{{ruleChainName}}' default edge root?", "set-default-root-edge-rulechain-text": "After the confirmation the rule chain will become default edge root and will handle all incoming transport messages.", "invalid-rulechain-type-error": "Unable to import rule chain: Invalid rule chain type. Expected type is {{expectedRuleChainType}}.", - "set-default-edge": "Make edge rule chain default", + "set-default-edge": "Make rule chain default", "set-default-edge-title": "Are you sure you want to make the edge rule chain '{{ruleChainName}}' default?", "set-default-edge-text": "After the confirmation the edge rule chain will be added to default list and assigned to newly created edge(s).", - "remove-default-edge": "Remove edge rule chain from defaults", + "remove-default-edge": "Remove rule chain from defaults", "remove-default-edge-title": "Are you sure you want to remove the edge rule chain '{{ruleChainName}}' from default list?", "remove-default-edge-text": "After the confirmation the edge rule chain will not be assigned for a newly created edges." }, diff --git a/ui/src/app/rulechain/rulechain-fieldset.tpl.html b/ui/src/app/rulechain/rulechain-fieldset.tpl.html index 4afd6ee96e..9a449725b4 100644 --- a/ui/src/app/rulechain/rulechain-fieldset.tpl.html +++ b/ui/src/app/rulechain/rulechain-fieldset.tpl.html @@ -18,11 +18,27 @@ {{ 'rulechain.export' | translate }} + {{ 'rulechain.set-root' | translate }} + +{{ 'rulechain.set-default-root-edge' | translate }} +{{ 'rulechain.set-default-edge' | translate }} +{{ 'rulechain.remove-default-edge' | translate }} + +{{ 'rulechain.set-root' | translate }} + {{ 'rulechain.delete' | translate }}
diff --git a/ui/src/app/rulechain/rulechain.directive.js b/ui/src/app/rulechain/rulechain.directive.js index 105c888063..9af8672939 100644 --- a/ui/src/app/rulechain/rulechain.directive.js +++ b/ui/src/app/rulechain/rulechain.directive.js @@ -40,6 +40,9 @@ export default function RuleChainDirective($compile, $templateCache, $mdDialog, isEdit: '=', isReadOnly: '=', theForm: '=', + ruleChainsScope: '=', + onSetDefaultEdgeRuleChain: '&', + onRemoveDefaultEdgeRuleChain: '&', onSetRootRuleChain: '&', onExportRuleChain: '&', onDeleteRuleChain: '&' diff --git a/ui/src/app/rulechain/rulechains.controller.js b/ui/src/app/rulechain/rulechains.controller.js index 97a2c2de29..6e3908b0a7 100644 --- a/ui/src/app/rulechain/rulechains.controller.js +++ b/ui/src/app/rulechain/rulechains.controller.js @@ -97,6 +97,8 @@ export default function RuleChainsController(ruleChainService, userService, impo vm.exportRuleChain = exportRuleChain; vm.setRootRuleChain = setRootRuleChain; + vm.setDefaultEdgeRuleChain = setDefaultEdgeRuleChain; + vm.removeDefaultEdgeRuleChain = removeDefaultEdgeRuleChain; initController(); diff --git a/ui/src/app/rulechain/rulechains.tpl.html b/ui/src/app/rulechain/rulechains.tpl.html index 9880ac0213..f31348d59c 100644 --- a/ui/src/app/rulechain/rulechains.tpl.html +++ b/ui/src/app/rulechain/rulechains.tpl.html @@ -26,6 +26,9 @@ is-edit="vm.grid.detailsConfig.isDetailsEditMode" is-read-only="vm.grid.isDetailsReadOnly(vm.grid.operatingItem())" the-form="vm.grid.detailsForm" + rule-chains-scope="vm.ruleChainsScope" + on-set-default-edge-rule-chain="vm.setDefaultEdgeRuleChain(event, vm.grid.detailsConfig.currentItem)" + on-remove-default-edge-rule-chain="vm.removeDefaultEdgeRuleChain(event, vm.grid.detailsConfig.currentItem)" on-set-root-rule-chain="vm.setRootRuleChain(event, vm.grid.detailsConfig.currentItem)" on-export-rule-chain="vm.exportRuleChain(event, vm.grid.detailsConfig.currentItem)" on-delete-rule-chain="vm.grid.deleteItem(event, vm.grid.detailsConfig.currentItem)">