opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20405 from martenson/admin-jobs

Browse Source 
[25.0] Fixes for the admin jobs interface
This commit is contained in:
Marius van den Beek
2025-06-06 12:49:59 +02:00
committed by GitHub
parent 93e1446e4c a7a61f1815
commit 1bf6f51610
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/components/admin/JobsList.vue
+16 -8
View File
@@ -8,18 +8,21 @@
<JobLock />
<Heading h2 size="md" separator>Job Overview</Heading>
<p>
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.
</p>
<p>
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:
</p>
<p>
"This job was stopped by an administrator:
<strong>&lt;YOUR MESSAGE&gt;</strong>
For more information or help, report this error".
</p>
<b-row>
<b-col class="col-sm-4">
<b-form-group description="Select whether or not to use the cutoff below.">
<b-form-group>
<b-form-checkbox id="show-all-running" v-model="showAllRunning" switch size="lg" @change="update">
{{ showAllRunning ? "Showing all unfinished jobs" : "Time cutoff applied to query" }}
</b-form-checkbox>
@@ -35,7 +38,7 @@
</b-input-group>
</b-form-group>
</b-form>
<b-form-group description="Use strings or regular expressions to search jobs.">
<b-form-group>
<IndexFilter v-bind="filterAttrs" id="job-search" v-model="filter" />
</b-form-group>
</b-col>
@@ -183,7 +186,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 +246,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();