Commit a1d6cee789af40ef1a0ba5b26250d3c8f8e9a176
Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge
Showing
2 changed files
with
11 additions
and
10 deletions
| @@ -304,6 +304,15 @@ public class DefaultSyncEdgeService implements SyncEdgeService { | @@ -304,6 +304,15 @@ public class DefaultSyncEdgeService implements SyncEdgeService { | ||
| 304 | } | 304 | } |
| 305 | } | 305 | } |
| 306 | 306 | ||
| 307 | + private void pushUsersToEdge(PageData<User> pageData, Edge edge) { | ||
| 308 | + if (pageData != null && pageData.getData() != null && !pageData.getData().isEmpty()) { | ||
| 309 | + log.trace("[{}] [{}] user(s) are going to be pushed to edge.", edge.getId(), pageData.getData().size()); | ||
| 310 | + for (User user : pageData.getData()) { | ||
| 311 | + saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.USER, EdgeEventActionType.ADDED, user.getId(), null); | ||
| 312 | + } | ||
| 313 | + } | ||
| 314 | + } | ||
| 315 | + | ||
| 307 | private void syncWidgetsBundleAndWidgetTypes(Edge edge) { | 316 | private void syncWidgetsBundleAndWidgetTypes(Edge edge) { |
| 308 | log.trace("[{}] syncWidgetsBundleAndWidgetTypes [{}]", edge.getTenantId(), edge.getName()); | 317 | log.trace("[{}] syncWidgetsBundleAndWidgetTypes [{}]", edge.getTenantId(), edge.getName()); |
| 309 | List<WidgetsBundle> widgetsBundlesToPush = new ArrayList<>(); | 318 | List<WidgetsBundle> widgetsBundlesToPush = new ArrayList<>(); |
| @@ -391,15 +400,6 @@ public class DefaultSyncEdgeService implements SyncEdgeService { | @@ -391,15 +400,6 @@ public class DefaultSyncEdgeService implements SyncEdgeService { | ||
| 391 | return tenantMailSettings; | 400 | return tenantMailSettings; |
| 392 | } | 401 | } |
| 393 | 402 | ||
| 394 | - private void pushUsersToEdge(PageData<User> pageData, Edge edge) { | ||
| 395 | - if (pageData != null && pageData.getData() != null && !pageData.getData().isEmpty()) { | ||
| 396 | - log.trace("[{}] [{}] user(s) are going to be pushed to edge.", edge.getId(), pageData.getData().size()); | ||
| 397 | - for (User user : pageData.getData()) { | ||
| 398 | - saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.USER, EdgeEventActionType.ADDED, user.getId(), null); | ||
| 399 | - } | ||
| 400 | - } | ||
| 401 | - } | ||
| 402 | - | ||
| 403 | @Override | 403 | @Override |
| 404 | public ListenableFuture<Void> processRuleChainMetadataRequestMsg(Edge edge, RuleChainMetadataRequestMsg ruleChainMetadataRequestMsg) { | 404 | public ListenableFuture<Void> processRuleChainMetadataRequestMsg(Edge edge, RuleChainMetadataRequestMsg ruleChainMetadataRequestMsg) { |
| 405 | log.trace("[{}] processRuleChainMetadataRequestMsg [{}][{}]", edge.getTenantId(), edge.getName(), ruleChainMetadataRequestMsg); | 405 | log.trace("[{}] processRuleChainMetadataRequestMsg [{}][{}]", edge.getTenantId(), edge.getName(), ruleChainMetadataRequestMsg); |
| @@ -1205,7 +1205,8 @@ | @@ -1205,7 +1205,8 @@ | ||
| 1205 | "edge-type-list-empty": "No device types selected.", | 1205 | "edge-type-list-empty": "No device types selected.", |
| 1206 | "edge-types": "Edge types", | 1206 | "edge-types": "Edge types", |
| 1207 | "dashboard": "Edge dashboard", | 1207 | "dashboard": "Edge dashboard", |
| 1208 | - "unassign-edges-action-title": "Unassign { count, plural, 1 {1 edge} other {# edges} } from customer" | 1208 | + "unassign-edges-action-title": "Unassign { count, plural, 1 {1 edge} other {# edges} } from customer", |
| 1209 | + "enter-edge-type": "Enter edge type" | ||
| 1209 | }, | 1210 | }, |
| 1210 | "error": { | 1211 | "error": { |
| 1211 | "unable-to-connect": "Unable to connect to the server! Please check your internet connection.", | 1212 | "unable-to-connect": "Unable to connect to the server! Please check your internet connection.", |