Unverified Commit 7f8d8062 authored by John Davis's avatar John Davis Committed by GitHub
Browse files

Merge pull request #16365 from mvdbeek/fix_invocation_progress_bar_for_skipped_and_deleted_jobs 

[23.1] Fix invocation progress bar for skipped and deleted jobs
parents a662d803 67a5b015

client/src/components/JobInformation/JobInformation.vue

+9 −5
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;