erikdarlingdata
diff --git a/‎.github/workflows/check-version-bump.yml‎
Lines changed: 48 additions & 0 deletions b/‎.github/workflows/check-version-bump.yml‎
Lines changed: 48 additions & 0 deletions
diff --git a/‎Dashboard/App.xaml.cs‎
Lines changed: 20 additions & 0 deletions b/‎Dashboard/App.xaml.cs‎
Lines changed: 20 additions & 0 deletions
diff --git a/‎Dashboard/Controls/PlanViewerControl.xaml.cs‎
Lines changed: 4 additions & 2 deletions b/‎Dashboard/Controls/PlanViewerControl.xaml.cs‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎Dashboard/Controls/ResourceMetricsContent.xaml.cs‎
Lines changed: 44 additions & 1 deletion b/‎Dashboard/Controls/ResourceMetricsContent.xaml.cs‎
Lines changed: 44 additions & 1 deletion
diff --git a/‎Dashboard/Converters/QueryTextCleanupConverter.cs‎
Lines changed: 5 additions & 2 deletions b/‎Dashboard/Converters/QueryTextCleanupConverter.cs‎
Lines changed: 5 additions & 2 deletions
diff --git a/‎Dashboard/Dashboard.csproj‎
Lines changed: 4 additions & 4 deletions b/‎Dashboard/Dashboard.csproj‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎Dashboard/Helpers/ChartHoverHelper.cs‎
Lines changed: 47 additions & 2 deletions b/‎Dashboard/Helpers/ChartHoverHelper.cs‎
Lines changed: 47 additions & 2 deletions
diff --git a/‎Dashboard/Helpers/DateFilterHelper.cs‎
Lines changed: 5 additions & 2 deletions b/‎Dashboard/Helpers/DateFilterHelper.cs‎
Lines changed: 5 additions & 2 deletions
diff --git a/‎Dashboard/Helpers/TabHelpers.cs‎
Lines changed: 3 additions & 1 deletion b/‎Dashboard/Helpers/TabHelpers.cs‎
Lines changed: 3 additions & 1 deletion
@@ -0,0 +1,48 @@
+name: Check version bump
+on:
+  pull_request:
+    branches: [main]
+
+jobs:
+  check-version:
+    if: github.head_ref == 'dev'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout PR branch
+        uses: actions/checkout@v4
+
+      - name: Get PR version
+        id: pr
+        shell: pwsh
+        run: |
+          $version = ([xml](Get-Content Dashboard/Dashboard.csproj)).Project.PropertyGroup.Version | Where-Object { $_ }
+          echo "VERSION=$version" >> $env:GITHUB_OUTPUT
+          Write-Host "PR version: $version"
+
+      - name: Checkout main
+        uses: actions/checkout@v4
+        with:
+          ref: main
+          path: main-branch
+
+      - name: Get main version
+        id: main
+        shell: pwsh
+        run: |
+          $version = ([xml](Get-Content main-branch/Dashboard/Dashboard.csproj)).Project.PropertyGroup.Version | Where-Object { $_ }
+          echo "VERSION=$version" >> $env:GITHUB_OUTPUT
+          Write-Host "Main version: $version"
+
+      - name: Compare versions
+        env:
+          PR_VERSION: ${{ steps.pr.outputs.VERSION }}
+          MAIN_VERSION: ${{ steps.main.outputs.VERSION }}
+        run: |
+          echo "Main version: $MAIN_VERSION"
+          echo "PR version:   $PR_VERSION"
+          if [ "$PR_VERSION" == "$MAIN_VERSION" ]; then
+            echo "::error::Version in Dashboard.csproj ($PR_VERSION) has not changed from main. Bump the version before merging to main."
+            exit 1
+          fi
+          echo "✅ Version bumped: $MAIN_VERSION → $PR_VERSION"
@@ -95,6 +95,16 @@ private void OnUnhandledException(object sender, UnhandledExceptionEventArgs e)
 
         private void OnDispatcherUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs e)
         {
+            /* Silently swallow Hardcodet TrayToolTip race condition (issue #422).
+               The crash occurs in Popup.CreateWindow when showing the custom visual tooltip
+               and is harmless — the tooltip simply doesn't show that one time. */
+            if (IsTrayToolTipCrash(e.Exception))
+            {
+                Logger.Warning("Suppressed Hardcodet TrayToolTip crash (issue #422)");
+                e.Handled = true;
+                return;
+            }
+
             Logger.Error("Unhandled Dispatcher Exception", e.Exception);
 
             MessageBox.Show(
@@ -114,6 +124,16 @@ private void OnUnobservedTaskException(object? sender, UnobservedTaskExceptionEv
             e.SetObserved(); // Prevent process termination
         }
 
+        /// <summary>
+        /// Detects the Hardcodet TrayToolTip race condition crash (issue #422).
+        /// </summary>
+        private static bool IsTrayToolTipCrash(Exception ex)
+        {
+            return ex is ArgumentException
+                && ex.Message.Contains("VisualTarget")
+                && ex.StackTrace?.Contains("TaskbarIcon") == true;
+        }
+
         private void CreateCrashDump(Exception? exception)
         {
             try
 
@@ -534,7 +534,8 @@ private void ShowPropertiesPanel(PlanNode node)
 
         // Header
         var headerText = node.PhysicalOp;
-        if (node.LogicalOp != node.PhysicalOp && !string.IsNullOrEmpty(node.LogicalOp))
+        if (node.LogicalOp != node.PhysicalOp && !string.IsNullOrEmpty(node.LogicalOp)
+            && !node.PhysicalOp.Contains(node.LogicalOp, StringComparison.OrdinalIgnoreCase))
             headerText += $" ({node.LogicalOp})";
         PropertiesHeader.Text = headerText;
         PropertiesSubHeader.Text = $"Node ID: {node.NodeId}";
@@ -1481,7 +1482,8 @@ private ToolTip BuildNodeTooltip(PlanNode node)
 
         // Header
         var headerText = node.PhysicalOp;
-        if (node.LogicalOp != node.PhysicalOp && !string.IsNullOrEmpty(node.LogicalOp))
+        if (node.LogicalOp != node.PhysicalOp && !string.IsNullOrEmpty(node.LogicalOp)
+            && !node.PhysicalOp.Contains(node.LogicalOp, StringComparison.OrdinalIgnoreCase))
             headerText += $" ({node.LogicalOp})";
         stack.Children.Add(new TextBlock
         {
 
@@ -199,7 +199,8 @@ private void SetupChartContextMenus()
             TabHelpers.SetupChartContextMenu(PerfmonCountersChart, "Perfmon_Counters", "collect.perfmon_stats");
 
             // Wait Stats Detail chart
-            TabHelpers.SetupChartContextMenu(WaitStatsDetailChart, "Wait_Stats_Detail", "collect.wait_stats");
+            var waitStatsMenu = TabHelpers.SetupChartContextMenu(WaitStatsDetailChart, "Wait_Stats_Detail", "collect.wait_stats");
+            AddWaitDrillDownMenuItem(WaitStatsDetailChart, waitStatsMenu);
         }
 
         /// <summary>
@@ -1813,6 +1814,48 @@ private async void WaitType_CheckChanged(object sender, RoutedEventArgs e)
             await UpdateWaitStatsDetailChartAsync();
         }
 
+        private void AddWaitDrillDownMenuItem(ScottPlot.WPF.WpfPlot chart, ContextMenu contextMenu)
+        {
+            contextMenu.Items.Insert(0, new Separator());
+            var drillDownItem = new MenuItem { Header = "Show Queries With This Wait" };
+            drillDownItem.Click += ShowQueriesForWaitType_Click;
+            contextMenu.Items.Insert(0, drillDownItem);
+
+            contextMenu.Opened += (s, _) =>
+            {
+                var pos = System.Windows.Input.Mouse.GetPosition(chart);
+                var nearest = _waitStatsHover?.GetNearestSeries(pos);
+                if (nearest.HasValue)
+                {
+                    drillDownItem.Tag = (nearest.Value.Label, nearest.Value.Time);
+                    drillDownItem.Header = $"Show Queries With {nearest.Value.Label.Replace("_", "__")}";
+                    drillDownItem.IsEnabled = true;
+                }
+                else
+                {
+                    drillDownItem.Tag = null;
+                    drillDownItem.Header = "Show Queries With This Wait";
+                    drillDownItem.IsEnabled = false;
+                }
+            };
+        }
+
+        private void ShowQueriesForWaitType_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is not MenuItem menuItem) return;
+            if (menuItem.Tag is not ValueTuple<string, DateTime> tag) return;
+            if (_databaseService == null) return;
+
+            // ±15 minute window around the clicked point
+            var fromDate = tag.Item2.AddMinutes(-15);
+            var toDate = tag.Item2.AddMinutes(15);
+
+            var window = new WaitDrillDownWindow(
+                _databaseService, tag.Item1, 1, fromDate, toDate);
+            window.Owner = Window.GetWindow(this);
+            window.ShowDialog();
+        }
+
         private void WaitStatsMetric_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (_allWaitStatsDetailData != null)
 
@@ -12,7 +12,7 @@
 
 namespace PerformanceMonitorDashboard.Converters
 {
-    public class QueryTextCleanupConverter : IValueConverter
+    public partial class QueryTextCleanupConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
@@ -28,7 +28,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
             text = text.Replace("\t", " ", StringComparison.Ordinal);
 
             // Replace multiple spaces with single space
-            text = Regex.Replace(text, @"\s+", " ");
+            text = MultipleSpacesRegExp().Replace(text, " ");
 
             // Trim leading/trailing whitespace
             text = text.Trim();
@@ -40,5 +40,8 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
         {
             throw new NotImplementedException();
         }
+
+        [GeneratedRegex(@"\s+")]
+        private static partial Regex MultipleSpacesRegExp();
     }
 }
