ComboBox for agent selection, modal behavior for directory window

Author: deansheather

App/App.csproj

@@ -29,10 +29,6 @@
         <SelfContained>false</SelfContained>
     </PropertyGroup>
 
-    <ItemGroup>
-      <None Remove="Views\Pages\DirectoryPickerMainPage.xaml" />
-    </ItemGroup>
-
     <ItemGroup>
         <Content Include="coder.ico" />
     </ItemGroup>
@@ -79,16 +75,4 @@
         <ProjectReference Include="..\Vpn.Proto\Vpn.Proto.csproj" />
         <ProjectReference Include="..\Vpn\Vpn.csproj" />
     </ItemGroup>
-
-    <ItemGroup>
-      <Page Update="Views\Pages\DirectoryPickerMainPage.xaml">
-        <Generator>MSBuild:Compile</Generator>
-      </Page>
-    </ItemGroup>
-
-    <ItemGroup>
-      <Page Update="Views\DirectoryPickerWindow.xaml">
-        <Generator>MSBuild:Compile</Generator>
-      </Page>
-    </ItemGroup>
 </Project>

App/Services/MutagenController.cs

@@ -569,6 +569,7 @@ private void StartDaemonProcess()
             {
                 // ignored
             }
+
             _daemonProcess?.Dispose();
             _logWriter?.Dispose();
             _daemonProcess = null;

App/ViewModels/DirectoryPickerViewModel.cs

@@ -14,14 +14,16 @@ namespace Coder.Desktop.App.ViewModels;
 
 public class DirectoryPickerBreadcrumb
 {
+    // HACK: you cannot access the parent context when inside an ItemsRepeater.
+    public required DirectoryPickerViewModel ViewModel;
+
     public required string Name { get; init; }
+
     public required IReadOnlyList<string> AbsolutePathSegments { get; init; }
+
     // HACK: we need to know which one is first so we don't prepend an arrow
     // icon. You can't get the index of the current ItemsRepeater item in XAML.
     public required bool IsFirst { get; init; }
-
-    // HACK: you cannot access the parent context when inside an ItemsRepeater.
-    public required DirectoryPickerViewModel ViewModel;
 }
 
 public enum DirectoryPickerItemKind
@@ -33,13 +35,13 @@ public enum DirectoryPickerItemKind
 
 public class DirectoryPickerItem
 {
+    // HACK: you cannot access the parent context when inside an ItemsRepeater.
+    public required DirectoryPickerViewModel ViewModel;
+
     public required DirectoryPickerItemKind Kind { get; init; }
     public required string Name { get; init; }
     public required IReadOnlyList<string> AbsolutePathSegments { get; init; }
 
-    // HACK: you cannot access the parent context when inside an ItemsRepeater.
-    public required DirectoryPickerViewModel ViewModel;
-
     public bool Selectable => Kind is DirectoryPickerItemKind.ParentDirectory or DirectoryPickerItemKind.Directory;
 }
 
@@ -74,18 +76,15 @@ public partial class DirectoryPickerViewModel : ObservableObject
     [NotifyPropertyChangedFor(nameof(ShowListScreen))]
     public partial string? InitialLoadError { get; set; } = null;
 
-    [ObservableProperty]
-    public partial bool NavigatingLoading { get; set; } = false;
+    [ObservableProperty] public partial bool NavigatingLoading { get; set; } = false;
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(IsSelectable))]
     public partial string CurrentDirectory { get; set; } = "";
 
-    [ObservableProperty]
-    public partial IReadOnlyList<DirectoryPickerBreadcrumb> Breadcrumbs { get; set; } = [];
+    [ObservableProperty] public partial IReadOnlyList<DirectoryPickerBreadcrumb> Breadcrumbs { get; set; } = [];
 
-    [ObservableProperty]
-    public partial IReadOnlyList<DirectoryPickerItem> Items { get; set; } = [];
+    [ObservableProperty] public partial IReadOnlyList<DirectoryPickerItem> Items { get; set; } = [];
 
     public bool ShowLoadingScreen => InitialLoadError == null && InitialLoading;
     public bool ShowErrorScreen => InitialLoadError != null;
