Skip to content

Commit c2e431d

Browse files
committed
refactor: Update StandalonePostgresql database initialization and backup handling
1 parent 6fb88ed commit c2e431d

File tree

2 files changed

+13
-19
lines changed

2 files changed

+13
-19
lines changed

app/Livewire/SettingsBackup.php

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class SettingsBackup extends Component
1616

1717
public $s3s;
1818

19-
public StandalonePostgresql|null|array $database = [];
19+
public ?StandalonePostgresql $database = null;
2020

2121
public ScheduledDatabaseBackup|null|array $backup = [];
2222

@@ -43,26 +43,19 @@ public function mount()
4343
{
4444
if (isInstanceAdmin()) {
4545
$settings = InstanceSettings::get();
46-
$database = StandalonePostgresql::whereName('coolify-db')->first();
46+
$this->database = StandalonePostgresql::whereName('coolify-db')->first();
4747
$s3s = S3Storage::whereTeamId(0)->get() ?? [];
48-
if ($database) {
49-
if ($database->status !== 'running') {
50-
$database->status = 'running';
51-
$database->save();
48+
if ($this->database) {
49+
if ($this->database->status !== 'running') {
50+
$this->database->status = 'running';
51+
$this->database->save();
5252
}
53-
$this->database = $database;
53+
$this->backup = $this->database->scheduledBackups->first();
54+
$this->executions = $this->backup->executions;
5455
}
5556
$this->settings = $settings;
5657
$this->s3s = $s3s;
5758

58-
$scheduledBackups = data_get($this->database, 'scheduledBackups');
59-
if ($scheduledBackups) {
60-
$this->backup = $scheduledBackups->first();
61-
}
62-
$executions = data_get($this->backup, 'executions');
63-
if ($executions) {
64-
$this->executions = $executions;
65-
}
6659
} else {
6760
return redirect()->route('dashboard');
6861
}

resources/views/livewire/settings-backup.blade.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</div>
1515
<div class="pb-4">Backup configuration for Coolify instance.</div>
1616
<div>
17-
@if (isset($database))
17+
@if (isset($database) && isset($backup))
1818
<div class="flex flex-col gap-3 pb-4">
1919
<div class="flex gap-2">
2020
<x-forms.input label="UUID" readonly id="database.uuid" />
@@ -27,14 +27,15 @@
2727
</div>
2828
</div>
2929
<livewire:project.database.backup-edit :backup="$backup" :s3s="$s3s" :status="data_get($database, 'status')" />
30+
<div class="py-4">
31+
<livewire:project.database.backup-executions :backup="$backup" />
32+
</div>
3033
@else
3134
To configure automatic backup for your Coolify instance, you first need to add a database resource
3235
into Coolify.
3336
<x-forms.button class="mt-2" wire:click="add_coolify_database">Add Database</x-forms.button>
3437
@endif
3538
</div>
36-
<div class="py-4">
37-
<livewire:project.database.backup-executions :backup="$backup" />
38-
</div>
39+
3940
</div>
4041
</div>

0 commit comments

Comments
 (0)