Unverified Commit 1a42534b authored by Dannon's avatar Dannon Committed by GitHub
Browse files

Merge pull request #14036 from jmchilton/deferred_tour 

Add a tour for deferred datasets.
parents 8595b0d6 7aa9ac53

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

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
                        @click.stop="toggleHighlights">

                        <font-awesome-icon icon="check-circle" />

                    </span>

                    <span v-if="hasStateIcon">

                    <span v-if="hasStateIcon" class="state-icon">

                        <icon fixed-width :icon="contentState.icon" :spin="contentState.spin" />

                    </span>

                    <span class="id hid">{{ id }}</span>

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

+2 −2
Original line number Diff line number Diff line
@@ -10,9 +10,9 @@ export const STATES = { 
        icon: "exclamation-triangle",

    },

    deferred: {

        status: "danger",

        status: "info",

        text: "This dataset is remote, has not be ingested by Galaxy, and full metadata may not be available.",

        icon: "exclamation-triangle",

        icon: "cloud",

    },

    /** has no data */

    empty: {

client/src/components/Upload/Default.vue

+3 −3
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
            <b-button

                id="btn-close"

                ref="btnClose"

                class="ui-button-default"

                class="ui-button-default upload-close"

                :title="btnCloseTitle"

                @click="$emit('dismiss')">

                {{ btnCloseTitle }}
@@ -62,7 +62,7 @@ 
            <b-button

                id="btn-start"

                ref="btnStart"

                class="ui-button-default"

                class="ui-button-default upload-start"

                :disabled="!enableStart"

                :title="btnStartTitle"

                :variant="enableStart ? 'primary' : ''"
@@ -72,7 +72,7 @@ 
            <b-button

                id="btn-new"

                ref="btnCreate"

                class="ui-button-default"

                class="ui-button-default upload-paste"

                :title="btnCreateTitle"

                :disabled="!enableSources"

                @click="_eventCreate()">

client/src/components/plugins/icons.js

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ import { 
    faChartArea,

    faCheckSquare,

    faClock,

    faCloud,

    faCodeBranch,

    faColumns,

    faCompress,
@@ -47,6 +48,7 @@ library.add( 
    faChartArea,

    faCheckSquare,

    faClock,

    faCloud,

    faCodeBranch,

    faColumns,

    faCompress,

client/src/utils/navigation/index.js

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ import NAVIGATION_DATA from "./navigation.yml"; 


function interpolate(template, properties) {

    let parsed = template;

    parsed = parsed.replace("$$", "$"); // Handle escaping $ in Python style...

    Object.keys(properties).forEach((key) => {

        const value = properties[key];

        parsed = parsed.replace("${" + key + "}", value);