Skip to content

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.

fix: append iterator to page when inserting from marketplace (#3433)

Bogdan Chadkin59e1a8795346
diff --git a/apps/builder/app/shared/page-utils.test.ts b/apps/builder/app/shared/page-utils.test.ts
index 553fb22134..87e27b4749 100644
--- a/apps/builder/app/shared/page-utils.test.ts
+++ b/apps/builder/app/shared/page-utils.test.ts
@@ -340,4 +340,65 @@ describe("insert page copy", () => {
systemDataSourceId: expect.not.stringMatching("systemId"),
});
});
+
+ test("append number to name only when conflict is found", () => {
+ const data = getWebstudioDataStub({
+ instances: toMap<Instance>([
+ { type: "instance", id: "bodyId", component: "Body", children: [] },
+ ]),
+ dataSources: toMap<DataSource>([
+ {
+ id: "systemId",
+ scopeInstanceId: "bodyId",
+ name: "system",
+ type: "parameter",
+ },
+ ]),
+ pages: {
+ meta: {},
+ homePage: {
+ id: "pageId",
+ name: "Name",
+ path: "/",
+ title: `"Title"`,
+ meta: {},
+ rootInstanceId: "bodyId",
+ systemDataSourceId: "systemId",
+ },
+ pages: [],
+ folders: [
+ createRootFolder(["pageId", "folderId"]),
+ {
+ id: "folderId",
+ name: "Folder",
+ slug: "folder",
+ children: [],
+ },
+ ],
+ },
+ });
+ insertPageCopyMutable({
+ source: { data, pageId: "pageId" },
+ target: { data, folderId: ROOT_FOLDER_ID },
+ });
+ insertPageCopyMutable({
+ source: { data, pageId: "pageId" },
+ target: { data, folderId: ROOT_FOLDER_ID },
+ });
+ insertPageCopyMutable({
+ source: { data, pageId: "pageId" },
+ target: { data, folderId: "folderId" },
+ });
+ insertPageCopyMutable({
+ source: { data, pageId: "pageId" },
+ target: { data, folderId: "folderId" },
+ });
+ expect(data.pages.pages.length).toEqual(4);
+ // inside folder with conflict
+ expect(data.pages.pages[0].name).toEqual(`Name (1)`);
+ expect(data.pages.pages[1].name).toEqual(`Name (2)`);
+ // inside folder without conflict
+ expect(data.pages.pages[2].name).toEqual(`Name`);
+ expect(data.pages.pages[3].name).toEqual(`Name (1)`);
+ });
});
diff --git a/apps/builder/app/shared/page-utils.ts b/apps/builder/app/shared/page-utils.ts
index e5301c3f34..cfc57d47ce 100644
--- a/apps/builder/app/shared/page-utils.ts
+++ b/apps/builder/app/shared/page-utils.ts
@@ -16,6 +16,31 @@ import {
insertWebstudioFragmentCopy,
} from "./instance-utils";
+const deduplicateName = (
+ pages: Pages,
+ folderId: Folder["id"],
+ pageName: Page["name"]
+) => {
+ const { name = pageName, copyNumber } =
+ // extract a number from "name (copyNumber)"
+ pageName.match(/^(?<name>.+) \((?<copyNumber>\d+)\)$/)?.groups ?? {};
+ const folder = pages.folders.find((folder) => folder.id === folderId);
+ const usedNames = new Set<string>();
+ for (const pageId of folder?.children ?? []) {
+ const page = findPageByIdOrPath(pageId, pages);
+ if (page) {
+ usedNames.add(page.name);
+ }
+ }
+ let newName = name;
+ let nameNumber = Number(copyNumber ?? "0");
+ while (usedNames.has(newName)) {
+ nameNumber += 1;
+ newName = `${name} (${nameNumber})`;
+ }
+ return newName;
+};
+
const deduplicatePath = (
pages: Pages,
folderId: Folder["id"],
@@ -76,10 +101,6 @@ export const insertPageCopyMutable = ({
availableDataSources: new Set(),
});
const newPageId = nanoid();
- const { name = page.name, copyNumber } =
- // extract a number from "name (copyNumber)"
- page.name.match(/^(?<name>.+) \((?<copyNumber>\d+)\)$/)?.groups ?? {};
- const newName = `${name} (${Number(copyNumber ?? "0") + 1})`;
const newRootInstanceId =
newInstanceIds.get(page.rootInstanceId) ?? page.rootInstanceId;
const newSystemDataSourceId =
@@ -89,7 +110,7 @@ export const insertPageCopyMutable = ({
id: newPageId,
rootInstanceId: newRootInstanceId,
systemDataSourceId: newSystemDataSourceId,
- name: newName,
+ name: deduplicateName(target.data.pages, target.folderId, page.name),
path: deduplicatePath(target.data.pages, target.folderId, page.path),
title: replaceDataSources(page.title, newDataSourceIds),
meta: {