ahmido
a97beefda3
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
104 lines
3.2 KiB
PHP
104 lines
3.2 KiB
PHP
<?php
|
|
|
|
use App\Filament\Resources\TenantResource\Pages\ListTenants;
|
|
use App\Jobs\BulkTenantSyncJob;
|
|
use App\Models\Tenant;
|
|
use App\Models\User;
|
|
use Filament\Events\TenantSet;
|
|
use Filament\Facades\Filament;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
use Illuminate\Support\Facades\Bus;
|
|
use Livewire\Livewire;
|
|
|
|
uses(RefreshDatabase::class);
|
|
|
|
test('tenant-scoped pages return 404 for unauthorized tenant', function () {
|
|
[$user, $authorizedTenant] = createUserWithTenant();
|
|
$unauthorizedTenant = Tenant::factory()->create();
|
|
|
|
$this->actingAs($user)
|
|
->get(route('filament.admin.resources.policies.index', filamentTenantRouteParams($unauthorizedTenant)))
|
|
->assertNotFound();
|
|
});
|
|
|
|
test('tenant portfolio lists only tenants the user can access', function () {
|
|
$user = User::factory()->create();
|
|
$this->actingAs($user);
|
|
|
|
$authorizedTenant = Tenant::factory()->create([
|
|
'tenant_id' => 'tenant-portfolio-authorized',
|
|
'name' => 'Authorized Tenant',
|
|
]);
|
|
|
|
$unauthorizedTenant = Tenant::factory()->create([
|
|
'tenant_id' => 'tenant-portfolio-unauthorized',
|
|
'name' => 'Unauthorized Tenant',
|
|
]);
|
|
|
|
$user->tenants()->syncWithoutDetaching([
|
|
$authorizedTenant->getKey() => ['role' => 'owner'],
|
|
]);
|
|
|
|
$this->get(route('filament.admin.resources.tenants.index', filamentTenantRouteParams($authorizedTenant)))
|
|
->assertOk()
|
|
->assertSee($authorizedTenant->name)
|
|
->assertDontSee($unauthorizedTenant->name);
|
|
});
|
|
|
|
test('tenant portfolio bulk sync dispatches one job per eligible tenant', function () {
|
|
Bus::fake();
|
|
|
|
$user = User::factory()->create();
|
|
$this->actingAs($user);
|
|
|
|
$tenantA = Tenant::factory()->create(['tenant_id' => 'tenant-bulk-a']);
|
|
$tenantB = Tenant::factory()->create(['tenant_id' => 'tenant-bulk-b']);
|
|
|
|
$user->tenants()->syncWithoutDetaching([
|
|
$tenantA->getKey() => ['role' => 'owner'],
|
|
$tenantB->getKey() => ['role' => 'operator'],
|
|
]);
|
|
|
|
Filament::setTenant($tenantA, true);
|
|
|
|
Livewire::test(ListTenants::class)
|
|
->assertTableBulkActionVisible('syncSelected')
|
|
->callTableBulkAction('syncSelected', collect([$tenantA, $tenantB]));
|
|
|
|
Bus::assertDispatchedTimes(BulkTenantSyncJob::class, 1);
|
|
|
|
$this->assertDatabaseHas('operation_runs', [
|
|
'tenant_id' => $tenantA->id,
|
|
'user_id' => $user->id,
|
|
'type' => 'tenant.sync',
|
|
'status' => 'queued',
|
|
]);
|
|
});
|
|
|
|
test('tenant portfolio bulk sync is hidden for readonly users', function () {
|
|
$user = User::factory()->create();
|
|
$this->actingAs($user);
|
|
|
|
$tenant = Tenant::factory()->create(['tenant_id' => 'tenant-bulk-readonly']);
|
|
|
|
$user->tenants()->syncWithoutDetaching([
|
|
$tenant->getKey() => ['role' => 'readonly'],
|
|
]);
|
|
|
|
Filament::setTenant($tenant, true);
|
|
|
|
Livewire::test(ListTenants::class)
|
|
->assertTableBulkActionHidden('syncSelected');
|
|
});
|
|
|
|
test('tenant set event updates user tenant preference last used timestamp', function () {
|
|
[$user, $tenant] = createUserWithTenant();
|
|
|
|
TenantSet::dispatch($tenant, $user);
|
|
|
|
$this->assertDatabaseHas('user_tenant_preferences', [
|
|
'user_id' => $user->id,
|
|
'tenant_id' => $tenant->id,
|
|
]);
|
|
});
|