Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
fix: parent folder creation
Marc Seitz7310016ada16
diff --git a/components/Sidebar.tsx b/components/Sidebar.tsxindex d4ab89e5..f7e30d67 100644--- a/components/Sidebar.tsx+++ b/components/Sidebar.tsx@@ -155,7 +155,7 @@ export const SidebarComponent = ({ className }: { className?: string }) => {<span>Add New Document</span></Button></AddDocumentModal>- <AddFolderModal path={(router.query.name as string[])?.join("/")}>+ <AddFolderModal><Buttonsize="icon"variant="outline"diff --git a/components/documents/add-folder-modal.tsx b/components/documents/add-folder-modal.tsxindex 3b608185..9639f13f 100644--- a/components/documents/add-folder-modal.tsx+++ b/components/documents/add-folder-modal.tsx@@ -18,20 +18,20 @@ import { usePlan } from "@/lib/swr/use-billing";import { useAnalytics } from "@/lib/analytics";import { mutate } from "swr";import { Folder } from "@prisma/client";+import { useRouter } from "next/router";export function AddFolderModal({// open,// setOpen,- path,onAddition,children,}: {// open?: boolean;// setOpen?: React.Dispatch<React.SetStateAction<boolean>>;- path?: string;onAddition?: (folderName: string) => void;children?: React.ReactNode;}) {+ const router = useRouter();const [folderName, setFolderName] = useState<string>("");const [loading, setLoading] = useState<boolean>(false);const [open, setOpen] = useState<boolean>(false);@@ -40,6 +40,9 @@ export function AddFolderModal({const { plan } = usePlan();const analytics = useAnalytics();+ /** current folder name */+ const currentFolderPath = router.query.name as string[] | undefined;+const handleSubmit = async (event: any) => {event.preventDefault();event.stopPropagation();@@ -58,7 +61,7 @@ export function AddFolderModal({},body: JSON.stringify({name: folderName,- path: path || "/",+ path: currentFolderPath?.join("/"),}),},);@@ -70,11 +73,15 @@ export function AddFolderModal({return;}+ const { parentFolderPath } = await response.json();+analytics.capture("Folder Added", { folderName: folderName });toast.success("Folder added successfully! 🎉");mutate(`/api/teams/${teamInfo?.currentTeam?.id}/folders`);- mutate(`/api/teams/${teamInfo?.currentTeam?.id}/folders/${path}`);+ mutate(+ `/api/teams/${teamInfo?.currentTeam?.id}/folders${parentFolderPath}`,+ );} catch (error) {setLoading(false);toast.error("Error adding folder. Please try again.");diff --git a/pages/api/teams/[teamId]/folders/index.ts b/pages/api/teams/[teamId]/folders/index.tsindex 1820a24b..c9973dab 100644--- a/pages/api/teams/[teamId]/folders/index.ts+++ b/pages/api/teams/[teamId]/folders/index.ts@@ -97,6 +97,12 @@ export default async function handle(const { teamId } = req.query as { teamId: string };const { name, path } = req.body as { name: string; path: string };+ const childFolderPath = path+ ? "/" + path + "/" + slugify(name)+ : "/" + slugify(name);++ const parentFolderPath = path ? "/" + path : "/";+try {// Check if the user is part of the teamconst team = await prisma.team.findUnique({@@ -118,7 +124,7 @@ export default async function handle(where: {teamId_path: {teamId: teamId,- path: "/" + path,+ path: parentFolderPath,},},select: {@@ -131,7 +137,7 @@ export default async function handle(const folder = await prisma.folder.create({data: {name: name,- path: "/" + path + "/" + slugify(name),+ path: childFolderPath,parentId: parentFolder?.id ?? null,teamId: teamId,},@@ -141,6 +147,7 @@ export default async function handle(...folder,documents: [],childFolders: [],+ parentFolderPath: parentFolderPath,};res.status(201).json(folderWithDocs);