Delete

Author: Dmitry Yadrikhinsky

src/base/CommonTypes.ts

@@ -19,7 +19,7 @@ export default abstract class TreeModelStoreHelper {
     return undefined;
   }
 
-  static getItemsRecursive<T extends ITreeItem<any>>(
+  static getFlatItemsRecursive<T extends ITreeItem<any>>(
     tasks: T[],
     condition: (task: T) => boolean,
     result: T[]
@@ -29,7 +29,7 @@ export default abstract class TreeModelStoreHelper {
         result.push(task);
       }
       if (Array.isArray(task.children)) {
-        this.getItemsRecursive(task.children, condition, result);
+        this.getFlatItemsRecursive(task.children, condition, result);
       }
     }
     return result;

src/base/TreeModelStoreHelper.ts

@@ -24,6 +24,7 @@ export default class TaskModel extends AbstractModel {
   time: Date[][] = [];
   datesInProgress: Date[] = [];
   details: string = '';
+  deleted: boolean = false;
 
   constructor(props: IJsonTaskModel) {
     super();
@@ -75,6 +76,10 @@ export default class TaskModel extends AbstractModel {
     this.checked = checked;
   }
 
+  setDeleted() {
+    this.deleted = true;
+  }
+
   start() {
     this.active = true;
     this.addDateWhenWasInProgress(new Date());

src/models/TaskModel.ts

@@ -30,7 +30,7 @@ export default function TaskNode({ model }: TaskNodeProps) {
         ) : (
           <PauseOutlined onClick={() => tasksStore.endTimer(model)} />
         )}
-        <DeleteOutlined />
+        <DeleteOutlined onClick={() => tasksStore.delete(model)} />
       </span>
     </div>
   );

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

@@ -45,7 +45,7 @@ export default class TaskStore {
     }
 
     for (const tasks of Object.values(this.tasks)) {
-      TreeModelStoreHelper.getItemsRecursive(tasks, condition, result);
+      TreeModelStoreHelper.getFlatItemsRecursive(tasks, condition, result);
     }
     return result;
   }
@@ -60,6 +60,11 @@ export default class TaskStore {
     this.tasksService.save(this.tasks);
   }
 
+  delete(task: TaskModel) {
+    task.setDeleted();
+    this.tasksService.save(this.tasks);
+  }
+
   startTimer(task: TaskModel) {
     if (this.activeTask) {
       this.endTimer(this.activeTask);
@@ -87,7 +92,7 @@ export default class TaskStore {
 
     if (Array.isArray(this.tasks[projectId])) {
       const found: TaskModel[] = [];
-      TreeModelStoreHelper.getItemsRecursive(
+      TreeModelStoreHelper.getFlatItemsRecursive(
         this.tasks[projectId],
         condition,
         found