Add config option to order queued but not started jobs first

romanzipp · May 2, 2024 · 86cb0e4 · 86cb0e4
1 parent a06a41a
commit 86cb0e4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/config/queue-monitor.php b/config/queue-monitor.php
@@ -53,5 +53,8 @@
 
         // The interval before refreshing the dashboard (in seconds).
         'refresh_interval' => null,
+
+        // Order the queued but not started jobs first
+        'order_queued_first' => false
     ],
 ];
diff --git a/src/Controllers/ShowQueueMonitorController.php b/src/Controllers/ShowQueueMonitorController.php
@@ -54,6 +54,22 @@ public function __invoke(Request $request)
             $jobsQuery->where('data', 'like', "%{$filters['custom_data']}%");
         }
 
+        if (config('queue-monitor.ui.order_queued_first')) {
+            $connection = DB::connection();
+
+            if ($connection instanceof DatabaseConnections\MySqlConnection) {
+                $jobsQuery->orderByRaw('-`started_at`');
+            }
+
+            if ($connection instanceof DatabaseConnections\SqlServerConnection) {
+                $jobsQuery->orderByRaw('(CASE WHEN [started_at] IS NULL THEN 0 ELSE 1 END)');
+            }
+
+            if ($connection instanceof DatabaseConnections\SQLiteConnection) {
+                $jobsQuery->orderByRaw('started_at DESC NULLS FIRST');
+            }
+        }
+
         $jobsQuery
             ->orderBy('started_at', 'desc')
             ->orderBy('started_at_exact', 'desc');