dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fix method getEntityDataInfo in VersionController
This commit is contained in:
Viacheslav Klimov 2025-03-13 11:52:00 +02:00 committed by GitHub
commit 3182c1a88e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);

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

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