6 files changed, 83 insertions, 31 deletions

diff --git a/src/features/workspaces/actions.js b/src/features/workspaces/actions.js
index 84de2b011..25246de09 100644
--- a/src/features/workspaces/actions.js
+++ b/src/features/workspaces/actions.js
@@ -1,7 +1,8 @@
 import PropTypes from 'prop-types';
 import Workspace from './models/Workspace';
+import { createActionsFromDefinitions } from '../../actions/lib/actions';
 
-export default {
+export default createActionsFromDefinitions({
   edit: {
     workspace: PropTypes.instanceOf(Workspace).isRequired,
   },
@@ -14,4 +15,8 @@ export default {
   update: {
     workspace: PropTypes.instanceOf(Workspace).isRequired,
   },
-};
+  activate: {
+    workspace: PropTypes.instanceOf(Workspace).isRequired,
+  },
+  deactivate: {},
+}, PropTypes.checkPropTypes);
diff --git a/src/features/workspaces/containers/EditWorkspaceScreen.js b/src/features/workspaces/containers/EditWorkspaceScreen.js
index 790b8a0fe..1b13bc2d4 100644
--- a/src/features/workspaces/containers/EditWorkspaceScreen.js
+++ b/src/features/workspaces/containers/EditWorkspaceScreen.js
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 
 import ErrorBoundary from '../../../components/util/ErrorBoundary';
 import EditWorkspaceForm from '../components/EditWorkspaceForm';
-import { state } from '../state';
+import { workspacesState } from '../state';
 import ServicesStore from '../../../stores/ServicesStore';
 import Workspace from '../models/Workspace';
 
@@ -22,23 +22,23 @@ class EditWorkspaceScreen extends Component {
   };
 
   onDelete = () => {
-    const { workspaceBeingEdited } = state;
+    const { workspaceBeingEdited } = workspacesState;
     const { actions } = this.props;
     if (!workspaceBeingEdited) return null;
-    actions.workspace.delete({ workspace: workspaceBeingEdited });
+    actions.workspaces.delete({ workspace: workspaceBeingEdited });
   };
 
   onSave = (values) => {
-    const { workspaceBeingEdited } = state;
+    const { workspaceBeingEdited } = workspacesState;
     const { actions } = this.props;
     const workspace = new Workspace(
       Object.assign({}, workspaceBeingEdited, values),
     );
-    actions.workspace.update({ workspace });
+    actions.workspaces.update({ workspace });
   };
 
   render() {
-    const { workspaceBeingEdited } = state;
+    const { workspaceBeingEdited } = workspacesState;
     const { stores } = this.props;
     if (!workspaceBeingEdited) return null;
     return (
diff --git a/src/features/workspaces/containers/WorkspacesScreen.js b/src/features/workspaces/containers/WorkspacesScreen.js
index b89cbcf67..94e714255 100644
--- a/src/features/workspaces/containers/WorkspacesScreen.js
+++ b/src/features/workspaces/containers/WorkspacesScreen.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { inject, observer } from 'mobx-react';
 import PropTypes from 'prop-types';
-import { state } from '../state';
+import { workspacesState } from '../state';
 import WorkspacesDashboard from '../components/WorkspacesDashboard';
 import ErrorBoundary from '../../../components/util/ErrorBoundary';
 
@@ -20,10 +20,10 @@ class WorkspacesScreen extends Component {
     return (
       <ErrorBoundary>
         <WorkspacesDashboard
-          workspaces={state.workspaces}
-          isLoading={state.isLoading}
-          onCreateWorkspaceSubmit={data => actions.workspace.create(data)}
-          onWorkspaceClick={w => actions.workspace.edit({ workspace: w })}
+          workspaces={workspacesState.workspaces}
+          isLoading={workspacesState.isLoading}
+          onCreateWorkspaceSubmit={data => actions.workspaces.create(data)}
+          onWorkspaceClick={w => actions.workspaces.edit({ workspace: w })}
         />
       </ErrorBoundary>
     );
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 });
+      }
+    }
+  });
 }
