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

Merge branch 'master' of https://github.com/thingsboard/thingsboard into UITests

Browse Source
This commit is contained in:
Seraphym-Tuhai 2022-12-22 00:15:37 +02:00
commit 43a3fc7c6e
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dao/src/main/java/org/thingsboard/server/dao/service/ConstraintValidator.java
View File

@ -53,8 +53,13 @@ public class ConstraintValidator {
public static List<String> getConstraintsViolations(Object data) { public static List<String> getConstraintsViolations(Object data) {
return fieldsValidator.validate(data).stream() return fieldsValidator.validate(data).stream()
.map(constraintViolation -> { .map(constraintViolation -> {
Path propertyPath = constraintViolation.getPropertyPath(); String property;
String property = Iterators.getLast(propertyPath.iterator()).toString(); 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(); return property + " " + constraintViolation.getMessage();
}) })
.distinct() .distinct()

1
ui-ngx/src/app/core/api/widget-subscription.ts
View File

@ -204,6 +204,7 @@ export class WidgetSubscription implements IWidgetSubscription {
this.timeWindow = {}; this.timeWindow = {};
this.useDashboardTimewindow = options.useDashboardTimewindow; this.useDashboardTimewindow = options.useDashboardTimewindow;
this.useTimewindow = true; this.useTimewindow = true;
this.onTimewindowChangeFunction = options.onTimewindowChangeFunction || ((timewindow) => timewindow);
if (this.useDashboardTimewindow) { if (this.useDashboardTimewindow) {
this.timeWindowConfig = deepClone(options.dashboardTimewindow); this.timeWindowConfig = deepClone(options.dashboardTimewindow);
} else { } else {