1 files changed, 6 insertions, 45 deletions

diff --git a/src/features/workspaces/index.js b/src/features/workspaces/index.js
index 1644c0e2f..68f82bdee 100644
--- a/src/features/workspaces/index.js
+++ b/src/features/workspaces/index.js
@@ -1,26 +1,9 @@
-import { reaction, runInAction } from 'mobx';
+import { reaction } from 'mobx';
 import WorkspacesStore from './store';
-import api from './api';
-import { workspacesState, resetState } from './state';
 
 const debug = require('debug')('Franz:feature:workspaces');
 
-let store = null;
-
-export const filterServicesByActiveWorkspace = (services) => {
-  const {
-    activeWorkspace,
-    isFeatureActive,
-  } = workspacesState;
-
-  if (!isFeatureActive) return services;
-  if (activeWorkspace) return services.filter(s => activeWorkspace.services.includes(s.id));
-  return services;
-};
-
-export const getActiveWorkspaceServices = services => (
-  filterServicesByActiveWorkspace(services)
-);
+export const workspaceStore = new WorkspacesStore();
 
 export default function initWorkspaces(stores, actions) {
   const { features, user } = stores;
@@ -33,38 +16,16 @@ export default function initWorkspaces(stores, actions) {
       )
     ),
     (isEnabled) => {
-      if (isEnabled) {
+      if (isEnabled && !workspaceStore.isFeatureActive) {
         debug('Initializing `workspaces` feature');
-        store = new WorkspacesStore(stores, api, actions, workspacesState);
-        store.initialize();
-        runInAction(() => { workspacesState.isFeatureActive = true; });
-      } else if (store) {
+        workspaceStore.start(stores, actions);
+      } else if (workspaceStore.isFeatureActive) {
         debug('Disabling `workspaces` feature');
-        runInAction(() => { workspacesState.isFeatureActive = false; });
-        store.teardown();
-        store = null;
-        resetState(); // Reset state to default
+        workspaceStore.stop();
       }
     },
     {
       fireImmediately: true,
     },
   );
-
-  // Update active service on workspace switches
-  reaction(() => ({
-    isFeatureActive: workspacesState.isFeatureActive,
-    activeWorkspace: workspacesState.activeWorkspace,
-  }), ({ isFeatureActive, activeWorkspace }) => {
-    if (!isFeatureActive) return;
-    if (activeWorkspace) {
-      const services = stores.services.allDisplayed;
-      const activeService = services.find(s => s.isActive);
-      const workspaceServices = filterServicesByActiveWorkspace(services);
-      const isActiveServiceInWorkspace = workspaceServices.includes(activeService);
-      if (!isActiveServiceInWorkspace) {
-        actions.service.setActive({ serviceId: workspaceServices[0].id });
-      }
-    }
-  });
 }