Skip to content

Hide "Show/Hide Hidden Resources" menu item when viewing single resource logs #14288

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

Merged
JamesNK merged 3 commits into from
Feb 5, 2026
+92 −44
Merged

Hide "Show/Hide Hidden Resources" menu item when viewing single resource logs #14288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d39a7ae
Initial plan
Copilot Feb 2, 2026
64cc5d6
Hide "Show/Hide Hidden Resources" menu item when viewing a single res…
Copilot Feb 2, 2026
298f46f
PR feedback
JamesNK Feb 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
40 changes: 20 additions & 20 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 @@ -427,7 +427,7 @@ private async Task SubscribeAsync(bool isAllSelected, string? selectedResourceNa

private bool IsAllSelected()
{
return PageViewModel.SelectedResource == _allResource;
return PageViewModel?.SelectedResource is not null && PageViewModel.SelectedResource == _allResource;
}

private void UpdateMenuButtons()
Expand All @@ -451,27 +451,27 @@ private void UpdateMenuButtons()

var selectedResource = GetSelectedResource();

CommonMenuItems.AddToggleHiddenResourcesMenuItem(
_logsMenuItems,
ControlsStringsLoc,
_showHiddenResources,
_resourceByName.Values,
SessionStorage,
EventCallback.Factory.Create<bool>(this, async
value =>
{
_showHiddenResources = value;
UpdateResourcesList();
UpdateMenuButtons();

if (!_showHiddenResources && selectedResource?.IsResourceHidden(showHiddenResources: false) is true)
// Only show the "Hide hidden resources" menu item when viewing all resources
// Use IsAllSelected() instead of _isSubscribedToAll because UpdateMenuButtons()
// can be called before the subscription is established
if (IsAllSelected())
{
CommonMenuItems.AddToggleHiddenResourcesMenuItem(
_logsMenuItems,
ControlsStringsLoc,
_showHiddenResources,
_resourceByName.Values,
SessionStorage,
EventCallback.Factory.Create<bool>(this, async
value =>
{
PageViewModel.SelectedResource = _allResource;
await this.AfterViewModelChangedAsync(_contentLayout, false);
}
_showHiddenResources = value;
UpdateResourcesList();
UpdateMenuButtons();

await this.RefreshIfMobileAsync(_contentLayout);
}));
await this.RefreshIfMobileAsync(_contentLayout);
}));
}

_logsMenuItems.Add(new()
{
Expand Down
96 changes: 72 additions & 24 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 @@ -171,7 +171,8 @@ public async Task ResourceName_SubscribeOnLoadAndChange_SubscribeConsoleLogsOnce
public void ToggleHiddenResources_HiddenResourceVisibilityAndSelection_WorksCorrectly()
{
// Arrange
var regularResource = ModelTestHelpers.CreateResource(resourceName: "regular-resource", state: KnownResourceState.Running);
var regularResource1 = ModelTestHelpers.CreateResource(resourceName: "regular-resource1", state: KnownResourceState.Running);
var regularResource2 = ModelTestHelpers.CreateResource(resourceName: "regular-resource2", state: KnownResourceState.Running);
var hiddenResource = ModelTestHelpers.CreateResource(resourceName: "hidden-resource", state: KnownResourceState.Running, hidden: true);

var consoleLogsChannel = Channel.CreateUnbounded<IReadOnlyList<ResourceLogLine>>();
Expand All @@ -180,7 +181,7 @@ public void ToggleHiddenResources_HiddenResourceVisibilityAndSelection_WorksCorr
isEnabled: true,
consoleLogsChannelProvider: name => consoleLogsChannel,
resourceChannelProvider: () => resourceChannel,
initialResources: [regularResource, hiddenResource]);
initialResources: [regularResource1, regularResource2, hiddenResource]);

SetupConsoleLogsServices(dashboardClient);

Expand All @@ -203,19 +204,20 @@ public void ToggleHiddenResources_HiddenResourceVisibilityAndSelection_WorksCorr
var selectElement = resourceSelect.Find("fluent-select");
var selectOptions = selectElement.QuerySelectorAll("fluent-option");

// Should have at least 1 option (regular resource) when resources are loaded
Assert.True(selectOptions.Length >= 1);
// Should have "All" + 2 regular resources when resources are loaded
Assert.Equal(3, selectOptions.Length);
});

// Initially, hidden resources should not be shown
var resourceSelect = cut.FindComponent<ResourceSelect>();
var selectElement = resourceSelect.Find("fluent-select");
var selectOptions = selectElement.QuerySelectorAll("fluent-option");

// Should only have regular resource (hidden resource filtered out)
Assert.Equal(1, selectOptions.Length); // regular-resource
// Should have "All" + 2 regular resources (hidden resource filtered out)
Assert.Equal(3, selectOptions.Length);
var optionValues = selectOptions.Select(opt => opt.GetAttribute("value")).ToList();
Assert.Contains("regular-resource", optionValues);
Assert.Contains("regular-resource1", optionValues);
Assert.Contains("regular-resource2", optionValues);
Assert.DoesNotContain("hidden-resource", optionValues);

