Skip to content

Commit d2eb877

Browse files
Merge pull request #747 from erikdarlingdata/fix/drill-down-timezone
Fix drill-down timezone mismatches and slicer state
2 parents f3c9f58 + e25c47e commit d2eb877

2 files changed

Lines changed: 11 additions & 4 deletions

File tree

Dashboard/Controls/QueryPerformanceContent.xaml.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2680,9 +2680,16 @@ private async Task RefreshActiveQueriesWithRangeAsync(DateTime from, DateTime to
26802680
{
26812681
if (_databaseService == null) return;
26822682
_isDrillDownActive = true;
2683+
2684+
// Update active queries state so slicer loads matching data
2685+
_activeQueriesHoursBack = 0;
2686+
_activeQueriesFromDate = from;
2687+
_activeQueriesToDate = to;
2688+
26832689
var snapshots = await _databaseService.GetQuerySnapshotsAsync(0, from, to);
26842690
SetItemsSourcePreservingSort(ActiveQueriesDataGrid, snapshots);
26852691
ActiveQueriesNoDataMessage.Visibility = snapshots.Count == 0 ? Visibility.Visible : Visibility.Collapsed;
2692+
LoadActiveQueriesSlicerAsync().ConfigureAwait(false);
26862693
}
26872694

26882695
#endregion

Lite/Controls/ServerTab.xaml.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3120,7 +3120,7 @@ private async void OnCpuDrillDown(DateTime time)
31203120
QueriesSubTabControl.SelectedIndex = 1; // Active Queries
31213121
var snapshots = await _dataService.GetLatestQuerySnapshotsAsync(_serverId, 0, fromDate, toDate);
31223122
_querySnapshotsFilterMgr!.UpdateData(snapshots);
3123-
LiveSnapshotIndicator.Text = $"Drill-down: {ServerTimeHelper.FormatServerTime(fromDate, "HH:mm")} \u2192 {ServerTimeHelper.FormatServerTime(toDate, "HH:mm")}";
3123+
LiveSnapshotIndicator.Text = $"Drill-down: {ServerTimeHelper.FormatServerTime(fromDate.AddMinutes(-UtcOffsetMinutes), "HH:mm")} \u2192 {ServerTimeHelper.FormatServerTime(toDate.AddMinutes(-UtcOffsetMinutes), "HH:mm")}";
31243124
_ = LoadActiveQueriesSlicerAsync();
31253125
}
31263126

@@ -3134,7 +3134,7 @@ private async void OnMemoryDrillDown(DateTime time)
31343134
QueriesSubTabControl.SelectedIndex = 1; // Active Queries
31353135
var snapshots = await _dataService.GetLatestQuerySnapshotsAsync(_serverId, 0, fromDate, toDate);
31363136
_querySnapshotsFilterMgr!.UpdateData(snapshots);
3137-
LiveSnapshotIndicator.Text = $"Drill-down: {ServerTimeHelper.FormatServerTime(fromDate, "HH:mm")} \u2192 {ServerTimeHelper.FormatServerTime(toDate, "HH:mm")}";
3137+
LiveSnapshotIndicator.Text = $"Drill-down: {ServerTimeHelper.FormatServerTime(fromDate.AddMinutes(-UtcOffsetMinutes), "HH:mm")} \u2192 {ServerTimeHelper.FormatServerTime(toDate.AddMinutes(-UtcOffsetMinutes), "HH:mm")}";
31383138
_ = LoadActiveQueriesSlicerAsync();
31393139
}
31403140

@@ -3149,7 +3149,7 @@ private async void OnTempDbDrillDown(DateTime time)
31493149
QueriesSubTabControl.SelectedIndex = 1; // Active Queries
31503150
var snapshots = await _dataService.GetLatestQuerySnapshotsAsync(_serverId, 0, fromDate, toDate);
31513151
_querySnapshotsFilterMgr!.UpdateData(snapshots);
3152-
LiveSnapshotIndicator.Text = $"Drill-down: {ServerTimeHelper.FormatServerTime(fromDate, "HH:mm")} \u2192 {ServerTimeHelper.FormatServerTime(toDate, "HH:mm")}";
3152+
LiveSnapshotIndicator.Text = $"Drill-down: {ServerTimeHelper.FormatServerTime(fromDate.AddMinutes(-UtcOffsetMinutes), "HH:mm")} \u2192 {ServerTimeHelper.FormatServerTime(toDate.AddMinutes(-UtcOffsetMinutes), "HH:mm")}";
31533153
_ = LoadActiveQueriesSlicerAsync();
31543154
}
31553155

@@ -3190,7 +3190,7 @@ private async void OnHeatmapDrillDown(DateTime bucketTimeUtc)
31903190
QueriesSubTabControl.SelectedIndex = 1; // Active Queries
31913191
var snapshots = await _dataService.GetLatestQuerySnapshotsAsync(_serverId, 0, fromDate, toDate);
31923192
_querySnapshotsFilterMgr!.UpdateData(snapshots);
3193-
LiveSnapshotIndicator.Text = $"Drill-down: {ServerTimeHelper.FormatServerTime(fromDate, "HH:mm")} \u2192 {ServerTimeHelper.FormatServerTime(toDate, "HH:mm")}";
3193+
LiveSnapshotIndicator.Text = $"Drill-down: {ServerTimeHelper.FormatServerTime(fromDate.AddMinutes(-UtcOffsetMinutes), "HH:mm")} \u2192 {ServerTimeHelper.FormatServerTime(toDate.AddMinutes(-UtcOffsetMinutes), "HH:mm")}";
31943194
_ = LoadActiveQueriesSlicerAsync();
31953195
}
31963196

0 commit comments

Comments
 (0)