From eb10ba3c3cfb35f1bb69cb7f40af0e593692edf7 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 20 Dec 2022 16:50:26 +0200 Subject: [PATCH 1/4] Update pkg.upgradeVersion --- msa/tb/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msa/tb/pom.xml b/msa/tb/pom.xml index 46a2a632be..fe79951126 100644 --- a/msa/tb/pom.xml +++ b/msa/tb/pom.xml @@ -38,7 +38,7 @@ tb-postgres tb-cassandra /usr/share/${pkg.name} - 3.4.2 + 3.4.3 From acfb357135eeb93c66b481866a6135e9cbcdbd86 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 20 Dec 2022 16:59:45 +0200 Subject: [PATCH 2/4] Update UI help link --- application/src/main/resources/thingsboard.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml index 6a00775a38..47273d03b5 100644 --- a/application/src/main/resources/thingsboard.yml +++ b/application/src/main/resources/thingsboard.yml @@ -148,7 +148,7 @@ ui: # Help parameters help: # Base url for UI help assets - base-url: "${UI_HELP_BASE_URL:https://raw.githubusercontent.com/thingsboard/thingsboard-ui-help/release-3.4.2}" + base-url: "${UI_HELP_BASE_URL:https://raw.githubusercontent.com/thingsboard/thingsboard-ui-help/release-3.4.3}" database: ts_max_intervals: "${DATABASE_TS_MAX_INTERVALS:700}" # Max number of DB queries generated by single API call to fetch telemetry records From 1c53a90c1af7cc36e34585342186d37979907a86 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Wed, 21 Dec 2022 12:36:24 +0200 Subject: [PATCH 3/4] Fix field constraint validation message --- .../server/dao/service/ConstraintValidator.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/ConstraintValidator.java b/dao/src/main/java/org/thingsboard/server/dao/service/ConstraintValidator.java index ee1e42f0dc..7f26c6e909 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/service/ConstraintValidator.java +++ b/dao/src/main/java/org/thingsboard/server/dao/service/ConstraintValidator.java @@ -53,8 +53,13 @@ public class ConstraintValidator { public static List getConstraintsViolations(Object data) { return fieldsValidator.validate(data).stream() .map(constraintViolation -> { - Path propertyPath = constraintViolation.getPropertyPath(); - String property = Iterators.getLast(propertyPath.iterator()).toString(); + String property; + if (constraintViolation.getConstraintDescriptor().getAttributes().containsKey("fieldName")) { + property = constraintViolation.getConstraintDescriptor().getAttributes().get("fieldName").toString(); + } else { + Path propertyPath = constraintViolation.getPropertyPath(); + property = Iterators.getLast(propertyPath.iterator()).toString(); + } return property + " " + constraintViolation.getMessage(); }) .distinct() From b9d361f1cf8e40004115b2c14134728addcaa5e6 Mon Sep 17 00:00:00 2001 From: Vladyslav_Prykhodko Date: Wed, 21 Dec 2022 17:23:51 +0200 Subject: [PATCH 4/4] UI: Fixed incorrect updated timewindow in Alarm table --- ui-ngx/src/app/core/api/widget-subscription.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/ui-ngx/src/app/core/api/widget-subscription.ts b/ui-ngx/src/app/core/api/widget-subscription.ts index d40dc95db7..332b8db14f 100644 --- a/ui-ngx/src/app/core/api/widget-subscription.ts +++ b/ui-ngx/src/app/core/api/widget-subscription.ts @@ -204,6 +204,7 @@ export class WidgetSubscription implements IWidgetSubscription { this.timeWindow = {}; this.useDashboardTimewindow = options.useDashboardTimewindow; this.useTimewindow = true; + this.onTimewindowChangeFunction = options.onTimewindowChangeFunction || ((timewindow) => timewindow); if (this.useDashboardTimewindow) { this.timeWindowConfig = deepClone(options.dashboardTimewindow); } else {