redo of IconUrl and ImageSource

deansheather · deansheather · commit 887919146978 · 2025-05-08T13:26:37.000+10:00
diff --git a/App/ViewModels/AgentAppViewModel.cs b/App/ViewModels/AgentAppViewModel.cs
@@ -1,34 +1,32 @@
 using System;
 using System.Linq;
 using Windows.System;
+using Coder.Desktop.App.Models;
+using Coder.Desktop.App.Services;
 using Coder.Desktop.App.Utils;
 using Coder.Desktop.Vpn.Proto;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using Microsoft.Extensions.Logging;
 using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
 using Microsoft.UI.Xaml.Media;
 using Microsoft.UI.Xaml.Media.Imaging;
 
 namespace Coder.Desktop.App.ViewModels;
 
 public interface IAgentAppViewModelFactory
 {
-    public AgentAppViewModel Create(Uuid id, string name, Uri appUri, Uri? iconUrl);
+    public AgentAppViewModel Create(Uuid id, string name, string appUri, Uri? iconUrl);
 }
 
-public class AgentAppViewModelFactory : IAgentAppViewModelFactory
+public class AgentAppViewModelFactory(ILogger<AgentAppViewModel> childLogger, ICredentialManager credentialManager)
+    : IAgentAppViewModelFactory
 {
-    private readonly ILogger<AgentAppViewModel> _childLogger;
-
-    public AgentAppViewModelFactory(ILogger<AgentAppViewModel> childLogger)
-    {
-        _childLogger = childLogger;
-    }
-
-    public AgentAppViewModel Create(Uuid id, string name, Uri appUri, Uri? iconUrl)
+    public AgentAppViewModel Create(Uuid id, string name, string appUri, Uri? iconUrl)
     {
-        return new AgentAppViewModel(_childLogger)
+        return new AgentAppViewModel(childLogger, credentialManager)
         {
             Id = id,
             Name = name,
@@ -40,61 +38,40 @@ public AgentAppViewModel Create(Uuid id, string name, Uri appUri, Uri? iconUrl)
 
 public partial class AgentAppViewModel : ObservableObject, IModelUpdateable<AgentAppViewModel>
 {
+    private const string SessionTokenUriVar = "$SESSION_TOKEN";
+
     private readonly ILogger<AgentAppViewModel> _logger;
+    private readonly ICredentialManager _credentialManager;
 
     public required Uuid Id { get; init; }
 
     [ObservableProperty] public required partial string Name { get; set; }
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(Details))]
-    public required partial Uri AppUri { get; set; }
+    public required partial string AppUri { get; set; }
 
-    [ObservableProperty]
-    [NotifyPropertyChangedFor(nameof(ImageSource))]
-    public partial Uri? IconUrl { get; set; }
+    [ObservableProperty] public partial Uri? IconUrl { get; set; }
+
+    [ObservableProperty] public partial ImageSource IconImageSource { get; set; }
 
     [ObservableProperty] public partial bool UseFallbackIcon { get; set; } = true;
 
     public string Details =>
         (string.IsNullOrWhiteSpace(Name) ? "(no name)" : Name) + ":\n\n" + AppUri;
 
-    public ImageSource ImageSource
-    {
-        get
-        {
-            if (IconUrl is null || (IconUrl.Scheme != "http" && IconUrl.Scheme != "https"))
-            {
-                UseFallbackIcon = true;
-                return new BitmapImage();
-            }
-
-            // Determine what image source to use based on extension, use a
-            // BitmapImage as last resort.
-            var ext = IconUrl.AbsolutePath.Split('/').LastOrDefault()?.Split('.').LastOrDefault();
-            // TODO: this is definitely a hack, URLs shouldn't need to end in .svg
-            if (ext is "svg")
-            {
-                // TODO: Some SVGs like `/icon/cursor.svg` contain PNG data and
-                //       don't render at all.
-                var svg = new SvgImageSource(IconUrl);
-                svg.Opened += (_, _) => _logger.LogDebug("app icon opened (svg): {uri}", IconUrl);
-                svg.OpenFailed += (_, args) =>
-                    _logger.LogDebug("app icon failed to open (svg): {uri}: {Status}", IconUrl, args.Status);
-                return svg;
-            }
-
-            var bitmap = new BitmapImage(IconUrl);
-            bitmap.ImageOpened += (_, _) => _logger.LogDebug("app icon opened (bitmap): {uri}", IconUrl);
-            bitmap.ImageFailed += (_, args) =>
-                _logger.LogDebug("app icon failed to open (bitmap): {uri}: {ErrorMessage}", IconUrl, args.ErrorMessage);
-            return bitmap;
-        }
-    }
-
-    public AgentAppViewModel(ILogger<AgentAppViewModel> logger)
+    public AgentAppViewModel(ILogger<AgentAppViewModel> logger, ICredentialManager credentialManager)
     {
         _logger = logger;
+        _credentialManager = credentialManager;
+
+        // Apply the icon URL to the icon image source when it is updated.
+        IconImageSource = UpdateIcon();
+        PropertyChanged += (_, args) =>
+        {
+            if (args.PropertyName == nameof(IconUrl))
+                IconImageSource = UpdateIcon();
+        };
     }
 
     public bool TryApplyChanges(AgentAppViewModel obj)
@@ -116,6 +93,36 @@ public bool TryApplyChanges(AgentAppViewModel obj)
         return true;
     }
 
+    private ImageSource UpdateIcon()
+    {
+        if (IconUrl is null || (IconUrl.Scheme != "http" && IconUrl.Scheme != "https"))
+        {
+            UseFallbackIcon = true;
+            return new BitmapImage();
+        }
+
+        // Determine what image source to use based on extension, use a
+        // BitmapImage as last resort.
+        var ext = IconUrl.AbsolutePath.Split('/').LastOrDefault()?.Split('.').LastOrDefault();
+        // TODO: this is definitely a hack, URLs shouldn't need to end in .svg
+        if (ext is "svg")
+        {
+            // TODO: Some SVGs like `/icon/cursor.svg` contain PNG data and
+            //       don't render at all.
+            var svg = new SvgImageSource(IconUrl);
+            svg.Opened += (_, _) => _logger.LogDebug("app icon opened (svg): {uri}", IconUrl);
+            svg.OpenFailed += (_, args) =>
+                _logger.LogDebug("app icon failed to open (svg): {uri}: {Status}", IconUrl, args.Status);
+            return svg;
+        }
+
+        var bitmap = new BitmapImage(IconUrl);
+        bitmap.ImageOpened += (_, _) => _logger.LogDebug("app icon opened (bitmap): {uri}", IconUrl);
+        bitmap.ImageFailed += (_, args) =>
+            _logger.LogDebug("app icon failed to open (bitmap): {uri}: {ErrorMessage}", IconUrl, args.ErrorMessage);
+        return bitmap;
+    }
+
     public void OnImageOpened(object? sender, RoutedEventArgs e)
     {
         UseFallbackIcon = false;
@@ -127,15 +134,45 @@ public void OnImageFailed(object? sender, RoutedEventArgs e)
     }
 
     [RelayCommand]
-    private void OpenApp()
+    private void OpenApp(object parameter)
     {
         try
         {
-            _ = Launcher.LaunchUriAsync(AppUri);
+            var uriString = AppUri;
+            var cred = _credentialManager.GetCachedCredentials();
+            if (cred.State is CredentialState.Valid && cred.ApiToken is not null)
+                uriString = uriString.Replace(SessionTokenUriVar, cred.ApiToken);
+            uriString += SessionTokenUriVar;
+            if (uriString.Contains(SessionTokenUriVar))
+                throw new Exception($"URI contains {SessionTokenUriVar} variable but could not be replaced");
+
+            var uri = new Uri(uriString);
+            _ = Launcher.LaunchUriAsync(uri);
         }
-        catch
+        catch (Exception e)
         {
-            // TODO: log/notify
+            _logger.LogWarning(e, "could not parse or launch app");
+
+            if (parameter is not FrameworkElement frameworkElement) return;
+            var flyout = new Flyout
+            {
+                Content = new TextBlock
+                {
+                    Text = $"Could not open app: {e.Message}",
+                    Margin = new Thickness(4),
+                    TextWrapping = TextWrapping.Wrap,
+                },
+                FlyoutPresenterStyle = new Style(typeof(FlyoutPresenter))
+                {
+                    Setters =
+                    {
+                        new Setter(ScrollViewer.HorizontalScrollModeProperty, ScrollMode.Disabled),
+                        new Setter(ScrollViewer.HorizontalScrollBarVisibilityProperty, ScrollBarVisibility.Disabled),
+                    },
+                },
+            };
+            FlyoutBase.SetAttachedFlyout(frameworkElement, flyout);
+            FlyoutBase.ShowAttachedFlyout(frameworkElement);
         }
     }
 }
