Merge branch 'develop'v5.0.0-beta.21

1 files changed, 22 insertions, 3 deletions

diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 4c01e9910..a456195bf 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -1,5 +1,7 @@
 import { ipcRenderer } from 'electron';
-import { action, computed, observable } from 'mobx';
+import {
+  action, computed, observable, set,
+} from 'mobx';
 import localStorage from 'mobx-localstorage';
 
 import Store from './lib/Store';
@@ -14,11 +16,13 @@ const debug = require('debug')('Franz:SettingsStore');
 
 export default class SettingsStore extends Store {
   @observable appSettingsRequest = new CachedRequest(this.api.local, 'getAppSettings');
+
   @observable updateAppSettingsRequest = new Request(this.api.local, 'updateAppSettings');
 
-  @observable fileSystemSettingsRequests = [];
+  fileSystemSettingsRequests = [];
 
   fileSystemSettingsTypes = FILE_SYSTEM_SETTINGS_TYPES;
+
   @observable _fileSystemSettingsCache = {
     app: DEFAULT_APP_SETTINGS,
     proxy: {},
@@ -57,6 +61,21 @@ export default class SettingsStore extends Store {
   }
 
   @computed get proxy() {
+    // // We need to provide the final data structure as mobx autoruns won't work
+    // const proxySettings = observable({});
+    // this.stores.services.all.forEach((service) => {
+    //   proxySettings[service.id] = {
+    //     isEnabled: false,
+    //     host: null,
+    //     user: null,
+    //     password: null,
+    //   };
+    // });
+
+    // debug('this._fileSystemSettingsCache.proxy', this._fileSystemSettingsCache.proxy, proxySettings);
+
+    // return Object.assign(proxySettings, this._fileSystemSettingsCache.proxy);
+
     return this._fileSystemSettingsCache.proxy || {};
   }
 
@@ -98,7 +117,7 @@ export default class SettingsStore extends Store {
         data,
       });
 
-      Object.assign(this._fileSystemSettingsCache[type], data);
+      set(this._fileSystemSettingsCache[type], data);
     }
   }