tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Edge rule chains: refactored edgeId usage, added unAssingFromEdge button

pull/3957/head
deaflynx 6 years ago
parent
a60f3630e8
commit
280f6aebb3
4 changed files with 20 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      ui/src/app/rulechain/rulechain-fieldset.tpl.html
  2. 1
      ui/src/app/rulechain/rulechain.directive.js
  3. 23
      ui/src/app/rulechain/rulechains.controller.js
  4. 1
      ui/src/app/rulechain/rulechains.tpl.html

9
ui/src/app/rulechain/rulechain-fieldset.tpl.html
View File

@ -24,8 +24,11 @@
class="md-raised md-primary">{{ 'rulechain.delete' | translate }}</md-button> class="md-raised md-primary">{{ 'rulechain.delete' | translate }}</md-button>
</div> </div>
<div layout="row"><md-button ng-click="onSetRootRuleChain({event: $event})" <div layout="row"><md-button ng-click="onSetRootRuleChain({event: $event})"
ng-show="!isEdit && !ruleChain.root && ruleChainsScope == 'tenant'" ng-show="!isEdit && ((!ruleChain.root && ruleChainsScope == 'tenant') || (ruleChainsScope == 'edge' && edge.rootRuleChainId.id !== ruleChain.id.id))"
class="md-raised md-primary">{{ 'rulechain.set-root' | translate }}</md-button> class="md-raised md-primary">{{ 'rulechain.set-root' | translate }}</md-button>
<md-button ng-click="onUnassignFromEdge({event: $event})"
ng-show="!isEdit && ruleChainsScope == 'edge' && edge.rootRuleChainId.id !== ruleChain.id.id"
class="md-raised md-primary">{{ 'edge.unassign-from-edge' | translate }}</md-button>
<md-button ng-click="onSetRootRuleChain({event: $event})" <md-button ng-click="onSetRootRuleChain({event: $event})"
ng-show="!isEdit && !ruleChain.root && ruleChainsScope == 'edges'" ng-show="!isEdit && !ruleChain.root && ruleChainsScope == 'edges'"
class="md-raised md-primary">{{ 'rulechain.set-edge-template-root-rulechain' | translate }}</md-button> class="md-raised md-primary">{{ 'rulechain.set-edge-template-root-rulechain' | translate }}</md-button>
@ -36,9 +39,7 @@
ng-show="!isEdit && !ruleChain.root && ruleChain.isDefault && ruleChainsScope == 'edges'" ng-show="!isEdit && !ruleChain.root && ruleChain.isDefault && ruleChainsScope == 'edges'"
class="md-raised md-primary">{{ 'rulechain.unset-auto-assign-to-edge' | translate }}</md-button> class="md-raised md-primary">{{ 'rulechain.unset-auto-assign-to-edge' | translate }}</md-button>
<md-button ng-click="onSetRootRuleChain({event: $event})"
ng-show="!isEdit && ruleChainsScope == 'edge' && edge.rootRuleChainId.id !== ruleChain.id.id"
class="md-raised md-primary">{{ 'rulechain.set-root' | translate }}</md-button>
</div> </div>
<div layout="row"> <div layout="row">
<md-button ngclipboard data-clipboard-action="copy" <md-button ngclipboard data-clipboard-action="copy"

1
ui/src/app/rulechain/rulechain.directive.js
View File

