Increment project names automatically for less confusion

Author: genmnz

apps/web/src/app/editor/[project_id]/page.tsx

@@ -38,6 +38,7 @@ export default function Editor() {
     activeProject,
     loadProject,
     createNewProject,
+    savedProjects,
     isInvalidProjectId,
     markProjectIdAsInvalid,
   } = useProjectStore();
@@ -109,7 +110,27 @@ export default function Editor() {
           markProjectIdAsInvalid(projectId);
 
           try {
-            const newProjectId = await createNewProject("Untitled Project");
+            const projectExists = savedProjects.some(
+              (p) => p.name === "Untitled Project"
+            );
+            if (!projectExists) {
+              const newProjectId = await createNewProject("Untitled Project");
+              router.replace(`/editor/${newProjectId}`);
+              return;
+            }
+
+            let newProjectNumber = 2;
+            while (
+              savedProjects.some(
+                (p) => p.name === `Untitled Project ${newProjectNumber}`
+              )
+            ) {
+              newProjectNumber++;
+            }
+
+            const newProjectId = await createNewProject(
+              `Untitled Project ${newProjectNumber}`
+            );
 
             // Check again if component was unmounted
             if (isCancelled) {
@@ -146,6 +167,7 @@ export default function Editor() {
     loadProject,
     createNewProject,
     router,
+    savedProjects,
     isInvalidProjectId,
     markProjectIdAsInvalid,
   ]);

apps/web/src/app/projects/page.tsx

@@ -90,8 +90,20 @@ export default function ProjectsPage() {
   );
 
   const handleCreateProject = async () => {
-    const projectId = await createNewProject("New Project");
-    console.log("projectId", projectId);
+    const projectExists = savedProjects.some((p) => p.name === "New Project");
+    if (!projectExists) {
+      const projectId = await createNewProject("New Project");
+      console.log("projectId", projectId);
+      router.push(`/editor/${projectId}`);
+      return;
+    }
+
+    let newProjectNumber = 2;
+    while (savedProjects.some((p) => p.name === `Project ${newProjectNumber}`)) {
+      newProjectNumber++;
+    }
+
+    const projectId = await createNewProject(`Project ${newProjectNumber}`);
     router.push(`/editor/${projectId}`);
   };
 

apps/web/src/stores/project-store.ts

@@ -339,25 +339,21 @@ export const useProjectStore = create<ProjectStore>((set, get) => ({
       const { savedProjects } = get();
 
       // Extract the base name (remove any existing numbering)
-      const numberMatch = project.name.match(/^\((\d+)\)\s+(.+)$/);
-      const baseName = numberMatch ? numberMatch[2] : project.name;
-      const existingNumbers: number[] = [];
-
-      // Check for pattern "(number) baseName" in existing projects
-      savedProjects.forEach((p) => {
-        const match = p.name.match(/^\((\d+)\)\s+(.+)$/);
-        if (match && match[2] === baseName) {
-          existingNumbers.push(parseInt(match[1], 10));
-        }
-      });
+      const baseName = project.name.replace(/ \(\d+\)$/, "");
+      let newName = `${baseName} (1)`;
+      let counter = 1;
+
+      const existingNames = new Set(savedProjects.map((p) => p.name));
 
-      const nextNumber =
-        existingNumbers.length > 0 ? Math.max(...existingNumbers) + 1 : 1;
+      while (existingNames.has(newName)) {
+        counter++;
+        newName = `${baseName} (${counter})`;
+      }
 
       const newProject: TProject = {
         ...project, // Copy all properties from the original project
         id: generateUUID(),
-        name: `(${nextNumber}) ${baseName}`,
+        name: newName,
         createdAt: new Date(),
         updatedAt: new Date(),
       };