From d4e063255711998a4105c5f3ff38ae845b76f457 Mon Sep 17 00:00:00 2001 From: Ahmed Darrazi Date: Mon, 2 Feb 2026 19:56:06 +0100 Subject: [PATCH] fix: workspaces nav uses active tenant --- app/Providers/Filament/AdminPanelProvider.php | 10 +++++++++- tests/Feature/Filament/TenantDashboardDbOnlyTest.php | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/Providers/Filament/AdminPanelProvider.php b/app/Providers/Filament/AdminPanelProvider.php index 1e8a536..406ec27 100644 --- a/app/Providers/Filament/AdminPanelProvider.php +++ b/app/Providers/Filament/AdminPanelProvider.php @@ -53,7 +53,15 @@ public function panel(Panel $panel): Panel ]) ->navigationItems([ NavigationItem::make('Workspaces') - ->url(fn (): string => ChooseWorkspace::getUrl()) + ->url(function (): string { + $tenant = Filament::getTenant(); + + if ($tenant instanceof Tenant) { + return route('filament.admin.resources.workspaces.index', ['tenant' => $tenant->external_id]); + } + + return ChooseWorkspace::getUrl(); + }) ->icon('heroicon-o-squares-2x2') ->group('Settings') ->sort(10), diff --git a/tests/Feature/Filament/TenantDashboardDbOnlyTest.php b/tests/Feature/Filament/TenantDashboardDbOnlyTest.php index 150e4f9..524f6d9 100644 --- a/tests/Feature/Filament/TenantDashboardDbOnlyTest.php +++ b/tests/Feature/Filament/TenantDashboardDbOnlyTest.php @@ -32,6 +32,7 @@ assertNoOutboundHttp(function () use ($tenant): void { $this->get(TenantDashboard::getUrl(tenant: $tenant)) ->assertOk() + ->assertSee("/admin/t/{$tenant->external_id}/workspaces", false) ->assertSee('Needs Attention') ->assertSee('Recent Operations') ->assertSee('Recent Drift Findings');