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
128 lines
4.0 KiB
PHP
128 lines
4.0 KiB
PHP
<?php
|
|
|
|
use App\Filament\Resources\BackupSetResource;
|
|
use App\Models\BackupItem;
|
|
use App\Models\BackupSet;
|
|
use App\Models\OperationRun;
|
|
use App\Models\RestoreRun;
|
|
use App\Models\Tenant;
|
|
use App\Models\User;
|
|
use Filament\Facades\Filament;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
use Livewire\Livewire;
|
|
|
|
uses(RefreshDatabase::class);
|
|
|
|
test('backup sets table bulk archive creates a run and archives selected sets', function () {
|
|
$tenant = Tenant::factory()->create();
|
|
$user = User::factory()->create();
|
|
$user->tenants()->syncWithoutDetaching([
|
|
$tenant->getKey() => ['role' => 'owner'],
|
|
]);
|
|
|
|
Filament::setTenant($tenant, true);
|
|
|
|
$sets = collect(range(1, 3))->map(function (int $i) use ($tenant) {
|
|
return BackupSet::create([
|
|
'tenant_id' => $tenant->id,
|
|
'name' => 'Backup '.$i,
|
|
'status' => 'completed',
|
|
'item_count' => 1,
|
|
]);
|
|
});
|
|
|
|
$sets->each(function (BackupSet $set) use ($tenant) {
|
|
BackupItem::create([
|
|
'tenant_id' => $tenant->id,
|
|
'backup_set_id' => $set->id,
|
|
'policy_id' => null,
|
|
'policy_identifier' => 'policy-'.$set->id,
|
|
'policy_type' => 'deviceConfiguration',
|
|
'platform' => 'windows10',
|
|
'payload' => ['id' => 'policy-'.$set->id],
|
|
'metadata' => null,
|
|
]);
|
|
});
|
|
|
|
Livewire::actingAs($user)
|
|
->test(BackupSetResource\Pages\ListBackupSets::class)
|
|
->callTableBulkAction('bulk_delete', $sets)
|
|
->assertHasNoTableBulkActionErrors();
|
|
|
|
$sets->each(fn (BackupSet $set) => expect(BackupSet::withTrashed()->find($set->id)?->trashed())->toBeTrue());
|
|
|
|
$opRun = OperationRun::query()
|
|
->where('tenant_id', $tenant->id)
|
|
->where('user_id', $user->id)
|
|
->where('type', 'backup_set.delete')
|
|
->latest('id')
|
|
->first();
|
|
|
|
expect($opRun)->not->toBeNull();
|
|
expect($opRun->status)->toBe('completed');
|
|
});
|
|
|
|
test('backup sets can be archived even when referenced by restore runs', function () {
|
|
$tenant = Tenant::factory()->create();
|
|
$user = User::factory()->create();
|
|
$user->tenants()->syncWithoutDetaching([
|
|
$tenant->getKey() => ['role' => 'owner'],
|
|
]);
|
|
|
|
Filament::setTenant($tenant, true);
|
|
|
|
$set = BackupSet::create([
|
|
'tenant_id' => $tenant->id,
|
|
'name' => 'Backup',
|
|
'status' => 'completed',
|
|
'item_count' => 0,
|
|
]);
|
|
|
|
$restoreRun = RestoreRun::create([
|
|
'tenant_id' => $tenant->id,
|
|
'backup_set_id' => $set->id,
|
|
'status' => 'completed',
|
|
'is_dry_run' => true,
|
|
'requested_by' => 'tester@example.com',
|
|
]);
|
|
|
|
Livewire::actingAs($user)
|
|
->test(BackupSetResource\Pages\ListBackupSets::class)
|
|
->callTableBulkAction('bulk_delete', collect([$set]))
|
|
->assertHasNoTableBulkActionErrors();
|
|
|
|
expect(BackupSet::withTrashed()->find($set->id)?->trashed())->toBeTrue();
|
|
expect(RestoreRun::withTrashed()->find($restoreRun->id))->not->toBeNull();
|
|
});
|
|
|
|
test('backup sets table bulk archive requires type-to-confirm for 10+ sets', function () {
|
|
$tenant = Tenant::factory()->create();
|
|
$user = User::factory()->create();
|
|
$user->tenants()->syncWithoutDetaching([
|
|
$tenant->getKey() => ['role' => 'owner'],
|
|
]);
|
|
|
|
Filament::setTenant($tenant, true);
|
|
|
|
$sets = collect(range(1, 10))->map(function (int $i) use ($tenant) {
|
|
return BackupSet::create([
|
|
'tenant_id' => $tenant->id,
|
|
'name' => 'Backup '.$i,
|
|
'status' => 'completed',
|
|
'item_count' => 0,
|
|
]);
|
|
});
|
|
|
|
Livewire::actingAs($user)
|
|
->test(BackupSetResource\Pages\ListBackupSets::class)
|
|
->callTableBulkAction('bulk_delete', $sets)
|
|
->assertHasTableBulkActionErrors();
|
|
|
|
Livewire::actingAs($user)
|
|
->test(BackupSetResource\Pages\ListBackupSets::class)
|
|
->callTableBulkAction('bulk_delete', $sets, data: [
|
|
'confirmation' => 'DELETE',
|
|
])
|
|
->assertHasNoTableBulkActionErrors();
|
|
});
|