Skip to content

Commit 343bd20

Browse files
committed
Fix task deletion and update task state
1 parent 72773d0 commit 343bd20

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

src/components/ui/TaskItem.tsx

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export default function TaskItem({ task }: { task: task }) {
1414
const setActiveCategoryTasks = useSetRecoilState(activeCategoryTasksState)
1515
const setToastMessage = useSetRecoilState(messageState)
1616
const [deleteIsClicked, setDeleteIsClicked] = useState(false)
17+
1718

1819

1920
const handleTaskCheck = (task: task) => {
@@ -34,16 +35,27 @@ export default function TaskItem({ task }: { task: task }) {
3435
const handleTaskDelete = (task: task) => {
3536
setDeleteIsClicked(true)
3637
Taskobject.deleteTask(task, taskCategoryList[activeTaskCategory].id).then((d) => {
37-
if(!d) return console.log('task deleted')
38+
if(d == null) throw new Error("Task not deleted")
3839
Taskobject.getTasksByCategoryPosition(activeTaskCategory).then(() => {
3940
setActiveCategoryTasks(active => {
4041
return active.filter((t) => {
4142
if (t.id != task.id) return t
4243
})
4344
})
4445
})
45-
}).finally(() => {
46+
}).then(() => {
4647
Taskobject.clearPositionCache(activeTaskCategory)
48+
setToastMessage({
49+
title: "Task Deleted",
50+
type : "warning",
51+
})
52+
}).catch((err) => {
53+
setToastMessage({
54+
title: "Error",
55+
body:(err as Error).message,
56+
type : "warning",
57+
})
58+
}).finally(() => {
4759
setDeleteIsClicked(false)
4860
})
4961
}

src/components/ui/TaskList.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { useRecoilValue } from "recoil"
2-
import { activeCategoryTasksSelector } from "../../config/states"
2+
import { activeCategoryTasksSelector, activeCategoryTasksState } from "../../config/states"
33
import { task } from "../../types/taskapi"
44
import TaskItem from "./TaskItem"
55
import { Accordion, AccordionButton, AccordionIcon, AccordionItem, AccordionPanel, Box, Center } from "@chakra-ui/react"
66

77
export default function TaskList() {
8-
const activeCategoryTasks = useRecoilValue<task[]>(activeCategoryTasksSelector)
8+
const activeCategoryTasks = useRecoilValue<task[]>(activeCategoryTasksState)
99

1010
const unCompletedTasks = activeCategoryTasks.filter(task => !task.completed)
1111
const CompletedTasks = activeCategoryTasks.filter(task => task.completed)

0 commit comments

Comments
 (0)