More URL fixes (#8749)

* URL fixes

- Show "-" for URLs with no display text & disable visualizer & disable visualizer when URL has no display text (Fixes #8745)
- Show non-HTTP endpoints on Resources Graph (Fixes #8682)

* PR feedback

* Update ResourceDetails.razor

Author: DamianEdwards

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

@@ -79,23 +79,23 @@
                     <AspireTemplateColumn Sortable="true" SortBy="@_urlValueSort" Title="@ControlStringsLoc[nameof(ControlsStrings.LinkAddressColumnHeader)]">
                         <GridValue ValueDescription="@ControlStringsLoc[nameof(ControlsStrings.LinkAddressColumnHeader)]"
                                    Value="@context.OriginalUrlString"
-                                   ValueTemplate="@(_ => RenderUrlValue(context, _filter))"
+                                   ValueTemplate="@(_ => RenderAddressValue(context, _filter))"
                                    EnableHighlighting="@(!string.IsNullOrEmpty(_filter))"
                                    IsMaskedChanged="@(_ => OnValueMaskedChanged(context))"
                                    HighlightText="@_filter" />
                     </AspireTemplateColumn>
                     <AspireTemplateColumn Sortable="true" SortBy="@_urlValueSort" Title="@ControlStringsLoc[nameof(ControlsStrings.LinkTextColumnHeader)]">
                         <GridValue ValueDescription="@ControlStringsLoc[nameof(ControlsStrings.LinkTextColumnHeader)]"
-                                   Value="@context.Text"
+                                   Value="@context.DisplayName"
                                    ValueTemplate="@(_ => RenderTextValue(context, _filter))"
-                                   EnableHighlighting="@(!string.IsNullOrEmpty(_filter))"
+                                   EnableHighlighting="@(!string.IsNullOrEmpty(_filter) && !string.IsNullOrEmpty(context.DisplayName))"
                                    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="@(GridSort<DisplayedUrl>.ByAscending(i => i.Name))" Title="@ControlStringsLoc[nameof(ControlsStrings.EndpointNameColumnHeader)]">
                         <GridValue ValueDescription="@ControlStringsLoc[nameof(ControlsStrings.EndpointNameColumnHeader)]"
                                    Value="@context.Name"
-                                   EnableHighlighting="@(!string.IsNullOrEmpty(_filter) && context.Name != "-")"
+                                   EnableHighlighting="@(!string.IsNullOrEmpty(_filter))"
                                    HighlightText="@_filter" />
                     </AspireTemplateColumn>
                 </FluentDataGrid>
@@ -287,10 +287,10 @@
 </div>
 
 @code {
-    private static RenderFragment RenderUrlValue(DisplayedUrl vm, string filter)
+    private static RenderFragment RenderAddressValue(DisplayedUrl vm, string filter)
     {
-        var highlighting = !string.IsNullOrEmpty(filter) && vm.Text != "-";
-        
+        var highlighting = !string.IsNullOrEmpty(filter);
+
         // If there's no URL, e.g. this is a tcp:// URI, just show the text
         if (vm.Url is null)
         {
@@ -313,21 +313,21 @@
 
     private static RenderFragment RenderTextValue(DisplayedUrl vm, string filter)
     {
-        var highlighting = !string.IsNullOrEmpty(filter) && vm.Text != "-";
+        var highlighting = !string.IsNullOrEmpty(filter) && !string.IsNullOrEmpty(vm.DisplayName);
 
-        // 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))
+        // If there's no DisplayName then show nothing
+        if (string.IsNullOrEmpty(vm.DisplayName))
         {
-            return @<span></span>;
+            return @<span class="empty-data"></span>;
         }
         // Otherwise, render a link with the text as the anchor text & title as the URL
         else
         {
             if (highlighting)
             {
-                return @<a href="@vm.Url" title="@vm.Url" target="_blank"><FluentHighlighter HighlightedText="@filter" Text="@vm.Text" /></a>;
+                return @<a href="@vm.Url" title="@vm.Url" target="_blank"><FluentHighlighter HighlightedText="@filter" Text="@vm.DisplayName" /></a>;
             }
-            return @<a href="@vm.Url" title="@vm.Url" target="_blank">@vm.Text</a>;
+            return @<a href="@vm.Url" title="@vm.Url" target="_blank">@vm.DisplayName</a>;
         }
     }
 }

src/Aspire.Dashboard/Model/ResourceGraph/ResourceGraphMapper.cs

@@ -68,7 +68,7 @@ public static ResourceDto MapResource(ResourceViewModel r, IDictionary<string, R
 
     private static string ResolvedEndpointText(DisplayedUrl? endpoint)
     {
-        var text = endpoint?.Url;
+        var text = endpoint?.OriginalUrlString;
         if (string.IsNullOrEmpty(text))
         {
             return ControlsStrings.ResourceGraphNoEndpoints;

src/Aspire.Dashboard/Model/ResourceUrlHelpers.cs

@@ -35,7 +35,7 @@ public static List<DisplayedUrl> GetUrls(ResourceViewModel resource, bool includ
                     Port = url.Url.Port,
                     Url = url.Url.Scheme is "http" or "https" ? url.Url.OriginalString : null,
                     SortOrder = url.DisplayProperties.SortOrder,
-                    DisplayName = url.DisplayProperties.DisplayName,
+                    DisplayName = string.IsNullOrEmpty(url.DisplayProperties.DisplayName) ? null : url.DisplayProperties.DisplayName,
                     OriginalUrlString = url.Url.OriginalString,
                     Text = string.IsNullOrEmpty(url.DisplayProperties.DisplayName) ? url.Url.OriginalString : url.DisplayProperties.DisplayName
                 });
@@ -69,12 +69,12 @@ public sealed class DisplayedUrl : IPropertyGridItem
     public int? Port { get; set; }
     public string? Url { get; set; }
     public int SortOrder { get; set; }
-    public required string DisplayName { get; set; }
+    public string? DisplayName { get; set; }
     public required string OriginalUrlString { get; set; }
 
     /// <summary>
     /// Don't display a plain string value here. The URL will be displayed as a hyperlink
-    /// in <see cref="ResourceDetails.RenderUrlValue(DisplayedUrl, string)"/> instead.
+    /// in <see cref="ResourceDetails.RenderAddressValue(DisplayedUrl, string)"/> instead.
     /// </summary>
     string? IPropertyGridItem.Value => null;
 
@@ -83,6 +83,8 @@ public sealed class DisplayedUrl : IPropertyGridItem
     public string? ValueToVisualize => Url ?? Text;
 
     public bool MatchesFilter(string filter)
-        => Name.Contains(filter, StringComparison.CurrentCultureIgnoreCase) ||
-           Text.Contains(filter, StringComparison.CurrentCultureIgnoreCase);
+        => Url?.Contains(filter, StringComparison.CurrentCultureIgnoreCase) == true ||
+           Text.Contains(filter, StringComparison.CurrentCultureIgnoreCase) ||
+           Name.Contains(filter, StringComparison.CurrentCultureIgnoreCase) ||
+           DisplayName?.Contains(filter, StringComparison.CurrentCultureIgnoreCase) == true;
 }