Browse Source

UI: Improve default time window calculation

pull/8203/head
Igor Kulikov 4 years ago
parent
commit
3688c6aa44
  1. 16
      ui-ngx/src/app/shared/models/time/time.models.ts

16
ui-ngx/src/app/shared/models/time/time.models.ts

@ -270,13 +270,19 @@ export function initModelFromDefaultTimewindow(value: Timewindow, quickIntervalO
} else { } else {
model.history.historyType = value.history.historyType; model.history.historyType = value.history.historyType;
} }
if (model.history.historyType === HistoryWindowType.LAST_INTERVAL) { if (isDefined(value.history.timewindowMs)) {
model.history.timewindowMs = value.history.timewindowMs; model.history.timewindowMs = value.history.timewindowMs;
} else if (model.history.historyType === HistoryWindowType.INTERVAL) { }
if (isDefined(value.history.quickInterval)) {
model.history.quickInterval = value.history.quickInterval; model.history.quickInterval = value.history.quickInterval;
} else { }
model.history.fixedTimewindow.startTimeMs = value.history.fixedTimewindow.startTimeMs; if (isDefined(value.history.fixedTimewindow)) {
model.history.fixedTimewindow.endTimeMs = value.history.fixedTimewindow.endTimeMs; if (isDefined(value.history.fixedTimewindow.startTimeMs)) {
model.history.fixedTimewindow.startTimeMs = value.history.fixedTimewindow.startTimeMs;
}
if (isDefined(value.history.fixedTimewindow.endTimeMs)) {
model.history.fixedTimewindow.endTimeMs = value.history.fixedTimewindow.endTimeMs;
}
} }
} }
if (value.aggregation) { if (value.aggregation) {

Loading…
Cancel
Save