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

Timewindow: additional conditioning for clear config function; refactoring

Browse Source
This commit is contained in:
Ekaterina Chantsova 2025-07-21 16:19:06 +03:00
parent 81a5a3c3ea
commit 35b349bd6e
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ui-ngx/src/app/shared/components/time/timewindow-panel.component.ts
View File

@ -381,8 +381,7 @@ export class TimewindowPanelComponent extends PageComponent implements OnInit, O
this.timewindowForm.valueChanges.pipe( this.timewindowForm.valueChanges.pipe(
takeUntil(this.destroy$) takeUntil(this.destroy$)
).subscribe(() => { ).subscribe(() => {
this.prepareTimewindowConfig(); this.changeTimewindow.emit(this.prepareTimewindowConfig());
this.changeTimewindow.emit(this.clearTimewindowConfig());
}); });
} }
} }
@ -408,12 +407,11 @@ export class TimewindowPanelComponent extends PageComponent implements OnInit, O
} }
update() { update() {
this.prepareTimewindowConfig(); this.result = this.prepareTimewindowConfig();
this.result = this.clearTimewindowConfig();
this.overlayRef?.dispose(); this.overlayRef?.dispose();
} }
private prepareTimewindowConfig() { private prepareTimewindowConfig(clearConfig = true): Timewindow {
const timewindowFormValue = this.timewindowForm.getRawValue(); const timewindowFormValue = this.timewindowForm.getRawValue();
this.timewindow.selectedTab = timewindowFormValue.selectedTab; this.timewindow.selectedTab = timewindowFormValue.selectedTab;
if (this.timewindow.selectedTab === TimewindowType.REALTIME) { if (this.timewindow.selectedTab === TimewindowType.REALTIME) {
@ -442,10 +440,12 @@ export class TimewindowPanelComponent extends PageComponent implements OnInit, O
if (this.timezone) { if (this.timezone) {
this.timewindow.timezone = timewindowFormValue.timezone; this.timewindow.timezone = timewindowFormValue.timezone;
} }
}
private clearTimewindowConfig(): Timewindow { if (clearConfig) {
return clearTimewindowConfig(this.timewindow, this.quickIntervalOnly, this.historyOnly, this.aggregation, this.timezone); return clearTimewindowConfig(this.timewindow, this.quickIntervalOnly, this.historyOnly, this.aggregation, this.timezone);
} else {
return deepClone(this.timewindow);
}
} }
private updateTimewindowForm() { private updateTimewindowForm() {
@ -555,7 +555,6 @@ export class TimewindowPanelComponent extends PageComponent implements OnInit, O
} }
openTimewindowConfig() { openTimewindowConfig() {
this.prepareTimewindowConfig();
this.dialog.open<TimewindowConfigDialogComponent, TimewindowConfigDialogData, Timewindow>( this.dialog.open<TimewindowConfigDialogComponent, TimewindowConfigDialogData, Timewindow>(
TimewindowConfigDialogComponent, { TimewindowConfigDialogComponent, {
autoFocus: false, autoFocus: false,
@ -564,7 +563,7 @@ export class TimewindowPanelComponent extends PageComponent implements OnInit, O
data: { data: {
quickIntervalOnly: this.quickIntervalOnly, quickIntervalOnly: this.quickIntervalOnly,
aggregation: this.aggregation, aggregation: this.aggregation,
timewindow: deepClone(this.timewindow) timewindow: this.prepareTimewindowConfig(false)
} }
}).afterClosed() }).afterClosed()
.subscribe((res) => { .subscribe((res) => {

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

@ -1132,12 +1132,12 @@ export const clearTimewindowConfig = (timewindow: Timewindow, quickIntervalOnly:
delete timewindow.realtime.quickInterval; delete timewindow.realtime.quickInterval;
} }
delete timewindow.history.historyType; delete timewindow.history?.historyType;
delete timewindow.history.timewindowMs; delete timewindow.history?.timewindowMs;
delete timewindow.history.fixedTimewindow; delete timewindow.history?.fixedTimewindow;
delete timewindow.history.quickInterval; delete timewindow.history?.quickInterval;
delete timewindow.history.interval; delete timewindow.history?.interval;
if (!hasAggregation) { if (!hasAggregation) {
delete timewindow.realtime.interval; delete timewindow.realtime.interval;
} }
@ -1157,11 +1157,11 @@ export const clearTimewindowConfig = (timewindow: Timewindow, quickIntervalOnly:
delete timewindow.history.quickInterval; delete timewindow.history.quickInterval;
} }
delete timewindow.realtime.realtimeType; delete timewindow.realtime?.realtimeType;
delete timewindow.realtime.timewindowMs; delete timewindow.realtime?.timewindowMs;
delete timewindow.realtime.quickInterval; delete timewindow.realtime?.quickInterval;
delete timewindow.realtime.interval; delete timewindow.realtime?.interval;
if (!hasAggregation) { if (!hasAggregation) {
delete timewindow.history.interval; delete timewindow.history.interval;
} }