@@ -6,10 +6,10 @@
     <UseWPF>true</UseWPF>
     <AssemblyName>PerformanceMonitorDashboard</AssemblyName>
     <Product>SQL Server Performance Monitor Dashboard</Product>
-    <Version>2.1.0</Version>
-    <AssemblyVersion>2.1.0.0</AssemblyVersion>
-    <FileVersion>2.1.0.0</FileVersion>
-    <InformationalVersion>2.1.0</InformationalVersion>
+    <Version>2.2.0</Version>
+    <AssemblyVersion>2.2.0.0</AssemblyVersion>
+    <FileVersion>2.2.0.0</FileVersion>
+    <InformationalVersion>2.2.0</InformationalVersion>
     <Company>Darling Data, LLC</Company>
     <Copyright>Copyright © 2026 Darling Data, LLC</Copyright>
     <ApplicationIcon>EDD.ico</ApplicationIcon>
 
@@ -61,6 +61,50 @@ public ChartHoverHelper(ScottPlot.WPF.WpfPlot chart, string unit)
     public void Add(ScottPlot.Plottables.Scatter scatter, string label) =>
         _scatters.Add((scatter, label));
 
+    /// <summary>
+    /// Returns the nearest series label and data-point time for the given mouse position,
+    /// or null if no series is close enough.
+    /// </summary>
+    public (string Label, DateTime Time)? GetNearestSeries(Point mousePos)
+    {
+        if (_scatters.Count == 0) return null;
+        try
+        {
+            var dpi = VisualTreeHelper.GetDpi(_chart);
+            var pixel = new ScottPlot.Pixel(
+                (float)(mousePos.X * dpi.DpiScaleX),
+                (float)(mousePos.Y * dpi.DpiScaleY));
+            var mouseCoords = _chart.Plot.GetCoordinates(pixel);
+
+            double bestYDistance = double.MaxValue;
+            ScottPlot.DataPoint bestPoint = default;
+            string bestLabel = "";
+            bool found = false;
+
+            foreach (var (scatter, label) in _scatters)
+            {
+                var nearest = scatter.Data.GetNearest(mouseCoords, _chart.Plot.LastRender);
+                if (!nearest.IsReal) continue;
+                var nearestPixel = _chart.Plot.GetPixel(
+                    new ScottPlot.Coordinates(nearest.X, nearest.Y));
+                double dx = Math.Abs(nearestPixel.X - pixel.X);
+                double dy = Math.Abs(nearestPixel.Y - pixel.Y);
+                if (dx < 80 && dy < bestYDistance)
+                {
+                    bestYDistance = dy;
+                    bestPoint = nearest;
+                    bestLabel = label;
+                    found = true;
+                }
+            }
+
+            if (found)
+                return (bestLabel, DateTime.FromOADate(bestPoint.X));
+        }
+        catch { }
+        return null;
+    }
+
     private void OnMouseMove(object sender, MouseEventArgs e)
     {
         if (_scatters.Count == 0) return;
@@ -71,9 +115,10 @@ private void OnMouseMove(object sender, MouseEventArgs e)
         try
         {
             var pos = e.GetPosition(_chart);
+            var dpi = VisualTreeHelper.GetDpi(_chart);
             var pixel = new ScottPlot.Pixel(
-                (float)(pos.X * _chart.DisplayScale),
-                (float)(pos.Y * _chart.DisplayScale));
+                (float)(pos.X * dpi.DpiScaleX),
+                (float)(pos.Y * dpi.DpiScaleY));
             var mouseCoords = _chart.Plot.GetCoordinates(pixel);
 
             /* Use X-axis (time) proximity as the primary filter, Y-axis distance
 
@@ -11,7 +11,7 @@
 
 namespace PerformanceMonitorDashboard.Helpers
 {
-    public static class DateFilterHelper
+    public static partial class DateFilterHelper
     {
         public static bool MatchesFilter(object? value, string? filterText)
         {
@@ -148,7 +148,7 @@ private static bool TryConvertToDateTime(object value, out DateTime result)
             }
 
             // "last N hours/days/weeks" expressions
-            var lastMatch = Regex.Match(expressionLower, @"last\s+(\d+)\s+(hour|hours|day|days|week|weeks|month|months)");
+            var lastMatch = LastNHoursDaysWeeksMonthsRegExp().Match(expressionLower);
             if (lastMatch.Success)
             {
                 int count = int.Parse(lastMatch.Groups[1].Value, CultureInfo.InvariantCulture);
@@ -231,5 +231,8 @@ private static bool IsRelativeExpression(string expression)
                    expression == "tomorrow" ||
                    Regex.IsMatch(expression, @"last\s+\d+\s+(hour|hours|day|days|week|weeks|month|months)");
         }
+
+        [GeneratedRegex(@"last\s+(\d+)\s+(hour|hours|day|days|week|weeks|month|months)")]
+        private static partial Regex LastNHoursDaysWeeksMonthsRegExp();
     }
 }
@@ -603,7 +603,7 @@ public static string FormatForExport(object? value)
         /// <param name="chart">The WpfPlot chart control</param>
         /// <param name="chartName">A descriptive name for the chart (used in filenames)</param>
         /// <param name="dataSource">Optional SQL view/table name that populates this chart</param>
-        public static void SetupChartContextMenu(WpfPlot chart, string chartName, string? dataSource = null)
+        public static ContextMenu SetupChartContextMenu(WpfPlot chart, string chartName, string? dataSource = null)
         {
             var contextMenu = new ContextMenu();
 
@@ -786,6 +786,8 @@ public static void SetupChartContextMenu(WpfPlot chart, string chartName, string
                 chart.Plot.Axes.AutoScale();
                 chart.Refresh();
             };
+
+            return contextMenu;
         }
 
         /// <summary>
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`
`13`	`13`	`namespace PerformanceMonitorDashboard.Converters`
`14`	`14`	`{`
`15`		`- public class QueryTextCleanupConverter : IValueConverter`
	`15`	`+ public partial class QueryTextCleanupConverter : IValueConverter`
`16`	`16`	`{`
`17`	`17`	`public object Convert(object value, Type targetType, object parameter, CultureInfo culture)`
`18`	`18`	`{`
`@@ -28,7 +28,7 @@ public object Convert(object value, Type targetType, object parameter, CultureIn`
`28`	`28`	`text = text.Replace("\t", " ", StringComparison.Ordinal);`
`29`	`29`
`30`	`30`	`// Replace multiple spaces with single space`
`31`		`- text = Regex.Replace(text, @"\s+", " ");`
	`31`	`+ text = MultipleSpacesRegExp().Replace(text, " ");`
`32`	`32`
`33`	`33`	`// Trim leading/trailing whitespace`
`34`	`34`	`text = text.Trim();`
`@@ -40,5 +40,8 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu`
`40`	`40`	`{`
`41`	`41`	`throw new NotImplementedException();`
`42`	`42`	`}`
	`43`	`+`
	`44`	`+ [GeneratedRegex(@"\s+")]`
	`45`	`+ private static partial Regex MultipleSpacesRegExp();`
`43`	`46`	`}`
`44`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace PerformanceMonitorDashboard.Helpers`
`13`	`13`	`{`
`14`		`- public static class DateFilterHelper`
	`14`	`+ public static partial class DateFilterHelper`
`15`	`15`	`{`
`16`	`16`	`public static bool MatchesFilter(object? value, string? filterText)`
`17`	`17`	`{`
`@@ -148,7 +148,7 @@ private static bool TryConvertToDateTime(object value, out DateTime result)`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`// "last N hours/days/weeks" expressions`
`151`		`- var lastMatch = Regex.Match(expressionLower, @"last\s+(\d+)\s+(hour\|hours\|day\|days\|week\|weeks\|month\|months)");`
	`151`	`+ var lastMatch = LastNHoursDaysWeeksMonthsRegExp().Match(expressionLower);`
`152`	`152`	`if (lastMatch.Success)`
`153`	`153`	`{`
`154`	`154`	`int count = int.Parse(lastMatch.Groups[1].Value, CultureInfo.InvariantCulture);`
`@@ -231,5 +231,8 @@ private static bool IsRelativeExpression(string expression)`
`231`	`231`	`expression == "tomorrow" \|\|`
`232`	`232`	`Regex.IsMatch(expression, @"last\s+\d+\s+(hour\|hours\|day\|days\|week\|weeks\|month\|months)");`
`233`	`233`	`}`
	`234`	`+`
	`235`	`+ [GeneratedRegex(@"last\s+(\d+)\s+(hour\|hours\|day\|days\|week\|weeks\|month\|months)")]`
	`236`	`+ private static partial Regex LastNHoursDaysWeeksMonthsRegExp();`
`234`	`237`	`}`
`235`	`238`	`}`