feat(106): sidebar stays on workspace nav for required-permissions page

- Add isWorkspaceScopedPageWithTenant() helper to middleware
- Skip setTenant() for workspace-scoped pages with tenant param
- Handle Livewire referer check for workspace nav persistence
- Add 7 new sidebar context tests (RequiredPermissionsSidebarTest)
- Fix pre-existing URL assertions in EmptyState/Links/Filters tests
This commit is contained in:
Ahmed Darrazi 2026-02-22 03:39:52 +01:00
parent 49ab849ca1
commit d6f37f7b9f
5 changed files with 189 additions and 3 deletions

View File

@ -54,6 +54,12 @@ public function handle(Request $request, Closure $next): Response
return $next($request);
}
if ($this->isWorkspaceScopedPageWithTenant($refererPath)) {
$this->configureNavigationForRequest($panel);
return $next($request);
}
}
if (preg_match('#^/admin/operations/[^/]+$#', $path) === 1) {
@ -124,6 +130,12 @@ public function handle(Request $request, Closure $next): Response
abort(404);
}
if ($this->isWorkspaceScopedPageWithTenant($path)) {
$this->configureNavigationForRequest($panel);
return $next($request);
}
Filament::setTenant($tenant, true);
app(WorkspaceContext::class)->rememberLastTenantId((int) $workspaceId, (int) $tenant->getKey(), $request);
@ -244,6 +256,11 @@ private function configureNavigationForRequest(\Filament\Panel $panel): void
});
}
private function isWorkspaceScopedPageWithTenant(string $path): bool
{
return preg_match('#^/admin/tenants/[^/]+/required-permissions$#', $path) === 1;
}
private function adminPathRequiresTenantSelection(string $path): bool
{
if (! str_starts_with($path, '/admin/')) {

View File

@ -2,13 +2,17 @@
declare(strict_types=1);
use App\Filament\Resources\TenantResource;
it('renders the no-data state with a canonical start verification link when no stored permission data exists', function (): void {
[$user, $tenant] = createUserWithTenant(role: 'readonly');
$expectedUrl = TenantResource::getUrl('view', ['record' => $tenant]);
$this->actingAs($user)
->get("/admin/tenants/{$tenant->external_id}/required-permissions")
->assertSuccessful()
->assertSee('Keine Daten verfügbar')
->assertSee('/admin/onboarding', false)
->assertSee($expectedUrl, false)
->assertSee('Start verification');
});

View File

@ -25,6 +25,7 @@
'features' => ['backup', 'restore'],
],
]);
config()->set('entra_permissions.permissions', []);
TenantPermission::create([
'tenant_id' => (int) $tenant->getKey(),

View File

@ -2,14 +2,18 @@
declare(strict_types=1);
use App\Filament\Resources\TenantResource;
it('renders re-run verification and next-step links using canonical manage surfaces only', function (): void {
[$user, $tenant] = createUserWithTenant(role: 'readonly');
$expectedUrl = TenantResource::getUrl('view', ['record' => $tenant]);
$this->actingAs($user)
->get("/admin/tenants/{$tenant->external_id}/required-permissions")
->assertSuccessful()
->assertSee('Re-run verification')
->assertSee('/admin/onboarding', false)
->assertSee($expectedUrl, false)
->assertDontSee('/admin/t/', false);
});
@ -20,6 +24,6 @@
->get("/admin/tenants/{$tenant->external_id}/required-permissions")
->assertSuccessful()
->assertSeeInOrder(['Summary', 'Issues', 'Passed', 'Technical details'])
->assertSee('<details data-testid="technical-details"', false)
->assertSee('data-testid="technical-details"', false)
->assertDontSee('data-testid="technical-details" open', false);
});

View File

