Port 1344 and 1398 to main (#1401)

Author: tlmii

src/Aspire.Dashboard/Components/Pages/Resources.razor

@@ -65,7 +65,7 @@
                         <SourceColumnDisplay Resource="context" FilterText="@_filter" />
                     </TemplateColumn>
                     <TemplateColumn Title="@Loc[Dashboard.Resources.Resources.ResourcesEnvironmentVariablesGridEndpointsColumnHeader]">
-                        <EndpointsColumnDisplay Resource="context" />
+                        <EndpointsColumnDisplay Resource="context" HasMultipleReplicas="HasMultipleReplicas(context)" />
                     </TemplateColumn>
                     <TemplateColumn Title="@Loc[Dashboard.Resources.Resources.ResourcesEnvironmentVariablesGridEnvironmentColumnHeader]" Sortable="false">
                         <FluentButton Appearance="Appearance.Lightweight"

src/Aspire.Dashboard/Components/Pages/Resources.razor.cs

@@ -165,6 +165,24 @@ private async Task OnResourceListChanged(ResourceChangeType changeType, Resource
 
     private string GetResourceName(ResourceViewModel resource) => ResourceViewModel.GetResourceName(resource, _resourcesMap.Values);
 
+    private bool HasMultipleReplicas(ResourceViewModel resource)
+    {
+        var count = 0;
+        foreach (var item in _resourcesMap.Values)
+        {
+            if (item.DisplayName == resource.DisplayName)
+            {
+                count++;
+                if (count >= 2)
+                {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
     protected virtual void Dispose(bool disposing)
     {
         if (disposing)

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

@@ -11,9 +11,17 @@
     else
     {
         @* If we have any, regardless of the state, go ahead and display them *@
-        foreach (var endpoint in Resource.Endpoints.OrderBy(e => e))
+        foreach (var endpoint in Resource.Endpoints.OrderBy(e => e.ProxyUrl))
         {
-            <a href="@endpoint" target="_blank" class="long-inner-content">@endpoint</a>
+            if (HasMultipleReplicas)
+            {
+                <a href="@endpoint.ProxyUrl" target="_blank" class="long-inner-content">@endpoint.ProxyUrl</a>
+                <span class="long-inner-content">(<a href="@endpoint.EndpointUrl" target="_blank">@endpoint.EndpointUrl</a>)</span>
+            }
+            else
+            {
+                <a href="@endpoint.ProxyUrl" target="_blank" class="long-inner-content">@endpoint.ProxyUrl</a>
+            }
         }
         @* If we're expecting more, say Starting..., unless the app isn't running anymore *@
         if (Resource.State != FinishedState
@@ -32,4 +40,7 @@
 
     [Parameter, EditorRequired]
     public required ResourceViewModel Resource { get; set; }
+
+    [Parameter, EditorRequired]
+    public required bool HasMultipleReplicas { get; set; }
 }

src/Aspire.Dashboard/Model/ResourceViewModel.cs

@@ -18,7 +18,7 @@ public abstract class ResourceViewModel
     public required DateTime? CreationTimeStamp { get; init; }
     public required ImmutableArray<EnvironmentVariableViewModel> Environment { get; init; }
     public required ILogSource LogSource { get; init; }
-    public required ImmutableArray<string> Endpoints { get; init; }
+    public required ImmutableArray<EndpointViewModel> Endpoints { get; init; }
     public required ImmutableArray<ResourceServiceSnapshot> Services { get; init; }
     public required int? ExpectedEndpointsCount { get; init; }
 
@@ -55,3 +55,5 @@ public sealed class ResourceServiceSnapshot(string name, string? allocatedAddres
     public int? AllocatedPort { get; } = allocatedPort;
     public string AddressAndPort { get; } = $"{allocatedAddress}:{allocatedPort}";
 }
+
+public sealed record EndpointViewModel(string EndpointUrl, string ProxyUrl);

src/Aspire.Hosting/Dashboard/DcpDataSource.cs

@@ -237,12 +237,12 @@ private ExecutableViewModel ToSnapshot(Executable executable)
         };
     }
 
-    private (ImmutableArray<string> Endpoints, ImmutableArray<ResourceServiceSnapshot> Services) GetEndpointsAndServices(
+    private (ImmutableArray<EndpointViewModel> Endpoints, ImmutableArray<ResourceServiceSnapshot> Services) GetEndpointsAndServices(
         CustomResource resource,
         string resourceKind,
         string? projectPath = null)
     {
-        var endpoints = ImmutableArray.CreateBuilder<string>();
+        var endpoints = ImmutableArray.CreateBuilder<EndpointViewModel>();
         var services = ImmutableArray.CreateBuilder<ResourceServiceSnapshot>();
         var name = resource.Metadata.Name;
 
@@ -258,6 +258,7 @@ private ExecutableViewModel ToSnapshot(Executable executable)
                 && service?.UsesHttpProtocol(out var uriScheme) == true)
             {
                 var endpointString = $"{uriScheme}://{endpoint.Spec.Address}:{endpoint.Spec.Port}";
+                var proxyUrlString = $"{uriScheme}://{service.AllocatedAddress}:{service.AllocatedPort}";
 
                 // For project look into launch profile to append launch url
                 if (projectPath is not null
@@ -269,6 +270,7 @@ private ExecutableViewModel ToSnapshot(Executable executable)
                     {
                         // This is relative URL
                         endpointString += $"/{launchUrl}";
+                        proxyUrlString += $"/{launchUrl}";
                     }
                     else
                     {
@@ -277,13 +279,14 @@ private ExecutableViewModel ToSnapshot(Executable executable)
                             && launchUrl.StartsWith(applicationUrl))
                         {
                             endpointString = launchUrl.Replace(applicationUrl, endpointString);
+                            proxyUrlString = launchUrl;
                         }
                     }
 
                     // If we cannot process launchUrl then we just show endpoint string
                 }
 
-                endpoints.Add(endpointString);
+                endpoints.Add(new(endpointString, proxyUrlString));
             }
         }