Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions components/modal/DeleteFolderModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ const DeleteFolderModal = ({
linkCount: number;
}) => {
const { closeModal } = useModalStore();
// let linkCount: number;
const handleSubmit = async () => {
// 폴더 내에 링크 개수 0 일때만 폴더 삭제 가능 -> 링크 1개 이상이면 error toast 띄우고 있음 or 전체 링크 삭제 후 폴더 삭제
if (!linkCount) {
toast.error(toastMessages.error.invalidLinkCount);

if (linkCount !== 0) {
toast.error(toastMessages.error.deleteNonEmptyFolder);
closeModal();
} else if (linkCount === 0) {
} else {
try {
await deleteFolder(folderId);
toast.success(toastMessages.success.deleteFolder);
Expand All @@ -30,9 +30,6 @@ const DeleteFolderModal = ({
} finally {
closeModal();
}
} else {
toast.error(toastMessages.error.deleteNonEmptyFolder);
closeModal();
}
};

Expand Down
8 changes: 4 additions & 4 deletions pages/api/folders/[folderId]/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,13 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
}

case "DELETE":
console.log("너 왔니?");
try {
await axiosInstance.delete(`/folders/${folderId}`, {
headers: {
Authorization: `Bearer ${token}`,
},
});
return res.status(204).json({ message: "폴더 삭제 성공" });
return res.status(204).end(); // 본문 제거
} catch (error) {
if (axios.isAxiosError(error)) {
console.error("Axios Error:", error); // 여기서 error 객체 전체를 확인
Expand All @@ -67,12 +66,13 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
const message =
error.response.data?.message || "알 수 없는 오류 발생";
console.error("Error Response Data:", error.response.data);
return res.status(status).json({ message: message });
res.status(status).json({ message: message });
return;
}
console.error("Unknown Error:", error); // Axios 오류가 아닌 경우
throw error;
}
return res.status(500).json({ message: "서버 오류 발생" });
res.status(500).json({ message: "서버 오류 발생" });
}
}
};
Expand Down
Loading