Skip to content

fix(dashboard): hide UTC timestamps option when Show timestamps is off #19967

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

Open
Longhao Wang (GISWLH) wants to merge 2 commits into
base: main
Choose a base branch
from
+65 −6
Open

fix(dashboard): hide UTC timestamps option when Show timestamps is off #19967

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
fa1cc2b
Hide UTC timestamps option when Show timestamps is off
GISWLH Sep 5, 2026
b65f747
Add test for hiding UTC timestamps menu item
GISWLH Sep 5, 2026
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
15 changes: 9 additions & 6 deletions src/Aspire.Dashboard/Components/Pages/ConsoleLogs.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,13 +761,16 @@ private void UpdateMenuButtons()
Icon = new Icons.Regular.Size16.CalendarClock()
});

_logsMenuItems.Add(new()
// UTC timestamps only apply when timestamps are shown.
if (_showTimestamp)
{
OnClick = () => ToggleTimestampAsync(showTimestamp: _showTimestamp, isTimestampUtc: !_isTimestampUtc),
Text = Loc[nameof(Dashboard.Resources.ConsoleLogs.ConsoleLogsTimestampShowUtc)],
Icon = _isTimestampUtc ? new Icons.Regular.Size16.CheckboxChecked() : new Icons.Regular.Size16.CheckboxUnchecked(),
IsDisabled = !_showTimestamp
});
_logsMenuItems.Add(new()
{
OnClick = () => ToggleTimestampAsync(showTimestamp: _showTimestamp, isTimestampUtc: !_isTimestampUtc),
Text = Loc[nameof(Dashboard.Resources.ConsoleLogs.ConsoleLogsTimestampShowUtc)],
Icon = _isTimestampUtc ? new Icons.Regular.Size16.CheckboxChecked() : new Icons.Regular.Size16.CheckboxUnchecked(),
});
}

_logsMenuItems.Add(new()
{
Expand Down
56 changes: 56 additions & 0 deletions tests/Aspire.Dashboard.Components.Tests/Pages/ConsoleLogsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1107,6 +1107,62 @@ void PrintCurrentLogEntries(LogEntries logEntries)
}
}

[Fact]
public async Task UtcTimestampsMenuItem_HiddenWhenShowTimestampsDisabled_ShownWhenEnabled()
{
// Arrange
var testResource = ModelTestHelpers.CreateResource(resourceName: "test-resource", state: KnownResourceState.Running);
var consoleLogsChannel = Channel.CreateUnbounded<IReadOnlyList<ResourceLogLine>>();
var resourceChannel = Channel.CreateUnbounded<IReadOnlyList<ResourceViewModelChange>>();
var dashboardClient = new TestDashboardClient(
isEnabled: true,
consoleLogsChannelProvider: name => consoleLogsChannel,
resourceChannelProvider: () => resourceChannel,
initialResources: [testResource]);

SetupConsoleLogsServices(dashboardClient);

var viewport = CreateViewport(isDesktop: true);
var cut = RenderConsoleLogsPage(viewport, "test-resource");

cut.WaitForState(() => cut.Instance.PageViewModel.SelectedResource?.Id?.InstanceId == "test-resource");

// Act: open settings menu while timestamps are off (default)
var settingsMenuButton = cut.Find("fluent-button[title='" + Resources.ConsoleLogs.ConsoleLogsSettings + "']");
settingsMenuButton.Click();

// Assert: UTC timestamps option is not present when Show timestamps is disabled
cut.WaitForAssertion(() =>
{
var settingsMenu = cut.FindComponents<AspireMenu>().Single(m => m.Instance.Items.Any(i =>
i.Text == Resources.ConsoleLogs.ConsoleLogsTimestampShow ||
i.Text == Resources.ConsoleLogs.ConsoleLogsTimestampHide));
Assert.DoesNotContain(settingsMenu.Instance.Items, i => i.Text == Resources.ConsoleLogs.ConsoleLogsTimestampShowUtc);
});

// Act: enable Show timestamps
var menu = cut.FindComponents<AspireMenu>().Single(m => m.Instance.Items.Any(i =>
i.Text == Resources.ConsoleLogs.ConsoleLogsTimestampShow ||
i.Text == Resources.ConsoleLogs.ConsoleLogsTimestampHide));
var showTimestampsItem = menu.Instance.Items.Single(i => i.Text == Resources.ConsoleLogs.ConsoleLogsTimestampShow);
Assert.NotNull(showTimestampsItem.OnClick);
await cut.InvokeAsync(() => menu.Instance.OpenChanged.InvokeAsync(false));
await cut.InvokeAsync(showTimestampsItem.OnClick);
cut.Render();

// Re-open settings menu
cut.WaitForAssertion(() => Assert.False(menu.Instance.Open));
settingsMenuButton.Click();

// Assert: UTC timestamps option appears once timestamps are shown
cut.WaitForAssertion(() =>
{
var settingsMenu = cut.FindComponents<AspireMenu>().Single(m => m.Instance.Items.Any(i =>
i.Text == Resources.ConsoleLogs.ConsoleLogsTimestampHide));
Assert.Contains(settingsMenu.Instance.Items, i => i.Text == Resources.ConsoleLogs.ConsoleLogsTimestampShowUtc);
});
}

private void SetupConsoleLogsServices(TestDashboardClient? dashboardClient = null, TestTimeProvider? timeProvider = null, IResourceRepository? resourceRepository = null)
{
FluentUISetupHelpers.SetupFluentDialogProvider(this);
Expand Down
Loading