From 3701e43fc6a40eebb177a74a3bd17b33afdfb612 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Sun, 27 Aug 2023 23:11:04 +0200
Subject: [PATCH] improve job queue counter clarity

---
 ...fd796b7ff92434f5ed4682c4445a02c2c720.json} |  4 ++--
 backend/windmill-api/src/jobs.rs              | 22 +------------------
 .../(logged)/runs/[...path]/+page.svelte      |  2 +-
 3 files changed, 4 insertions(+), 24 deletions(-)
 rename backend/.sqlx/{query-c4fb68ce79c1cec23cadc515285578ca18398504cf703091d06191ff68d95399.json => query-9da1bf41c433c1f781bcc8ea5d86fd796b7ff92434f5ed4682c4445a02c2c720.json} (67%)

diff --git a/backend/.sqlx/query-c4fb68ce79c1cec23cadc515285578ca18398504cf703091d06191ff68d95399.json b/backend/.sqlx/query-9da1bf41c433c1f781bcc8ea5d86fd796b7ff92434f5ed4682c4445a02c2c720.json
similarity index 67%
rename from backend/.sqlx/query-c4fb68ce79c1cec23cadc515285578ca18398504cf703091d06191ff68d95399.json
rename to backend/.sqlx/query-9da1bf41c433c1f781bcc8ea5d86fd796b7ff92434f5ed4682c4445a02c2c720.json
index 4d9d65af17..51711c668c 100644
--- a/backend/.sqlx/query-c4fb68ce79c1cec23cadc515285578ca18398504cf703091d06191ff68d95399.json
+++ b/backend/.sqlx/query-9da1bf41c433c1f781bcc8ea5d86fd796b7ff92434f5ed4682c4445a02c2c720.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT coalesce(COUNT(*), 0) as \"database_length!\" FROM queue WHERE workspace_id = $1",
+  "query": "SELECT coalesce(COUNT(*), 0) as \"database_length!\" FROM queue WHERE workspace_id = $1 AND scheduled_for <= now() AND running = false",
   "describe": {
     "columns": [
       {
@@ -18,5 +18,5 @@
       null
     ]
   },
-  "hash": "c4fb68ce79c1cec23cadc515285578ca18398504cf703091d06191ff68d95399"
+  "hash": "9da1bf41c433c1f781bcc8ea5d86fd796b7ff92434f5ed4682c4445a02c2c720"
 }
diff --git a/backend/windmill-api/src/jobs.rs b/backend/windmill-api/src/jobs.rs
index 6f783d485c..b0f0a8e1c5 100644
--- a/backend/windmill-api/src/jobs.rs
+++ b/backend/windmill-api/src/jobs.rs
@@ -673,26 +673,6 @@ async fn cancel_all(
     Ok(Json(uuids))
 }
 
-// #[derive(Serialize, Debug, FromRow)]
-// struct QueueStats {
-//     database_length: i64,
-// }
-
-// async fn count_waiting_for_executors(
-//     Extension(db): Extension<DB>,
-//     Path(w_id): Path<String>,
-// ) -> error::JsonResult<QueueStats> {
-//     Ok(Json(
-//         sqlx::query_as!(
-//             QueueStats,
-//             "SELECT coalesce(COUNT(*), 0) as \"database_length!\" FROM queue WHERE workspace_id = $1",
-//             w_id
-//         )
-//         .fetch_one(&db)
-//         .await?,
-//     ))
-// }
-
 #[derive(Serialize, Debug, FromRow)]
 struct QueueStats {
     database_length: i64,
@@ -705,7 +685,7 @@ async fn count_queue_jobs(
     Ok(Json(
         sqlx::query_as!(
             QueueStats,
-            "SELECT coalesce(COUNT(*), 0) as \"database_length!\" FROM queue WHERE workspace_id = $1",
+            "SELECT coalesce(COUNT(*), 0) as \"database_length!\" FROM queue WHERE workspace_id = $1 AND scheduled_for <= now() AND running = false",
             w_id
         )
         .fetch_one(&db)
diff --git a/frontend/src/routes/(root)/(logged)/runs/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/runs/[...path]/+page.svelte
index 7ddcfb8047..0767344ca7 100644
--- a/frontend/src/routes/(root)/(logged)/runs/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/runs/[...path]/+page.svelte
@@ -377,7 +377,7 @@
 	<div class="flex flex-col gap-1 md:flex-row w-full p-4">
 		<div class="flex gap-2 grow mb-2">
 			<div class="flex gap-1 relative max-w-36 min-w-[50px]">
-				<div class="text-xs absolute -top-4 truncate">Jobs Running or Queued</div>
+				<div class="text-xs absolute -top-4 truncate">Jobs Waiting for Worker</div>
 				<div class="mt-1">{queue_count ? ($queue_count ?? 0).toFixed(0) : '...'}</div>
 			</div>
 			<div class="flex"