Clear parents, make Projects observable

Author: Yadro

src/helpers/TreeModelHelper.ts

@@ -237,6 +237,22 @@ const TreeModelHelper = {
     });
     return result;
   },
+
+  fillParent<T extends ITreeItemWithParent>(items: T[]) {
+    TreeModelHelper.walkRecursive(setParent, items);
+  },
+
+  clearParent<T extends ITreeItemWithParent>(items: T[]) {
+    TreeModelHelper.walkRecursive(clearParent, items);
+  },
+};
+
+const setParent = <T extends ITreeItemWithParent>(item: T, parent?: T) => {
+  item.parent = parent;
+};
+
+const clearParent = <T extends ITreeItemWithParent>(item: T) => {
+  item.parent = undefined;
 };
 
 export default TreeModelHelper;

src/modules/projects/ProjectService.ts

@@ -1,7 +1,12 @@
-import ProjectModel, { DEFAULT_PROJECTS } from './models/ProjectModel';
+import ProjectModel, {
+  DEFAULT_PROJECTS,
+  IJsonProjectItem,
+} from './models/ProjectModel';
 import ProjectFactory from './ProjectFactory';
 import ProjectRepository from './ProjectRepository';
 import AbstractServiceWithProfile from '../../base/AbstractServiceWithProfile';
+import TreeModelHelper from '../../helpers/TreeModelHelper';
+import { toJS } from 'mobx';
 
 export default class ProjectService extends AbstractServiceWithProfile<
   ProjectModel[]
@@ -11,11 +16,21 @@ export default class ProjectService extends AbstractServiceWithProfile<
 
   getAll(): ProjectModel[] {
     const data = this.repository.restore(DEFAULT_PROJECTS);
-
+    ProjectService.fillParent(data);
     return this.factory.createProjects(data);
   }
 
   save(data: ProjectModel[]): void {
-    this.repository.save(data);
+    const copyData = toJS(data);
+    ProjectService.clearParent(copyData);
+    this.repository.save(copyData);
+  }
+
+  private static fillParent(data: IJsonProjectItem[]) {
+    TreeModelHelper.fillParent(data);
+  }
+
+  private static clearParent(data: ProjectModel[]) {
+    TreeModelHelper.clearParent(data);
   }
 }

src/modules/projects/models/ProjectModel.ts

@@ -1,7 +1,8 @@
 import * as colors from '@ant-design/colors';
+import { makeObservable, observable } from 'mobx';
 
 import AbstractModel from '../../../base/AbstractModel';
-import { ITreeItem, ITreeItemWithParent } from '../../../types/ITreeItem';
+import { ITreeItemWithParent } from '../../../types/ITreeItem';
 
 export enum DEFAULT_PROJECT_ID {
   MyDay = '0',
@@ -22,10 +23,11 @@ export const DEFAULT_PROJECTS: IJsonProjectItem[] = [
     color: colors.blue.primary || '',
     deletable: false,
     expanded: false,
+    parent: undefined,
   },
 ];
 
-export interface IJsonProjectItem extends ITreeItem {
+export interface IJsonProjectItem extends ITreeItemWithParent {
   color: string;
   expanded: boolean;
   deletable: boolean;
@@ -58,5 +60,15 @@ export default class ProjectModel extends AbstractModel
     };
 
     this.load(newProps);
+
+    makeObservable(this, {
+      key: observable,
+      title: observable,
+      color: observable,
+      expanded: observable,
+      deletable: observable,
+      children: observable,
+      // parent: none,
+    });
   }
 }

src/modules/tasks/TaskService.ts

@@ -5,15 +5,6 @@ import TaskFactory from './TaskFactory';
 import { TasksByProject } from './models/TasksByProject';
 import AbstractServiceWithProfile from '../../base/AbstractServiceWithProfile';
 import TreeModelHelper from '../../helpers/TreeModelHelper';
-import { ITreeItemWithParent } from '../../types/ITreeItem';
-
-const setParent = <T extends ITreeItemWithParent>(item: T, parent?: T) => {
-  item.parent = parent;
-};
-
-const clearParent = <T extends ITreeItemWithParent>(item: T) => {
-  item.parent = undefined;
-};
 
 export default class TaskService extends AbstractServiceWithProfile<
   TasksByProject
@@ -33,16 +24,15 @@ export default class TaskService extends AbstractServiceWithProfile<
     this.repository.save(copyData);
   }
 
-  // TODO ProjectService fill and remove parent
   private static fillParent(data: TasksByProject) {
     Object.values(data).forEach((projectTasks) => {
-      TreeModelHelper.walkRecursive(setParent, projectTasks);
+      TreeModelHelper.fillParent(projectTasks);
     });
   }
 
   private static clearParent(data: TasksByProject) {
     Object.values(data).forEach((projectTasks) => {
-      TreeModelHelper.walkRecursive(clearParent, projectTasks);
+      TreeModelHelper.clearParent(projectTasks);
     });
   }
 }

src/modules/tasks/models/TaskModel.ts

@@ -83,12 +83,16 @@ export default class TaskModel extends AbstractModel
       key: observable,
       title: observable,
       children: observable,
+      // parent: none
       projectId: observable,
       checked: observable,
       active: observable,
+      expanded: observable,
+      inMyDay: observable,
       time: observable,
       datesInProgress: observable,
       details: observable,
+      withoutActions: observable,
       duration: computed,
       setTitle: action,
       setDetails: action,