use mobx-localstorage directly in the store

2 files changed, 4 insertions, 15 deletions

diff --git a/src/features/workspaces/api.js b/src/features/workspaces/api.js
index 0a3e2bfa4..356e48cdb 100644
--- a/src/features/workspaces/api.js
+++ b/src/features/workspaces/api.js
@@ -52,22 +52,12 @@ export const workspaceApi = {
     if (!result.ok) throw result;
     return new Workspace(await result.json());
   },
-
-  getWorkspaceSettings: async () => (
-    localStorage.getItem('workspaces') || {}
-  ),
-
-  setWorkspaceSettings: async settings => (
-    localStorage.setItem('workspaces', settings)
-  ),
 };
 
 export const getUserWorkspacesRequest = new Request(workspaceApi, 'getUserWorkspaces');
 export const createWorkspaceRequest = new Request(workspaceApi, 'createWorkspace');
 export const deleteWorkspaceRequest = new Request(workspaceApi, 'deleteWorkspace');
 export const updateWorkspaceRequest = new Request(workspaceApi, 'updateWorkspace');
-export const getWorkspaceSettingsRequest = new Request(workspaceApi, 'getWorkspaceSettings');
-export const setWorkspaceSettingsRequest = new Request(workspaceApi, 'setWorkspaceSettings');
 
 export const resetApiRequests = () => {
   getUserWorkspacesRequest.reset();
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.js
index 2abb91c22..4d65712a7 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.js
@@ -3,13 +3,14 @@ import {
   observable,
   action,
 } from 'mobx';
+import localStorage from 'mobx-localstorage';
 import { matchRoute } from '../../helpers/routing-helpers';
 import { workspaceActions } from './actions';
 import { FeatureStore } from '../utils/FeatureStore';
 import {
   createWorkspaceRequest,
   deleteWorkspaceRequest,
-  getUserWorkspacesRequest, getWorkspaceSettingsRequest, setWorkspaceSettingsRequest,
+  getUserWorkspacesRequest,
   updateWorkspaceRequest,
 } from './api';
 
@@ -38,7 +39,7 @@ export default class WorkspacesStore extends FeatureStore {
   }
 
   @computed get settings() {
-    return getWorkspaceSettingsRequest.result;
+    return localStorage.getItem('workspaces') || {};
   }
 
   @computed get userHasWorkspaces() {
@@ -74,7 +75,6 @@ export default class WorkspacesStore extends FeatureStore {
     ]);
 
     getUserWorkspacesRequest.execute();
-    getWorkspaceSettingsRequest.execute();
     this.isFeatureActive = true;
   }
 
@@ -105,7 +105,7 @@ export default class WorkspacesStore extends FeatureStore {
   _getWorkspaceById = id => this.workspaces.find(w => w.id === id);
 
   _updateSettings = (changes) => {
-    setWorkspaceSettingsRequest.execute({
+    localStorage.setItem('workspaces', {
       ...this.settings,
       ...changes,
     });
@@ -170,7 +170,6 @@ export default class WorkspacesStore extends FeatureStore {
     this.isSwitchingWorkspace = true;
     this.nextWorkspace = null;
     this._updateSettings({ lastActiveWorkspace: null });
-    getWorkspaceSettingsRequest.execute();
     // Delay switching to next workspace so that the services loading does not drag down UI
     setTimeout(() => {
       this.activeWorkspace = null;