fix: fix TaskDetails being overwritten

helpwave · Aug 6, 2023 · 6c94e2a · 6c94e2a
1 parent d766370
commit 6c94e2a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tasks/components/layout/PatientDetails.tsx b/tasks/components/layout/PatientDetails.tsx
@@ -102,6 +102,8 @@ export const PatientDetail = ({
     return <div>Loading PatientDetails!</div>
   }
 
+  const isShowingTask = (!!taskID || taskID === '')
+
   return (
     <div className={tw('relative flex flex-col py-4 px-6')}>
       {isShowingSavedNotification &&
@@ -125,7 +127,7 @@ export const PatientDetail = ({
         confirmType="negative"
       />
       {/* taskID === '' is create and if set it's the tasks id */}
-      {(!!taskID || taskID === '') && (
+      {isShowingTask && (
         <TaskDetailModal
           isOpen={true}
           onBackgroundClick={() => setTaskID(undefined)}

diff --git a/tasks/components/layout/TaskDetailView.tsx b/tasks/components/layout/TaskDetailView.tsx
@@ -123,10 +123,10 @@ export const TaskDetailView = ({
   const deleteTaskMutation = useTaskDeleteMutation(onClose)
 
   useEffect(() => {
-    if (data) {
+    if (data && taskID) {
       setTask(data)
     }
-  }, [data])
+  }, [data, taskID])
 
   const {
     data: personalTaskTemplatesData,