From c33132d8d9a546a2c4989a5a8b4bce7f1b38002a Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 3 Jan 2025 20:39:27 +0100
Subject: [PATCH] fix: show backup timezone on the UI

---
 app/Livewire/Project/Database/BackupEdit.php           |  4 ++++
 .../livewire/project/database/backup-edit.blade.php    |  2 ++
 .../project/database/scheduled-backups.blade.php       | 10 ++++++----
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/Livewire/Project/Database/BackupEdit.php b/app/Livewire/Project/Database/BackupEdit.php
index b3a54f0ab..bf5302cb9 100644
--- a/app/Livewire/Project/Database/BackupEdit.php
+++ b/app/Livewire/Project/Database/BackupEdit.php
@@ -40,6 +40,9 @@ class BackupEdit extends Component
     #[Validate(['required', 'string'])]
     public string $frequency = '';
 
+    #[Validate(['readonly', 'string'])]
+    public string $timezone = '';
+
     #[Validate(['required', 'integer', 'min:1'])]
     public int $numberOfBackupsLocally = 1;
 
@@ -80,6 +83,7 @@ class BackupEdit extends Component
         } else {
             $this->backupEnabled = $this->backup->enabled;
             $this->frequency = $this->backup->frequency;
+            $this->timezone = data_get($this->backup->server(), 'settings.server_timezone', 'Instance timezone');
             $this->numberOfBackupsLocally = $this->backup->number_of_backups_locally;
             $this->saveS3 = $this->backup->save_s3;
             $this->s3StorageId = $this->backup->s3_storage_id;
diff --git a/resources/views/livewire/project/database/backup-edit.blade.php b/resources/views/livewire/project/database/backup-edit.blade.php
index b91b35802..59628636d 100644
--- a/resources/views/livewire/project/database/backup-edit.blade.php
+++ b/resources/views/livewire/project/database/backup-edit.blade.php
@@ -70,6 +70,8 @@
         </div>
         <div class="flex gap-2">
             <x-forms.input label="Frequency" id="frequency" />
+            <x-forms.input label="Timezone" id="timezone" disabled
+                helper="The timezone of the server where the backup is scheduled to run (if not set, the instance timezone will be used)" />
             <x-forms.input label="Number of backups to keep (locally)" id="numberOfBackupsLocally" />
         </div>
     </div>
diff --git a/resources/views/livewire/project/database/scheduled-backups.blade.php b/resources/views/livewire/project/database/scheduled-backups.blade.php
index d468f090a..e8d66d9ee 100644
--- a/resources/views/livewire/project/database/scheduled-backups.blade.php
+++ b/resources/views/livewire/project/database/scheduled-backups.blade.php
@@ -5,9 +5,10 @@
                 <a class="box"
                     href="{{ route('project.database.backup.execution', [...$parameters, 'backup_uuid' => $backup->uuid]) }}">
                     <div class="flex flex-col">
-                        <div>Frequency: {{ $backup->frequency }}</div>
+                        <div>Frequency: {{ $backup->frequency }}
+                            ({{ data_get($backup->server(), 'settings.server_timezone', 'Instance timezone') }})
+                        </div>
                         <div>Last backup: {{ data_get($backup->latest_log, 'status', 'No backup yet') }}</div>
-                        <div>Number of backups to keep (locally): {{ $backup->number_of_backups_locally }}</div>
                     </div>
                 </a>
             @else
@@ -17,9 +18,10 @@
                             data_get($backup, 'id') === data_get($selectedBackup, 'id'),
                         'flex flex-col border-l-2 border-transparent',
                     ])>
-                        <div>Frequency: {{ $backup->frequency }}</div>
+                        <div>Frequency: {{ $backup->frequency }}
+                            ({{ data_get($backup->server(), 'settings.server_timezone', 'Instance timezone') }})
+                        </div>
                         <div>Last backup: {{ data_get($backup->latest_log, 'status', 'No backup yet') }}</div>
-                        <div>Number of backups to keep (locally): {{ $backup->number_of_backups_locally }}</div>
                     </div>
                 </div>
             @endif