Refactoring Stores

Author: Dmitry Yadrikhinsky

src/base/AbstractTreeModelStore.ts src/base/TreeModelStoreHelper.tssrc/base/AbstractTreeModelStore.ts renamed to src/base/TreeModelStoreHelper.ts

@@ -1,7 +1,7 @@
 import { ITreeItem } from '../types/ITreeItem';
 
-export default abstract class AbstractTreeModelStore<T extends ITreeItem<any>> {
-  protected getItemRecursive(
+export default abstract class TreeModelStoreHelper {
+  static getItemRecursive<T extends ITreeItem<any>>(
     tasks: T[],
     condition: (task: T) => boolean
   ): T | undefined {
@@ -19,7 +19,7 @@ export default abstract class AbstractTreeModelStore<T extends ITreeItem<any>> {
     return undefined;
   }
 
-  protected getItemsRecursive(
+  static getItemsRecursive<T extends ITreeItem<any>>(
     tasks: T[],
     condition: (task: T) => boolean,
     result: T[]

src/services/projects/ProjectStore.ts

@@ -1,26 +1,17 @@
-import { action, makeObservable, observable } from 'mobx';
+import { makeAutoObservable } from 'mobx';
 
 import ProjectModel from '../../models/ProjectModel';
 import ProjectService from './ProjectService';
-import AbstractTreeModelStore from '../../base/AbstractTreeModelStore';
+import TreeModelStoreHelper from '../../base/TreeModelStoreHelper';
 
-export default class ProjectStore extends AbstractTreeModelStore<ProjectModel> {
+export default class ProjectStore {
   projects: ProjectModel[] = [];
   activeProject: string = '';
 
   private projectService = new ProjectService();
 
   constructor() {
-    super();
-    makeObservable(this, {
-      projects: observable,
-      activeProject: observable,
-      set: action,
-      get: action,
-      add: action,
-      setActiveProject: action,
-      restore: action,
-    });
+    makeAutoObservable(this);
   }
 
   set(projects: ProjectModel[]) {
@@ -32,7 +23,7 @@ export default class ProjectStore extends AbstractTreeModelStore<ProjectModel> {
     function compare(project: ProjectModel) {
       return project.key === projectKey;
     }
-    return this.getItemRecursive(this.projects, compare);
+    return TreeModelStoreHelper.getItemRecursive(this.projects, compare);
   }
 
   add(project: ProjectModel) {

src/services/tasks/TaskStore.ts

@@ -1,31 +1,17 @@
-import { action, makeObservable, observable } from 'mobx';
+import { makeAutoObservable } from 'mobx';
 
 import TaskService from './TaskService';
 import TaskModel from '../../models/TaskModel';
 import TasksByProject from '../../models/TasksByProject';
-import AbstractTreeModelStore from '../../base/AbstractTreeModelStore';
+import TreeModelStoreHelper from '../../base/TreeModelStoreHelper';
 
-export default class TaskStore extends AbstractTreeModelStore<TaskModel> {
+export default class TaskStore {
   tasks: TasksByProject = {};
   activeTask: TaskModel | undefined;
   private tasksService = new TaskService();
 
   constructor() {
-    super();
-    makeObservable(this, {
-      tasks: observable,
-      activeTask: observable,
-      set: action,
-      getTasks: action,
-      getTaskByKey: action,
-      getTaskByDate: action,
-      add: action,
-      startTimer: action,
-      endTimer: action,
-      restore: action,
-      getCheckedKeys: action,
-      checkTasks: action,
-    });
+    makeAutoObservable(this);
   }
 
   set(projectId: string, tasks: TaskModel[]) {
@@ -43,7 +29,7 @@ export default class TaskStore extends AbstractTreeModelStore<TaskModel> {
     }
 
     for (const tasks of Object.values(this.tasks)) {
-      const found = this.getItemRecursive(tasks, condition);
+      const found = TreeModelStoreHelper.getItemRecursive(tasks, condition);
       if (found) {
         return found;
       }
@@ -59,7 +45,7 @@ export default class TaskStore extends AbstractTreeModelStore<TaskModel> {
     }
 
     for (const tasks of Object.values(this.tasks)) {
-      this.getItemsRecursive(tasks, condition, result);
+      TreeModelStoreHelper.getItemsRecursive(tasks, condition, result);
     }
     return result;
   }
@@ -98,9 +84,14 @@ export default class TaskStore extends AbstractTreeModelStore<TaskModel> {
     function condition(task: TaskModel): boolean {
       return task.checked;
     }
+
     if (Array.isArray(this.tasks[projectId])) {
       const found: TaskModel[] = [];
-      this.getItemsRecursive(this.tasks[projectId], condition, found);
+      TreeModelStoreHelper.getItemsRecursive(
+        this.tasks[projectId],
+        condition,
+        found
+      );
       return found.map((f) => f.key);
     }
     return [];
@@ -129,7 +120,7 @@ export default class TaskStore extends AbstractTreeModelStore<TaskModel> {
       return task.active;
     }
 
-    return this.getItemRecursive(tasks, condition);
+    return TreeModelStoreHelper.getItemRecursive(tasks, condition);
   }
 
   private checkTasksRecursive(tasks: TaskModel[], taskIds: string[]) {