From cb29bc0197ee9ceaaa9e0ee895bdf296d499733c Mon Sep 17 00:00:00 2001
From: Timothee Guerin <timothee.guerin@outlook.com>
Date: Thu, 31 Aug 2017 22:04:17 -0700
Subject: [PATCH 1/6] Fix settings crash when no setting file

---
 app/components/settings/settings.component.ts |  2 +-
 app/components/shared/main-navigation.html    | 12 ++++++------
 app/services/fs.service.ts                    |  4 ++++
 app/services/settings.service.ts              | 16 ++++++++++------
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/app/components/settings/settings.component.ts b/app/components/settings/settings.component.ts
index 29b44882b5..44e87eeec2 100644
--- a/app/components/settings/settings.component.ts
+++ b/app/components/settings/settings.component.ts
@@ -50,7 +50,7 @@ export class SettingsComponent implements OnDestroy {
     private _subs: Subscription[] = [];
 
     constructor(private settingsService: SettingsService) {
-        this._subs.push(this.settingsService.settingsObs.subscribe(() => {
+        this._subs.push(this.settingsService.settingsObs.subscribe((e) => {
             this._updateOriginalValue();
         }));
     }
diff --git a/app/components/shared/main-navigation.html b/app/components/shared/main-navigation.html
index c7cba0475f..985d106422 100644
--- a/app/components/shared/main-navigation.html
+++ b/app/components/shared/main-navigation.html
@@ -1,26 +1,26 @@
 <ul class="top">
     <li>
-        <a href="#" [routerLink]="['/accounts', selectedId]" routerLinkActive="active" title="Dashboard">
+        <a [routerLink]="['/accounts', selectedId]" routerLinkActive="active" title="Dashboard">
             <i class="fa fa-th fa-lg"></i><div class="label">Dash</div>
         </a>
     </li>
     <li>
-        <a href="#" routerLink="/jobs" routerLinkActive="active">
+        <a routerLink="/jobs" routerLinkActive="active">
             <i class="fa fa-tasks fa-lg"></i><div class="label">Jobs</div>
         </a>
     </li>
     <li>
-        <a href="#" routerLink="/pools" routerLinkActive="active">
+        <a routerLink="/pools" routerLinkActive="active">
             <i class="fa fa-database fa-lg"></i><div class="label">Pools</div>
         </a>
     </li>
     <li>
-        <a href="#" routerLink="/applications" routerLinkActive="active" title="Application packages">
+        <a routerLink="/applications" routerLinkActive="active" title="Application packages">
             <i class="fa fa-file-archive-o fa-lg"></i><div class="label">Packages</div>
         </a>
     </li>
     <li>
-        <a href="#" routerLink="/data" routerLinkActive="active" title="File groups">
+        <a routerLink="/data" routerLinkActive="active" title="File groups">
             <i class="fa fa-cloud-upload fa-lg"></i><div class="label">Data</div>
         </a>
     </li>
@@ -28,7 +28,7 @@
 <div class="spacer"></div>
 <ul class="bottom">
     <li>
-        <a href="#" (click)="openSettingsContextMenu()" [title]="currentUserName" class="profile">
+        <a (click)="openSettingsContextMenu()" [title]="currentUserName" class="profile">
             <i class="fa fa-user fa-lg"></i><div class="label">Profile</div>
         </a>
     </li>
diff --git a/app/services/fs.service.ts b/app/services/fs.service.ts
index ec6609dfad..307feadfcd 100644
--- a/app/services/fs.service.ts
+++ b/app/services/fs.service.ts
@@ -12,6 +12,8 @@ import { FileUtils } from "client/api";
 export interface CommonFolders {
     temp: string;
     downloads: string;
+    appData: string;
+    userData: string;
 }
 
 /**
@@ -27,6 +29,8 @@ export class FileSystemService {
         this.commonFolders = {
             temp: path.join(app.getPath("temp"), "batch-labs"),
             downloads: app.getPath("downloads"),
+            appData: app.getPath("appData"),
+            userData: app.getPath("userData"),
         };
         this._fileUtils = remote.getFileUtils();
     }
diff --git a/app/services/settings.service.ts b/app/services/settings.service.ts
index 3a6156033e..682afb39d4 100644
--- a/app/services/settings.service.ts
+++ b/app/services/settings.service.ts
@@ -1,11 +1,12 @@
 import { Injectable, NgZone } from "@angular/core";
 import * as storage from "electron-json-storage";
+import * as path from "path";
 import { BehaviorSubject, Observable } from "rxjs";
 // tslint:disable-next-line:no-var-requires
 const stripJsonComments = require("strip-json-comments");
 
 import { KeyBindings, Settings, defaultKeybindings } from "app/models";
-import { LocalFileStorage } from "app/services";
+import { FileSystemService, LocalFileStorage } from "app/services";
 import { log } from "app/utils";
 
 // tslint:disable-next-line:no-var-requires
@@ -24,28 +25,31 @@ export class SettingsService {
     private _settingsSubject = new BehaviorSubject<Settings>(null);
     private _keybindings = new BehaviorSubject<KeyBindings[]>(null);
 
-    private _filename = "settings";
+    private _filename: string;
     private _keybindingsFilename = "keybindings";
 
-    constructor(private zone: NgZone, private storage: LocalFileStorage) {
+    constructor(private zone: NgZone, private storage: LocalFileStorage, private fs: FileSystemService) {
         this.settingsObs = this._settingsSubject.asObservable();
         this.keybindings = this._keybindings.asObservable();
         this.hasSettingsLoaded = this._hasSettingsLoaded.asObservable();
+        this._filename = path.join(this.fs.commonFolders.userData, "settings.json");
     }
 
     public init() {
         this.loadSettings();
     }
 
-    public saveUserSettings(userSettings: string) {
+    public saveUserSettings(userSettings: string): Observable<any> {
         this.userSettingsStr = userSettings;
         this.settings = { ...defaultSettings, ...this._parseUserSettings(userSettings) };
         this._settingsSubject.next(this.settings);
-        return this.storage.set(this._filename, userSettings);
+        return Observable.fromPromise(this.fs.saveFile(this._filename, userSettings));
     }
 
     private loadSettings() {
-        this.storage.get(this._filename).subscribe((userSettings: string) => {
+        this.fs.readFile(this._filename).catch(() => {
+            return null;
+        }).then((userSettings: string) => {
             this.userSettingsStr = userSettings;
             this.settings = { ...defaultSettings, ...this._parseUserSettings(userSettings) };
             this._hasSettingsLoaded.next(true);

From ccd35c3535d75c0f29dd4b1c644cf308b49f30fb Mon Sep 17 00:00:00 2001
From: Timothee Guerin <timothee.guerin@outlook.com>
Date: Fri, 1 Sep 2017 08:18:16 -0700
Subject: [PATCH 2/6] REmove

---
 app/services/local-file-storage.service.ts | 60 +++++++++++++---------
 app/services/settings.service.ts           | 14 +++--
 2 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/app/services/local-file-storage.service.ts b/app/services/local-file-storage.service.ts
index dc6aef5bf3..7bc2861b82 100644
--- a/app/services/local-file-storage.service.ts
+++ b/app/services/local-file-storage.service.ts
@@ -1,47 +1,59 @@
 import { Injectable } from "@angular/core";
-import * as storage from "electron-json-storage";
-import { AsyncSubject, Observable } from "rxjs";
+import * as path from "path";
+import { Observable } from "rxjs";
+
+import { FileSystemService } from "./fs.service";
+import { log } from "app/utils";
 
 /**
  * This service is used to read/write files to the user data folder.
  * Prefer this for writing big data over localStorage.
+ * Each key is a different file under userData.
  */
 @Injectable()
 export class LocalFileStorage {
+
+    constructor(private fs: FileSystemService) { }
     /**
-     * @param filename Name of the file
+     * @param key Key where the data is store
      * @returns Observable which will resolve the data contained in the file if successfull or reject if any error
      */
-    public get<T>(filename: string): Observable<T> {
-        const sub = new AsyncSubject<T>();
-        storage.get(filename, (error, data) => {
-            this._errorToSub(sub, error, data);
+    public get<T>(key: string): Observable<T> {
+        return this.read(key).map((content) => {
+            if (!content) {
+                return {};
+            }
+
+            try {
+                return JSON.parse(content);
+            } catch (e) {
+                log.error("Loading file from storage has invalid json", { key, content });
+                return {};
+            }
         });
-        return sub.asObservable();
     }
 
     /**
      * Store the given data into the given file.
-     * @param filename Filename to store the data
+     * @param filename Key to store the data(Corespond to a file under userdata)
      * @param data Javascript object(JSON format) to store
      * @returns observable that will resolve if saving is sucessfull or reject if any error
      */
-    public set<T>(filename: string, data: T): Observable<{}> {
-        const sub = new AsyncSubject();
-        storage.set(filename, data, (error) => {
-            this._errorToSub(sub, error);
-        });
-        return sub;
+    public set<T>(key: string, data: T): Observable<{}> {
+        const content = JSON.stringify(data);
+        return this.write(key, content);
     }
 
-    private _errorToSub(subject: AsyncSubject<any>, error: any, data?: any) {
-        if (error) {
-            subject.error(error);
-        } else {
-            if (data) {
-                subject.next(data);
-            }
-            subject.complete();
-        }
+    public read(key: string): Observable<string> {
+        return Observable.fromPromise(this.fs.readFile(this._getFile(key)).catch(() => null));
+    }
+
+    public write(key: string, content: string): Observable<string> {
+        return Observable.fromPromise(this.fs.saveFile(this._getFile(key), content));
+    }
+
+    private _getFile(key: string) {
+        const filename = key.endsWith(".json") ? key : `${key}.json`;
+        return path.join(this.fs.commonFolders.userData, filename);
     }
 }
diff --git a/app/services/settings.service.ts b/app/services/settings.service.ts
index 682afb39d4..5f37da603a 100644
--- a/app/services/settings.service.ts
+++ b/app/services/settings.service.ts
@@ -1,12 +1,11 @@
 import { Injectable, NgZone } from "@angular/core";
 import * as storage from "electron-json-storage";
-import * as path from "path";
 import { BehaviorSubject, Observable } from "rxjs";
 // tslint:disable-next-line:no-var-requires
 const stripJsonComments = require("strip-json-comments");
 
 import { KeyBindings, Settings, defaultKeybindings } from "app/models";
-import { FileSystemService, LocalFileStorage } from "app/services";
+import {  LocalFileStorage } from "app/services";
 import { log } from "app/utils";
 
 // tslint:disable-next-line:no-var-requires
@@ -25,14 +24,13 @@ export class SettingsService {
     private _settingsSubject = new BehaviorSubject<Settings>(null);
     private _keybindings = new BehaviorSubject<KeyBindings[]>(null);
 
-    private _filename: string;
+    private _filename = "settings";
     private _keybindingsFilename = "keybindings";
 
-    constructor(private zone: NgZone, private storage: LocalFileStorage, private fs: FileSystemService) {
+    constructor(private zone: NgZone, private storage: LocalFileStorage) {
         this.settingsObs = this._settingsSubject.asObservable();
         this.keybindings = this._keybindings.asObservable();
         this.hasSettingsLoaded = this._hasSettingsLoaded.asObservable();
-        this._filename = path.join(this.fs.commonFolders.userData, "settings.json");
     }
 
     public init() {
@@ -43,13 +41,13 @@ export class SettingsService {
         this.userSettingsStr = userSettings;
         this.settings = { ...defaultSettings, ...this._parseUserSettings(userSettings) };
         this._settingsSubject.next(this.settings);
-        return Observable.fromPromise(this.fs.saveFile(this._filename, userSettings));
+        return this.storage.write(this._filename, userSettings);
     }
 
     private loadSettings() {
-        this.fs.readFile(this._filename).catch(() => {
+        this.storage.read(this._filename).catch(() => {
             return null;
-        }).then((userSettings: string) => {
+        }).subscribe((userSettings: string) => {
             this.userSettingsStr = userSettings;
             this.settings = { ...defaultSettings, ...this._parseUserSettings(userSettings) };
             this._hasSettingsLoaded.next(true);

From 55296b21e0db16c470af527fb998250b53afb40f Mon Sep 17 00:00:00 2001
From: Timothee Guerin <timothee.guerin@outlook.com>
Date: Fri, 1 Sep 2017 08:28:46 -0700
Subject: [PATCH 3/6] remove package

---
 app/services/account.service.ts  | 35 ++++------------
 app/services/settings.service.ts | 10 ++---
 app/services/ssh-key.service.ts  | 40 +++++-------------
 package.json                     |  3 +-
 yarn.lock                        | 70 ++++++++------------------------
 5 files changed, 40 insertions(+), 118 deletions(-)

diff --git a/app/services/account.service.ts b/app/services/account.service.ts
index 14e1eccf24..cc61a4bd6c 100644
--- a/app/services/account.service.ts
+++ b/app/services/account.service.ts
@@ -1,6 +1,5 @@
 import { Injectable } from "@angular/core";
 import { RequestOptions, URLSearchParams } from "@angular/http";
-import * as storage from "electron-json-storage";
 import { List } from "immutable";
 import { AsyncSubject, BehaviorSubject, Observable } from "rxjs";
 
@@ -11,6 +10,7 @@ import { AzureHttpService } from "./azure-http.service";
 import {
     DataCache, DataCacheTracker, RxBasicEntityProxy, RxEntityProxy, getOnceProxy,
 } from "./core";
+import { LocalFileStorage } from "./local-file-storage.service";
 import { SubscriptionService } from "./subscription.service";
 
 export enum AccountStatus {
@@ -62,6 +62,7 @@ export class AccountService {
     private _cache = new DataCache<AccountResource>();
 
     constructor(
+        private storage: LocalFileStorage,
         private azure: AzureHttpService,
         private subscriptionService: SubscriptionService) {
 
@@ -267,40 +268,18 @@ export class AccountService {
     }
 
     private _loadFavoriteAccounts(): Observable<List<AccountResource>> {
-        let sub = new AsyncSubject<List<AccountResource>>();
-        storage.get(this._accountJsonFileName, (error, data) => {
-            if (error) {
-                log.error("Error retrieving accounts");
-                sub.error(error);
-            }
-
+        return this.storage.get(this._accountJsonFileName).map((data) => {
             if (Array.isArray(data)) {
-                sub.next(List(data.map(x => new AccountResource(x))));
+                return List(data.map(x => new AccountResource(x)));
             } else {
-                sub.next(List([]));
+                return List([]);
             }
-
-            sub.complete();
-        });
-
-        return sub.asObservable();
+        }).share();
     }
 
     private _saveAccountFavorites(accounts: List<AccountResource> = null): Observable<any> {
-        let sub = new AsyncSubject();
-
         accounts = accounts === null ? this._accountFavorites.getValue() : accounts;
-        storage.set(this._accountJsonFileName, accounts.toJS(), (error) => {
-            if (error) {
-                log.error("Error saving accounts", error);
-                sub.error(error);
-            }
-
-            sub.next(true);
-            sub.complete();
-        });
-
-        return sub;
+        return this.storage.set(this._accountJsonFileName, accounts.toJS());
     }
 
     private _getAccount(accountId: string): Observable<AccountResource> {
diff --git a/app/services/settings.service.ts b/app/services/settings.service.ts
index 5f37da603a..e439ce3618 100644
--- a/app/services/settings.service.ts
+++ b/app/services/settings.service.ts
@@ -1,11 +1,10 @@
 import { Injectable, NgZone } from "@angular/core";
-import * as storage from "electron-json-storage";
 import { BehaviorSubject, Observable } from "rxjs";
 // tslint:disable-next-line:no-var-requires
 const stripJsonComments = require("strip-json-comments");
 
 import { KeyBindings, Settings, defaultKeybindings } from "app/models";
-import {  LocalFileStorage } from "app/services";
+import { LocalFileStorage } from "app/services";
 import { log } from "app/utils";
 
 // tslint:disable-next-line:no-var-requires
@@ -58,9 +57,10 @@ export class SettingsService {
             this.zone.run(() => {
                 // If the file has never been init create it
                 if (!Array.isArray(data)) {
-                    storage.set(this._keybindingsFilename, [], () => {
-                        log.error("Error saving the initial keybinding settings.");
-                    });
+                    this.storage.set(this._keybindingsFilename, []).catch((e) => {
+                        log.error("Error saving the initial keybinding settings.", e);
+                        return null;
+                    }).subscribe();
                 }
                 this._keybindings.next(defaultKeybindings.concat(data));
             });
diff --git a/app/services/ssh-key.service.ts b/app/services/ssh-key.service.ts
index 64a62a3bda..4826dbafbb 100644
--- a/app/services/ssh-key.service.ts
+++ b/app/services/ssh-key.service.ts
@@ -1,9 +1,10 @@
 import { Injectable } from "@angular/core";
-import { SSHPublicKey } from "app/models";
-import { Constants, log } from "app/utils";
-import * as storage from "electron-json-storage";
 import { List } from "immutable";
-import { AsyncSubject, BehaviorSubject, Observable } from "rxjs";
+
+import { SSHPublicKey } from "app/models";
+import { Constants } from "app/utils";
+import { BehaviorSubject, Observable } from "rxjs";
+import { LocalFileStorage } from "./local-file-storage.service";
 
 const filename = Constants.SavedDataFilename.sshPublicKeys;
 
@@ -13,7 +14,7 @@ export class SSHKeyService {
 
     private _keys = new BehaviorSubject<List<SSHPublicKey>>(List([]));
 
-    constructor() {
+    constructor(private storage: LocalFileStorage) {
         this.keys = this._keys.asObservable();
     }
 
@@ -37,38 +38,17 @@ export class SSHKeyService {
     }
 
     public loadInitialData(): Observable<List<SSHPublicKey>> {
-        const sub = new AsyncSubject<List<SSHPublicKey>>();
-        storage.get(filename, (error, data) => {
-            if (error) {
-                log.error("Error retrieving ssh public keys");
-                sub.error(error);
-            }
-
+        return this.storage.get(filename).map((data) => {
             if (Array.isArray(data)) {
-                sub.next(List(data));
+                return List(data);
             } else {
-                sub.next(List([]));
+                return List([]);
             }
-
-            sub.complete();
         });
-        return sub.asObservable();
     }
 
     private _saveSSHPublicKeys(keys: List<SSHPublicKey> = null): Observable<any> {
-        let sub = new AsyncSubject();
-
         keys = keys === null ? this._keys.value : keys;
-        storage.set(filename, keys.toJS(), (error) => {
-            if (error) {
-                log.error("Error saving accounts", error);
-                sub.error(error);
-            }
-
-            sub.next(true);
-            sub.complete();
-        });
-
-        return sub;
+        return this.storage.set(filename, keys.toJS());
     }
 }
diff --git a/package.json b/package.json
index b27567369e..7f1f9ff262 100644
--- a/package.json
+++ b/package.json
@@ -111,8 +111,8 @@
     "@types/node": "~8.0.2",
     "@types/strip-json-comments": "~0.0.28",
     "add-asset-html-webpack-plugin": "^1.0.2",
-    "awesome-typescript-loader": "^3.2.1",
     "angular2-template-loader": "~0.6.2",
+    "awesome-typescript-loader": "^3.2.1",
     "codelyzer": "~3.1.1",
     "concurrently": "^3.0.0",
     "copy-webpack-plugin": "^4.0.1",
@@ -173,7 +173,6 @@
     "core-decorators": "~0.19.0",
     "d3": "~4.10.0",
     "download": "~6.2.5",
-    "electron-json-storage": "~3.0.4",
     "element-resize-detector": "^1.1.9",
     "extract-text-webpack-plugin": "~2.1.0",
     "extract-zip": "~1.6.5",
diff --git a/yarn.lock b/yarn.lock
index 534af03b6d..35a176d874 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -346,11 +346,7 @@
   version "8.0.24"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.24.tgz#06c580084d9add1fb40c1510ef0b448961246fb1"
 
-"@types/node@^7.0.10":
-  version "7.0.42"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.42.tgz#051ff1cdbd1e1b7523ba425bc388147483344dbf"
-
-"@types/node@^7.0.18":
+"@types/node@^7.0.10", "@types/node@^7.0.18":
   version "7.0.43"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c"
 
@@ -650,7 +646,7 @@ async@1.5.2, async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
-async@>=0.6.0, async@^2.0.0, async@^2.1.2, async@^2.1.5:
+async@>=0.6.0, async@^2.1.2, async@^2.1.5:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.5.0.tgz#843190fd6b7357a0b9e1c956edddd5ec8462b54d"
   dependencies:
@@ -765,14 +761,10 @@ base64-js@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-0.0.8.tgz#1101e9544f4a76b1bc3b26d452ca96d7a35e7978"
 
-base64-js@1.2.0:
+base64-js@1.2.0, base64-js@^1.0.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
 
-base64-js@^1.0.2:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.1.tgz#a91947da1f4a516ea38e5b4ec0ec3773675e0886"
-
 base64id@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
@@ -1210,7 +1202,7 @@ chartjs-color@^2.1.0:
     chartjs-color-string "^0.4.0"
     color-convert "^0.5.3"
 
-chokidar@1.5.2:
+chokidar@1.5.2, chokidar@^1.4.1:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.5.2.tgz#293e728640cc93dd8277424334b3c6d4ad3a348a"
   dependencies:
@@ -1225,7 +1217,7 @@ chokidar@1.5.2:
   optionalDependencies:
     fsevents "^1.0.0"
 
-chokidar@^1.4.1, chokidar@^1.6.0, chokidar@^1.7.0:
+chokidar@^1.6.0, chokidar@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
   dependencies:
@@ -1423,7 +1415,13 @@ commander@1.0.4:
   dependencies:
     keypress "0.1.x"
 
-commander@2, commander@2.11.x, commander@^2.9.0, commander@~2.11.0:
+commander@2, commander@^2.9.0, commander@~2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
+  dependencies:
+    graceful-readlink ">= 1.0.0"
+
+commander@2.11.x, commander@~2.11.0:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
 
@@ -1437,12 +1435,6 @@ commander@~2.8.1:
   dependencies:
     graceful-readlink ">= 1.0.0"
 
-commander@~2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
-  dependencies:
-    graceful-readlink ">= 1.0.0"
-
 compare-version@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080"
@@ -2435,16 +2427,6 @@ electron-download@^3.0.1:
     semver "^5.3.0"
     sumchecker "^1.2.0"
 
-electron-json-storage@~3.0.4:
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/electron-json-storage/-/electron-json-storage-3.0.7.tgz#a2137756d06782fe565948b8d07242d3f5624c27"
-  dependencies:
-    async "^2.0.0"
-    lodash "^4.0.1"
-    mkdirp "^0.5.1"
-    rimraf "^2.5.1"
-    rwlock "^5.0.0"
-
 electron-osx-sign@0.4.6:
   version "0.4.6"
   resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.4.6.tgz#2398e2d7cab5c1d8c3eeabb1cd490376528ec39a"
@@ -4301,7 +4283,7 @@ lodash@^3.8.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@^4.0.0, lodash@^4.0.1, lodash@^4.1.0, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.5.0, lodash@^4.5.1, lodash@~4.17.4:
+lodash@^4.0.0, lodash@^4.1.0, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.5.0, lodash@^4.5.1, lodash@~4.17.4:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
@@ -4529,7 +4511,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@0.0.8:
+minimist@0.0.8, minimist@~0.0.1:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
@@ -4537,10 +4519,6 @@ minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
-minimist@~0.0.1:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-
 minstache@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minstache/-/minstache-1.2.0.tgz#ff1cc403ac2844f68dbf18c662129be7eb0efc41"
@@ -5019,7 +4997,7 @@ os-locale@^2.0.0:
     lcid "^1.0.0"
     mem "^1.1.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
+os-tmpdir@^1.0.0, os-tmpdir@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
@@ -5154,14 +5132,10 @@ path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
 
-path-is-absolute@1.0.0:
+path-is-absolute@1.0.0, path-is-absolute@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.0.tgz#263dada66ab3f2fb10bf7f9d24dd8f3e570ef912"
 
-path-is-absolute@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-
 path-is-inside@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
@@ -5974,10 +5948,6 @@ rw@1:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
 
-rwlock@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/rwlock/-/rwlock-5.0.0.tgz#888d6a77a3351cc1a209204ef2ee1722093836cf"
-
 rx@2.3.24:
   version "2.3.24"
   resolved "https://registry.yarnpkg.com/rx/-/rx-2.3.24.tgz#14f950a4217d7e35daa71bbcbe58eff68ea4b2b7"
@@ -6775,18 +6745,12 @@ timers-browserify@^2.0.2:
   dependencies:
     setimmediate "^1.0.4"
 
-tmp@0.0.31:
+tmp@0.0.31, tmp@0.0.x:
   version "0.0.31"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"
   dependencies:
     os-tmpdir "~1.0.1"
 
-tmp@0.0.x:
-  version "0.0.33"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
-  dependencies:
-    os-tmpdir "~1.0.2"
-
 to-array@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"

From 27aae292c1f1c4a7fc68085a1a3088daa0570f94 Mon Sep 17 00:00:00 2001
From: Timothee Guerin <timothee.guerin@outlook.com>
Date: Fri, 1 Sep 2017 08:30:42 -0700
Subject: [PATCH 4/6] Fix

---
 app/services/local-file-storage.service.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/services/local-file-storage.service.ts b/app/services/local-file-storage.service.ts
index 7bc2861b82..511ec739cf 100644
--- a/app/services/local-file-storage.service.ts
+++ b/app/services/local-file-storage.service.ts
@@ -2,8 +2,8 @@ import { Injectable } from "@angular/core";
 import * as path from "path";
 import { Observable } from "rxjs";
 
-import { FileSystemService } from "./fs.service";
 import { log } from "app/utils";
+import { FileSystemService } from "./fs.service";
 
 /**
  * This service is used to read/write files to the user data folder.

From 2a1dd724c900831dce5b3e34a8a1debed52c7d1e Mon Sep 17 00:00:00 2001
From: Timothee Guerin <timothee.guerin@outlook.com>
Date: Fri, 1 Sep 2017 08:36:05 -0700
Subject: [PATCH 5/6] remove types

---
 package.json | 1 -
 yarn.lock    | 4 ----
 2 files changed, 5 deletions(-)

diff --git a/package.json b/package.json
index 7f1f9ff262..eb4b952ebf 100644
--- a/package.json
+++ b/package.json
@@ -101,7 +101,6 @@
     "@types/codemirror": "~0.0.40",
     "@types/core-decorators": "^0.10.30",
     "@types/d3": "^4.4.0",
-    "@types/electron-json-storage": "0.0.19",
     "@types/extract-zip": "~1.6.2",
     "@types/hammerjs": "^2.0.33",
     "@types/inflection": "^1.5.28",
diff --git a/yarn.lock b/yarn.lock
index 35a176d874..986ba6faee 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -298,10 +298,6 @@
     "@types/d3-voronoi" "*"
     "@types/d3-zoom" "*"
 
-"@types/electron-json-storage@0.0.19":
-  version "0.0.19"
-  resolved "https://registry.yarnpkg.com/@types/electron-json-storage/-/electron-json-storage-0.0.19.tgz#91833b532aec3c909734e3d0e277fe55b0ebcb5a"
-
 "@types/extract-zip@~1.6.2":
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/@types/extract-zip/-/extract-zip-1.6.2.tgz#5c7eb441c41136167a42b88b64051e6260c29e86"

From f0d36526354999ca595d8d8cd26d8d800975d198 Mon Sep 17 00:00:00 2001
From: Timothee Guerin <timothee.guerin@outlook.com>
Date: Fri, 1 Sep 2017 09:02:21 -0700
Subject: [PATCH 6/6] fix

---
 app/components/base/editor/editor.component.ts               | 2 +-
 .../pool/action/scale/autoscale-formula-picker.component.ts  | 1 +
 test/app/services/account.service.spec.ts                    | 5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/components/base/editor/editor.component.ts b/app/components/base/editor/editor.component.ts
index 9f11de94cd..504d72b542 100644
--- a/app/components/base/editor/editor.component.ts
+++ b/app/components/base/editor/editor.component.ts
@@ -85,7 +85,7 @@ export class EditorComponent implements ControlValueAccessor, AfterViewInit, OnC
             this.updateValue(this.instance.getValue());
 
             if (change.origin !== "complete" && change.origin !== "setValue") {
-                const hint = (CodeMirror as any).hint[this.instance.getDoc().getMode()];
+                const hint = (CodeMirror as any).hint[this.instance.getDoc().getMode().name];
                 if (hint) {
                     (this.instance as any).showHint({ hint: hint, completeSingle: false });
                 }
diff --git a/app/components/pool/action/scale/autoscale-formula-picker.component.ts b/app/components/pool/action/scale/autoscale-formula-picker.component.ts
index c96bf71334..170db5f1d2 100644
--- a/app/components/pool/action/scale/autoscale-formula-picker.component.ts
+++ b/app/components/pool/action/scale/autoscale-formula-picker.component.ts
@@ -31,6 +31,7 @@ export class AutoscaleFormulaPickerComponent implements OnInit, OnDestroy, Contr
         mode: "autoscale",
         autoRefresh: true,
     };
+
     public customFormulaMode = true;
     private _subs: Subscription[];
     private _propagateChange: (value: string) => void;
diff --git a/test/app/services/account.service.spec.ts b/test/app/services/account.service.spec.ts
index 9d7c100e6b..9d9e77f22a 100644
--- a/test/app/services/account.service.spec.ts
+++ b/test/app/services/account.service.spec.ts
@@ -12,13 +12,16 @@ describe("AccountService", () => {
     let account1 = new AccountResource({ id: "account-1" } as any);
     let subscriptionServiceSpy;
     let subs: Subscription[] = [];
+    let storageSpy;
 
     beforeEach(() => {
         subscriptionServiceSpy = {
             cache: new DataCache<any>(),
         };
 
-        accountService = new AccountService({} as any, subscriptionServiceSpy);
+        storageSpy = {};
+
+        accountService = new AccountService(storageSpy, {} as any, subscriptionServiceSpy);
         accountService.getOnce = jasmine.createSpy("getOnce").and.returnValue(Observable.of(account1));
         accountService.getAccountKeys = jasmine.createSpy("getAccountKeys").and.returnValue(Observable.of({}));
         subs.push(accountService.currentAccountId.subscribe(x => currentAccountId = x));