Unverified Commit 3403972c authored by Björn Grüning's avatar Björn Grüning Committed by GitHub
Browse files

Merge pull request #13720 from davelopez/21.09_backport_job_error_message_fix 

[21.09] Backport job error message fix
parents 3356ef6f 8ffa4d48

client/src/components/Tool/ToolForm.vue

+7 −2
Original line number Diff line number Diff line
@@ -16,7 +16,10 @@ 
                    />

                    <Webhook v-if="showSuccess" type="tool" :tool-id="jobDef.tool_id" />

                    <b-modal v-model="showError" size="sm" :title="errorTitle | l" scrollable ok-only>

                        <b-alert show variant="danger">

                        <b-alert v-if="errorMessage" show variant="danger">

                            {{ errorMessage }}

                        </b-alert>

                        <b-alert 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.
@@ -155,6 +158,7 @@ export default { 
            remapAllowed: false,

            errorTitle: null,

            errorContent: null,

            errorMessage: "",

            messageShow: false,

            messageVariant: "",

            messageText: "",
@@ -324,6 +328,7 @@ export default { 
                    document.querySelector(".center-panel").scrollTop = 0;

                },

                (e) => {

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

                    this.showExecuting = false;

                    let genericError = true;

                    const errorData = e && e.response && e.response.data && e.response.data.err_data;
@@ -337,7 +342,7 @@ export default { 
                    if (genericError) {

                        this.showError = true;

                        this.errorTitle = "Job submission failed.";

                        this.errorContent = this.jobDef;

                        this.errorContent = jobDef;

                    }

                }

            );