From 4315f3458690fc203f2d9b75e79e36dabfddd54a Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Tue, 16 Apr 2019 10:00:45 -0400
Subject: [PATCH] Update error reporting for more fine grain error messages.

xref https://github.com/galaxyproject/galaxy/pull/7095/files
---
 .../scripts/mvc/dataset/dataset-error.js      | 29 +++++++++++++++++--
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/client/galaxy/scripts/mvc/dataset/dataset-error.js b/client/galaxy/scripts/mvc/dataset/dataset-error.js
index 15ed502ce27..9f49399c604 100644
--- a/client/galaxy/scripts/mvc/dataset/dataset-error.js
+++ b/client/galaxy/scripts/mvc/dataset/dataset-error.js
@@ -62,9 +62,7 @@ var View = Backbone.View.extend({
             ${this._templateHeader()}
             <h2>Dataset Error</h2>
             <p>An error occurred while running the tool <b>${job.tool_id}</b>.</p>
-            <p>Tool execution generated the following messages:</p>
-            <pre class="code">${_.escape(job.stderr)}</pre>
-
+            ${this.job_summary(job)}
             <h3>Troubleshoot This Error</h3>
             <p>
                 There are a number of help resources to self diagnose and
@@ -85,6 +83,31 @@ var View = Backbone.View.extend({
         this.$el.append(this._getBugFormTemplate(dataset, job));
     },
 
+    job_summary: function(job) {
+        const tool_stderr = job.tool_stderr;
+        const job_stderr = job.job_stderr;
+        const job_messages = job.job_messages;
+        if (!tool_stderr && !job_stderr && !job_messages) {
+            return '';
+        }
+        var message = '<h3>Error Details</h3>';
+        if (job_messages) {
+            message += '<p>Execution resulted in the following messages:</p>';
+            for (let job_message of job_messages) {
+                message += `<p><pre>${_.escape(job_message['desc'])}</pre></p>`;
+            }
+        }
+        if (tool_stderr) {
+            message += '<p>Tool generated the following standard error:</p>';
+            message += `<pre class="code">${_.escape(tool_stderr)}</pre>`;
+        }
+        if (job_stderr) {
+            message += '<p>Galaxy job runner generated the following standard error:</p>';
+            message += `<pre class="code">${_.escape(job_stderr)}</pre>`;
+        }
+        return message;
+    },
+
     /** Display actions messages */
     display_message: function(response, $el, doNotClear, safe) {
         if (!safe) {