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 2 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.TryGetExitCode(out _) && (resource.IsFinishedState() || resource.IsExitedState()))
Copy link
Member

@JamesNK JamesNK Apr 2, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is TryGetExitCode here for? Are you making it so there must be a known 0 exit code and if there isn't then show warning?

The concept of exit codes is specific to executable/containers. Other resource types could go into a finished/exited state without specifying one and then show a warning.

Please test these changes with resource types other than executables/containers.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For example,

image

{
// Process completed successfully.
icon = new Icons.Regular.Size16.RecordStop();
Expand Down
3 changes: 3 additions & 0 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 @@ -25,6 +25,9 @@ public class ResourceStateViewModelTests
[InlineData(
/* state */ KnownResourceState.Exited, 3, null, null,
/* expected output */ $"Localized:{nameof(Columns.StateColumnResourceExitedUnexpectedly)}:{ResourceType}+3", "ErrorCircle", Color.Error, "Exited")]
[InlineData(
/* state */ KnownResourceState.Exited, 0, null, null,
/* expected output */ $"Localized:{nameof(Columns.StateColumnResourceExited)}:{ResourceType}", "RecordStop", Color.Info, "Exited")]
[InlineData(
/* state */ KnownResourceState.Finished, 0, null, null,
/* expected output */ $"Localized:{nameof(Columns.StateColumnResourceExited)}:{ResourceType}", "RecordStop", Color.Info, "Finished")]
Expand Down
Loading