@@ -100,7 +99,7 @@ public partial class DirectoryPickerViewModel : ObservableObject
 
     public DirectoryPickerViewModel(IAgentApiClientFactory clientFactory, string agentFqdn)
     {
-        _client = clientFactory.Create(hostname: agentFqdn);
+        _client = clientFactory.Create(agentFqdn);
         AgentFqdn = agentFqdn;
     }
 
@@ -218,7 +217,7 @@ private void ProcessResponse(ListDirectoryResponse res)
 
         var breadcrumbs = new List<DirectoryPickerBreadcrumb>(res.AbsolutePath.Count + 1)
         {
-            new DirectoryPickerBreadcrumb
+            new()
             {
                 Name = "(root)",
                 AbsolutePathSegments = [],
@@ -227,27 +226,23 @@ private void ProcessResponse(ListDirectoryResponse res)
             },
         };
         for (var i = 0; i < res.AbsolutePath.Count; i++)
-        {
             breadcrumbs.Add(new DirectoryPickerBreadcrumb
             {
                 Name = res.AbsolutePath[i],
                 AbsolutePathSegments = res.AbsolutePath[..(i + 1)],
                 IsFirst = false,
                 ViewModel = this,
             });
-        }
 
         var items = new List<DirectoryPickerItem>(res.Contents.Count + 1);
         if (res.AbsolutePath.Count != 0)
-        {
             items.Add(new DirectoryPickerItem
             {
                 Kind = DirectoryPickerItemKind.ParentDirectory,
                 Name = "..",
                 AbsolutePathSegments = res.AbsolutePath[..^1],
                 ViewModel = this,
             });
-        }
 
         foreach (var item in res.Contents)
         {

App/ViewModels/FileSyncListViewModel.cs

@@ -21,7 +21,7 @@ public partial class FileSyncListViewModel : ObservableObject
 {
     private Window? _window;
     private DispatcherQueue? _dispatcherQueue;
-    private Window? _remotePickerWindow;
+    private DirectoryPickerWindow? _remotePickerWindow;
 
     private readonly ISyncSessionController _syncSessionController;
     private readonly IRpcController _rpcController;
@@ -50,7 +50,7 @@ public partial class FileSyncListViewModel : ObservableObject
 
     [ObservableProperty] public partial bool OperationInProgress { get; set; } = false;
 
-    [ObservableProperty] public partial List<SyncSessionViewModel> Sessions { get; set; } = [];
+    [ObservableProperty] public partial IReadOnlyList<SyncSessionViewModel> Sessions { get; set; } = [];
 
     [ObservableProperty] public partial bool CreatingNewSession { get; set; } = false;
 
@@ -62,18 +62,29 @@ public partial class FileSyncListViewModel : ObservableObject
     [NotifyPropertyChangedFor(nameof(NewSessionCreateEnabled))]
     public partial bool NewSessionLocalPathDialogOpen { get; set; } = false;
 
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(NewSessionRemoteHostEnabled))]
+    public partial IReadOnlyList<string> AvailableHosts { get; set; } = [];
+
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(NewSessionCreateEnabled))]
-    public partial string NewSessionRemoteHost { get; set; } = "";
+    [NotifyPropertyChangedFor(nameof(NewSessionRemotePathDialogEnabled))]
+    public partial string? NewSessionRemoteHost { get; set; } = null;
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(NewSessionCreateEnabled))]
     public partial string NewSessionRemotePath { get; set; } = "";
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(NewSessionCreateEnabled))]
+    [NotifyPropertyChangedFor(nameof(NewSessionRemotePathDialogEnabled))]
     public partial bool NewSessionRemotePathDialogOpen { get; set; } = false;
 
