Merge pull request #12894 from AndriiLandiak/fix-calculated-field-vc

Fix method getEntityDataInfo in VersionController

application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java

@@ -500,10 +500,9 @@ public class DefaultEntitiesVersionControlService implements EntitiesVersionCont
     @Override
     public ListenableFuture<EntityDataInfo> getEntityDataInfo(User user, EntityId entityId, String versionId) {
         return Futures.transform(gitServiceQueue.getEntity(user.getTenantId(), versionId, entityId),
-                entity -> new EntityDataInfo(entity.hasRelations(), entity.hasAttributes(), entity.hasCredentials()), MoreExecutors.directExecutor());
+                entity -> new EntityDataInfo(entity.hasRelations(), entity.hasAttributes(), entity.hasCredentials(), entity.hasCalculatedFields()), MoreExecutors.directExecutor());
     }
 
-
     @Override
     public ListenableFuture<List<BranchInfo>> listBranches(TenantId tenantId) {
         return gitServiceQueue.listBranches(tenantId);

common/data/src/main/java/org/thingsboard/server/common/data/sync/vc/EntityDataInfo.java

@@ -26,4 +26,5 @@ public class EntityDataInfo {
     boolean hasRelations;
     boolean hasAttributes;
     boolean hasCredentials;
+    boolean hasCalculatedFields;
 }