// Act & Assert 2: Click the settings menu button to show the menu, then click "Show hidden resources"
Expand All @@ -235,21 +237,16 @@ public void ToggleHiddenResources_HiddenResourceVisibilityAndSelection_WorksCorr
cut.WaitForAssertion(() =>
{
var updatedOptions = selectElement.QuerySelectorAll("fluent-option");
// Should now have both resources
Assert.Equal(3, updatedOptions.Length); // "None" + regular-resource + hidden-resource
// Should now have "All" + all three resources
Assert.Equal(4, updatedOptions.Length);
var updatedOptionValues = updatedOptions.Select(opt => opt.GetAttribute("value")).ToList();
Assert.Contains("regular-resource", updatedOptionValues);
Assert.Contains("regular-resource1", updatedOptionValues);
Assert.Contains("regular-resource2", updatedOptionValues);
Assert.Contains("hidden-resource", updatedOptionValues);
});

// Act & Assert 3: Select the hidden resource
var hiddenResourceOption = selectElement.QuerySelector("fluent-option[value='hidden-resource']");
Assert.NotNull(hiddenResourceOption);
selectElement.Change("hidden-resource");

cut.WaitForState(() => instance.PageViewModel.SelectedResource?.Name == "hidden-resource");

// Act & Assert 4: Click the settings menu button again and click "Hide hidden resources" to hide them again
// Act & Assert 3: Click the settings menu button again and click "Hide hidden resources" to hide them again
// Note: We stay on "All" view to test the hide functionality
settingsMenuButton.Click();

cut.WaitForAssertion(() =>
Expand All @@ -259,19 +256,70 @@ public void ToggleHiddenResources_HiddenResourceVisibilityAndSelection_WorksCorr
hideHiddenMenuItem.Click();
});

// Wait for UI to update - hidden resource should be filtered out and selection should be cleared
// Wait for UI to update - hidden resource should be filtered out
cut.WaitForAssertion(() =>
{
var finalOptions = selectElement.QuerySelectorAll("fluent-option");
// Should be back to regular resource only
Assert.Equal(1, finalOptions.Length); // regular-resource
// Should be back to "All" + 2 regular resources only
Assert.Equal(3, finalOptions.Length);
var finalOptionValues = finalOptions.Select(opt => opt.GetAttribute("value")).ToList();
Assert.Contains("regular-resource", finalOptionValues);
Assert.Contains("regular-resource1", finalOptionValues);
Assert.Contains("regular-resource2", finalOptionValues);
Assert.DoesNotContain("hidden-resource", finalOptionValues);
});
}

[Fact]
public void ToggleHiddenResourcesMenuItem_WhenSingleResourceSelected_NotShown()
{
// Arrange
var testResource = ModelTestHelpers.CreateResource(resourceName: "test-resource", state: KnownResourceState.Running);
var hiddenResource = ModelTestHelpers.CreateResource(resourceName: "hidden-resource", state: KnownResourceState.Running, hidden: true);

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, hiddenResource]);

SetupConsoleLogsServices(dashboardClient);

var dimensionManager = Services.GetRequiredService<DimensionManager>();
var viewport = new ViewportInformation(IsDesktop: true, IsUltraLowHeight: false, IsUltraLowWidth: false);
dimensionManager.InvokeOnViewportInformationChanged(viewport);

// Act: Render component with a specific resource selected
var cut = RenderComponent<Components.Pages.ConsoleLogs>(builder =>
{
builder.Add(p => p.ViewportInformation, viewport);
builder.Add(p => p.ResourceName, "test-resource");
});

var instance = cut.Instance;

// Selection should be cleared since selected resource is now hidden
cut.WaitForState(() => instance.PageViewModel.SelectedResource.Id?.InstanceId == regularResource.Name);
// Wait for resources to load and specific resource to be selected
cut.WaitForState(() => instance.PageViewModel.SelectedResource?.Id?.InstanceId == "test-resource");

// Act: Click the settings menu button
var settingsMenuButton = cut.Find("fluent-button[title='" + Resources.ConsoleLogs.ConsoleLogsSettings + "']");
Assert.NotNull(settingsMenuButton);
settingsMenuButton.Click();

// Assert: The "Show hidden resources" / "Hide hidden resources" menu item should NOT be present
cut.WaitForAssertion(() =>
{
var menuItems = cut.FindAll("fluent-menu-item");
var hiddenResourcesMenuItems = menuItems.Where(item =>
{
var text = item.TextContent;
return text.Contains(Resources.ControlsStrings.ShowHiddenResources) ||
text.Contains(Resources.ControlsStrings.HideHiddenResources);
}).ToList();

Assert.Empty(hiddenResourcesMenuItems);
});
}

[Fact]
Expand Down
Loading