@@ -38,7 +38,7 @@ const TaskDetailModal: FC<Props> = ({ open, task, columns, projectId, onClose, o
|
||||
const changeTaskPhase = useChangeTaskPhase();
|
||||
const deleteTask = useDeleteTask();
|
||||
|
||||
const rawTaskDetail = getTaskDetail.data?.data?.task ?? getTaskDetail.data?.data;
|
||||
const rawTaskDetail = getTaskDetail.data?.data;
|
||||
const taskDetail: TaskDetailType | undefined = rawTaskDetail
|
||||
? {
|
||||
...rawTaskDetail,
|
||||
|
||||
@@ -13,6 +13,8 @@ import TaskDetailActionBar from "./TaskDetailActionBar";
|
||||
import TaskDetailMetadataPreview from "./TaskDetailMetadataPreview";
|
||||
import type { TaskDetailTab } from "./types";
|
||||
import TaskDetailUsersPopover from "./users/TaskDetailUsersPopover";
|
||||
import type { TaskUser } from "./users/types";
|
||||
import type { UserItemType } from "../../../users/types/UserTypes";
|
||||
import type { TaskDetailType } from "../../task/types/TaskTypes";
|
||||
import { useCreateCheckListItem, useCreateTaskAttachment, useCreateTaskRemark, useUpdateTask } from "../../task/hooks/useTaskData";
|
||||
import { useSingleUpload } from "../../../service/hooks/useServiceData";
|
||||
@@ -64,18 +66,18 @@ const TaskDetailToolbar: FC<Props> = ({ activeTab, onTabChange, taskDetail, task
|
||||
}, [taskDetail]);
|
||||
|
||||
const selectedLabels = labels.filter((label) => selectedLabelIds.has(label.id));
|
||||
const users = useMemo(() => {
|
||||
const apiUsers =
|
||||
getUsers.data?.data?.users?.map((user) => ({
|
||||
const users = useMemo((): TaskUser[] => {
|
||||
const apiUsers: TaskUser[] =
|
||||
getUsers.data?.data?.users?.map((user: UserItemType) => ({
|
||||
id: user.id,
|
||||
name: `${user.firstName} ${user.lastName}`.trim(),
|
||||
})) ?? [];
|
||||
const taskUsers =
|
||||
const taskUsers: TaskUser[] =
|
||||
taskDetail?.users?.map((user) => ({
|
||||
id: user.id,
|
||||
name: `${user.firstName} ${user.lastName}`.trim(),
|
||||
})) ?? [];
|
||||
const userMap = new Map(apiUsers.map((user) => [user.id, user]));
|
||||
const userMap = new Map<string, TaskUser>(apiUsers.map((user) => [user.id, user]));
|
||||
|
||||
taskUsers.forEach((user) => {
|
||||
if (!userMap.has(user.id)) {
|
||||
@@ -160,10 +162,7 @@ const TaskDetailToolbar: FC<Props> = ({ activeTab, onTabChange, taskDetail, task
|
||||
{ title, color, taskId: effectiveTaskId },
|
||||
{
|
||||
onSuccess: (response) => {
|
||||
const remark =
|
||||
response.data?.remark ??
|
||||
(response as { remark?: TaskLabel }).remark ??
|
||||
(response.data as TaskLabel | undefined);
|
||||
const remark = response.data?.remark;
|
||||
if (remark?.id) {
|
||||
const newLabel: TaskLabel = {
|
||||
id: remark.id,
|
||||
|
||||
Reference in New Issue
Block a user