From 37d6cd915e34767a2d52a29a0320677e8da5a0bf Mon Sep 17 00:00:00 2001 From: Viacheslav Klimov Date: Wed, 22 Jun 2022 18:54:55 +0300 Subject: [PATCH 1/2] Always add default branch to listBranches response --- .../EntitiesVersionControlController.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/controller/EntitiesVersionControlController.java b/application/src/main/java/org/thingsboard/server/controller/EntitiesVersionControlController.java index 11d64b0be4..dc2bac8947 100644 --- a/application/src/main/java/org/thingsboard/server/controller/EntitiesVersionControlController.java +++ b/application/src/main/java/org/thingsboard/server/controller/EntitiesVersionControlController.java @@ -490,15 +490,20 @@ public class EntitiesVersionControlController extends BaseController { List infos = new ArrayList<>(); String defaultBranch = versionControlService.getVersionControlSettings(tenantId).getDefaultBranch(); - if (StringUtils.isNotEmpty(defaultBranch)) { - infos.add(new BranchInfo(defaultBranch, true)); + if (StringUtils.isEmpty(defaultBranch)) { + if (remoteBranches.contains("main")) { + defaultBranch = "main"; + } else { + defaultBranch = "master"; + } } + infos.add(new BranchInfo(defaultBranch, true)); - remoteBranches.forEach(branch -> { + for (String branch : remoteBranches) { if (!branch.equals(defaultBranch)) { infos.add(new BranchInfo(branch, false)); } - }); + } return infos; }, MoreExecutors.directExecutor())); } From db43c39c545fb3093d746ff9ade86f82ca41f529 Mon Sep 17 00:00:00 2001 From: Viacheslav Klimov Date: Thu, 23 Jun 2022 10:44:07 +0300 Subject: [PATCH 2/2] Fix device version load --- .../service/sync/vc/DefaultEntitiesVersionControlService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java b/application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java index 6ea8115e53..76f5bc2901 100644 --- a/application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java +++ b/application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java @@ -358,6 +358,7 @@ public class DefaultEntitiesVersionControlService implements EntitiesVersionCont return EntityImportSettings.builder() .updateRelations(config.isLoadRelations()) .saveAttributes(config.isLoadAttributes()) + .saveCredentials(config.isLoadCredentials()) .findExistingByName(config.isFindExistingEntityByName()) .build(); }