Init test, fix types

Author: Yadro

package.json

@@ -13,7 +13,8 @@
     "postinstall": "node -r @babel/register .erb/scripts/CheckNativeDep.js && electron-builder install-app-deps && yarn cross-env NODE_ENV=development webpack --config ./.erb/configs/webpack.config.renderer.dev.dll.babel.js && opencollective-postinstall && yarn-deduplicate yarn.lock",
     "start": "node -r @babel/register ./.erb/scripts/CheckPortInUse.js && cross-env yarn start:renderer",
     "start:main": "cross-env NODE_ENV=development electron -r ./.erb/scripts/BabelRegister ./src/main.dev.ts",
-    "start:renderer": "cross-env NODE_ENV=development webpack serve --config ./.erb/configs/webpack.config.renderer.dev.babel.js"
+    "start:renderer": "cross-env NODE_ENV=development webpack serve --config ./.erb/configs/webpack.config.renderer.dev.babel.js",
+    "test": "jest"
   },
   "lint-staged": {
     "*.{js,jsx,ts,tsx}": [
@@ -112,6 +113,27 @@
     "hot",
     "reload"
   ],
+  "jest": {
+    "testURL": "http://localhost/",
+    "moduleNameMapper": {
+      "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/.erb/mocks/fileMock.js",
+      "\\.(css|less|sass|scss)$": "identity-obj-proxy"
+    },
+    "moduleFileExtensions": [
+      "js",
+      "jsx",
+      "ts",
+      "tsx",
+      "json"
+    ],
+    "moduleDirectories": [
+      "node_modules",
+      "src/node_modules"
+    ],
+    "setupFiles": [
+      "./.erb/scripts/CheckBuildsExist.js"
+    ]
+  },
   "devDependencies": {
     "@babel/core": "^7.12.9",
     "@babel/plugin-proposal-class-properties": "^7.12.1",
@@ -139,6 +161,7 @@
     "@pmmmwh/react-refresh-webpack-plugin": "^0.4.3",
     "@teamsupercell/typings-for-css-modules-loader": "^2.4.0",
     "@types/history": "4.7.6",
+    "@types/jest": "^26.0.24",
     "@types/node": "14.14.10",
     "@types/react": "^16.9.44",
     "@types/react-dom": "^16.9.9",
@@ -147,6 +170,7 @@
     "@typescript-eslint/eslint-plugin": "^4.8.1",
     "@typescript-eslint/parser": "^4.8.1",
     "babel-eslint": "^10.1.0",
+    "babel-jest": "^26.1.0",
     "babel-loader": "^8.2.2",
     "babel-plugin-dev-expression": "^0.2.2",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
@@ -172,13 +196,16 @@
     "eslint-import-resolver-webpack": "^0.13.0",
     "eslint-plugin-compat": "^3.8.0",
     "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-jest": "^24.1.3",
     "eslint-plugin-jsx-a11y": "6.4.1",
     "eslint-plugin-prettier": "^3.1.4",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-react": "^7.20.6",
     "eslint-plugin-react-hooks": "^4.0.8",
     "file-loader": "^6.0.0",
     "husky": "^4.2.5",
+    "identity-obj-proxy": "^3.0.0",
+    "jest": "^27.0.6",
     "lint-staged": "^10.2.11",
     "mini-css-extract-plugin": "^1.3.1",
     "node-sass": "^5.0.0",

src/helpers/TreeModelHelper.test.ts

@@ -0,0 +1,79 @@
+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 { ITreeItemWithParent } from '../types/ITreeItem';
+
+describe('TreeModelHelper', () => {
+  let testTasks: TasksByProject | undefined;
+  beforeEach(() => {
+    const factory = new TaskFactory();
+    const task111: Partial<IJsonTaskModel> = {
+      key: '111',
+      title: 'task1-1-1',
+      parent: null,
+      children: [],
+    };
+    const task11: Partial<IJsonTaskModel> = {
+      key: '11',
+      title: 'task1-1',
+      parent: null,
+      children: [task111 as IJsonTaskModel],
+    };
+    const task1: Partial<IJsonTaskModel> = {
+      key: '1',
+      title: 'task1',
+      parent: null,
+      children: [task11 as IJsonTaskModel],
+    };
+
+    task111.parent = task11 as IJsonTaskModel;
+    task11.parent = task1 as IJsonTaskModel;
+
+    const task21: Partial<IJsonTaskModel> = {
+      key: '21',
+      title: 'task21',
+      parent: null,
+      children: [],
+    };
+    const task22: Partial<IJsonTaskModel> = {
+      key: '22',
+      title: 'task22',
+      parent: null,
+      children: [],
+    };
+    const task2: Partial<IJsonTaskModel> = {
+      key: '2',
+      title: 'task2',
+      parent: null,
+      children: [task21, task22] as IJsonTaskModel[],
+    };
+    task21.parent = task2 as IJsonTaskModel;
+    task22.parent = task2 as IJsonTaskModel;
+
+    testTasks = factory.createTasks(({
+      proj: [task1, task2],
+    } as unknown) as TasksByProject);
+  });
+
+  test('getPathToNode #1', () => {
+    if (!testTasks) {
+      throw new Error();
+    }
+    const task111 = testTasks.proj[0].children[0].children[0];
+    expect(TreeModelHelper.getPathToNode(task111)).toStrictEqual([
+      '1',
+      '11',
+      '111',
+    ]);
+  });
+  test('getPathToNode #2', () => {
+    if (!testTasks) {
+      throw new Error();
+    }
+    const task22 = testTasks.proj[1].children[0];
+    expect(TreeModelHelper.getPathToNode(task22)).toStrictEqual(['2', '21']);
+  });
+
+  test('');
+});

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 } from '../../../types/ITreeItem';
+import { ITreeItem, ITreeItemWithParent } from '../../../types/ITreeItem';
 
 export interface IJsonTimeRangeModel {
   start: string;
@@ -16,7 +16,7 @@ export interface ITimeRangeModel {
   description?: string;
 }
 
-interface IJsonTaskModel extends ITreeItem<IJsonTaskModel> {
+export interface IJsonTaskModel extends ITreeItemWithParent {
   projectId?: string;
   checked?: boolean;
   active?: boolean;
@@ -49,11 +49,12 @@ const parseTimeRageItems = (
   );
 };
 
-export default class TaskModel extends AbstractModel {
+export default class TaskModel extends AbstractModel
+  implements ITreeItemWithParent<TaskModel> {
   key: string = '';
   title: string = '';
   children: TaskModel[] = [];
-  parent: TaskModel | null = null;
+  parent: TaskModel | null = null; // update parent on drug&drop
   projectId: string = '';
   checked: boolean = false;
   active: boolean = false;

src/types/ITreeItem.ts

@@ -4,6 +4,8 @@ export interface ITreeItem<T extends ITreeItem<any> = ITreeItem<any>> {
   children?: T[];
 }
 
-export interface ITreeItemWithParent extends ITreeItem<ITreeItemWithParent> {
-  parent: ITreeItemWithParent | undefined;
+export interface ITreeItemWithParent<
+  T extends ITreeItemWithParent<any> = ITreeItemWithParent<any>
+> extends ITreeItem<T> {
+  parent: T | null;
 }