From 1f5a808e9a5e65b7e58d99fbadd29947a7c17ade Mon Sep 17 00:00:00 2001 From: Martin Cech Date: Thu, 5 Jun 2025 11:29:07 +0200 Subject: [PATCH 1/4] fix the filtering for "unfinished jobs" to all non-terminal do not mention cutoff when all unfinished are displayed drop mention of regex for search, that is not implemented --- client/src/components/admin/JobsList.vue | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/client/src/components/admin/JobsList.vue b/client/src/components/admin/JobsList.vue index b69fb2ddacc..2be0fa7c27d 100644 --- a/client/src/components/admin/JobsList.vue +++ b/client/src/components/admin/JobsList.vue @@ -35,7 +35,7 @@ - + @@ -183,7 +183,12 @@ export default { return `These jobs have completed in the previous ${this.cutoffMin} minutes.`; }, runningTableCaption() { - return `These jobs are unfinished and have had their state updated in the previous ${this.cutoffMin} minutes. For currently running jobs, the "Last Update" column should indicate the runtime so far.`; + let message = `These jobs are unfinished`; + if (!this.showAllRunning) { + message += ` and have had their state updated in the previous ${this.cutoffMin} minutes`; + } + message += `. For currently running jobs, the "Last Update" column should indicate the runtime so far.`; + return message; }, finishedNoJobsMessage() { return `There are no recently finished jobs to show with current cutoff time of ${this.cutoffMin} minutes.`; @@ -238,7 +243,7 @@ export default { this.busy = true; const params = { view: "admin_job_list" }; if (this.showAllRunning) { - params.state = "running"; + params.state = NON_TERMINAL_STATES; } else { const cutoff = Math.floor(this.cutoffMin); const dateRangeMin = new Date(Date.now() - cutoff * 60 * 1000).toISOString(); From 7d9155d38f5cee2afbd96a013148e10c8b69efc8 Mon Sep 17 00:00:00 2001 From: Martin Cech Date: Thu, 5 Jun 2025 11:36:18 +0200 Subject: [PATCH 2/4] drop description for a hidden form element --- client/src/components/admin/JobsList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/admin/JobsList.vue b/client/src/components/admin/JobsList.vue index 2be0fa7c27d..2274a69dcb9 100644 --- a/client/src/components/admin/JobsList.vue +++ b/client/src/components/admin/JobsList.vue @@ -19,7 +19,7 @@

- + {{ showAllRunning ? "Showing all unfinished jobs" : "Time cutoff applied to query" }} From 7ea330c8d7419e75a736b927cac3db5315a675e4 Mon Sep 17 00:00:00 2001 From: Martin Cech Date: Thu, 5 Jun 2025 11:48:57 +0200 Subject: [PATCH 3/4] clarify admin help for jobs page --- client/src/components/admin/JobsList.vue | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/client/src/components/admin/JobsList.vue b/client/src/components/admin/JobsList.vue index 2274a69dcb9..c1584d59e00 100644 --- a/client/src/components/admin/JobsList.vue +++ b/client/src/components/admin/JobsList.vue @@ -8,12 +8,15 @@ Job Overview

- Below unfinished jobs are displayed (in the 'new', 'queued', 'running', or 'upload' states) and recently - completed jobs (in 'error' or 'ok' states). + Unfinished jobs (in the 'new', 'queued', 'running', or 'waiting' states) and finished + jobs (in 'error' or 'ok' states) are displayed below.

- You may choose to stop some of the displayed jobs and provide the user with a message. Your stop message - will be displayed to the user as: "This job was stopped by an administrator: + You may choose to stop some of the unfinished jobs and provide the user with a message. Your stop message + will be displayed to the user as: +

+

+ "This job was stopped by an administrator: <YOUR MESSAGE> For more information or help, report this error".

From a7a61f18155cf289f99932fa0a22ec43d595d201 Mon Sep 17 00:00:00 2001 From: Martin Cech Date: Thu, 5 Jun 2025 11:53:19 +0200 Subject: [PATCH 4/4] client format lint --- client/src/components/admin/JobsList.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/client/src/components/admin/JobsList.vue b/client/src/components/admin/JobsList.vue index c1584d59e00..b96f11faaa7 100644 --- a/client/src/components/admin/JobsList.vue +++ b/client/src/components/admin/JobsList.vue @@ -8,14 +8,14 @@ Job Overview

- Unfinished jobs (in the 'new', 'queued', 'running', or 'waiting' states) and finished - jobs (in 'error' or 'ok' states) are displayed below. + Unfinished jobs (in the 'new', 'queued', 'running', or 'waiting' states) and finished jobs (in 'error' or + 'ok' states) are displayed below.

You may choose to stop some of the unfinished jobs and provide the user with a message. Your stop message will be displayed to the user as: -

-

+

+

"This job was stopped by an administrator: <YOUR MESSAGE> For more information or help, report this error".