+    public bool NewSessionRemoteHostEnabled => AvailableHosts.Count > 0;
+
+    public bool NewSessionRemotePathDialogEnabled =>
+        !string.IsNullOrWhiteSpace(NewSessionRemoteHost) && !NewSessionRemotePathDialogOpen;
+
     public bool NewSessionCreateEnabled
     {
         get
@@ -109,17 +120,6 @@ public void Initialize(Window window, DispatcherQueue dispatcherQueue)
         if (!_dispatcherQueue.HasThreadAccess)
             throw new InvalidOperationException("Initialize must be called from the UI thread");
 
-        // Force the remote picker to activate when activating the file sync
-        // list window if open.
-        _window.Activated += (_, e) =>
-        {
-            if (_remotePickerWindow is not null && e.WindowActivationState is WindowActivationState.PointerActivated)
-            {
-                e.Handled = true;
-                _remotePickerWindow.Activate();
-            }
-        };
-
         _rpcController.StateChanged += RpcControllerStateChanged;
         _credentialManager.CredentialsChanged += CredentialManagerCredentialsChanged;
         _syncSessionController.StateChanged += SyncSessionStateChanged;
@@ -199,8 +199,13 @@ private void MaybeSetUnavailableMessage(RpcModel rpcModel, CredentialModel crede
         else
         {
             UnavailableMessage = null;
+            // Reload if we transitioned from unavailable to available.
             if (oldMessage != null) ReloadSessions();
         }
+
+        // When transitioning from available to unavailable:
+        if (oldMessage == null && UnavailableMessage != null)
+            ClearNewForm();
     }
 
     private void UpdateSyncSessionState(SyncSessionControllerStateModel syncSessionState)
@@ -253,10 +258,34 @@ private void HandleRefresh(Task<SyncSessionControllerStateModel> t)
         Loading = false;
     }
 
+    // Overriding AvailableHosts seems to make the ComboBox clear its value, so
+    // we only do this while the create form is not open.
+    // Must be called in UI thread.
+    private void SetAvailableHostsFromRpcModel(RpcModel rpcModel)
+    {
+        var hosts = new List<string>(rpcModel.Agents.Count);
+        // Agents will only contain started agents.
+        foreach (var agent in rpcModel.Agents)
+        {
+            var fqdn = agent.Fqdn
+                .Select(a => a.Trim('.'))
+                .Where(a => !string.IsNullOrWhiteSpace(a))
+                .Aggregate((a, b) => a.Count(c => c == '.') < b.Count(c => c == '.') ? a : b);
+            if (string.IsNullOrWhiteSpace(fqdn))
+                continue;
+            hosts.Add(fqdn);
+        }
+
+        NewSessionRemoteHost = null;
+        AvailableHosts = hosts;
+    }
+
     [RelayCommand]
     private void StartCreatingNewSession()
     {
         ClearNewForm();
+        // Ensure we have a fresh hosts list before we open the form.
+        SetAvailableHostsFromRpcModel(_rpcController.GetState());
         CreatingNewSession = true;
     }
 
