Merge branch 'main' into add-resource-server-proto

Author: drewnoakes

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

@@ -187,15 +187,12 @@ private async Task HandleSelectedOptionChangedAsync()
         NavigationManager.NavigateTo($"/ConsoleLogs/{_selectedOption?.Value}");
     }
 
-    private async Task OnResourceListChangedAsync(ObjectChangeType changeType, ResourceViewModel resourceViewModel)
+    private async Task OnResourceListChangedAsync(ResourceChangeType changeType, ResourceViewModel resourceViewModel)
     {
-        if (changeType == ObjectChangeType.Added)
-        {
-            _resourceNameMapping[resourceViewModel.Name] = resourceViewModel;
-        }
-        else if (changeType == ObjectChangeType.Modified)
+        if (changeType == ResourceChangeType.Upsert)
         {
             _resourceNameMapping[resourceViewModel.Name] = resourceViewModel;
+
             if (string.Equals(_selectedResource?.Name, resourceViewModel.Name, StringComparison.Ordinal))
             {
                 _selectedResource = resourceViewModel;
@@ -210,9 +207,10 @@ private async Task OnResourceListChangedAsync(ObjectChangeType changeType, Resou
                 }
             }
         }
-        else if (changeType == ObjectChangeType.Deleted)
+        else if (changeType == ResourceChangeType.Deleted)
         {
             _resourceNameMapping.Remove(resourceViewModel.Name);
+
             if (string.Equals(_selectedResource?.Name, resourceViewModel.Name, StringComparison.Ordinal))
             {
                 _selectedOption = _noSelection;

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

@@ -130,7 +130,7 @@ private int GetUnviewedErrorCount(ResourceViewModel resource)
 
     private void ShowEnvironmentVariables(ResourceViewModel resource)
     {
-        if (SelectedEnvironmentVariables == resource.Environment)
+        if (SelectedResource == resource)
         {
             ClearSelectedResource();
         }
@@ -147,19 +147,15 @@ private void ClearSelectedResource()
         SelectedResource = null;
     }
 
-    private async Task OnResourceListChanged(ObjectChangeType objectChangeType, ResourceViewModel resource)
+    private async Task OnResourceListChanged(ResourceChangeType changeType, ResourceViewModel resource)
     {
-        switch (objectChangeType)
+        switch (changeType)
         {
-            case ObjectChangeType.Added:
-                _resourcesMap.Add(resource.Name, resource);
-                break;
-
-            case ObjectChangeType.Modified:
+            case ResourceChangeType.Upsert:
                 _resourcesMap[resource.Name] = resource;
                 break;
 
-            case ObjectChangeType.Deleted:
+            case ResourceChangeType.Deleted:
                 _resourcesMap.Remove(resource.Name);
                 break;
         }

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

@@ -2,7 +2,7 @@
 
 <FluentStack Orientation="Orientation.Vertical">
     @* If we have no endpoints, and the app isn't running anymore or we're not expecting any, then just say None *@
-    @if (Resource.Endpoints.Count == 0 && (Resource.State == FinishedState || Resource.ExpectedEndpointsCount == 0))
+    @if (Resource.Endpoints.Length == 0 && (Resource.State == FinishedState || Resource.ExpectedEndpointsCount == 0))
     {
         <span class="long-inner-content">None</span>
     }
@@ -15,7 +15,7 @@
         }
         @* If we're expecting more, say Starting..., unless the app isn't running anymore *@
         if (Resource.State != FinishedState
-        && (Resource.ExpectedEndpointsCount is null || Resource.ExpectedEndpointsCount > Resource.Endpoints.Count))
+        && (Resource.ExpectedEndpointsCount is null || Resource.ExpectedEndpointsCount > Resource.Endpoints.Length))
         {
             <span class="long-inner-content">Starting...</span>
         }

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

@@ -2,12 +2,7 @@
 
 <FluentStack Orientation="Orientation.Horizontal" VerticalAlignment="VerticalAlignment.Center">
     <span><FluentHighlighter HighlightedText="@FilterText" Text="@FormatName(Resource)" /></span>
-    @if (Resource is ProjectViewModel projectViewModel)
-    {
-        var title = $"Process ID: {projectViewModel.ProcessId}";
-        <span class="subtext" title="@title" aria-label="@title">@projectViewModel.ProcessId</span>
-    }
-    else if (Resource is ContainerViewModel containerViewModel)
+    @if (Resource is ContainerViewModel containerViewModel)
     {
         <div class="subtext">
             <GridValue Value="@containerViewModel.ContainerId"
@@ -19,6 +14,7 @@
     }
     else if (Resource is ExecutableViewModel executableViewModel)
     {
+        // NOTE projects are also executables, so this will handle both
         var title = $"Process ID: {executableViewModel.ProcessId}";
         <span class="subtext" title="@title" aria-label="@title">@executableViewModel.ProcessId</span>
     }

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

@@ -3,6 +3,7 @@
 
 @if (Resource is ProjectViewModel projectViewModel)
 {
+    // NOTE projects are also executables, so we have to check for projects first
     <span title="@projectViewModel.ProjectPath" aria-label="@projectViewModel.ProjectPath">@Path.GetFileName(projectViewModel.ProjectPath)</span>
 }
 else if (Resource is ExecutableViewModel executableViewModel)
@@ -18,9 +19,9 @@ else if (Resource is ContainerViewModel containerViewModel)
     var ports = string.Join("; ", containerViewModel.Ports);
     <FluentStack Orientation="Orientation.Horizontal">
         <span title="@containerViewModel.Image"><FluentHighlighter HighlightedText="@FilterText" Text="@containerViewModel.Image" /></span>
-        @if (containerViewModel.Ports.Count > 0)
+        @if (containerViewModel.Ports.Length > 0)
         {
-            var title = $"Port{(containerViewModel.Ports.Count > 1 ? "s" : string.Empty)}: {ports}";
+            var title = $"Port{(containerViewModel.Ports.Length > 1 ? "s" : string.Empty)}: {ports}";
             <span class="subtext" title="@title" aria-label="@title">@ports</span>
         }
     </FluentStack>

src/Aspire.Dashboard/Model/ContainerViewModel.cs

@@ -1,18 +1,23 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Collections.Immutable;
 using Aspire.Dashboard.Extensions;
 
 namespace Aspire.Dashboard.Model;
 
+/// <summary>
+/// Immutable snapshot of container state at a point in time.
+/// </summary>
 public class ContainerViewModel : ResourceViewModel
 {
     public override string ResourceType => "Container";
-    public string? ContainerId { get; init; }
+
+    public required string? ContainerId { get; init; }
     public required string Image { get; init; }
-    public List<int> Ports { get; } = new();
-    public string? Command { get; init; }
-    public List<string>? Args { get; init; }
+    public required ImmutableArray<int> Ports { get; init; }
+    public required string? Command { get; init; }
+    public required ImmutableArray<string>? Args { get; init; }
 
     internal override bool MatchesFilter(string filter)
     {

src/Aspire.Dashboard/Model/ExecutableViewModel.cs

@@ -1,14 +1,20 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Collections.Immutable;
+
 namespace Aspire.Dashboard.Model;
 
+/// <summary>
+/// Immutable snapshot of executable state at a point in time.
+/// </summary>
 public class ExecutableViewModel : ResourceViewModel
 {
     public override string ResourceType => "Executable";
-    public int? ProcessId { get; init; }
-    public string? ExecutablePath { get; set; }
-    public string? WorkingDirectory { get; set; }
-    public List<string>? Arguments { get; set; }
+
+    public required int? ProcessId { get; init; }
+    public required string? ExecutablePath { get; init; }
+    public required string? WorkingDirectory { get; init; }
+    public required ImmutableArray<string>? Arguments { get; init; }
 }
 

src/Aspire.Dashboard/Model/ObjectChangeType.cs

@@ -3,9 +3,12 @@
 
 namespace Aspire.Dashboard.Model;
 
-public class ProjectViewModel : ResourceViewModel
+/// <summary>
+/// Immutable snapshot of project state at a point in time.
+/// </summary>
+public class ProjectViewModel : ExecutableViewModel
 {
     public override string ResourceType => "Project";
-    public int? ProcessId { get; init; }
+
     public required string ProjectPath { get; init; }
 }

src/Aspire.Dashboard/Model/ProjectViewModel.cs

@@ -3,4 +3,4 @@
 
 namespace Aspire.Dashboard.Model;
 
-public sealed record ResourceChange(ObjectChangeType ObjectChangeType, ResourceViewModel Resource);
+public sealed record ResourceChange(ResourceChangeType ChangeType, ResourceViewModel Resource);