diff --git a/src/app/(authorized)/(note)/(list)/note-all-task/[taskId]/page.tsx b/src/app/(authorized)/(note)/(list)/note-all-task/[taskId]/page.tsx index 5e91c3f..193c5ea 100644 --- a/src/app/(authorized)/(note)/(list)/note-all-task/[taskId]/page.tsx +++ b/src/app/(authorized)/(note)/(list)/note-all-task/[taskId]/page.tsx @@ -23,7 +23,6 @@ export default function NoteDetailPage({ const tripTitle = data?.result?.tripTitle || ''; const notes = data?.result?.details || []; - // tasktitle을 detail 배열 안에만 내려줘서 이렇게 작성할 수 밖에 없습니다.. 수정필요 const taskTitle = data?.result?.taskTitle || ''; return ( diff --git a/src/model/task.model.ts b/src/model/task.model.ts index ab7ff08..08fffd6 100644 --- a/src/model/task.model.ts +++ b/src/model/task.model.ts @@ -20,6 +20,7 @@ export type TGetTaskResponse = { taskId: number; tripName: string; taskTitle: string; + ownerId: number; taskFilePath?: string; taskStatus: TTaskStatus; taskDDay: string; diff --git a/src/ui/card/taskCard/TaskItem.tsx b/src/ui/card/taskCard/TaskItem.tsx index 3824f5f..7ccc2c9 100644 --- a/src/ui/card/taskCard/TaskItem.tsx +++ b/src/ui/card/taskCard/TaskItem.tsx @@ -26,6 +26,7 @@ function TaskItem({ tripId, taskId, taskTitle, + ownerId, taskFilePath, taskStatus, taskDDay, @@ -139,6 +140,7 @@ function TaskItem({ {taskTitle} void; onDeleteTaskClick: () => void; registrantId: number; + ownerId: number; className?: string; taskAssignees: TTaskAssignee[]; } @@ -35,6 +36,7 @@ export default function ButtonIconGroup({ taskId, hasFilePath, onFileClick, + ownerId, taskAssignees, registrantId, onEditTaskClick, @@ -48,6 +50,7 @@ export default function ButtonIconGroup({ //오너 response로 받아서추가처리 const showDropdownMenu = + ownerId === user?.user.id || registrantId === user?.user.id || taskAssignees.some((assignee) => assignee.userId === user?.user.id); diff --git a/src/ui/trip/TripTask.tsx b/src/ui/trip/TripTask.tsx index e6332e2..c2ba155 100644 --- a/src/ui/trip/TripTask.tsx +++ b/src/ui/trip/TripTask.tsx @@ -23,7 +23,6 @@ export default function TripTask({ id }: TTripTaskProps) { }); const { data, isLoading } = useGetTasks(params); - const { showModal } = useModalStore(); const postTask = usePostTask(); const handleAddTaskClick = () => { @@ -43,7 +42,6 @@ export default function TripTask({ id }: TTripTaskProps) { }; return ( - //

Todo