Implements Spec 103 (IA semantics: Scope vs Filter vs Targeting) across Monitoring + Manage. Changes - Monitoring tenant indicator copy: “All tenants” / “Filtered by tenant: …” - Alerts KPI header resolves tenant via OperateHubShell::activeEntitledTenant() for consistency - Manage list pages (Alert Rules / Destinations) no longer show tenant indicator - AlertRule form uses targeting semantics + sections (Rule / Applies to / Delivery) - Additional UI polish: resource sections, tenant view widgets layout, RBAC progressive disclosure (“Not configured” when empty) Notes - US6 (“Add current tenant” convenience button) intentionally skipped (optional P3). Testing - CI=1 vendor/bin/sail artisan test tests/Feature/TenantRBAC/ tests/Feature/Onboarding/OnboardingIdentifyTenantTest.php - vendor/bin/sail bin pint --dirty --format agent Co-authored-by: Ahmed Darrazi <ahmed.darrazi@live.de> Reviewed-on: #126
205 lines
6.7 KiB
PHP
205 lines
6.7 KiB
PHP
<?php
|
|
|
|
use App\Filament\Pages\Monitoring\Operations;
|
|
use App\Models\OperationRun;
|
|
use App\Models\Tenant;
|
|
use App\Support\Workspaces\WorkspaceContext;
|
|
use Filament\Facades\Filament;
|
|
use Illuminate\Support\Facades\Http;
|
|
use Livewire\Livewire;
|
|
|
|
beforeEach(function (): void {
|
|
Http::preventStrayRequests();
|
|
});
|
|
|
|
it('defaults Monitoring → Operations list to the active tenant when tenant context is set', function () {
|
|
$tenantA = Tenant::factory()->create();
|
|
$tenantB = Tenant::factory()->create();
|
|
|
|
[$user] = createUserWithTenant($tenantA, role: 'owner');
|
|
|
|
$tenantB->forceFill(['workspace_id' => (int) $tenantA->workspace_id])->save();
|
|
|
|
$user->tenants()->syncWithoutDetaching([
|
|
$tenantB->getKey() => ['role' => 'owner'],
|
|
]);
|
|
|
|
OperationRun::factory()->create([
|
|
'tenant_id' => $tenantA->getKey(),
|
|
'type' => 'policy.sync',
|
|
'status' => 'queued',
|
|
'outcome' => 'pending',
|
|
'initiator_name' => 'TenantA',
|
|
]);
|
|
|
|
OperationRun::factory()->create([
|
|
'tenant_id' => $tenantB->getKey(),
|
|
'type' => 'inventory_sync',
|
|
'status' => 'queued',
|
|
'outcome' => 'pending',
|
|
'initiator_name' => 'TenantB',
|
|
]);
|
|
|
|
Filament::setTenant($tenantA, true);
|
|
|
|
$this->actingAs($user)
|
|
->withSession([WorkspaceContext::SESSION_KEY => (int) $tenantA->workspace_id])
|
|
->get('/admin/operations')
|
|
->assertOk()
|
|
->assertSee('Policy sync')
|
|
->assertSee('TenantA')
|
|
->assertDontSee('Inventory sync')
|
|
->assertDontSee('TenantB');
|
|
});
|
|
|
|
it('defaults Monitoring → Operations list to the remembered tenant when Filament tenant is not available', function () {
|
|
$tenantA = Tenant::factory()->create();
|
|
$tenantB = Tenant::factory()->create();
|
|
|
|
[$user] = createUserWithTenant($tenantA, role: 'owner');
|
|
|
|
$tenantB->forceFill(['workspace_id' => (int) $tenantA->workspace_id])->save();
|
|
|
|
$user->tenants()->syncWithoutDetaching([
|
|
$tenantB->getKey() => ['role' => 'owner'],
|
|
]);
|
|
|
|
OperationRun::factory()->create([
|
|
'tenant_id' => $tenantA->getKey(),
|
|
'type' => 'policy.sync',
|
|
'status' => 'queued',
|
|
'outcome' => 'pending',
|
|
'initiator_name' => 'TenantA',
|
|
]);
|
|
|
|
OperationRun::factory()->create([
|
|
'tenant_id' => $tenantB->getKey(),
|
|
'type' => 'inventory_sync',
|
|
'status' => 'queued',
|
|
'outcome' => 'pending',
|
|
'initiator_name' => 'TenantB',
|
|
]);
|
|
|
|
Filament::setTenant(null, true);
|
|
|
|
$workspaceId = (int) $tenantA->workspace_id;
|
|
app(WorkspaceContext::class)->rememberLastTenantId($workspaceId, (int) $tenantA->getKey());
|
|
|
|
$this->actingAs($user)
|
|
->withSession([WorkspaceContext::SESSION_KEY => $workspaceId])
|
|
->get('/admin/operations')
|
|
->assertOk()
|
|
->assertSee('Filtered by tenant: '.$tenantA->name)
|
|
->assertSee('Policy sync')
|
|
->assertSee('TenantA')
|
|
->assertDontSee('Inventory sync');
|
|
});
|
|
|
|
it('scopes Monitoring → Operations tabs to the active tenant', function () {
|
|
$tenantA = Tenant::factory()->create();
|
|
$tenantB = Tenant::factory()->create();
|
|
|
|
[$user] = createUserWithTenant($tenantA, role: 'owner');
|
|
|
|
$tenantB->forceFill(['workspace_id' => (int) $tenantA->workspace_id])->save();
|
|
|
|
$user->tenants()->syncWithoutDetaching([
|
|
$tenantB->getKey() => ['role' => 'owner'],
|
|
]);
|
|
|
|
$runActiveA = OperationRun::factory()->create([
|
|
'tenant_id' => $tenantA->getKey(),
|
|
'type' => 'policy.sync',
|
|
'status' => 'queued',
|
|
'outcome' => 'pending',
|
|
'initiator_name' => 'A-active',
|
|
]);
|
|
|
|
$runSucceededA = OperationRun::factory()->create([
|
|
'tenant_id' => $tenantA->getKey(),
|
|
'type' => 'policy.sync',
|
|
'status' => 'completed',
|
|
'outcome' => 'succeeded',
|
|
'initiator_name' => 'A-succeeded',
|
|
]);
|
|
|
|
$runPartialA = OperationRun::factory()->create([
|
|
'tenant_id' => $tenantA->getKey(),
|
|
'type' => 'policy.sync',
|
|
'status' => 'completed',
|
|
'outcome' => 'partially_succeeded',
|
|
'initiator_name' => 'A-partial',
|
|
]);
|
|
|
|
$runFailedA = OperationRun::factory()->create([
|
|
'tenant_id' => $tenantA->getKey(),
|
|
'type' => 'policy.sync',
|
|
'status' => 'completed',
|
|
'outcome' => 'failed',
|
|
'initiator_name' => 'A-failed',
|
|
]);
|
|
|
|
$runActiveB = OperationRun::factory()->create([
|
|
'tenant_id' => $tenantB->getKey(),
|
|
'type' => 'inventory_sync',
|
|
'status' => 'queued',
|
|
'outcome' => 'pending',
|
|
'initiator_name' => 'B-active',
|
|
]);
|
|
|
|
$runFailedB = OperationRun::factory()->create([
|
|
'tenant_id' => $tenantB->getKey(),
|
|
'type' => 'inventory_sync',
|
|
'status' => 'completed',
|
|
'outcome' => 'failed',
|
|
'initiator_name' => 'B-failed',
|
|
]);
|
|
|
|
$tenantA->makeCurrent();
|
|
Filament::setTenant($tenantA, true);
|
|
|
|
$this->withSession([
|
|
WorkspaceContext::SESSION_KEY => (int) $tenantA->workspace_id,
|
|
]);
|
|
session([
|
|
WorkspaceContext::SESSION_KEY => (int) $tenantA->workspace_id,
|
|
]);
|
|
|
|
Livewire::actingAs($user)
|
|
->test(Operations::class)
|
|
->assertCanSeeTableRecords([$runActiveA, $runSucceededA, $runPartialA, $runFailedA])
|
|
->assertCanNotSeeTableRecords([$runActiveB, $runFailedB])
|
|
->set('activeTab', 'active')
|
|
->assertCanSeeTableRecords([$runActiveA])
|
|
->assertCanNotSeeTableRecords([$runSucceededA, $runPartialA, $runFailedA, $runActiveB, $runFailedB])
|
|
->set('activeTab', 'succeeded')
|
|
->assertCanSeeTableRecords([$runSucceededA])
|
|
->assertCanNotSeeTableRecords([$runActiveA, $runPartialA, $runFailedA, $runActiveB, $runFailedB])
|
|
->set('activeTab', 'partial')
|
|
->assertCanSeeTableRecords([$runPartialA])
|
|
->assertCanNotSeeTableRecords([$runActiveA, $runSucceededA, $runFailedA, $runActiveB, $runFailedB])
|
|
->set('activeTab', 'failed')
|
|
->assertCanSeeTableRecords([$runFailedA])
|
|
->assertCanNotSeeTableRecords([$runActiveA, $runSucceededA, $runPartialA, $runActiveB, $runFailedB]);
|
|
});
|
|
|
|
it('prevents cross-workspace access to Monitoring → Operations detail', function () {
|
|
$tenantA = Tenant::factory()->create();
|
|
[$user, $tenantA] = createUserWithTenant($tenantA, role: 'owner');
|
|
|
|
$tenantB = Tenant::factory()->create();
|
|
|
|
$runB = OperationRun::factory()->create([
|
|
'tenant_id' => $tenantB->getKey(),
|
|
'type' => 'inventory_sync',
|
|
'status' => 'queued',
|
|
'outcome' => 'pending',
|
|
'initiator_name' => 'TenantB',
|
|
]);
|
|
|
|
$this->actingAs($user)
|
|
->withSession([WorkspaceContext::SESSION_KEY => (int) $tenantA->workspace_id])
|
|
->get(route('admin.operations.view', ['run' => (int) $runB->getKey()]))
|
|
->assertNotFound();
|
|
});
|