Always update resource list in console logs after hidden bool changes (#10705)

Co-authored-by: Adam Ratzman <[email protected]>

Author: adamint

src/Aspire.Dashboard/Components/Pages/ConsoleLogs.razor.cs

@@ -346,17 +346,15 @@ private void UpdateMenuButtons()
             value =>
             {
                 _showHiddenResources = value;
+                UpdateResourcesList();
+                UpdateMenuButtons();
 
                 if (!_showHiddenResources && PageViewModel.SelectedResource?.IsResourceHidden(showHiddenResources: false) is true)
                 {
                     PageViewModel.SelectedResource = null;
                     PageViewModel.SelectedOption = _noSelection;
                     await this.AfterViewModelChangedAsync(_contentLayout, false);
-                    return;
                 }
-
-                UpdateResourcesList();
-                UpdateMenuButtons();
             }));
 
         _logsMenuItems.Add(new()

tests/Aspire.Dashboard.Components.Tests/Pages/ConsoleLogsTests.cs

@@ -173,6 +173,113 @@ public async Task ResourceName_SubscribeOnLoadAndChange_SubscribeConsoleLogsOnce
         Assert.False(await subscribedResourceNamesChannel.Reader.WaitToReadAsync().DefaultTimeout());
     }
 
+    [Fact]
+    public void ToggleHiddenResources_HiddenResourceVisibilityAndSelection_WorksCorrectly()
+    {
+        // Arrange
+        var regularResource = ModelTestHelpers.CreateResource(appName: "regular-resource", state: KnownResourceState.Running);
+        var hiddenResource = ModelTestHelpers.CreateResource(appName: "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: [regularResource, hiddenResource]);
+
+        SetupConsoleLogsServices(dashboardClient);
+
+        var dimensionManager = Services.GetRequiredService<DimensionManager>();
+        var viewport = new ViewportInformation(IsDesktop: true, IsUltraLowHeight: false, IsUltraLowWidth: false);
+        dimensionManager.InvokeOnViewportInformationChanged(viewport);
+
+        // Act & Assert 1: Render component - initially hidden resource should not be visible
+        var cut = RenderComponent<Components.Pages.ConsoleLogs>(builder =>
+        {
+            builder.Add(p => p.ViewportInformation, viewport);
+        });
+
+        var instance = cut.Instance;
+        
+        // Wait for resources to load - use resource select component as proxy
+        cut.WaitForAssertion(() =>
+        {
+            var resourceSelect = cut.FindComponent<ResourceSelect>();
+            var selectElement = resourceSelect.Find("fluent-select");
+            var selectOptions = selectElement.QuerySelectorAll("fluent-option");
+            
+            // Should have at least 2 options (None + regular resource) when resources are loaded
+            Assert.True(selectOptions.Length >= 2);
+        });
+        
+        // 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 "None" option + regular resource (hidden resource filtered out)
+        Assert.Equal(2, selectOptions.Length); // "None" + regular-resource
+        var optionValues = selectOptions.Select(opt => opt.GetAttribute("value")).ToList();
+        Assert.Contains("regular-resource", optionValues);
+        Assert.DoesNotContain("hidden-resource", optionValues);
+
+        // Act & Assert 2: Click the settings menu button to show the menu, then click "Show hidden resources"
+        var settingsMenuButton = cut.Find("fluent-button[title='" + Resources.ConsoleLogs.ConsoleLogsSettings + "']");
+        Assert.NotNull(settingsMenuButton);
+        settingsMenuButton.Click();
+        
+        // Find and click the "Show hidden resources" menu item
+        cut.WaitForAssertion(() =>
+        {
+            var showHiddenMenuItem = cut.Find("fluent-menu-item:contains('" + Resources.ControlsStrings.ShowHiddenResources + "')");
+            Assert.NotNull(showHiddenMenuItem);
+            showHiddenMenuItem.Click();
+        });
+        
+        // Wait for UI to update
+        cut.WaitForAssertion(() =>
+        {
+            var updatedOptions = selectElement.QuerySelectorAll("fluent-option");
+            // Should now have "None" + both resources
+            Assert.Equal(3, updatedOptions.Length); // "None" + regular-resource + hidden-resource
+            var updatedOptionValues = updatedOptions.Select(opt => opt.GetAttribute("value")).ToList();
+            Assert.Contains("regular-resource", 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
+        settingsMenuButton.Click();
+        
+        cut.WaitForAssertion(() =>
+        {
+            var hideHiddenMenuItem = cut.Find("fluent-menu-item:contains('" + Resources.ControlsStrings.HideHiddenResources + "')");
+            Assert.NotNull(hideHiddenMenuItem);
+            hideHiddenMenuItem.Click();
+        });
+        
+        // Wait for UI to update - hidden resource should be filtered out and selection should be cleared
+        cut.WaitForAssertion(() =>
+        {
+            var finalOptions = selectElement.QuerySelectorAll("fluent-option");
+            // Should be back to "None" + regular resource only
+            Assert.Equal(2, finalOptions.Length); // "None" + regular-resource
+            var finalOptionValues = finalOptions.Select(opt => opt.GetAttribute("value")).ToList();
+            Assert.Contains("regular-resource", finalOptionValues);
+            Assert.DoesNotContain("hidden-resource", finalOptionValues);
+        });
+        
+        // Selection should be cleared since selected resource is now hidden
+        cut.WaitForState(() => instance.PageViewModel.SelectedResource is null);
+    }
+
     [Fact]
     public async Task ResourceName_ViaUrlAndResourceLoaded_LogViewerUpdated()
     {