Custom URLs improvements

playground/TestShop/TestShop.AppHost/Program.cs

@@ -66,7 +66,12 @@
        .WithExternalHttpEndpoints()
        .WithReference(basketService)
        .WithReference(catalogService)
-       .WithUrls(c => c.Urls.ForEach(u => u.DisplayText = $"Online store ({u.Endpoint?.EndpointName})"));
+       // Modify the display text of the URLs
+       .WithUrls(c => c.Urls.ForEach(u => u.DisplayText = $"Online store ({u.Endpoint?.EndpointName})"))
+       // Don't show the non-HTTPS link on the resources page (details only)
+       .WithUrlForEndpoint("http", url => url.ShowOnResourcesPage = false)
+       // Add health relative URL (show in details only)
+       .WithUrlForEndpoint("https", ep => new() { Url = "/health", DisplayText = "Health", ShowOnResourcesPage = false });
 
 var _ = frontend.GetEndpoint("https").Exists ? frontend.WithHttpsHealthCheck("/health") : frontend.WithHttpHealthCheck("/health");
 

src/Aspire.Dashboard/Components/Controls/ResourceDetails.razor

@@ -74,17 +74,25 @@
                                 ResizeType="DataGridResizeType.Discrete"
                                 Style="width:100%"
                                 RowSize="DataGridRowSize.Medium"
-                                GridTemplateColumns="1fr 1.5fr"
+                                GridTemplateColumns="1fr 1fr 0.5fr"
                                 ShowHover="true">
-                    <AspireTemplateColumn Sortable="true" SortBy="@_urlValueSort" Title="@ControlStringsLoc[nameof(ControlsStrings.LinkColumnHeader)]">
-                        <GridValue ValueDescription="@ControlStringsLoc[nameof(ControlsStrings.LinkColumnHeader)]"
+                    <AspireTemplateColumn Sortable="true" SortBy="@_urlValueSort" Title="@ControlStringsLoc[nameof(ControlsStrings.LinkAddressColumnHeader)]">
+                        <GridValue ValueDescription="@ControlStringsLoc[nameof(ControlsStrings.LinkAddressColumnHeader)]"
                                    Value="@context.OriginalUrlString"
                                    ValueTemplate="@(_ => RenderUrlValue(context, _filter))"
                                    EnableHighlighting="@(!string.IsNullOrEmpty(_filter))"
                                    IsMaskedChanged="@(_ => OnValueMaskedChanged(context))"
                                    HighlightText="@_filter" />
                     </AspireTemplateColumn>
-                                <AspireTemplateColumn Sortable="true" SortBy="@(GridSort<DisplayedUrl>.ByAscending(i => i.DisplayName))" Title="@ControlStringsLoc[nameof(ControlsStrings.EndpointNameColumnHeader)]">
+                    <AspireTemplateColumn Sortable="true" SortBy="@_urlValueSort" Title="@ControlStringsLoc[nameof(ControlsStrings.LinkTextColumnHeader)]">
+                        <GridValue ValueDescription="@ControlStringsLoc[nameof(ControlsStrings.LinkTextColumnHeader)]"
+                                   Value="@context.Text"
+                                   ValueTemplate="@(_ => RenderTextValue(context, _filter))"
+                                   EnableHighlighting="@(!string.IsNullOrEmpty(_filter))"
+                                   IsMaskedChanged="@(_ => OnValueMaskedChanged(context))"
+                                   HighlightText="@_filter" />
+                    </AspireTemplateColumn>
+                    <AspireTemplateColumn Sortable="true" SortBy="@(GridSort<DisplayedUrl>.ByAscending(i => i.DisplayName))" Title="@ControlStringsLoc[nameof(ControlsStrings.EndpointNameColumnHeader)]">
                         <GridValue ValueDescription="@ControlStringsLoc[nameof(ControlsStrings.EndpointNameColumnHeader)]"
                                    Value="@context.Name"
                                    EnableHighlighting="@(!string.IsNullOrEmpty(_filter) && context.Name != "-")"
