Unverified Commit 32ddf2ba authored by mvdbeek's avatar mvdbeek
Browse files

Merge branch 'release_24.2' into dev

parents 56ce8293 48c99075

client/src/components/Collections/common/CollectionCreatorNoItemsMessage.vue

+2 −2
Original line number Diff line number Diff line
@@ -4,14 +4,14 @@ import { BAlert, BLink } from "bootstrap-vue"; 
import localize from "@/utils/localization";



const emit = defineEmits<{

    (e: "clicked-upload"): void;

    (e: "click-upload"): void;

}>();

</script>

<template>

    <BAlert variant="info" show>

        {{ localize("No items available to create a collection.") }}

        {{ localize("Exit and change your current history, or") }}

        <BLink class="text-decoration-none" @click.stop.prevent="emit('clicked-upload')">

        <BLink class="text-decoration-none" @click.stop.prevent="emit('click-upload')">

            {{ localize("Upload some datasets.") }}

        </BLink>

    </BAlert>

client/src/components/JobInformation/JobInformation.vue

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ watch( 
    () => props.job_id,

    async (newId, oldId) => {

        if (newId && (invocationId.value === undefined || newId !== oldId)) {

            const invocation = await fetchInvocationForJob({ jobId: newId });

            const invocation = await fetchInvocationForJob(newId);

            if (invocation) {

                invocationId.value = invocation.id;

            } else {

client/src/components/Libraries/LibraryFolder/LibraryFolderDataset/LibraryDataset.vue

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
                </b-button>

            </span>

            <b-button

                v-if="currentUser.is_admin"

                v-if="currentUser?.is_admin"

                title="Manage permissions"

                class="mr-1 mb-2"

                :to="{

client/src/components/PageDisplay/PageDisplay.vue

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ export default { 
    },

    computed: {

        userOwnsPage() {

            return this.currentUser.username === this.page.username;

            return this.currentUser?.username === this.page.username;

        },

        dataUrl() {

            return `/api/pages/${this.pageId}`;

client/src/components/Tool/ToolForm.vue

+20 −4
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
            <b-alert v-if="errorMessage" show variant="danger">

                {{ errorMessage }}

            </b-alert>

            <b-alert show variant="warning">

            <b-alert v-if="submissionRequestFailed" show variant="warning">

                The server could not complete this request. Please verify your parameter settings, retry submission and

                contact the Galaxy Team if this error persists. A transcript of the submitted data is shown below.

            </b-alert>
@@ -194,6 +194,7 @@ export default { 
            entryPoints: [],

            jobDef: {},

            jobResponse: {},

            submissionRequestFailed: false,

            validationInternal: null,

            validationScrollTo: null,

            currentVersion: this.version,
@@ -365,6 +366,7 @@ export default { 
            const prevRoute = this.$route.fullPath;

            submitJob(jobDef).then(

                (jobResponse) => {

                    this.submissionRequestFailed = false;

                    this.showExecuting = false;

                    let changeRoute = false;

                    refreshContentsWrapper();
@@ -373,7 +375,7 @@ export default { 
                        this.entryPoints = jobResponse.jobs;

                    }

                    const nJobs = jobResponse && jobResponse.jobs ? jobResponse.jobs.length : 0;

                    if (nJobs > 0) {

                    if (nJobs > 0 && !jobResponse.errors?.length) {

                        this.showForm = false;

                        const toolName = this.toolName;

                        this.saveLatestResponse({
@@ -383,11 +385,24 @@ export default { 
                        });

                        changeRoute = prevRoute === this.$route.fullPath;

                    } else {

                        const defaultErrorTitle = "Job submission rejected.";

                        this.showError = true;

                        this.showForm = true;

                        this.errorTitle = "Job submission rejected.";

                        if (jobResponse?.errors) {

                            const nErrors = jobResponse.errors.length;

                            if (nJobs > 0) {

                                this.errorTitle = `Job submission for ${nErrors} out of ${

                                    nJobs + nErrors

                                } jobs failed.`;

                            } else {

                                this.errorTitle = defaultErrorTitle;

                            }

                            this.errorContent = jobResponse.errors;

                        } else {

                            this.errorTitle = defaultErrorTitle;

                            this.errorContent = jobResponse;

                        }

                    }

                    if (changeRoute) {

                        this.$router.push(`/jobs/submission/success`);

                    } else {
@@ -399,6 +414,7 @@ export default { 
                },

                (e) => {

                    this.errorMessage = e?.response?.data?.err_msg;

                    this.submissionRequestFailed = true;

                    this.showExecuting = false;

                    let genericError = true;

                    const errorData = e && e.response && e.response.data && e.response.data.err_data;