Show waiting dependency details in dashboard #17089
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| @using Aspire.Dashboard.Resources | ||
|
adamint marked this conversation as resolved.
Outdated
|
||
| @using Aspire.Dashboard.Utils | ||
|
|
||
| @if (_waitingResources.Count == 0) | ||
| { | ||
| <FluentHighlighter HighlightedText="@HighlightText" Text="@Value" /> | ||
| } | ||
| else | ||
| { | ||
| <FluentHighlighter HighlightedText="@HighlightText" Text="@_prefix" /> | ||
| @for (var index = 0; index < _waitingResources.Count; index++) | ||
| { | ||
| var waitingResource = _waitingResources[index]; | ||
|
|
||
| if (index > 0) | ||
| { | ||
| <span>, </span> | ||
| } | ||
|
|
||
| if (waitingResource.Resource is { } resource) | ||
| { | ||
| <FluentAnchor Href="@DashboardUrls.ResourcesUrl(resource: resource.Name)" Appearance="Appearance.Hypertext"> | ||
| <FluentHighlighter HighlightedText="@HighlightText" Text="@waitingResource.DisplayName" /> | ||
| </FluentAnchor> | ||
| } | ||
| else | ||
| { | ||
| <FluentHighlighter HighlightedText="@HighlightText" Text="@waitingResource.DisplayName" /> | ||
| } | ||
| } | ||
| <FluentHighlighter HighlightedText="@HighlightText" Text="@_suffix" /> | ||
| } | ||
|
|
||
| @if (StartCommand is not null) | ||
| { | ||
| <span> </span> | ||
| <button type="button" | ||
| class="state-description-action" | ||
| disabled="@IsStartCommandDisabled" | ||
| @onclick="OnStartCommandAsync" | ||
| title="@StartCommandTitle"> | ||
| <FluentIcon Value="@(new Icons.Filled.Size16.Play())" Width="0.8em" Class="state-description-action-icon" /> | ||
| <FluentHighlighter HighlightedText="@HighlightText" Text="@ControlsLoc[nameof(ControlsStrings.ResourceStateDescriptionStartNowAction)]" /> | ||
| </button> | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,143 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using Aspire.Dashboard.Model; | ||
| using Aspire.Dashboard.Resources; | ||
| using Microsoft.AspNetCore.Components; | ||
| using Microsoft.Extensions.Localization; | ||
|
|
||
| namespace Aspire.Dashboard.Components.Controls.PropertyValues; | ||
|
|
||
| public partial class ResourceStateDescriptionValue | ||
| { | ||
| private const string WaitingResourcePlaceholder = "{0}"; | ||
| private string _prefix = string.Empty; | ||
| private string _suffix = string.Empty; | ||
| private List<WaitingResource> _waitingResources = []; | ||
| private CommandViewModel? StartCommand { get; set; } | ||
| private bool IsStartCommandDisabled => StartCommand is null || StartCommand.State == CommandViewModelState.Disabled || OnExecuteCommandAsync is null || IsStartCommandExecuting; | ||
| private bool IsStartCommandExecuting => StartCommand is not null && (IsCommandExecuting?.Invoke(Resource, StartCommand) ?? false); | ||
| private string StartCommandTitle => StartCommand?.GetDisplayDescription() ?? StartCommand?.GetDisplayName() ?? string.Empty; | ||
|
|
||
| [Parameter, EditorRequired] | ||
| public required string Value { get; set; } | ||
|
|
||
| [Parameter, EditorRequired] | ||
| public required string HighlightText { get; set; } | ||
|
|
||
| [Parameter, EditorRequired] | ||
| public required ResourceViewModel Resource { get; set; } | ||
|
|
||
| [Parameter, EditorRequired] | ||
| public required IDictionary<string, ResourceViewModel> ResourceByName { get; set; } | ||
|
|
||
| [Parameter] | ||
| public bool ShowHiddenResources { get; set; } | ||
|
|
||
| [Parameter] | ||
| public Func<ResourceViewModel, CommandViewModel, Task>? OnExecuteCommandAsync { get; set; } | ||
|
|
||
| [Parameter] | ||
| public Func<ResourceViewModel, CommandViewModel, bool>? IsCommandExecuting { get; set; } | ||
|
|
||
| [Inject] | ||
| public required IStringLocalizer<Columns> Loc { get; init; } | ||
|
|
||
| [Inject] | ||
| public required IStringLocalizer<ControlsStrings> ControlsLoc { get; init; } | ||
|
|
||
| protected override void OnParametersSet() | ||
| { | ||
| _waitingResources = []; | ||
| _prefix = string.Empty; | ||
| _suffix = string.Empty; | ||
| StartCommand = GetVisibleStartCommand(); | ||
|
|
||
| if (!Resource.TryGetWaitingForDependencies(out var dependencies)) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| var waitingResourceNames = string.Join(", ", dependencies); | ||
| if (!TrySplitWaitingForFormat(waitingResourceNames, out _prefix, out _suffix)) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| foreach (var dependency in dependencies) | ||
| { | ||
| if (TryGetVisibleResource(dependency, out var resource)) | ||
| { | ||
| _waitingResources.Add(new WaitingResource(resource, ResourceViewModel.GetResourceName(resource, ResourceByName))); | ||
| } | ||
| else | ||
| { | ||
| _waitingResources.Add(new WaitingResource(null, dependency)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private bool TrySplitWaitingForFormat(string waitingResourceNames, out string prefix, out string suffix) | ||
| { | ||
| var format = Loc[nameof(Columns.StateColumnResourceWaitingFor)].Value; | ||
| var placeholderIndex = format.IndexOf(WaitingResourcePlaceholder, StringComparison.Ordinal); | ||
|
|
||
| if (placeholderIndex >= 0) | ||
| { | ||
| prefix = format[..placeholderIndex]; | ||
| suffix = format[(placeholderIndex + WaitingResourcePlaceholder.Length)..]; | ||
| return true; | ||
| } | ||
|
|
||
| var resourceNamesIndex = Value.IndexOf(waitingResourceNames, StringComparison.Ordinal); | ||
| if (resourceNamesIndex >= 0) | ||
| { | ||
| prefix = Value[..resourceNamesIndex]; | ||
| suffix = Value[(resourceNamesIndex + waitingResourceNames.Length)..]; | ||
| return true; | ||
| } | ||
|
|
||
| prefix = string.Empty; | ||
| suffix = string.Empty; | ||
| return false; | ||
| } | ||
|
|
||
| private bool TryGetVisibleResource(string resourceName, [System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out ResourceViewModel? resource) | ||
| { | ||
| if (ResourceViewModel.TryGetResourceByName(resourceName, ResourceByName, out resource) && !resource.IsResourceHidden(ShowHiddenResources)) | ||
| { | ||
| return true; | ||
| } | ||
|
|
||
| resource = null; | ||
| return false; | ||
| } | ||
|
|
||
| private CommandViewModel? GetVisibleStartCommand() | ||
| { | ||
| foreach (var command in Resource.Commands) | ||
| { | ||
| if (string.Equals(command.Name, CommandViewModel.StartCommand, StringComparisons.CommandName) && | ||
| command.State != CommandViewModelState.Hidden) | ||
| { | ||
| return command; | ||
| } | ||
| } | ||
|
|
||
| return null; | ||
| } | ||
|
|
||
| private Task OnStartCommandAsync() | ||
| { | ||
| if (StartCommand is not { } startCommand || | ||
| IsStartCommandDisabled || | ||
| OnExecuteCommandAsync is not { } onExecuteCommandAsync) | ||
| { | ||
| return Task.CompletedTask; | ||
| } | ||
|
|
||
| return onExecuteCommandAsync(Resource, startCommand); | ||
| } | ||
|
|
||
| private sealed record WaitingResource(ResourceViewModel? Resource, string DisplayName); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| .state-description-action { | ||
| display: inline; | ||
| padding: 0; | ||
| border: 0; | ||
| background: none; | ||
| color: var(--accent-foreground-rest); | ||
| cursor: pointer; | ||
| font: inherit; | ||
| font-weight: inherit; | ||
| line-height: inherit; | ||
| text-decoration: none; | ||
| vertical-align: baseline; | ||
| } | ||
|
|
||
| .state-description-action:hover:not(:disabled) { | ||
| color: var(--accent-foreground-hover); | ||
| } | ||
|
|
||
| .state-description-action:disabled { | ||
| cursor: default; | ||
| opacity: var(--disabled-opacity); | ||
| } | ||
|
|
||
| .state-description-action-icon { | ||
| display: inline; | ||
| margin-inline-end: 0.2em; | ||
| vertical-align: text-bottom; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
????
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The removed Kestrel HTTP/2-only default was blocking the new HTTP health check on BasketService. This playground change needs
WithHttpHealthCheck("/health", endpointName: "http")so the dashboard can show healthy/starting dependency details for the waiting-state demo.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, but this breaks the basket service. It needs HTTP/2