17 files changed, 107 insertions, 58 deletions

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 6f156a96d..dd4642d70 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -38,12 +38,15 @@ export default class AppStore extends Store {
   };
 
   @observable healthCheckRequest = new Request(this.api.app, 'health');
+
   @observable getAppCacheSizeRequest = new Request(this.api.local, 'getAppCacheSize');
+
   @observable clearAppCacheRequest = new Request(this.api.local, 'clearAppCache');
 
   @observable autoLaunchOnStart = true;
 
   @observable isOnline = navigator.onLine;
+
   @observable timeOfflineStart;
 
   @observable updateStatus = null;
@@ -150,19 +153,22 @@ export default class AppStore extends Store {
     key(
       '⌘+pagedown, ctrl+pagedown, ⌘+alt+right, ctrl+tab', () => {
         this.actions.service.setActiveNext();
-      });
+      },
+    );
 
     // Set active the prev service
     key(
       '⌘+pageup, ctrl+pageup, ⌘+alt+left, ctrl+shift+tab', () => {
         this.actions.service.setActivePrev();
-      });
+      },
+    );
 
     // Global Mute
     key(
       '⌘+shift+m ctrl+shift+m', () => {
         this.actions.app.toggleMuteApp();
-      });
+      },
+    );
 
     this.locale = this._getDefaultLocale();
 
@@ -182,7 +188,9 @@ export default class AppStore extends Store {
   }
 
   // Actions
