Skip to content
This repository was archived by the owner on Dec 26, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 29 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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}": [
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -189,7 +216,7 @@
"sass-loader": "^10.1.0",
"style-loader": "^2.0.0",
"terser-webpack-plugin": "^5.0.3",
"typescript": "^4.0.5",
"typescript": "^4.3.5",
"url-loader": "^4.1.0",
"webpack": "^5.5.1",
"webpack-bundle-analyzer": "^4.1.0",
Expand Down
2 changes: 1 addition & 1 deletion src/base/AbstractModel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
77 changes: 0 additions & 77 deletions src/base/TreeModelHelper.ts

This file was deleted.

3 changes: 3 additions & 0 deletions src/config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export const Features = {
myDay: false,
};
88 changes: 88 additions & 0 deletions src/helpers/TreeModelHelper.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
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();
/* Structure:
-task1
--task1-1
---task-1-1-1
-task2
--task21
--task22
*/
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('');
});
Loading