merge-in latest develop

4 files changed, 55 insertions, 25 deletions

diff --git a/src/features/announcements/store.js b/src/features/announcements/store.js
index 3c46828bb..b99309ca7 100644
--- a/src/features/announcements/store.js
+++ b/src/features/announcements/store.js
@@ -10,6 +10,8 @@ import localStorage from 'mobx-localstorage';
 import { FeatureStore } from '../utils/FeatureStore';
 import { getAnnouncementRequest, getChangelogRequest, getCurrentVersionRequest } from './api';
 import { announcementActions } from './actions';
+import { createActionBindings } from '../utils/ActionBinding';
+import { createReactions } from '../../stores/lib/Reaction';
 
 const LOCAL_STORAGE_KEY = 'announcements';
 
@@ -52,14 +54,15 @@ export class AnnouncementsStore extends FeatureStore {
     this.actions = actions;
     getCurrentVersionRequest.execute();
 
-    this._registerActions([
+    this._registerActions(createActionBindings([
       [announcementActions.show, this._showAnnouncement],
-    ]);
+    ]));
 
-    this._registerReactions([
+    this._reactions = createReactions([
       this._fetchAnnouncements,
       this._showAnnouncementToUsersWhoUpdatedApp,
     ]);
+    this._registerReactions(this._reactions);
     this.isFeatureActive = true;
   }
 
@@ -105,7 +108,6 @@ export class AnnouncementsStore extends FeatureStore {
 
   _showAnnouncementToUsersWhoUpdatedApp = () => {
     const { announcement, isNewUser } = this;
-    console.log(announcement, isNewUser);
     // Check if there is an announcement and on't show announcements to new users
     if (!announcement || isNewUser) return;
 
@@ -125,7 +127,7 @@ export class AnnouncementsStore extends FeatureStore {
   _fetchAnnouncements = () => {
     const targetVersion = this.targetVersion || this.currentVersion;
     if (!targetVersion) return;
-    getChangelogRequest.execute('5.0.1');
-    getAnnouncementRequest.execute('5.1.0');
+    getChangelogRequest.execute(targetVersion);
+    getAnnouncementRequest.execute(targetVersion);
   }
 }
diff --git a/src/features/utils/ActionBinding.js b/src/features/utils/ActionBinding.js
new file mode 100644
index 000000000..497aa071b
--- /dev/null
+++ b/src/features/utils/ActionBinding.js
@@ -0,0 +1,29 @@
+export default class ActionBinding {
+  action;
+
+  isActive = false;
+
+  constructor(action) {
+    this.action = action;
+  }
+
+  start() {
+    if (!this.isActive) {
+      const { action } = this;
+      action[0].listen(action[1]);
+      this.isActive = true;
+    }
+  }
+
+  stop() {
+    if (this.isActive) {
+      const { action } = this;
+      action[0].off(action[1]);
+      this.isActive = false;
+    }
+  }
+}
+
+export const createActionBindings = actions => (
+  actions.map(a => new ActionBinding(a))
+);
diff --git a/src/features/utils/FeatureStore.js b/src/features/utils/FeatureStore.js
index d863f7464..967e745b2 100644
--- a/src/features/utils/FeatureStore.js
+++ b/src/features/utils/FeatureStore.js
@@ -1,4 +1,4 @@
-import Reaction from '../../stores/lib/Reaction';
+import { union } from 'lodash';
 
 export class FeatureStore {
   _actions = null;
@@ -13,25 +13,24 @@ export class FeatureStore {
   // ACTIONS
 
   _registerActions(actions) {
-    this._actions = [];
-    actions.forEach(a => this._actions.push(a));
-    this._startActions(this._actions);
+    this._actions = union(this._actions, actions);
+    this._startActions();
   }
 
   _startActions(actions = this._actions) {
-    actions.forEach(a => a[0].listen(a[1]));
+    console.log(actions);
+    actions.forEach(a => a.start());
   }
 
   _stopActions(actions = this._actions) {
-    actions.forEach(a => a[0].off(a[1]));
+    actions.forEach(a => a.stop());
   }
 
   // REACTIONS
 
   _registerReactions(reactions) {
-    this._reactions = [];
-    reactions.forEach(r => this._reactions.push(new Reaction(r)));
-    this._startReactions(this._reactions);
+    this._reactions = union(this._reactions, reactions);
+    this._startReactions();
   }
 
   _startReactions(reactions = this._reactions) {
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index bb18dc182..e11513d1f 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -14,6 +14,8 @@ import {
   updateWorkspaceRequest,
 } from './api';
 import { WORKSPACES_ROUTES } from './index';
+import { createReactions } from '../../stores/lib/Reaction';
+import { createActionBindings } from '../utils/ActionBinding';
 
 const debug = require('debug')('Franz:feature:workspaces:store');
 
@@ -80,41 +82,39 @@ export default class WorkspacesStore extends FeatureStore {
 
     // ACTIONS
 
-    this._freeUserActions = [
+    this._freeUserActions = createActionBindings([
       [workspaceActions.toggleWorkspaceDrawer, this._toggleWorkspaceDrawer],
       [workspaceActions.openWorkspaceSettings, this._openWorkspaceSettings],
-    ];
-    this._premiumUserActions = [
+    ]);
+    this._premiumUserActions = createActionBindings([
       [workspaceActions.edit, this._edit],
       [workspaceActions.create, this._create],
       [workspaceActions.delete, this._delete],
       [workspaceActions.update, this._update],
       [workspaceActions.activate, this._setActiveWorkspace],
       [workspaceActions.deactivate, this._deactivateActiveWorkspace],
-    ];
+    ]);
     this._allActions = this._freeUserActions.concat(this._premiumUserActions);
     this._registerActions(this._allActions);
 
     // REACTIONS
 
-    this._freeUserReactions = [
+    this._freeUserReactions = createReactions([
       this._stopPremiumActionsAndReactions,
       this._openDrawerWithSettingsReaction,
       this._setFeatureEnabledReaction,
       this._setIsPremiumFeatureReaction,
       this._cleanupInvalidServiceReferences,
-    ];
-    this._premiumUserReactions = [
+    ]);
+    this._premiumUserReactions = createReactions([
       this._setActiveServiceOnWorkspaceSwitchReaction,
       this._activateLastUsedWorkspaceReaction,
       this._setWorkspaceBeingEditedReaction,
-    ];
+    ]);
     this._allReactions = this._freeUserReactions.concat(this._premiumUserReactions);
 
     this._registerReactions(this._allReactions);
 
-    console.log(this._reactions);
-
     getUserWorkspacesRequest.execute();
     this.isFeatureActive = true;
   }