Make resource HealthStatus computed from HealthReports

src/Aspire.Dashboard/Model/ResourceStateViewModel.cs

@@ -62,12 +62,6 @@ internal static ResourceStateViewModel GetStateViewModel(ResourceViewModel resou
             icon = new Icons.Filled.Size16.Circle();
             color = Color.Info;
         }
-        else if (resource.HealthStatus is null)
-        {
-            // If we are waiting for a health check, show a progress bar and consider the resource unhealthy
-            icon = new Icons.Filled.Size16.CheckmarkCircleWarning();
-            color = Color.Warning;
-        }
         else if (resource.HealthStatus is not HealthStatus.Healthy)
         {
             icon = new Icons.Filled.Size16.CheckmarkCircleWarning();

src/Aspire.Dashboard/Model/ResourceViewModel.cs

@@ -20,6 +20,9 @@ namespace Aspire.Dashboard.Model;
 [DebuggerDisplay("Name = {Name}, ResourceType = {ResourceType}, State = {State}, Properties = {Properties.Count}")]
 public sealed class ResourceViewModel
 {
+    private readonly ImmutableArray<HealthReportViewModel> _healthReports = [];
+    private readonly KnownResourceState? _knownState;
+
     public required string Name { get; init; }
     public required string ResourceType { get; init; }
     public required string DisplayName { get; init; }
@@ -34,10 +37,45 @@ public sealed class ResourceViewModel
     public required ImmutableArray<VolumeViewModel> Volumes { get; init; }
     public required FrozenDictionary<string, ResourcePropertyViewModel> Properties { get; init; }
     public required ImmutableArray<CommandViewModel> Commands { get; init; }
+
     /// <summary>The health status of the resource. <see langword="null"/> indicates that health status is expected but not yet available.</summary>
-    public required HealthStatus? HealthStatus { get; init; }
-    public required ImmutableArray<HealthReportViewModel> HealthReports { get; init; }
-    public KnownResourceState? KnownState { get; init; }
+    public HealthStatus? HealthStatus { get; private set; }
+
+    public required ImmutableArray<HealthReportViewModel> HealthReports
+    {
+        get => _healthReports;
+        init
+        {
+            _healthReports = value;
+            HealthStatus = ComputeHealthStatus(value, KnownState);
+        }
+    }
+
+    public KnownResourceState? KnownState
+    {
+        get => _knownState;
+        init
+        {
+            _knownState = value;
+            HealthStatus = ComputeHealthStatus(HealthReports, value);
+        }
+    }
+
+    internal static HealthStatus? ComputeHealthStatus(ImmutableArray<HealthReportViewModel> healthReports, KnownResourceState? state)
+    {
+        if (state != KnownResourceState.Running)
+        {
+            return null;
+        }
+
+        return healthReports.Length == 0
+            // If there are no health reports and the resource is running, assume it's healthy.
+            ? Microsoft.Extensions.Diagnostics.HealthChecks.HealthStatus.Healthy
+            // If there are health reports, the health status is the minimum of the health status of the reports.
+            // If any of the reports is null (first health check has not returned), the health status is unhealthy.
+            : healthReports.MinBy(r => r.HealthStatus)?.HealthStatus
+              ?? Microsoft.Extensions.Diagnostics.HealthChecks.HealthStatus.Unhealthy;
+    }
 
     internal bool MatchesFilter(string filter)
     {

src/Aspire.Dashboard/ResourceService/Partials.cs

@@ -49,7 +49,6 @@ public ResourceViewModel ToViewModel(BrowserTimeProvider timeProvider, IKnownPro
                 KnownState = HasState ? Enum.TryParse(State, out KnownResourceState knownState) ? knownState : null : null,
                 StateStyle = HasStateStyle ? StateStyle : null,
                 Commands = GetCommands(),
-                HealthStatus = HasHealthStatus ? MapHealthStatus(HealthStatus) : null,
                 HealthReports = HealthReports.Select(ToHealthReportViewModel).OrderBy(vm => vm.Name).ToImmutableArray(),
             };
         }

src/Aspire.Dashboard/Resources/Resources.resx

@@ -233,7 +233,7 @@
     <value>View console logs</value>
   </data>
   <data name="ResourcesDetailsHealthStateProperty" xml:space="preserve">
-    <value>Health State</value>
+    <value>Health state</value>
   </data>
   <data name="ResourcesDetailsStopTimeProperty" xml:space="preserve">
     <value>Stop time</value>
@@ -262,4 +262,4 @@
   <data name="ResourceActionTelemetryTooltip" xml:space="preserve">
     <value>No telemetry found for this resource.</value>
   </data>
-</root>
+</root>

src/Aspire.Hosting/ApplicationModel/CustomResourceSnapshot.cs

@@ -12,6 +12,9 @@ namespace Aspire.Hosting.ApplicationModel;
 /// </summary>
 public sealed record CustomResourceSnapshot
 {
+    private readonly ImmutableArray<HealthReportSnapshot> _healthReports = [];
+    private readonly ResourceStateSnapshot? _state;
+
     /// <summary>
     /// The type of the resource.
     /// </summary>
@@ -40,7 +43,15 @@ public sealed record CustomResourceSnapshot
     /// <summary>
     /// Represents the state of the resource.
     /// </summary>
-    public ResourceStateSnapshot? State { get; init; }
+    public ResourceStateSnapshot? State
+    {
+        get => _state;
+        init
+        {
+            _state = value;
+            HealthStatus = ComputeHealthStatus(HealthReports, value?.Text);
+        }
+    }
 
     /// <summary>
     /// The exit code of the resource.
@@ -52,11 +63,10 @@ public sealed record CustomResourceSnapshot
     /// </summary>
     /// <remarks>
     /// <para>
-    /// This value is derived from <see cref="HealthReports"/>. If a resource is known to have a health check
-    /// and no reports exist, or if a resource does not have a health check, then this value is <see langword="null"/>.
+    /// This value is derived from <see cref="HealthReports"/>.
     /// </para>
     /// </remarks>
-    public HealthStatus? HealthStatus { get; init; }
+    public HealthStatus? HealthStatus { get; private set; }
 
     /// <summary>
     /// The health reports for this resource.
@@ -65,7 +75,15 @@ public sealed record CustomResourceSnapshot
     /// May be zero or more. If there are no health reports, the resource is considered healthy
     /// so long as no heath checks are registered for the resource.
     /// </remarks>
-    public ImmutableArray<HealthReportSnapshot> HealthReports { get; init; } = [];
+    public ImmutableArray<HealthReportSnapshot> HealthReports
+    {
+        get => _healthReports;
+        init
+        {
+            _healthReports = value;
+            HealthStatus = ComputeHealthStatus(value, State?.Text);
+        }
+    }
 
     /// <summary>
     /// The environment variables that should show up in the dashboard for this resource.
@@ -86,6 +104,22 @@ public sealed record CustomResourceSnapshot
     /// The commands available in the dashboard for this resource.
     /// </summary>
     public ImmutableArray<ResourceCommandSnapshot> Commands { get; init; } = [];
+
+    internal static HealthStatus? ComputeHealthStatus(ImmutableArray<HealthReportSnapshot> healthReports, string? state)
+    {
+        if (state != KnownResourceStates.Running)
+        {
+            return null;
+        }
+
+        return healthReports.Length == 0
+            // If there are no health reports and the resource is running, assume it's healthy.
+            ? Microsoft.Extensions.Diagnostics.HealthChecks.HealthStatus.Healthy
+            // If there are health reports, the health status is the minimum of the health status of the reports.
+            // If any of the reports is null (first health check has not returned), the health status is unhealthy.
+            : healthReports.MinBy(r => r.Status)?.Status
+                ?? Microsoft.Extensions.Diagnostics.HealthChecks.HealthStatus.Unhealthy;
+    }
 }
 
 /// <summary>

src/Aspire.Hosting/ApplicationModel/ResourceNotificationService.cs

@@ -352,7 +352,6 @@ public Task PublishUpdateAsync(IResource resource, string resourceId, Func<Custo
             var newState = stateFactory(previousState);
 
             newState = UpdateCommands(resource, newState);
-            newState = UpdateHealthStatus(resource, newState);
 
             notificationState.LastSnapshot = newState;
 
@@ -377,11 +376,10 @@ public Task PublishUpdateAsync(IResource resource, string resourceId, Func<Custo
             {
                 _logger.LogTrace("Resource {Resource}/{ResourceId} update published: " +
                     "ResourceType = {ResourceType}, CreationTimeStamp = {CreationTimeStamp:s}, State = {{ Text = {StateText}, Style = {StateStyle} }}, " +
-                    "HealthStatus = {HealthStatus} " +
                     "ExitCode = {ExitCode}, EnvironmentVariables = {{ {EnvironmentVariables} }}, Urls = {{ {Urls} }}, " +
                     "Properties = {{ {Properties} }}",
                     resource.Name, resourceId,
-                    newState.ResourceType, newState.CreationTimeStamp, newState.State?.Text, newState.State?.Style, newState.HealthStatus,
+                    newState.ResourceType, newState.CreationTimeStamp, newState.State?.Text, newState.State?.Style,
                     newState.ExitCode, string.Join(", ", newState.EnvironmentVariables.Select(e => $"{e.Name} = {e.Value}")), string.Join(", ", newState.Urls.Select(u => $"{u.Name} = {u.Url}")),
                     string.Join(", ", newState.Properties.Select(p => $"{p.Name} = {p.Value}")));
             }
@@ -390,20 +388,6 @@ public Task PublishUpdateAsync(IResource resource, string resourceId, Func<Custo
         return Task.CompletedTask;
     }
 
-    /// <summary>
-    /// Update resource snapshot health status if the resource is running with no health checks.
-    /// </summary>
-    private static CustomResourceSnapshot UpdateHealthStatus(IResource resource, CustomResourceSnapshot previousState)
-    {
-        // A resource is also healthy if it has no health check annotations and is in the running state.
-        if (previousState.HealthStatus is not HealthStatus.Healthy && !resource.TryGetAnnotationsIncludingAncestorsOfType<HealthCheckAnnotation>(out _) && previousState.State?.Text == KnownResourceStates.Running)
-        {
-            return previousState with { HealthStatus = HealthStatus.Healthy };
-        }
-
-        return previousState;
-    }
-
     /// <summary>
     /// Use command annotations to update resource snapshot.
     /// </summary>

src/Aspire.Hosting/Dashboard/DashboardServiceData.cs

@@ -49,7 +49,6 @@ static GenericResourceSnapshot CreateResourceSnapshot(IResource resource, string
                     ExitCode = snapshot.ExitCode,
                     State = snapshot.State?.Text,
                     StateStyle = snapshot.State?.Style,
-                    HealthStatus = snapshot.HealthStatus,
                     HealthReports = GetOrCreateHealthReports(),
                     Commands = snapshot.Commands
                 };