From 6d81e29a74eb73884d1091b60190bcccac4880cc Mon Sep 17 00:00:00 2001
From: Erik Darling <2136037+erikdarlingdata@users.noreply.github.com>
Date: Thu, 14 May 2026 09:21:54 +0200
Subject: [PATCH] Fix two post-split UX issues
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Both are pre-existing bugs surfaced during smoke-testing of the
god-file split; neither was caused by the move-only refactor.

1. Run Repro from a file-loaded plan produced an actual-plan tab with
   schema lookups (Show Indexes / Show Table Definition) greyed out.
   The new PlanViewerControl wasn't given the connection used to run
   the repro. Now inherits ConnectionString + connection services +
   status, matching the query-editor Run Repro path.

2. QuerySessionControl toolbar overflowed off-screen on narrow windows
   — the Format / Format Options buttons were unreachable. Switched the
   toolbar from a single-row StackPanel to a WrapPanel so buttons wrap
   to a second row instead of being cut off.

Build clean: 0 errors on PlanViewer.sln.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .../Controls/QuerySessionControl.axaml        | 20 +++++++++++++------
 src/PlanViewer.App/MainWindow.PlanViewer.cs   |  6 ++++++
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/PlanViewer.App/Controls/QuerySessionControl.axaml b/src/PlanViewer.App/Controls/QuerySessionControl.axaml
index a6fa92c..a9aefad 100644
--- a/src/PlanViewer.App/Controls/QuerySessionControl.axaml
+++ b/src/PlanViewer.App/Controls/QuerySessionControl.axaml
@@ -8,7 +8,19 @@
         <Border Grid.Row="0" Background="{DynamicResource BackgroundDarkBrush}" Padding="8,6"
                 BorderBrush="{DynamicResource BorderBrush}" BorderThickness="0,0,0,1">
             <DockPanel>
-                <StackPanel Orientation="Horizontal" DockPanel.Dock="Left" Spacing="4">
+                <TextBlock x:Name="StatusText" DockPanel.Dock="Right"
+                           HorizontalAlignment="Right" VerticalAlignment="Center"
+                           FontSize="11" Foreground="{DynamicResource ForegroundBrush}"
+                           TextTrimming="CharacterEllipsis" Margin="8,0,0,0"/>
+                <WrapPanel Orientation="Horizontal">
+                    <WrapPanel.Styles>
+                        <Style Selector="Button">
+                            <Setter Property="Margin" Value="0,2,4,2"/>
+                        </Style>
+                        <Style Selector="ComboBox">
+                            <Setter Property="Margin" Value="0,2,4,2"/>
+                        </Style>
+                    </WrapPanel.Styles>
                     <Button x:Name="ConnectButton" Content="Connect" Click="Connect_Click"
                             Height="28" Padding="8,0" FontSize="12"
                             Theme="{StaticResource AppButton}"
@@ -84,11 +96,7 @@
                             Height="28" Padding="10,0" FontSize="12"
                             Theme="{StaticResource AppButton}"
                             ToolTip.Tip="Configure SQL formatting options"/>
-                </StackPanel>
-                <TextBlock x:Name="StatusText" DockPanel.Dock="Right"
-                           HorizontalAlignment="Right" VerticalAlignment="Center"
-                           FontSize="11" Foreground="{DynamicResource ForegroundBrush}"
-                           TextTrimming="CharacterEllipsis"/>
+                </WrapPanel>
             </DockPanel>
         </Border>
 
diff --git a/src/PlanViewer.App/MainWindow.PlanViewer.cs b/src/PlanViewer.App/MainWindow.PlanViewer.cs
index 9e196a5..c8f5d47 100644
--- a/src/PlanViewer.App/MainWindow.PlanViewer.cs
+++ b/src/PlanViewer.App/MainWindow.PlanViewer.cs
@@ -489,6 +489,12 @@ private async Task GetActualPlanFromFile(PlanViewerControl viewer)
             // Replace loading content with the actual plan
             var actualViewer = new PlanViewerControl();
             actualViewer.Metadata = metadata;
+            // Inherit the connection used to run the repro so schema lookups
+            // (Show Indexes, Show Table Definition) remain available on the
+            // new plan tab.
+            actualViewer.ConnectionString = connectionString;
+            actualViewer.SetConnectionServices(_credentialService, _connectionStore);
+            actualViewer.SetConnectionStatus(dialog.ResultConnection.ServerName, database);
             actualViewer.LoadPlan(actualPlanXml, "Actual Plan", queryText);
 
             tab.Content = CreatePlanTabContent(actualViewer);