opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-01 15:37:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16365 from mvdbeek/fix_invocation_progress_bar_for_skipped_and_deleted_jobs

Browse Source 
[23.1] Fix invocation progress bar for skipped and deleted jobs
This commit is contained in:
John Davis
2023-07-03 13:57:46 -04:00
committed by GitHub
parent a662d8034c 67a5b015cb
commit 7f8d8062dd
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/components/JobInformation/JobInformation.vue
+9 -5
View File
@@ -5,7 +5,7 @@
<table id="job-information" class="tabletip info_data_table">
<tbody>
<tr v-if="job && job.tool_id">
<td>Galaxy Tool ID:</td>
<td>Galaxy Tool ID</td>
<td id="galaxy-tool-id">
{{ job.tool_id }}
<copy-to-clipboard
@@ -14,8 +14,12 @@
title="Copy Tool ID" />
</td>
</tr>
<tr v-if="job && job.state">
<td>Job State</td>
<td data-description="galaxy-job-state">{{ job.state }}</td>
</tr>
<tr v-if="job && job.tool_version">
<td>Galaxy Tool Version:</td>
<td>Galaxy Tool Version</td>
<td id="galaxy-tool-version">{{ job.tool_version }}</td>
</tr>
<tr v-if="job && includeTimes">
@@ -45,7 +49,7 @@
:code-label="'Unexpected Job Errors'"
:code-item="job.traceback" />
<tr v-if="job">
<td>Tool Exit Code:</td>
<td>Tool Exit Code</td>
<td id="exit-code">{{ job.exit_code }}</td>
</tr>
<tr v-if="job && job.job_messages && job.job_messages.length > 0" id="job-messages">
@@ -58,11 +62,11 @@
</tr>
<slot></slot>
<tr v-if="job && job.id">
<td>Job API ID:</td>
<td>Job API ID</td>
<td id="encoded-job-id">{{ job.id }} <decoded-id :id="job.id" /></td>
</tr>
<tr v-if="job && job.copied_from_job_id">
<td>Copied from Job API ID:</td>
<td>Copied from Job API ID</td>
<td id="encoded-copied-from-job-id">
{{ job.copied_from_job_id }} <decoded-id :id="job.copied_from_job_id" />
</td>
client/src/components/JobStates/mixin.js
+2 -2
View File
@@ -24,10 +24,10 @@ export default {
return this.countStates(["running"]);
},
okCount() {
return this.countStates(["ok"]);
return this.countStates(["ok", "skipped"]);
},
errorCount() {
return this.countStates(["error"]);
return this.countStates(["error", "deleted"]);
},
newCount() {
return this.jobCount - this.okCount - this.runningCount - this.errorCount;
client/src/utils/job-states-model.js
+1 -1
View File
@@ -6,7 +6,7 @@ import AJAX_QUEUE from "utils/ajax-queue";
var UPDATE_DELAY = 2000;
var NON_TERMINAL_STATES = ["new", "queued", "running", "waiting"];
var ERROR_STATES = ["error", "deleted"];
var TERMINAL_STATES = ["ok"].concat(ERROR_STATES);
var TERMINAL_STATES = ["ok", "skipped"].concat(ERROR_STATES);
const POPULATED_STATE_FAILED = "failed";
/** Fetch state on add or just wait for polling to start. */
var FETCH_STATE_ON_ADD = false;