Kurzbeschreibung Filament-native UI-Polish für das Tenant-Dashboard und zugehörige Inventory/Operations-Ansichten; entfernt alte custom Blade‑Panel-Wrapper (die die dicken Rahmen erzeugten) und ersetzt sie durch Filament‑Widgets (StatsOverview / TableWidget). Keine DB-Migrationen. Änderungen (Kurz) Dashboard: KPI‑Kacheln als StatsOverviewWidget (4 Tiles). Needs‑Attention: sinnvolle Leerstaat‑UI (3 Health‑Checks + Links) und begrenzte, badge‑gestützte Issue‑Liste. Recent Drift Findings & Recent Operations: Filament TableWidget (10 Zeilen), badge‑Spalten für Severity/Status/Outcome, kurze copyable IDs, freundliche Subject‑Labels statt roher UUIDs. Entfernen der alten Blade-Wrapper, die ring- / shadow Klassen erzeugten. Tests aktualisiert/ergänzt, um Tenant‑Scope und DB‑only Garantien zu prüfen. Kleinigkeiten / UI‑Polish in Inventory/Operations-Listen und Panel‑Provider. Wichtige Dateien (Auswahl) DashboardKpis.php NeedsAttention.php RecentDriftFindings.php RecentOperations.php needs-attention.blade.php Tests: TenantDashboardTenantScopeTest.php, inventory/operations test updates Testing / Verifikation Lokale Tests (empfohlen, vor Merge ausführen): Formatter: Filament assets (falls panel assets geändert wurden): Review‑Hinweise (Was prüfen) UI: Dashboard sieht visuell wie Filament‑Demo‑Widgets aus (keine dicken ring- Rahmen mehr). Tables: Primary text zeigt freundliche Labels, nicht UUIDs; IDs sind copyable und kurz dargestellt. Needs‑Attention: Leerstaat zeigt die 3 Health‑Checks + korrekte Links; bei Issues sind Badges und Farben korrekt. Tenant‑Scope: Keine Daten von anderen Tenants leakieren (prüfe die aktualisierten TenantScope‑Tests). Polling: Widgets poll nur wenn nötig (z.B. aktive Runs existieren). Keine externen HTTP‑Calls oder ungeprüfte Jobs während Dashboard‑Rendering. Deployment / Migrations Keine Datenbankmigrationen. Empfohlen: nach Merge ./vendor/bin/sail artisan filament:assets in Deployment‑Pipeline prüfen, falls neue panel assets registriert wurden. Zusammenfassung für den Reviewer Zweck: Entfernen der alten, handgebauten Panel‑Wrappers und Vereinheitlichung der Dashboard‑UX mit Filament‑nativen Komponenten; kleinere UI‑Polish in Inventory/Operations. Tests: Unit/Feature tests für Tenant‑Scope und DB‑only Verhalten wurden aktualisiert; bitte laufen lassen. Merge: Branch 058-tenant-ui-polish → dev (protected) via Pull Request in Gitea. Co-authored-by: Ahmed Darrazi <ahmeddarrazi@adsmac.local> Reviewed-on: #70
220 lines
7.9 KiB
PHP
220 lines
7.9 KiB
PHP
<?php
|
|
|
|
use App\Filament\Resources\InventoryItemResource\Pages\ListInventoryItems;
|
|
use App\Jobs\RunInventorySyncJob;
|
|
use App\Livewire\BulkOperationProgress;
|
|
use App\Models\InventorySyncRun;
|
|
use App\Models\OperationRun;
|
|
use App\Models\Tenant;
|
|
use App\Services\Inventory\InventorySyncService;
|
|
use App\Support\OpsUx\OpsUxBrowserEvents;
|
|
use Filament\Facades\Filament;
|
|
use Illuminate\Support\Facades\Queue;
|
|
use Livewire\Livewire;
|
|
|
|
it('dispatches inventory sync and creates observable run records', function () {
|
|
Queue::fake();
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
$this->actingAs($user);
|
|
|
|
$tenant->makeCurrent();
|
|
Filament::setTenant($tenant, true);
|
|
|
|
$sync = app(InventorySyncService::class);
|
|
$allTypes = $sync->defaultSelectionPayload()['policy_types'];
|
|
|
|
Livewire::test(ListInventoryItems::class)
|
|
->callAction('run_inventory_sync', data: ['policy_types' => $allTypes])
|
|
->assertDispatchedTo(BulkOperationProgress::class, OpsUxBrowserEvents::RunEnqueued, tenantId: (int) $tenant->getKey());
|
|
|
|
Queue::assertPushed(RunInventorySyncJob::class);
|
|
|
|
$run = InventorySyncRun::query()->where('tenant_id', $tenant->id)->latest('id')->first();
|
|
expect($run)->not->toBeNull();
|
|
expect($run->user_id)->toBe($user->id);
|
|
expect($run->status)->toBe(InventorySyncRun::STATUS_PENDING);
|
|
|
|
$opRun = OperationRun::query()
|
|
->where('tenant_id', $tenant->id)
|
|
->where('user_id', $user->id)
|
|
->where('type', 'inventory.sync')
|
|
->latest('id')
|
|
->first();
|
|
|
|
expect($opRun)->not->toBeNull();
|
|
});
|
|
|
|
it('dispatches inventory sync for selected policy types', function () {
|
|
Queue::fake();
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
$this->actingAs($user);
|
|
|
|
$tenant->makeCurrent();
|
|
Filament::setTenant($tenant, true);
|
|
|
|
$sync = app(InventorySyncService::class);
|
|
$allTypes = $sync->defaultSelectionPayload()['policy_types'];
|
|
$selectedTypes = array_slice($allTypes, 0, min(2, count($allTypes)));
|
|
|
|
Livewire::test(ListInventoryItems::class)
|
|
->mountAction('run_inventory_sync')
|
|
->set('mountedActions.0.data.policy_types', $selectedTypes)
|
|
->assertActionDataSet(['policy_types' => $selectedTypes])
|
|
->callMountedAction()
|
|
->assertHasNoActionErrors();
|
|
|
|
Queue::assertPushed(RunInventorySyncJob::class);
|
|
|
|
$run = InventorySyncRun::query()->where('tenant_id', $tenant->id)->latest('id')->first();
|
|
expect($run)->not->toBeNull();
|
|
expect($run->selection_payload['policy_types'] ?? [])->toEqualCanonicalizing($selectedTypes);
|
|
});
|
|
|
|
it('persists include dependencies toggle into the run selection payload', function () {
|
|
Queue::fake();
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
$this->actingAs($user);
|
|
|
|
$tenant->makeCurrent();
|
|
Filament::setTenant($tenant, true);
|
|
|
|
$sync = app(InventorySyncService::class);
|
|
$allTypes = $sync->defaultSelectionPayload()['policy_types'];
|
|
$selectedTypes = array_slice($allTypes, 0, min(2, count($allTypes)));
|
|
|
|
Livewire::test(ListInventoryItems::class)
|
|
->callAction('run_inventory_sync', data: [
|
|
'policy_types' => $selectedTypes,
|
|
'include_dependencies' => false,
|
|
])
|
|
->assertHasNoActionErrors();
|
|
|
|
$run = InventorySyncRun::query()->where('tenant_id', $tenant->id)->latest('id')->first();
|
|
expect($run)->not->toBeNull();
|
|
expect((bool) ($run->selection_payload['include_dependencies'] ?? true))->toBeFalse();
|
|
});
|
|
|
|
it('defaults include foundations toggle to true and persists it into the run selection payload', function () {
|
|
Queue::fake();
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
$this->actingAs($user);
|
|
|
|
$tenant->makeCurrent();
|
|
Filament::setTenant($tenant, true);
|
|
|
|
$sync = app(InventorySyncService::class);
|
|
$allTypes = $sync->defaultSelectionPayload()['policy_types'];
|
|
$selectedTypes = array_slice($allTypes, 0, min(2, count($allTypes)));
|
|
|
|
Livewire::test(ListInventoryItems::class)
|
|
->mountAction('run_inventory_sync')
|
|
->set('mountedActions.0.data.policy_types', $selectedTypes)
|
|
->assertActionDataSet(['include_foundations' => true])
|
|
->callMountedAction()
|
|
->assertHasNoActionErrors();
|
|
|
|
$run = InventorySyncRun::query()->where('tenant_id', $tenant->id)->latest('id')->first();
|
|
expect($run)->not->toBeNull();
|
|
expect((bool) ($run->selection_payload['include_foundations'] ?? false))->toBeTrue();
|
|
});
|
|
|
|
it('persists include foundations toggle into the run selection payload', function () {
|
|
Queue::fake();
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
$this->actingAs($user);
|
|
|
|
$tenant->makeCurrent();
|
|
Filament::setTenant($tenant, true);
|
|
|
|
$sync = app(InventorySyncService::class);
|
|
$allTypes = $sync->defaultSelectionPayload()['policy_types'];
|
|
$selectedTypes = array_slice($allTypes, 0, min(2, count($allTypes)));
|
|
|
|
Livewire::test(ListInventoryItems::class)
|
|
->callAction('run_inventory_sync', data: [
|
|
'policy_types' => $selectedTypes,
|
|
'include_foundations' => false,
|
|
])
|
|
->assertHasNoActionErrors();
|
|
|
|
$run = InventorySyncRun::query()->where('tenant_id', $tenant->id)->latest('id')->first();
|
|
expect($run)->not->toBeNull();
|
|
expect((bool) ($run->selection_payload['include_foundations'] ?? true))->toBeFalse();
|
|
});
|
|
|
|
it('rejects cross-tenant initiation attempts (403) with no side effects', function () {
|
|
Queue::fake();
|
|
|
|
[$user, $tenantA] = createUserWithTenant(role: 'owner');
|
|
$tenantB = Tenant::factory()->create();
|
|
|
|
$this->actingAs($user);
|
|
Filament::setTenant($tenantA, true);
|
|
|
|
$sync = app(InventorySyncService::class);
|
|
$allTypes = $sync->defaultSelectionPayload()['policy_types'];
|
|
|
|
Livewire::test(ListInventoryItems::class)
|
|
->callAction('run_inventory_sync', data: ['tenant_id' => $tenantB->getKey(), 'policy_types' => $allTypes])
|
|
->assertStatus(403);
|
|
|
|
Queue::assertNothingPushed();
|
|
|
|
expect(InventorySyncRun::query()->where('tenant_id', $tenantB->id)->exists())->toBeFalse();
|
|
expect(OperationRun::query()->where('tenant_id', $tenantB->id)->exists())->toBeFalse();
|
|
});
|
|
|
|
it('blocks dispatch when a matching run is already pending or running', function () {
|
|
Queue::fake();
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
$this->actingAs($user);
|
|
Filament::setTenant($tenant, true);
|
|
|
|
$sync = app(InventorySyncService::class);
|
|
$selectionPayload = $sync->defaultSelectionPayload();
|
|
$computed = $sync->normalizeAndHashSelection($selectionPayload);
|
|
|
|
InventorySyncRun::query()->create([
|
|
'tenant_id' => $tenant->getKey(),
|
|
'user_id' => $user->getKey(),
|
|
'selection_hash' => $computed['selection_hash'],
|
|
'selection_payload' => $computed['selection'],
|
|
'status' => InventorySyncRun::STATUS_RUNNING,
|
|
'had_errors' => false,
|
|
'error_codes' => [],
|
|
'error_context' => null,
|
|
'started_at' => now(),
|
|
'finished_at' => null,
|
|
'items_observed_count' => 0,
|
|
'items_upserted_count' => 0,
|
|
'errors_count' => 0,
|
|
]);
|
|
|
|
Livewire::test(ListInventoryItems::class)
|
|
->callAction('run_inventory_sync', data: ['policy_types' => $computed['selection']['policy_types']]);
|
|
|
|
Queue::assertNothingPushed();
|
|
expect(InventorySyncRun::query()->where('tenant_id', $tenant->id)->count())->toBe(1);
|
|
expect(OperationRun::query()->where('tenant_id', $tenant->id)->where('type', 'inventory.sync')->count())->toBe(1);
|
|
});
|
|
|
|
it('forbids unauthorized users from starting inventory sync', function () {
|
|
Queue::fake();
|
|
|
|
[$user, $tenant] = createUserWithTenant(role: 'readonly');
|
|
$this->actingAs($user);
|
|
Filament::setTenant($tenant, true);
|
|
|
|
Livewire::test(ListInventoryItems::class)
|
|
->assertActionHidden('run_inventory_sync');
|
|
|
|
Queue::assertNothingPushed();
|
|
expect(InventorySyncRun::query()->where('tenant_id', $tenant->id)->exists())->toBeFalse();
|
|
});
|