Commit 15852de1 authored by Cage, Gregory's avatar Cage, Gregory
Browse files

Merge branch 'stop-job-metadata' into 'dev' 

Add Stopped job metadata

See merge request !66
parents 2a709cb7 0521eb67

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

+4 −2
Original line number Diff line number Diff line
@@ -110,11 +110,11 @@ import { updateContentFields } from "components/History/model/queries"; 
import { JobStateSummary } from "./Collection/JobStateSummary";

import { library } from "@fortawesome/fontawesome-svg-core";

import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";

import { faArrowCircleUp, faArrowCircleDown, faCheckCircle } from "@fortawesome/free-solid-svg-icons";

import { faArrowCircleUp, faArrowCircleDown, faCheckCircle, faStopCircle } from "@fortawesome/free-solid-svg-icons";

import { useEntryPointStore } from "stores/entryPointStore";

import { clearDrag, setDrag } from "@/utils/setDrag.js";



library.add(faArrowCircleUp, faArrowCircleDown, faCheckCircle);

library.add(faArrowCircleUp, faArrowCircleDown, faCheckCircle, faStopCircle);

export default {

    components: {

        CollectionDescription,
@@ -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;

            }

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

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

        icon: "exclamation-triangle",

    },

    /** the job has been manually stopped */

    stopped: {

        text: "This job was stopped manually.",

        status: "stopped",

        icon: "stop-circle",

    },

};



/** 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-success-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-success-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-success-bg;

        .state-icon {

            content: fa-content($fa-var-stop-circle );

        }

    }

}



.blinking {