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

Timewindow: fix applying disable custom interval option

Browse Source
This commit is contained in:
Ekaterina Chantsova 2024-11-18 15:54:55 +02:00
parent 72c6a375b3
commit ffdd7d566f
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui-ngx/src/app/shared/models/time/time.models.ts
View File

@ -331,6 +331,12 @@ export const initModelFromDefaultTimewindow = (value: Timewindow, quickIntervalO
if (isDefinedAndNotNull(value.realtime.hideQuickInterval)) {
model.realtime.hideQuickInterval = value.realtime.hideQuickInterval;
}
if (isDefinedAndNotNull(value.realtime.disableCustomInterval)) {
model.realtime.disableCustomInterval = value.realtime.disableCustomInterval;
}
if (isDefinedAndNotNull(value.realtime.disableCustomGroupInterval)) {
model.realtime.disableCustomGroupInterval = value.realtime.disableCustomGroupInterval;
}
if (isDefined(value.realtime.interval)) {
model.realtime.interval = value.realtime.interval;
@ -364,6 +370,12 @@ export const initModelFromDefaultTimewindow = (value: Timewindow, quickIntervalO
if (isDefinedAndNotNull(value.history.hideQuickInterval)) {
model.history.hideQuickInterval = value.history.hideQuickInterval;
}
if (isDefinedAndNotNull(value.history.disableCustomInterval)) {
model.history.disableCustomInterval = value.history.disableCustomInterval;
}
if (isDefinedAndNotNull(value.history.disableCustomGroupInterval)) {
model.history.disableCustomGroupInterval = value.history.disableCustomGroupInterval;
}
if (isDefined(value.history.interval)) {
model.history.interval = value.history.interval;
@ -444,6 +456,8 @@ export const toHistoryTimewindow = (timewindow: Timewindow, startTimeMs: number,
hideInterval: timewindow.history?.hideInterval || false,
hideLastInterval: timewindow.history?.hideLastInterval || false,
hideQuickInterval: timewindow.history?.hideQuickInterval || false,
disableCustomInterval: timewindow.history?.disableCustomInterval || false,
disableCustomGroupInterval: timewindow.history?.disableCustomGroupInterval || false,
},
aggregation: {
type: aggType,