fix: show backup timezone on the UI

This commit is contained in:
Andras Bacsai
2025-01-03 20:39:27 +01:00
parent 4d18e3372d
commit c33132d8d9
3 changed files with 12 additions and 4 deletions

View File

@@ -40,6 +40,9 @@ class BackupEdit extends Component
#[Validate(['required', 'string'])] #[Validate(['required', 'string'])]
public string $frequency = ''; public string $frequency = '';
#[Validate(['readonly', 'string'])]
public string $timezone = '';
#[Validate(['required', 'integer', 'min:1'])] #[Validate(['required', 'integer', 'min:1'])]
public int $numberOfBackupsLocally = 1; public int $numberOfBackupsLocally = 1;
@@ -80,6 +83,7 @@ class BackupEdit extends Component
} else { } else {
$this->backupEnabled = $this->backup->enabled; $this->backupEnabled = $this->backup->enabled;
$this->frequency = $this->backup->frequency; $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->numberOfBackupsLocally = $this->backup->number_of_backups_locally;
$this->saveS3 = $this->backup->save_s3; $this->saveS3 = $this->backup->save_s3;
$this->s3StorageId = $this->backup->s3_storage_id; $this->s3StorageId = $this->backup->s3_storage_id;

View File

@@ -70,6 +70,8 @@
</div> </div>
<div class="flex gap-2"> <div class="flex gap-2">
<x-forms.input label="Frequency" id="frequency" /> <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" /> <x-forms.input label="Number of backups to keep (locally)" id="numberOfBackupsLocally" />
</div> </div>
</div> </div>

View File

@@ -5,9 +5,10 @@
<a class="box" <a class="box"
href="{{ route('project.database.backup.execution', [...$parameters, 'backup_uuid' => $backup->uuid]) }}"> href="{{ route('project.database.backup.execution', [...$parameters, 'backup_uuid' => $backup->uuid]) }}">
<div class="flex flex-col"> <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>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>
</a> </a>
@else @else
@@ -17,9 +18,10 @@
data_get($backup, 'id') === data_get($selectedBackup, 'id'), data_get($backup, 'id') === data_get($selectedBackup, 'id'),
'flex flex-col border-l-2 border-transparent', '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>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>
</div> </div>
@endif @endif