diff --git a/App/ViewModels/AgentViewModel.cs b/App/ViewModels/AgentViewModel.cs
@@ -26,26 +26,16 @@ public AgentViewModel Create(Uuid id, string hostname, string hostnameSuffix,
         AgentConnectionStatus connectionStatus, Uri dashboardBaseUrl, string? workspaceName);
 }
 
-public class AgentViewModelFactory : IAgentViewModelFactory
+public class AgentViewModelFactory(
+    ILogger<AgentViewModel> childLogger,
+    ICoderApiClientFactory coderApiClientFactory,
+    ICredentialManager credentialManager,
+    IAgentAppViewModelFactory agentAppViewModelFactory) : IAgentViewModelFactory
 {
-    private readonly ILogger<AgentViewModel> _childLogger;
-    private readonly ICoderApiClientFactory _coderApiClientFactory;
-    private readonly ICredentialManager _credentialManager;
-    private readonly IAgentAppViewModelFactory _agentAppViewModelFactory;
-
-    public AgentViewModelFactory(ILogger<AgentViewModel> childLogger, ICoderApiClientFactory coderApiClientFactory,
-        ICredentialManager credentialManager, IAgentAppViewModelFactory agentAppViewModelFactory)
-    {
-        _childLogger = childLogger;
-        _coderApiClientFactory = coderApiClientFactory;
-        _credentialManager = credentialManager;
-        _agentAppViewModelFactory = agentAppViewModelFactory;
-    }
-
     public AgentViewModel Create(Uuid id, string hostname, string hostnameSuffix,
         AgentConnectionStatus connectionStatus, Uri dashboardBaseUrl, string? workspaceName)
     {
-        return new AgentViewModel(_childLogger, _coderApiClientFactory, _credentialManager, _agentAppViewModelFactory)
+        return new AgentViewModel(childLogger, coderApiClientFactory, credentialManager, agentAppViewModelFactory)
         {
             Id = id,
             Hostname = hostname,
@@ -270,18 +260,18 @@ private void ContinueFetchApps(Task<WorkspaceAgent> task)
                 continue;
             }
 
-            if (!Uri.TryCreate(app.Url, UriKind.Absolute, out var appUri))
+            if (string.IsNullOrEmpty(app.Url))
             {
-                _logger.LogWarning("Could not parse app URI '{Url}' for '{DisplayName}', app will not appear in list",
-                    app.Url, app.DisplayName);
+                _logger.LogWarning("App URI '{Url}' for '{DisplayName}' is empty, app will not appear in list", app.Url,
+                    app.DisplayName);
                 continue;
             }
 
             // Icon parse failures are not fatal, we will just use the fallback
             // icon.
             _ = Uri.TryCreate(DashboardBaseUrl, app.Icon, out var iconUrl);
 
-            apps.Add(_agentAppViewModelFactory.Create(uuid, app.DisplayName, appUri, iconUrl));
+            apps.Add(_agentAppViewModelFactory.Create(uuid, app.DisplayName, app.Url, iconUrl));
         }
 
         // Sort by name.
diff --git a/App/Views/Pages/TrayWindowMainPage.xaml b/App/Views/Pages/TrayWindowMainPage.xaml
@@ -251,16 +251,18 @@
                                 <ItemsRepeater.ItemTemplate>
                                     <DataTemplate x:DataType="viewModels:AgentAppViewModel">
                                         <HyperlinkButton
+                                            x:Name="AppButton"
                                             Padding="6"
                                             Margin="0"
                                             Command="{x:Bind OpenAppCommand}"
+                                            CommandParameter="{Binding ElementName=AppButton}"
                                             Width="34"
                                             Height="34"
                                             ToolTipService.ToolTip="{x:Bind Details}">
 
                                             <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                                                 <Image
-                                                    Source="{x:Bind ImageSource}"
+                                                    Source="{x:Bind IconImageSource, Mode=OneWay}"
                                                     ImageOpened="{x:Bind OnImageOpened}"
                                                     ImageFailed="{x:Bind OnImageFailed}"
                                                     Visibility="{x:Bind UseFallbackIcon, Converter={StaticResource InverseBoolToVisibilityConverter}, Mode=OneWay}"
