Skip to content

Commit 8ccc244

Browse files
committed
fix(visualization): update default time handling based on filterType
Signed-off-by: Manuel Abascal <mjabascal10@gmail.com>
1 parent ae52a2a commit 8ccc244

File tree

8 files changed

+23
-13
lines changed

8 files changed

+23
-13
lines changed

frontend/src/app/graphic-builder/chart-builder/chart-builder.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ <h5 class="mb-0 label-header px-3 py-2">
2020
</app-visualization-header>
2121

2222
<div class="row">
23-
<div *ngIf="visualization && visualization.filterType && !isSqlMode" class="col-lg-12 col-sm-12 col-md-12 p-0">
23+
<div *ngIf="visualization" class="col-lg-12 col-sm-12 col-md-12 p-0">
2424
<app-utm-elastic-filter (filterChange)="onFilterChange($event)"
2525
[filters]="visualization.filterType"
2626
[pattern]="pattern"

frontend/src/app/graphic-builder/chart-builder/chart-builder.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ export class ChartBuilderComponent implements OnInit, AfterViewChecked {
345345
this.visualization.aggregationType = null;
346346
this.visualization.pattern = null;
347347
this.visualization.idPattern = null;
348-
this.visualization.filterType = null;
348+
// this.visualization.filterType = null;
349349
}
350350

351351
clearMessages(): void {

frontend/src/app/graphic-builder/shared/components/viewer/chart-view/chart-view.component.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,9 @@ export class ChartViewComponent implements OnInit, OnDestroy {
127127
if (!this.defaultTime) {
128128
this.defaultTime = this.visualization.filterType ? resolveDefaultVisualizationTime(this.visualization)
129129
: new ElasticFilterDefaultTime('now-30d', 'now');
130+
}
131+
132+
if (this.building) {
130133
this.refreshService.sendRefresh(this.refreshType);
131134
}
132135
}

frontend/src/app/graphic-builder/shared/components/viewer/goal-view/goal-view.component.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,10 @@ export class GoalViewComponent implements OnInit, OnDestroy {
100100

101101
if (!this.defaultTime) {
102102
this.defaultTime = this.visualization.filterType ? resolveDefaultVisualizationTime(this.visualization)
103-
: new ElasticFilterDefaultTime('now-30d', 'now');
103+
: new ElasticFilterDefaultTime('now-30d', 'now');
104+
}
105+
106+
if (this.building) {
104107
this.refreshService.sendRefresh(this.refreshType);
105108
}
106109
}

frontend/src/app/graphic-builder/shared/components/viewer/map-view/map-view.component.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,9 +326,11 @@ export class MapViewComponent implements OnInit, AfterViewInit, OnDestroy {
326326
});
327327

328328
if (!this.defaultTime) {
329-
this.defaultTime = this.visualization.queryLanguage === ChartBuilderQueryLanguageEnum.DSL ?
330-
resolveDefaultVisualizationTime(this.visualization)
329+
this.defaultTime = this.visualization.filterType ? resolveDefaultVisualizationTime(this.visualization)
331330
: new ElasticFilterDefaultTime('now-30d', 'now');
331+
}
332+
333+
if (this.building) {
332334
this.refreshService.sendRefresh(this.refreshType);
333335
}
334336
}

frontend/src/app/graphic-builder/shared/components/viewer/metric-view/metric-view.component.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ export class MetricViewComponent implements OnInit, OnDestroy {
9999
});
100100

101101
if (!this.defaultTime) {
102-
this.defaultTime = resolveDefaultVisualizationTime(this.visualization);
103-
104-
if (!this.defaultTime) {
105-
this.refreshService.sendRefresh(this.refreshType);
106-
}
102+
this.defaultTime = this.visualization.filterType ? resolveDefaultVisualizationTime(this.visualization)
103+
: new ElasticFilterDefaultTime('now-30d', 'now');
104+
}
107105

106+
if (this.building) {
107+
this.refreshService.sendRefresh(this.refreshType);
108108
}
109109
}
110110

frontend/src/app/graphic-builder/shared/components/viewer/table-view/table-view.component.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,11 @@ export class TableViewComponent implements OnInit, OnChanges, OnDestroy {
129129
});
130130

131131
if (!this.defaultTime) {
132-
this.defaultTime = this.visualization.queryLanguage === ChartBuilderQueryLanguageEnum.DSL ?
133-
resolveDefaultVisualizationTime(this.visualization)
132+
this.defaultTime = this.visualization.filterType ? resolveDefaultVisualizationTime(this.visualization)
134133
: new ElasticFilterDefaultTime('now-30d', 'now');
134+
}
135+
136+
if (this.building) {
135137
this.refreshService.sendRefresh(this.refreshType);
136138
}
137139
}

frontend/src/app/graphic-builder/shared/util/visualization/visualization-render.util.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ export function resolveDefaultVisualizationTime(visualization: VisualizationType
1212
const to = visualization.filterType[indexTime].value[1];
1313
return new ElasticFilterDefaultTime(from, to);
1414
} else {
15-
return null;
15+
return new ElasticFilterDefaultTime('now-30d', 'now');
1616
}
1717
}

0 commit comments

Comments
 (0)