Commit bf1ba383 authored by Cage, Gregory's avatar Cage, Gregory
Browse files

Display stopped as job state if job was stopped and color stopped datasets in history

parent 80518e38

client/src/components/History/Content/ContentItem.vue

+6 −0
Original line number Diff line number Diff line
@@ -170,6 +170,8 @@ export default { 
                        return state;

                    }

                }

            } else if (this.isDataset && this.item.stopped) {

                return "stopped"

            } else if (this.item.state) {

                return this.item.state;

            }
@@ -222,6 +224,10 @@ export default { 
            } else {

                this.$emit("view-collection", this.item, this.name);

            }

            console.log(this.isDataset);

            console.log(this.item.state);

            console.log(this.item);

            console.log(this.$el);

        },

        onDisplay() {

            const entryPointStore = useEntryPointStore();

client/src/components/History/Content/model/states.js

+5 −0
Original line number Diff line number Diff line
@@ -80,6 +80,11 @@ export const STATES = { 
        status: "danger",

        icon: "exclamation-triangle",

    },

    /** the job has been manually stopped */

    stopped: {

        text: "This job was stopped manually.",

        status: "stopped",

    },

};



/** We want to display a single state for a dataset collection whose elements may have mixed states.

client/src/components/JobInformation/JobInformation.vue

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
                </tr>

                <tr v-if="job && job.state">

                    <td>Job State</td>

                    <td data-description="galaxy-job-state">{{ job.state }}</td>

                    <td data-description="galaxy-job-state">{{ job.stopped ? "Stopped": job.state }}</td>

                </tr>

                <tr v-if="job && job.tool_version">

                    <td>Galaxy Tool Version</td>

client/src/style/scss/base.scss

+2 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ $galaxy-state-border: ( 
    "deleted": darken($state-default-border, 30%),

    "hidden": $state-default-border,

    "setting_metadata": $state-warning-border,

    "stopped": $state-stopped-border,

);



$galaxy-state-bg: (
@@ -218,6 +219,7 @@ $galaxy-state-bg: ( 
    "deleted": darken($state-default-bg, 30%),

    "hidden": $state-default-bg,

    "setting_metadata": $state-warning-bg,

    "stopped": $state-stopped-bg,

);



@each $state in map-keys($galaxy-state-border) {

client/src/style/scss/dataset.scss

+7 −0
Original line number Diff line number Diff line
@@ -177,6 +177,13 @@ 
            @extend .state-icon-running;

        }

    }



    &.state-stopped {

        background: $state-stopped-bg;

        .state-icon {

            display: none;

        }

    }

}



.blinking {