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

Merge branch 'rc' of github.com:thingsboard/thingsboard into rc

Browse Source
This commit is contained in:
Igor Kulikov 2025-03-26 15:47:01 +02:00
commit e2e1e9347f
5 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/src/main/data/upgrade/basic/schema_update.sql
View File

@ -83,3 +83,13 @@ SET profile_data = profile_data
WHERE profile_data->'configuration'->>'maxCalculatedFieldsPerEntity' IS NULL; WHERE profile_data->'configuration'->>'maxCalculatedFieldsPerEntity' IS NULL;
-- UPDATE TENANT PROFILE CALCULATED FIELD LIMITS END -- UPDATE TENANT PROFILE CALCULATED FIELD LIMITS END
-- UPDATE TENANT PROFILE DEBUG DURATION START
UPDATE tenant_profile
SET profile_data = jsonb_set(profile_data, '{configuration,maxDebugModeDurationMinutes}', '15', true)
WHERE
profile_data->'configuration' ? 'maxDebugModeDurationMinutes' = false
OR (profile_data->'configuration'->>'maxDebugModeDurationMinutes')::int = 0;
-- UPDATE TENANT PROFILE DEBUG DURATION END

5
application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
View File

@ -122,6 +122,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import static org.thingsboard.common.util.DebugModeUtil.DEBUG_MODE_DEFAULT_DURATION_MINUTES;
import static org.thingsboard.server.common.data.DataConstants.DEFAULT_DEVICE_TYPE; import static org.thingsboard.server.common.data.DataConstants.DEFAULT_DEVICE_TYPE;
import static org.thingsboard.server.service.security.auth.jwt.settings.DefaultJwtSettingsService.isSigningKeyDefault; import static org.thingsboard.server.service.security.auth.jwt.settings.DefaultJwtSettingsService.isSigningKeyDefault;
import static org.thingsboard.server.service.security.auth.jwt.settings.DefaultJwtSettingsService.validateKeyLength; import static org.thingsboard.server.service.security.auth.jwt.settings.DefaultJwtSettingsService.validateKeyLength;
@ -199,7 +200,9 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
tenantProfileService.findOrCreateDefaultTenantProfile(TenantId.SYS_TENANT_ID); tenantProfileService.findOrCreateDefaultTenantProfile(TenantId.SYS_TENANT_ID);
TenantProfileData isolatedRuleEngineTenantProfileData = new TenantProfileData(); TenantProfileData isolatedRuleEngineTenantProfileData = new TenantProfileData();
isolatedRuleEngineTenantProfileData.setConfiguration(new DefaultTenantProfileConfiguration()); DefaultTenantProfileConfiguration configuration = new DefaultTenantProfileConfiguration();
configuration.setMaxDebugModeDurationMinutes(DEBUG_MODE_DEFAULT_DURATION_MINUTES);
isolatedRuleEngineTenantProfileData.setConfiguration(configuration);
TenantProfileQueueConfiguration mainQueueConfiguration = new TenantProfileQueueConfiguration(); TenantProfileQueueConfiguration mainQueueConfiguration = new TenantProfileQueueConfiguration();
mainQueueConfiguration.setName(DataConstants.MAIN_QUEUE_NAME); mainQueueConfiguration.setName(DataConstants.MAIN_QUEUE_NAME);

2
common/util/src/main/java/org/thingsboard/common/util/DebugModeUtil.java
View File

@ -22,7 +22,7 @@ import java.util.Set;
public final class DebugModeUtil { public final class DebugModeUtil {
private static final int DEBUG_MODE_DEFAULT_DURATION_MINUTES = 15; public static final int DEBUG_MODE_DEFAULT_DURATION_MINUTES = 15;
private DebugModeUtil() { private DebugModeUtil() {
} }

5
dao/src/main/java/org/thingsboard/server/dao/tenant/TenantProfileServiceImpl.java
View File

@ -44,6 +44,7 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; import java.util.UUID;
import static org.thingsboard.common.util.DebugModeUtil.DEBUG_MODE_DEFAULT_DURATION_MINUTES;
import static org.thingsboard.server.dao.service.Validator.validateId; import static org.thingsboard.server.dao.service.Validator.validateId;
@Service("TenantProfileDaoService") @Service("TenantProfileDaoService")
@ -160,7 +161,9 @@ public class TenantProfileServiceImpl extends AbstractCachedEntityService<Tenant
defaultTenantProfile.setDefault(true); defaultTenantProfile.setDefault(true);
defaultTenantProfile.setName("Default"); defaultTenantProfile.setName("Default");
TenantProfileData profileData = new TenantProfileData(); TenantProfileData profileData = new TenantProfileData();
profileData.setConfiguration(new DefaultTenantProfileConfiguration()); DefaultTenantProfileConfiguration configuration = new DefaultTenantProfileConfiguration();
configuration.setMaxDebugModeDurationMinutes(DEBUG_MODE_DEFAULT_DURATION_MINUTES);
profileData.setConfiguration(configuration);
defaultTenantProfile.setProfileData(profileData); defaultTenantProfile.setProfileData(profileData);
defaultTenantProfile.setDescription("Default tenant profile"); defaultTenantProfile.setDescription("Default tenant profile");
defaultTenantProfile.setIsolatedTbRuleEngine(false); defaultTenantProfile.setIsolatedTbRuleEngine(false);

3
ui-ngx/src/app/modules/home/components/widget/lib/home-page/getting-started-widget.component.scss
View File

@ -38,9 +38,6 @@
.tb-get-started-container { .tb-get-started-container {
flex: 1; flex: 1;
overflow: auto; overflow: auto;
mat-stepper {
transform: scale(1); //fixed blur content
}
} }
} }