WIP TaskWithProjectNameModel

Author: Yadro

src/base/AbstractModel.ts

@@ -3,7 +3,7 @@ export default abstract class AbstractModel {
     return Object.keys(this);
   }
 
-  protected load<T extends any = any>(data: T) {
+  protected load<T extends Object = Object>(data: T) {
     if (data) {
       this.getAttributes().forEach((attribute) => {
         if (data.hasOwnProperty(attribute)) {

src/helpers/TreeModelHelper.test.ts

@@ -1,7 +1,7 @@
 import TreeModelHelper from './TreeModelHelper';
 import TaskFactory from '../modules/tasks/TaskFactory';
 import { IJsonTaskModel } from '../modules/tasks/models/TaskModel';
-import TasksByProject from '../modules/tasks/models/TasksByProject';
+import { TasksByProject } from '../modules/tasks/models/TasksByProject';
 import { ITreeItemWithParent } from '../types/ITreeItem';
 
 describe('TreeModelHelper', () => {

src/main.dev.ts

@@ -18,6 +18,7 @@ initSentry();
 import path from 'path';
 import { app, BrowserWindow, shell } from 'electron';
 import { autoUpdater } from 'electron-updater';
+// @ts-ignore
 import Badge from 'electron-windows-badge';
 
 import './main/IpcMain';

src/modules/tasks/TaskFactory.ts

@@ -1,5 +1,5 @@
 import AbstractFactory from '../../base/AbstractFactory';
-import TasksByProject from './models/TasksByProject';
+import { TasksByProject } from './models/TasksByProject';
 import TaskModel from './models/TaskModel';
 import { TaskInMyDay, taskModelProxyHandler } from './models/TaskInMyDay';
 import { DEFAULT_PROJECT_ID } from '../projects/models/ProjectModel';

src/modules/tasks/TaskRepository.ts

@@ -1,5 +1,5 @@
 import AbstractFileRepository from '../../base/repositories/AbstractFileRepository';
-import TasksByProject from './models/TasksByProject';
+import { TasksByProject } from './models/TasksByProject';
 
 export default class TaskRepository extends AbstractFileRepository<
   TasksByProject

src/modules/tasks/TaskService.ts

@@ -2,16 +2,16 @@ import { toJS } from 'mobx';
 
 import TaskRepository from './TaskRepository';
 import TaskFactory from './TaskFactory';
-import TasksByProject from './models/TasksByProject';
+import { TasksByProject } from './models/TasksByProject';
 import AbstractServiceWithProfile from '../../base/AbstractServiceWithProfile';
 import TreeModelHelper from '../../helpers/TreeModelHelper';
-import TaskModel from './models/TaskModel';
+import { ITreeItemWithParent } from '../../types/ITreeItem';
 
-const setParent = (item: TaskModel, parent?: TaskModel) => {
+const setParent = <T extends ITreeItemWithParent<any>>(item: T, parent?: T) => {
   item.parent = parent || null;
 };
 
-const clearParent = (item: TaskModel) => {
+const clearParent = (item: ITreeItemWithParent<any>) => {
   item.parent = null;
 };
 
@@ -35,13 +35,19 @@ export default class TaskService extends AbstractServiceWithProfile<
 
   private static fillParent(data: TasksByProject) {
     Object.values(data).forEach((projectTasks) => {
-      TreeModelHelper.walkRecursive(setParent, projectTasks);
+      TreeModelHelper.walkRecursive<ITreeItemWithParent<any>>(
+        setParent,
+        projectTasks
+      );
     });
   }
 
   private static clearParent(data: TasksByProject) {
     Object.values(data).forEach((projectTasks) => {
-      TreeModelHelper.walkRecursive(clearParent, projectTasks);
+      TreeModelHelper.walkRecursive<ITreeItemWithParent<any>>(
+        clearParent,
+        projectTasks
+      );
     });
   }
 }

src/modules/tasks/TaskStore.ts

@@ -2,7 +2,10 @@ import { autorun, makeAutoObservable } from 'mobx';
 
 import TaskService from './TaskService';
 import TaskModel, { ITimeRangeModel } from './models/TaskModel';
-import TasksByProject from '../../modules/tasks/models/TasksByProject';
+import {
+  Task,
+  TasksByProject,
+} from '../../modules/tasks/models/TasksByProject';
 import TreeModelHelper from '../../helpers/TreeModelHelper';
 import BadgeService from '../BadgeService';
 import rootStore, { RootStore } from '../RootStore';
@@ -13,6 +16,7 @@ import {
   ETimeRangeEvents,
 } from '../../services/gaService/EEvents';
 import { DEFAULT_PROJECT_ID } from '../projects/models/ProjectModel';
+import { ITreeItemWithParent } from '../../types/ITreeItem';
 
 export default class TaskStore {
   tasks: TasksByProject = {};
@@ -51,7 +55,7 @@ export default class TaskStore {
     GaService.event(EEventCategory.TimeRange, ETimeRangeEvents.Delete);
   }
 
-  getTasks(projectId: string): TaskModel[] {
+  getTasks(projectId: string): Task[] {
     return this.tasks[projectId] || [];
   }
 
@@ -95,7 +99,7 @@ export default class TaskStore {
 
   addToMyDay(task: TaskModel) {
     task.inMyDay = new Date();
-    // @ts-ignore
+
     const pathToNode = TreeModelHelper.getPathToNode(task);
 
     TreeModelHelper.copyItemsToTreeUnderProject(
@@ -187,12 +191,14 @@ export default class TaskStore {
   }
 
   markExpanded(projectId: string, taskIds: string[]) {
-    const markExpanded = (task: TaskModel, taskIds: string[]) => {
-      task.expanded = taskIds.includes(task.key);
+    const markExpanded = (task: Task, taskIds: string[]) => {
+      if (task instanceof TaskModel) {
+        task.expanded = taskIds.includes(task.key);
+      }
     };
 
     if (Array.isArray(this.tasks[projectId])) {
-      TreeModelHelper.modifyItemsWithIdsRecursive<TaskModel>(
+      TreeModelHelper.modifyItemsWithIdsRecursive<Task>(
         this.tasks[projectId],
         taskIds,
         markExpanded
@@ -207,7 +213,7 @@ export default class TaskStore {
     condition: (task: TaskModel) => boolean
   ) {
     if (Array.isArray(this.tasks[projectId])) {
-      return TreeModelHelper.getFlatItemsRecursive(
+      return TreeModelHelper.getFlatItemsRecursive<ITreeItemWithParent>(
         this.tasks[projectId],
         condition
       ).map((task) => task.key);

src/modules/tasks/models/TaskModel.ts

@@ -2,7 +2,7 @@ import { action, computed, makeObservable, observable } from 'mobx';
 import { isSameDay, startOfDay } from 'date-fns';
 
 import AbstractModel from '../../../base/AbstractModel';
-import { ITreeItem, ITreeItemWithParent } from '../../../types/ITreeItem';
+import { ITreeItemWithParent } from '../../../types/ITreeItem';
 
 export interface IJsonTimeRangeModel {
   start: string;

src/modules/tasks/models/TaskWithProjectNameModel.ts

@@ -0,0 +1,23 @@
+import AbstractModel from '../../../base/AbstractModel';
+import { ITreeItemWithParent } from '../../../types/ITreeItem';
+import TaskModel from './TaskModel';
+
+interface ITaskWithProjectName {
+  key: string;
+  title: string;
+  parent: null;
+  children: TaskModel[];
+}
+
+export class TaskWithProjectNameModel extends AbstractModel
+  implements ITreeItemWithParent<TaskModel> {
+  key: string = '';
+  title: string = '';
+  parent: TaskModel | null = null;
+  children: TaskModel[] = [];
+
+  constructor(props: ITaskWithProjectName) {
+    super();
+    this.load(props);
+  }
+}

src/modules/tasks/models/TasksByProject.ts

@@ -1,7 +1,6 @@
 import TaskModel from './TaskModel';
 import { TaskInMyDay } from './TaskInMyDay';
+import { TaskWithProjectNameModel } from './TaskWithProjectNameModel';
 
-type Task = TaskModel | TaskInMyDay;
-type TasksByProject = Record<string, Task[]>;
-
-export default TasksByProject;
+export type Task = TaskModel | TaskInMyDay | TaskWithProjectNameModel;
+export type TasksByProject = Record<string, Task[]>;