opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12401 from guerler/indicate_missing_error_message

Browse Source 
Hide details header in dataset error page if details are unavailable
This commit is contained in:
Marius van den Beek
2021-09-06 17:34:17 +02:00
committed by GitHub
parent 77606d2e97 65de2f0d6e
commit 508bbc60b4
2 changed files with 53 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/components/DatasetInformation/DatasetError.vue
+7 -17
View File
@@ -21,23 +21,11 @@
<b id="dataset-error-tool-id" class="text-break">{{ jobDetails.tool_id }}</b
>.
</p>
<div v-if="jobDetails.tool_stderr || jobDetails.job_stderr || jobDetails.job_messages">
<h3>Details</h3>
</div>
<div v-if="jobDetails.job_messages" id="dataset-error-job-messages">
<p>Execution resulted in the following messages:</p>
<div v-for="(job_message, index) in jobDetails.job_messages" :key="index">
<pre class="rounded code">{{ job_message["desc"] }}</pre>
</div>
</div>
<div v-if="jobDetails.tool_stderr">
<p>Tool generated the following standard error:</p>
<pre id="dataset-error-tool-stderr" class="rounded code">{{ jobDetails.tool_stderr }}</pre>
</div>
<div v-if="jobDetails.job_stderr">
<p>Galaxy job runner generated the following standard error:</p>
<pre id="dataset-error-job-stderr" class="rounded code">{{ jobDetails.job_stderr }}</pre>
</div>
<DatasetErrorDetails
:tool-stderr="jobDetails.tool_stderr"
:job-stderr="jobDetails.job_stderr"
:job-messages="jobDetails.job_messages"
/>
<JobProblemProvider :jobid="dataset.creating_job" v-slot="{ result: jobProblems }" @error="onError">
<div v-if="jobProblems && (jobProblems.has_duplicate_inputs || jobProblems.has_empty_inputs)">
<h3 class="common_problems mt-3">Detected Common Potential Problems</h3>
@@ -97,6 +85,7 @@
</template>
<script>
import DatasetErrorDetails from "./DatasetErrorDetails";
import FormElement from "components/Form/FormElement";
import { DatasetProvider } from "components/WorkflowInvocationState/providers";
import { JobDetailsProvider, JobProblemProvider } from "components/providers/JobProvider";
@@ -110,6 +99,7 @@ library.add(faBug);
export default {
components: {
DatasetProvider,
DatasetErrorDetails,
FontAwesomeIcon,
FormElement,
JobDetailsProvider,
client/src/components/DatasetInformation/DatasetErrorDetails.vue
+46
View File
@@ -0,0 +1,46 @@
<template>
<div v-if="hasDetails">
<h3>Details</h3>
<div v-if="hasMessages" id="dataset-error-job-messages">
<p>Execution resulted in the following messages:</p>
<div v-for="(jobMessage, index) in jobMessages" :key="index">
<pre class="rounded code">{{ jobMessage["desc"] }}</pre>
</div>
</div>
<div v-if="toolStderr">
<p>Tool generated the following standard error:</p>
<pre id="dataset-error-tool-stderr" class="rounded code">{{ toolStderr }}</pre>
</div>
<div v-if="jobStderr">
<p>Galaxy job runner generated the following standard error:</p>
<pre id="dataset-error-job-stderr" class="rounded code">{{ jobStderr }}</pre>
</div>
</div>
</template>
<script>
export default {
props: {
toolStderr: {
type: String,
default: null,
},
jobStderr: {
type: String,
default: null,
},
jobMessages: {
type: Array,
default: null,
},
},
computed: {
hasDetails() {
return this.toolStderr || this.jobStderr || this.hasMessages;
},
hasMessages() {
return this.jobMessages && this.jobMessages.length > 0;
},
},
};
</script>