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

Merge pull request #14081 from ChantsovaEkaterina/bug/timewindow-hidden-option-displayed

Browse Source 
Timewindow: fix hidden options displaying when switching between Realtime and History
This commit is contained in:
Igor Kulikov 2025-10-01 15:36:04 +03:00 committed by GitHub
commit 20e4b3970b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -411,9 +411,10 @@ export class TimewindowConfigDialogComponent extends PageComponent implements On
const timewindowFormValue = this.timewindowForm.getRawValue(); const timewindowFormValue = this.timewindowForm.getRawValue();
const realtimeDisableCustomInterval = timewindowFormValue.realtime.disableCustomInterval; const realtimeDisableCustomInterval = timewindowFormValue.realtime.disableCustomInterval;
const historyDisableCustomInterval = timewindowFormValue.history.disableCustomInterval; const historyDisableCustomInterval = timewindowFormValue.history.disableCustomInterval;
updateFormValuesOnTimewindowTypeChange(selectedTab, this.quickIntervalOnly, this.timewindowForm, updateFormValuesOnTimewindowTypeChange(selectedTab, this.timewindowForm,
realtimeDisableCustomInterval, historyDisableCustomInterval, realtimeDisableCustomInterval, historyDisableCustomInterval,
timewindowFormValue.realtime.advancedParams, timewindowFormValue.history.advancedParams); timewindowFormValue.realtime.advancedParams, timewindowFormValue.history.advancedParams,
this.realtimeTimewindowOptions, this.historyTimewindowOptions);
this.timewindowForm.patchValue({ this.timewindowForm.patchValue({
hideAggregation: timewindowFormValue.hideAggregation, hideAggregation: timewindowFormValue.hideAggregation,
hideAggInterval: timewindowFormValue.hideAggInterval, hideAggInterval: timewindowFormValue.hideAggInterval,

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

@ -400,9 +400,10 @@ export class TimewindowPanelComponent extends PageComponent implements OnInit, O
} }
private onTimewindowTypeChange(selectedTab: TimewindowType) { private onTimewindowTypeChange(selectedTab: TimewindowType) {
updateFormValuesOnTimewindowTypeChange(selectedTab, this.quickIntervalOnly, this.timewindowForm, updateFormValuesOnTimewindowTypeChange(selectedTab, this.timewindowForm,
this.realtimeDisableCustomInterval, this.historyDisableCustomInterval, this.realtimeDisableCustomInterval, this.historyDisableCustomInterval,
this.realtimeAdvancedParams, this.historyAdvancedParams); this.realtimeAdvancedParams, this.historyAdvancedParams,
this.realtimeTimewindowOptions, this.historyTimewindowOptions);
} }
update() { update() {

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

@ -20,6 +20,7 @@ import moment_ from 'moment';
import * as momentTz from 'moment-timezone'; import * as momentTz from 'moment-timezone';
import { IntervalType } from '@shared/models/telemetry/telemetry.models'; import { IntervalType } from '@shared/models/telemetry/telemetry.models';
import { FormGroup } from '@angular/forms'; import { FormGroup } from '@angular/forms';
import { ToggleHeaderOption } from '@shared/components/toggle-header.component';
const moment = moment_; const moment = moment_;
@ -526,17 +527,20 @@ export const timewindowTypeChanged = (newTimewindow: Timewindow, oldTimewindow:
}; };
export const updateFormValuesOnTimewindowTypeChange = (selectedTab: TimewindowType, export const updateFormValuesOnTimewindowTypeChange = (selectedTab: TimewindowType,
quickIntervalOnly: boolean, timewindowForm: FormGroup, timewindowForm: FormGroup,
realtimeDisableCustomInterval: boolean, historyDisableCustomInterval: boolean, realtimeDisableCustomInterval: boolean, historyDisableCustomInterval: boolean,
realtimeAdvancedParams?: TimewindowAdvancedParams, realtimeAdvancedParams: TimewindowAdvancedParams,
historyAdvancedParams?: TimewindowAdvancedParams) => { historyAdvancedParams: TimewindowAdvancedParams,
realtimeTimewindowOptions: ToggleHeaderOption[],
historyTimewindowOptions: ToggleHeaderOption[]) => {
const timewindowFormValue = timewindowForm.getRawValue(); const timewindowFormValue = timewindowForm.getRawValue();
if (selectedTab === TimewindowType.REALTIME) { if (selectedTab === TimewindowType.REALTIME) {
if (timewindowFormValue.history.historyType !== HistoryWindowType.FIXED const sameWindowTypeOptionAvailable = realtimeTimewindowOptions.some(
&& !(quickIntervalOnly && timewindowFormValue.history.historyType === HistoryWindowType.LAST_INTERVAL)) { option => {
if (Object.keys(RealtimeWindowType).includes(HistoryWindowType[timewindowFormValue.history.historyType])) { return option.value === RealtimeWindowType[HistoryWindowType[timewindowFormValue.history.historyType]]
timewindowForm.get('realtime.realtimeType').patchValue(RealtimeWindowType[HistoryWindowType[timewindowFormValue.history.historyType]]); });
} if (sameWindowTypeOptionAvailable) {
timewindowForm.get('realtime.realtimeType').patchValue(RealtimeWindowType[HistoryWindowType[timewindowFormValue.history.historyType]]);
if (!realtimeDisableCustomInterval || if (!realtimeDisableCustomInterval ||
!realtimeAdvancedParams?.allowedLastIntervals?.length || realtimeAdvancedParams.allowedLastIntervals.includes(timewindowFormValue.history.timewindowMs)) { !realtimeAdvancedParams?.allowedLastIntervals?.length || realtimeAdvancedParams.allowedLastIntervals.includes(timewindowFormValue.history.timewindowMs)) {
timewindowForm.get('realtime.timewindowMs').patchValue(timewindowFormValue.history.timewindowMs); timewindowForm.get('realtime.timewindowMs').patchValue(timewindowFormValue.history.timewindowMs);
@ -554,20 +558,26 @@ export const updateFormValuesOnTimewindowTypeChange = (selectedTab: TimewindowTy
} }
} }
} else { } else {
timewindowForm.get('history.historyType').patchValue(HistoryWindowType[RealtimeWindowType[timewindowFormValue.realtime.realtimeType]]); const sameWindowTypeOptionAvailable = historyTimewindowOptions.some(
if (!historyDisableCustomInterval || option => {
return option.value === HistoryWindowType[RealtimeWindowType[timewindowFormValue.realtime.realtimeType]]
});
if (sameWindowTypeOptionAvailable) {
timewindowForm.get('history.historyType').patchValue(HistoryWindowType[RealtimeWindowType[timewindowFormValue.realtime.realtimeType]]);
if (!historyDisableCustomInterval ||
!historyAdvancedParams?.allowedLastIntervals?.length || historyAdvancedParams.allowedLastIntervals?.includes(timewindowFormValue.realtime.timewindowMs)) { !historyAdvancedParams?.allowedLastIntervals?.length || historyAdvancedParams.allowedLastIntervals?.includes(timewindowFormValue.realtime.timewindowMs)) {
timewindowForm.get('history.timewindowMs').patchValue(timewindowFormValue.realtime.timewindowMs); timewindowForm.get('history.timewindowMs').patchValue(timewindowFormValue.realtime.timewindowMs);
} }
if (!historyAdvancedParams?.allowedQuickIntervals?.length || historyAdvancedParams.allowedQuickIntervals?.includes(timewindowFormValue.realtime.quickInterval)) { if (!historyAdvancedParams?.allowedQuickIntervals?.length || historyAdvancedParams.allowedQuickIntervals?.includes(timewindowFormValue.realtime.quickInterval)) {
timewindowForm.get('history.quickInterval').patchValue(timewindowFormValue.realtime.quickInterval); timewindowForm.get('history.quickInterval').patchValue(timewindowFormValue.realtime.quickInterval);
} }
const defaultAggInterval = historyDefaultAggInterval(timewindowForm.getRawValue(), historyAdvancedParams); const defaultAggInterval = historyDefaultAggInterval(timewindowForm.getRawValue(), historyAdvancedParams);
const allowedAggIntervals = historyAllowedAggIntervals(timewindowForm.getRawValue(), historyAdvancedParams); const allowedAggIntervals = historyAllowedAggIntervals(timewindowForm.getRawValue(), historyAdvancedParams);
if (defaultAggInterval || !allowedAggIntervals.length || allowedAggIntervals.includes(timewindowFormValue.realtime.interval)) { if (defaultAggInterval || !allowedAggIntervals.length || allowedAggIntervals.includes(timewindowFormValue.realtime.interval)) {
setTimeout(() => timewindowForm.get('history.interval').patchValue( setTimeout(() => timewindowForm.get('history.interval').patchValue(
defaultAggInterval ?? timewindowFormValue.realtime.interval defaultAggInterval ?? timewindowFormValue.realtime.interval
)); ));
}
} }
} }
timewindowForm.patchValue({ timewindowForm.patchValue({