fetch system widgets bundles

application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/WidgetTypeUpdateMsgConstructor.java

@@ -17,6 +17,7 @@ package org.thingsboard.server.service.edge.rpc.constructor;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.WidgetTypeId;
 import org.thingsboard.server.common.data.widget.WidgetType;
 import org.thingsboard.server.dao.util.mapping.JacksonUtil;
@@ -44,7 +45,10 @@ public class WidgetTypeUpdateMsgConstructor {
                 if (widgetType.getDescriptor() != null) {
                     builder.setDescriptorJson(JacksonUtil.toString(widgetType.getDescriptor()));
                 }
-                return builder.build();
+                if (widgetType.getTenantId().equals(TenantId.SYS_TENANT_ID)) {
+                   builder.setIsSystem(true);
+                }
+        return builder.build();
     }
 
     public WidgetTypeUpdateMsg constructWidgetTypeDeleteMsg(WidgetTypeId widgetTypeId) {

application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/WidgetsBundleUpdateMsgConstructor.java

@@ -18,6 +18,7 @@ package org.thingsboard.server.service.edge.rpc.constructor;
 import com.google.protobuf.ByteString;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.WidgetsBundleId;
 import org.thingsboard.server.common.data.widget.WidgetsBundle;
 import org.thingsboard.server.gen.edge.UpdateMsgType;
@@ -37,6 +38,9 @@ public class WidgetsBundleUpdateMsgConstructor {
         if (widgetsBundle.getImage() != null) {
             builder.setImage(ByteString.copyFrom(widgetsBundle.getImage()));
         }
+        if (widgetsBundle.getTenantId().equals(TenantId.SYS_TENANT_ID)) {
+            builder.setIsSystem(true);
+        }
         return builder.build();
     }
 

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

@@ -54,6 +54,8 @@ import org.thingsboard.server.common.data.relation.EntityRelationsQuery;
 import org.thingsboard.server.common.data.relation.EntitySearchDirection;
 import org.thingsboard.server.common.data.relation.RelationsSearchParameters;
 import org.thingsboard.server.common.data.rule.RuleChain;
+import org.thingsboard.server.common.data.widget.WidgetType;
+import org.thingsboard.server.common.data.widget.WidgetsBundle;
 import org.thingsboard.server.dao.asset.AssetService;
 import org.thingsboard.server.dao.attributes.AttributesService;
 import org.thingsboard.server.dao.dashboard.DashboardService;
@@ -63,6 +65,8 @@ import org.thingsboard.server.dao.entityview.EntityViewService;
 import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.rule.RuleChainService;
 import org.thingsboard.server.dao.user.UserService;
+import org.thingsboard.server.dao.widget.WidgetTypeService;
+import org.thingsboard.server.dao.widget.WidgetsBundleService;
 import org.thingsboard.server.gen.edge.AttributesRequestMsg;
 import org.thingsboard.server.gen.edge.DeviceCredentialsRequestMsg;
 import org.thingsboard.server.gen.edge.RelationRequestMsg;
@@ -109,6 +113,12 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
     @Autowired
     private UserService userService;
 
+    @Autowired
+    private WidgetsBundleService widgetsBundleService;
+
+    @Autowired
+    private WidgetTypeService widgetTypeService;
+
     @Autowired
     private DbCallbackExecutorService dbCallbackExecutorService;
 
@@ -121,6 +131,7 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
             syncAssets(edge);
             syncEntityViews(edge);
             syncDashboards(edge);
+            syncWidgetsBundleAndWidgetTypes(edge);
         } catch (Exception e) {
             log.error("Exception during sync process", e);
         }
@@ -261,6 +272,24 @@ public class DefaultSyncEdgeService implements SyncEdgeService {
         }
     }
 
+    private void syncWidgetsBundleAndWidgetTypes(Edge edge) {
+        List<WidgetsBundle> widgetsBundlesToPush = new ArrayList<>();
+        List<WidgetType> widgetTypesToPush = new ArrayList<>();
+        widgetsBundlesToPush.addAll(widgetsBundleService.findAllTenantWidgetsBundlesByTenantId(edge.getTenantId()));
+        widgetsBundlesToPush.addAll(widgetsBundleService.findSystemWidgetsBundles(edge.getTenantId()));
+        try {
+            for (WidgetsBundle widgetsBundle: widgetsBundlesToPush) {
+                saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.WIDGETS_BUNDLE, ActionType.ADDED, widgetsBundle.getId(), null);
+                widgetTypesToPush.addAll(widgetTypeService.findWidgetTypesByTenantIdAndBundleAlias(widgetsBundle.getTenantId(), widgetsBundle.getAlias()));
+            }
+            for (WidgetType widgetType: widgetTypesToPush) {
+                saveEdgeEvent(edge.getTenantId(), edge.getId(), EdgeEventType.WIDGET_TYPE, ActionType.ADDED, widgetType.getId(), null);
+            }
+        } catch (Exception e) {
+            log.error("Exception during loading widgets bundle(s) and widget type(s) on sync!", e);
+        }
+    }
+
     private void pushUsersToEdge(TextPageData<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());

common/edge-api/src/main/proto/edge.proto

@@ -275,6 +275,7 @@ message WidgetsBundleUpdateMsg {
   string title = 4;
   string alias = 5;
   bytes image = 6;
+  bool isSystem = 7;
 }
 
 message WidgetTypeUpdateMsg {
@@ -285,6 +286,7 @@ message WidgetTypeUpdateMsg {
   string alias = 5;
   string name = 6;
   string descriptorJson = 7;
+  bool isSystem = 8;
 }
 
 message UserCredentialsUpdateMsg {