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

return empty object for app store and version info to fit UI component behaviour

Browse Source
This commit is contained in:
dashevchenko 2025-01-13 12:26:20 +02:00
parent 796632d6f9
commit 2bb368b45d
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/data/src/main/java/org/thingsboard/server/common/data/mobile/app/StoreInfo.java
View File

@ -15,12 +15,16 @@
*/ */
package org.thingsboard.server.common.data.mobile.app; package org.thingsboard.server.common.data.mobile.app;
import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor;
import org.thingsboard.server.common.data.validation.NoXss; import org.thingsboard.server.common.data.validation.NoXss;
@Data @Data
@Builder @Builder
@NoArgsConstructor
@AllArgsConstructor
public class StoreInfo { public class StoreInfo {
@NoXss @NoXss

4
dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
View File

@ -19,6 +19,8 @@ import com.datastax.oss.driver.api.core.uuid.Uuids;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.kv.Aggregation; import org.thingsboard.server.common.data.kv.Aggregation;
import org.thingsboard.server.common.data.mobile.app.MobileAppVersionInfo;
import org.thingsboard.server.common.data.mobile.app.StoreInfo;
import java.util.UUID; import java.util.UUID;
@ -454,6 +456,8 @@ public class ModelConstants {
public static final String MOBILE_APP_STATUS_PROPERTY = "status"; public static final String MOBILE_APP_STATUS_PROPERTY = "status";
public static final String MOBILE_APP_VERSION_INFO_PROPERTY = "version_info"; public static final String MOBILE_APP_VERSION_INFO_PROPERTY = "version_info";
public static final String MOBILE_APP_STORE_INFO_PROPERTY = "store_info"; public static final String MOBILE_APP_STORE_INFO_PROPERTY = "store_info";
public static final MobileAppVersionInfo MOBILE_APP_VERSION_INFO_EMPTY_OBJECT = new MobileAppVersionInfo();
public static final StoreInfo MOBILE_APP_STORE_INFO_EMPTY_OBJECT = new StoreInfo();
/** /**
* Mobile application bundle constants. * Mobile application bundle constants.

6
dao/src/main/java/org/thingsboard/server/dao/model/sql/MobileAppEntity.java
View File

@ -37,6 +37,8 @@ import org.thingsboard.server.dao.util.mapping.JsonConverter;
import java.util.UUID; import java.util.UUID;
import static org.thingsboard.server.dao.model.ModelConstants.MOBILE_APP_STORE_INFO_EMPTY_OBJECT;
import static org.thingsboard.server.dao.model.ModelConstants.MOBILE_APP_VERSION_INFO_EMPTY_OBJECT;
import static org.thingsboard.server.dao.model.ModelConstants.TENANT_ID_COLUMN; import static org.thingsboard.server.dao.model.ModelConstants.TENANT_ID_COLUMN;
@Data @Data
@ -99,8 +101,8 @@ public class MobileAppEntity extends BaseSqlEntity<MobileApp> {
mobile.setAppSecret(appSecret); mobile.setAppSecret(appSecret);
mobile.setPlatformType(platformType); mobile.setPlatformType(platformType);
mobile.setStatus(status); mobile.setStatus(status);
mobile.setVersionInfo(fromJson(versionInfo, MobileAppVersionInfo.class)); mobile.setVersionInfo(versionInfo != null ? fromJson(versionInfo, MobileAppVersionInfo.class) : MOBILE_APP_VERSION_INFO_EMPTY_OBJECT);
mobile.setStoreInfo(fromJson(storeInfo, StoreInfo.class)); mobile.setStoreInfo(storeInfo != null ? fromJson(storeInfo, StoreInfo.class) : MOBILE_APP_STORE_INFO_EMPTY_OBJECT);
return mobile; return mobile;
} }
} }