Unverified Commit 09686ddb authored by mvdbeek's avatar mvdbeek
Browse files

Fix progress bar for skipped and deleted jobs 

Both would previously appear as running. It sure would be a good idea to
sync the item states and their categorization with the backend schema,
which would have caught these issues. We also seem to have at least two
independent job state classes / mixins / objects, there's surely room
for improvement.
parent a662d803

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;