Refactor URL display properties to support nullable icon names and variants; enhance FluentButton accessibility with AriaLabel

Author: mcumming

src/Aspire.Dashboard/Components/ResourcesGridColumns/UrlsColumnDisplay.razor

@@ -68,11 +68,11 @@ else if (DisplayedUrls.Count > 1)
         {
             if (string.IsNullOrWhiteSpace(displayedUrl.IconName) == false && IconResolver.ResolveIconName(displayedUrl.IconName, IconSize.Size16, iconVariant: displayedUrl.IconVariant) is { } icon)
             {
-                return @<FluentButton Appearance="Appearance.Lightweight" Title="@displayedUrl.Text" StopPropagation="true" OnClick="@(() => JSRuntime.InvokeAsync<object>("open", displayedUrl.Url, "_blank"))" >
+                return @<FluentButton Appearance="Appearance.Lightweight" Title="@displayedUrl.Text" AriaLabel="@displayedUrl.Text" StopPropagation="true" OnClick="@(() => JSRuntime.InvokeAsync<object>("open", displayedUrl.Url, "_blank"))" >
                             <FluentIcon Value="@icon" Width="16px" Title="@displayedUrl.Text" />
                         </FluentButton>;
             }
-            //<a href="@displayedUrl.Url" target="_blank" @onclick:stopPropagation="true">
+
 
             return @<a href="@displayedUrl.Url" target="_blank" @onclick:stopPropagation="true">@displayedUrl.Text</a>;
         }

src/Aspire.Dashboard/Components/ResourcesGridColumns/UrlsColumnDisplay.razor.cs

@@ -34,6 +34,6 @@ public partial class UrlsColumnDisplay
 
     [Inject]
     public required IJSRuntime JSRuntime { get; init; }
-    
+
     private bool _popoverVisible;
 }

src/Aspire.Dashboard/Model/ResourceViewModel.cs

@@ -430,7 +430,7 @@ public UrlViewModel(string? endpointName, Uri url, bool isInternal, bool isInact
 
 public record UrlDisplayPropertiesViewModel(string DisplayName, int SortOrder, string? IconName, IconVariant? IconVariant)
 {
-    public static readonly UrlDisplayPropertiesViewModel Empty = new(string.Empty, 0, string.Empty, (IconVariant)(-1));
+    public static readonly UrlDisplayPropertiesViewModel Empty = new(string.Empty, 0, string.Empty, null);
 }
 
 public sealed record class VolumeViewModel(int index, string Source, string Target, string MountType, bool IsReadOnly) : IPropertyGridItem

src/Aspire.Hosting/ApplicationModel/CustomResourceSnapshot.cs

@@ -230,7 +230,7 @@ internal void Deconstruct(out string? name, out string url, out bool isInternal,
 /// <param name="SortOrder">The order of the url in UI. Higher numbers are displayed first in the UI.</param>
 /// <param name="IconName">The icon name for the Url. The name should be a valid FluentUI icon name. https://aka.ms/fluentui-system-icons</param>
 /// <param name="IconVariant">The icon variant.</param>
-/// 
+
 public sealed record UrlDisplayPropertiesSnapshot(string DisplayName = "", int SortOrder = 0, string? IconName = null, IconVariant? IconVariant = null);
 
 /// <summary>

src/Aspire.Hosting/ApplicationModel/ResourceUrlAnnotation.cs

@@ -39,12 +39,12 @@ public sealed class ResourceUrlAnnotation : IResourceAnnotation
     /// <summary>
     /// The name of the icon to display with this URL.
     /// </summary>
-    public string IconName { get; set; } = string.Empty;
-    
+    public string? IconName { get; set; }?
+
     /// <summary>
     /// The variant of the icon to display with this URL.
     /// </summary>
-    public IconVariant IconVariant { get; set; } = IconVariant.Regular;
+    public IconVariant? IconVariant { get; set; }
 
     internal bool IsInternal => DisplayLocation == UrlDisplayLocation.DetailsOnly;
 

src/Aspire.Hosting/Dashboard/proto/Partials.cs

@@ -75,7 +75,7 @@ public static Resource FromSnapshot(ResourceSnapshot snapshot)
             {
                 displayProperties.IconVariant = MapIconVariant(urlSnapshot.DisplayProperties.IconVariant);
             }
-            
+
             url.DisplayProperties = displayProperties;
             resource.Urls.Add(url);
         }