Skip to content
This repository was archived by the owner on Dec 26, 2022. It is now read-only.

Commit 01820b9

Browse files
committed
Dont stop timer if remove another task
1 parent 8e09dd0 commit 01820b9

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

src/modules/RootStore.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export class RootStore {
2020
}
2121

2222
deleteProject(project: ProjectModel) {
23-
this.tasksStore.deleteProjectTasks(project.key);
23+
this.tasksStore.removeProjectTasks(project.key);
2424
this.projectStore.delete(project);
2525
}
2626
}

src/modules/tasks/TaskStore.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,14 @@ export default class TaskStore {
114114
);
115115
}
116116

117-
delete(task: TaskModel) {
117+
remove(task: TaskModel) {
118118
function condition(_task: TaskModel) {
119119
return _task.key === task.key;
120120
}
121121

122-
this.stopTimer();
122+
if (task.active) {
123+
this.stopTimer();
124+
}
123125

124126
for (const projectKey in this.tasks) {
125127
if (this.tasks.hasOwnProperty(projectKey)) {
@@ -134,7 +136,7 @@ export default class TaskStore {
134136
GaService.event(EEventCategory.Tasks, ETasksEvents.Delete);
135137
}
136138

137-
deleteProjectTasks(projectKey: string) {
139+
removeProjectTasks(projectKey: string) {
138140
delete this.tasks[projectKey];
139141
this.tasksService.save(this.tasks);
140142
this.updateVersion();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export default observer(function TaskNode({ task }: TaskNodeProps) {
6868
)}
6969
<Popconfirm
7070
title="Are you sure to delete this task?"
71-
onConfirm={stopPropagationAndRun(() => tasksStore.delete(task))}
71+
onConfirm={stopPropagationAndRun(() => tasksStore.remove(task))}
7272
onCancel={stopPropagation}
7373
okText="Yes"
7474
cancelText="No"

0 commit comments

Comments
 (0)