Merge branch 'master' of https://github.com/meetfranz/franz into meetfranz-master

1 files changed, 34 insertions, 3 deletions

diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 73385d7b8..09e7b43ab 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -21,6 +21,8 @@ import { API, TODOS_FRONTEND } from '../../environment';
 
 import globalMessages from '../../i18n/globalMessages';
 import { DEFAULT_IS_FEATURE_ENABLED_BY_USER } from '../../features/todos';
+import WorkspacesStore from '../../features/workspaces/store';
+import { DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED } from '../../features/workspaces';
 
 const messages = defineMessages({
   autoLaunchOnStart: {
@@ -87,6 +89,10 @@ const messages = defineMessages({
     id: 'settings.app.form.enableTodos',
     defaultMessage: '!!!Enable Franz Todos',
   },
+  keepAllWorkspacesLoaded: {
+    id: 'settings.app.form.keepAllWorkspacesLoaded',
+    defaultMessage: '!!!Keep all workspaces loaded',
+  },
 });
 
 export default @inject('stores', 'actions') @observer class EditSettingsScreen extends Component {
@@ -95,12 +101,13 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
   };
 
   onSubmit(settingsData) {
-    const { todos } = this.props.stores;
+    const { todos, workspaces } = this.props.stores;
     const {
       app,
       settings,
       user,
       todos: todosActions,
+      workspaces: workspaceActions,
     } = this.props.actions;
 
     app.launchOnStartup({
@@ -135,14 +142,24 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
       },
     });
 
+    if (workspaces.isFeatureActive) {
+      const { keepAllWorkspacesLoaded } = workspaces.settings;
+      if (keepAllWorkspacesLoaded !== settingsData.keepAllWorkspacesLoaded) {
+        workspaceActions.toggleKeepAllWorkspacesLoadedSetting();
+      }
+    }
+
     if (todos.isFeatureActive) {
-      todosActions.toggleTodosFeatureVisibility();
+      const { isFeatureEnabledByUser } = todos.settings;
+      if (isFeatureEnabledByUser !== settingsData.enableTodos) {
+        todosActions.toggleTodosFeatureVisibility();
+      }
     }
   }
 
   prepareForm() {
     const {
-      app, settings, user, todos,
+      app, settings, user, todos, workspaces,
     } = this.props.stores;
     const { intl } = this.context;
 
@@ -242,6 +259,14 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
       },
     };
 
+    if (workspaces.isFeatureActive) {
+      config.fields.keepAllWorkspacesLoaded = {
+        label: intl.formatMessage(messages.keepAllWorkspacesLoaded),
+        value: workspaces.settings.keepAllWorkspacesLoaded,
+        default: DEFAULT_SETTING_KEEP_ALL_WORKSPACES_LOADED,
+      };
+    }
+
     if (todos.isFeatureActive) {
       config.fields.enableTodos = {
         label: intl.formatMessage(messages.enableTodos),
@@ -257,6 +282,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
     const {
       app,
       todos,
+      workspaces,
     } = this.props.stores;
     const {
       updateStatus,
@@ -287,6 +313,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           onClearAllCache={clearAllCache}
           isSpellcheckerIncludedInCurrentPlan={spellcheckerConfig.isIncludedInCurrentPlan}
           isTodosEnabled={todos.isFeatureActive}
+          isWorkspaceEnabled={workspaces.isFeatureActive}
         />
       </ErrorBoundary>
     );
@@ -299,6 +326,7 @@ EditSettingsScreen.wrappedComponent.propTypes = {
     user: PropTypes.instanceOf(UserStore).isRequired,
     settings: PropTypes.instanceOf(SettingsStore).isRequired,
     todos: PropTypes.instanceOf(TodosStore).isRequired,
+    workspaces: PropTypes.instanceOf(WorkspacesStore).isRequired,
   }).isRequired,
   actions: PropTypes.shape({
     app: PropTypes.shape({
@@ -316,5 +344,8 @@ EditSettingsScreen.wrappedComponent.propTypes = {
     todos: PropTypes.shape({
       toggleTodosFeatureVisibility: PropTypes.func.isRequired,
     }).isRequired,
+    workspaces: PropTypes.shape({
+      toggleAllWorkspacesLoadedSetting: PropTypes.func.isRequired,
+    }).isRequired,
   }).isRequired,
 };