-
Notifications
You must be signed in to change notification settings - Fork 760
Add commands to console logs page #6819
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.
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
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| // Licensed to the .NET Foundation under one or more agreements. | ||
| // The .NET Foundation licenses this file to you under the MIT license. | ||
|
|
||
| using System.Globalization; | ||
| using Aspire.Dashboard.Utils; | ||
| using Microsoft.AspNetCore.Components; | ||
| using Microsoft.Extensions.Localization; | ||
| using Microsoft.FluentUI.AspNetCore.Components; | ||
|
|
||
| namespace Aspire.Dashboard.Model; | ||
|
|
||
| public sealed class DashboardCommandExecutor( | ||
| IDashboardClient dashboardClient, | ||
| IDialogService dialogService, | ||
| IToastService toastService, | ||
| IStringLocalizer<Dashboard.Resources.Resources> loc, | ||
| NavigationManager navigationManager) | ||
| { | ||
| public async Task ExecuteAsync(ResourceViewModel resource, CommandViewModel command, Func<ResourceViewModel, string> getResourceName) | ||
| { | ||
| if (!string.IsNullOrWhiteSpace(command.ConfirmationMessage)) | ||
| { | ||
| var dialogReference = await dialogService.ShowConfirmationAsync(command.ConfirmationMessage).ConfigureAwait(false); | ||
| var result = await dialogReference.Result.ConfigureAwait(false); | ||
| if (result.Cancelled) | ||
| { | ||
| return; | ||
| } | ||
| } | ||
|
|
||
| var messageResourceName = getResourceName(resource); | ||
|
|
||
| var toastParameters = new ToastParameters<CommunicationToastContent>() | ||
| { | ||
| Id = Guid.NewGuid().ToString(), | ||
| Intent = ToastIntent.Progress, | ||
| Title = string.Format(CultureInfo.InvariantCulture, loc[nameof(Dashboard.Resources.Resources.ResourceCommandStarting)], messageResourceName, command.DisplayName), | ||
| Content = new CommunicationToastContent() | ||
| }; | ||
|
|
||
| // Show a toast immediately to indicate the command is starting. | ||
| toastService.ShowCommunicationToast(toastParameters); | ||
|
|
||
| var response = await dashboardClient.ExecuteResourceCommandAsync(resource.Name, resource.ResourceType, command, CancellationToken.None).ConfigureAwait(false); | ||
|
|
||
| // Update toast with the result; | ||
| if (response.Kind == ResourceCommandResponseKind.Succeeded) | ||
| { | ||
| toastParameters.Title = string.Format(CultureInfo.InvariantCulture, loc[nameof(Dashboard.Resources.Resources.ResourceCommandSuccess)], messageResourceName, command.DisplayName); | ||
| toastParameters.Intent = ToastIntent.Success; | ||
| toastParameters.Icon = GetIntentIcon(ToastIntent.Success); | ||
| } | ||
| else | ||
| { | ||
| toastParameters.Title = string.Format(CultureInfo.InvariantCulture, loc[nameof(Dashboard.Resources.Resources.ResourceCommandFailed)], messageResourceName, command.DisplayName); | ||
| toastParameters.Intent = ToastIntent.Error; | ||
| toastParameters.Icon = GetIntentIcon(ToastIntent.Error); | ||
| toastParameters.Content.Details = response.ErrorMessage; | ||
| toastParameters.PrimaryAction = loc[nameof(Dashboard.Resources.Resources.ResourceCommandToastViewLogs)]; | ||
| toastParameters.OnPrimaryAction = EventCallback.Factory.Create<ToastResult>(this, () => navigationManager.NavigateTo(DashboardUrls.ConsoleLogsUrl(resource: resource.Name))); | ||
| } | ||
|
|
||
| toastService.UpdateToast(toastParameters.Id, toastParameters); | ||
| } | ||
|
|
||
| // Copied from FluentUI. | ||
| private static (Icon Icon, Color Color)? GetIntentIcon(ToastIntent intent) | ||
| { | ||
| return intent switch | ||
| { | ||
| ToastIntent.Success => (new Icons.Filled.Size24.CheckmarkCircle(), Color.Success), | ||
| ToastIntent.Warning => (new Icons.Filled.Size24.Warning(), Color.Warning), | ||
| ToastIntent.Error => (new Icons.Filled.Size24.DismissCircle(), Color.Error), | ||
| ToastIntent.Info => (new Icons.Filled.Size24.Info(), Color.Info), | ||
| ToastIntent.Progress => (new Icons.Regular.Size24.Flash(), Color.Neutral), | ||
| ToastIntent.Upload => (new Icons.Regular.Size24.ArrowUpload(), Color.Neutral), | ||
| ToastIntent.Download => (new Icons.Regular.Size24.ArrowDownload(), Color.Neutral), | ||
| ToastIntent.Event => (new Icons.Regular.Size24.CalendarLtr(), Color.Neutral), | ||
| ToastIntent.Mention => (new Icons.Regular.Size24.Person(), Color.Neutral), | ||
| ToastIntent.Custom => null, | ||
| _ => throw new InvalidOperationException() | ||
| }; | ||
| } | ||
| } |
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.
@adamint I believe these were left over from earlier iterations of logs download. I removed them and everything still seems to work