Skip to content

Add command & args to container source column #1205

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 2 commits into from
Dec 6, 2023
Merged

Add command & args to container source column #1205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4ee9c9
Add command & args to container source column
adamint Dec 5, 2023
c4dfbe3
Put container args on second line
Dec 6, 2023
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
11 changes: 11 additions & 0 deletions src/Aspire.Dashboard/Components/ResourcesGridColumns/SourceColumnDisplay.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,17 @@ else if (Resource is ContainerViewModel containerViewModel)
<span class="subtext" title="@title" aria-label="@title">@ports</span>
}
</FluentStack>
<FluentStack Orientation="Orientation.Horizontal">
@if (containerViewModel.Command is not null)
{
<div class="ellipsis-overflow" title="Container command" aria-label="Container command">Command: @containerViewModel.Command</div>
}
@if (containerViewModel.Args is not null)
{
var args = string.Join(" ", containerViewModel.Args);
<div class="ellipsis-overflow" title="Container args" aria-label="Container args">@args</div>
}
</FluentStack>
}

@code {
Expand Down
2 changes: 2 additions & 0 deletions src/Aspire.Dashboard/Model/ContainerViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ public class ContainerViewModel : ResourceViewModel
public 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; }
}
4 changes: 3 additions & 1 deletion src/Aspire.Hosting/Dashboard/DashboardViewModelService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,9 @@ private ContainerViewModel ConvertToContainerViewModel(Container container, List
Image = container.Spec.Image!,
LogSource = new DockerContainerLogSource(container.Status!.ContainerId!),
State = container.Status?.State,
ExpectedEndpointsCount = GetExpectedEndpointsCount(_servicesMap.Values, container)
ExpectedEndpointsCount = GetExpectedEndpointsCount(_servicesMap.Values, container),
Command = container.Spec.Command,
Args = container.Spec.Args
};

if (container.Spec.Ports != null)
Expand Down