@@ -293,6 +322,8 @@ public async Task OpenLocalPathSelectDialog()
     [RelayCommand]
     public void OpenRemotePathSelectDialog()
     {
+        if (string.IsNullOrWhiteSpace(NewSessionRemoteHost))
+            return;
         if (_remotePickerWindow is not null)
         {
             _remotePickerWindow.Activate();
@@ -304,6 +335,7 @@ public void OpenRemotePathSelectDialog()
         pickerViewModel.PathSelected += OnRemotePathSelected;
 
         _remotePickerWindow = new DirectoryPickerWindow(pickerViewModel);
+        _remotePickerWindow.SetParent(_window);
         _remotePickerWindow.Closed += (_, _) =>
         {
             _remotePickerWindow = null;
@@ -347,7 +379,7 @@ await _syncSessionController.CreateSyncSession(new CreateSyncSessionRequest
                 Beta = new CreateSyncSessionRequest.Endpoint
                 {
                     Protocol = CreateSyncSessionRequest.Endpoint.ProtocolKind.Ssh,
-                    Host = NewSessionRemoteHost,
+                    Host = NewSessionRemoteHost!,
                     Path = NewSessionRemotePath,
                 },
             }, cts.Token);

App/ViewModels/TrayWindowViewModel.cs

@@ -178,6 +178,7 @@ private void UpdateFromRpcModel(RpcModel rpcModel)
             {
                 // We just assume that it's a single-agent workspace.
                 Hostname = workspace.Name,
+                // TODO: this needs to get the suffix from the server
                 HostnameSuffix = ".coder",
                 ConnectionStatus = AgentConnectionStatus.Gray,
                 DashboardUrl = WorkspaceUri(coderUri, workspace.Name),

App/Views/DirectoryPickerWindow.xaml

@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <winuiex:WindowEx
     x:Class="Coder.Desktop.App.Views.DirectoryPickerWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:winuiex="using:WinUIEx"
-    xmlns:locals="using:Coder.Desktop.App.Views"
-    xmlns:converters="using:Coder.Desktop.App.Converters"
     mc:Ignorable="d"
     Title="Directory Picker"
     Width="400" Height="600"

App/Views/DirectoryPickerWindow.xaml.cs

@@ -1,6 +1,12 @@
+using System;
+using System.Runtime.InteropServices;
+using Windows.Graphics;
 using Coder.Desktop.App.ViewModels;
 using Coder.Desktop.App.Views.Pages;
+using Microsoft.UI.Windowing;
+using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
+using WinRT.Interop;
 using WinUIEx;
 
 namespace Coder.Desktop.App.Views;
@@ -15,7 +21,73 @@ public DirectoryPickerWindow(DirectoryPickerViewModel viewModel)
         viewModel.Initialize(this, DispatcherQueue);
         RootFrame.Content = new DirectoryPickerMainPage(viewModel);
 
-        // TODO: this should appear near the mouse instead, similar to the tray window
+        // This will be moved to the center of the parent window in SetParent.
         this.CenterOnScreen();
     }
+
+    public void SetParent(Window parentWindow)
+    {
+        // Move the window to the center of the parent window.
+        var scale = DisplayScale.WindowScale(parentWindow);
+        var windowPos = new PointInt32(
+            parentWindow.AppWindow.Position.X + parentWindow.AppWindow.Size.Width / 2 - AppWindow.Size.Width / 2,
+            parentWindow.AppWindow.Position.Y + parentWindow.AppWindow.Size.Height / 2 - AppWindow.Size.Height / 2
+        );
+
+        // Ensure we stay within the display.
+        var workArea = DisplayArea.GetFromPoint(parentWindow.AppWindow.Position, DisplayAreaFallback.Primary).WorkArea;
+        if (windowPos.X + AppWindow.Size.Width > workArea.X + workArea.Width) // right edge
+            windowPos.X = workArea.X + workArea.Width - AppWindow.Size.Width;
+        if (windowPos.Y + AppWindow.Size.Height > workArea.Y + workArea.Height) // bottom edge
+            windowPos.Y = workArea.Y + workArea.Height - AppWindow.Size.Height;
+        if (windowPos.X < workArea.X) // left edge
+            windowPos.X = workArea.X;
+        if (windowPos.Y < workArea.Y) // top edge
+            windowPos.Y = workArea.Y;
+
+        AppWindow.Move(windowPos);
+
+        var parentHandle = WindowNative.GetWindowHandle(parentWindow);
+        var thisHandle = WindowNative.GetWindowHandle(this);
+
+        // Set the parent window in win API.
+        NativeApi.SetWindowParent(thisHandle, parentHandle);
+
+        // Override the presenter, which allows us to enable modal-like
+        // behavior for this window:
+        // - Disables the parent window
+        // - Any activations of the parent window will play a bell sound and
+        //   focus the modal window
+        //
+        // This behavior is very similar to the native file/directory picker on
+        // Windows.
+        var presenter = OverlappedPresenter.CreateForDialog();
+        presenter.IsModal = true;
+        AppWindow.SetPresenter(presenter);
+        AppWindow.Show();
+
+        // Cascade close events.
+        parentWindow.Closed += OnParentWindowClosed;
+        Closed += (_, _) =>
+        {
+            parentWindow.Closed -= OnParentWindowClosed;
+            parentWindow.Activate();
+        };
+    }
+
+    private void OnParentWindowClosed(object? sender, WindowEventArgs e)
+    {
+        Close();
+    }
+
+    private static class NativeApi
+    {
+        [DllImport("user32.dll")]
+        private static extern IntPtr SetWindowLongPtr(IntPtr hWnd, int nIndex, IntPtr dwNewLong);
+
+        public static void SetWindowParent(IntPtr window, IntPtr parent)
+        {
+            SetWindowLongPtr(window, -8, parent);
+        }
+    }
 }