Skip to content

Commit d8a767b

Browse files
committed
Use radio menu items for dashboard runs
1 parent 2988733 commit d8a767b

3 files changed

Lines changed: 24 additions & 12 deletions

File tree

‎src/Aspire.Dashboard/Components/Controls/AspireMenu.razor‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,19 @@
2727
return @<FluentMenuItem Id="@item.Id" Class="@item.Class" OnClick="() => HandleItemClicked(item)" Disabled="@item.IsDisabled" Role="@item.Role" Checked="@item.Checked" AdditionalAttributes="@additionalMenuItemAttributes" Label="@item.Text" MenuItems="@RenderNestedItems(item)">
2828
@if (item.Icon != null)
2929
{
30-
<span slot="start">
31-
<FluentIcon Value="@item.Icon" Style="vertical-align: text-bottom;" Width="16px" />
32-
</span>
30+
<FluentIcon Value="@item.Icon" Style="vertical-align: text-bottom;" Width="16px" Slot="@GetIconSlot(item.Role)" />
3331
}
3432
</FluentMenuItem>;
3533
}
3634
}
3735

36+
private static string GetIconSlot(MenuItemRole? role) => role switch
37+
{
38+
MenuItemRole.MenuItemCheckbox => "checkbox-indicator",
39+
MenuItemRole.MenuItemRadio => "radio-indicator",
40+
_ => "start"
41+
};
42+
3843
private RenderFragment? RenderNestedItems(MenuButtonItem item)
3944
{
4045
if (item.NestedMenuItems is null || item.NestedMenuItems.Count == 0)

‎src/Aspire.Dashboard/Components/Controls/DashboardRunSelect.razor.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,15 @@
66
using Microsoft.AspNetCore.Components;
77
using Microsoft.Extensions.Localization;
88
using Microsoft.FluentUI.AspNetCore.Components;
9+
using Icons = Microsoft.FluentUI.AspNetCore.Components.Icons;
910
using LayoutResources = Aspire.Dashboard.Resources.Layout;
1011

1112
namespace Aspire.Dashboard.Components.Controls;
1213

1314
public partial class DashboardRunSelect : ComponentBase
1415
{
16+
private static readonly Icon s_checkmarkIcon = new Icons.Regular.Size16.Checkmark();
17+
1518
private readonly List<MenuButtonItem> _menuItems = [];
1619
private string? _previousSelectedRunId;
1720
private string RunSelectTitle => Loc[nameof(LayoutResources.DashboardRunSelectTitle)];
@@ -60,8 +63,9 @@ private void LoadRuns()
6063
_menuItems.Add(new MenuButtonItem
6164
{
6265
Text = FormatRunOption(run),
63-
Role = MenuItemRole.MenuItemCheckbox,
66+
Role = MenuItemRole.MenuItemRadio,
6467
Checked = string.Equals(run.RunId, SelectedRunId, StringComparison.Ordinal),
68+
Icon = s_checkmarkIcon,
6569
OnClick = () => SelectedRunIdChanged.InvokeAsync(run.IsCurrent ? null : run.RunId)
6670
});
6771

‎tests/Aspire.Dashboard.Components.Tests/Layout/MainLayoutTests.cs‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
using Microsoft.FluentUI.AspNetCore.Components.Components.Tooltip;
2222
using Microsoft.JSInterop;
2323
using Xunit;
24+
using Icons = Microsoft.FluentUI.AspNetCore.Components.Icons;
2425

2526
namespace Aspire.Dashboard.Components.Tests.Layout;
2627

@@ -370,26 +371,28 @@ public async Task DashboardRunSelect_ChangeStoresAndAppliesSelectionWithoutNavig
370371
item =>
371372
{
372373
Assert.Equal("Live run", item.Text);
373-
Assert.Equal(MenuItemRole.MenuItemCheckbox, item.Role);
374+
Assert.Equal(MenuItemRole.MenuItemRadio, item.Role);
374375
Assert.True(item.Checked);
375-
Assert.Null(item.Icon);
376+
Assert.IsType<Icons.Regular.Size16.Checkmark>(item.Icon);
376377
},
377378
item => Assert.True(item.IsDivider),
378379
item =>
379380
{
380381
Assert.Equal(expectedHistoricalRunText, item.Text);
381-
Assert.Equal(MenuItemRole.MenuItemCheckbox, item.Role);
382+
Assert.Equal(MenuItemRole.MenuItemRadio, item.Role);
382383
Assert.False(item.Checked);
383-
Assert.Null(item.Icon);
384+
Assert.IsType<Icons.Regular.Size16.Checkmark>(item.Icon);
384385
});
385386

386387
var menuItems = runSelect.WaitForElements("fluent-menu-item");
387388
Assert.Single(runSelect.FindAll("fluent-divider"));
388389
Assert.Empty(menuItems[0].QuerySelectorAll("span[slot='start']"));
389390
Assert.Empty(menuItems[1].QuerySelectorAll("span[slot='start']"));
390-
Assert.Equal("menuitemcheckbox", menuItems[0].GetAttribute("role"));
391+
Assert.Single(menuItems[0].QuerySelectorAll("[slot='radio-indicator']"));
392+
Assert.Single(menuItems[1].QuerySelectorAll("[slot='radio-indicator']"));
393+
Assert.Equal("menuitemradio", menuItems[0].GetAttribute("role"));
391394
Assert.True(menuItems[0].HasAttribute("checked"));
392-
Assert.Equal("menuitemcheckbox", menuItems[1].GetAttribute("role"));
395+
Assert.Equal("menuitemradio", menuItems[1].GetAttribute("role"));
393396
Assert.False(menuItems[1].HasAttribute("checked"));
394397
menuItems[1].Click();
395398

@@ -417,13 +420,13 @@ public async Task DashboardRunSelect_ChangeStoresAndAppliesSelectionWithoutNavig
417420
item =>
418421
{
419422
Assert.False(item.Checked);
420-
Assert.Null(item.Icon);
423+
Assert.IsType<Icons.Regular.Size16.Checkmark>(item.Icon);
421424
},
422425
item => Assert.True(item.IsDivider),
423426
item =>
424427
{
425428
Assert.True(item.Checked);
426-
Assert.Null(item.Icon);
429+
Assert.IsType<Icons.Regular.Size16.Checkmark>(item.Icon);
427430
});
428431
menuItems = runSelect.WaitForElements("fluent-menu-item");
429432
Assert.Single(runSelect.FindAll("fluent-divider"));

0 commit comments

Comments
 (0)