From 28f57aafb8f7ef5c4d232dbd82899d107c4351f3 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <5845193+andrasbacsai@users.noreply.github.com>
Date: Fri, 7 Aug 2026 15:24:41 +0200
Subject: [PATCH] fix(server): keep resources nav active and show tab loading

Use $activeMenu for Resources so Livewire updates do not clear
the sidebar highlight, and disable managed/unmanaged tabs with
spinners while containers load.
---
 resources/views/components/server/sidebar.blade.php    |  2 +-
 resources/views/livewire/server/resources.blade.php    | 10 ++++++----
 tests/Feature/ServerResourcesTableMobileLayoutTest.php | 10 ++++++++++
 tests/Feature/SidebarNavigationMarkupTest.php          |  8 ++++++++
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/resources/views/components/server/sidebar.blade.php b/resources/views/components/server/sidebar.blade.php
index 5450e4310..1d6f07310 100644
--- a/resources/views/components/server/sidebar.blade.php
+++ b/resources/views/components/server/sidebar.blade.php
@@ -76,7 +76,7 @@
         [
             'label' => 'Resources',
             'route' => 'server.resources',
-            'active' => request()->routeIs('server.resources'),
+            'active' => $activeMenu === 'resources',
             'icon' => 'projects',
             'group' => 'Platform',
         ],
diff --git a/resources/views/livewire/server/resources.blade.php b/resources/views/livewire/server/resources.blade.php
index 6d9031c18..1ab1744b5 100644
--- a/resources/views/livewire/server/resources.blade.php
+++ b/resources/views/livewire/server/resources.blade.php
@@ -13,12 +13,14 @@
             flush>
             <x-slot:actions>
                 <div class="inline-flex w-fit rounded-[10px] bg-neutral-100 p-1 dark:bg-white/[0.05]">
-                    <button type="button" wire:click="loadManagedContainers"
-                        class="rounded-md px-3 py-1 text-xs font-medium transition-colors {{ $activeTab === 'managed' ? 'bg-white text-neutral-950 shadow-sm dark:bg-warning/15 dark:text-warning' : 'text-neutral-500 hover:text-neutral-900 dark:text-fg-dim dark:hover:text-fg' }}">
+                    <button type="button" wire:click="loadManagedContainers" wire:loading.attr="disabled" wire:target="loadManagedContainers,loadUnmanagedContainers"
+                        class="inline-flex items-center gap-1.5 rounded-md px-3 py-1 text-xs font-medium transition-colors disabled:cursor-wait {{ $activeTab === 'managed' ? 'bg-white text-neutral-950 shadow-sm dark:bg-warning/15 dark:text-warning' : 'text-neutral-500 hover:text-neutral-900 dark:text-fg-dim dark:hover:text-fg' }}">
+                        <x-loading-on-button wire:loading wire:target="loadManagedContainers" />
                         Managed
                     </button>
-                    <button type="button" wire:click="loadUnmanagedContainers"
-                        class="rounded-md px-3 py-1 text-xs font-medium transition-colors {{ $activeTab === 'unmanaged' ? 'bg-white text-neutral-950 shadow-sm dark:bg-warning/15 dark:text-warning' : 'text-neutral-500 hover:text-neutral-900 dark:text-fg-dim dark:hover:text-fg' }}">
+                    <button type="button" wire:click="loadUnmanagedContainers" wire:loading.attr="disabled" wire:target="loadManagedContainers,loadUnmanagedContainers"
+                        class="inline-flex items-center gap-1.5 rounded-md px-3 py-1 text-xs font-medium transition-colors disabled:cursor-wait {{ $activeTab === 'unmanaged' ? 'bg-white text-neutral-950 shadow-sm dark:bg-warning/15 dark:text-warning' : 'text-neutral-500 hover:text-neutral-900 dark:text-fg-dim dark:hover:text-fg' }}">
+                        <x-loading-on-button wire:loading wire:target="loadUnmanagedContainers" />
                         Unmanaged
                     </button>
                 </div>
diff --git a/tests/Feature/ServerResourcesTableMobileLayoutTest.php b/tests/Feature/ServerResourcesTableMobileLayoutTest.php
index 41834ae4b..7d35c7f10 100644
--- a/tests/Feature/ServerResourcesTableMobileLayoutTest.php
+++ b/tests/Feature/ServerResourcesTableMobileLayoutTest.php
@@ -55,3 +55,13 @@ test('unmanaged container names use the same typeface as managed resource names'
         ->toContain('min-w-0 truncate text-[12px] font-medium text-neutral-950 dark:text-fg')
         ->not->toContain('truncate font-mono text-[12px] text-neutral-950 dark:text-fg');
 });
+
+test('server resource tabs show a loading state while switching', function () {
+    $view = file_get_contents(resource_path('views/livewire/server/resources.blade.php'));
+
+    expect(substr_count($view, 'wire:loading.attr="disabled" wire:target="loadManagedContainers,loadUnmanagedContainers"'))
+        ->toBe(2)
+        ->and($view)
+        ->toContain('<x-loading-on-button wire:loading wire:target="loadManagedContainers" />')
+        ->toContain('<x-loading-on-button wire:loading wire:target="loadUnmanagedContainers" />');
+});
diff --git a/tests/Feature/SidebarNavigationMarkupTest.php b/tests/Feature/SidebarNavigationMarkupTest.php
index ffd5cfdf1..2e07f06f2 100644
--- a/tests/Feature/SidebarNavigationMarkupTest.php
+++ b/tests/Feature/SidebarNavigationMarkupTest.php
@@ -15,6 +15,14 @@ it('keeps server submenu state independent from the Livewire update route', func
         ->and($proxyLogs)->toContain('activeSubMenu="logs"');
 });
 
+it('keeps the server resources menu active during Livewire updates', function () {
+    $sidebar = file_get_contents(resource_path('views/components/server/sidebar.blade.php'));
+
+    expect($sidebar)
+        ->toContain("'label' => 'Resources',\n            'route' => 'server.resources',\n            'active' => \$activeMenu === 'resources'")
+        ->not->toContain("'active' => request()->routeIs('server.resources')");
+});
+
 it('initializes persisted sidebar state before enabling layout transitions', function () {
     $layout = file_get_contents(resource_path('views/layouts/app.blade.php'));