Kurzbeschreibung Versteckt die Rerun-Row-Action für archivierte (soft-deleted) RestoreRuns und verhindert damit fehlerhafte Neu-Starts aus dem Archiv; ergänzt einen Regressionstest. Änderungen Code: RestoreRunResource.php — Sichtbarkeit der rerun-Action geprüft auf ! $record->trashed() und defensive Abbruchprüfung im Action-Handler. Tests: RestoreRunRerunTest.php — neuer Test rerun action is hidden for archived restore runs. Warum Archivierte RestoreRuns durften nicht neu gestartet werden; UI zeigte trotzdem die Option. Das führte zu verwirrendem Verhalten und möglichen Fehlern beim Enqueueing. Verifikation / QA Unit/Feature: ./vendor/bin/sail artisan test tests/Feature/RestoreRunRerunTest.php Stil/format: ./vendor/bin/pint --dirty Manuell (UI): Als Tenant-Admin Filament → Restore Runs öffnen. Filter Archived aktivieren (oder Trashed filter auswählen). Sicherstellen, dass für archivierte Einträge die Rerun-Action nicht sichtbar ist. Auf einem aktiven (nicht-archivierten) Run prüfen, dass Rerun sichtbar bleibt und wie erwartet eine neue RestoreRun erzeugt. Wichtige Hinweise Kein DB-Migration required. Diese PR enthält nur den UI-/Filament-Fix; die zuvor gemachten operative Fixes für Queue/adapter-Reconciliation bleiben ebenfalls auf dem Branch (z. B. frühere commits während der Debugging-Session). T055 (Schema squash) wurde bewusst zurückgestellt und ist nicht Teil dieses PRs. Merge-Checklist Tests lokal laufen (RestoreRunRerunTest grünt) Pint läuft ohne ungepatchte Fehler Branch gepusht: 056-remove-legacy-bulkops (PR-URL: https://git.cloudarix.de/ahmido/TenantAtlas/compare/dev...056-remove-legacy-bulkops) Co-authored-by: Ahmed Darrazi <ahmeddarrazi@adsmac.local> Reviewed-on: #65
121 lines
3.6 KiB
PHP
121 lines
3.6 KiB
PHP
<?php
|
|
|
|
declare(strict_types=1);
|
|
|
|
use App\Models\OperationRun;
|
|
use App\Services\OperationRunService;
|
|
use Filament\Facades\Filament;
|
|
|
|
it('renders only whitelisted numeric summary counts in terminal notifications', function (): void {
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
$this->actingAs($user);
|
|
|
|
Filament::setTenant($tenant, true);
|
|
|
|
$run = OperationRun::factory()->create([
|
|
'tenant_id' => $tenant->getKey(),
|
|
'user_id' => $user->getKey(),
|
|
'initiator_name' => $user->name,
|
|
'type' => 'inventory.sync',
|
|
'status' => 'queued',
|
|
'outcome' => 'pending',
|
|
'context' => ['scope' => 'all'],
|
|
]);
|
|
|
|
/** @var OperationRunService $service */
|
|
$service = app(OperationRunService::class);
|
|
|
|
$service->updateRun(
|
|
$run,
|
|
status: 'completed',
|
|
outcome: 'succeeded',
|
|
summaryCounts: [
|
|
'total' => '10',
|
|
'processed' => 5.2,
|
|
'failed' => 'nope',
|
|
'secrets' => 123,
|
|
],
|
|
failures: [],
|
|
);
|
|
|
|
$notification = $user->notifications()->latest('id')->first();
|
|
expect($notification)->not->toBeNull();
|
|
|
|
$body = (string) ($notification->data['body'] ?? '');
|
|
|
|
expect($body)->toContain('Summary:');
|
|
expect($body)->toContain('total: 10');
|
|
expect($body)->toContain('processed: 5');
|
|
expect($body)->not->toContain('secrets');
|
|
expect($body)->not->toContain('failed:');
|
|
})->group('ops-ux');
|
|
|
|
it('sanitizes summary_counts values and drops non-whitelisted keys', function (): void {
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
$this->actingAs($user);
|
|
|
|
$run = OperationRun::factory()->create([
|
|
'tenant_id' => $tenant->getKey(),
|
|
'user_id' => $user->getKey(),
|
|
'initiator_name' => $user->name,
|
|
'type' => 'policy.delete',
|
|
'status' => 'queued',
|
|
'outcome' => 'pending',
|
|
'context' => ['operation' => ['type' => 'policy.delete']],
|
|
'summary_counts' => [],
|
|
]);
|
|
|
|
/** @var OperationRunService $service */
|
|
$service = app(OperationRunService::class);
|
|
|
|
$service->updateRun(
|
|
$run,
|
|
status: 'running',
|
|
outcome: null,
|
|
summaryCounts: [
|
|
'processed' => '2',
|
|
'failed' => 1.2,
|
|
'secrets' => 999,
|
|
'' => 5,
|
|
'total' => 'not-a-number',
|
|
],
|
|
);
|
|
|
|
$run->refresh();
|
|
|
|
expect($run->summary_counts['processed'] ?? null)->toBe(2);
|
|
expect($run->summary_counts['failed'] ?? null)->toBe(1);
|
|
expect($run->summary_counts)->not->toHaveKey('secrets');
|
|
expect($run->summary_counts)->not->toHaveKey('');
|
|
expect($run->summary_counts)->not->toHaveKey('total');
|
|
})->group('ops-ux');
|
|
|
|
it('ignores non-whitelisted keys when incrementing summary_counts', function (): void {
|
|
[$user, $tenant] = createUserWithTenant(role: 'owner');
|
|
$this->actingAs($user);
|
|
|
|
$run = OperationRun::factory()->create([
|
|
'tenant_id' => $tenant->getKey(),
|
|
'user_id' => $user->getKey(),
|
|
'initiator_name' => $user->name,
|
|
'type' => 'policy.delete',
|
|
'status' => 'queued',
|
|
'outcome' => 'pending',
|
|
'context' => ['operation' => ['type' => 'policy.delete']],
|
|
'summary_counts' => ['processed' => 1, 'secrets' => 5],
|
|
]);
|
|
|
|
/** @var OperationRunService $service */
|
|
$service = app(OperationRunService::class);
|
|
|
|
$service->incrementSummaryCounts($run, [
|
|
'processed' => 1,
|
|
'secrets' => 10,
|
|
]);
|
|
|
|
$run->refresh();
|
|
|
|
expect($run->summary_counts['processed'] ?? null)->toBe(2);
|
|
expect($run->summary_counts)->not->toHaveKey('secrets');
|
|
})->group('ops-ux');
|