1 files changed, 37 insertions, 3 deletions

diff --git a/src/features/workspaces/index.js b/src/features/workspaces/index.js
index 50ac3b414..8091f49fc 100644
--- a/src/features/workspaces/index.js
+++ b/src/features/workspaces/index.js
@@ -1,14 +1,28 @@
-import { reaction } from 'mobx';
+import { reaction, runInAction } from 'mobx';
 import WorkspacesStore from './store';
 import api from './api';
-import { state, resetState } from './state';
+import { workspacesState, resetState } from './state';
 
 const debug = require('debug')('Franz:feature:workspaces');
 
 let store = null;
 
+export const filterServicesByActiveWorkspace = (services) => {
+  const { isFeatureActive, activeWorkspace } = workspacesState;
+  if (isFeatureActive && activeWorkspace) {
+    return services.filter(s => activeWorkspace.services.includes(s.id));
+  }
+  return services;
+};
+
+export const getActiveWorkspaceServices = (services) => {
+  return filterServicesByActiveWorkspace(services);
+};
+
 export default function initWorkspaces(stores, actions) {
   const { features, user } = stores;
+
+  // Toggle workspace feature
   reaction(
     () => (
       features.features.isWorkspaceEnabled && (
@@ -18,10 +32,12 @@ export default function initWorkspaces(stores, actions) {
     (isEnabled) => {
       if (isEnabled) {
         debug('Initializing `workspaces` feature');
-        store = new WorkspacesStore(stores, api, actions, state);
+        store = new WorkspacesStore(stores, api, actions, workspacesState);
         store.initialize();
+        runInAction(() => { workspacesState.isFeatureActive = true; });
       } else if (store) {
         debug('Disabling `workspaces` feature');
+        runInAction(() => { workspacesState.isFeatureActive = false; });
         store.teardown();
         store = null;
         resetState(); // Reset state to default
@@ -31,4 +47,22 @@ export default function initWorkspaces(stores, actions) {
       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) {
+        console.log(workspaceServices[0].id);
+        actions.service.setActive({ serviceId: workspaceServices[0].id });
+      }
+    }
+  });
 }