From 0fd4a042a72df8dc3ce640b6ec4b786601865538 Mon Sep 17 00:00:00 2001
From: Ahmed Darrazi <ahmeddarrazi@adsmac.local>
Date: Mon, 5 Jan 2026 10:50:31 +0100
Subject: [PATCH] fix(backup-scheduling): show next run in schedule timezone

---
 .../Resources/BackupScheduleResource.php      | 16 +++++++++++-
 .../BackupScheduleCrudTest.php                | 25 +++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/app/Filament/Resources/BackupScheduleResource.php b/app/Filament/Resources/BackupScheduleResource.php
index c0d959e..755ed74 100644
--- a/app/Filament/Resources/BackupScheduleResource.php
+++ b/app/Filament/Resources/BackupScheduleResource.php
@@ -279,7 +279,21 @@ public static function table(Table $table): Table
 
                 TextColumn::make('next_run_at')
                     ->label('Next run')
-                    ->dateTime()
+                    ->getStateUsing(function (BackupSchedule $record): ?string {
+                        $nextRun = $record->next_run_at;
+
+                        if (! $nextRun) {
+                            return null;
+                        }
+
+                        $timezone = $record->timezone ?: 'UTC';
+
+                        try {
+                            return $nextRun->setTimezone($timezone)->format('M j, Y H:i:s');
+                        } catch (\Throwable) {
+                            return $nextRun->format('M j, Y H:i:s');
+                        }
+                    })
                     ->sortable(),
             ])
             ->filters([
diff --git a/tests/Feature/BackupScheduling/BackupScheduleCrudTest.php b/tests/Feature/BackupScheduling/BackupScheduleCrudTest.php
index 90c9f73..59a0e79 100644
--- a/tests/Feature/BackupScheduling/BackupScheduleCrudTest.php
+++ b/tests/Feature/BackupScheduling/BackupScheduleCrudTest.php
@@ -4,6 +4,7 @@
 use App\Filament\Resources\BackupScheduleResource\Pages\EditBackupSchedule;
 use App\Models\BackupSchedule;
 use App\Models\Tenant;
+use Carbon\CarbonImmutable;
 use Filament\Facades\Filament;
 use Livewire\Livewire;
 
@@ -48,6 +49,30 @@
         ->assertDontSee('Tenant B schedule');
 });
 
+test('backup schedules listing shows next run in schedule timezone', function () {
+    [$user, $tenant] = createUserWithTenant(role: 'manager');
+
+    BackupSchedule::query()->create([
+        'tenant_id' => $tenant->id,
+        'name' => 'Berlin schedule',
+        'is_enabled' => true,
+        'timezone' => 'Europe/Berlin',
+        'frequency' => 'daily',
+        'time_of_day' => '10:17:00',
+        'days_of_week' => null,
+        'policy_types' => ['deviceConfiguration'],
+        'include_foundations' => true,
+        'retention_keep_last' => 30,
+        'next_run_at' => CarbonImmutable::create(2026, 1, 5, 9, 17, 0, 'UTC'),
+    ]);
+
+    $this->actingAs($user);
+
+    $this->get(route('filament.admin.resources.backup-schedules.index', filamentTenantRouteParams($tenant)))
+        ->assertOk()
+        ->assertSee('Jan 5, 2026 10:17:00');
+});
+
 test('backup schedules pages return 404 for unauthorized tenant', function () {
     [$user] = createUserWithTenant(role: 'manager');
     $unauthorizedTenant = Tenant::factory()->create();