Skip to content

Show neutral icon for container exiting with status code 0 #8477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 8, 2025
Merged

Show neutral icon for container exiting with status code 0 #8477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9732674
Show neutral icon for container exiting with status code 0
adamint Apr 1, 2025
f18f4a0
Show info/stop icons for all exited resources with status code 0
adamint Apr 1, 2025
00d2ca4
Add finished test for custom resource, remove exit code expectation
adamint Apr 3, 2025
578c616
update tests
adamint Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/Aspire.Dashboard/Extensions/ResourceViewModelExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ public static bool IsFinishedState(this ResourceViewModel resource)
return resource.KnownState is KnownResourceState.Finished;
}

public static bool IsExitedState(this ResourceViewModel resource)
{
return resource.KnownState is KnownResourceState.Exited;
}

public static bool IsStopped(this ResourceViewModel resource)
{
return resource.KnownState is KnownResourceState.Exited or KnownResourceState.Finished or KnownResourceState.FailedToStart;
Expand Down
2 changes: 1 addition & 1 deletion src/Aspire.Dashboard/Model/ResourceStateViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ private static (Icon icon, Color color) GetStateIcon(ResourceViewModel resource)
icon = new Icons.Filled.Size16.ErrorCircle();
color = Color.Error;
}
else if (resource.IsFinishedState())
else if (resource.IsFinishedState() || resource.IsExitedState())
{
// Process completed successfully.
icon = new Icons.Regular.Size16.RecordStop();
Expand Down
39 changes: 22 additions & 17 deletions tests/Aspire.Dashboard.Tests/Model/ResourceStateViewModelTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,45 +15,50 @@ namespace Aspire.Dashboard.Tests.Model;

public class ResourceStateViewModelTests
{
private const string ResourceType = "Container";

[Theory]
// Resource is no longer running
[InlineData(
/* state */ KnownResourceState.Exited, null, null,null,
/* expected output */ $"Localized:{nameof(Columns.StateColumnResourceExited)}:{ResourceType}", "Warning", Color.Warning, "Exited")]
/* state */ "Container", KnownResourceState.Exited, null, null,null,
/* expected output */ $"Localized:{nameof(Columns.StateColumnResourceExited)}:Container", "RecordStop", Color.Info, "Exited")]
[InlineData(
/* state */ "Container", KnownResourceState.Exited, 3, null, null,
/* expected output */ $"Localized:{nameof(Columns.StateColumnResourceExitedUnexpectedly)}:Container+3", "ErrorCircle", Color.Error, "Exited")]
[InlineData(
/* state */ "Container", KnownResourceState.Exited, 0, null, null,
/* expected output */ $"Localized:{nameof(Columns.StateColumnResourceExited)}:Container", "RecordStop", Color.Info, "Exited")]
[InlineData(
/* state */ KnownResourceState.Exited, 3, null, null,
/* expected output */ $"Localized:{nameof(Columns.StateColumnResourceExitedUnexpectedly)}:{ResourceType}+3", "ErrorCircle", Color.Error, "Exited")]
/* state */ "Container", KnownResourceState.Finished, 0, null, null,
/* expected output */ $"Localized:{nameof(Columns.StateColumnResourceExited)}:Container", "RecordStop", Color.Info, "Finished")]
[InlineData(
/* state */ KnownResourceState.Finished, 0, null, null,
/* expected output */ $"Localized:{nameof(Columns.StateColumnResourceExited)}:{ResourceType}", "RecordStop", Color.Info, "Finished")]
/* state */ "CustomResource", KnownResourceState.Finished, null, null, null,
/* expected output */ $"Localized:{nameof(Columns.StateColumnResourceExited)}:CustomResource", "RecordStop", Color.Info, "Finished")]
[InlineData(
/* state */ KnownResourceState.Unknown, null, null, null,
/* state */ "Container", KnownResourceState.Unknown, null, null, null,
/* expected output */ "Unknown", "CircleHint", Color.Info, "Unknown")]
// Health checks
[InlineData(
/* state */ KnownResourceState.Running, null, "Healthy", null,
/* state */ "Container", KnownResourceState.Running, null, "Healthy", null,
/* expected output */ "Running", "CheckmarkCircle", Color.Success, "Running")]
[InlineData(
/* state */ KnownResourceState.Running, null, "", null,
/* state */ "Container", KnownResourceState.Running, null, "", null,
/* expected output */ $"Localized:{nameof(Columns.RunningAndUnhealthyResourceStateToolTip)}", "CheckmarkCircleWarning", Color.Warning, "Running (Unhealthy)")]
[InlineData(
/* state */ KnownResourceState.Running, null, "Unhealthy", null,
/* state */ "Container", KnownResourceState.Running, null, "Unhealthy", null,
/* expected output */ $"Localized:{nameof(Columns.RunningAndUnhealthyResourceStateToolTip)}", "CheckmarkCircleWarning", Color.Warning, "Running (Unhealthy)")]
[InlineData(
/* state */ KnownResourceState.Running, null, "Healthy", "warning",
/* state */ "Container", KnownResourceState.Running, null, "Healthy", "warning",
/* expected output */ "Running", "Warning", Color.Warning, "Running")]
[InlineData(
/* state */ KnownResourceState.Running, null, "Healthy", "NOT_A_VALID_STATE_STYLE",
/* state */ "Container", KnownResourceState.Running, null, "Healthy", "NOT_A_VALID_STATE_STYLE",
/* expected output */ "Running", "Circle", Color.Neutral, "Running")]
[InlineData(
/* state */ KnownResourceState.Running, null, null, "info",
/* state */ "Container", KnownResourceState.Running, null, null, "info",
/* expected output */ "Running", "Info", Color.Info, "Running")]
[InlineData(
/* state */ KnownResourceState.RuntimeUnhealthy, null, null, null,
/* state */ "Container", KnownResourceState.RuntimeUnhealthy, null, null, null,
/* expected output */ $"Localized:{nameof(Columns.StateColumnResourceContainerRuntimeUnhealthy)}", "Warning", Color.Warning, "Runtime unhealthy")]
public void ResourceViewModel_ReturnsCorrectIconAndTooltip(
string resourceType,
KnownResourceState state,
int? exitCode,
string? healthStatusString,
Expand All @@ -76,7 +81,7 @@ public void ResourceViewModel_ReturnsCorrectIconAndTooltip(
reportHealthStatus: healthStatus,
createNullHealthReport: healthStatusString == "",
stateStyle: stateStyle,
resourceType: ResourceType,
resourceType: resourceType,
properties: propertiesDictionary);

if (exitCode is not null)
Expand Down
Loading