Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge

application/src/main/java/org/thingsboard/server/service/edge/rpc/init/DefaultSyncEdgeService.java

@@ -304,6 +304,15 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
         }
     }
 
+    private void pushUsersToEdge(PageData<User> pageData, Edge edge) {
+        if (pageData != null && pageData.getData() != null && !pageData.getData().isEmpty()) {
+            log.trace("[{}] [{}] user(s) are going to be pushed to edge.", edge.getId(), pageData.getData().size());
+            for (User user : pageData.getData()) {
+                saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.USER, EdgeEventActionType.ADDED, user.getId(), null);
+            }
+        }
+    }
+
     private void syncWidgetsBundleAndWidgetTypes(Edge edge) {
         log.trace("[{}] syncWidgetsBundleAndWidgetTypes [{}]", edge.getTenantId(), edge.getName());
         List<WidgetsBundle> widgetsBundlesToPush = new ArrayList<>();
@@ -391,15 +400,6 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
         return tenantMailSettings;
     }
 
-    private void pushUsersToEdge(PageData<User> pageData, Edge edge) {
-        if (pageData != null && pageData.getData() != null && !pageData.getData().isEmpty()) {
-            log.trace("[{}] [{}] user(s) are going to be pushed to edge.", edge.getId(), pageData.getData().size());
-            for (User user : pageData.getData()) {
-                saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.USER, EdgeEventActionType.ADDED, user.getId(), null);
-            }
-        }
-    }
-
     @Override
     public ListenableFuture<Void> processRuleChainMetadataRequestMsg(Edge edge, RuleChainMetadataRequestMsg ruleChainMetadataRequestMsg) {
         log.trace("[{}] processRuleChainMetadataRequestMsg [{}][{}]", edge.getTenantId(), edge.getName(), ruleChainMetadataRequestMsg);

ui-ngx/src/assets/locale/locale.constant-en_US.json

@@ -1205,7 +1205,8 @@
       "edge-type-list-empty": "No device types selected.",
       "edge-types": "Edge types",
       "dashboard": "Edge dashboard",
-      "unassign-edges-action-title": "Unassign { count, plural, 1 {1 edge} other {# edges} } from customer"
+      "unassign-edges-action-title": "Unassign { count, plural, 1 {1 edge} other {# edges} } from customer",
+      "enter-edge-type": "Enter edge type"
     },
     "error": {
         "unable-to-connect": "Unable to connect to the server! Please check your internet connection.",