From 73fae0d9245b81a7f48c87f02e05cfc4a7c5da15 Mon Sep 17 00:00:00 2001
From: Takeshi Kimata <117462761+kimatata@users.noreply.github.com>
Date: Sat, 24 Feb 2024 10:40:39 +0900
Subject: [PATCH] folder control

---
 .../projects/[projectId]/folders/folder-edit-menu.tsx  |  7 +------
 frontend/app/projects/[projectId]/folders/layout.tsx   | 10 +++++++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/frontend/app/projects/[projectId]/folders/folder-edit-menu.tsx b/frontend/app/projects/[projectId]/folders/folder-edit-menu.tsx
index b530627..79d1aec 100644
--- a/frontend/app/projects/[projectId]/folders/folder-edit-menu.tsx
+++ b/frontend/app/projects/[projectId]/folders/folder-edit-menu.tsx
@@ -6,13 +6,8 @@ import {
   DropdownItem,
 } from "@nextui-org/react";
 import { MoreVertical } from "lucide-react";
-import { FolderType } from "./layout";
 
-export default function FolderEditMenu(
-  folder: FolderType,
-  onEditClick: (folder: FolderType) => void,
-  onDeleteClick: (folderId: number) => void
-) {
+export default function FolderEditMenu({ folder, onEditClick, onDeleteClick }) {
   return (
     <Dropdown>
       <DropdownTrigger>
diff --git a/frontend/app/projects/[projectId]/folders/layout.tsx b/frontend/app/projects/[projectId]/folders/layout.tsx
index 068a14b..ccef211 100644
--- a/frontend/app/projects/[projectId]/folders/layout.tsx
+++ b/frontend/app/projects/[projectId]/folders/layout.tsx
@@ -156,6 +156,7 @@ export default function FoldersLayout({
   children: React.ReactNode;
   params: { projectId: number };
 }) {
+  const router = useRouter();
   const [folders, setFolders] = useState([]);
   const [selectedFolder, setSelectedFolder] = useState<FolderType>({});
 
@@ -205,6 +206,11 @@ export default function FoldersLayout({
     setIsFolderDialogOpen(true);
   };
 
+  const onDeleteClick = async (folderId: number) => {
+    await deleteFolder(folderId);
+    router.push(`/projects/${params.projectId}/folders`);
+  };
+
   useEffect(() => {
     async function fetchDataEffect() {
       try {
@@ -223,7 +229,6 @@ export default function FoldersLayout({
     fetchDataEffect();
   }, [folderId]);
 
-  const router = useRouter();
   return (
     <div className="flex w-full">
       <div className="w-64 min-h-screen border-r-1">
@@ -253,10 +258,9 @@ export default function FoldersLayout({
               }
               endContent={
                 <FolderEditMenu
-                  key={index}
                   folder={folder}
                   onEditClick={onEditClick}
-                  onDeleteClick={() => console.log("TODO")}
+                  onDeleteClick={onDeleteClick}
                 />
               }
             >