tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #12255 from ChantsovaEkaterina/bug/fix-applying-default-grouping-interval 

Timewindow: fix applying default grouping interval
pull/12277/head
Igor Kulikov 1 year ago
committed by GitHub
parent
bec41c5bf6 b1179dc4d4
commit
ac0b608f38
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
3 changed files with 21 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      ui-ngx/src/app/shared/components/time/timewindow-config-dialog.component.html
  2. 16
      ui-ngx/src/app/shared/components/time/timewindow-config-dialog.component.ts
  3. 16
      ui-ngx/src/app/shared/components/time/timewindow-panel.component.ts

10
ui-ngx/src/app/shared/components/time/timewindow-config-dialog.component.html
View File

@ -68,7 +68,7 @@
timewindowForm.get('realtime.realtimeType').value === realtimeTypes.LAST_INTERVAL">
<button *ngIf="!(timewindowForm.get('realtime.hideLastInterval').value ||
timewindowForm.get('realtime.hideInterval').value)"
matSuffix mat-icon-button type="button" class="tb-mat-24"
matSuffix mat-icon-button type="button"
(click)="configureRealtimeLastIntervalOptions($event)">
<mat-icon>edit</mat-icon>
</button>
@ -95,7 +95,7 @@
timewindowForm.get('realtime.realtimeType').value === realtimeTypes.INTERVAL">
<button *ngIf="!(timewindowForm.get('realtime.hideQuickInterval').value ||
timewindowForm.get('realtime.hideInterval').value)"
matSuffix mat-icon-button type="button" class="tb-mat-24"
matSuffix mat-icon-button type="button"
(click)="configureRealtimeQuickIntervalOptions($event)">
<mat-icon>edit</mat-icon>
</button>
@ -137,7 +137,7 @@
timewindowForm.get('history.historyType').value === historyTypes.LAST_INTERVAL">
<button *ngIf="!(timewindowForm.get('history.hideLastInterval').value ||
timewindowForm.get('history.hideInterval').value)"
matSuffix mat-icon-button type="button" class="tb-mat-24"
matSuffix mat-icon-button type="button"
(click)="configureHistoryLastIntervalOptions($event)">
<mat-icon>edit</mat-icon>
</button>
@ -177,7 +177,7 @@
timewindowForm.get('history.historyType').value === historyTypes.INTERVAL">
<button *ngIf="!(timewindowForm.get('history.hideQuickInterval').value ||
timewindowForm.get('history.hideInterval').value)"
matSuffix mat-icon-button type="button" class="tb-mat-24"
matSuffix mat-icon-button type="button"
(click)="configureHistoryQuickIntervalOptions($event)">
<mat-icon>edit</mat-icon>
</button>
@ -199,7 +199,7 @@
formControlName="type"
[allowedAggregationTypes]="timewindowForm.get('allowedAggTypes').value">
<button *ngIf="!timewindowForm.get('hideAggregation').value"
matSuffix mat-icon-button type="button" class="tb-mat-24"
matSuffix mat-icon-button type="button"
(click)="openAggregationOptionsConfig($event)">
<mat-icon>edit</mat-icon>
</button>

16
ui-ngx/src/app/shared/components/time/timewindow-config-dialog.component.ts
View File

