7 files changed, 49 insertions, 29 deletions

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 351ad6422..72c4b4d0b 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -14,7 +14,7 @@ import Request from './lib/Request';
 import { CHECK_INTERVAL, DEFAULT_APP_SETTINGS } from '../config';
 import { isMac } from '../environment';
 import locales from '../i18n/translations';
-import { gaEvent, gaPage } from '../lib/analytics';
+import { gaEvent, gaPage, statsEvent } from '../lib/analytics';
 import { onVisibilityChange } from '../helpers/visibility-helper';
 import { getLocale } from '../helpers/i18n-helpers';
 
@@ -67,6 +67,8 @@ export default class AppStore extends Store {
 
   @observable isFocused = true;
 
+  @observable nextAppReleaseVersion = null;
+
   dictionaries = [];
 
   constructor(...args) {
@@ -123,7 +125,7 @@ export default class AppStore extends Store {
     ipcRenderer.on('autoUpdate', (event, data) => {
       if (data.available) {
         this.updateStatus = this.updateStatusTypes.AVAILABLE;
-
+        this.nextAppReleaseVersion = data.version;
         if (isMac) {
           app.dock.bounce();
         }
@@ -172,7 +174,8 @@ export default class AppStore extends Store {
     reaction(() => this.stores.router.location.pathname, (pathname) => {
       gaPage(pathname);
     });
-    console.log('router location', this.stores.router.location);
+
+    statsEvent('app-start');
   }
 
   @computed get cacheSize() {
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index 8fe576813..e7832088b 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -14,6 +14,8 @@ import serviceProxy from '../features/serviceProxy';
 import basicAuth from '../features/basicAuth';
 import workspaces from '../features/workspaces';
 import shareFranz from '../features/shareFranz';
+import announcements from '../features/announcements';
+import settingsWS from '../features/settingsWS';
 
 import { DEFAULT_FEATURES_CONFIG } from '../config';
 
@@ -71,5 +73,7 @@ export default class FeaturesStore extends Store {
     basicAuth(this.stores, this.actions);
     workspaces(this.stores, this.actions);
     shareFranz(this.stores, this.actions);
+    announcements(this.stores, this.actions);
+    settingsWS(this.stores, this.actions);
   }
 }
diff --git a/src/stores/PaymentStore.js b/src/stores/PaymentStore.js
index 4cabee194..d4de476c8 100644
--- a/src/stores/PaymentStore.js
+++ b/src/stores/PaymentStore.js
@@ -10,15 +10,10 @@ export default class PaymentStore extends Store {
 
   @observable createHostedPageRequest = new Request(this.api.payment, 'getHostedPage');
 
-  @observable createDashboardUrlRequest = new Request(this.api.payment, 'getDashboardUrl');
-
-  @observable ordersDataRequest = new CachedRequest(this.api.payment, 'getOrders');
-
   constructor(...args) {
     super(...args);
 
     this.actions.payment.createHostedPage.listen(this._createHostedPage.bind(this));
-    this.actions.payment.createDashboardUrl.listen(this._createDashboardUrl.bind(this));
   }
 
   @computed get plan() {
@@ -28,10 +23,6 @@ export default class PaymentStore extends Store {
     return this.plansRequest.execute().result || {};
   }
 
-  @computed get orders() {
-    return this.ordersDataRequest.execute().result || [];
-  }
-
   @action _createHostedPage({ planId }) {
     const request = this.createHostedPageRequest.execute(planId);
 
@@ -39,12 +30,4 @@ export default class PaymentStore extends Store {
 
     return request;
   }
-
-  @action _createDashboardUrl() {
-    const request = this.createDashboardUrlRequest.execute();
-
-    gaEvent('Payment', 'createDashboardUrl');
-
-    return request;
-  }
 }
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 0ec6bf550..d63302fce 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -11,7 +11,7 @@ import Store from './lib/Store';
 import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
 import { matchRoute } from '../helpers/routing-helpers';
-import { gaEvent } from '../lib/analytics';
+import { gaEvent, statsEvent } from '../lib/analytics';
 import { workspaceStore } from '../features/workspaces';
 
 const debug = require('debug')('Franz:ServiceStore');
@@ -36,6 +36,7 @@ export default class ServicesStore extends Store {
 
     // Register action handlers
     this.actions.service.setActive.listen(this._setActive.bind(this));
+    this.actions.service.blurActive.listen(this._blurActive.bind(this));
     this.actions.service.setActiveNext.listen(this._setActiveNext.bind(this));
     this.actions.service.setActivePrev.listen(this._setActivePrev.bind(this));
     this.actions.service.showAddServiceInterface.listen(this._showAddServiceInterface.bind(this));
@@ -290,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) => {
@@ -298,9 +300,16 @@ export default class ServicesStore extends Store {
     });
     service.isActive = true;
 
+    statsEvent('activate-service', service.recipe.id);
+
     this._focusActiveService();
   }
 
+  @action _blurActive() {
+    if (!this.active) return;
+    this.active.isActive = false;
+  }
+
   @action _setActiveNext() {
     const nextIndex = this._wrapIndex(this.allDisplayed.findIndex(service => service.isActive), 1, this.allDisplayed.length);
 
@@ -509,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 534690fbb..31555dd5c 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -178,6 +178,7 @@ export default class UserStore extends Store {
       password,
       accountType,
       company,
+      locale: this.stores.app.locale,
     });
 
     this.hasCompletedSignup = false;
diff --git a/src/stores/index.js b/src/stores/index.js
index 96b844c95..1912418a2 100644
--- a/src/stores/index.js
+++ b/src/stores/index.js
@@ -10,6 +10,8 @@ import PaymentStore from './PaymentStore';
 import NewsStore from './NewsStore';
 import RequestStore from './RequestStore';
 import GlobalErrorStore from './GlobalErrorStore';
+import { workspaceStore } from '../features/workspaces';
+import { announcementsStore } from '../features/announcements';
 
 export default (api, actions, router) => {
   const stores = {};
@@ -27,6 +29,8 @@ export default (api, actions, router) => {
     news: new NewsStore(stores, api, actions),
     requests: new RequestStore(stores, api, actions),
     globalError: new GlobalErrorStore(stores, api, actions),
+    workspaces: workspaceStore,
+    announcements: announcementsStore,
   });
   // Initialize all stores
   Object.keys(stores).forEach((name) => {
diff --git a/src/stores/lib/Reaction.js b/src/stores/lib/Reaction.js
index 46aa4dae6..f2642908f 100644
--- a/src/stores/lib/Reaction.js
+++ b/src/stores/lib/Reaction.js
@@ -1,24 +1,31 @@
-// @flow
 import { autorun } from 'mobx';
 
 export default class Reaction {
   reaction;
 
-  hasBeenStarted;
+  isRunning = false;
 
   dispose;
 
   constructor(reaction) {
     this.reaction = reaction;
-    this.hasBeenStarted = false;
   }
 
   start() {
-    this.dispose = autorun(() => this.reaction());
-    this.hasBeenStarted = true;
+    if (!this.isRunning) {
+      this.dispose = autorun(() => this.reaction());
+      this.isActive = true;
+    }
   }
 
   stop() {
-    if (this.hasBeenStarted) this.dispose();
+    if (this.isRunning) {
+      this.dispose();
+      this.isActive = false;
+    }
   }
 }
+
+export const createReactions = reactions => (
+  reactions.map(r => new Reaction(r))
+);