Skip to content

Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.

Fix: Prevent duplicate folder creation in All Documents

Ashish Viradiya9117d6f75e34
diff --git a/lib/folders/create-folder.ts b/lib/folders/create-folder.ts
index f84353dc..e1a257ab 100644
--- a/lib/folders/create-folder.ts
+++ b/lib/folders/create-folder.ts
@@ -12,6 +12,7 @@ export function isSystemFile(name: string): boolean {
interface CreateFolderResponse {
path: string;
parentFolderPath?: string;
+ name: string;
}
export async function createFolderInDataroom({
@@ -93,11 +94,20 @@ export async function createFolderInBoth({
analytics: any;
}): Promise<{ dataroomPath: string; mainDocsPath: string }> {
try {
- const [dataroomResponse, mainDocsResponse] = await Promise.all([
- createFolderInDataroom({ teamId, dataroomId, name, path }),
- createFolderInMainDocs({ teamId, name, path }),
- ]);
+ const dataroomResponse = await createFolderInDataroom({ teamId, dataroomId, name, path });
+
+ const pathSegments = dataroomResponse.path.split('/').filter(Boolean);
+ const parentPath = pathSegments.length > 1
+ ? pathSegments.slice(0, -1).join('/')
+ : undefined;
+
+ const mainDocsResponse = await createFolderInMainDocs({
+ teamId,
+ name: dataroomResponse.name,
+ path: parentPath
+ });
+ console.log("mainDocsResponse", dataroomResponse.path, mainDocsResponse.path);
// Track analytics
analytics.capture("Folder Added in dataroom", {
folderName: name,
diff --git a/pages/api/teams/[teamId]/datarooms/[id]/folders/index.ts b/pages/api/teams/[teamId]/datarooms/[id]/folders/index.ts
index 79d29e5b..e32fb1bc 100644
--- a/pages/api/teams/[teamId]/datarooms/[id]/folders/index.ts
+++ b/pages/api/teams/[teamId]/datarooms/[id]/folders/index.ts
@@ -206,10 +206,6 @@ export default async function handle(
const { name, path } = req.body as { name: string; path?: string };
- // const childFolderPath = path
- // ? "/" + path + "/" + slugify(name)
- // : "/" + slugify(name);
-
const parentFolderPath = path ? "/" + path : "/";
try {
@@ -248,9 +244,12 @@ export default async function handle(
let counter = 1;
const MAX_RETRIES = 50;
- let childFolderPath = path
- ? "/" + path + "/" + slugify(folderName)
- : "/" + slugify(folderName);
+ // Split path into segments
+ // Slugify the final folder name
+ const pathSegments = path ? path.split('/').filter(Boolean) : [];
+ const basePath = pathSegments.length > 0 ? '/' + pathSegments.join('/') + '/' : '/';
+
+ let childFolderPath = basePath + slugify(folderName);
while (counter <= MAX_RETRIES) {
const existingFolder = await prisma.dataroomFolder.findUnique({
@@ -263,9 +262,7 @@ export default async function handle(
});
if (!existingFolder) break;
folderName = `${name} (${counter})`;
- childFolderPath = path
- ? "/" + path + "/" + slugify(folderName)
- : "/" + slugify(folderName);
+ childFolderPath = basePath + slugify(folderName);
counter++;
}
diff --git a/pages/api/teams/[teamId]/folders/index.ts b/pages/api/teams/[teamId]/folders/index.ts
index 1d820fa7..93af3533 100644
--- a/pages/api/teams/[teamId]/folders/index.ts
+++ b/pages/api/teams/[teamId]/folders/index.ts
@@ -105,10 +105,6 @@ 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 {