ahmido
fb1046c97a
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
66 lines
2.1 KiB
PHP
66 lines
2.1 KiB
PHP
<?php
|
|
|
|
use App\Models\Tenant;
|
|
use App\Models\User;
|
|
use App\Models\Workspace;
|
|
use App\Models\WorkspaceMembership;
|
|
use App\Support\Workspaces\WorkspaceContext;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
|
|
uses(RefreshDatabase::class);
|
|
|
|
test('default Filament tenant selection respects current workspace context', function () {
|
|
$user = User::factory()->create();
|
|
|
|
$workspaceA = Workspace::factory()->create(['name' => 'Workspace A']);
|
|
$workspaceB = Workspace::factory()->create(['name' => 'Workspace B']);
|
|
|
|
WorkspaceMembership::factory()->create([
|
|
'workspace_id' => $workspaceA->getKey(),
|
|
'user_id' => $user->getKey(),
|
|
'role' => 'owner',
|
|
]);
|
|
|
|
WorkspaceMembership::factory()->create([
|
|
'workspace_id' => $workspaceB->getKey(),
|
|
'user_id' => $user->getKey(),
|
|
'role' => 'owner',
|
|
]);
|
|
|
|
$tenantA = Tenant::factory()->create([
|
|
'workspace_id' => $workspaceA->getKey(),
|
|
'status' => 'active',
|
|
]);
|
|
|
|
$tenantB = Tenant::factory()->create([
|
|
'workspace_id' => $workspaceB->getKey(),
|
|
'status' => 'active',
|
|
]);
|
|
|
|
$user->tenants()->syncWithoutDetaching([
|
|
$tenantA->getKey() => ['role' => 'owner'],
|
|
$tenantB->getKey() => ['role' => 'owner'],
|
|
]);
|
|
|
|
session()->put(WorkspaceContext::SESSION_KEY, (int) $workspaceA->getKey());
|
|
$user->forceFill(['last_workspace_id' => (int) $workspaceA->getKey()])->save();
|
|
|
|
$this->actingAs($user)
|
|
->get(route('filament.admin.pages.choose-tenant'))
|
|
->assertOk()
|
|
->assertSee($tenantA->name)
|
|
->assertDontSee($tenantB->name);
|
|
});
|
|
|
|
test('user menu does not render a workspace switcher (topbar context bar is the single entry point)', function () {
|
|
[$user, $tenant] = createUserWithTenant();
|
|
|
|
$workspace = Workspace::query()->whereKey($tenant->workspace_id)->firstOrFail();
|
|
|
|
$this->actingAs($user)
|
|
->get(route('filament.admin.resources.tenants.index', filamentTenantRouteParams($tenant)))
|
|
->assertOk()
|
|
->assertSee($workspace->name)
|
|
->assertDontSee('name="workspace_id"', escape: false);
|
|
});
|