fix(task-desc): can not update task's description

hudy9x · May 2, 2024 · cedff71 · cedff71
1 parent 6d1585c
commit cedff71
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 28 deletions.
diff --git a/packages/shared-ui/src/components/Controls/TextEditorControl/index.tsx b/packages/shared-ui/src/components/Controls/TextEditorControl/index.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
 import { useEditor, EditorContent, BubbleMenu } from '@tiptap/react'
 
 import StarterKit from '@tiptap/starter-kit'
@@ -35,15 +35,23 @@ export default function TextareaControl({
     content: val,
     editable: !disabled,
     onUpdate: ({ editor }) => {
+      if (disabled) return
       console.log('on update ')
-      onChange && !disabled && onChange(editor.getHTML())
+
+      const content = editor.getHTML()
+
+      onChange && onChange(content)
+      setValue(content)
     }
   })
 
   useEffect(() => {
-    // setValue(value)
-    // value && editor?.commands.setContent(value)
-  }, [value, editor])
+    // it should be run as prop change
+    if (value !== val) {
+      setValue(value)
+      value && editor?.commands.setContent(value)
+    }
+  }, [value, editor, val])
 
   useEffect(() => {
     editor && editor.setEditable(!disabled)

diff --git a/packages/ui-app/app/[orgID]/project/[projectId]/TaskUpdate2.tsx b/packages/ui-app/app/[orgID]/project/[projectId]/TaskUpdate2.tsx
@@ -23,9 +23,10 @@ function TaskUpdateModal({
     task: ITaskDefaultValues,
     visible: boolean,
     setVisible: () => void,
-    onSubmit: (v: ITaskDefaultValues) => void
+    onSubmit: (v: ITaskDefaultValues, cb: () => void) => void
   }) {
 
+  console.log(task.desc)
 
   return <Dialog.Root open={visible} onOpenChange={() => {
     setVisible()
@@ -65,8 +66,6 @@ function useTaskIdChange(fn: (id: string) => void) {
     const newUrl = new URL(window.location.toString())
     const taskId = newUrl.searchParams.get('taskId')
     if (taskId) {
-      console.log('FIRST TIME', taskId)
-      // setTaskId(taskId)
       fn(taskId)
     }
 
@@ -97,11 +96,9 @@ export const TaskUpdate2 = () => {
 
   const closeTheModal = () => {
     deleteState('taskId')
-    // closeTaskDetail()
-    // router.replace(`${orgID}/project/${projectId}?mode=${mode}`)
   }
 
-  const handleSubmit = (v: ITaskDefaultValues) => {
+  const handleSubmit = (v: ITaskDefaultValues, cb: () => void) => {
     if (!taskId) return
 
     const dataUpdate = {
@@ -122,13 +119,18 @@ export const TaskUpdate2 = () => {
     taskUpdate(dataUpdate)
       .then(res => {
         const { data, status } = res.data
-        if (status !== 200) return
+        if (status !== 200) {
+          cb()
+          return
+        }
 
         messageSuccess('Synced success !')
         syncRemoteTaskById(data.id, data as Task)
+        cb()
       })
       .catch(err => {
         messageError('Update new task error')
+        cb()
 
         if (!refCurrentTask.current) return
         // syncRemoteTaskById(refCurrentTask.current.id, refCurrentTask.current)

diff --git a/packages/ui-app/app/_features/TaskDetail/index.tsx b/packages/ui-app/app/_features/TaskDetail/index.tsx
@@ -67,7 +67,7 @@ interface ITaskFormProps {
   taskStatusId?: string
   dueDate?: Date
   defaultValue?: ITaskDefaultValues
-  onSubmit: (v: ITaskDefaultValues) => void
+  onSubmit: (v: ITaskDefaultValues, cb: () => void) => void
 }
 
 export default function TaskDetail({
@@ -114,7 +114,10 @@ export default function TaskDetail({
         return
       }
 
-      onSubmit(mergedValues)
+      onSubmit(mergedValues, () => {
+        console.log('called')
+      })
+      setLoading(false)
     }
   })
 
@@ -277,20 +280,6 @@ export default function TaskDetail({
               </div>
             </div>
           </div>
-          {/* <div className="task-info-item"> */}
-          {/*   <div className="task-info-label"> */}
-          {/*     <HiOutlineBattery50 /> <span>Progress</span> */}
-          {/*   </div> */}
-          {/*   <div className="task-info-content w-[230px] pl-3"> */}
-          {/*     <Form.Range */}
-          {/*       step={5} */}
-          {/*       value={formik.values.progress} */}
-          {/*       onChange={v => { */}
-          {/*         formik.setFieldValue('progress', v) */}
-          {/*       }} */}
-          {/*     /> */}
-          {/*   </div> */}
-          {/* </div> */}
           <div className="flex flex-col items-start pt-2">
             <div className="task-info-label">
               <GoTasklist /> <span>Checklist</span>