Remark

2026-07-11 12:22:15 +03:30
parent c4150ab8ac
commit ee8da0b88c
7 changed files with 104 additions and 22 deletions
@@ -33,8 +33,14 @@ const TaskDetailModal: FC<Props> = ({ open, task, statusLabel, onClose }) => {
  const updateTask = useUpdateTask();
  const deleteTask = useDeleteTask();

-  const taskDetail: TaskDetailType | undefined =
-    getTaskDetail.data?.data?.task ?? getTaskDetail.data?.data;
+  const rawTaskDetail = getTaskDetail.data?.data?.task ?? getTaskDetail.data?.data;
+  const taskDetail: TaskDetailType | undefined = rawTaskDetail
+    ? {
+        ...rawTaskDetail,
+        id: rawTaskDetail.id ?? task?.id ?? "",
+        labels: rawTaskDetail.labels ?? rawTaskDetail.remarks,
+      }
+    : undefined;

  useEffect(() => {
    if (!open) {
@@ -128,7 +134,12 @@ const TaskDetailModal: FC<Props> = ({ open, task, statusLabel, onClose }) => {
          />

          <div className="mt-4">
-            <TaskDetailToolbar activeTab={activeTab} onTabChange={handleTabChange} taskDetail={taskDetail} />
+            <TaskDetailToolbar
+              activeTab={activeTab}
+              onTabChange={handleTabChange}
+              taskDetail={taskDetail}
+              taskId={task.id}
+            />
          </div>

          <TaskDetailDescription