-  @action _notify({ title, options, notificationId, serviceId = null }) {
+  @action _notify({
+    title, options, notificationId, serviceId = null,
+  }) {
     if (this.stores.settings.all.app.isAppMuted) return;
 
     const notification = new window.Notification(title, options);
diff --git a/src/stores/DictionaryStore.js b/src/stores/DictionaryStore.js
deleted file mode 100644
index b9c5f2abf..000000000
--- a/src/stores/DictionaryStore.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import { observable } from 'mobx';
-import { createDownloader } from 'hunspell-dict-downloader';
-
-import Store from './lib/Store';
-
-import { DICTIONARY_PATH } from '../config';
-
-const debug = require('debug')('Franz:DictionaryStore');
-
-export default class DictionaryStore extends Store {
-  @observable available = []
-  @observable installed = []
-
-  _dictDownloader = null
-
-  constructor(...args) {
-    super(...args);
-
-    this.registerReactions([
-      this._downloadDictForUserLocale.bind(this),
-    ]);
-  }
-
-  async setup() {
-    this._dictDownloader = await createDownloader(DICTIONARY_PATH);
-    debug('dicts', this._dictDownloader);
-
-    this.available = this._dictDownloader.availableDictionaries;
-    this.installed = this._dictDownloader.installedDictionaries;
-
-    if (!this.installed.includes('en-us')) {
-      this._dictDownloader.installDictionary('en-us');
-    }
-  }
-
-  _downloadDictForUserLocale() {
-    const spellcheckerLanguage = this.stores.settings.app.spellcheckerLanguage;
-
-    debug('trying to Downloading dict for', spellcheckerLanguage);
-    if (!this.installed.includes(spellcheckerLanguage) && this.available.includes(spellcheckerLanguage) && spellcheckerLanguage !== 'en-us') {
-      debug('Downloading dict for', spellcheckerLanguage);
-      this._dictDownloader.installDictionary(spellcheckerLanguage);
-    }
-  }
-}
diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index 10c893d3f..2a0713b6f 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -11,6 +11,7 @@ import { DEFAULT_FEATURES_CONFIG } from '../config';
 
 export default class FeaturesStore extends Store {
   @observable defaultFeaturesRequest = new CachedRequest(this.api.features, 'default');
+
   @observable featuresRequest = new CachedRequest(this.api.features, 'features');
 
   async setup() {
diff --git a/src/stores/GlobalErrorStore.js b/src/stores/GlobalErrorStore.js
index f4b9d7838..90bf751c3 100644
--- a/src/stores/GlobalErrorStore.js
+++ b/src/stores/GlobalErrorStore.js
@@ -4,6 +4,7 @@ import Request from './lib/Request';
 
 export default class GlobalErrorStore extends Store {
   @observable error = null;
+
   @observable response = {};
 
   constructor(...args) {
diff --git a/src/stores/NewsStore.js b/src/stores/NewsStore.js
index e5091834f..6984425df 100644
--- a/src/stores/NewsStore.js
+++ b/src/stores/NewsStore.js
@@ -8,6 +8,7 @@ import { CHECK_INTERVAL } from '../config';
 
 export default class NewsStore extends Store {
   @observable latestNewsRequest = new CachedRequest(this.api.news, 'latest');
+
   @observable hideNewsRequest = new Request(this.api.news, 'hide');
 
   constructor(...args) {
diff --git a/src/stores/PaymentStore.js b/src/stores/PaymentStore.js
index 9e348d14e..4cabee194 100644
--- a/src/stores/PaymentStore.js
+++ b/src/stores/PaymentStore.js
@@ -7,8 +7,11 @@ import { gaEvent } from '../lib/analytics';
 
 export default class PaymentStore extends Store {
   @observable plansRequest = new CachedRequest(this.api.payment, 'plans');
+
   @observable createHostedPageRequest = new Request(this.api.payment, 'getHostedPage');
+
   @observable createDashboardUrlRequest = new Request(this.api.payment, 'getDashboardUrl');
+
   @observable ordersDataRequest = new CachedRequest(this.api.payment, 'getOrders');
 
   constructor(...args) {
diff --git a/src/stores/RecipePreviewsStore.js b/src/stores/RecipePreviewsStore.js
index e25936f15..10b2928e3 100644
--- a/src/stores/RecipePreviewsStore.js
+++ b/src/stores/RecipePreviewsStore.js
@@ -8,7 +8,9 @@ import { gaEvent } from '../lib/analytics';
 
 export default class RecipePreviewsStore extends Store {
   @observable allRecipePreviewsRequest = new CachedRequest(this.api.recipePreviews, 'all');
+
   @observable featuredRecipePreviewsRequest = new CachedRequest(this.api.recipePreviews, 'featured');
+
   @observable searchRecipePreviewsRequest = new Request(this.api.recipePreviews, 'search');
 
   constructor(...args) {
diff --git a/src/stores/RecipesStore.js b/src/stores/RecipesStore.js
index f2480bc8e..ab64bf79c 100644
--- a/src/stores/RecipesStore.js
+++ b/src/stores/RecipesStore.js
@@ -9,7 +9,9 @@ const debug = require('debug')('Franz:RecipeStore');
 
 export default class RecipesStore extends Store {
   @observable allRecipesRequest = new CachedRequest(this.api.recipes, 'all');
+
   @observable installRecipeRequest = new Request(this.api.recipes, 'install');
+
   @observable getRecipeUpdatesRequest = new Request(this.api.recipes, 'update');
 
   constructor(...args) {
diff --git a/src/stores/RequestStore.js b/src/stores/RequestStore.js
index bbfe6f6df..2629e0a38 100644
--- a/src/stores/RequestStore.js
+++ b/src/stores/RequestStore.js
@@ -6,10 +6,13 @@ const debug = require('debug')('Franz:RequestsStore');
 
 export default class RequestStore extends Store {
   @observable userInfoRequest;
+
   @observable servicesRequest;
+
   @observable showRequiredRequestsError = false;
 
   retries = 0;
+
   retryDelay = 2000;
 
   constructor(...args) {
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 99b091589..5b70ca271 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -1,4 +1,6 @@
-import { action, reaction, computed, observable } from 'mobx';
+import {
+  action, reaction, computed, observable,
+} from 'mobx';
 import { debounce, remove } from 'lodash';
 
 import Store from './lib/Store';
@@ -11,10 +13,15 @@ const debug = require('debug')('Franz:ServiceStore');
 
 export default class ServicesStore extends Store {
   @observable allServicesRequest = new CachedRequest(this.api.services, 'all');
+
   @observable createServiceRequest = new Request(this.api.services, 'create');
+
   @observable updateServiceRequest = new Request(this.api.services, 'update');
+
   @observable reorderServicesRequest = new Request(this.api.services, 'reorder');
+
   @observable deleteServiceRequest = new Request(this.api.services, 'delete');
+
   @observable clearCacheRequest = new Request(this.api.services, 'clearCache');
 
   @observable filterNeedle = null;
@@ -400,6 +407,18 @@ export default class ServicesStore extends Store {
       const url = args[0];
 
       this.actions.app.openExternalUrl({ url });
+    } else if (channel === 'set-service-spellchecker-language') {
+      if (!args) {
+        console.warn('Did not receive locale');
+      } else {
+        this.actions.service.updateService({
+          serviceId,
+          serviceData: {
+            spellcheckerLanguage: args[0] === 'reset' ? '' : args[0],
+          },
+          redirect: false,
+        });
+      }
     }
   }
 
@@ -625,7 +644,7 @@ export default class ServicesStore extends Store {
     const service = this.one(serviceId);
 
     if (service.webview) {
-      service.webview.send('initializeRecipe', service);
+      service.webview.send('initialize-recipe', service);
     }
   }
 
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);
     }
   }
 
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 26ac2c60e..7addb5760 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -14,29 +14,47 @@ const debug = require('debug')('Franz:UserStore');
 // TODO: split stores into UserStore and AuthStore
 export default class UserStore extends Store {
   BASE_ROUTE = '/auth';
+
   WELCOME_ROUTE = `${this.BASE_ROUTE}/welcome`;
+
   LOGIN_ROUTE = `${this.BASE_ROUTE}/login`;
+
   LOGOUT_ROUTE = `${this.BASE_ROUTE}/logout`;
+
   SIGNUP_ROUTE = `${this.BASE_ROUTE}/signup`;
+
   PRICING_ROUTE = `${this.BASE_ROUTE}/signup/pricing`;
+
   IMPORT_ROUTE = `${this.BASE_ROUTE}/signup/import`;
+
   INVITE_ROUTE = `${this.BASE_ROUTE}/signup/invite`;
+
   PASSWORD_ROUTE = `${this.BASE_ROUTE}/password`;
 
   @observable loginRequest = new Request(this.api.user, 'login');
+
   @observable signupRequest = new Request(this.api.user, 'signup');
+
   @observable passwordRequest = new Request(this.api.user, 'password');
+
   @observable inviteRequest = new Request(this.api.user, 'invite');
+
   @observable getUserInfoRequest = new CachedRequest(this.api.user, 'getInfo');
+
   @observable updateUserInfoRequest = new Request(this.api.user, 'updateInfo');
+
   @observable getLegacyServicesRequest = new CachedRequest(this.api.user, 'getLegacyServices');
+
   @observable deleteAccountRequest = new CachedRequest(this.api.user, 'delete');
 
   @observable isImportLegacyServicesExecuting = false;
+
   @observable isImportLegacyServicesCompleted = false;
 
   @observable id;
+
   @observable authToken = localStorage.getItem('authToken') || null;
+
   @observable accountType;
 
   @observable hasCompletedSignup = null;
@@ -48,6 +66,7 @@ export default class UserStore extends Store {
   logoutReasonTypes = {
     SERVER: 'SERVER',
   };
+
   @observable logoutReason = null;
 
   constructor(...args) {
@@ -141,7 +160,9 @@ export default class UserStore extends Store {
     gaEvent('User', 'login');
   }
 
-  @action async _signup({ firstname, lastname, email, password, accountType, company }) {
+  @action async _signup({
+    firstname, lastname, email, password, accountType, company,
+  }) {
     const authToken = await this.signupRequest.execute({
       firstname,
       lastname,
@@ -198,10 +219,11 @@ export default class UserStore extends Store {
   }
 
   @action _logout() {
+    // workaround mobx issue
     localStorage.removeItem('authToken');
+    window.localStorage.removeItem('authToken');
     this.getUserInfoRequest.invalidate().reset();
     this.authToken = null;
-    // this.data = {};
   }
 
   @action async _importLegacyServices({ services }) {
diff --git a/src/stores/index.js b/src/stores/index.js
index f547d0a7a..96b844c95 100644
--- a/src/stores/index.js
+++ b/src/stores/index.js
@@ -9,7 +9,6 @@ import UIStore from './UIStore';
 import PaymentStore from './PaymentStore';
 import NewsStore from './NewsStore';
 import RequestStore from './RequestStore';
-import DictionaryStore from './DictionaryStore';
 import GlobalErrorStore from './GlobalErrorStore';
 
 export default (api, actions, router) => {
@@ -27,7 +26,6 @@ export default (api, actions, router) => {
     payment: new PaymentStore(stores, api, actions),
     news: new NewsStore(stores, api, actions),
     requests: new RequestStore(stores, api, actions),
-    dictionary: new DictionaryStore(stores, api, actions),
     globalError: new GlobalErrorStore(stores, api, actions),
   });
   // Initialize all stores
diff --git a/src/stores/lib/CachedRequest.js b/src/stores/lib/CachedRequest.js
index c0c3d40a1..ac8b2bd81 100644
--- a/src/stores/lib/CachedRequest.js
+++ b/src/stores/lib/CachedRequest.js
@@ -5,6 +5,7 @@ import Request from './Request';
 
 export default class CachedRequest extends Request {
   _apiCalls = [];
+
   _isInvalidated = true;
 
   execute(...callArgs) {
diff --git a/src/stores/lib/Reaction.js b/src/stores/lib/Reaction.js
index e9bc26d81..46aa4dae6 100644
--- a/src/stores/lib/Reaction.js
+++ b/src/stores/lib/Reaction.js
@@ -3,7 +3,9 @@ import { autorun } from 'mobx';
 
 export default class Reaction {
   reaction;
+
   hasBeenStarted;
+
   dispose;
 
   constructor(reaction) {
diff --git a/src/stores/lib/Request.js b/src/stores/lib/Request.js
index 4a6925cc5..04f528156 100644
--- a/src/stores/lib/Request.js
+++ b/src/stores/lib/Request.js
@@ -9,15 +9,23 @@ export default class Request {
   }
 
   @observable result = null;
+
   @observable error = null;
+
   @observable isExecuting = false;
+
   @observable isError = false;
+
   @observable wasExecuted = false;
 
   _promise = Promise;
+
   _api = {};
+
   _method = '';
+
   _isWaitingForResponse = false;
+
   _currentApiCall = null;
 
   constructor(api, method) {
diff --git a/src/stores/lib/Store.js b/src/stores/lib/Store.js
index 873da7b37..8d2fb4066 100644
--- a/src/stores/lib/Store.js
+++ b/src/stores/lib/Store.js
@@ -3,16 +3,20 @@ import Reaction from './Reaction';
 
 export default class Store {
   stores = {};
+
   api = {};
+
   actions = {};
 
   _reactions = [];
 
   // status implementation
   @observable _status = null;
+
   @computed get actionStatus() {
     return this._status || [];
   }
+
   set actionStatus(status) {
     this._status = status;
   }