Refactor folders pane's component and UI

frontend/app/projects/[projectId]/folders/FolderDialog.tsx

@@ -20,7 +20,7 @@ type Props = {
   onSubmit: (name: string, detail: string) => void;
 };
 
-export function FolderDialog({
+export default function FolderDialog({
   isOpen,
   editingFolder,
   onCancel,

frontend/app/projects/[projectId]/folders/FoldersPane.tsx

@@ -0,0 +1,150 @@
+"use client";
+import React from "react";
+import { FolderType } from "@/types/folder";
+import { useEffect, useState } from "react";
+import { Button, Listbox, ListboxItem } from "@nextui-org/react";
+import { Folder, Plus } from "lucide-react";
+import { useRouter, usePathname } from "next/navigation";
+import useGetCurrentIds from "@/utils/useGetCurrentIds";
+import FolderDialog from "./FolderDialog";
+import FolderEditMenu from "./FolderEditMenu";
+
+import {
+  fetchFolders,
+  createFolder,
+  updateFolder,
+  deleteFolder,
+} from "./foldersControl";
+
+type Props = {
+  projectId: string;
+};
+
+export default function FoldersPane({ projectId }: Props) {
+  const router = useRouter();
+  const pathname = usePathname();
+  const [folders, setFolders] = useState([]);
+  const [selectedFolder, setSelectedFolder] = useState<FolderType>({});
+
+  const { folderId } = useGetCurrentIds();
+
+  const [isFolderDialogOpen, setIsFolderDialogOpen] = useState(false);
+  const [editingFolder, setEditingProject] = useState<FolderType | null>(null);
+
+  const openDialogForCreate = () => {
+    setIsFolderDialogOpen(true);
+    setEditingProject(null);
+  };
+
+  const closeDialog = () => {
+    setIsFolderDialogOpen(false);
+    setEditingProject(null);
+  };
+
+  const onSubmit = async (name: string, detail: string) => {
+    if (editingFolder) {
+      const updatedProject = await updateFolder(
+        editingFolder.id,
+        name,
+        detail,
+        projectId,
+        null
+      );
+      const updatedProjects = folders.map((project) =>
+        project.id === updatedProject.id ? updatedProject : project
+      );
+      setFolders(updatedProjects);
+    } else {
+      const newProject = await createFolder(name, detail, projectId, null);
+      setFolders([...folders, newProject]);
+    }
+    closeDialog();
+  };
+
+  const onEditClick = (folder: FolderType) => {
+    setEditingProject(folder);
+    setIsFolderDialogOpen(true);
+  };
+
+  const onDeleteClick = async (folderId: number) => {
+    await deleteFolder(folderId);
+    router.push(`/projects/${projectId}/folders`);
+  };
+
+  useEffect(() => {
+    async function fetchDataEffect() {
+      try {
+        const data = await fetchFolders(projectId);
+        setFolders(data);
+
+        const selectedFolderFromUrl = data.find(
+          (folder) => folder.id === folderId
+        );
+        setSelectedFolder(selectedFolderFromUrl);
+
+        // Redirect to the smallest folder ID page if the path is "projects/[projectId]/folders
+        if (pathname === `/projects/${projectId}/folders`) {
+          const smallestFolderId = Math.min(...data.map((folder) => folder.id));
+          router.push(
+            `/projects/${projectId}/folders/${smallestFolderId}/cases`
+          );
+        }
+      } catch (error) {
+        console.error("Error in effect:", error.message);
+      }
+    }
+
+    fetchDataEffect();
+  }, [folderId]);
+
+  const baseClass = "px-3 py-2 rounded-none";
+  const selectedClass = `${baseClass} bg-neutral-200 dark:bg-neutral-700`;
+
+  return (
+    <>
+      <div className="w-64 min-h-[calc(100vh-64px)] border-r-1 dark:border-neutral-700">
+        <Button
+          startContent={<Plus size={16} />}
+          size="sm"
+          variant="bordered"
+          className="m-2"
+          onClick={openDialogForCreate}
+        >
+          New Folder
+        </Button>
+        <Listbox aria-label="Listbox Variants" variant="light" className="p-0">
+          {folders.map((folder, index) => (
+            <ListboxItem
+              key={index}
+              onClick={() =>
+                router.push(`/projects/${projectId}/folders/${folder.id}/cases`)
+              }
+              startContent={<Folder size={20} color="#F7C24E" fill="#F7C24E" />}
+              className={
+                selectedFolder && folder.id === selectedFolder.id
+                  ? selectedClass
+                  : baseClass
+              }
+              endContent={
+                <FolderEditMenu
+                  folder={folder}
+                  onEditClick={onEditClick}
+                  onDeleteClick={onDeleteClick}
+                />
+              }
+            >
+              {folder.name}
+            </ListboxItem>
+          ))}
+        </Listbox>
+      </div>
+
+      <FolderDialog
+        isOpen={isFolderDialogOpen}
+        editingFolder={editingFolder}
+        onCancel={closeDialog}
+        onSubmit={onSubmit}
+      />
+    </>
+  );
+}

frontend/app/projects/[projectId]/folders/foldersControl.ts

@@ -0,0 +1,131 @@
+import Config from "@/config/config";
+const apiServer = Config.apiServer;
+
+/**
+ * fetch folder records
+ */
+async function fetchFolders(projectId: string) {
+  try {
+    const url = `${apiServer}/folders?projectId=${projectId}`;
+    const response = await fetch(url, {
+      method: "GET",
+      headers: {
+        "Content-Type": "application/json",
+      },
+    });
+
+    if (!response.ok) {
+      throw new Error(`HTTP error! Status: ${response.status}`);
+    }
+
+    const data = await response.json();
+    return data;
+  } catch (error) {
+    console.error("Error fetching data:", error.message);
+  }
+}
+
+/**
+ * Create project
+ */
+async function createFolder(
+  name: string,
+  detail: string,
+  projectId: strting,
+  parentFolderId: number
+) {
+  const newFolderData = {
+    name: name,
+    detail: detail,
+    projectId: projectId,
+    parentFolderId: parentFolderId,
+  };
+
+  const fetchOptions = {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify(newFolderData),
+  };
+
+  const url = `${apiServer}/folders`;
+
+  try {
+    const response = await fetch(url, fetchOptions);
+    if (!response.ok) {
+      throw new Error(`HTTP error! Status: ${response.status}`);
+    }
+    const data = await response.json();
+    return data;
+  } catch (error) {
+    console.error("Error creating new project:", error);
+    throw error;
+  }
+}
+
+/**
+ * Update folder
+ */
+async function updateFolder(
+  folderId: number,
+  name: string,
+  detail: string,
+  projectId: string,
+  parentFolderId: number
+) {
+  const updateFolderData = {
+    name: name,
+    detail: detail,
+    projectId: projectId,
+    parentFolderId: parentFolderId,
+  };
+
+  const fetchOptions = {
+    method: "PUT",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify(updateFolderData),
+  };
+
+  const url = `${apiServer}/folders/${folderId}`;
+
+  try {
+    const response = await fetch(url, fetchOptions);
+    if (!response.ok) {
+      throw new Error(`HTTP error! Status: ${response.status}`);
+    }
+    const data = await response.json();
+    return data;
+  } catch (error) {
+    console.error("Error updating project:", error);
+    throw error;
+  }
+}
+
+/**
+ * Delete folder
+ */
+async function deleteFolder(folderId: number) {
+  const fetchOptions = {
+    method: "DELETE",
+    headers: {
+      "Content-Type": "application/json",
+    },
+  };
+
+  const url = `${apiServer}/folders/${folderId}`;
+
+  try {
+    const response = await fetch(url, fetchOptions);
+    if (!response.ok) {
+      throw new Error(`HTTP error! Status: ${response.status}`);
+    }
+  } catch (error) {
+    console.error("Error deleting project:", error);
+    throw error;
+  }
+}
+
+export { fetchFolders, createFolder, updateFolder, deleteFolder };

frontend/app/projects/[projectId]/folders/layout.tsx

@@ -1,13 +1,8 @@
 "use client";
 import { useEffect, useState } from "react";
-import Config from "@/config/config";
-const apiServer = Config.apiServer;
-import { Button, Listbox, ListboxItem } from "@nextui-org/react";
-import { Folder, Plus } from "lucide-react";
-import { FolderDialog } from "./folder-dialog";
-import FolderEditMenu from "./folder-edit-menu";
 import { useRouter, usePathname } from "next/navigation";
 import useGetCurrentIds from "@/utils/useGetCurrentIds";
+import FoldersPane from "./FoldersPane";
 
 export type FolderType = {
   id: number;
@@ -19,140 +14,12 @@ export type FolderType = {
   updatedAt: string;
 };
 
-/**
- * fetch folder records
- */
-async function fetchFolders(projectId: string) {
-  // console.log("fetch folders", url)
-  try {
-    const url = `${apiServer}/folders?projectId=${projectId}`;
-    const response = await fetch(url, {
-      method: "GET",
-      headers: {
-        "Content-Type": "application/json",
-      },
-    });
-
-    if (!response.ok) {
-      throw new Error(`HTTP error! Status: ${response.status}`);
-    }
-
-    const data = await response.json();
-    return data;
-  } catch (error) {
-    console.error("Error fetching data:", error.message);
-  }
-}
-
-/**
- * Create project
- */
-async function createFolder(
-  name: string,
-  detail: string,
-  projectId: number,
-  parentFolderId: number
-) {
-  const newFolderData = {
-    name: name,
-    detail: detail,
-    projectId: projectId,
-    parentFolderId: parentFolderId,
-  };
-
-  const fetchOptions = {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify(newFolderData),
-  };
-
-  const url = `${apiServer}/folders`;
-
-  try {
-    const response = await fetch(url, fetchOptions);
-    if (!response.ok) {
-      throw new Error(`HTTP error! Status: ${response.status}`);
-    }
-    const data = await response.json();
-    return data;
-  } catch (error) {
-    console.error("Error creating new project:", error);
-    throw error;
-  }
-}
-
-/**
- * Update folder
- */
-async function updateFolder(
-  folderId: number,
-  name: string,
-  detail: string,
-  projectId: number,
-  parentFolderId: number
-) {
-  const updateFolderData = {
-    name: name,
-    detail: detail,
-    projectId: projectId,
-    parentFolderId: parentFolderId,
-  };
-
-  const fetchOptions = {
-    method: "PUT",
-    headers: {
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify(updateFolderData),
-  };
-
-  const url = `${apiServer}/folders/${folderId}`;
-
-  try {
-    const response = await fetch(url, fetchOptions);
-    if (!response.ok) {
-      throw new Error(`HTTP error! Status: ${response.status}`);
-    }
-    const data = await response.json();
-    return data;
-  } catch (error) {
-    console.error("Error updating project:", error);
-    throw error;
-  }
-}
-
-/**
- * Delete folder
- */
-async function deleteFolder(folderId: number) {
-  const fetchOptions = {
-    method: "DELETE",
-    headers: {
-      "Content-Type": "application/json",
-    },
-  };
-
-  const url = `${apiServer}/folders/${folderId}`;
-
-  try {
-    const response = await fetch(url, fetchOptions);
-    if (!response.ok) {
-      throw new Error(`HTTP error! Status: ${response.status}`);
-    }
-  } catch (error) {
-    console.error("Error deleting project:", error);
-    throw error;
-  }
-}
-
 export default function FoldersLayout({
   children,
   params,
 }: {
   children: React.ReactNode;
-  params: { projectId: number };
+  params: { projectId: string };
 }) {
   const router = useRouter();
   const pathname = usePathname();
@@ -235,57 +102,10 @@ export default function FoldersLayout({
     fetchDataEffect();
   }, [folderId]);
 
-  const baseClass = "px-3 py-2 rounded-none";
-  const selectedClass = `${baseClass} bg-neutral-200 dark:bg-neutral-700`;
-
   return (
     <div className="flex w-full">
-      <div className="w-64 min-h-[calc(100vh-64px)] border-r-1 dark:border-neutral-700">
-        <Button
-          startContent={<Plus size={16} />}
-          size="sm"
-          variant="bordered"
-          className="m-2"
-          onClick={openDialogForCreate}
-        >
-          New Folder
-        </Button>
-        <Listbox aria-label="Listbox Variants" variant="light" className="p-0">
-          {folders.map((folder, index) => (
-            <ListboxItem
-              key={index}
-              onClick={() =>
-                router.push(
-                  `/projects/${params.projectId}/folders/${folder.id}/cases`
-                )
-              }
-              startContent={<Folder size={20} color="#F7C24E" fill="#F7C24E" />}
-              className={
-                selectedFolder && folder.id === selectedFolder.id
-                  ? selectedClass
-                  : baseClass
-              }
-              endContent={
-                <FolderEditMenu
-                  folder={folder}
-                  onEditClick={onEditClick}
-                  onDeleteClick={onDeleteClick}
-                />
-              }
-            >
-              {folder.name}
-            </ListboxItem>
-          ))}
-        </Listbox>
-      </div>
+      <FoldersPane projectId={params.projectId}/>
       <div className="flex-grow w-full">{children}</div>
-
-      <FolderDialog
-        isOpen={isFolderDialogOpen}
-        editingFolder={editingFolder}
-        onCancel={closeDialog}
-        onSubmit={onSubmit}
-      />
     </div>
   );
 }

frontend/types/folder.ts

@@ -0,0 +1,9 @@
+export type FolderType = {
+  id: number;
+  name: string;
+  detail: string;
+  projectId: number;
+  parentFolderId: number | null;
+  createdAt: string;
+  updatedAt: string;
+};