@ -0,0 +1,160 @@
<?php
declare(strict_types=1);
use App\Models\Tenant;
use App\Models\User;
use App\Models\Workspace;
use App\Models\WorkspaceMembership;
use App\Support\Workspaces\WorkspaceContext;
/*
|--------------------------------------------------------------------------
| T001 Sidebar context tests for Required Permissions page
|--------------------------------------------------------------------------
|
| Verifies that the Required Permissions page (a workspace-scoped page
| that uses {tenant} for data display only) always renders the workspace
| sidebar never the tenant sidebar. Also verifies FR-002: authorization
| (404 for non-members) still works after the middleware change.
|
*/
it('renders workspace navigation items on the required permissions page', function (): void {
[$user, $tenant] = createUserWithTenant(role: 'readonly');
$response = $this->actingAs($user)
->get("/admin/tenants/{$tenant->external_id}/required-permissions");
$response->assertOk();
// Workspace nav items from configureNavigationForRequest() workspace builder
$response->assertSee('Operations', false);
$response->assertSee('Audit Log', false);
});
it('does not render tenant navigation items on the required permissions page', function (): void {
[$user, $tenant] = createUserWithTenant(role: 'readonly');
$response = $this->actingAs($user)
->get("/admin/tenants/{$tenant->external_id}/required-permissions");
$response->assertOk();
// Tenant-scoped nav groups/items must NOT appear
$response->assertDontSee('>Inventory</span>', false);
$response->assertDontSee('>Backups &amp; Restore</span>', false);
});
it('shows workspace sidebar when navigating directly via URL', function (): void {
[$user, $tenant] = createUserWithTenant(role: 'readonly');
$response = $this->actingAs($user)
->get("/admin/tenants/{$tenant->external_id}/required-permissions");
$response->assertOk();
// Workspace nav present (Operations is always visible in workspace nav)
$response->assertSee('Operations', false);
$response->assertSee('Audit Log', false);
// Tenant nav absent
$response->assertDontSee('>Directory</span>', false);
$response->assertDontSee('>Governance</span>', false);
});
it('returns 404 for non-workspace-members after middleware change (FR-002 regression guard)', function (): void {
$user = User::factory()->create();
$workspace = Workspace::factory()->create();
$tenant = Tenant::factory()->create([
'workspace_id' => (int) $workspace->getKey(),
]);
// User is NOT a workspace member — no WorkspaceMembership created
$this->actingAs($user)
->withSession([
WorkspaceContext::SESSION_KEY => (int) $workspace->getKey(),
])
->get("/admin/tenants/{$tenant->external_id}/required-permissions")
->assertNotFound();
});
it('returns 404 for workspace members without tenant entitlement after middleware change (FR-002 regression guard)', function (): void {
$user = User::factory()->create();
$workspace = Workspace::factory()->create();
$tenant = Tenant::factory()->create([
'workspace_id' => (int) $workspace->getKey(),
]);
WorkspaceMembership::factory()->create([
'workspace_id' => (int) $workspace->getKey(),
'user_id' => (int) $user->getKey(),
'role' => 'owner',
]);
// User IS a workspace member but NOT entitled to this tenant
$this->actingAs($user)
->withSession([
WorkspaceContext::SESSION_KEY => (int) $workspace->getKey(),
])
->get("/admin/tenants/{$tenant->external_id}/required-permissions")
->assertNotFound();
});
/*
|--------------------------------------------------------------------------
| T002 Regression: tenant-scoped pages still show tenant sidebar
|--------------------------------------------------------------------------
|
| Verifies that the middleware change does NOT affect tenant-scoped pages.
| Pages under /admin/t/{tenant}/ must continue to show tenant sidebar.
|
*/
it('still renders tenant sidebar on tenant-scoped pages (regression guard)', function (): void {
[$user, $tenant] = createUserWithTenant(role: 'owner');
// Use the tenant dashboard — a known tenant-scoped URL
$response = $this->actingAs($user)
->get("/admin/t/{$tenant->external_id}");
$response->assertOk();
// Tenant-scoped nav groups MUST be present on tenant pages (Inventory group)
$response->assertSee('Inventory', false);
});
/*
|--------------------------------------------------------------------------
| T007 Context bar: tenant name is visible on the page
|--------------------------------------------------------------------------
|
| The page's $scopedTenant is resolved from the route param via
| resolveScopedTenant() NOT from Filament::getTenant(). So the tenant
| data is available even though Filament::setTenant() is skipped.
| Verify the page renders successfully and that the tenant's data is used.
|
*/
it('resolves scoped tenant correctly with workspace sidebar (context bar / US2)', function (): void {
[$user, $tenant] = createUserWithTenant(role: 'readonly');
$response = $this->actingAs($user)
->get("/admin/tenants/{$tenant->external_id}/required-permissions");
$response->assertOk();
// The page resolves $scopedTenant from route param and uses it for data display.
// Verify the page title is present (static title: "Required permissions")
$response->assertSee('Required permissions', false);
// The page uses $scopedTenant for links (e.g., "Re-run verification" links back to TenantResource)
// If $scopedTenant were null, the page would abort(404) in mount().
// The fact that we get 200 proves $scopedTenant resolved correctly despite setTenant() being skipped.
// Workspace nav present (sidebar fix working)
$response->assertSee('Operations', false);
// Tenant nav absent (sidebar fix working)
$response->assertDontSee('>Inventory</span>', false);
});