Commit 2c360f5221109d963ad05df83e890be46f963a60
1 parent
a79b7678
Added buttons to entities' cards for edge scope except Dashboards
Showing
12 changed files
with
21 additions
and
3 deletions
... | ... | @@ -27,6 +27,9 @@ |
27 | 27 | <md-button ng-click="onDeleteAsset({event: $event})" |
28 | 28 | ng-show="!isEdit && assetScope === 'tenant'" |
29 | 29 | class="md-raised md-primary">{{ 'asset.delete' | translate }}</md-button> |
30 | +<md-button ng-click="onUnassignFromEdge({event: $event})" | |
31 | + ng-show="!isEdit && assetScope === 'edge'" | |
32 | + class="md-raised md-primary">{{ 'edge.unassign-from-edge' | translate }}</md-button> | |
30 | 33 | |
31 | 34 | <div layout="row"> |
32 | 35 | <md-button ngclipboard data-clipboard-action="copy" | ... | ... |
... | ... | @@ -130,6 +130,7 @@ export function AssetController($rootScope, userService, assetService, customerS |
130 | 130 | vm.assignToCustomer = assignToCustomer; |
131 | 131 | vm.makePublic = makePublic; |
132 | 132 | vm.unassignFromCustomer = unassignFromCustomer; |
133 | + vm.unassignFromEdge = unassignFromEdge; | |
133 | 134 | |
134 | 135 | initController(); |
135 | 136 | ... | ... |
... | ... | @@ -66,7 +66,8 @@ export default function AssetDirective($compile, $templateCache, toast, $transla |
66 | 66 | onAssignToCustomer: '&', |
67 | 67 | onMakePublic: '&', |
68 | 68 | onUnassignFromCustomer: '&', |
69 | - onDeleteAsset: '&' | |
69 | + onDeleteAsset: '&', | |
70 | + onUnassignFromEdge: '&' | |
70 | 71 | } |
71 | 72 | }; |
72 | 73 | } | ... | ... |
... | ... | @@ -29,6 +29,7 @@ |
29 | 29 | on-assign-to-customer="vm.assignToCustomer(event, [ vm.grid.detailsConfig.currentItem.id.id ])" |
30 | 30 | on-make-public="vm.makePublic(event, vm.grid.detailsConfig.currentItem)" |
31 | 31 | on-unassign-from-customer="vm.unassignFromCustomer(event, vm.grid.detailsConfig.currentItem, isPublic)" |
32 | + on-unassign-from-edge="vm.unassignFromEdge(event, vm.grid.detailsConfig.currentItem)" | |
32 | 33 | on-delete-asset="vm.grid.deleteItem(event, vm.grid.detailsConfig.currentItem)"></tb-asset> |
33 | 34 | </md-tab> |
34 | 35 | <md-tab ng-if="!vm.grid.detailsConfig.isDetailsEditMode" md-on-select="vm.grid.triggerResize()" label="{{ 'attribute.attributes' | translate }}"> | ... | ... |
... | ... | @@ -24,6 +24,9 @@ |
24 | 24 | <md-button ng-click="onUnassignFromCustomer({event: $event, isPublic: isPublic})" |
25 | 25 | ng-show="!isEdit && (deviceScope === 'customer' || deviceScope === 'tenant') && isAssignedToCustomer" |
26 | 26 | class="md-raised md-primary">{{ isPublic ? 'device.make-private' : 'device.unassign-from-customer' | translate }}</md-button> |
27 | +<md-button ng-click="onUnassignFromEdge({event: $event})" | |
28 | + ng-show="!isEdit && deviceScope === 'edge'" | |
29 | + class="md-raised md-primary">{{ 'edge.unassign-from-edge' | translate }}</md-button> | |
27 | 30 | <md-button ng-click="onManageCredentials({event: $event})" |
28 | 31 | ng-show="!isEdit" |
29 | 32 | class="md-raised md-primary">{{ (deviceScope === 'customer_user' ? 'device.view-credentials' : 'device.manage-credentials') | translate }}</md-button> | ... | ... |
... | ... | @@ -131,6 +131,7 @@ export function DeviceController($rootScope, userService, deviceService, custome |
131 | 131 | vm.makePublic = makePublic; |
132 | 132 | vm.unassignFromCustomer = unassignFromCustomer; |
133 | 133 | vm.manageCredentials = manageCredentials; |
134 | + vm.unassignFromEdge = unassignFromEdge; | |
134 | 135 | |
135 | 136 | initController(); |
136 | 137 | ... | ... |
... | ... | @@ -82,7 +82,8 @@ export default function DeviceDirective($compile, $templateCache, toast, $transl |
82 | 82 | onMakePublic: '&', |
83 | 83 | onUnassignFromCustomer: '&', |
84 | 84 | onManageCredentials: '&', |
85 | - onDeleteDevice: '&' | |
85 | + onDeleteDevice: '&', | |
86 | + onUnassignFromEdge: '&', | |
86 | 87 | } |
87 | 88 | }; |
88 | 89 | } | ... | ... |
... | ... | @@ -29,6 +29,7 @@ |
29 | 29 | on-assign-to-customer="vm.assignToCustomer(event, [ vm.grid.detailsConfig.currentItem.id.id ])" |
30 | 30 | on-make-public="vm.makePublic(event, vm.grid.detailsConfig.currentItem)" |
31 | 31 | on-unassign-from-customer="vm.unassignFromCustomer(event, vm.grid.detailsConfig.currentItem, isPublic)" |
32 | + on-unassign-from-edge="vm.unassignFromEdge(event, vm.grid.detailsConfig.currentItem)" | |
32 | 33 | on-manage-credentials="vm.manageCredentials(event, vm.grid.detailsConfig.currentItem)" |
33 | 34 | on-delete-device="vm.grid.deleteItem(event, vm.grid.detailsConfig.currentItem)"></tb-device> |
34 | 35 | </md-tab> | ... | ... |
... | ... | @@ -27,6 +27,9 @@ |
27 | 27 | <md-button ng-click="onDeleteEntityView({event: $event})" |
28 | 28 | ng-show="!isEdit && entityViewScope === 'tenant'" |
29 | 29 | class="md-raised md-primary">{{ 'entity-view.delete' | translate }}</md-button> |
30 | +<md-button ng-click="onUnassignFromEdge({event: $event})" | |
31 | + ng-show="!isEdit && entityViewScope === 'edge'" | |
32 | + class="md-raised md-primary">{{ 'edge.unassign-from-edge' | translate }}</md-button> | |
30 | 33 | |
31 | 34 | <div layout="row"> |
32 | 35 | <md-button ngclipboard data-clipboard-action="copy" | ... | ... |
... | ... | @@ -106,6 +106,7 @@ export function EntityViewController($rootScope, userService, entityViewService, |
106 | 106 | vm.assignToCustomer = assignToCustomer; |
107 | 107 | vm.makePublic = makePublic; |
108 | 108 | vm.unassignFromCustomer = unassignFromCustomer; |
109 | + vm.unassignFromEdge = unassignFromEdge; | |
109 | 110 | |
110 | 111 | initController(); |
111 | 112 | ... | ... |
... | ... | @@ -144,7 +144,8 @@ export default function EntityViewDirective($q, $compile, $templateCache, $filte |
144 | 144 | onAssignToCustomer: '&', |
145 | 145 | onMakePublic: '&', |
146 | 146 | onUnassignFromCustomer: '&', |
147 | - onDeleteEntityView: '&' | |
147 | + onDeleteEntityView: '&', | |
148 | + onUnassignFromEdge: '&' | |
148 | 149 | } |
149 | 150 | }; |
150 | 151 | } | ... | ... |
... | ... | @@ -29,6 +29,7 @@ |
29 | 29 | on-assign-to-customer="vm.assignToCustomer(event, [ vm.grid.detailsConfig.currentItem.id.id ])" |
30 | 30 | on-make-public="vm.makePublic(event, vm.grid.detailsConfig.currentItem)" |
31 | 31 | on-unassign-from-customer="vm.unassignFromCustomer(event, vm.grid.detailsConfig.currentItem, isPublic)" |
32 | + on-unassign-from-edge="vm.unassignFromEdge(event, vm.grid.detailsConfig.currentItem)" | |
32 | 33 | on-delete-entity-view="vm.grid.deleteItem(event, vm.grid.detailsConfig.currentItem)"></tb-entity-view> |
33 | 34 | </md-tab> |
34 | 35 | <md-tab ng-if="!vm.grid.detailsConfig.isDetailsEditMode" md-on-select="vm.grid.triggerResize()" label="{{ 'attribute.attributes' | translate }}"> | ... | ... |