@ -44,6 +44,7 @@ export default function RuleChainDirective($compile, $templateCache, $mdDialog,
edge: '=', edge: '=',
onSetAutoAssignToEdgeRuleChain: '&', onSetAutoAssignToEdgeRuleChain: '&',
onUnsetAutoAssignToEdgeRuleChain: '&', onUnsetAutoAssignToEdgeRuleChain: '&',
onUnassignFromEdge: '&',
onSetRootRuleChain: '&', onSetRootRuleChain: '&',
onExportRuleChain: '&', onExportRuleChain: '&',
onDeleteRuleChain: '&' onDeleteRuleChain: '&'

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

@ -27,7 +27,6 @@ export default function RuleChainsController(ruleChainService, userService, impo
$document, $q, edgeService) { $document, $q, edgeService) {
var vm = this; var vm = this;
var edgeId = $stateParams.edgeId;
vm.ruleChainsScope = $state.$current.data.ruleChainsType; vm.ruleChainsScope = $state.$current.data.ruleChainsType;
@ -53,6 +52,9 @@ export default function RuleChainsController(ruleChainService, userService, impo
var ruleChainGroupActionsList = []; var ruleChainGroupActionsList = [];
vm.types = types; vm.types = types;
var edgeId = $stateParams.edgeId;
vm.edge = null;
vm.ruleChainGridConfig = { vm.ruleChainGridConfig = {
refreshParamsFunc: null, refreshParamsFunc: null,
@ -99,6 +101,7 @@ export default function RuleChainsController(ruleChainService, userService, impo
vm.setRootRuleChain = setRootRuleChain; vm.setRootRuleChain = setRootRuleChain;
vm.setAutoAssignToEdgeRuleChain = setAutoAssignToEdgeRuleChain; vm.setAutoAssignToEdgeRuleChain = setAutoAssignToEdgeRuleChain;
vm.unsetAutoAssignToEdgeRuleChain = unsetAutoAssignToEdgeRuleChain; vm.unsetAutoAssignToEdgeRuleChain = unsetAutoAssignToEdgeRuleChain;
vm.unassignFromEdge = unassignFromEdge;
initController(); initController();
@ -277,7 +280,7 @@ export default function RuleChainsController(ruleChainService, userService, impo
ruleChainActionsList.push( ruleChainActionsList.push(
{ {
onAction: function ($event, item) { onAction: function ($event, item) {
unassignFromEdge($event, item, edgeId); unassignFromEdge($event, item);
}, },
name: function() { return $translate.instant('action.unassign') }, name: function() { return $translate.instant('action.unassign') },
details: function() { return $translate.instant('edge.unassign-from-edge') }, details: function() { return $translate.instant('edge.unassign-from-edge') },
@ -289,7 +292,7 @@ export default function RuleChainsController(ruleChainService, userService, impo
ruleChainGroupActionsList.push( ruleChainGroupActionsList.push(
{ {
onAction: function ($event, items) { onAction: function ($event, items) {
unassignRuleChainsFromEdge($event, items, edgeId); unassignRuleChainsFromEdge($event, items);
}, },
name: function() { return $translate.instant('rulechain.unassign-rulechains') }, name: function() { return $translate.instant('rulechain.unassign-rulechains') },
details: function(selectedCount) { details: function(selectedCount) {
@ -399,7 +402,7 @@ export default function RuleChainsController(ruleChainService, userService, impo
} }
var ruleChainParams = {ruleChainId: ruleChain.id.id}; var ruleChainParams = {ruleChainId: ruleChain.id.id};
if (vm.ruleChainsScope === 'edge') { if (vm.ruleChainsScope === 'edge') {
$state.go('home.edges.ruleChains.ruleChain', Object.assign(ruleChainParams, edgeId = vm.edge.id.id)); $state.go('home.edges.ruleChains.ruleChain', ruleChainParams);
} else if (vm.ruleChainsScope === 'edges') { } else if (vm.ruleChainsScope === 'edges') {
$state.go('home.edges.edgeRuleChains.ruleChain', ruleChainParams); $state.go('home.edges.edgeRuleChains.ruleChain', ruleChainParams);
} else { } else {
@ -416,7 +419,7 @@ export default function RuleChainsController(ruleChainService, userService, impo
} }
function isRootRuleChain(ruleChain) { function isRootRuleChain(ruleChain) {
if (angular.isDefined(vm.edge) && vm.edge != null) { if (vm.edge != null) {
return angular.isDefined(vm.edge.rootRuleChainId) && vm.edge.rootRuleChainId != null && vm.edge.rootRuleChainId.id === ruleChain.id.id; return angular.isDefined(vm.edge.rootRuleChainId) && vm.edge.rootRuleChainId != null && vm.edge.rootRuleChainId.id === ruleChain.id.id;
} else { } else {
return ruleChain && ruleChain.root; return ruleChain && ruleChain.root;
@ -424,7 +427,7 @@ export default function RuleChainsController(ruleChainService, userService, impo
} }
function isNonRootRuleChain(ruleChain) { function isNonRootRuleChain(ruleChain) {
if (angular.isDefined(vm.edge) && vm.edge != null) { if (vm.edge != null) {
return angular.isDefined(vm.edge.rootRuleChainId) && vm.edge.rootRuleChainId != null && vm.edge.rootRuleChainId.id !== ruleChain.id.id; return angular.isDefined(vm.edge.rootRuleChainId) && vm.edge.rootRuleChainId != null && vm.edge.rootRuleChainId.id !== ruleChain.id.id;
} else { } else {
return ruleChain && !ruleChain.root; return ruleChain && !ruleChain.root;
@ -454,7 +457,7 @@ export default function RuleChainsController(ruleChainService, userService, impo
.cancel($translate.instant('action.no')) .cancel($translate.instant('action.no'))
.ok($translate.instant('action.yes')); .ok($translate.instant('action.yes'));
$mdDialog.show(confirm).then(function () { $mdDialog.show(confirm).then(function () {
if (angular.isDefined(vm.edge) && vm.edge != null) { if (vm.edge != null) {
edgeService.setRootRuleChain(vm.edge.id.id, ruleChain.id.id).then( edgeService.setRootRuleChain(vm.edge.id.id, ruleChain.id.id).then(
(edge) => { (edge) => {
vm.edge = edge; vm.edge = edge;
@ -525,7 +528,7 @@ export default function RuleChainsController(ruleChainService, userService, impo
}); });
} }
function unassignRuleChainsFromEdge($event, items, edgeId) { function unassignRuleChainsFromEdge($event, items) {
var confirm = $mdDialog.confirm() var confirm = $mdDialog.confirm()
.targetEvent($event) .targetEvent($event)
.title($translate.instant('rulechain.unassign-rulechains-title', {count: items.selectedCount}, 'messageformat')) .title($translate.instant('rulechain.unassign-rulechains-title', {count: items.selectedCount}, 'messageformat'))
@ -567,7 +570,7 @@ export default function RuleChainsController(ruleChainService, userService, impo
controller: 'AddRuleChainsToEdgeController', controller: 'AddRuleChainsToEdgeController',
controllerAs: 'vm', controllerAs: 'vm',
templateUrl: addRuleChainsToEdgeTemplate, templateUrl: addRuleChainsToEdgeTemplate,
locals: {edgeId: edgeId, ruleChains: ruleChains}, locals: {edgeId, ruleChains},
parent: angular.element($document[0].body), parent: angular.element($document[0].body),
fullscreen: true, fullscreen: true,
targetEvent: $event targetEvent: $event
@ -604,7 +607,7 @@ export default function RuleChainsController(ruleChainService, userService, impo
}); });
} }
function unassignFromEdge($event, ruleChain, edgeId) { function unassignFromEdge($event, ruleChain) {
if ($event) { if ($event) {
$event.stopPropagation(); $event.stopPropagation();
} }

1
ui/src/app/rulechain/rulechains.tpl.html
View File

@ -30,6 +30,7 @@
edge="vm.edge" edge="vm.edge"
on-set-auto-assign-to-edge-rule-chain="vm.setAutoAssignToEdgeRuleChain(event, vm.grid.detailsConfig.currentItem)" on-set-auto-assign-to-edge-rule-chain="vm.setAutoAssignToEdgeRuleChain(event, vm.grid.detailsConfig.currentItem)"
on-unset-auto-assign-to-edge-rule-chain="vm.unsetAutoAssignToEdgeRuleChain(event, vm.grid.detailsConfig.currentItem)" on-unset-auto-assign-to-edge-rule-chain="vm.unsetAutoAssignToEdgeRuleChain(event, vm.grid.detailsConfig.currentItem)"
on-unassign-from-edge="vm.unassignFromEdge(event, vm.grid.detailsConfig.currentItem)"
on-set-root-rule-chain="vm.setRootRuleChain(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-export-rule-chain="vm.exportRuleChain(event, vm.grid.detailsConfig.currentItem)"
on-delete-rule-chain="vm.grid.deleteItem(event, vm.grid.detailsConfig.currentItem)"> on-delete-rule-chain="vm.grid.deleteItem(event, vm.grid.detailsConfig.currentItem)">

Write Preview
Loading…
Cancel
Save