From a21ce12528ac7a0d8e6ca8cfaa47f8f0e4e419dc Mon Sep 17 00:00:00 2001
From: rusikv <rvasylkiv@thingsboard.io>
Date: Wed, 20 Sep 2023 17:07:47 +0300
Subject: [PATCH 1/3] UI: add timewindow panel transfering of data between tabs
 on switch

---
 .../time/timewindow-panel.component.html      |  3 +-
 .../time/timewindow-panel.component.ts        | 31 +++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/ui-ngx/src/app/shared/components/time/timewindow-panel.component.html b/ui-ngx/src/app/shared/components/time/timewindow-panel.component.html
index 0524f7e989..57ccc75842 100644
--- a/ui-ngx/src/app/shared/components/time/timewindow-panel.component.html
+++ b/ui-ngx/src/app/shared/components/time/timewindow-panel.component.html
@@ -17,7 +17,8 @@
 -->
 <form [formGroup]="timewindowForm" class="mat-content">
   <mat-tab-group [ngClass]="{'tb-headless': historyOnly}"
-                 (selectedIndexChange)="timewindowForm.markAsDirty()" [(selectedIndex)]="timewindow.selectedTab">
+                 (selectedIndexChange)="timewindowForm.markAsDirty()" [(selectedIndex)]="timewindow.selectedTab"
+                 (selectedTabChange)="onTimewindowTypeChange()">
     <mat-tab label="{{ 'timewindow.realtime' | translate }}">
       <section fxLayout="row">
         <section *ngIf="isEdit" fxLayout="column" fxLayoutAlign="start center"
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 f4a2e8b916..cdcb5bd449 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
@@ -20,6 +20,7 @@ import {
   AggregationType,
   DAY,
   HistoryWindowType,
+  QuickTimeInterval,
   quickTimeIntervalPeriod,
   RealtimeWindowType,
   Timewindow,
@@ -186,6 +187,36 @@ export class TimewindowPanelComponent extends PageComponent implements OnInit {
     this.timewindowForm.get('aggregation.limit').updateValueAndValidity({emitEvent: false});
   }
 
+  onTimewindowTypeChange() {
+    const timewindowFormValue = this.timewindowForm.getRawValue();
+    if (this.timewindow.selectedTab === TimewindowType.REALTIME) {
+      this.timewindowForm.get('realtime').patchValue({
+        realtimeType: Object.keys(RealtimeWindowType).includes(HistoryWindowType[timewindowFormValue.history.historyType]) ?
+          RealtimeWindowType[HistoryWindowType[timewindowFormValue.history.historyType]] :
+          timewindowFormValue.realtime.realtimeType,
+        timewindowMs: timewindowFormValue.history.timewindowMs,
+        quickInterval: Object.values(QuickTimeInterval).filter(interval => interval.startsWith('CURRENT_'))
+          .includes(QuickTimeInterval[timewindowFormValue.history.quickInterval]) ? timewindowFormValue.history.quickInterval :
+          timewindowFormValue.realtime.quickInterval
+      });
+      setTimeout(() => this.timewindowForm.get('realtime.interval').patchValue(timewindowFormValue.history.interval));
+    } else {
+      this.timewindowForm.get('history').patchValue({
+        historyType: HistoryWindowType[RealtimeWindowType[timewindowFormValue.realtime.realtimeType]],
+        timewindowMs: timewindowFormValue.realtime.timewindowMs,
+        quickInterval: timewindowFormValue.realtime.quickInterval
+      });
+      setTimeout(() => this.timewindowForm.get('history.interval').patchValue(timewindowFormValue.realtime.interval));
+    }
+    this.timewindowForm.patchValue({
+      aggregation: {
+        type: timewindowFormValue.aggregation.type,
+        limit: timewindowFormValue.aggregation.limit
+      },
+      timezone: timewindowFormValue.timezone
+    });
+  }
+
   update() {
     const timewindowFormValue = this.timewindowForm.getRawValue();
     this.timewindow.realtime = {

From 1b93dc7666ce5fc590b0fec03d42734f3ba54b6c Mon Sep 17 00:00:00 2001
From: rusikv <rvasylkiv@thingsboard.io>
Date: Wed, 27 Sep 2023 13:02:56 +0300
Subject: [PATCH 2/3] UI: combined logic of indexchanged and tabchanged event
 handlers of timewindow panel

---
 .../app/shared/components/time/timewindow-panel.component.html | 3 +--
 .../app/shared/components/time/timewindow-panel.component.ts   | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui-ngx/src/app/shared/components/time/timewindow-panel.component.html b/ui-ngx/src/app/shared/components/time/timewindow-panel.component.html
index 57ccc75842..8e1a05d031 100644
--- a/ui-ngx/src/app/shared/components/time/timewindow-panel.component.html
+++ b/ui-ngx/src/app/shared/components/time/timewindow-panel.component.html
@@ -17,8 +17,7 @@
 -->
 <form [formGroup]="timewindowForm" class="mat-content">
   <mat-tab-group [ngClass]="{'tb-headless': historyOnly}"
-                 (selectedIndexChange)="timewindowForm.markAsDirty()" [(selectedIndex)]="timewindow.selectedTab"
-                 (selectedTabChange)="onTimewindowTypeChange()">
+                 (selectedTabChange)="onTimewindowTypeChange()" [(selectedIndex)]="timewindow.selectedTab">
     <mat-tab label="{{ 'timewindow.realtime' | translate }}">
       <section fxLayout="row">
         <section *ngIf="isEdit" fxLayout="column" fxLayoutAlign="start center"
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 cdcb5bd449..3610317855 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
@@ -188,6 +188,7 @@ export class TimewindowPanelComponent extends PageComponent implements OnInit {
   }
 
   onTimewindowTypeChange() {
+    this.timewindowForm.markAsDirty();
     const timewindowFormValue = this.timewindowForm.getRawValue();
     if (this.timewindow.selectedTab === TimewindowType.REALTIME) {
       this.timewindowForm.get('realtime').patchValue({

From 63370d2a9541c74346c2d9badbebac577c2e73b8 Mon Sep 17 00:00:00 2001
From: rusikv <rvasylkiv@thingsboard.io>
Date: Fri, 3 Nov 2023 17:29:11 +0200
Subject: [PATCH 3/3] UI: improvements for timewindow config transfer between
 tabs

---
 .../time/timewindow-panel.component.ts        | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

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 3610317855..41a2ae33ec 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
@@ -191,16 +191,17 @@ export class TimewindowPanelComponent extends PageComponent implements OnInit {
     this.timewindowForm.markAsDirty();
     const timewindowFormValue = this.timewindowForm.getRawValue();
     if (this.timewindow.selectedTab === TimewindowType.REALTIME) {
-      this.timewindowForm.get('realtime').patchValue({
-        realtimeType: Object.keys(RealtimeWindowType).includes(HistoryWindowType[timewindowFormValue.history.historyType]) ?
-          RealtimeWindowType[HistoryWindowType[timewindowFormValue.history.historyType]] :
-          timewindowFormValue.realtime.realtimeType,
-        timewindowMs: timewindowFormValue.history.timewindowMs,
-        quickInterval: Object.values(QuickTimeInterval).filter(interval => interval.startsWith('CURRENT_'))
-          .includes(QuickTimeInterval[timewindowFormValue.history.quickInterval]) ? timewindowFormValue.history.quickInterval :
-          timewindowFormValue.realtime.quickInterval
-      });
-      setTimeout(() => this.timewindowForm.get('realtime.interval').patchValue(timewindowFormValue.history.interval));
+      if (timewindowFormValue.history.historyType !== HistoryWindowType.FIXED) {
+        this.timewindowForm.get('realtime').patchValue({
+          realtimeType: Object.keys(RealtimeWindowType).includes(HistoryWindowType[timewindowFormValue.history.historyType]) ?
+            RealtimeWindowType[HistoryWindowType[timewindowFormValue.history.historyType]] :
+            timewindowFormValue.realtime.realtimeType,
+          timewindowMs: timewindowFormValue.history.timewindowMs,
+          quickInterval: timewindowFormValue.history.quickInterval.startsWith('CURRENT') ?
+            timewindowFormValue.history.quickInterval : timewindowFormValue.realtime.quickInterval
+        });
+        setTimeout(() => this.timewindowForm.get('realtime.interval').patchValue(timewindowFormValue.history.interval));
+      }
     } else {
       this.timewindowForm.get('history').patchValue({
         historyType: HistoryWindowType[RealtimeWindowType[timewindowFormValue.realtime.realtimeType]],