Merge pull request #1645 from briehl/redirect-loading

migrate from pr #1632 to a master feature branch

Author: briehl

Diff for: RELEASE_NOTES.md

@@ -3,6 +3,9 @@ The Narrative Interface allows users to craft KBase Narratives using a combinati
 
 This is built on the Jupyter Notebook v6.0.2 (more notes will follow).
 
+### Version 4.1.2
+- Redirect to the interstitial loading page after shutting down a Narrative session, instead of letting the backend server do the redirect.
+
 ### Version 4.1.1
 - Fix sort order in Narratives panel - should be by most recently saved.
 - Add better error support in data staging uploader - if an upload directory is not available, you should be able to return to the root directory without trouble.

Diff for: bower.json

@@ -1,6 +1,6 @@
 {
   "name": "kbase-narrative",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "homepage": "https://kbase.us",
   "dependencies": {
     "bluebird": "3.4.7",

Diff for: kbase-extension/static/kbase/js/kbaseNarrative.js

@@ -811,20 +811,20 @@ define([
      * If it can't, or if this is being run locally, it pops up an alert saying so.
      */
     Narrative.prototype.updateVersion = function () {
-        var user = NarrativeLogin.sessionInfo.user; //.loginWidget($('#signin-button')).session('user_id');
+        var user = NarrativeLogin.sessionInfo.user;
         Promise.resolve(
             $.ajax({
                 contentType: 'application/json',
                 url: '/narrative_shutdown/' + user,
                 type: 'DELETE',
                 crossDomain: true
             }))
-            .then(function () {
-                setTimeout(function () {
-                    location.reload(true);
+            .then(() => {
+                setTimeout(() => {
+                    location.replace(`/load-narrative.html?n=${this.workspaceId}&check=true`);
                 }, 200);
             })
-            .catch(function (error) {
+            .catch((error) => {
                 window.alert('Unable to update your Narrative session\nError: ' + error.status + ': ' + error.statusText);
                 console.error(error);
             });

Diff for: package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "kbase-narrative-core",
   "description": "Core components for the KBase Narrative Interface",
-  "version": "4.1.1",
+  "version": "4.1.2",
   "private": true,
   "repository": "github.com/kbase/narrative",
   "devDependencies": {

Diff for: package.json

@@ -1,7 +1,7 @@
 __all__ = ['magics', 'common', 'handlers', 'contents', 'services', 'widgetmanager']
 
 from semantic_version import Version
-__version__ = Version("4.1.1")
+__version__ = Version("4.1.2")
 version = lambda: __version__
 
 # if run directly:

Diff for: src/biokbase/narrative/__init__.py

@@ -262,5 +262,5 @@
         "showDelay": 750
     },
     "use_local_widgets": true,
-    "version": "4.1.1"
+    "version": "4.1.2"
 }

Diff for: src/config.json

@@ -321,5 +321,5 @@
         "showDelay": 750
     },
     "use_local_widgets": true,
-    "version": "4.1.1"
+    "version": "4.1.2"
 }