Pipe Grunt errors to front end

Author: tomgreenfield

frontend/src/modules/editor/global/views/editorView.js

@@ -95,28 +95,30 @@ define(function(require) {
       $('.editor-common-sidebar-previewing').removeClass('display-none');
 
       var url = '/api/output/'+Origin.constants.outputPlugin+'/preview/'+this.currentCourseId+'?force='+(forceRebuild === true);
-      $.get(url, _.bind(function(jqXHR, textStatus, errorThrown) {
-        if(!jqXHR.success) {
+      $.get(url, function(data, textStatus, jqXHR) {
+        if (!data.success) {
           this.resetPreviewProgress();
           Origin.Notify.alert({
             type: 'error',
-            text: Origin.l10n.t('app.errorgeneratingpreview')
+            text: Origin.l10n.t('app.errorgeneratingpreview') +
+              Origin.l10n.t('app.debuginfo', { message: jqXHR.responseJSON.message })
           });
           previewWindow.close();
           return;
         }
-        if (jqXHR.payload && typeof(jqXHR.payload.pollUrl) !== undefined && jqXHR.payload.pollUrl) {
+        const pollUrl = data.payload && data.payload.pollUrl;
+        if (pollUrl) {
           // Ping the remote URL to check if the job has been completed
-          this.updatePreviewProgress(jqXHR.payload.pollUrl, previewWindow);
+          this.updatePreviewProgress(pollUrl, previewWindow);
           return;
         }
         this.updateCoursePreview(previewWindow);
         this.resetPreviewProgress();
-      }, this)).fail(_.bind(function(jqXHR, textStatus, errorThrown) {
+      }.bind(this)).fail(function(jqXHR, textStatus, errorThrown) {
         this.resetPreviewProgress();
         Origin.Notify.alert({ type: 'error', text: Origin.l10n.t('app.errorgeneric') });
         previewWindow.close();
-      }, this));
+      }.bind(this));
     },
 
     exportProject: function(error) {
@@ -134,30 +136,28 @@ define(function(require) {
 
       var self = this;
       $.ajax({
-         url: '/export/' + tenantId + '/' + courseId,
-         success: function(data, textStatus, jqXHR) {
-           self.showExportAnimation(false, $btn);
-           self.exporting = false;
-
-           // get the zip
-           var form = document.createElement('form');
-           self.$el.append(form);
-           form.setAttribute('action', '/export/' + tenantId + '/' + courseId + '/download.zip');
-           form.submit();
-         },
-         error: function(jqXHR, textStatus, errorThrown) {
-           var messageText = errorThrown;
-           if(jqXHR && jqXHR.responseJSON && jqXHR.responseJSON.message) messageText += ':<br/>' + jqXHR.responseJSON.message;
-
-           self.showExportAnimation(false, $btn);
-           self.exporting = false;
-
-           Origin.Notify.alert({
-             type: 'error',
-             title: Origin.l10n.t('app.exporterrortitle'),
-             text: messageText
-           });
-         }
+        url: '/export/' + tenantId + '/' + courseId,
+        success: function(data, textStatus, jqXHR) {
+          self.showExportAnimation(false, $btn);
+          self.exporting = false;
+
+          // get the zip
+          var form = document.createElement('form');
+          self.$el.append(form);
+          form.setAttribute('action', '/export/' + tenantId + '/' + courseId + '/download.zip');
+          form.submit();
+        },
+        error: function(jqXHR, textStatus, errorThrown) {
+          self.showExportAnimation(false, $btn);
+          self.exporting = false;
+
+          Origin.Notify.alert({
+            type: 'error',
+            title: Origin.l10n.t('app.exporterrortitle'),
+            text: Origin.l10n.t('app.errorgeneric') +
+              Origin.l10n.t('app.debuginfo', { message: jqXHR.responseJSON.message })
+          });
+        }
       });
     },
 
@@ -179,28 +179,32 @@ define(function(require) {
       $('.editor-common-sidebar-downloading').removeClass('display-none');
 
       var url = '/api/output/' + Origin.constants.outputPlugin + '/publish/' + this.currentCourseId;
-      $.get(url, _.bind(function(jqXHR, textStatus, errorThrown) {
-
-        if (!jqXHR.success) {
-          Origin.Notify.alert({ type: 'error', text: Origin.l10n.t('app.errorgeneric') });
+      $.get(url, function(data, textStatus, jqXHR) {
+        if (!data.success) {
+          Origin.Notify.alert({
+            type: 'error',
+            text: Origin.l10n.t('app.errorgeneric') +
+              Origin.l10n.t('app.debuginfo', { message: jqXHR.responseJSON.message })
+          });
           this.resetDownloadProgress();
           return;
         }
-        if (jqXHR.payload && typeof(jqXHR.payload.pollUrl) !== undefined && jqXHR.payload.pollUrl) {
+        const pollUrl = data.payload && data.payload.pollUrl;
+        if (pollUrl) {
           // Ping the remote URL to check if the job has been completed
-          this.updateDownloadProgress(jqXHR.payload.pollUrl);
+          this.updateDownloadProgress(pollUrl);
           return;
         }
         this.resetDownloadProgress();
 
         var $downloadForm = $('#downloadForm');
-        $downloadForm.attr('action', '/download/' + Origin.sessionModel.get('tenantId') + '/' + Origin.editor.data.course.get('_id') + '/' + jqXHR.payload.zipName + '/download.zip');
+        $downloadForm.attr('action', '/download/' + Origin.sessionModel.get('tenantId') + '/' + Origin.editor.data.course.get('_id') + '/' + data.payload.zipName + '/download.zip');
         $downloadForm.submit();
 
-      }, this)).fail(_.bind(function (jqXHR, textStatus, errorThrown) {
+      }.bind(this)).fail(function(jqXHR, textStatus, errorThrown) {
         this.resetDownloadProgress();
         Origin.Notify.alert({ type: 'error', text: Origin.l10n.t('app.errorgeneric') });
-      }, this));
+      }.bind(this));
     },
 
     updatePreviewProgress: function(url, previewWindow) {

frontend/src/modules/notify/plugins/alert/less/alert.less

@@ -5,7 +5,13 @@
 .sweet-alert {
   max-height: 91%;
   overflow-y: auto;
-
+  details {
+    display: block;
+    margin-top: 20px;
+  }
+  textarea {
+    font-family: monospace;
+  }
   button {
     min-width: 100px;
     margin: 10px 5px 20px 5px;

plugins/output/adapt/publish.js

@@ -36,6 +36,16 @@ function publishCourse(courseId, mode, request, response, next) {
 
   var customPluginName = user._id;
 
+  const getGruntFatalError = stdout => {
+    const indexStart = stdout.indexOf('\nFatal error: ');
+
+    if (indexStart === -1) return;
+
+    const indexEnd = stdout.indexOf('\n\nExecution Time');
+
+    return stdout.substring(indexStart, indexEnd !== -1 ? indexEnd : stdout.length);
+  }
+
   async.series([
     // get an object with all the course data
     function(callback) {
@@ -167,6 +177,7 @@ function publishCourse(courseId, mode, request, response, next) {
             if (error !== null) {
               logger.log('error', 'exec error: ' + error);
               logger.log('error', 'stdout error: ' + stdout);
+              error.message += getGruntFatalError(stdout) || '';
               resultObject.success = true;
               return callback(error, 'Error building framework');
             }

routes/lang/en-application.json

@@ -265,6 +265,7 @@
   "app.confirmdefaulttitle": "Are you sure?",
   "app.confirmdefaultyes": "Yes, I'm sure",
   "app.confirmwait": "Wait",
+  "app.debuginfo": "<details><summary>Debug information</summary><textarea readonly rows='5'>%{message}</textarea></details>",
   "app.errorsessionexpired": "Your session has expired, click OK to log on again",
   "app.errorassetupdate": "Something went wrong while updating the asset.<br/>Please try again.",
   "app.errordeleteasset": "Couldn't delete this asset, %{message}",