Skip to content

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

feat: change name if name already exists in all documents or data room of toplevel folder

Marc Seitz3128b21629ee
diff --git a/lib/folders/create-folder.ts b/lib/folders/create-folder.ts
index 036c86ab..f84353dc 100644
--- a/lib/folders/create-folder.ts
+++ b/lib/folders/create-folder.ts
@@ -1,119 +1,128 @@
import { mutate } from "swr";
+
import { SYSTEM_FILES } from "../constants";
export function isSystemFile(name: string): boolean {
- return SYSTEM_FILES.includes(name) || name.startsWith('.');
+ return (
+ SYSTEM_FILES.includes(name.toLowerCase()) ||
+ name.toLowerCase().startsWith(".")
+ );
}
interface CreateFolderResponse {
- path: string;
- parentFolderPath?: string;
+ path: string;
+ parentFolderPath?: string;
}
export async function createFolderInDataroom({
- teamId,
- dataroomId,
- name,
- path,
+ teamId,
+ dataroomId,
+ name,
+ path,
}: {
- teamId: string;
- dataroomId: string;
- name: string;
- path?: string;
+ teamId: string;
+ dataroomId: string;
+ name: string;
+ path?: string;
}): Promise<CreateFolderResponse> {
- const response = await fetch(
- `/api/teams/${teamId}/datarooms/${dataroomId}/folders`,
- {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- body: JSON.stringify({
- name,
- path,
- }),
- },
- );
+ const response = await fetch(
+ `/api/teams/${teamId}/datarooms/${dataroomId}/folders`,
+ {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ body: JSON.stringify({
+ name,
+ path,
+ }),
+ },
+ );
- if (!response.ok) {
- const error = await response.json();
- throw new Error(error.message || "Failed to create folder in dataroom");
- }
+ if (!response.ok) {
+ const error = await response.json();
+ throw new Error(error.message || "Failed to create folder in dataroom");
+ }
- return response.json();
+ return response.json();
}
export async function createFolderInMainDocs({
- teamId,
- name,
- path,
+ teamId,
+ name,
+ path,
}: {
- teamId: string;
- name: string;
- path?: string;
+ teamId: string;
+ name: string;
+ path?: string;
}): Promise<CreateFolderResponse> {
- const response = await fetch(`/api/teams/${teamId}/folders`, {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- body: JSON.stringify({
- name,
- path,
- }),
- });
+ const response = await fetch(`/api/teams/${teamId}/folders`, {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ body: JSON.stringify({
+ name,
+ path,
+ }),
+ });
- if (!response.ok) {
- const error = await response.json();
- throw new Error(error.message || "Failed to create folder in main documents");
- }
+ if (!response.ok) {
+ const error = await response.json();
+ throw new Error(
+ error.message || "Failed to create folder in all documents",
+ );
+ }
- return response.json();
+ return response.json();
}
export async function createFolderInBoth({
- teamId,
- dataroomId,
- name,
- path,
- setRejectedFiles,
- analytics,
+ teamId,
+ dataroomId,
+ name,
+ path,
+ setRejectedFiles,
+ analytics,
}: {
- teamId: string;
- dataroomId: string;
- name: string;
- path?: string;
- setRejectedFiles: (files: { fileName: string; message: string }[]) => void;
- analytics: any;
+ teamId: string;
+ dataroomId: string;
+ name: string;
+ path?: string;
+ setRejectedFiles: (files: { fileName: string; message: string }[]) => void;
+ analytics: any;
}): Promise<{ dataroomPath: string; mainDocsPath: string }> {
- try {
- const [dataroomResponse, mainDocsResponse] = await Promise.all([
- createFolderInDataroom({ teamId, dataroomId, name, path }),
- createFolderInMainDocs({ teamId, name, path }),
- ]);
+ try {
+ const [dataroomResponse, mainDocsResponse] = await Promise.all([
+ createFolderInDataroom({ teamId, dataroomId, name, path }),
+ createFolderInMainDocs({ teamId, name, path }),
+ ]);
- // Track analytics
- analytics.capture("Folder Added in dataroom", {
- folderName: name,
- });
+ // Track analytics
+ analytics.capture("Folder Added in dataroom", {
+ folderName: name,
+ });
- // Mutate dataroom folders
- mutate(`/api/teams/${teamId}/datarooms/${dataroomId}/folders?root=true`);
- mutate(`/api/teams/${teamId}/datarooms/${dataroomId}/folders`);
- mutate(`/api/teams/${teamId}/datarooms/${dataroomId}/folders/${dataroomResponse.path}`);
+ // Mutate dataroom folders
+ mutate(`/api/teams/${teamId}/datarooms/${dataroomId}/folders?root=true`);
+ mutate(`/api/teams/${teamId}/datarooms/${dataroomId}/folders`);
+ mutate(
+ `/api/teams/${teamId}/datarooms/${dataroomId}/folders/${dataroomResponse.path}`,
+ );
- return {
- dataroomPath: dataroomResponse.path,
- mainDocsPath: mainDocsResponse.path,
- };
- } catch (error) {
- console.error("An error occurred while creating the folder: ", error);
- setRejectedFiles([
- {
- fileName: name,
- message: error instanceof Error ? error.message : "Failed to create folder",
- },
- ]);
- throw error;
- }
-}
\ No newline at end of file
+ return {
+ dataroomPath: dataroomResponse.path,
+ mainDocsPath: mainDocsResponse.path,
+ };
+ } catch (error) {
+ console.error("An error occurred while creating the folder: ", error);
+ setRejectedFiles([
+ {
+ fileName: name,
+ message:
+ error instanceof Error ? error.message : "Failed to create folder",
+ },
+ ]);
+ throw error;
+ }
+}
diff --git a/pages/api/teams/[teamId]/datarooms/[id]/folders/index.ts b/pages/api/teams/[teamId]/datarooms/[id]/folders/index.ts
index 1d406f5f..80358927 100644
--- a/pages/api/teams/[teamId]/datarooms/[id]/folders/index.ts
+++ b/pages/api/teams/[teamId]/datarooms/[id]/folders/index.ts
@@ -206,9 +206,9 @@ export default async function handle(
const { name, path } = req.body as { name: string; path?: string };
- const childFolderPath = path
- ? "/" + path + "/" + slugify(name)
- : "/" + slugify(name);
+ // const childFolderPath = path
+ // ? "/" + path + "/" + slugify(name)
+ // : "/" + slugify(name);
const parentFolderPath = path ? "/" + path : "/";
@@ -243,9 +243,34 @@ export default async function handle(
},
});
+ // Duplicate name handling
+ let folderName = name;
+ let counter = 1;
+
+ let childFolderPath = path
+ ? "/" + path + "/" + slugify(folderName)
+ : "/" + slugify(folderName);
+
+ while (true) {
+ const existingFolder = await prisma.dataroomFolder.findUnique({
+ where: {
+ dataroomId_path: {
+ dataroomId: dataroomId,
+ path: childFolderPath,
+ },
+ },
+ });
+ if (!existingFolder) break;
+ folderName = `${name} (${counter})`;
+ childFolderPath = path
+ ? "/" + path + "/" + slugify(folderName)
+ : "/" + slugify(folderName);
+ counter++;
+ }
+
const folder = await prisma.dataroomFolder.create({
data: {
- name: name,
+ name: folderName,
path: childFolderPath,
parentId: parentFolder?.id ?? null,
dataroomId: dataroomId,
@@ -265,8 +290,8 @@ export default async function handle(
res.status(500).json({ error: "Error creating folder" });
}
} else {
- // We only allow POST requests
- res.setHeader("Allow", ["GET"]);
+ // We only allow GET and POST requests
+ res.setHeader("Allow", ["GET", "POST"]);
return res.status(405).end(`Method ${req.method} Not Allowed`);
}
}
diff --git a/pages/api/teams/[teamId]/folders/index.ts b/pages/api/teams/[teamId]/folders/index.ts
index 3f1453c6..87bd91d1 100644
--- a/pages/api/teams/[teamId]/folders/index.ts
+++ b/pages/api/teams/[teamId]/folders/index.ts
@@ -105,9 +105,9 @@ 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 childFolderPath = path
+ // ? "/" + path + "/" + slugify(name)
+ // : "/" + slugify(name);
const parentFolderPath = path ? "/" + path : "/";
@@ -142,9 +142,35 @@ export default async function handle(
},
});
+ let folderName = name;
+ let counter = 1;
+
+ let childFolderPath = path
+ ? "/" + path + "/" + slugify(folderName)
+ : "/" + slugify(folderName);
+
+ while (true) {
+ const existingFolder = await prisma.folder.findUnique({
+ where: {
+ teamId_path: {
+ teamId: teamId,
+ path: childFolderPath,
+ },
+ },
+ });
+
+ if (!existingFolder) break;
+
+ folderName = `${name} (${counter})`;
+ childFolderPath = path
+ ? "/" + path + "/" + slugify(folderName)
+ : "/" + slugify(folderName);
+ counter++;
+ }
+
const folder = await prisma.folder.create({
data: {
- name: name,
+ name: folderName,
path: childFolderPath,
parentId: parentFolder?.id ?? null,
teamId: teamId,