Add error handler for save workflow view, fix overlay text

client/galaxy/scripts/components/Workflow/Editor/Index.vue

@@ -213,15 +213,20 @@ export default {
             window.location = `${getAppRoot()}workflows/run?id=${this.id}`;
         },
         onSave() {
-            show_message("Saving workflow", "progress");
-            saveWorkflow(this.manager, this.id).then(data => {
-                showWarnings(data);
-                showWorkflowParameters(this.manager);
-                getVersions(this.id).then(versions => {
-                    this.versions = versions;
+            show_message("Saving workflow...", "progress");
+            saveWorkflow(this.manager, this.id)
+                .then(data => {
+                    showWarnings(data);
+                    showWorkflowParameters(this.manager);
+                    getVersions(this.id).then(versions => {
+                        this.versions = versions;
+                        hide_modal();
+                    });
+                })
+                .catch(response => {
                     hide_modal();
+                    alert("Saving workflow failed.");
                 });
-            });
         },
         onReportHelp() {
             showReportHelp();
@@ -242,7 +247,7 @@ export default {
             }
         },
         loadCurrent(id, version) {
-            show_message("Loading workflow", "progress");
+            show_message("Loading workflow...", "progress");
             loadWorkflow(this.manager, id, version)
                 .then(data => {
                     const report = data.report || {};
@@ -252,10 +257,11 @@ export default {
                     showWorkflowParameters(this.manager);
                     getVersions(this.id).then(versions => {
                         this.versions = versions;
+                        hide_modal();
                     });
-                    hide_modal();
                 })
                 .catch(response => {
+                    hide_modal();
                     alert("Loading workflow failed.");
                 });
         }

templates/webapps/galaxy/workflow/editor.mako

@@ -31,7 +31,7 @@
 </%def>
 
 <%def name="overlay(visible=False)">
-    ${parent.overlay( "Loading workflow editor...",
+    ${parent.overlay( "Loading workflow...",
                       "<div class='progress progress-striped progress-info active'><div class='progress-bar' style='width: 100%;'></div></div>", self.overlay_visible )}
 </%def>