简柏林 / thingskit · Commits

Commit 77e73516e6b9ef744438cf568cbe4c85d2e4aaba

Authored by Artem Babak
1 parent 850b3389

Edge's dashboards - fix for card buttons

Inline Side-by-side
Showing 4 changed files with 14 additions and 2 deletions
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 16
17 --> 17 -->
18 <md-button ng-click="onExportDashboard({event: $event})" 18 <md-button ng-click="onExportDashboard({event: $event})"
19 - ng-show="!isEdit && dashboardScope === 'tenant'" 19 + ng-show="!isEdit && (dashboardScope === 'tenant' || dashboardScope === 'edge')"
20 class="md-raised md-primary">{{ 'dashboard.export' | translate }}</md-button> 20 class="md-raised md-primary">{{ 'dashboard.export' | translate }}</md-button>
21 <md-button ng-click="onMakePublic({event: $event})" 21 <md-button ng-click="onMakePublic({event: $event})"
22 ng-show="!isEdit && dashboardScope === 'tenant' && !dashboard.publicCustomerId" 22 ng-show="!isEdit && dashboardScope === 'tenant' && !dashboard.publicCustomerId"
@@ -34,6 +34,9 @@ @@ -34,6 +34,9 @@
34 <md-button ng-click="onDeleteDashboard({event: $event})" 34 <md-button ng-click="onDeleteDashboard({event: $event})"
35 ng-show="!isEdit && dashboardScope === 'tenant'" 35 ng-show="!isEdit && dashboardScope === 'tenant'"
36 class="md-raised md-primary">{{ 'dashboard.delete' | translate }}</md-button> 36 class="md-raised md-primary">{{ 'dashboard.delete' | translate }}</md-button>
  37 +<md-button ng-click="onUnassignFromEdge({event: $event})"
  38 + ng-show="!isEdit && dashboardScope === 'edge'"
  39 + class="md-raised md-primary">{{ 'edge.unassign-from-edge' | translate }}</md-button>
37 <md-content class="md-padding" layout="column"> 40 <md-content class="md-padding" layout="column">
38 <md-input-container class="md-block" 41 <md-input-container class="md-block"
39 ng-show="!isEdit && dashboard.assignedCustomersText && dashboardScope === 'tenant'"> 42 ng-show="!isEdit && dashboard.assignedCustomersText && dashboardScope === 'tenant'">
@@ -48,12 +48,14 @@ export default function DashboardDirective($compile, $templateCache, $translate, @@ -48,12 +48,14 @@ export default function DashboardDirective($compile, $templateCache, $translate,
48 dashboard: '=', 48 dashboard: '=',
49 isEdit: '=', 49 isEdit: '=',
50 customerId: '=', 50 customerId: '=',
  51 + edgeId: '=',
51 dashboardScope: '=', 52 dashboardScope: '=',
52 theForm: '=', 53 theForm: '=',
53 onMakePublic: '&', 54 onMakePublic: '&',
54 onMakePrivate: '&', 55 onMakePrivate: '&',
55 onManageAssignedCustomers: '&', 56 onManageAssignedCustomers: '&',
56 onUnassignFromCustomer: '&', 57 onUnassignFromCustomer: '&',
  58 + onUnassignFromEdge: '&',
57 onExportDashboard: '&', 59 onExportDashboard: '&',
58 onDeleteDashboard: '&' 60 onDeleteDashboard: '&'
59 } 61 }
@@ -129,6 +129,7 @@ export function DashboardsController(userService, dashboardService, customerServ @@ -129,6 +129,7 @@ export function DashboardsController(userService, dashboardService, customerServ
129 vm.manageAssignedCustomers = manageAssignedCustomers; 129 vm.manageAssignedCustomers = manageAssignedCustomers;
130 vm.unassignFromCustomer = unassignFromCustomer; 130 vm.unassignFromCustomer = unassignFromCustomer;
131 vm.exportDashboard = exportDashboard; 131 vm.exportDashboard = exportDashboard;
  132 + vm.unassignFromEdge = unassignFromEdge;
132 133
133 initController(); 134 initController();
134 135
@@ -156,6 +157,10 @@ export function DashboardsController(userService, dashboardService, customerServ @@ -156,6 +157,10 @@ export function DashboardsController(userService, dashboardService, customerServ
156 ); 157 );
157 } 158 }
158 159
  160 + if (edgeId) {
  161 + vm.edgeId = edgeId;
  162 + }
  163 +
159 if (vm.dashboardsScope === 'tenant') { 164 if (vm.dashboardsScope === 'tenant') {
160 fetchDashboardsFunction = function (pageLink) { 165 fetchDashboardsFunction = function (pageLink) {
161 return dashboardService.getTenantDashboards(pageLink); 166 return dashboardService.getTenantDashboards(pageLink);
@@ -26,12 +26,14 @@ @@ -26,12 +26,14 @@
26 is-edit="vm.grid.detailsConfig.isDetailsEditMode" 26 is-edit="vm.grid.detailsConfig.isDetailsEditMode"
27 dashboard-scope="vm.dashboardsScope" 27 dashboard-scope="vm.dashboardsScope"
28 customer-id="vm.customerId" 28 customer-id="vm.customerId"
  29 + edge-id="vm.edgeId"
29 the-form="vm.grid.detailsForm" 30 the-form="vm.grid.detailsForm"
30 on-make-public="vm.makePublic(event, vm.grid.detailsConfig.currentItem)" 31 on-make-public="vm.makePublic(event, vm.grid.detailsConfig.currentItem)"
31 on-make-private="vm.makePrivate(event, vm.grid.detailsConfig.currentItem)" 32 on-make-private="vm.makePrivate(event, vm.grid.detailsConfig.currentItem)"
32 on-manage-assigned-customers="vm.manageAssignedCustomers(event, vm.grid.detailsConfig.currentItem)" 33 on-manage-assigned-customers="vm.manageAssignedCustomers(event, vm.grid.detailsConfig.currentItem)"
33 on-unassign-from-customer="vm.unassignFromCustomer(event, vm.grid.detailsConfig.currentItem, vm.customerId)" 34 on-unassign-from-customer="vm.unassignFromCustomer(event, vm.grid.detailsConfig.currentItem, vm.customerId)"
34 - on-export-dashboard="vm.exportDashboard(event, vm.grid.detailsConfig.currentItem)" 35 + on-unassign-from-edge="vm.unassignFromEdge(event, vm.grid.detailsConfig.currentItem, vm.edgeId)"
  36 + on-export-dashboard="vm.exportDashboard(event, vm.grid.detailsConfig.currentItem)"
35 on-delete-dashboard="vm.grid.deleteItem(event, vm.grid.detailsConfig.currentItem)"></tb-dashboard-details> 37 on-delete-dashboard="vm.grid.deleteItem(event, vm.grid.detailsConfig.currentItem)"></tb-dashboard-details>
36 </md-tab> 38 </md-tab>
37 <md-tab ng-if="!vm.grid.detailsConfig.isDetailsEditMode && vm.grid.isTenantAdmin()" md-on-select="vm.grid.triggerResize()" label="{{ 'audit-log.audit-logs' | translate }}"> 39 <md-tab ng-if="!vm.grid.detailsConfig.isDetailsEditMode && vm.grid.isTenantAdmin()" md-on-select="vm.grid.triggerResize()" label="{{ 'audit-log.audit-logs' | translate }}">