From ead11869d8f6840b7efbd23e4eb99cc081e0810b Mon Sep 17 00:00:00 2001 From: Ekaterina Chantsova Date: Thu, 4 Dec 2025 19:16:31 +0200 Subject: [PATCH] Timewindow: fix switching timewindow to history-only mode from Realtime and back --- .../components/time/timewindow-config-dialog.component.ts | 4 +++- .../app/shared/components/time/timewindow-panel.component.ts | 4 +++- ui-ngx/src/app/shared/components/time/timewindow.component.ts | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ui-ngx/src/app/shared/components/time/timewindow-config-dialog.component.ts b/ui-ngx/src/app/shared/components/time/timewindow-config-dialog.component.ts index 1ac80c8ba3..d3fee219ac 100644 --- a/ui-ngx/src/app/shared/components/time/timewindow-config-dialog.component.ts +++ b/ui-ngx/src/app/shared/components/time/timewindow-config-dialog.component.ts @@ -164,7 +164,9 @@ export class TimewindowConfigDialogComponent extends PageComponent implements On this.timewindowForm = this.fb.group({ selectedTab: [isDefined(this.timewindow.selectedTab) ? this.timewindow.selectedTab : TimewindowType.REALTIME], realtime: this.fb.group({ - realtimeType: [ isDefined(realtime?.realtimeType) ? realtime.realtimeType : RealtimeWindowType.LAST_INTERVAL ], + realtimeType: [ this.quickIntervalOnly + ? RealtimeWindowType.INTERVAL + : (isDefined(realtime?.realtimeType) ? realtime.realtimeType : RealtimeWindowType.LAST_INTERVAL) ], timewindowMs: [ isDefined(realtime?.timewindowMs) ? realtime.timewindowMs : null ], interval: [ isDefined(realtime?.interval) ? realtime.interval : null ], quickInterval: [ isDefined(realtime?.quickInterval) ? realtime.quickInterval : null ], diff --git a/ui-ngx/src/app/shared/components/time/timewindow-panel.component.ts b/ui-ngx/src/app/shared/components/time/timewindow-panel.component.ts index d5b952b338..4b06d7fff0 100644 --- a/ui-ngx/src/app/shared/components/time/timewindow-panel.component.ts +++ b/ui-ngx/src/app/shared/components/time/timewindow-panel.component.ts @@ -276,7 +276,9 @@ export class TimewindowPanelComponent extends PageComponent implements OnInit, O selectedTab: [isDefined(this.timewindow.selectedTab) ? this.timewindow.selectedTab : TimewindowType.REALTIME], realtime: this.fb.group({ realtimeType: [{ - value: isDefined(realtime?.realtimeType) ? realtime.realtimeType : RealtimeWindowType.LAST_INTERVAL, + value: this.quickIntervalOnly + ? RealtimeWindowType.INTERVAL + : (isDefined(realtime?.realtimeType) ? realtime.realtimeType : RealtimeWindowType.LAST_INTERVAL), disabled: realtime?.hideInterval }], timewindowMs: [{ diff --git a/ui-ngx/src/app/shared/components/time/timewindow.component.ts b/ui-ngx/src/app/shared/components/time/timewindow.component.ts index bc49e84574..c0393f3261 100644 --- a/ui-ngx/src/app/shared/components/time/timewindow.component.ts +++ b/ui-ngx/src/app/shared/components/time/timewindow.component.ts @@ -309,7 +309,8 @@ export class TimewindowComponent implements ControlValueAccessor, OnInit, OnChan private onHistoryOnlyChanged(): boolean { if (this.historyOnlyValue && this.innerValue && this.innerValue.selectedTab !== TimewindowType.HISTORY) { - this.innerValue.selectedTab = TimewindowType.HISTORY; + this.innerValue = initModelFromDefaultTimewindow(this.innerValue, this.quickIntervalOnly, this.historyOnly, + this.timeService, this.aggregation); this.updateDisplayValue(); return true; }