Commit c989c31f1f3d7cb2004d332a0c2c1bf769773874
1 parent
63de68f6
Added Edge Fieldset manage... buttons. In EdgeEvents updated table columns width, status labels
Showing
8 changed files
with
52 additions
and
10 deletions
... | ... | @@ -21,6 +21,21 @@ |
21 | 21 | <md-button ng-click="onUnassignFromCustomer({event: $event, isPublic: isPublic})" |
22 | 22 | ng-show="!isEdit && (edgeScope === 'customer' || edgeScope === 'tenant') && isAssignedToCustomer" |
23 | 23 | class="md-raised md-primary">{{ isPublic ? 'edge.make-private' : 'edge.unassign-from-customer' | translate }}</md-button> |
24 | +<md-button ng-click="onManageEdgeAssets({event: $event})" | |
25 | + ng-show="!isEdit && edgeScope === 'tenant'" | |
26 | + class="md-raised md-primary">{{ 'edge.manage-edge-assets' | translate }}</md-button> | |
27 | +<md-button ng-click="onManageEdgeDevices({event: $event})" | |
28 | + ng-show="!isEdit && edgeScope === 'tenant'" | |
29 | + class="md-raised md-primary">{{ 'edge.manage-edge-devices' | translate }}</md-button> | |
30 | +<md-button ng-click="onManageEdgeEntityViews({event: $event})" | |
31 | + ng-show="!isEdit && edgeScope === 'tenant'" | |
32 | + class="md-raised md-primary">{{ 'edge.manage-edge-entity-views' | translate }}</md-button> | |
33 | +<md-button ng-click="onManageEdgeDashboards({event: $event})" | |
34 | + ng-show="!isEdit && edgeScope === 'tenant'" | |
35 | + class="md-raised md-primary">{{ 'edge.manage-edge-dashboards' | translate }}</md-button> | |
36 | +<md-button ng-click="onManageEdgeRuleChains({event: $event})" | |
37 | + ng-show="!isEdit && edgeScope === 'tenant'" | |
38 | + class="md-raised md-primary">{{ 'edge.manage-edge-rulechains' | translate }}</md-button> | |
24 | 39 | <md-button ng-click="onDeleteEdge({event: $event})" |
25 | 40 | ng-show="!isEdit && edgeScope === 'tenant'" |
26 | 41 | class="md-raised md-primary">{{ 'edge.delete' | translate }}</md-button> | ... | ... |
... | ... | @@ -129,6 +129,11 @@ export function EdgeController($rootScope, userService, edgeService, customerSer |
129 | 129 | vm.assignToCustomer = assignToCustomer; |
130 | 130 | vm.makePublic = makePublic; |
131 | 131 | vm.unassignFromCustomer = unassignFromCustomer; |
132 | + vm.openEdgeAssets = openEdgeAssets; | |
133 | + vm.openEdgeDevices = openEdgeDevices; | |
134 | + vm.openEdgeEntityViews = openEdgeEntityViews; | |
135 | + vm.openEdgeDashboards = openEdgeDashboards; | |
136 | + vm.openEdgeRuleChains = openEdgeRuleChains; | |
132 | 137 | |
133 | 138 | initController(); |
134 | 139 | ... | ... |
... | ... | @@ -96,6 +96,11 @@ export default function EdgeDirective($compile, $templateCache, $translate, $mdD |
96 | 96 | onAssignToCustomer: '&', |
97 | 97 | onMakePublic: '&', |
98 | 98 | onUnassignFromCustomer: '&', |
99 | + onManageEdgeAssets: '&', | |
100 | + onManageEdgeDevices: '&', | |
101 | + onManageEdgeEntityViews: '&', | |
102 | + onManageEdgeDashboards: '&', | |
103 | + onManageEdgeRuleChains: '&', | |
99 | 104 | onDeleteEdge: '&' |
100 | 105 | } |
101 | 106 | }; | ... | ... |
... | ... | @@ -29,6 +29,11 @@ |
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-manage-edge-assets="vm.openEdgeAssets(event, vm.grid.detailsConfig.currentItem)" | |
33 | + on-manage-edge-devices="vm.openEdgeDevices(event, vm.grid.detailsConfig.currentItem)" | |
34 | + on-manage-edge-entity-views="vm.openEdgeEntityViews(event, vm.grid.detailsConfig.currentItem)" | |
35 | + on-manage-edge-dashboards="vm.openEdgeDashboards(event, vm.grid.detailsConfig.currentItem)" | |
36 | + on-manage-edge-rule-chains="vm.openEdgeRuleChains(event, vm.grid.detailsConfig.currentItem)" | |
32 | 37 | on-delete-edge="vm.grid.deleteItem(event, vm.grid.detailsConfig.currentItem)"></tb-edge> |
33 | 38 | </md-tab> |
34 | 39 | <md-tab ng-if="!vm.grid.detailsConfig.isDetailsEditMode" md-on-select="vm.grid.triggerResize()" label="{{ 'attribute.attributes' | translate }}"> | ... | ... |
... | ... | @@ -17,7 +17,7 @@ |
17 | 17 | --> |
18 | 18 | <div translate class="tb-cell" flex="20">event.event-time</div> |
19 | 19 | <div translate class="tb-cell" flex="20">event.event-type</div> |
20 | -<div translate class="tb-cell" flex="20">edge.event-action</div> | |
21 | -<div translate class="tb-cell" flex="30">edge.entity-id</div> | |
22 | -<div translate class="tb-cell" flex="20">edge.entity-info</div> | |
23 | -<div translate class="tb-cell" flex="20">event.status</div> | |
20 | +<div translate class="tb-cell" flex="40">edge.event-action</div> | |
21 | +<div translate class="tb-cell" flex="20">edge.entity-id</div> | |
22 | +<div translate class="tb-cell" flex="15">edge.status</div> | |
23 | +<div translate class="tb-cell" flex="10">edge.entity-info</div> | ... | ... |
... | ... | @@ -17,9 +17,10 @@ |
17 | 17 | --> |
18 | 18 | <div class="tb-cell" flex="20">{{event.createdTime | date : 'yyyy-MM-dd HH:mm:ss'}}</div> |
19 | 19 | <div class="tb-cell" flex="20">{{event.edgeEventType}}</div> |
20 | -<div class="tb-cell" flex="20">{{event.edgeEventAction}}</div> | |
21 | -<div class="tb-cell" flex="30">{{event.entityId}}</div> | |
22 | -<div class="tb-cell" flex="20"> | |
20 | +<div class="tb-cell" flex="40">{{event.edgeEventAction}}</div> | |
21 | +<div class="tb-cell" flex="20">{{event.entityId}}</div> | |
22 | +<div class="tb-cell" flex="15" ng-style="isPending ? {'color': 'rgba(0, 0, 0, 0.38)'} : {'color': '#000'}">{{updateStatus(event.createdTime)}}</div> | |
23 | +<div class="tb-cell" flex="10"> | |
23 | 24 | <md-button class="md-icon-button md-primary" |
24 | 25 | ng-click="showEdgeEntityContent($event, 'edge.entity-info', 'JSON')" |
25 | 26 | aria-label="{{ 'action.view' | translate }}"> |
... | ... | @@ -32,5 +33,5 @@ |
32 | 33 | </md-icon> |
33 | 34 | </md-button> |
34 | 35 | </div> |
35 | -<div class="tb-cell" flex="20">{{updateStatus(event.createdTime)}}</div> | |
36 | + | |
36 | 37 | ... | ... |
... | ... | @@ -147,7 +147,15 @@ export default function EventRowDirective($compile, $templateCache, $mdDialog, $ |
147 | 147 | |
148 | 148 | scope.updateStatus = function(eventCreatedTime) { |
149 | 149 | if (scope.queueStartTs) { |
150 | - return (eventCreatedTime < scope.queueStartTs) ? $translate.instant('event.success') : $translate.instant('event.failed'); | |
150 | + var status; | |
151 | + if (eventCreatedTime < scope.queueStartTs) { | |
152 | + status = 'edge.success'; | |
153 | + scope.isPending = false; | |
154 | + } else { | |
155 | + status = 'edge.failed'; | |
156 | + scope.isPending = true; | |
157 | + } | |
158 | + return $translate.instant(status); | |
151 | 159 | } |
152 | 160 | } |
153 | 161 | } | ... | ... |
... | ... | @@ -843,7 +843,10 @@ |
843 | 843 | "entity-views": "Edge entity views", |
844 | 844 | "set-root-rule-chain-text": "Please select root rule chain for edge(s)", |
845 | 845 | "set-root-rule-chain-to-edges": "Set root rule chain for Edge(s)", |
846 | - "set-root-rule-chain-to-edges-text": "Set root rule chain for { count, plural, 1 {1 edge} other {# edges} }" | |
846 | + "set-root-rule-chain-to-edges-text": "Set root rule chain for { count, plural, 1 {1 edge} other {# edges} }", | |
847 | + "status": "Received by edge", | |
848 | + "success": "Deployed", | |
849 | + "failed": "Pending" | |
847 | 850 | }, |
848 | 851 | "error": { |
849 | 852 | "unable-to-connect": "Unable to connect to the server! Please check your internet connection.", | ... | ... |