Delete task, rename

Author: Dmitry Yadrikhinsky

src/base/TreeModelStoreHelper.ts

@@ -34,4 +34,18 @@ export default abstract class TreeModelStoreHelper {
     }
     return result;
   }
+
+  static deleteItems<T extends ITreeItem<any>>(
+    tasks: T[],
+    condition: (task: T) => boolean
+  ): T[] {
+    const result = tasks.filter((t) => !condition(t));
+    for (let i = 0; i < result.length; i++) {
+      const task = tasks[i];
+      if (Array.isArray(task.children)) {
+        tasks[i].children = this.deleteItems(task.children, condition);
+      }
+    }
+    return result;
+  }
 }

src/components/PlayStopButton/PlayStopButton.tsx

@@ -25,7 +25,7 @@ export default function PlayStopButton({
       if (!task?.active) {
         tasksStore.startTimer(task);
       } else {
-        tasksStore.endTimer(task);
+        tasksStore.stopTimer(task);
       }
     }
   }

src/models/TaskModel.ts

@@ -77,7 +77,7 @@ export default class TaskModel extends AbstractModel {
       setTitle: action,
       setDetails: action,
       start: action,
-      end: action,
+      stop: action,
     });
   }
 
@@ -115,7 +115,7 @@ export default class TaskModel extends AbstractModel {
     });
   }
 
-  end() {
+  stop() {
     if (this.active) {
       this.active = false;
       const range = this.time[this.time.length - 1];

src/screens/projects/components/TaskControl/TaskControl.tsx

@@ -26,7 +26,7 @@ export default observer(function TaskControl() {
           <span>{task.title}</span>
         </div>
         <span className="task-control__duration">{duration}</span>
-        <CircleButton onClick={() => tasksStore.endTimer(task)}>
+        <CircleButton onClick={() => tasksStore.stopTimer(task)}>
           <PauseOutlined />
         </CircleButton>
       </span>

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

@@ -38,7 +38,7 @@ export default function TaskNode({ model }: TaskNodeProps) {
           />
         ) : (
           <PauseOutlined
-            onClick={preventDefault(() => tasksStore.endTimer(model))}
+            onClick={preventDefault(() => tasksStore.stopTimer(model))}
           />
         )}
         <DeleteOutlined

src/services/RootStore.ts

@@ -9,8 +9,6 @@ class RootStore {
   restore() {
     this.tasksStore.restore();
     this.projectStore.restore();
-    console.log(toJS(this.projectStore.projects));
-    console.log(toJS(this.tasksStore.tasks));
   }
 }
 

src/services/tasks/TaskStore.ts

@@ -26,7 +26,7 @@ export default class TaskStore {
 
   deleteTime(task: TaskModel, timeIndex: number) {
     if (!task.time[timeIndex].end) {
-      task.end();
+      task.stop();
     }
     task.time.splice(timeIndex, 1);
     this.tasksService.save(this.tasks);
@@ -74,22 +74,37 @@ export default class TaskStore {
   }
 
   delete(task: TaskModel) {
-    task.setDeleted();
+    function condition(_task: TaskModel) {
+      return _task.key === task.key;
+    }
+
+    if (task.active) {
+      this.stopTimer(task);
+    }
+
+    for (const projectKey in this.tasks) {
+      if (this.tasks.hasOwnProperty(projectKey)) {
+        this.tasks[projectKey] = TreeModelStoreHelper.deleteItems(
+          this.tasks[projectKey],
+          condition
+        );
+      }
+    }
     this.tasksService.save(this.tasks);
   }
 
   startTimer(task: TaskModel) {
     if (this.activeTask) {
-      this.endTimer(this.activeTask);
+      this.stopTimer(this.activeTask);
     }
     this.activeTask = task;
     task.start();
     this.tasksService.save(this.tasks);
   }
 
-  endTimer(task: TaskModel) {
+  stopTimer(task: TaskModel) {
     this.activeTask = undefined;
-    task.end();
+    task.stop();
     this.tasksService.save(this.tasks);
   }