From cadb12986c650c31534c793edc35f2cadf6242ac Mon Sep 17 00:00:00 2001
From: Vahor <me@vahor.fr>
Date: Tue, 3 Sep 2024 17:35:18 +0200
Subject: [PATCH] fix: wrong executions order

---
 app/Models/ScheduledDatabaseBackup.php                        | 3 ++-
 app/Models/ScheduledTask.php                                  | 1 +
 .../livewire/project/database/backup-executions.blade.php     | 2 +-
 .../project/shared/scheduled-task/executions.blade.php        | 4 ++--
 .../livewire/project/shared/scheduled-task/show.blade.php     | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/Models/ScheduledDatabaseBackup.php b/app/Models/ScheduledDatabaseBackup.php
index 2d0e200da..50a0c8173 100644
--- a/app/Models/ScheduledDatabaseBackup.php
+++ b/app/Models/ScheduledDatabaseBackup.php
@@ -22,7 +22,8 @@ class ScheduledDatabaseBackup extends BaseModel
 
     public function executions(): HasMany
     {
-        return $this->hasMany(ScheduledDatabaseBackupExecution::class);
+        // Last execution first
+        return $this->hasMany(ScheduledDatabaseBackupExecution::class)->orderBy('created_at', 'desc');
     }
 
     public function s3()
diff --git a/app/Models/ScheduledTask.php b/app/Models/ScheduledTask.php
index 7b1c0d275..82f0036a5 100644
--- a/app/Models/ScheduledTask.php
+++ b/app/Models/ScheduledTask.php
@@ -28,6 +28,7 @@ class ScheduledTask extends BaseModel
 
     public function executions(): HasMany
     {
+        // Last execution first
         return $this->hasMany(ScheduledTaskExecution::class)->orderBy('created_at', 'desc');
     }
 
diff --git a/resources/views/livewire/project/database/backup-executions.blade.php b/resources/views/livewire/project/database/backup-executions.blade.php
index 6d177505c..fd444b50a 100644
--- a/resources/views/livewire/project/database/backup-executions.blade.php
+++ b/resources/views/livewire/project/database/backup-executions.blade.php
@@ -4,7 +4,7 @@
             <h3 class="py-4">Executions</h3>
             <x-forms.button wire:click='cleanupFailed'>Cleanup Failed Backups</x-forms.button>
         </div>
-        <div class="flex flex-col-reverse gap-4">
+        <div class="flex flex-col gap-4">
             @forelse($executions as $execution)
                 <div wire:key="{{ data_get($execution, 'id') }}" @class([
                     'flex flex-col border-l-2 transition-colors p-4 ',
diff --git a/resources/views/livewire/project/shared/scheduled-task/executions.blade.php b/resources/views/livewire/project/shared/scheduled-task/executions.blade.php
index a52713522..24424f41a 100644
--- a/resources/views/livewire/project/shared/scheduled-task/executions.blade.php
+++ b/resources/views/livewire/project/shared/scheduled-task/executions.blade.php
@@ -1,4 +1,4 @@
-<div class="flex flex-col-reverse gap-4">
+<div class="flex flex-col gap-4">
     @forelse($executions as $execution)
     @if (data_get($execution, 'id') == $selectedKey)
     <div class="p-4 mb-2 bg-gray-100 dark:bg-coolgray-200 rounded">
@@ -33,4 +33,4 @@
     @empty
     <div class="p-4 bg-gray-100 dark:bg-coolgray-200 rounded">No executions found.</div>
     @endforelse
-</div>
\ No newline at end of file
+</div>
diff --git a/resources/views/livewire/project/shared/scheduled-task/show.blade.php b/resources/views/livewire/project/shared/scheduled-task/show.blade.php
index 125a431a4..789065d71 100644
--- a/resources/views/livewire/project/shared/scheduled-task/show.blade.php
+++ b/resources/views/livewire/project/shared/scheduled-task/show.blade.php
@@ -42,6 +42,6 @@
 
         <div class="pt-4">
             <h3 class="py-4">Recent executions <span class="text-xs text-neutral-500">(click to check output)</span></h3>
-            <livewire:project.shared.scheduled-task.executions :task="$task" key="{{ $task->id }}" selectedKey="" :executions="$task->executions->take(-20)" />
+            <livewire:project.shared.scheduled-task.executions :task="$task" key="{{ $task->id }}" selectedKey="" :executions="$task->executions->take(20)" />
         </div>
 </div>