Commit a79b7678ee5abe116b86c9b26c1c4d392710319a
1 parent
ffd50e0b
Added buttons to rule chain cards for edge/edges/tenant scopes
Showing
5 changed files
with
28 additions
and
4 deletions
... | ... | @@ -1589,10 +1589,10 @@ |
1589 | 1589 | "set-default-root-edge-rulechain-title": "Are you sure you want to make the rule chain '{{ruleChainName}}' default edge root?", |
1590 | 1590 | "set-default-root-edge-rulechain-text": "After the confirmation the rule chain will become default edge root and will handle all incoming transport messages.", |
1591 | 1591 | "invalid-rulechain-type-error": "Unable to import rule chain: Invalid rule chain type. Expected type is {{expectedRuleChainType}}.", |
1592 | - "set-default-edge": "Make edge rule chain default", | |
1592 | + "set-default-edge": "Make rule chain default", | |
1593 | 1593 | "set-default-edge-title": "Are you sure you want to make the edge rule chain '{{ruleChainName}}' default?", |
1594 | 1594 | "set-default-edge-text": "After the confirmation the edge rule chain will be added to default list and assigned to newly created edge(s).", |
1595 | - "remove-default-edge": "Remove edge rule chain from defaults", | |
1595 | + "remove-default-edge": "Remove rule chain from defaults", | |
1596 | 1596 | "remove-default-edge-title": "Are you sure you want to remove the edge rule chain '{{ruleChainName}}' from default list?", |
1597 | 1597 | "remove-default-edge-text": "After the confirmation the edge rule chain will not be assigned for a newly created edges." |
1598 | 1598 | }, | ... | ... |
... | ... | @@ -18,11 +18,27 @@ |
18 | 18 | <md-button ng-click="onExportRuleChain({event: $event})" |
19 | 19 | ng-show="!isEdit" |
20 | 20 | class="md-raised md-primary">{{ 'rulechain.export' | translate }}</md-button> |
21 | + | |
21 | 22 | <md-button ng-click="onSetRootRuleChain({event: $event})" |
22 | - ng-show="!isEdit && !ruleChain.root" | |
23 | + ng-show="!isEdit && !ruleChain.root && ruleChainsScope == 'tenant'" | |
23 | 24 | class="md-raised md-primary">{{ 'rulechain.set-root' | translate }}</md-button> |
25 | + | |
26 | +<md-button ng-click="onSetRootRuleChain({event: $event})" | |
27 | + ng-show="!isEdit && !ruleChain.root && ruleChainsScope == 'edges'" | |
28 | + class="md-raised md-primary">{{ 'rulechain.set-default-root-edge' | translate }}</md-button> | |
29 | +<md-button ng-click="onSetDefaultEdgeRuleChain({event: $event})" | |
30 | + ng-show="!isEdit && !ruleChain.root && !ruleChain.isDefault && ruleChainsScope == 'edges'" | |
31 | + class="md-raised md-primary">{{ 'rulechain.set-default-edge' | translate }}</md-button> | |
32 | +<md-button ng-click="onRemoveDefaultEdgeRuleChain({event: $event})" | |
33 | + ng-show="!isEdit && !ruleChain.root && ruleChain.isDefault && ruleChainsScope == 'edges'" | |
34 | + class="md-raised md-primary">{{ 'rulechain.remove-default-edge' | translate }}</md-button> | |
35 | + | |
36 | +<md-button ng-click="onSetRootRuleChain({event: $event})" | |
37 | + ng-show="!isEdit && ruleChainsScope == 'edge'" | |
38 | + class="md-raised md-primary">{{ 'rulechain.set-root' | translate }}</md-button> | |
39 | + | |
24 | 40 | <md-button ng-click="onDeleteRuleChain({event: $event})" |
25 | - ng-show="!isEdit && !ruleChain.root" | |
41 | + ng-show="!isEdit && !ruleChain.root && ruleChainsScope != 'edge'" | |
26 | 42 | class="md-raised md-primary">{{ 'rulechain.delete' | translate }}</md-button> |
27 | 43 | |
28 | 44 | <div layout="row"> | ... | ... |
... | ... | @@ -40,6 +40,9 @@ export default function RuleChainDirective($compile, $templateCache, $mdDialog, |
40 | 40 | isEdit: '=', |
41 | 41 | isReadOnly: '=', |
42 | 42 | theForm: '=', |
43 | + ruleChainsScope: '=', | |
44 | + onSetDefaultEdgeRuleChain: '&', | |
45 | + onRemoveDefaultEdgeRuleChain: '&', | |
43 | 46 | onSetRootRuleChain: '&', |
44 | 47 | onExportRuleChain: '&', |
45 | 48 | onDeleteRuleChain: '&' | ... | ... |
... | ... | @@ -97,6 +97,8 @@ export default function RuleChainsController(ruleChainService, userService, impo |
97 | 97 | |
98 | 98 | vm.exportRuleChain = exportRuleChain; |
99 | 99 | vm.setRootRuleChain = setRootRuleChain; |
100 | + vm.setDefaultEdgeRuleChain = setDefaultEdgeRuleChain; | |
101 | + vm.removeDefaultEdgeRuleChain = removeDefaultEdgeRuleChain; | |
100 | 102 | |
101 | 103 | initController(); |
102 | 104 | ... | ... |
... | ... | @@ -26,6 +26,9 @@ |
26 | 26 | is-edit="vm.grid.detailsConfig.isDetailsEditMode" |
27 | 27 | is-read-only="vm.grid.isDetailsReadOnly(vm.grid.operatingItem())" |
28 | 28 | the-form="vm.grid.detailsForm" |
29 | + rule-chains-scope="vm.ruleChainsScope" | |
30 | + on-set-default-edge-rule-chain="vm.setDefaultEdgeRuleChain(event, vm.grid.detailsConfig.currentItem)" | |
31 | + on-remove-default-edge-rule-chain="vm.removeDefaultEdgeRuleChain(event, vm.grid.detailsConfig.currentItem)" | |
29 | 32 | on-set-root-rule-chain="vm.setRootRuleChain(event, vm.grid.detailsConfig.currentItem)" |
30 | 33 | on-export-rule-chain="vm.exportRuleChain(event, vm.grid.detailsConfig.currentItem)" |
31 | 34 | on-delete-rule-chain="vm.grid.deleteItem(event, vm.grid.detailsConfig.currentItem)"> | ... | ... |