From 95f81276c560d28bdc792b02fb3e57bc50204bed Mon Sep 17 00:00:00 2001 From: dashevchenko Date: Mon, 2 Dec 2024 12:12:50 +0200 Subject: [PATCH 1/2] send null if layout config is not configured --- .../org/thingsboard/server/controller/MobileAppController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/main/java/org/thingsboard/server/controller/MobileAppController.java b/application/src/main/java/org/thingsboard/server/controller/MobileAppController.java index 362539f6b6..0673ce1fdf 100644 --- a/application/src/main/java/org/thingsboard/server/controller/MobileAppController.java +++ b/application/src/main/java/org/thingsboard/server/controller/MobileAppController.java @@ -168,7 +168,7 @@ public class MobileAppController extends BaseController { .collect(Collectors.toList()); return JacksonUtil.toJsonNode(JacksonUtil.writeValueAsViewIgnoringNullFields(mobilePages, Views.Public.class)); } else { - return JacksonUtil.newArrayNode(); + return null; } } From 7d6d26bb937ca0da0739c8e9d117698c171875b4 Mon Sep 17 00:00:00 2001 From: dashevchenko Date: Mon, 2 Dec 2024 12:21:11 +0200 Subject: [PATCH 2/2] fixed constraint check --- .../server/dao/mobile/MobileAppBundleServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/mobile/MobileAppBundleServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/mobile/MobileAppBundleServiceImpl.java index 4997ad8d30..e2c817e0c5 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/mobile/MobileAppBundleServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/mobile/MobileAppBundleServiceImpl.java @@ -71,8 +71,8 @@ public class MobileAppBundleServiceImpl extends AbstractEntityService implements return savedMobileApp; } catch (Exception e) { checkConstraintViolation(e, - Map.of("android_app_id_unq_key", "Android mobile app already exists in another bundle!", - "ios_app_id_unq_key", "IOS mobile app already exists in another bundle!")); + Map.of("mobile_app_bundle_android_app_id_key", "Android mobile app is already configured in another bundle!", + "mobile_app_bundle_ios_app_id_key", "IOS mobile app is already configured in another bundle!")); throw e; } }