-
Notifications
You must be signed in to change notification settings - Fork 719
Add context menu to resource graph, improve console logs actions #8691
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 3 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
999086f
Add context menu to resource graph, improve console logs actions
JamesNK 952be07
Update
JamesNK 343c399
Update
JamesNK 3d7f954
Clean up
JamesNK af0361f
Comments
JamesNK 9564d9a
Clean up
JamesNK 594a9f3
Clean up
JamesNK 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| @namespace Aspire.Dashboard.Components | ||
| @using System.Collections.Immutable | ||
| @using Aspire.Dashboard.Model | ||
| @using Microsoft.FluentUI.AspNetCore.Components.DesignTokens | ||
| @inherits FluentComponentBase | ||
|
|
||
| <FluentMenu @ref="_menu" Anchor="@Anchor" Anchored="@Anchored" Open="@Open" OpenChanged="OnOpenChanged" VerticalThreshold="200"> | ||
| @foreach (var item in Items) | ||
| { | ||
| @if (item.IsDivider) | ||
| { | ||
| <FluentDivider /> | ||
| } | ||
| else | ||
| { | ||
| var additionalMenuItemAttributes = new Dictionary<string, object>(item.AdditionalAttributes ?? ImmutableDictionary<string, object>.Empty) | ||
| { | ||
| { "title", item.Tooltip ?? item.Text ?? string.Empty } | ||
| }; | ||
|
|
||
| <FluentMenuItem Id="@item.Id" Class="@item.Class" OnClick="() => HandleItemClicked(item)" Disabled="@item.IsDisabled" AdditionalAttributes="@additionalMenuItemAttributes"> | ||
| @item.Text | ||
| @if (item.Icon != null) | ||
| { | ||
| <span slot="start"> | ||
| <FluentIcon Value="@item.Icon" Style="vertical-align: text-bottom;" Width="16px" /> | ||
| </span> | ||
| } | ||
| </FluentMenuItem> | ||
| } | ||
| } | ||
| </FluentMenu> |
65 changes: 65 additions & 0 deletions
65
src/Aspire.Dashboard/Components/Controls/AspireMenu.razor.cs
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,65 @@ | ||
| // 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 Microsoft.AspNetCore.Components; | ||
| using Microsoft.FluentUI.AspNetCore.Components; | ||
|
|
||
| namespace Aspire.Dashboard.Components; | ||
|
|
||
| public partial class AspireMenu : FluentComponentBase | ||
| { | ||
| private FluentMenu? _menu; | ||
|
|
||
| [Parameter] | ||
| public string? Anchor { get; set; } | ||
|
|
||
| [Parameter] | ||
| public bool Open { get; set; } | ||
|
|
||
| [Parameter] | ||
| public bool Anchored { get; set; } = true; | ||
|
|
||
| /// <summary> | ||
| /// Raised when the <see cref="Open"/> property changed. | ||
| /// </summary> | ||
| [Parameter] | ||
| public EventCallback<bool> OpenChanged { get; set; } | ||
|
|
||
| [Parameter] | ||
| public required IList<MenuButtonItem> Items { get; set; } | ||
|
|
||
| public async Task CloseAsync() | ||
| { | ||
| if (_menu is { } menu) | ||
| { | ||
| await menu.CloseAsync(); | ||
| } | ||
| } | ||
|
|
||
| public async Task OpenAsync(int clientX, int clientY) | ||
| { | ||
| if (_menu is { } menu) | ||
| { | ||
| await menu.OpenAsync(clientX, clientY); | ||
| } | ||
| } | ||
|
|
||
| private async Task HandleItemClicked(MenuButtonItem item) | ||
| { | ||
| if (item.OnClick is {} onClick) | ||
| { | ||
| await onClick(); | ||
| } | ||
| Open = false; | ||
| } | ||
|
|
||
| private Task OnOpenChanged(bool open) | ||
| { | ||
| Open = open; | ||
|
|
||
| return OpenChanged.HasDelegate | ||
| ? OpenChanged.InvokeAsync(open) | ||
| : Task.CompletedTask; | ||
| } | ||
| } |
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
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.
TODO: Update after #8470 is merged.
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.
Or #8470 will need to react to this PR 😄