3 files changed, 80 insertions, 48 deletions

diff --git a/src/features/serviceProxy/index.ts b/src/features/serviceProxy/index.ts
index 51e67feca..eb3b89ece 100644
--- a/src/features/serviceProxy/index.ts
+++ b/src/features/serviceProxy/index.ts
@@ -1,4 +1,4 @@
-import { autorun, observable } from 'mobx';
+import { autorun, action, observable } from 'mobx';
 import { session } from '@electron/remote';
 
 const debug = require('../../preload-safe-debug')(
@@ -15,8 +15,12 @@ export default function init(stores: {
 }) {
   debug('Initializing `serviceProxy` feature');
 
+  const setIsEnabled = action((value: boolean) => {
+    config.isEnabled = value;
+  });
+
   autorun(() => {
-    config.isEnabled = true;
+    setIsEnabled(true);
 
     const services = stores.services.enabled;
     const proxySettings = stores.settings.proxy;
diff --git a/src/features/webControls/containers/WebControlsScreen.js b/src/features/webControls/containers/WebControlsScreen.jsx
index e5567eec5..25e14060d 100644
--- a/src/features/webControls/containers/WebControlsScreen.js
+++ b/src/features/webControls/containers/WebControlsScreen.jsx
@@ -2,7 +2,7 @@ import { Component } from 'react';
 import { observer, inject } from 'mobx-react';
 import PropTypes from 'prop-types';
 
-import { autorun, makeObservable, observable } from 'mobx';
+import { autorun, action, makeObservable, observable } from 'mobx';
 import WebControls from '../components/WebControls';
 import ServicesStore from '../../../stores/ServicesStore';
 import Service from '../../../models/Service';
@@ -27,6 +27,16 @@ class WebControlsScreen extends Component {
 
   autorunDisposer = null;
 
+  @action _setUrl(value) {
+    this.url = value;
+  }
+
+  @action _setUrlAndHistory(value) {
+    this._setUrl(value);
+    this.canGoBack = this.webview.canGoBack();
+    this.canGoForward = this.webview.canGoForward();
+  }
+
   constructor(props) {
     super(props);
 
@@ -39,15 +49,13 @@ class WebControlsScreen extends Component {
     this.autorunDisposer = autorun(() => {
       if (service.isAttached) {
         this.webview = service.webview;
-        this.url = this.webview.getURL();
+        this._setUrl(this.webview.getURL());
 
         for (const event of URL_EVENTS) {
           this.webview.addEventListener(event, e => {
             if (!e.isMainFrame) return;
 
-            this.url = e.url;
-            this.canGoBack = this.webview.canGoBack();
-            this.canGoForward = this.webview.canGoForward();
+            this._setUrlAndHistory(e.url);
           });
         }
       }
@@ -101,7 +109,7 @@ class WebControlsScreen extends Component {
     }
 
     this.webview.loadURL(url);
-    this.url = url;
+    this._setUrl(url);
   }
 
   openInBrowser() {
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index a8fb493df..2323019fe 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -90,7 +90,7 @@ export default class WorkspacesStore extends FeatureStore {
       [workspaceActions.create, this._create],
       [workspaceActions.delete, this._delete],
       [workspaceActions.update, this._update],
-      [workspaceActions.activate, this._setActiveWorkspace],
+      [workspaceActions.activate, this._setActivateWorkspace],
       [workspaceActions.deactivate, this._deactivateActiveWorkspace],
       [
         workspaceActions.toggleKeepAllWorkspacesLoadedSetting,
@@ -114,10 +114,10 @@ export default class WorkspacesStore extends FeatureStore {
   }
 
   @action reset() {
-    this.activeWorkspace = null;
-    this.nextWorkspace = null;
+    this._setActiveWorkspace(null);
+    this._setNextWorkspace(null);
     this.workspaceBeingEdited = null;
-    this.isSwitchingWorkspace = false;
+    this._setIsSwitchingWorkspace(false);
     this.isWorkspaceDrawerOpen = false;
   }
 
@@ -181,19 +181,31 @@ export default class WorkspacesStore extends FeatureStore {
     this.stores.router.push('/settings/workspaces');
   };
 
-  @action _setActiveWorkspace = ({ workspace }) => {
-    // Indicate that we are switching to another workspace
-    this.isSwitchingWorkspace = true;
+  @action _setNextWorkspace(workspace) {
     this.nextWorkspace = workspace;
+  }
+
+  @action _setIsSwitchingWorkspace(bool) {
+    this.isSwitchingWorkspace = bool;
+  }
+
+  @action _setActiveWorkspace(workspace) {
+    this.activeWorkspace = workspace;
+  }
+
+  @action _setActivateWorkspace = ({ workspace }) => {
+    // Indicate that we are switching to another workspace
+    this._setIsSwitchingWorkspace(true);
+    this._setNextWorkspace(workspace);
     // Delay switching to next workspace so that the services loading does not drag down UI
     setTimeout(() => {
-      this.activeWorkspace = workspace;
+      this._setActiveWorkspace(workspace);
       this._updateSettings({ lastActiveWorkspace: workspace.id });
     }, 100);
     // Indicate that we are done switching to the next workspace
     setTimeout(() => {
-      this.isSwitchingWorkspace = false;
-      this.nextWorkspace = null;
+      this._setIsSwitchingWorkspace(false);
+      this._setNextWorkspace(null);
       if (this.stores.settings.app.splitMode) {
         const serviceNames = new Set(
           this.getWorkspaceServices(workspace).map(service => service.name),
@@ -211,16 +223,16 @@ export default class WorkspacesStore extends FeatureStore {
 
   @action _deactivateActiveWorkspace = () => {
     // Indicate that we are switching to default workspace
-    this.isSwitchingWorkspace = true;
-    this.nextWorkspace = null;
+    this._setIsSwitchingWorkspace(true);
+    this._setNextWorkspace(null);
     this._updateSettings({ lastActiveWorkspace: null });
     // Delay switching to next workspace so that the services loading does not drag down UI
     setTimeout(() => {
-      this.activeWorkspace = null;
+      this._setActiveWorkspace(null);
     }, 100);
     // Indicate that we are done switching to the default workspace
     setTimeout(() => {
-      this.isSwitchingWorkspace = false;
+      this._setIsSwitchingWorkspace(false);
       if (this.stores.settings.app.splitMode) {
         for (const wrapper of document.querySelectorAll(
           '.services__webview-wrapper',
@@ -247,6 +259,37 @@ export default class WorkspacesStore extends FeatureStore {
     await updateWorkspaceRequest.execute(activeWorkspace);
   };
 
+  @action _setOpenDrawerWithSettings() {
+    const { router } = this.stores;
+    const isWorkspaceSettingsRoute = router.location.pathname.includes(
+      WORKSPACES_ROUTES.ROOT,
+    );
+    const isSwitchingToSettingsRoute =
+      !this.isSettingsRouteActive && isWorkspaceSettingsRoute;
+    const isLeavingSettingsRoute =
+      !isWorkspaceSettingsRoute && this.isSettingsRouteActive;
+
+    if (isSwitchingToSettingsRoute) {
+      this.isSettingsRouteActive = true;
+      this._wasDrawerOpenBeforeSettingsRoute = this.isWorkspaceDrawerOpen;
+      if (!this._wasDrawerOpenBeforeSettingsRoute) {
+        workspaceActions.toggleWorkspaceDrawer();
+      }
+    } else if (isLeavingSettingsRoute) {
+      this.isSettingsRouteActive = false;
+      if (
+        !this._wasDrawerOpenBeforeSettingsRoute &&
+        this.isWorkspaceDrawerOpen
+      ) {
+        workspaceActions.toggleWorkspaceDrawer();
+      }
+    }
+  }
+
+  @action _setWorkspaceBeingEdited(match) {
+    this.workspaceBeingEdited = this._getWorkspaceById(match.id);
+  }
+
   _toggleKeepAllWorkspacesLoadedSetting = async () => {
     this._updateSettings({
       keepAllWorkspacesLoaded: !this.settings.keepAllWorkspacesLoaded,
@@ -259,7 +302,7 @@ export default class WorkspacesStore extends FeatureStore {
     const { pathname } = this.stores.router.location;
     const match = matchRoute('/settings/workspaces/edit/:id', pathname);
     if (match) {
-      this.workspaceBeingEdited = this._getWorkspaceById(match.id);
+      this._setWorkspaceBeingEdited(match);
     }
   };
 
@@ -286,36 +329,13 @@ export default class WorkspacesStore extends FeatureStore {
       const { lastActiveWorkspace } = this.settings;
       if (lastActiveWorkspace) {
         const workspace = this._getWorkspaceById(lastActiveWorkspace);
-        if (workspace) this._setActiveWorkspace({ workspace });
+        if (workspace) this._setActivateWorkspace({ workspace });
       }
     }
   };
 
   _openDrawerWithSettingsReaction = () => {
-    const { router } = this.stores;
-    const isWorkspaceSettingsRoute = router.location.pathname.includes(
-      WORKSPACES_ROUTES.ROOT,
-    );
-    const isSwitchingToSettingsRoute =
-      !this.isSettingsRouteActive && isWorkspaceSettingsRoute;
-    const isLeavingSettingsRoute =
-      !isWorkspaceSettingsRoute && this.isSettingsRouteActive;
-
-    if (isSwitchingToSettingsRoute) {
-      this.isSettingsRouteActive = true;
-      this._wasDrawerOpenBeforeSettingsRoute = this.isWorkspaceDrawerOpen;
-      if (!this._wasDrawerOpenBeforeSettingsRoute) {
-        workspaceActions.toggleWorkspaceDrawer();
-      }
-    } else if (isLeavingSettingsRoute) {
-      this.isSettingsRouteActive = false;
-      if (
-        !this._wasDrawerOpenBeforeSettingsRoute &&
-        this.isWorkspaceDrawerOpen
-      ) {
-        workspaceActions.toggleWorkspaceDrawer();
-      }
-    }
+    this._setOpenDrawerWithSettings();
   };
 
   _cleanupInvalidServiceReferences = () => {