Auto-commit fix for Widget Types

application/src/main/java/org/thingsboard/server/controller/AutoCommitController.java

@@ -0,0 +1,42 @@
+/**
+ * Copyright © 2016-2022 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.controller;
+
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.service.sync.vc.EntitiesVersionControlService;
+
+import java.util.UUID;
+
+public class AutoCommitController extends BaseController {
+
+    @Autowired
+    private EntitiesVersionControlService vcService;
+
+    protected ListenableFuture<UUID> autoCommit(User user, EntityId entityId) throws Exception {
+        if (vcService != null) {
+            return vcService.autoCommit(user, entityId);
+        } else {
+            // We do not support auto-commit for rule engine
+            return Futures.immediateFailedFuture(new RuntimeException("Operation not supported!"));
+        }
+    }
+
+
+}

application/src/main/java/org/thingsboard/server/controller/WidgetTypeController.java

@@ -36,6 +36,7 @@ import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.data.widget.WidgetType;
 import org.thingsboard.server.common.data.widget.WidgetTypeDetails;
 import org.thingsboard.server.common.data.widget.WidgetTypeInfo;
+import org.thingsboard.server.common.data.widget.WidgetsBundle;
 import org.thingsboard.server.dao.model.ModelConstants;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.permission.Operation;
@@ -52,7 +53,7 @@ import static org.thingsboard.server.controller.ControllerConstants.WIDGET_TYPE_
 @RestController
 @TbCoreComponent
 @RequestMapping("/api")
-public class WidgetTypeController extends BaseController {
+public class WidgetTypeController extends AutoCommitController {
 
     private static final String WIDGET_TYPE_DESCRIPTION = "Widget Type represents the template for widget creation. Widget Type and Widget are similar to class and object in OOP theory.";
     private static final String WIDGET_TYPE_DETAILS_DESCRIPTION = "Widget Type Details extend Widget Type and add image and description properties. " +
@@ -93,15 +94,21 @@ public class WidgetTypeController extends BaseController {
             @ApiParam(value = "A JSON value representing the Widget Type Details.", required = true)
             @RequestBody WidgetTypeDetails widgetTypeDetails) throws ThingsboardException {
         try {
-            if (Authority.SYS_ADMIN.equals(getCurrentUser().getAuthority())) {
+            var currentUser = getCurrentUser();
+            if (Authority.SYS_ADMIN.equals(currentUser.getAuthority())) {
                 widgetTypeDetails.setTenantId(TenantId.SYS_TENANT_ID);
             } else {
-                widgetTypeDetails.setTenantId(getCurrentUser().getTenantId());
+                widgetTypeDetails.setTenantId(currentUser.getTenantId());
             }
 
             checkEntity(widgetTypeDetails.getId(), widgetTypeDetails, Resource.WIDGET_TYPE);
             WidgetTypeDetails savedWidgetTypeDetails = widgetTypeService.saveWidgetType(widgetTypeDetails);
 
+            WidgetsBundle widgetsBundle = widgetsBundleService.findWidgetsBundleByTenantIdAndAlias(widgetTypeDetails.getTenantId(), widgetTypeDetails.getBundleAlias());
+            if (widgetsBundle != null) {
+                autoCommit(currentUser, widgetsBundle.getId());
+            }
+
             sendEntityNotificationMsg(getTenantId(), savedWidgetTypeDetails.getId(),
                     widgetTypeDetails.getId() == null ? EdgeEventActionType.ADDED : EdgeEventActionType.UPDATED);
 

application/src/main/java/org/thingsboard/server/controller/WidgetsBundleController.java

@@ -96,16 +96,17 @@ public class WidgetsBundleController extends BaseController {
     @ResponseBody
     public WidgetsBundle saveWidgetsBundle(
             @ApiParam(value = "A JSON value representing the Widget Bundle.", required = true)
-            @RequestBody WidgetsBundle widgetsBundle) throws ThingsboardException {
+            @RequestBody WidgetsBundle widgetsBundle) throws Exception {
-        if (Authority.SYS_ADMIN.equals(getCurrentUser().getAuthority())) {
+        var currentUser = getCurrentUser();
+        if (Authority.SYS_ADMIN.equals(currentUser.getAuthority())) {
             widgetsBundle.setTenantId(TenantId.SYS_TENANT_ID);
         } else {
-            widgetsBundle.setTenantId(getCurrentUser().getTenantId());
+            widgetsBundle.setTenantId(currentUser.getTenantId());
         }
 
         checkEntity(widgetsBundle.getId(), widgetsBundle, Resource.WIDGETS_BUNDLE);
 
-        return tbWidgetsBundleService.save(widgetsBundle);
+        return tbWidgetsBundleService.save(widgetsBundle, currentUser);
     }
 
     @ApiOperation(value = "Delete widgets bundle (deleteWidgetsBundle)",

application/src/main/java/org/thingsboard/server/service/entitiy/widgets/bundle/DefaultWidgetsBundleService.java

@@ -17,6 +17,7 @@ package org.thingsboard.server.service.entitiy.widgets.bundle;
 
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.widget.WidgetsBundle;
@@ -32,8 +33,9 @@ public class DefaultWidgetsBundleService extends AbstractTbEntityService impleme
     private final WidgetsBundleService widgetsBundleService;
 
     @Override
-    public WidgetsBundle save(WidgetsBundle widgetsBundle) throws ThingsboardException {
+    public WidgetsBundle save(WidgetsBundle widgetsBundle, User user) throws Exception {
         WidgetsBundle savedWidgetsBundle = checkNotNull(widgetsBundleService.saveWidgetsBundle(widgetsBundle));
+        autoCommit(user, savedWidgetsBundle.getId());
         notificationEntityService.notifySendMsgToEdgeService(widgetsBundle.getTenantId(), savedWidgetsBundle.getId(),
                 widgetsBundle.getId() == null ? EdgeEventActionType.ADDED : EdgeEventActionType.UPDATED);
         return savedWidgetsBundle;

application/src/main/java/org/thingsboard/server/service/entitiy/widgets/bundle/TbWidgetsBundleService.java

@@ -15,11 +15,13 @@
  */
 package org.thingsboard.server.service.entitiy.widgets.bundle;
 
+import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.widget.WidgetsBundle;
 
 public interface TbWidgetsBundleService {
-    WidgetsBundle save(WidgetsBundle entity) throws ThingsboardException;
+
+    WidgetsBundle save(WidgetsBundle entity, User currentUser) throws Exception;
 
     void delete(WidgetsBundle entity) throws ThingsboardException;
 }