ahmido
b159dacd36
## Summary - remove legacy tenant-scoped routing and middleware paths in favor of the current environment/workspace context flow - update Filament pages and resources to use the cleaned-up admin surface and environment filter context - add the related spec 317 artifacts and targeted tests for environment filter state and legacy context cleanup ## Testing - not run as part of this commit/push/PR workflow Co-authored-by: Ahmed Darrazi <ahmed.darrazi@live.de> Reviewed-on: #372
119 lines
4.7 KiB
PHP
119 lines
4.7 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
use App\Models\ManagedEnvironment;
|
|
use App\Support\Workspaces\WorkspaceContext;
|
|
use Filament\Facades\Filament;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
use Illuminate\Support\Facades\Http;
|
|
|
|
uses(RefreshDatabase::class);
|
|
|
|
beforeEach(function (): void {
|
|
Http::preventStrayRequests();
|
|
});
|
|
|
|
it('renders workspace scope label when tenant context is active on the workspace operations route', function (): void {
|
|
$tenant = ManagedEnvironment::factory()->create();
|
|
[$user, $tenant] = createUserWithTenant($tenant, role: 'owner');
|
|
|
|
Filament::setTenant($tenant, true);
|
|
|
|
$this->actingAs($user)
|
|
->withSession([WorkspaceContext::SESSION_KEY => (int) $tenant->workspace_id])
|
|
->get(route('admin.operations.index', ['workspace' => $tenant->workspace]))
|
|
->assertOk()
|
|
->assertSee(__('localization.shell.all_environments'))
|
|
->assertSee(__('localization.shell.no_environment_selected'))
|
|
->assertDontSee(__('localization.shell.environment_scope').': '.$tenant->name)
|
|
->assertDontSee('Back to '.$tenant->name)
|
|
->assertDontSee(__('localization.shell.show_all_environments'));
|
|
});
|
|
|
|
it('treats stale tenant context as workspace-wide without tenant identity hints', function (): void {
|
|
$entitledTenant = ManagedEnvironment::factory()->create();
|
|
[$user, $entitledTenant] = createUserWithTenant($entitledTenant, role: 'owner', workspaceRole: 'readonly');
|
|
|
|
$staleTenant = ManagedEnvironment::factory()->create([
|
|
'workspace_id' => (int) $entitledTenant->workspace_id,
|
|
]);
|
|
|
|
Filament::setTenant($staleTenant, true);
|
|
|
|
$this->actingAs($user)
|
|
->withSession([WorkspaceContext::SESSION_KEY => (int) $entitledTenant->workspace_id])
|
|
->get(route('admin.operations.index', ['workspace' => $entitledTenant->workspace]))
|
|
->assertOk()
|
|
->assertSee(__('localization.shell.all_environments'))
|
|
->assertDontSee('Back to '.$staleTenant->name)
|
|
->assertDontSee($staleTenant->name)
|
|
->assertDontSee(__('localization.shell.show_all_environments'));
|
|
});
|
|
|
|
it('clears filament tenant context and last-tenant session state via clear-environment-context endpoint', function (): void {
|
|
$tenant = ManagedEnvironment::factory()->create();
|
|
[$user, $tenant] = createUserWithTenant($tenant, role: 'owner');
|
|
|
|
$workspaceId = (int) $tenant->workspace_id;
|
|
$lastEnvironmentIds = [
|
|
(string) $workspaceId => (int) $tenant->getKey(),
|
|
];
|
|
|
|
Filament::setTenant($tenant, true);
|
|
|
|
$this->actingAs($user)
|
|
->withSession([
|
|
WorkspaceContext::SESSION_KEY => $workspaceId,
|
|
WorkspaceContext::LAST_ENVIRONMENT_IDS_SESSION_KEY => $lastEnvironmentIds,
|
|
])
|
|
->from('/admin/alerts')
|
|
->post('/admin/clear-environment-context')
|
|
->assertRedirect('/admin/alerts');
|
|
|
|
expect(Filament::getTenant())->toBeNull();
|
|
expect(session()->get(WorkspaceContext::LAST_ENVIRONMENT_IDS_SESSION_KEY, []))
|
|
->not->toHaveKey((string) $workspaceId);
|
|
|
|
$this->withSession([
|
|
WorkspaceContext::SESSION_KEY => $workspaceId,
|
|
])
|
|
->get(route('admin.operations.index', ['workspace' => $tenant->workspace]))
|
|
->assertOk()
|
|
->assertSee(__('localization.shell.all_environments'))
|
|
->assertDontSee(__('localization.shell.environment_scope').': '.$tenant->name);
|
|
});
|
|
|
|
it('clears remembered environment scope even when the stored environment is no longer operable', function (): void {
|
|
$activeEnvironment = ManagedEnvironment::factory()->create();
|
|
[$user, $activeEnvironment] = createUserWithTenant($activeEnvironment, role: 'owner');
|
|
|
|
$onboardingTenant = ManagedEnvironment::factory()->onboarding()->create([
|
|
'workspace_id' => (int) $activeEnvironment->workspace_id,
|
|
]);
|
|
|
|
createUserWithTenant(
|
|
tenant: $onboardingTenant,
|
|
user: $user,
|
|
role: 'owner',
|
|
workspaceRole: 'owner',
|
|
ensureDefaultMicrosoftProviderConnection: false,
|
|
);
|
|
|
|
$workspaceId = (int) $activeEnvironment->workspace_id;
|
|
|
|
$this->actingAs($user)
|
|
->withSession([
|
|
WorkspaceContext::SESSION_KEY => $workspaceId,
|
|
WorkspaceContext::LAST_ENVIRONMENT_IDS_SESSION_KEY => [
|
|
(string) $workspaceId => (int) $onboardingTenant->getKey(),
|
|
],
|
|
])
|
|
->from(route('admin.operations.index', ['workspace' => $activeEnvironment->workspace]))
|
|
->post('/admin/clear-environment-context')
|
|
->assertRedirect(route('admin.operations.index', ['workspace' => $activeEnvironment->workspace]));
|
|
|
|
expect(session()->get(WorkspaceContext::LAST_ENVIRONMENT_IDS_SESSION_KEY, []))
|
|
->not->toHaveKey((string) $workspaceId);
|
|
});
|