WIP Add to MyDay

Author: Yadro

src/base/TreeModelHelper.ts

@@ -1,6 +1,108 @@
-import { ITreeItem } from '../types/ITreeItem';
+import { ITreeItem, ITreeItemWithParent } from '../types/ITreeItem';
+import { TaskModelProxy } from '../modules/tasks/models/TaskModelProxy';
+import TaskModel from '../modules/tasks/models/TaskModel';
 
 const TreeModelHelper = {
+  getPathToNode<T extends ITreeItemWithParent>(node: T) {
+    const result: string[] = [];
+
+    let ptrNode = node;
+    while (ptrNode) {
+      result.unshift(ptrNode.key);
+      // @ts-ignore
+      ptrNode = ptrNode.parent;
+    }
+
+    return result;
+  },
+  copyItemsToTree(
+    sourceTree: TaskModel[],
+    destTree: TaskModelProxy[],
+    keysToTask: string[]
+  ) {
+    let keyIdx = 0;
+    let sourceChild = sourceTree;
+    let destChild = destTree;
+
+    if (keysToTask.length === 1) {
+      const source = sourceChild.find((node) => node.key === keysToTask[0]);
+      destChild.push(
+        // @ts-ignore
+        new TaskModelProxy({
+          ...source,
+          children: [],
+        })
+      );
+      return true;
+    }
+
+    do {
+      const nextSourceNode = sourceChild.find(
+        (task) => task.key === keysToTask[keyIdx]
+      );
+      if (!nextSourceNode) {
+        return false;
+      }
+
+      const nextDestNode = destChild.find(
+        (task) => task.key === keysToTask[keyIdx]
+      );
+
+      if (nextDestNode) {
+        keyIdx++;
+        destChild = nextDestNode.children;
+      } else {
+        const restKeysToTask = keysToTask.slice(keyIdx);
+        return TreeModelHelper.copySubItemsToTree(
+          sourceChild,
+          destChild,
+          restKeysToTask
+        );
+      }
+    } while (keyIdx >= keysToTask.length);
+
+    return true;
+  },
+
+  copySubItemsToTree(
+    sourceTree: TaskModel[],
+    destTree: TaskModelProxy[],
+    keysToTask: string[]
+  ) {
+    if (!sourceTree) {
+      return false;
+    }
+
+    let keyIdx = 0;
+    let dest = destTree;
+    let source = sourceTree.find((node) => node.key === keysToTask[keyIdx]);
+
+    if (!source) {
+      return false;
+    }
+
+    while (true) {
+      // @ts-ignore
+      let copy = new TaskModelProxy({
+        ...source,
+        children: [],
+      });
+
+      dest.push(copy);
+
+      keyIdx++;
+      if (keyIdx === keysToTask.length) {
+        return true;
+      }
+
+      dest = copy.children;
+      source = source.children.find((node) => node.key === keysToTask[keyIdx]);
+      if (!source) {
+        return false;
+      }
+    }
+  },
+
   walkRecursive<T extends ITreeItem<any>>(
     fn: (t: T, p?: T) => void,
     treeItems: T[],

src/modules/tasks/TaskFactory.ts

@@ -2,13 +2,17 @@ import AbstractFactory from '../../base/AbstractFactory';
 import TasksByProject from './models/TasksByProject';
 import TaskModel from './models/TaskModel';
 import { TaskModelProxy, taskModelProxyHandler } from './models/TaskModelProxy';
+import { DEFAULT_PROJECT_ID } from '../projects/models/ProjectModel';
 
 export default class TaskFactory extends AbstractFactory {
   createTasks(data: TasksByProject): TasksByProject {
     const newData: TasksByProject = {};
     Object.keys(data).forEach((projectId) => {
       newData[projectId] = this.createList(TaskModel, data[projectId]);
     });
+
+    newData[DEFAULT_PROJECT_ID.MyDay] = [];
+
     return newData;
   }
 

src/modules/tasks/TaskStore.ts

@@ -12,6 +12,7 @@ import {
   ETasksEvents,
   ETimeRangeEvents,
 } from '../../services/gaService/EEvents';
+import { DEFAULT_PROJECT_ID } from '../projects/models/ProjectModel';
 
 export default class TaskStore {
   tasks: TasksByProject = {};
@@ -92,6 +93,19 @@ export default class TaskStore {
     GaService.event(EEventCategory.Tasks, ETasksEvents.Create);
   }
 
+  addToMyDay(task: TaskModel) {
+    task.inMyDay = new Date();
+    // @ts-ignore
+    const pathToNode = TreeModelHelper.getPathToNode(task);
+
+    TreeModelHelper.copyItemsToTree(
+      this.tasks[task.projectId],
+      // @ts-ignore
+      this.tasks[DEFAULT_PROJECT_ID.MyDay],
+      pathToNode
+    );
+  }
+
   delete(task: TaskModel) {
     function condition(_task: TaskModel) {
       return _task.key === task.key;

src/modules/tasks/models/TaskModel.ts

@@ -17,14 +17,14 @@ export interface ITimeRangeModel {
 }
 
 interface IJsonTaskModel extends ITreeItem<IJsonTaskModel> {
-  projectId: string;
-  checked: boolean;
-  active: boolean;
-  expanded: boolean;
-  inMyDay: string;
-  time: string[][] | IJsonTimeRangeModel[];
-  datesInProgress: string[];
-  details: string[];
+  projectId?: string;
+  checked?: boolean;
+  active?: boolean;
+  expanded?: boolean;
+  inMyDay?: string;
+  time?: string[][] | IJsonTimeRangeModel[];
+  datesInProgress?: string[];
+  details?: string[];
 }
 
 const parseTimeRageItems = (

src/modules/tasks/models/TaskModelProxy.ts

@@ -2,6 +2,7 @@ import TaskModel from './TaskModel';
 
 export class TaskModelProxy extends TaskModel {
   origin: TaskModel | null = null;
+  children: TaskModelProxy[] = [];
 }
 
 export const taskModelProxyHandler: ProxyHandler<TaskModelProxy> = {

src/screens/projects/ProjectsScreen.tsx

@@ -29,7 +29,7 @@ const TaskList = TreeList(
   },
   {
     checkable: true,
-    get draggable() {
+    isDraggable() {
       return projectStore.activeProject !== DEFAULT_PROJECT_ID.MyDay;
     },
     onExpand(keys: Key[]) {

src/screens/projects/components/TaskNode/TaskNode.tsx

@@ -1,7 +1,8 @@
-import React, { SyntheticEvent } from 'react';
+import React, { SyntheticEvent, useCallback } from 'react';
 import {
   CaretRightFilled,
   DeleteOutlined,
+  EnterOutlined,
   PauseOutlined,
 } from '@ant-design/icons';
 import { observer } from 'mobx-react';
@@ -22,18 +23,21 @@ export default observer(function TaskNode({ task }: TaskNodeProps) {
 
   const duration = TaskHooks.useTaskDuration(task);
 
-  function preventDefault(fn: () => void) {
+  const preventDefault = useCallback((fn: () => void) => {
     return (e: SyntheticEvent) => {
       e.stopPropagation();
       fn();
     };
-  }
+  }, []);
 
   return (
     <div className={classes.taskNode}>
       <span className={classes.taskTitle}>{task.title}</span>
       <span>{duration}</span>
       <span className={classes.taskNodeActions}>
+        <EnterOutlined
+          onClick={preventDefault(() => tasksStore.addToMyDay(task))}
+        />
         {!task.active ? (
           <CaretRightFilled
             onClick={preventDefault(() => tasksStore.startTimer(task))}

src/screens/projects/components/TreeList.tsx

@@ -16,14 +16,15 @@ interface TreePropsExtended<T>
   getCheckedKeys?: () => Key[];
   getExpandedKeys?: () => Key[];
   titleRender?: (item: T) => React.ReactNode;
+  isDraggable?: () => boolean;
 }
 
 export default function TreeList<T extends ITreeItem<any>>(
   getData: () => T[],
   updateData: (items: T[]) => void,
   options: TreePropsExtended<T>
 ) {
-  const { getCheckedKeys, getExpandedKeys, ...rest } = options;
+  const { getCheckedKeys, getExpandedKeys, isDraggable, ...rest } = options;
 
   return observer(({ onSelect }: TreeListProps) => {
     const data = getData();
@@ -112,12 +113,15 @@ export default function TreeList<T extends ITreeItem<any>>(
       );
     }
 
+    const draggable = isDraggable ? isDraggable() : rest.draggable;
+
     return (
       <Tree
         className="draggable-tree"
         defaultExpandParent={false}
         checkedKeys={getCheckedKeys?.()}
         expandedKeys={getExpandedKeys?.()}
+        draggable={draggable}
         blockNode
         treeData={data}
         // @ts-ignore

src/types/ITreeItem.ts

@@ -3,3 +3,7 @@ export interface ITreeItem<T extends ITreeItem<any> = ITreeItem<any>> {
   key: string;
   children?: T[];
 }
+
+export interface ITreeItemWithParent extends ITreeItem<ITreeItemWithParent> {
+  parent: ITreeItemWithParent | undefined;
+}

yarn.lock

@@ -10391,10 +10391,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@^4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.5.tgz#ae9dddfd1069f1cb5beb3ef3b2170dd7c1332389"
-  integrity sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ==
+typescript@^4.3.5:
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4"
+  integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==
 
 typical@^5.0.0, typical@^5.2.0:
   version "5.2.0"