Merge branch 'develop' into feature/service-limit

4 files changed, 58 insertions, 40 deletions

diff --git a/src/features/announcements/components/AnnouncementScreen.js b/src/features/announcements/components/AnnouncementScreen.js
index dfce6cdd5..e7c5fe395 100644
--- a/src/features/announcements/components/AnnouncementScreen.js
+++ b/src/features/announcements/components/AnnouncementScreen.js
@@ -268,7 +268,7 @@ class AnnouncementScreen extends Component {
           <div className={classes.changelog}>
             <h1 className={classes.headline}>
               {intl.formatMessage(messages.headline, {
-                version: announcementsStore.currentVersion,
+                version: announcementsStore.targetVersion,
               })}
             </h1>
             <div
diff --git a/src/features/announcements/index.js b/src/features/announcements/index.js
index 4658b976f..f14e7c9a5 100644
--- a/src/features/announcements/index.js
+++ b/src/features/announcements/index.js
@@ -7,6 +7,10 @@ export const GA_CATEGORY_ANNOUNCEMENTS = 'Announcements';
 
 export const announcementsStore = new AnnouncementsStore();
 
+export const ANNOUNCEMENTS_ROUTES = {
+  TARGET: '/announcements/:id',
+};
+
 export default function initAnnouncements(stores, actions) {
   // const { features } = stores;
 
diff --git a/src/features/announcements/store.js b/src/features/announcements/store.js
index 7ecc0e346..de7ed2596 100644
--- a/src/features/announcements/store.js
+++ b/src/features/announcements/store.js
@@ -2,18 +2,19 @@ import {
   action,
   computed,
   observable,
-  reaction,
 } from 'mobx';
 import semver from 'semver';
 import localStorage from 'mobx-localstorage';
 
 import { FeatureStore } from '../utils/FeatureStore';
-import { GA_CATEGORY_ANNOUNCEMENTS } from '.';
+import { ANNOUNCEMENTS_ROUTES, GA_CATEGORY_ANNOUNCEMENTS } from '.';
 import { getAnnouncementRequest, getChangelogRequest, getCurrentVersionRequest } from './api';
 import { announcementActions } from './actions';
 import { createActionBindings } from '../utils/ActionBinding';
 import { createReactions } from '../../stores/lib/Reaction';
 import { gaEvent } from '../../lib/analytics';
+import { matchRoute } from '../../helpers/routing-helpers';
+import { DEFAULT_APP_SETTINGS } from '../../config';
 
 const LOCAL_STORAGE_KEY = 'announcements';
 
@@ -22,8 +23,6 @@ const debug = require('debug')('Franz:feature:announcements:store');
 export class AnnouncementsStore extends FeatureStore {
   @observable targetVersion = null;
 
-  @observable isAnnouncementVisible = false;
-
   @observable isFeatureActive = false;
 
   @computed get changelog() {
@@ -31,7 +30,15 @@ export class AnnouncementsStore extends FeatureStore {
   }
 
   @computed get announcement() {
-    return getAnnouncementRequest.result;
+    if (!this.stores || !getAnnouncementRequest.result) return null;
+    const { locale } = this.stores.app;
+    const announcement = getAnnouncementRequest.result;
+    // User locale
+    if (announcement[locale]) return announcement[locale];
+    // Default locale
+    if (announcement[DEFAULT_APP_SETTINGS.fallbackLocale]) return announcement[DEFAULT_APP_SETTINGS.fallbackLocale];
+    // No locales specified
+    return announcement;
   }
 
   @computed get areNewsAvailable() {
@@ -67,8 +74,9 @@ export class AnnouncementsStore extends FeatureStore {
     ]));
 
     this._reactions = createReactions([
-      this._fetchAnnouncements,
+      this._showAnnouncementOnRouteMatch,
       this._showAnnouncementToUsersWhoUpdatedApp,
+      this._fetchAnnouncements,
     ]);
     this._registerReactions(this._reactions);
     this.isFeatureActive = true;
@@ -78,7 +86,6 @@ export class AnnouncementsStore extends FeatureStore {
     super.stop();
     debug('AnnouncementsStore::stop');
     this.isFeatureActive = false;
-    this.isAnnouncementVisible = false;
   }
 
   // ======= HELPERS ======= //
@@ -93,39 +100,29 @@ export class AnnouncementsStore extends FeatureStore {
   // ======= ACTIONS ======= //
 
   @action _showAnnouncement = ({ targetVersion } = {}) => {
-    if (!this.areNewsAvailable) return;
+    const { router } = this.stores;
     this.targetVersion = targetVersion || this.currentVersion;
-    this.isAnnouncementVisible = true;
-    this.actions.service.blurActive();
     this._updateSettings({
       lastSeenAnnouncementVersion: this.currentVersion,
     });
-    const dispose = reaction(
-      () => this.stores.services.active,
-      () => {
-        this._hideAnnouncement();
-        dispose();
-      },
-    );
-
+    const targetRoute = `/announcements/${this.targetVersion}`;
+    if (router.location.pathname !== targetRoute) {
+      this.stores.router.push(targetRoute);
+    }
     gaEvent(GA_CATEGORY_ANNOUNCEMENTS, 'show');
   };
 
-  @action _hideAnnouncement() {
-    this.isAnnouncementVisible = false;
-  }
-
   // ======= REACTIONS ========
 
   _showAnnouncementToUsersWhoUpdatedApp = () => {
     const { announcement, isNewUser } = this;
-    // Check if there is an announcement and on't show announcements to new users
+    // Check if there is an announcement and don't show announcements to new users
     if (!announcement || isNewUser) return;
 
     // Check if the user has already used current version (= has seen the announcement)
     const { currentVersion, lastSeenAnnouncementVersion } = this;
     if (semver.gt(currentVersion, lastSeenAnnouncementVersion || '0.0.0')) {
-      debug(`${currentVersion} < ${lastSeenAnnouncementVersion}: announcement is shown`);
+      debug(`${currentVersion} > ${lastSeenAnnouncementVersion}: announcement is shown`);
       this._showAnnouncement();
     }
   };
@@ -133,12 +130,16 @@ export class AnnouncementsStore extends FeatureStore {
   _fetchAnnouncements = () => {
     const targetVersion = this.targetVersion || this.currentVersion;
     if (!targetVersion) return;
-    getChangelogRequest.execute(targetVersion);
-    // We only fetch announcements for current / older versions
-    if (targetVersion <= this.currentVersion) {
-      getAnnouncementRequest.execute(targetVersion);
-    } else {
-      getAnnouncementRequest.reset();
+    getChangelogRequest.reset().execute(targetVersion);
+    getAnnouncementRequest.reset().execute(targetVersion);
+  };
+
+  _showAnnouncementOnRouteMatch = () => {
+    const { router } = this.stores;
+    const match = matchRoute(ANNOUNCEMENTS_ROUTES.TARGET, router.location.pathname);
+    if (match) {
+      const targetVersion = match.id;
+      this._showAnnouncement({ targetVersion });
     }
   }
 }
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index e11513d1f..07b16ff23 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -57,6 +57,10 @@ export default class WorkspacesStore extends FeatureStore {
     return !this.isPremiumUpgradeRequired;
   }
 
+  @computed get isAnyWorkspaceActive() {
+    return !!this.activeWorkspace;
+  }
+
   // ========== PRIVATE PROPERTIES ========= //
 
   _wasDrawerOpenBeforeSettingsRoute = null;
@@ -229,6 +233,14 @@ export default class WorkspacesStore extends FeatureStore {
     this.actions.ui.openSettings({ path: 'workspaces' });
   };
 
+  @action reorderServicesOfActiveWorkspace = async ({ oldIndex, newIndex }) => {
+    const { activeWorkspace } = this;
+    const { services } = activeWorkspace;
+    // Move services from the old to the new position
+    services.splice(newIndex, 0, services.splice(oldIndex, 1)[0]);
+    await updateWorkspaceRequest.execute(activeWorkspace);
+  };
+
   // Reactions
 
   _setFeatureEnabledReaction = () => {
@@ -255,13 +267,15 @@ export default class WorkspacesStore extends FeatureStore {
   _setActiveServiceOnWorkspaceSwitchReaction = () => {
     if (!this.isFeatureActive) return;
     if (this.activeWorkspace) {
-      const services = this.stores.services.allDisplayed;
-      const activeService = services.find(s => s.isActive);
+      const activeService = this.stores.services.active;
       const workspaceServices = this.getWorkspaceServices(this.activeWorkspace);
       if (workspaceServices.length <= 0) return;
       const isActiveServiceInWorkspace = workspaceServices.includes(activeService);
       if (!isActiveServiceInWorkspace) {
-        this.actions.service.setActive({ serviceId: workspaceServices[0].id });
+        this.actions.service.setActive({
+          serviceId: workspaceServices[0].id,
+          keepActiveRoute: true,
+        });
       }
     }
   };
@@ -298,17 +312,16 @@ export default class WorkspacesStore extends FeatureStore {
 
   _cleanupInvalidServiceReferences = () => {
     const { services } = this.stores;
-    let invalidServiceReferencesExist = false;
+    const { allServicesRequest } = services;
+    const servicesHaveBeenLoaded = allServicesRequest.wasExecuted && !allServicesRequest.isError;
+    // Loop through all workspaces and remove invalid service ids (locally)
     this.workspaces.forEach((workspace) => {
       workspace.services.forEach((serviceId) => {
-        if (!services.one(serviceId)) {
-          invalidServiceReferencesExist = true;
+        if (servicesHaveBeenLoaded && !services.one(serviceId)) {
+          workspace.services.remove(serviceId);
         }
       });
     });
-    if (invalidServiceReferencesExist) {
-      getUserWorkspacesRequest.execute();
-    }
   };
 
   _stopPremiumActionsAndReactions = () => {