chore: change values inside mobx actions to fix console warnings (#532)

6 files changed, 68 insertions, 40 deletions

diff --git a/src/stores/AppStore.ts b/src/stores/AppStore.ts
index af1a0daae..08d2f718c 100644
--- a/src/stores/AppStore.ts
+++ b/src/stores/AppStore.ts
@@ -503,6 +503,17 @@ export default class AppStore extends TypedStore {
     this.isClearingAllCache = false;
   }
 
+  @action _setLocale() {
+    if (this.stores.user?.isLoggedIn && this.stores.user?.data.locale) {
+      this.locale = this.stores.user.data.locale;
+    } else if (!this.locale) {
+      this.locale = this._getDefaultLocale();
+    }
+
+    moment.locale(this.locale);
+    debug(`Set locale to "${this.locale}"`);
+  }
+
   // Reactions
   _offlineCheck() {
     if (!this.isOnline) {
@@ -516,17 +527,6 @@ export default class AppStore extends TypedStore {
     }
   }
 
-  _setLocale() {
-    if (this.stores.user?.isLoggedIn && this.stores.user?.data.locale) {
-      this.locale = this.stores.user.data.locale;
-    } else if (!this.locale) {
-      this.locale = this._getDefaultLocale();
-    }
-
-    moment.locale(this.locale);
-    debug(`Set locale to "${this.locale}"`);
-  }
-
   _getDefaultLocale() {
     return getLocale({
       locale: ferdiumLocale,
diff --git a/src/stores/RequestStore.ts b/src/stores/RequestStore.ts
index 59982c05a..279615e50 100644
--- a/src/stores/RequestStore.ts
+++ b/src/stores/RequestStore.ts
@@ -44,12 +44,7 @@ export default class RequestStore extends TypedStore {
     this.servicesRequest = this.stores.services.allServicesRequest;
 
     ipcRenderer.on('localServerPort', (_, data) => {
-      if (data.port) {
-        this.localServerPort = data.port;
-      }
-      if (data.token) {
-        this.localServerToken = data.token;
-      }
+      this.setData(data);
     });
   }
 
@@ -70,6 +65,15 @@ export default class RequestStore extends TypedStore {
     this.servicesRequest.reload();
   }
 
+  @action setData(data: { port: number; token: string | undefined }): void {
+    if (data.port) {
+      this.localServerPort = data.port;
+    }
+    if (data.token) {
+      this.localServerToken = data.token;
+    }
+  }
+
   // Reactions
   _autoRetry(): void {
     const delay = (this.retries <= 10 ? this.retries : 10) * this.retryDelay;
diff --git a/src/stores/ServicesStore.ts b/src/stores/ServicesStore.ts
index 7812d5aee..83ec7d18e 100644
--- a/src/stores/ServicesStore.ts
+++ b/src/stores/ServicesStore.ts
@@ -618,6 +618,10 @@ export default class ServicesStore extends TypedStore {
     await request._promise;
   }
 
+  @action _setIsActive(service: Service, state: boolean): void {
+    service.isActive = state;
+  }
+
   @action _setActive({ serviceId, keepActiveRoute = null }) {
     if (!keepActiveRoute) this.stores.router.push('/');
     const service = this.one(serviceId);
@@ -625,10 +629,10 @@ export default class ServicesStore extends TypedStore {
     for (const s of this.all) {
       if (s.isActive) {
         s.lastUsed = Date.now();
-        s.isActive = false;
+        this._setIsActive(s, false);
       }
     }
-    service.isActive = true;
+    this._setIsActive(service, true);
     this._awake({ serviceId: service.id });
 
     if (
@@ -650,7 +654,7 @@ export default class ServicesStore extends TypedStore {
   @action _blurActive() {
     const service = this.active;
     if (service) {
-      service.isActive = false;
+      this._setIsActive(service, false);
     } else {
       debug('No service is active');
     }
@@ -1194,13 +1198,14 @@ export default class ServicesStore extends TypedStore {
   _mapActiveServiceToServiceModelReaction() {
     const { activeService } = this.stores.settings.all.service;
     if (this.allDisplayed.length > 0) {
-      this.allDisplayed.map(service =>
-        Object.assign(service, {
-          isActive: activeService
+      for (const service of this.allDisplayed) {
+        this._setIsActive(
+          service,
+          activeService
             ? activeService === service.id
             : this.allDisplayed[0].id === service.id,
-        }),
-      );
+        );
+      }
     }
   }
 
diff --git a/src/stores/SettingsStore.ts b/src/stores/SettingsStore.ts
index e2903c952..811bc6f76 100644
--- a/src/stores/SettingsStore.ts
+++ b/src/stores/SettingsStore.ts
@@ -100,8 +100,11 @@ export default class SettingsStore extends TypedStore {
         });
       }
       debug('Get appSettings resolves', resp.type, resp.data);
-      Object.assign(this._fileSystemSettingsCache[resp.type], resp.data);
-      this.loaded = true;
+      this.actions.settings.update({
+        type: resp.type,
+        data: resp.data,
+      });
+      this.setLoaded();
       ipcRenderer.send('initialAppSettings', resp);
     });
 
@@ -148,6 +151,10 @@ export default class SettingsStore extends TypedStore {
     };
   }
 
+  @action async setLoaded(): Promise<void> {
+    this.loaded = true;
+  }
+
   @action async _update({ type, data }): Promise<void> {
     const appSettings = this.all;
     if (!this.fileSystemSettingsTypes.includes(type)) {
diff --git a/src/stores/lib/Request.js b/src/stores/lib/Request.js
index e58341790..60c943a42 100644
--- a/src/stores/lib/Request.js
+++ b/src/stores/lib/Request.js
@@ -18,6 +18,18 @@ export default class Request {
 
   @observable wasExecuted = false;
 
+  @action _reset() {
+    this.error = null;
+    this.result = null;
+    this.isExecuting = false;
+    this.isError = false;
+    this.wasExecuted = false;
+    this._isWaitingForResponse = false;
+    this._promise = Promise;
+
+    return this;
+  }
+
   _promise = Promise;
 
   _api = {};
@@ -139,15 +151,5 @@ export default class Request {
     for (const hook of Request._hooks) hook(this);
   }
 
-  reset = () => {
-    this.error = null;
-    this.result = null;
-    this.isExecuting = false;
-    this.isError = false;
-    this.wasExecuted = false;
-    this._isWaitingForResponse = false;
-    this._promise = Promise;
-
-    return this;
-  };
+  reset = () => this._reset();
 }
diff --git a/src/stores/lib/TypedStore.ts b/src/stores/lib/TypedStore.ts
index e44eadd32..0a669e669 100644
--- a/src/stores/lib/TypedStore.ts
+++ b/src/stores/lib/TypedStore.ts
@@ -1,4 +1,10 @@
-import { computed, IReactionPublic, makeObservable, observable } from 'mobx';
+import {
+  action,
+  computed,
+  IReactionPublic,
+  makeObservable,
+  observable,
+} from 'mobx';
 import { Actions } from '../../actions/lib/actions';
 import { ApiInterface } from '../../api';
 import { Stores } from '../../@types/stores.types';
@@ -15,6 +21,10 @@ export default abstract class TypedStore {
 
   actions: Actions;
 
+  @action _setResetStatus() {
+    this._status = null;
+  }
+
   @computed get actionStatus() {
     return this._status || [];
   }
@@ -49,6 +59,6 @@ export default abstract class TypedStore {
   }
 
   resetStatus(): void {
-    this._status = null;
+    this._setResetStatus();
   }
 }