diff --git a/src/features/workspaces/state.js b/src/features/workspaces/state.js
index f938c1470..963b96f81 100644
--- a/src/features/workspaces/state.js
+++ b/src/features/workspaces/state.js
@@ -1,13 +1,15 @@
 import { observable } from 'mobx';
 
 const defaultState = {
+  activeWorkspace: null,
   isLoading: false,
+  isFeatureActive: false,
   workspaces: [],
   workspaceBeingEdited: null,
 };
 
-export const state = observable(defaultState);
+export const workspacesState = observable(defaultState);
 
 export function resetState() {
-  Object.assign(state, defaultState);
+  Object.assign(workspacesState, defaultState);
 }
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index 5cccb2ab7..a2997a0d2 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -1,8 +1,9 @@
-import { observable, reaction } from 'mobx';
+import { observable, reaction, action } from 'mobx';
 import Store from '../../stores/lib/Store';
 import CachedRequest from '../../stores/lib/CachedRequest';
 import Workspace from './models/Workspace';
 import { matchRoute } from '../../helpers/routing-helpers';
+import workspaceActions from './actions';
 
 const debug = require('debug')('Franz:feature:workspaces');
 
@@ -48,28 +49,30 @@ export default class WorkspacesStore extends Store {
       },
     );
 
-    this.actions.workspace.edit.listen(this._edit);
-    this.actions.workspace.create.listen(this._create);
-    this.actions.workspace.delete.listen(this._delete);
-    this.actions.workspace.update.listen(this._update);
+    workspaceActions.edit.listen(this._edit);
+    workspaceActions.create.listen(this._create);
+    workspaceActions.delete.listen(this._delete);
+    workspaceActions.update.listen(this._update);
+    workspaceActions.activate.listen(this._setActiveWorkspace);
+    workspaceActions.deactivate.listen(this._deactivateActiveWorkspace);
   }
 
-  _setWorkspaces = (workspaces) => {
+  _getWorkspaceById = id => this.state.workspaces.find(w => w.id === id);
+
+  @action _setWorkspaces = (workspaces) => {
     debug('setting user workspaces', workspaces.slice());
     this.state.workspaces = workspaces.map(data => new Workspace(data));
   };
 
-  _setIsLoading = (isLoading) => {
+  @action _setIsLoading = (isLoading) => {
     this.state.isLoading = isLoading;
   };
 
-  _getWorkspaceById = id => this.state.workspaces.find(w => w.id === id);
-
-  _edit = ({ workspace }) => {
+  @action _edit = ({ workspace }) => {
     this.stores.router.push(`/settings/workspaces/edit/${workspace.id}`);
   };
 
-  _create = async ({ name }) => {
+  @action _create = async ({ name }) => {
     try {
       const result = await this.api.createWorkspace(name);
       const workspace = new Workspace(result);
@@ -80,7 +83,7 @@ export default class WorkspacesStore extends Store {
     }
   };
 
-  _delete = async ({ workspace }) => {
+  @action _delete = async ({ workspace }) => {
     try {
       await this.api.deleteWorkspace(workspace);
       this.state.workspaces.remove(workspace);
@@ -90,7 +93,7 @@ export default class WorkspacesStore extends Store {
     }
   };
 
-  _update = async ({ workspace }) => {
+  @action _update = async ({ workspace }) => {
     try {
       await this.api.updateWorkspace(workspace);
       const localWorkspace = this.state.workspaces.find(ws => ws.id === workspace.id);
@@ -100,4 +103,12 @@ export default class WorkspacesStore extends Store {
       throw error;
     }
   };
+
+  @action _setActiveWorkspace = ({ workspace }) => {
+    this.state.activeWorkspace = workspace;
+  };
+
+  @action _deactivateActiveWorkspace = () => {
+    this.state.activeWorkspace = null;
+  };
 }