Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
fix: Allow multiple folders to have an empty slug (#3074)
Oleg Isonen77f14266bd49
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/folder-settings.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/folder-settings.tsxindex eb02bdc4c9..ff8dc9f1bc 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/folder-settings.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/folder-settings.tsx@@ -40,7 +40,7 @@ import { nanoid } from "nanoid";import { serverSyncStore } from "~/shared/sync";import { useEffectEvent } from "~/shared/hook-utils/effect-event";import {- isSlugUsed,+ isSlugAvailable,registerFolderChildMutable,deleteFolderWithChildrenMutable,deletePageMutable,@@ -81,7 +81,7 @@ const validateValues = (}if (pages !== undefined && values.slug !== undefined) {if (- isSlugUsed(+ isSlugAvailable(values.slug,pages.folders,values.parentFolderId,diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.test.ts b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.test.tsindex f60d71152f..ce2311ef3f 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.test.ts+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.test.ts@@ -7,12 +7,13 @@ import {Instance,DataSource,encodeDataSourceVariable,+ ROOT_FOLDER_ID,} from "@webstudio-is/sdk";import {cleanupChildRefsMutable,deleteFolderWithChildrenMutable,getAllChildrenAndSelf,- isSlugUsed,+ isSlugAvailable,registerFolderChildMutable,reparentOrphansMutable,toTreeData,@@ -47,7 +48,7 @@ describe("toTreeData", () => {});const tree = toTreeData(pages);expect(tree.root).toEqual({- id: "root",+ id: ROOT_FOLDER_ID,name: "Root",slug: "",type: "folder",@@ -85,7 +86,7 @@ describe("toTreeData", () => {rootFolder?.children.push("folderId");const tree = toTreeData(pages);expect(tree.root).toEqual({- id: "root",+ id: ROOT_FOLDER_ID,name: "Root",slug: "",type: "folder",@@ -140,7 +141,7 @@ describe("toTreeData", () => {const tree = toTreeData(pages);expect(tree.root).toEqual({- id: "root",+ id: ROOT_FOLDER_ID,name: "Root",slug: "",type: "folder",@@ -206,7 +207,7 @@ describe("toTreeData", () => {const tree = toTreeData(pages);expect(tree.root).toEqual({type: "folder",- id: "root",+ id: ROOT_FOLDER_ID,name: "Root",slug: "",children: [@@ -270,7 +271,7 @@ describe("reparentOrphansMutable", () => {reparentOrphansMutable(pages);const rootFolder = pages.folders.find(isRoot);expect(rootFolder).toEqual({- id: "root",+ id: ROOT_FOLDER_ID,name: "Root",slug: "",children: ["homePageId", "folderId", "pageId"],@@ -295,7 +296,7 @@ describe("cleanupChildRefsMutable", () => {rootFolder?.children.push("folderId");cleanupChildRefsMutable("folderId", folders);expect(rootFolder).toEqual({- id: "root",+ id: ROOT_FOLDER_ID,name: "Root",slug: "",children: ["homePageId"],@@ -303,7 +304,7 @@ describe("cleanupChildRefsMutable", () => {});});-describe("isSlugUsed", () => {+describe("isSlugAvailable", () => {const { folders } = createDefaultPages({rootInstanceId: "rootInstanceId",systemDataSourceId: "systemDataSourceId",@@ -321,30 +322,45 @@ describe("isSlugUsed", () => {slug: "slug1-1",children: [],});-+ folders.push({+ id: "folderId2-1",+ name: "Folder 2-1",+ slug: "",+ children: [],+ });+ folders.push({+ id: "folderId2-2",+ name: "Folder 2-2",+ slug: "",+ children: [],+ });const rootFolder = folders.find(isRoot)!;rootFolder.children.push("folderId1");test("available in the root", () => {- expect(isSlugUsed("slug", folders, rootFolder.id)).toBe(true);+ expect(isSlugAvailable("slug", folders, rootFolder.id)).toBe(true);});test("not available in the root", () => {- expect(isSlugUsed("slug1", folders, rootFolder.id)).toBe(false);+ expect(isSlugAvailable("slug1", folders, rootFolder.id)).toBe(false);});test("available in Folder 1", () => {- expect(isSlugUsed("slug", folders, "folderId1")).toBe(true);+ expect(isSlugAvailable("slug", folders, "folderId1")).toBe(true);});test("not available in Folder 1", () => {- expect(isSlugUsed("slug1-1", folders, "folderId1")).toBe(false);+ expect(isSlugAvailable("slug1-1", folders, "folderId1")).toBe(false);});test("existing folder can have a matching slug when its the same id/folder", () => {- expect(isSlugUsed("slug1-1", folders, "folderId1", "folderId1-1")).toBe(- true- );+ expect(+ isSlugAvailable("slug1-1", folders, "folderId1", "folderId1-1")+ ).toBe(true);+ });++ test("empty folder slug can be defined multiple times", () => {+ expect(isSlugAvailable("", folders, "rootInstanceId")).toBe(true);});});@@ -391,8 +407,8 @@ describe("registerFolderChildMutable", () => {};folders.push(folder);const rootFolder = folders.find(isRoot);- registerFolderChildMutable(folders, "folderId", "root");- registerFolderChildMutable(folders, "folderId2", "root");+ registerFolderChildMutable(folders, "folderId", ROOT_FOLDER_ID);+ registerFolderChildMutable(folders, "folderId2", ROOT_FOLDER_ID);expect(rootFolder?.children).toEqual(["homePageId",diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.tsindex d99b3ebe3a..67841f1934 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-utils.ts@@ -169,13 +169,17 @@ export const reparentOrphansMutable = (pages: Pages) => {* Returns true if folder's slug is unique within it's future parent folder.* Needed to verify if the folder can be nested under the parent folder without modifying slug.*/-export const isSlugUsed = (+export const isSlugAvailable = (slug: string,folders: Array<Folder>,parentFolderId: Folder["id"],// undefined folder id means new folderfolderId?: Folder["id"]) => {+ // Empty slug can appear any amount of times.+ if (slug === "") {+ return true;+ }const foldersMap = new Map(folders.map((folder) => [folder.id, folder]));const parentFolder = foldersMap.get(parentFolderId);// Should be impossible because at least root folder is always found.