chore: transform workspace action store and todo store into ts

3 files changed, 61 insertions, 26 deletions

diff --git a/src/features/todos/store.js b/src/features/todos/store.ts
index 0f195f10d..5cf5e1d75 100644
--- a/src/features/todos/store.js
+++ b/src/features/todos/store.ts
@@ -1,5 +1,7 @@
+import { Webview } from 'react-electron-web-view';
 import { computed, action, observable, makeObservable } from 'mobx';
 import localStorage from 'mobx-localstorage';
+import { Actions } from '../../actions/lib/actions';
 
 import { ThemeType } from '../../themes';
 import { todoActions } from './actions';
@@ -13,7 +15,7 @@ import {
 } from '../../config';
 import { isValidExternalURL } from '../../helpers/url-helpers';
 import FeatureStore from '../utils/FeatureStore';
-import { createReactions } from '../../stores/lib/Reaction';
+import Reaction, { createReactions } from '../../stores/lib/Reaction';
 import { createActionBindings } from '../utils/ActionBinding';
 import { IPC, TODOS_ROUTES } from './constants';
 import UserAgent from '../../models/UserAgent';
@@ -23,16 +25,20 @@ const debug = require('../../preload-safe-debug')(
 );
 
 export default class TodoStore extends FeatureStore {
-  @observable stores = null;
+  @observable stores: any = null;
 
   @observable isFeatureActive = false;
 
-  @observable webview = null;
+  @observable webview: Webview | undefined;
 
   @observable userAgentModel = new UserAgent();
 
   isInitialized = false;
 
+  actions: Actions | undefined;
+
+  _allReactions: Reaction[] | undefined;
+
   constructor() {
     super();
 
@@ -142,7 +148,7 @@ export default class TodoStore extends FeatureStore {
   @action stop() {
     super.stop();
     debug('TodoStore::stop');
-    this.reset();
+    // this.reset(); // TODO - [TECH DEBT][PROP NOT IN CLASS] check it later
     this.isFeatureActive = false;
   }
 
@@ -184,7 +190,10 @@ export default class TodoStore extends FeatureStore {
     }
   };
 
-  @action _handleClientMessage = ({ channel, message = {} }) => {
+  @action _handleClientMessage = ({
+    channel,
+    message = { action: '', data: { url: '', serviceId: '' } },
+  }) => {
     debug('_handleClientMessage', channel, message);
     switch (message.action) {
       case 'todos:initialized':
@@ -195,7 +204,7 @@ export default class TodoStore extends FeatureStore {
         break;
       default:
         debug('Other message received', channel, message);
-        if (this.stores.services.isTodosServiceAdded) {
+        if (this.stores.services.isTodosServiceAdded && this.actions) {
           this.actions.service.handleIPCMessage({
             serviceId: this.stores.services.isTodosServiceAdded.id,
             channel,
@@ -206,6 +215,9 @@ export default class TodoStore extends FeatureStore {
   };
 
   _handleNewWindowEvent = ({ url }) => {
+    if (!this.actions) {
+      return;
+    }
     this.actions.app.openExternalUrl({ url });
   };
 
@@ -222,15 +234,19 @@ export default class TodoStore extends FeatureStore {
   _openDevTools = () => {
     debug('_openDevTools');
 
-    const webview = document.querySelector('#todos-panel webview');
-    if (webview) webview.openDevTools();
+    const webview = document.querySelector<Webview>('#todos-panel webview');
+    if (webview) {
+      webview.openDevTools();
+    }
   };
 
   _reload = () => {
     debug('_reload');
 
-    const webview = document.querySelector('#todos-panel webview');
-    if (webview) webview.reload();
+    const webview = document.querySelector<Webview>('#todos-panel webview');
+    if (webview) {
+      webview.reload();
+    }
   };
 
   // Todos client message handlers
@@ -260,7 +276,9 @@ export default class TodoStore extends FeatureStore {
     if (url) {
       this.stores.services.one(serviceId).webview.loadURL(url);
     }
-    this.actions.service.setActive({ serviceId });
+    if (this.actions) {
+      this.actions.service.setActive({ serviceId });
+    }
   };
 
   // Reactions
diff --git a/src/features/workspaces/actions.ts b/src/features/workspaces/actions.ts
index b32bd7c86..5f3fefec4 100644
--- a/src/features/workspaces/actions.ts
+++ b/src/features/workspaces/actions.ts
@@ -2,12 +2,17 @@ import PropTypes from 'prop-types';
 import Workspace from './models/Workspace';
 import { createActionsFromDefinitions } from '../../actions/lib/actions';
 
+type WorkspaceArg = { workspace: Workspace };
 export interface WorkspaceActions {
   openWorkspaceSettings: () => void;
   toggleWorkspaceDrawer: () => void;
   deactivate: () => void;
   activate: (options: any) => void;
-  edit: ({ workspace }: { workspace: Workspace }) => void;
+  edit: (workspaceArg: WorkspaceArg) => void;
+  create: ({ name }: { name: string }) => void;
+  delete: (workspaceArg: WorkspaceArg) => void;
+  update: (workspaceArg: WorkspaceArg) => void;
+  toggleKeepAllWorkspacesLoadedSetting: () => void;
 }
 
 export default createActionsFromDefinitions<WorkspaceActions>(
diff --git a/src/features/workspaces/store.js b/src/features/workspaces/store.ts
index 2323019fe..d63feb1f8 100644
--- a/src/features/workspaces/store.js
+++ b/src/features/workspaces/store.ts
@@ -14,6 +14,8 @@ import { createReactions } from '../../stores/lib/Reaction';
 import { createActionBindings } from '../utils/ActionBinding';
 
 import { KEEP_WS_LOADED_USID } from '../../config';
+import Workspace from './models/Workspace';
+import { Actions } from '../../actions/lib/actions';
 
 const debug = require('../../preload-safe-debug')(
   'Ferdium:feature:workspaces:store',
@@ -22,17 +24,21 @@ const debug = require('../../preload-safe-debug')(
 export default class WorkspacesStore extends FeatureStore {
   @observable isFeatureActive = false;
 
-  @observable activeWorkspace = null;
+  @observable activeWorkspace: Workspace | undefined;
 
-  @observable nextWorkspace = null;
+  @observable nextWorkspace: Workspace | undefined;
 
-  @observable workspaceBeingEdited = null;
+  @observable workspaceBeingEdited: any = null; // TODO - [TS DEBT] fix type later
 
   @observable isSwitchingWorkspace = false;
 
   @observable isWorkspaceDrawerOpen = false;
 
-  @observable isSettingsRouteActive = null;
+  @observable isSettingsRouteActive = false;
+
+  stores: any; // TODO - [TS DEBT] fix type later
+
+  actions: Actions | undefined;
 
   constructor() {
     super();
@@ -68,7 +74,7 @@ export default class WorkspacesStore extends FeatureStore {
 
   // ========== PRIVATE PROPERTIES ========= //
 
-  _wasDrawerOpenBeforeSettingsRoute = null;
+  _wasDrawerOpenBeforeSettingsRoute = false;
 
   _allActions = [];
 
@@ -159,13 +165,13 @@ export default class WorkspacesStore extends FeatureStore {
   };
 
   @action _create = async ({ name }) => {
-    const workspace = await createWorkspaceRequest.execute(name);
+    const workspace = await createWorkspaceRequest.execute(name).promise;
     await getUserWorkspacesRequest.result.push(workspace);
     this._edit({ workspace });
   };
 
   @action _delete = async ({ workspace }) => {
-    await deleteWorkspaceRequest.execute(workspace);
+    await deleteWorkspaceRequest.execute(workspace).promise;
     await getUserWorkspacesRequest.result.remove(workspace);
     this.stores.router.push('/settings/workspaces');
     if (this.activeWorkspace === workspace) {
@@ -174,7 +180,7 @@ export default class WorkspacesStore extends FeatureStore {
   };
 
   @action _update = async ({ workspace }) => {
-    await updateWorkspaceRequest.execute(workspace);
+    await updateWorkspaceRequest.execute(workspace).promise;
     // Path local result optimistically
     const localWorkspace = this._getWorkspaceById(workspace.id);
     Object.assign(localWorkspace, workspace);
@@ -210,7 +216,7 @@ export default class WorkspacesStore extends FeatureStore {
         const serviceNames = new Set(
           this.getWorkspaceServices(workspace).map(service => service.name),
         );
-        for (const wrapper of document.querySelectorAll(
+        for (const wrapper of document.querySelectorAll<HTMLDivElement>(
           '.services__webview-wrapper',
         )) {
           wrapper.style.display = serviceNames.has(wrapper.dataset.name)
@@ -234,7 +240,7 @@ export default class WorkspacesStore extends FeatureStore {
     setTimeout(() => {
       this._setIsSwitchingWorkspace(false);
       if (this.stores.settings.app.splitMode) {
-        for (const wrapper of document.querySelectorAll(
+        for (const wrapper of document.querySelectorAll<HTMLDivElement>(
           '.services__webview-wrapper',
         )) {
           wrapper.style.display = '';
@@ -248,15 +254,21 @@ export default class WorkspacesStore extends FeatureStore {
   };
 
   @action _openWorkspaceSettings = () => {
+    if (!this.actions) {
+      return;
+    }
     this.actions.ui.openSettings({ path: 'workspaces' });
   };
 
   @action reorderServicesOfActiveWorkspace = async ({ oldIndex, newIndex }) => {
-    const { activeWorkspace } = this;
-    const { services } = activeWorkspace;
+    if (!this.activeWorkspace) {
+      return;
+    }
+
+    const { services = [] } = this.activeWorkspace;
     // Move services from the old to the new position
     services.splice(newIndex, 0, services.splice(oldIndex, 1)[0]);
-    await updateWorkspaceRequest.execute(activeWorkspace);
+    await updateWorkspaceRequest.execute(this.activeWorkspace).promise;
   };
 
   @action _setOpenDrawerWithSettings() {
@@ -314,7 +326,7 @@ export default class WorkspacesStore extends FeatureStore {
       if (workspaceServices.length <= 0) return;
       const isActiveServiceInWorkspace =
         workspaceServices.includes(activeService);
-      if (!isActiveServiceInWorkspace) {
+      if (!isActiveServiceInWorkspace && this.actions) {
         this.actions.service.setActive({
           serviceId: workspaceServices[0].id,
           keepActiveRoute: true,