From c6793dcdde8009ebe665629f4abde2eb5d79d7c2 Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Thu, 2 Sep 2021 00:37:49 -0400
Subject: [PATCH 1/5] Hide details header in dataset error page if details are
 unavailable

---
 client/src/components/DatasetInformation/DatasetError.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/src/components/DatasetInformation/DatasetError.vue b/client/src/components/DatasetInformation/DatasetError.vue
index 5618117ab4d..43b2b846ea5 100644
--- a/client/src/components/DatasetInformation/DatasetError.vue
+++ b/client/src/components/DatasetInformation/DatasetError.vue
@@ -21,10 +21,10 @@
                         <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">
+                    <div v-if="jobDetails.tool_stderr || jobDetails.job_stderr || hasMessages(jobDetails)">
                         <h3>Details</h3>
                     </div>
-                    <div v-if="jobDetails.job_messages" id="dataset-error-job-messages">
+                    <div v-if="hasMessages(jobDetails)" 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>
@@ -130,6 +130,9 @@ export default {
         };
     },
     methods: {
+        hasMessages(jobDetails) {
+            return jobDetails.job_messages && jobDetails.job_messages.length > 0;
+        },
         onError(err) {
             this.errorMessage = err;
         },

From 3065ddf3d5ef6e9002844bd35e49878b6a706ae7 Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Fri, 3 Sep 2021 12:47:00 -0400
Subject: [PATCH 2/5] Add sub-component to dataset error view

---
 .../DatasetInformation/DatasetError.vue       | 24 +++----
 .../DatasetErrorDetails.vue                   | 62 +++++++++++++++++++
 2 files changed, 69 insertions(+), 17 deletions(-)
 create mode 100644 client/src/components/DatasetInformation/DatasetErrorDetails.vue

diff --git a/client/src/components/DatasetInformation/DatasetError.vue b/client/src/components/DatasetInformation/DatasetError.vue
index 43b2b846ea5..11e69e96d68 100644
--- a/client/src/components/DatasetInformation/DatasetError.vue
+++ b/client/src/components/DatasetInformation/DatasetError.vue
@@ -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 || hasMessages(jobDetails)">
-                        <h3>Details</h3>
-                    </div>
-                    <div v-if="hasMessages(jobDetails)" 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,
diff --git a/client/src/components/DatasetInformation/DatasetErrorDetails.vue b/client/src/components/DatasetInformation/DatasetErrorDetails.vue
new file mode 100644
index 00000000000..63afb97ec7b
--- /dev/null
+++ b/client/src/components/DatasetInformation/DatasetErrorDetails.vue
@@ -0,0 +1,62 @@
+<template>
+    <div>
+        <div v-if="toolStderr || jobStderr || hasMessages">
+            <h3>Details</h3>
+        </div>
+        <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>
+import FormElement from "components/Form/FormElement";
+import { DatasetProvider } from "components/WorkflowInvocationState/providers";
+import { JobDetailsProvider, JobProblemProvider } from "components/providers/JobProvider";
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+import { library } from "@fortawesome/fontawesome-svg-core";
+import { faBug } from "@fortawesome/free-solid-svg-icons";
+import { sendErrorReport } from "./services";
+
+library.add(faBug);
+
+export default {
+    components: {
+        DatasetProvider,
+        FontAwesomeIcon,
+        FormElement,
+        JobDetailsProvider,
+        JobProblemProvider,
+    },
+    props: {
+        toolStderr: {
+            type: String,
+            required: true,
+        },
+        jobStderr: {
+            type: String,
+            required: true,
+        },
+        jobMessages: {
+            type: Array,
+            required: true,
+        },
+    },
+    computed: {
+        hasMessages() {
+            return this.jobMessages && this.jobMessages.length > 0;
+        },
+    },
+};
+</script>

From cad420112f46835b150e7bd48dda72dc12c79698 Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Fri, 3 Sep 2021 13:03:07 -0400
Subject: [PATCH 3/5] Remove unused imports from details sub component

---
 .../DatasetInformation/DatasetErrorDetails.vue  | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/client/src/components/DatasetInformation/DatasetErrorDetails.vue b/client/src/components/DatasetInformation/DatasetErrorDetails.vue
index 63afb97ec7b..5b0d857bb44 100644
--- a/client/src/components/DatasetInformation/DatasetErrorDetails.vue
+++ b/client/src/components/DatasetInformation/DatasetErrorDetails.vue
@@ -21,24 +21,7 @@
 </template>
 
 <script>
-import FormElement from "components/Form/FormElement";
-import { DatasetProvider } from "components/WorkflowInvocationState/providers";
-import { JobDetailsProvider, JobProblemProvider } from "components/providers/JobProvider";
-import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
-import { library } from "@fortawesome/fontawesome-svg-core";
-import { faBug } from "@fortawesome/free-solid-svg-icons";
-import { sendErrorReport } from "./services";
-
-library.add(faBug);
-
 export default {
-    components: {
-        DatasetProvider,
-        FontAwesomeIcon,
-        FormElement,
-        JobDetailsProvider,
-        JobProblemProvider,
-    },
     props: {
         toolStderr: {
             type: String,

From 5f2feddeb38b830ccd27c3e882c306bcab67535b Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Fri, 3 Sep 2021 18:38:44 -0400
Subject: [PATCH 4/5] Remove unused hasmessage function from dataset error view

---
 client/src/components/DatasetInformation/DatasetError.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/client/src/components/DatasetInformation/DatasetError.vue b/client/src/components/DatasetInformation/DatasetError.vue
index 11e69e96d68..a35b56a565f 100644
--- a/client/src/components/DatasetInformation/DatasetError.vue
+++ b/client/src/components/DatasetInformation/DatasetError.vue
@@ -120,9 +120,6 @@ export default {
         };
     },
     methods: {
-        hasMessages(jobDetails) {
-            return jobDetails.job_messages && jobDetails.job_messages.length > 0;
-        },
         onError(err) {
             this.errorMessage = err;
         },

From 65de2f0d6ea6d0f823b7f4bc7ffeebe59e28c05e Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Fri, 3 Sep 2021 18:41:31 -0400
Subject: [PATCH 5/5] Place detail check into computed value

---
 .../DatasetInformation/DatasetErrorDetails.vue    | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/client/src/components/DatasetInformation/DatasetErrorDetails.vue b/client/src/components/DatasetInformation/DatasetErrorDetails.vue
index 5b0d857bb44..e2f98519d44 100644
--- a/client/src/components/DatasetInformation/DatasetErrorDetails.vue
+++ b/client/src/components/DatasetInformation/DatasetErrorDetails.vue
@@ -1,8 +1,6 @@
 <template>
-    <div>
-        <div v-if="toolStderr || jobStderr || hasMessages">
-            <h3>Details</h3>
-        </div>
+    <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">
@@ -25,18 +23,21 @@ export default {
     props: {
         toolStderr: {
             type: String,
-            required: true,
+            default: null,
         },
         jobStderr: {
             type: String,
-            required: true,
+            default: null,
         },
         jobMessages: {
             type: Array,
-            required: true,
+            default: null,
         },
     },
     computed: {
+        hasDetails() {
+            return this.toolStderr || this.jobStderr || this.hasMessages;
+        },
         hasMessages() {
             return this.jobMessages && this.jobMessages.length > 0;
         },