From ae07e9629bd86660b70a81cec740feabe9511b61 Mon Sep 17 00:00:00 2001 From: Pramod Mahajan Date: Tue, 8 Jul 2025 13:33:43 +0530 Subject: [PATCH] reset default correct activity for edit Task --- .../Project/Infrastructure/EditActivityModal.jsx | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/components/Project/Infrastructure/EditActivityModal.jsx b/src/components/Project/Infrastructure/EditActivityModal.jsx index e20abe0d..06a6e41e 100644 --- a/src/components/Project/Infrastructure/EditActivityModal.jsx +++ b/src/components/Project/Infrastructure/EditActivityModal.jsx @@ -63,7 +63,9 @@ const { mutate: UpdateTask, isPending } = useManageTask({ showToast( response?.message, "success" ) onClose() } -}); +} ); + + const activityID = watch("activityID"); @@ -82,13 +84,13 @@ const { mutate: UpdateTask, isPending } = useManageTask({ useEffect(() => { if (!workItem) return; - + console.log(workItem) reset({ activityID: String( - workItem?.workItem?.activityId || workItem?.activityId + workItem?.workItem?.activityId || workItem?.activityMaster?.id ), workCategoryId: String( - workItem?.workItem?.workCategoryId || workItem?.workCategoryId || "" + workItem?.workItem?.workCategoryId || workItem?.workCategoryMaster?.id ), plannedWork: workItem?.workItem?.plannedWork || workItem?.plannedWork || 0, @@ -99,9 +101,10 @@ useEffect(() => { }, [workItem?.id,selectedActivity]); + useEffect(() => { const selected = activities?.find((a) => a.id === activityID); - setSelectedActivity(selected || null); + setSelectedActivity( selected || null ); }, [activityID, activities]); const onSubmitForm = (data) =>