dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #3300 from Vahor/remove-reverse-scheduled

Browse Source 
fix: recent executions in wrong order in scheduled-task list ui
This commit is contained in:
Andras Bacsai
2024-09-05 11:07:48 +02:00
committed by GitHub
parent 58234ef65e cadb12986c
commit b5232f3d32
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Models/ScheduledDatabaseBackup.php
View File

@@ -22,7 +22,8 @@ class ScheduledDatabaseBackup extends BaseModel
public function executions(): HasMany public function executions(): HasMany
{ {
return $this->hasMany(ScheduledDatabaseBackupExecution::class); // Last execution first
return $this->hasMany(ScheduledDatabaseBackupExecution::class)->orderBy('created_at', 'desc');
} }
public function s3() public function s3()

1
app/Models/ScheduledTask.php
View File

@@ -28,6 +28,7 @@ class ScheduledTask extends BaseModel
public function executions(): HasMany public function executions(): HasMany
{ {
// Last execution first
return $this->hasMany(ScheduledTaskExecution::class)->orderBy('created_at', 'desc'); return $this->hasMany(ScheduledTaskExecution::class)->orderBy('created_at', 'desc');
} }

2
resources/views/livewire/project/database/backup-executions.blade.php
View File

@@ -4,7 +4,7 @@
<h3 class="py-4">Executions</h3> <h3 class="py-4">Executions</h3>
<x-forms.button wire:click='cleanupFailed'>Cleanup Failed Backups</x-forms.button> <x-forms.button wire:click='cleanupFailed'>Cleanup Failed Backups</x-forms.button>
</div> </div>
<div class="flex flex-col-reverse gap-4"> <div class="flex flex-col gap-4">
@forelse($executions as $execution) @forelse($executions as $execution)
<div wire:key="{{ data_get($execution, 'id') }}" @class([ <div wire:key="{{ data_get($execution, 'id') }}" @class([
'flex flex-col border-l-2 transition-colors p-4 ', 'flex flex-col border-l-2 transition-colors p-4 ',

2
resources/views/livewire/project/shared/scheduled-task/executions.blade.php
View File

@@ -1,4 +1,4 @@
<div class="flex flex-col-reverse gap-4"> <div class="flex flex-col gap-4">
@forelse($executions as $execution) @forelse($executions as $execution)
@if (data_get($execution, 'id') == $selectedKey) @if (data_get($execution, 'id') == $selectedKey)
<div class="p-4 mb-2 bg-gray-100 dark:bg-coolgray-200 rounded"> <div class="p-4 mb-2 bg-gray-100 dark:bg-coolgray-200 rounded">

2
resources/views/livewire/project/shared/scheduled-task/show.blade.php
View File

@@ -42,6 +42,6 @@
<div class="pt-4"> <div class="pt-4">
<h3 class="py-4">Recent executions <span class="text-xs text-neutral-500">(click to check output)</span></h3> <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>
</div> </div>