9 files changed, 63 insertions, 35 deletions

diff --git a/src/features/workspaces/api.js b/src/features/workspaces/api.js
index 0ec20c9ea..30fbd84be 100644
--- a/src/features/workspaces/api.js
+++ b/src/features/workspaces/api.js
@@ -1,14 +1,14 @@
 import { pick } from 'lodash';
 import { sendAuthRequest } from '../../api/utils/auth';
-import { API, API_VERSION } from '../../environment';
 import Request from '../../stores/lib/Request';
 import Workspace from './models/Workspace';
+import apiBase from '../../api/apiBase';
 
-const debug = require('debug')('Franz:feature:workspaces:api');
+const debug = require('debug')('Ferdi:feature:workspaces:api');
 
 export const workspaceApi = {
   getUserWorkspaces: async () => {
-    const url = `${API}/${API_VERSION}/workspace`;
+    const url = `${apiBase()}/workspace`;
     debug('getUserWorkspaces GET', url);
     const result = await sendAuthRequest(url, { method: 'GET' });
     debug('getUserWorkspaces RESULT', result);
@@ -18,7 +18,7 @@ export const workspaceApi = {
   },
 
   createWorkspace: async (name) => {
-    const url = `${API}/${API_VERSION}/workspace`;
+    const url = `${apiBase()}/workspace`;
     const options = {
       method: 'POST',
       body: JSON.stringify({ name }),
@@ -31,7 +31,7 @@ export const workspaceApi = {
   },
 
   deleteWorkspace: async (workspace) => {
-    const url = `${API}/${API_VERSION}/workspace/${workspace.id}`;
+    const url = `${apiBase()}/workspace/${workspace.id}`;
     debug('deleteWorkspace DELETE', url);
     const result = await sendAuthRequest(url, { method: 'DELETE' });
     debug('deleteWorkspace RESULT', result);
@@ -40,7 +40,7 @@ export const workspaceApi = {
   },
 
   updateWorkspace: async (workspace) => {
-    const url = `${API}/${API_VERSION}/workspace/${workspace.id}`;
+    const url = `${apiBase()}/workspace/${workspace.id}`;
     const options = {
       method: 'PUT',
       body: JSON.stringify(pick(workspace, ['name', 'services'])),
diff --git a/src/features/workspaces/components/CreateWorkspaceForm.js b/src/features/workspaces/components/CreateWorkspaceForm.js
index cddbb2b04..15b97121d 100644
--- a/src/features/workspaces/components/CreateWorkspaceForm.js
+++ b/src/features/workspaces/components/CreateWorkspaceForm.js
@@ -6,8 +6,7 @@ import { Input, Button } from '@meetfranz/forms';
 import injectSheet from 'react-jss';
 import Form from '../../../lib/Form';
 import { required } from '../../../helpers/validation-helpers';
-import { gaEvent } from '../../../lib/analytics';
-import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../index';
+import { workspaceStore } from '../index';
 
 const messages = defineMessages({
   submitButton: {
@@ -66,7 +65,6 @@ class CreateWorkspaceForm extends Component {
         const { onSubmit } = this.props;
         const values = f.values();
         onSubmit(values);
-        gaEvent(GA_CATEGORY_WORKSPACES, 'create', values.name);
       },
     });
   }
diff --git a/src/features/workspaces/components/EditWorkspaceForm.js b/src/features/workspaces/components/EditWorkspaceForm.js
index e602ebd5a..b3551a7b9 100644
--- a/src/features/workspaces/components/EditWorkspaceForm.js
+++ b/src/features/workspaces/components/EditWorkspaceForm.js
@@ -12,8 +12,10 @@ import Form from '../../../lib/Form';
 import { required } from '../../../helpers/validation-helpers';
 import WorkspaceServiceListItem from './WorkspaceServiceListItem';
 import Request from '../../../stores/lib/Request';
-import { gaEvent } from '../../../lib/analytics';
-import { GA_CATEGORY_WORKSPACES } from '../index';
+
+import { KEEP_WS_LOADED_USID } from '../../../config';
+
+import Toggle from '../../../components/ui/Toggle';
 
 const messages = defineMessages({
   buttonDelete: {
@@ -32,6 +34,14 @@ const messages = defineMessages({
     id: 'settings.workspace.form.yourWorkspaces',
     defaultMessage: '!!!Your workspaces',
   },
+  keepLoaded: {
+    id: 'settings.workspace.form.keepLoaded',
+    defaultMessage: '!!!Keep this workspace loaded*',
+  },
+  keepLoadedInfo: {
+    id: 'settings.workspace.form.keepLoadedInfo',
+    defaultMessage: '!!!*This option will be overwritten by the global "Keep all workspaces loaded" option.',
+  },
   servicesInWorkspaceHeadline: {
     id: 'settings.workspace.form.servicesInWorkspaceHeadline',
     defaultMessage: '!!!Services in this Workspace',
@@ -53,6 +63,9 @@ const styles = () => ({
   serviceList: {
     height: 'auto',
   },
+  keepLoadedInfo: {
+    marginBottom: '2rem !important',
+  },
 });
 
 @injectSheet(styles) @observer
@@ -90,6 +103,11 @@ class EditWorkspaceForm extends Component {
           value: workspace.name,
           validators: [required],
         },
+        keepLoaded: {
+          label: intl.formatMessage(messages.keepLoaded),
+          value: workspace.services.includes(KEEP_WS_LOADED_USID),
+          default: false,
+        },
         services: {
           value: workspace.services.slice(),
         },
@@ -103,7 +121,6 @@ class EditWorkspaceForm extends Component {
         const { onSave } = this.props;
         const values = f.values();
         onSave(values);
-        gaEvent(GA_CATEGORY_WORKSPACES, 'save');
       },
       onError: async () => {},
     });
@@ -112,7 +129,6 @@ class EditWorkspaceForm extends Component {
   delete() {
     const { onDelete } = this.props;
     onDelete();
-    gaEvent(GA_CATEGORY_WORKSPACES, 'delete');
   }
 
   toggleService(service) {
@@ -155,6 +171,10 @@ class EditWorkspaceForm extends Component {
         <div className="settings__body">
           <div className={classes.nameInput}>
             <Input {...form.$('name').bind()} />
+            <Toggle field={form.$('keepLoaded')} />
+            <p className={classes.keepLoadedInfo}>
+              { intl.formatMessage(messages.keepLoadedInfo) }
+            </p>
           </div>
           <h2>{intl.formatMessage(messages.servicesInWorkspaceHeadline)}</h2>
           <div className={classes.serviceList}>
diff --git a/src/features/workspaces/components/WorkspaceDrawer.js b/src/features/workspaces/components/WorkspaceDrawer.js
index 07100f5a1..baa94f6b3 100644
--- a/src/features/workspaces/components/WorkspaceDrawer.js
+++ b/src/features/workspaces/components/WorkspaceDrawer.js
@@ -10,8 +10,7 @@ import ReactTooltip from 'react-tooltip';
 import { mdiPlusBox, mdiSettings, mdiStar } from '@mdi/js';
 import WorkspaceDrawerItem from './WorkspaceDrawerItem';
 import { workspaceActions } from '../actions';
-import { GA_CATEGORY_WORKSPACES, workspaceStore } from '../index';
-import { gaEvent } from '../../../lib/analytics';
+import { workspaceStore } from '../index';
 
 const messages = defineMessages({
   headline: {
@@ -158,7 +157,6 @@ class WorkspaceDrawer extends Component {
             className={classes.workspacesSettingsButton}
             onClick={() => {
               workspaceActions.openWorkspaceSettings();
-              gaEvent(GA_CATEGORY_WORKSPACES, 'settings', 'drawerHeadline');
             }}
             data-tip={`${intl.formatMessage(messages.workspacesSettingsTooltip)}`}
           >
@@ -180,7 +178,6 @@ class WorkspaceDrawer extends Component {
                 icon={mdiStar}
                 onClick={() => {
                   onUpgradeAccountClick();
-                  gaEvent('User', 'upgrade', 'workspaceDrawer');
                 }}
               />
             ) : (
@@ -191,7 +188,6 @@ class WorkspaceDrawer extends Component {
                 icon={mdiPlusBox}
                 onClick={() => {
                   workspaceActions.openWorkspaceSettings();
-                  gaEvent(GA_CATEGORY_WORKSPACES, 'add', 'drawerPremiumCta');
                 }}
               />
             )}
@@ -203,7 +199,6 @@ class WorkspaceDrawer extends Component {
               onClick={() => {
                 workspaceActions.deactivate();
                 workspaceActions.toggleWorkspaceDrawer();
-                gaEvent(GA_CATEGORY_WORKSPACES, 'switch', 'drawer');
               }}
               services={getServicesForWorkspace(null)}
               isActive={actualWorkspace == null}
@@ -218,7 +213,6 @@ class WorkspaceDrawer extends Component {
                   if (actualWorkspace === workspace) return;
                   workspaceActions.activate({ workspace });
                   workspaceActions.toggleWorkspaceDrawer();
-                  gaEvent(GA_CATEGORY_WORKSPACES, 'switch', 'drawer');
                 }}
                 onContextMenuEditClick={() => workspaceActions.edit({ workspace })}
                 services={getServicesForWorkspace(workspace)}
@@ -229,7 +223,6 @@ class WorkspaceDrawer extends Component {
               className={classes.addNewWorkspaceLabel}
               onClick={() => {
                 workspaceActions.openWorkspaceSettings();
-                gaEvent(GA_CATEGORY_WORKSPACES, 'add', 'drawerAddLabel');
               }}
             >
               <Icon
diff --git a/src/features/workspaces/components/WorkspacesDashboard.js b/src/features/workspaces/components/WorkspacesDashboard.js
index 4fb302be2..b499e02a4 100644
--- a/src/features/workspaces/components/WorkspacesDashboard.js
+++ b/src/features/workspaces/components/WorkspacesDashboard.js
@@ -47,7 +47,7 @@ const messages = defineMessages({
   },
   workspaceFeatureHeadline: {
     id: 'settings.workspaces.workspaceFeatureHeadline',
-    defaultMessage: '!!!Less is More: Introducing Franz Workspaces',
+    defaultMessage: '!!!Less is More: Introducing Ferdi Workspaces',
   },
 });
 
diff --git a/src/features/workspaces/containers/EditWorkspaceScreen.js b/src/features/workspaces/containers/EditWorkspaceScreen.js
index 248b40131..7eaabc1ea 100644
--- a/src/features/workspaces/containers/EditWorkspaceScreen.js
+++ b/src/features/workspaces/containers/EditWorkspaceScreen.js
@@ -33,7 +33,9 @@ class EditWorkspaceScreen extends Component {
     const { workspaceBeingEdited } = workspaceStore;
     const { actions } = this.props;
     const workspace = new Workspace(
-      Object.assign({}, workspaceBeingEdited, values),
+      Object.assign({
+        saving: true,
+      }, workspaceBeingEdited, values),
     );
     actions.workspaces.update({ workspace });
   };
diff --git a/src/features/workspaces/index.js b/src/features/workspaces/index.js
index ed3e52096..560b732ab 100644
--- a/src/features/workspaces/index.js
+++ b/src/features/workspaces/index.js
@@ -2,7 +2,7 @@ import { reaction } from 'mobx';
 import WorkspacesStore from './store';
 import { resetApiRequests } from './api';
 
-const debug = require('debug')('Franz:feature:workspaces');
+const debug = require('debug')('Ferdi:feature:workspaces');
 
 export const GA_CATEGORY_WORKSPACES = 'Workspaces';
 export const DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED = false;
diff --git a/src/features/workspaces/models/Workspace.js b/src/features/workspaces/models/Workspace.js
index 6c73d7095..77c4e05f4 100644
--- a/src/features/workspaces/models/Workspace.js
+++ b/src/features/workspaces/models/Workspace.js
@@ -1,5 +1,7 @@
 import { observable } from 'mobx';
 
+import { KEEP_WS_LOADED_USID } from '../../../config';
+
 export default class Workspace {
   id = null;
 
@@ -19,7 +21,17 @@ export default class Workspace {
     this.id = data.id;
     this.name = data.name;
     this.order = data.order;
-    this.services.replace(data.services);
+
+    let services = data.services;
+    if (data.saving && data.keepLoaded) {
+      // Keep workspaces loaded
+      services.push(KEEP_WS_LOADED_USID);
+    } else if (data.saving && data.services.includes(KEEP_WS_LOADED_USID)) {
+      // Don't keep loaded
+      services = services.filter(e => e !== KEEP_WS_LOADED_USID);
+    }
+    this.services.replace(services);
+
     this.userId = data.userId;
   }
 }
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index 13227e033..5c90ff180 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -17,16 +17,18 @@ import { WORKSPACES_ROUTES } from './index';
 import { createReactions } from '../../stores/lib/Reaction';
 import { createActionBindings } from '../utils/ActionBinding';
 
-const debug = require('debug')('Franz:feature:workspaces:store');
+import { KEEP_WS_LOADED_USID } from '../../config';
+
+const debug = require('debug')('Ferdi:feature:workspaces:store');
 
 export default class WorkspacesStore extends FeatureStore {
-  @observable isFeatureEnabled = false;
+  @observable isFeatureEnabled = true;
 
   @observable isFeatureActive = false;
 
-  @observable isPremiumFeature = true;
+  @observable isPremiumFeature = false;
 
-  @observable isPremiumUpgradeRequired = true;
+  @observable isPremiumUpgradeRequired = false;
 
   @observable activeWorkspace = null;
 
@@ -59,7 +61,8 @@ export default class WorkspacesStore extends FeatureStore {
   }
 
   @computed get isUserAllowedToUseFeature() {
-    return !this.isPremiumUpgradeRequired;
+    return true;
+    // return !this.isPremiumUpgradeRequired;
   }
 
   @computed get isAnyWorkspaceActive() {
@@ -263,10 +266,10 @@ export default class WorkspacesStore extends FeatureStore {
   };
 
   _setIsPremiumFeatureReaction = () => {
-    const { features } = this.stores;
-    const { isWorkspaceIncludedInCurrentPlan } = features.features;
-    this.isPremiumFeature = !isWorkspaceIncludedInCurrentPlan;
-    this.isPremiumUpgradeRequired = !isWorkspaceIncludedInCurrentPlan;
+    // const { features } = this.stores;
+    // const { isWorkspaceIncludedInCurrentPlan } = features.features;
+    // this.isPremiumFeature = !isWorkspaceIncludedInCurrentPlan;
+    // this.isPremiumUpgradeRequired = !isWorkspaceIncludedInCurrentPlan;
   };
 
   _setWorkspaceBeingEditedReaction = () => {
@@ -331,7 +334,7 @@ export default class WorkspacesStore extends FeatureStore {
     // Loop through all workspaces and remove invalid service ids (locally)
     this.workspaces.forEach((workspace) => {
       workspace.services.forEach((serviceId) => {
-        if (servicesHaveBeenLoaded && !services.one(serviceId)) {
+        if (servicesHaveBeenLoaded && !services.one(serviceId) && serviceId !== KEEP_WS_LOADED_USID) {
           workspace.services.remove(serviceId);
         }
       });