Merge branch 'master' into feature/iot-svg

application/src/main/java/org/thingsboard/server/service/entitiy/AbstractTbEntityService.java

@@ -22,6 +22,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.core.env.Environment;
 import org.thingsboard.server.cluster.TbClusterService;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.User;
@@ -39,11 +40,15 @@ import org.thingsboard.server.service.telemetry.AlarmSubscriptionService;
 
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import java.util.UUID;
 
 @Slf4j
 public abstract class AbstractTbEntityService {
 
+    @Autowired
+    private Environment env;
+
     @Value("${server.log_controller_error_stack_trace}")
     @Getter
     private boolean logControllerErrorStackTrace;
@@ -67,6 +72,10 @@ public abstract class AbstractTbEntityService {
     @Lazy
     private EntitiesVersionControlService vcService;
 
+    protected boolean isTestProfile() {
+        return Set.of(this.env.getActiveProfiles()).contains("test");
+    }
+
     protected <T> T checkNotNull(T reference) throws ThingsboardException {
         return checkNotNull(reference, "Requested item wasn't found!");
     }

application/src/main/java/org/thingsboard/server/service/entitiy/tenant/DefaultTbTenantService.java

@@ -17,6 +17,7 @@ package org.thingsboard.server.service.entitiy.tenant;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Value;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -52,7 +53,9 @@ public class DefaultTbTenantService extends AbstractTbEntityService implements T
         Tenant savedTenant = tenantService.saveTenant(tenant, tenantId -> {
             installScripts.createDefaultRuleChains(tenantId);
             installScripts.createDefaultEdgeRuleChains(tenantId);
-            installScripts.createDefaultTenantDashboards(tenantId, null);
+            if (!isTestProfile()) {
+                installScripts.createDefaultTenantDashboards(tenantId, null);
+            }
         });
         tenantProfileCache.evict(savedTenant.getId());
 

application/src/main/java/org/thingsboard/server/service/install/InstallScripts.java

@@ -317,7 +317,8 @@ public class InstallScripts {
     @SneakyThrows
     public void loadSystemImages() {
         log.info("Loading system images...");
-        Stream<Path> dashboardsFiles = Files.list(Paths.get(getDataDir(), JSON_DIR, DEMO_DIR, DASHBOARDS_DIR));
+        Stream<Path> dashboardsFiles = Stream.concat(Files.list(Paths.get(getDataDir(), JSON_DIR, DEMO_DIR, DASHBOARDS_DIR)),
+                                                     Files.list(Paths.get(getDataDir(), JSON_DIR, TENANT_DIR, DASHBOARDS_DIR)));
         try (dashboardsFiles) {
             dashboardsFiles.forEach(file -> {
                 try {