From 4fd3185d12cf9b436290bf331901e7695a324a5d Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 5 Jun 2024 11:44:10 +0200
Subject: [PATCH] fix: backup executions view

---
 app/Livewire/Project/Database/BackupExecutions.php           | 2 +-
 .../livewire/project/database/backup-executions.blade.php    | 2 +-
 .../livewire/project/database/backup/execution.blade.php     | 2 +-
 .../views/livewire/project/database/backup/index.blade.php   | 2 +-
 .../livewire/project/database/scheduled-backups.blade.php    | 5 ++---
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/Livewire/Project/Database/BackupExecutions.php b/app/Livewire/Project/Database/BackupExecutions.php
index 5e9319cfd..f53a7b113 100644
--- a/app/Livewire/Project/Database/BackupExecutions.php
+++ b/app/Livewire/Project/Database/BackupExecutions.php
@@ -50,7 +50,7 @@ class BackupExecutions extends Component
     public function refreshBackupExecutions(): void
     {
         if ($this->backup) {
-            $this->executions = $this->backup->executions()->get()->sortByDesc('created_at');
+            $this->executions = $this->backup->executions()->get();
         }
     }
 }
diff --git a/resources/views/livewire/project/database/backup-executions.blade.php b/resources/views/livewire/project/database/backup-executions.blade.php
index dd96e13a9..644ac9fa4 100644
--- a/resources/views/livewire/project/database/backup-executions.blade.php
+++ b/resources/views/livewire/project/database/backup-executions.blade.php
@@ -1,4 +1,4 @@
-<div>
+<div wire:init='refreshBackupExecutions'>
     @isset($backup)
         <div class="flex items-center gap-2">
             <h3 class="py-4">Executions</h3>
diff --git a/resources/views/livewire/project/database/backup/execution.blade.php b/resources/views/livewire/project/database/backup/execution.blade.php
index 9056296fe..79bd9d656 100644
--- a/resources/views/livewire/project/database/backup/execution.blade.php
+++ b/resources/views/livewire/project/database/backup/execution.blade.php
@@ -4,6 +4,6 @@
     <livewire:project.database.heading :database="$database" />
     <div class="pt-6">
         <livewire:project.database.backup-edit :backup="$backup" :s3s="$s3s" :status="data_get($database, 'status')" />
-        <livewire:project.database.backup-executions :backup="$backup" :executions="$executions" />
+        <livewire:project.database.backup-executions :backup="$backup" />
     </div>
 </div>
diff --git a/resources/views/livewire/project/database/backup/index.blade.php b/resources/views/livewire/project/database/backup/index.blade.php
index 2208209c1..7879689a6 100644
--- a/resources/views/livewire/project/database/backup/index.blade.php
+++ b/resources/views/livewire/project/database/backup/index.blade.php
@@ -3,7 +3,7 @@
     <livewire:project.shared.configuration-checker :resource="$database" />
     <livewire:project.database.heading :database="$database" />
     <div class="pt-6">
-        <div class="flex gap-2 ">
+        <div class="flex gap-2">
             <h2 class="pb-4">Scheduled Backups</h2>
             <x-modal-input buttonTitle="+ Add" title="New Scheduled Backup">
                 <livewire:project.database.create-scheduled-backup :database="$database" :s3s="$s3s" />
diff --git a/resources/views/livewire/project/database/scheduled-backups.blade.php b/resources/views/livewire/project/database/scheduled-backups.blade.php
index 0dce5fb9a..66b28eb39 100644
--- a/resources/views/livewire/project/database/scheduled-backups.blade.php
+++ b/resources/views/livewire/project/database/scheduled-backups.blade.php
@@ -1,5 +1,5 @@
 <div>
-    <div class="flex flex-wrap gap-2">
+    <div class="flex flex-col gap-2">
         @forelse($database->scheduledBackups as $backup)
             @if ($type == 'database')
                 <a class="box"
@@ -32,8 +32,7 @@
             <livewire:project.database.backup-edit wire:key="{{ $selectedBackup->id }}" :backup="$selectedBackup"
                 :s3s="$s3s" :status="data_get($database, 'status')" />
             <h3 class="py-4">Executions</h3>
-            <livewire:project.database.backup-executions wire:keykey="{{ $selectedBackup->id }}" :backup="$selectedBackup"
-                :executions="$selectedBackup->executions" />
+            <livewire:project.database.backup-executions wire:key="{{ $selectedBackup->id }}" :backup="$selectedBackup" />
         </div>
     @endif
 </div>