Implements Spec 077 refinements: workspace Global Mode and navigation/context-bar redundancy cleanup.
Summary
- Global Mode: `/admin/workspaces` is workspace-optional (lists only member workspaces); explicit allowlist in `EnsureWorkspaceSelected`.
- Navigation cleanup: workspace switching is topbar-only; no sidebar “Switch workspace”; removes redundant “Manage workspaces” entry from context-bar.
- Context bar: when no workspace selected, tenant picker is disabled with guidance; on tenant-scoped routes `/admin/t/{tenant}/…` the tenant indicator is read-only (Filament tenant menu remains primary).
- Authorization: workspace creation is policy-driven (`WorkspacePolicy::create()`), enforced in `ChooseWorkspace` via Gate.
Safety / Compliance
- Livewire v4.0+ compliant (Filament v5).
- Panel provider registration remains in `bootstrap/providers.php` (no changes required).
- Global search: no new globally searchable resources added; no behavior changes introduced.
- Destructive actions: none added/changed.
- Assets: no new assets registered; deploy process unchanged (if assets are registered elsewhere, ensure `php artisan filament:assets` runs in deploy as usual).
Tests
- `vendor/bin/sail bin pint --dirty`
- `vendor/bin/sail artisan test --compact tests/Feature/Workspaces tests/Feature/Monitoring tests/Feature/OpsUx tests/Feature/Filament/WorkspaceContextTopbarAndTenantSelectionTest.php`
Spec artifacts
- `specs/077-workspace-nav-monitoring-hub/{spec,plan,tasks}.md`
- `specs/077-workspace-nav-monitoring-hub/contracts/routes.md`
Co-authored-by: Ahmed Darrazi <ahmeddarrazi@MacBookPro.fritz.box>
Reviewed-on: #94
174 lines
5.9 KiB
PHP
174 lines
5.9 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
use App\Models\OperationRun;
|
|
use App\Models\Tenant;
|
|
use App\Support\Workspaces\WorkspaceContext;
|
|
use Filament\Facades\Filament;
|
|
|
|
it('renders the tenant context picker on tenantless Monitoring → Operations', function (): void {
|
|
$tenant = Tenant::factory()->create(['status' => 'active']);
|
|
[$user, $tenant] = createUserWithTenant($tenant, role: 'owner');
|
|
|
|
$workspaceName = $tenant->workspace?->name;
|
|
|
|
Filament::setTenant(null, true);
|
|
|
|
$this->actingAs($user)
|
|
->withSession([
|
|
WorkspaceContext::SESSION_KEY => (int) $tenant->workspace_id,
|
|
WorkspaceContext::LAST_TENANT_IDS_SESSION_KEY => [
|
|
(string) $tenant->workspace_id => (int) $tenant->getKey(),
|
|
],
|
|
])
|
|
->get('/admin/operations')
|
|
->assertOk()
|
|
->assertSee($workspaceName ?? 'Select workspace')
|
|
->assertSee('Select tenant')
|
|
->assertSee('Search tenants…')
|
|
->assertSee('Switch workspace')
|
|
->assertSee('admin/select-tenant')
|
|
->assertSee('Clear tenant context')
|
|
->assertSee($tenant->getFilamentName());
|
|
|
|
$this->actingAs($user)
|
|
->withSession([
|
|
WorkspaceContext::SESSION_KEY => (int) $tenant->workspace_id,
|
|
])
|
|
->post(route('admin.select-tenant'), ['tenant_id' => (int) $tenant->getKey()])
|
|
->assertRedirect();
|
|
});
|
|
|
|
it('disables the tenant picker when no workspace is active (Global Mode)', function (): void {
|
|
$user = \App\Models\User::factory()->create();
|
|
$workspace = \App\Models\Workspace::factory()->create();
|
|
\App\Models\WorkspaceMembership::factory()->create([
|
|
'workspace_id' => (int) $workspace->getKey(),
|
|
'user_id' => (int) $user->getKey(),
|
|
'role' => 'owner',
|
|
]);
|
|
|
|
Filament::setTenant(null, true);
|
|
|
|
session()->forget(WorkspaceContext::SESSION_KEY);
|
|
|
|
$this->actingAs($user)
|
|
->get('/admin/workspaces')
|
|
->assertOk()
|
|
->assertSee('Select workspace')
|
|
->assertSee('Select tenant')
|
|
->assertSee('Choose a workspace first.')
|
|
->assertDontSee('Search tenants…');
|
|
});
|
|
|
|
it('renders the tenant indicator read-only on tenant-scoped pages (Filament tenant menu is primary)', function (): void {
|
|
$tenant = Tenant::factory()->create(['status' => 'active']);
|
|
[$user, $tenant] = createUserWithTenant($tenant, role: 'owner');
|
|
|
|
$this->actingAs($user)
|
|
->withSession([
|
|
WorkspaceContext::SESSION_KEY => (int) $tenant->workspace_id,
|
|
])
|
|
->get(route('filament.admin.resources.tenants.index', filamentTenantRouteParams($tenant)))
|
|
->assertOk()
|
|
->assertSee($tenant->getFilamentName())
|
|
->assertDontSee('Search tenants…')
|
|
->assertDontSee('admin/select-tenant')
|
|
->assertDontSee('Clear tenant context');
|
|
});
|
|
|
|
it('filters the header tenant picker to tenants the user can access', function (): void {
|
|
$tenantA = Tenant::factory()->create(['status' => 'active']);
|
|
[$user, $tenantA] = createUserWithTenant($tenantA, role: 'owner', workspaceRole: 'readonly');
|
|
|
|
$tenantB = Tenant::factory()->create([
|
|
'status' => 'active',
|
|
'workspace_id' => (int) $tenantA->workspace_id,
|
|
'name' => 'ZZZ-UNAUTHORIZED-TENANT-NAME-12345',
|
|
]);
|
|
|
|
Filament::setTenant(null, true);
|
|
|
|
$this->actingAs($user)
|
|
->withSession([
|
|
WorkspaceContext::SESSION_KEY => (int) $tenantA->workspace_id,
|
|
])
|
|
->get('/admin/operations')
|
|
->assertOk()
|
|
->assertSee($tenantA->getFilamentName())
|
|
->assertDontSee($tenantB->getFilamentName());
|
|
});
|
|
|
|
it('shows all workspace tenants in the header tenant picker for workspace owners', function (): void {
|
|
$tenantA = Tenant::factory()->create(['status' => 'active']);
|
|
[$user, $tenantA] = createUserWithTenant($tenantA, role: 'owner', workspaceRole: 'owner');
|
|
|
|
$tenantB = Tenant::factory()->create([
|
|
'status' => 'active',
|
|
'workspace_id' => (int) $tenantA->workspace_id,
|
|
'name' => 'ZZZ-UNASSIGNED-TENANT-NAME-12345',
|
|
]);
|
|
|
|
Filament::setTenant(null, true);
|
|
|
|
$this->actingAs($user)
|
|
->withSession([
|
|
WorkspaceContext::SESSION_KEY => (int) $tenantA->workspace_id,
|
|
])
|
|
->get('/admin/operations')
|
|
->assertOk()
|
|
->assertSee($tenantA->getFilamentName())
|
|
->assertSee($tenantB->getFilamentName());
|
|
});
|
|
|
|
it('does not implicitly switch tenant when opening canonical operation deep links', function (): void {
|
|
$tenantA = Tenant::factory()->create(['status' => 'active']);
|
|
[$user, $tenantA] = createUserWithTenant($tenantA, role: 'owner');
|
|
|
|
$tenantB = Tenant::factory()->create([
|
|
'status' => 'active',
|
|
'workspace_id' => (int) $tenantA->workspace_id,
|
|
]);
|
|
|
|
$user->tenants()->syncWithoutDetaching([
|
|
$tenantB->getKey() => ['role' => 'owner'],
|
|
]);
|
|
|
|
$runA = OperationRun::factory()->create([
|
|
'tenant_id' => (int) $tenantA->getKey(),
|
|
'workspace_id' => (int) $tenantA->workspace_id,
|
|
'type' => 'policy.sync',
|
|
'initiator_name' => 'TenantA',
|
|
]);
|
|
|
|
OperationRun::factory()->create([
|
|
'tenant_id' => (int) $tenantB->getKey(),
|
|
'workspace_id' => (int) $tenantB->workspace_id,
|
|
'type' => 'inventory.sync',
|
|
'initiator_name' => 'TenantB',
|
|
]);
|
|
|
|
Filament::setTenant(null, true);
|
|
|
|
$this->actingAs($user)
|
|
->withSession([
|
|
WorkspaceContext::SESSION_KEY => (int) $tenantA->workspace_id,
|
|
])
|
|
->get(route('admin.operations.view', ['run' => (int) $runA->getKey()]))
|
|
->assertOk();
|
|
|
|
expect(Filament::getTenant())->toBeNull();
|
|
|
|
$this->actingAs($user)
|
|
->withSession([
|
|
WorkspaceContext::SESSION_KEY => (int) $tenantA->workspace_id,
|
|
])
|
|
->get('/admin/operations')
|
|
->assertOk()
|
|
->assertSee('Policy sync')
|
|
->assertSee('Inventory sync')
|
|
->assertSee('TenantA')
|
|
->assertSee('TenantB');
|
|
});
|