ahmido
d32b2115a8
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
139 lines
4.9 KiB
PHP
139 lines
4.9 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
use App\Filament\Widgets\Alerts\AlertsKpiHeader;
|
|
use App\Models\AlertDelivery;
|
|
use App\Models\AlertDestination;
|
|
use App\Models\AlertRule;
|
|
use App\Models\Tenant;
|
|
use App\Support\Workspaces\WorkspaceContext;
|
|
use Filament\Facades\Filament;
|
|
use Livewire\Livewire;
|
|
|
|
it('filters KPI deliveries by tenant when context is set via lastTenantId fallback only', function (): void {
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
|
|
$workspaceId = (int) $tenant->workspace_id;
|
|
|
|
$rule = AlertRule::factory()->create(['workspace_id' => $workspaceId]);
|
|
$destination = AlertDestination::factory()->create(['workspace_id' => $workspaceId]);
|
|
|
|
AlertDelivery::factory()->create([
|
|
'workspace_id' => $workspaceId,
|
|
'tenant_id' => (int) $tenant->getKey(),
|
|
'alert_rule_id' => (int) $rule->getKey(),
|
|
'alert_destination_id' => (int) $destination->getKey(),
|
|
'status' => AlertDelivery::STATUS_SENT,
|
|
'created_at' => now()->subHour(),
|
|
]);
|
|
|
|
$otherTenant = Tenant::factory()->create(['workspace_id' => $workspaceId]);
|
|
$user->tenants()->syncWithoutDetaching([
|
|
$otherTenant->getKey() => ['role' => 'owner'],
|
|
]);
|
|
|
|
AlertDelivery::factory()->create([
|
|
'workspace_id' => $workspaceId,
|
|
'tenant_id' => (int) $otherTenant->getKey(),
|
|
'alert_rule_id' => (int) $rule->getKey(),
|
|
'alert_destination_id' => (int) $destination->getKey(),
|
|
'status' => AlertDelivery::STATUS_SENT,
|
|
'created_at' => now()->subHour(),
|
|
]);
|
|
|
|
$this->actingAs($user);
|
|
Filament::setTenant(null, true);
|
|
|
|
session()->put(WorkspaceContext::SESSION_KEY, $workspaceId);
|
|
session()->put(WorkspaceContext::LAST_TENANT_IDS_SESSION_KEY, [
|
|
(string) $workspaceId => (int) $tenant->getKey(),
|
|
]);
|
|
|
|
Livewire::test(AlertsKpiHeader::class)
|
|
->assertSee('Deliveries (24h)')
|
|
->assertSee('1');
|
|
})->group('ops-ux');
|
|
|
|
it('filters KPI deliveries by tenant when context is set via Filament setTenant', function (): void {
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
|
|
$workspaceId = (int) $tenant->workspace_id;
|
|
|
|
$rule = AlertRule::factory()->create(['workspace_id' => $workspaceId]);
|
|
$destination = AlertDestination::factory()->create(['workspace_id' => $workspaceId]);
|
|
|
|
AlertDelivery::factory()->create([
|
|
'workspace_id' => $workspaceId,
|
|
'tenant_id' => (int) $tenant->getKey(),
|
|
'alert_rule_id' => (int) $rule->getKey(),
|
|
'alert_destination_id' => (int) $destination->getKey(),
|
|
'status' => AlertDelivery::STATUS_SENT,
|
|
'created_at' => now()->subHour(),
|
|
]);
|
|
|
|
$otherTenant = Tenant::factory()->create(['workspace_id' => $workspaceId]);
|
|
$user->tenants()->syncWithoutDetaching([
|
|
$otherTenant->getKey() => ['role' => 'owner'],
|
|
]);
|
|
|
|
AlertDelivery::factory()->create([
|
|
'workspace_id' => $workspaceId,
|
|
'tenant_id' => (int) $otherTenant->getKey(),
|
|
'alert_rule_id' => (int) $rule->getKey(),
|
|
'alert_destination_id' => (int) $destination->getKey(),
|
|
'status' => AlertDelivery::STATUS_SENT,
|
|
'created_at' => now()->subHour(),
|
|
]);
|
|
|
|
$this->actingAs($user);
|
|
Filament::setTenant($tenant, true);
|
|
|
|
session()->put(WorkspaceContext::SESSION_KEY, $workspaceId);
|
|
|
|
Livewire::test(AlertsKpiHeader::class)
|
|
->assertSee('Deliveries (24h)')
|
|
->assertSee('1');
|
|
})->group('ops-ux');
|
|
|
|
it('shows workspace-wide KPI counts when no tenant context is active', function (): void {
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
|
|
$workspaceId = (int) $tenant->workspace_id;
|
|
|
|
$rule = AlertRule::factory()->create(['workspace_id' => $workspaceId]);
|
|
$destination = AlertDestination::factory()->create(['workspace_id' => $workspaceId]);
|
|
|
|
AlertDelivery::factory()->create([
|
|
'workspace_id' => $workspaceId,
|
|
'tenant_id' => (int) $tenant->getKey(),
|
|
'alert_rule_id' => (int) $rule->getKey(),
|
|
'alert_destination_id' => (int) $destination->getKey(),
|
|
'status' => AlertDelivery::STATUS_SENT,
|
|
'created_at' => now()->subHour(),
|
|
]);
|
|
|
|
$otherTenant = Tenant::factory()->create(['workspace_id' => $workspaceId]);
|
|
$user->tenants()->syncWithoutDetaching([
|
|
$otherTenant->getKey() => ['role' => 'owner'],
|
|
]);
|
|
|
|
AlertDelivery::factory()->create([
|
|
'workspace_id' => $workspaceId,
|
|
'tenant_id' => (int) $otherTenant->getKey(),
|
|
'alert_rule_id' => (int) $rule->getKey(),
|
|
'alert_destination_id' => (int) $destination->getKey(),
|
|
'status' => AlertDelivery::STATUS_SENT,
|
|
'created_at' => now()->subHour(),
|
|
]);
|
|
|
|
$this->actingAs($user);
|
|
Filament::setTenant(null, true);
|
|
|
|
session()->put(WorkspaceContext::SESSION_KEY, $workspaceId);
|
|
|
|
Livewire::test(AlertsKpiHeader::class)
|
|
->assertSee('Deliveries (24h)')
|
|
->assertSee('2');
|
|
})->group('ops-ux');
|