Summary Consolidates the “Tenant Operate Hub” work (Spec 085) and the follow-up adjustments from the 086 session merge into a single branch ready to merge into dev. Primary focus: stabilize Ops/Operate Hub UX flows, tighten/align authorization semantics, and make the full Sail test suite green. Key Changes Ops UX / Verification Readonly members can view verification operation runs (reports) while starting verification remains restricted. Normalized failure reason-code handling and aligned UX expectations with the provider reason-code taxonomy. Onboarding wizard UX “Start verification” CTA is hidden while a verification run is active; “Refresh” is shown during in-progress runs. Treats provider_permission_denied as a blocking reason (while keeping legacy compatibility). Test + fixture hardening Standardized use of default provider connection fixtures in tests where sync/restore flows require it. Fixed multiple Filament URL/tenant-context test cases to avoid 404s and reduce tenancy routing brittleness. Policy sync / restore safety Enrollment configuration type collision classification tests now exercise the real sync path (with required provider connection present). Restore edge-case safety tests updated to reflect current provider-connection requirements. Testing vendor/bin/sail artisan test --compact (green) vendor/bin/sail bin pint --dirty (green) Notes Includes merged 086 session work already (no separate PR needed). Co-authored-by: Ahmed Darrazi <ahmeddarrazi@ebc83aaa-d947-4a08-b88e-bd72ac9645f7.fritz.box> Co-authored-by: Ahmed Darrazi <ahmeddarrazi@MacBookPro.fritz.box> Co-authored-by: Ahmed Darrazi <ahmeddarrazi@adsmac.fritz.box> Reviewed-on: #103
173 lines
5.9 KiB
PHP
173 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('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');
|
|
});
|