Merge pull request #248 from meetfranz/feature/192-display-disabled-services

Add option to show disabled services in tab bar

3 files changed, 20 insertions, 21 deletions

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index ecfd621d3..e9faad911 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -8,14 +8,14 @@ import AutoLaunch from 'auto-launch';
 
 import Store from './lib/Store';
 import Request from './lib/Request';
-import { CHECK_INTERVAL } from '../config';
+import { CHECK_INTERVAL, DEFAULT_APP_SETTINGS } from '../config';
 import { isMac } from '../environment';
 import locales from '../i18n/translations';
 import { gaEvent } from '../lib/analytics';
 import Miner from '../lib/Miner';
 
 const { app, powerMonitor } = remote;
-const defaultLocale = 'en-US';
+const defaultLocale = DEFAULT_APP_SETTINGS.locale;
 const autoLauncher = new AutoLaunch({
   name: 'Franz',
 });
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 1d895d532..6c41c22cf 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -78,6 +78,10 @@ export default class ServicesStore extends Store {
     return this.all.filter(service => service.isEnabled);
   }
 
+  @computed get allDisplayed() {
+    return this.stores.settings.all.showDisabledServices ? this.all : this.enabled;
+  }
+
   @computed get filtered() {
     return this.all.filter(service => service.name.toLowerCase().includes(this.filterNeedle.toLowerCase()));
   }
@@ -208,21 +212,23 @@ export default class ServicesStore extends Store {
   }
 
   @action _setActiveNext() {
-    const nextIndex = this._wrapIndex(this.enabled.findIndex(service => service.isActive), 1, this.enabled.length);
+    const nextIndex = this._wrapIndex(this.allDisplayed.findIndex(service => service.isActive), 1, this.allDisplayed.length);
 
+    // TODO: simplify this;
     this.all.forEach((s, index) => {
       this.all[index].isActive = false;
     });
-    this.enabled[nextIndex].isActive = true;
+    this.allDisplayed[nextIndex].isActive = true;
   }
 
   @action _setActivePrev() {
-    const prevIndex = this._wrapIndex(this.enabled.findIndex(service => service.isActive), -1, this.enabled.length);
+    const prevIndex = this._wrapIndex(this.allDisplayed.findIndex(service => service.isActive), -1, this.allDisplayed.length);
 
+    // TODO: simplify this;
     this.all.forEach((s, index) => {
       this.all[index].isActive = false;
     });
-    this.enabled[prevIndex].isActive = true;
+    this.allDisplayed[prevIndex].isActive = true;
   }
 
   @action _setUnreadMessageCount({ serviceId, count }) {
@@ -373,9 +379,9 @@ export default class ServicesStore extends Store {
   }
 
   @action _reorder({ oldIndex, newIndex }) {
-    const oldEnabledSortIndex = this.all.indexOf(this.enabled[oldIndex]);
-    const newEnabledSortIndex = this.all.indexOf(this.enabled[newIndex]);
-
+    const showDisabledServices = this.stores.settings.all.showDisabledServices;
+    const oldEnabledSortIndex = showDisabledServices ? oldIndex : this.all.indexOf(this.enabled[oldIndex]);
+    const newEnabledSortIndex = showDisabledServices ? newIndex : this.all.indexOf(this.enabled[newIndex]);
 
     this.all.splice(newEnabledSortIndex, 0, this.all.splice(oldEnabledSortIndex, 1)[0]);
 
@@ -444,19 +450,11 @@ export default class ServicesStore extends Store {
 
   _mapActiveServiceToServiceModelReaction() {
     const { activeService } = this.stores.settings.all;
-    const services = this.enabled;
-    if (services.length) {
-      services.map(service => Object.assign(service, {
-        isActive: activeService ? activeService === service.id : services[0].id === service.id,
+    if (this.allDisplayed.length) {
+      this.allDisplayed.map(service => Object.assign(service, {
+        isActive: activeService ? activeService === service.id : this.allDisplayed[0].id === service.id,
       }));
-
-      // if (!services.active) {
-      //
-      // }
     }
-    //  else if (!activeService && services.length) {
-    //   services[0].isActive = true;
-    // }
   }
 
   _getUnreadMessageCountReaction() {
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 816f545ee..331df5c15 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -5,6 +5,7 @@ import Store from './lib/Store';
 import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
 import { gaEvent } from '../lib/analytics';
+import { DEFAULT_APP_SETTINGS } from '../config';
 
 export default class SettingsStore extends Store {
   @observable allSettingsRequest = new CachedRequest(this.api.local, 'getSettings');
@@ -29,7 +30,7 @@ export default class SettingsStore extends Store {
   }
 
   @computed get all() {
-    return this.allSettingsRequest.result || {};
+    return observable(Object.assign(DEFAULT_APP_SETTINGS, this.allSettingsRequest.result));
   }
 
   @action async _update({ settings }) {