@ -245,9 +245,9 @@ export class TimewindowConfigDialogComponent extends PageComponent implements On
this.timewindowForm.get('realtime.advancedParams.lastAggIntervalsConfig').value;
if (lastAggIntervalsConfig?.hasOwnProperty(timewindowMs) &&
lastAggIntervalsConfig[timewindowMs].defaultAggInterval) {
this.timewindowForm.get('realtime.interval').patchValue(
setTimeout(() => this.timewindowForm.get('realtime.interval').patchValue(
lastAggIntervalsConfig[timewindowMs].defaultAggInterval, {emitEvent: false}
);
));
}
});
this.timewindowForm.get('realtime.quickInterval').valueChanges.pipe(
@ -257,9 +257,9 @@ export class TimewindowConfigDialogComponent extends PageComponent implements On
this.timewindowForm.get('realtime.advancedParams.quickAggIntervalsConfig').value;
if (quickAggIntervalsConfig?.hasOwnProperty(quickInterval) &&
quickAggIntervalsConfig[quickInterval].defaultAggInterval) {
this.timewindowForm.get('realtime.interval').patchValue(
setTimeout(() => this.timewindowForm.get('realtime.interval').patchValue(
quickAggIntervalsConfig[quickInterval].defaultAggInterval, {emitEvent: false}
);
));
}
});
this.timewindowForm.get('history.timewindowMs').valueChanges.pipe(
@ -269,9 +269,9 @@ export class TimewindowConfigDialogComponent extends PageComponent implements On
this.timewindowForm.get('history.advancedParams.lastAggIntervalsConfig').value;
if (lastAggIntervalsConfig?.hasOwnProperty(timewindowMs) &&
lastAggIntervalsConfig[timewindowMs].defaultAggInterval) {
this.timewindowForm.get('history.interval').patchValue(
setTimeout(() => this.timewindowForm.get('history.interval').patchValue(
lastAggIntervalsConfig[timewindowMs].defaultAggInterval, {emitEvent: false}
);
));
}
});
this.timewindowForm.get('history.quickInterval').valueChanges.pipe(
@ -281,9 +281,9 @@ export class TimewindowConfigDialogComponent extends PageComponent implements On
this.timewindowForm.get('history.advancedParams.quickAggIntervalsConfig').value;
if (quickAggIntervalsConfig?.hasOwnProperty(quickInterval) &&
quickAggIntervalsConfig[quickInterval].defaultAggInterval) {
this.timewindowForm.get('history.interval').patchValue(
setTimeout(() => this.timewindowForm.get('history.interval').patchValue(
quickAggIntervalsConfig[quickInterval].defaultAggInterval, {emitEvent: false}
);
));
}
});

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

@ -308,9 +308,9 @@ export class TimewindowPanelComponent extends PageComponent implements OnInit, O
).subscribe((timewindowMs: number) => {
if (this.realtimeAdvancedParams?.lastAggIntervalsConfig?.hasOwnProperty(timewindowMs) &&
this.realtimeAdvancedParams.lastAggIntervalsConfig[timewindowMs].defaultAggInterval) {
this.timewindowForm.get('realtime.interval').patchValue(
setTimeout(() => this.timewindowForm.get('realtime.interval').patchValue(
this.realtimeAdvancedParams.lastAggIntervalsConfig[timewindowMs].defaultAggInterval, {emitEvent: false}
);
));
}
});
this.timewindowForm.get('realtime.quickInterval').valueChanges.pipe(
@ -318,9 +318,9 @@ export class TimewindowPanelComponent extends PageComponent implements OnInit, O
).subscribe((quickInterval: number) => {
if (this.realtimeAdvancedParams?.quickAggIntervalsConfig?.hasOwnProperty(quickInterval) &&
this.realtimeAdvancedParams.quickAggIntervalsConfig[quickInterval].defaultAggInterval) {
this.timewindowForm.get('realtime.interval').patchValue(
setTimeout(() => this.timewindowForm.get('realtime.interval').patchValue(
this.realtimeAdvancedParams.quickAggIntervalsConfig[quickInterval].defaultAggInterval, {emitEvent: false}
);
));
}
});
this.timewindowForm.get('history.timewindowMs').valueChanges.pipe(
@ -328,9 +328,9 @@ export class TimewindowPanelComponent extends PageComponent implements OnInit, O
).subscribe((timewindowMs: number) => {
if (this.historyAdvancedParams?.lastAggIntervalsConfig?.hasOwnProperty(timewindowMs) &&
this.historyAdvancedParams.lastAggIntervalsConfig[timewindowMs].defaultAggInterval) {
this.timewindowForm.get('history.interval').patchValue(
setTimeout(() => this.timewindowForm.get('history.interval').patchValue(
this.historyAdvancedParams.lastAggIntervalsConfig[timewindowMs].defaultAggInterval, {emitEvent: false}
);
));
}
});
this.timewindowForm.get('history.quickInterval').valueChanges.pipe(
@ -338,9 +338,9 @@ export class TimewindowPanelComponent extends PageComponent implements OnInit, O
).subscribe((quickInterval: number) => {
if (this.historyAdvancedParams?.quickAggIntervalsConfig?.hasOwnProperty(quickInterval) &&
this.historyAdvancedParams.quickAggIntervalsConfig[quickInterval].defaultAggInterval) {
this.timewindowForm.get('history.interval').patchValue(
setTimeout(() => this.timewindowForm.get('history.interval').patchValue(
this.historyAdvancedParams.quickAggIntervalsConfig[quickInterval].defaultAggInterval, {emitEvent: false}
);
));
}
});

Write Preview
Loading…
Cancel
Save