Merge pull request #1472 from meetfranz/release/5.2.0-beta.1

5.2.0 beta.1

4 files changed, 30 insertions, 6 deletions

diff --git a/src/stores/GlobalErrorStore.js b/src/stores/GlobalErrorStore.js
index 90bf751c3..7a85c2daa 100644
--- a/src/stores/GlobalErrorStore.js
+++ b/src/stores/GlobalErrorStore.js
@@ -18,8 +18,11 @@ export default class GlobalErrorStore extends Store {
       this.error = request.error;
 
       if (request.error.json) {
-        this.response = await request.error.json();
-
+        try {
+          this.response = await request.error.json();
+        } catch (error) {
+          this.response = {};
+        }
         if (this.error.status === 401) {
           this.actions.user.logout({ serverLogout: true });
         }
diff --git a/src/stores/NewsStore.js b/src/stores/NewsStore.js
index 6984425df..86e092592 100644
--- a/src/stores/NewsStore.js
+++ b/src/stores/NewsStore.js
@@ -16,6 +16,7 @@ export default class NewsStore extends Store {
 
     // Register action handlers
     this.actions.news.hide.listen(this._hide.bind(this));
+    this.actions.user.logout.listen(this._resetNewsRequest.bind(this));
   }
 
   setup() {
@@ -40,4 +41,15 @@ export default class NewsStore extends Store {
       remove(result, n => n.id === newsId);
     });
   }
+
+  /**
+   * Reset the news request when current user logs out so that when another user
+   * logs in again without an app restart, the request will be fetched again and
+   * the news will be shown to the user.
+   *
+   * @private
+   */
+  _resetNewsRequest() {
+    this.latestNewsRequest.reset();
+  }
 }
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 13f929c2f..d63302fce 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -291,7 +291,8 @@ export default class ServicesStore extends Store {
     gaEvent('Service', 'clear cache');
   }
 
-  @action _setActive({ serviceId }) {
+  @action _setActive({ serviceId, keepActiveRoute }) {
+    if (!keepActiveRoute) this.stores.router.push('/');
     const service = this.one(serviceId);
 
     this.all.forEach((s, index) => {
@@ -517,7 +518,16 @@ export default class ServicesStore extends Store {
     this.actions.ui.toggleServiceUpdatedInfoBar({ visible: false });
   }
 
-  @action _reorder({ oldIndex, newIndex }) {
+  @action _reorder(params) {
+    const { workspaces } = this.stores;
+    if (workspaces.isAnyWorkspaceActive) {
+      workspaces.reorderServicesOfActiveWorkspace(params);
+    } else {
+      this._reorderService(params);
+    }
+  }
+
+  @action _reorderService({ oldIndex, newIndex }) {
     const showDisabledServices = this.stores.settings.all.app.showDisabledServices;
     const oldEnabledSortIndex = showDisabledServices ? oldIndex : this.all.indexOf(this.enabled[oldIndex]);
     const newEnabledSortIndex = showDisabledServices ? newIndex : this.all.indexOf(this.enabled[newIndex]);
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 31555dd5c..b5423af3b 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -329,8 +329,7 @@ export default class UserStore extends Store {
         authToken,
       });
     } catch (err) {
-      console.error('AccessToken Invalid');
-
+      this._logout();
       return false;
     }
   }