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

Refactoring: optimize condition for latest widget timewindow; fix types

Browse Source
This commit is contained in:
Ekaterina Chantsova 2025-08-05 16:36:29 +03:00
parent fb61aa447d
commit 442c45524e
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui-ngx/src/app/core/services/dashboard-utils.service.ts
View File

@ -296,9 +296,8 @@ export class DashboardUtilsService {
} }
widgetConfig.datasources = this.validateAndUpdateDatasources(widgetConfig.datasources); widgetConfig.datasources = this.validateAndUpdateDatasources(widgetConfig.datasources);
if (type === widgetType.latest) { if (type === widgetType.latest) {
const onlyHistoryTimewindow = datasourcesHasOnlyComparisonAggregation(widgetConfig.datasources); if (datasourcesHasAggregation(widgetConfig.datasources)) {
const aggregationEnabledForKeys = datasourcesHasAggregation(widgetConfig.datasources); const onlyHistoryTimewindow = datasourcesHasOnlyComparisonAggregation(widgetConfig.datasources);
if (aggregationEnabledForKeys) {
widgetConfig.timewindow = initModelFromDefaultTimewindow(widgetConfig.timewindow, true, widgetConfig.timewindow = initModelFromDefaultTimewindow(widgetConfig.timewindow, true,
onlyHistoryTimewindow, this.timeService, false); onlyHistoryTimewindow, this.timeService, false);
} }
@ -356,7 +355,7 @@ export class DashboardUtilsService {
return widgetConfig; return widgetConfig;
} }
public removeTimewindowConfigIfUnused(widgetConfig: WidgetConfig, type: widgetType) { private removeTimewindowConfigIfUnused(widgetConfig: WidgetConfig, type: widgetType) {
const widgetHasTimewindow = widgetTypeHasTimewindow(type) || (type === widgetType.latest && datasourcesHasAggregation(widgetConfig.datasources)); const widgetHasTimewindow = widgetTypeHasTimewindow(type) || (type === widgetType.latest && datasourcesHasAggregation(widgetConfig.datasources));
if (!widgetHasTimewindow || widgetConfig.useDashboardTimewindow) { if (!widgetHasTimewindow || widgetConfig.useDashboardTimewindow) {
delete widgetConfig.displayTimewindow; delete widgetConfig.displayTimewindow;

2
ui-ngx/src/app/core/utils.ts
View File

@ -197,7 +197,7 @@ export function deleteNullProperties(obj: any) {
}); });
} }
export function deleteFalseProperties(obj: any) { export function deleteFalseProperties(obj: Record<string, any>): void {
if (isUndefinedOrNull(obj)) { if (isUndefinedOrNull(obj)) {
return; return;
} }