@@ -292,15 +300,26 @@
             }
             return @<span>@vm.Text</span>;
         }
-        // If the URL and text are the same, render a link for the URL
-        else if (string.Equals(vm.Url, vm.Text, StringComparison.Ordinal))
+        // Otherwise, render a link for the URL
+        else
         {
             if (highlighting)
             {
                 return @<a href="@vm.Url" target="_blank"><FluentHighlighter HighlightedText="@filter" Text="@vm.Url" /></a>;
             }
             return @<a href="@vm.Url" target="_blank">@vm.Url</a>;
         }
+    }
+
+    private static RenderFragment RenderTextValue(DisplayedUrl vm, string filter)
+    {
+        var highlighting = !string.IsNullOrEmpty(filter) && vm.Text != "-";
+
+        // If there's no URL, e.g. this is a tcp:// URI, show nothing, or URL is same as Text, then show nothing
+        if (vm.Url is null || string.Equals(vm.Url, vm.Text, StringComparison.Ordinal))
+        {
+            return @<span></span>;
+        }
         // Otherwise, render a link with the text as the anchor text & title as the URL
         else
         {

src/Aspire.Dashboard/Resources/ControlsStrings.resx

@@ -466,8 +466,8 @@
   <data name="EndpointNameColumnHeader" xml:space="preserve">
     <value>Endpoint name</value>
   </data>
-  <data name="LinkColumnHeader" xml:space="preserve">
-    <value>Link</value>
+  <data name="LinkAddressColumnHeader" xml:space="preserve">
+    <value>Address</value>
   </data>
   <data name="ResourceGraphNoEndpoints" xml:space="preserve">
     <value>No endpoints</value>
@@ -484,4 +484,7 @@
   <data name="TotalItemsFooterCapturePaused" xml:space="preserve">
     <value>Capture paused</value>
   </data>
+  <data name="LinkTextColumnHeader" xml:space="preserve">
+    <value>Text</value>
+  </data>
 </root>

src/Aspire.Hosting/ApplicationModel/CustomResourceSnapshot.cs

@@ -172,11 +172,11 @@ public sealed record ResourceStateSnapshot(string Text, string? Style)
 public sealed record EnvironmentVariableSnapshot(string Name, string? Value, bool IsFromSpec);
 
 /// <summary>
-/// A snapshot of the url.
+/// A snapshot of the URL.
 /// </summary>
-/// <param name="Name">Name of the endpoint associated with the url.</param>
-/// <param name="Url">The full uri.</param>
-/// <param name="IsInternal">Determines if this url is internal.</param>
+/// <param name="Name">Name of the endpoint associated with the URL.</param>
+/// <param name="Url">The full URL.</param>
+/// <param name="IsInternal">Determines if this URL is internal. Internal URLs are only shown in the details grid for a resource.</param>
 [DebuggerDisplay("{Url}", Name = "{Name}")]
 public sealed record UrlSnapshot(string? Name, string Url, bool IsInternal)
 {

src/Aspire.Hosting/ApplicationModel/ResourceUrlAnnotation.cs

@@ -30,4 +30,24 @@ public sealed class ResourceUrlAnnotation : IResourceAnnotation
     /// The display order the URL. Higher values mean sort higher in the list.
     /// </summary>
     public int? DisplayOrder;
+
+    /// <summary>
+    /// Whether this URL should be shown on the dashboard resources page. Defaults to <see langword="true"/>.
+    /// </summary>
+    /// <remarks>
+    /// Set this to <see langword="false"/> to only show this URL in the resource details grid.
+    /// </remarks>
+    public bool ShowOnResourcesPage { get; set; } = true;
+
+    internal ResourceUrlAnnotation WithEndpoint(EndpointReference endpoint)
+    {
+        return new()
+        {
+            Url = Url,
+            DisplayText = DisplayText,
+            Endpoint = endpoint,
+            DisplayOrder = DisplayOrder,
+            ShowOnResourcesPage = ShowOnResourcesPage
+        };
+    }
 }