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
experimental: update variables when duplicate page (#2886)
Bogdan Chadkin29df24bfafd2
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsxindex 3889283347..5bec2aee43 100644--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/page-settings.tsx@@ -48,11 +48,7 @@ import {} from "@webstudio-is/icons";import { useIds } from "~/shared/form-utils";import { Header, HeaderSuffixSpacer } from "../../header";-import {- getInstancesSlice,- insertInstancesSliceCopy,- updateWebstudioData,-} from "~/shared/instance-utils";+import { updateWebstudioData } from "~/shared/instance-utils";import {$assets,$domains,@@ -83,6 +79,7 @@ import {registerFolderChildMutable,deletePageMutable,$pageRootScope,+ duplicatePage,} from "./page-utils";import { Form } from "./form";import { AddressBar, useAddressBar, type AddressBarApi } from "./address-bar";@@ -1075,51 +1072,6 @@ const updatePage = (addressBar.savePathParams();};-const duplicatePage = (pageId: Page["id"]) => {- const pages = $pages.get();- if (pages === undefined) {- return;- }- const page = findPageByIdOrPath(pageId, pages);-- if (page === undefined) {- return;- }-- 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 slice = getInstancesSlice(page.rootInstanceId);- updateWebstudioData((data) => {- const rootInstanceId = insertInstancesSliceCopy({- data,- slice,- availableDataSources: new Set(),- });- if (rootInstanceId === undefined) {- return;- }- const newPage = {- ...page,- id: newPageId,- rootInstanceId,- name: newName,- path: nameToPath(pages, newName),- } satisfies Page;- data.pages.pages.push(newPage);- const currentFolder = findParentFolderByChildId(pageId, data.pages.folders);- registerFolderChildMutable(- data.pages.folders,- newPageId,- currentFolder?.id- );- });- return newPageId;-};-export const PageSettings = ({onClose,onDuplicate,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 989bbf6f01..1c45685b78 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@@ -1,4 +1,7 @@import { describe, expect, test } from "@jest/globals";+import type { Project } from "@webstudio-is/project";+import { createDefaultPages } from "@webstudio-is/project-build";+import { isRoot, type Folder, Instance } from "@webstudio-is/sdk";import {cleanupChildRefsMutable,deleteFolderWithChildrenMutable,@@ -9,9 +12,21 @@ import {toTreeData,filterSelfAndChildren,getExistingRoutePaths,+ duplicatePage,} from "./page-utils";-import { createDefaultPages } from "@webstudio-is/project-build";-import { isRoot, type Folder } from "@webstudio-is/sdk";+import {+ $dataSources,+ $instances,+ $pages,+ $project,+} from "~/shared/nano-states";+import { registerContainers } from "~/shared/sync";+import { encodeDataSourceVariable } from "@webstudio-is/react-sdk";++registerContainers();++const toMap = <T extends { id: string }>(list: T[]) =>+ new Map(list.map((item) => [item.id, item]));describe("toTreeData", () => {test("initial pages always has home pages and a root folder", () => {@@ -492,3 +507,188 @@ describe("getExistingRoutePaths", () => {expect(Array.from(result)).toEqual(["/page", "/blog/:id"]);});});++describe("duplicate page", () => {+ $project.set({ id: "projectId" } as Project);++ test("home page with new root instance", () => {+ $instances.set(+ toMap([{ type: "instance", id: "body", component: "Body", children: [] }])+ );+ $pages.set({+ homePage: {+ id: "pageId",+ name: "My Name",+ path: "/",+ title: `"My Title"`,+ meta: {},+ rootInstanceId: "body",+ },+ pages: [],+ folders: [],+ });+ duplicatePage("pageId");+ expect($pages.get()?.pages[0]).toEqual({+ id: expect.not.stringMatching("pageId"),+ name: "My Name (1)",+ path: "/copy-1",+ title: `"My Title"`,+ meta: {},+ rootInstanceId: expect.not.stringMatching("body"),+ });+ expect($instances.get()).toEqual(+ toMap<Instance>([+ {+ type: "instance",+ id: "body",+ component: "Body",+ children: [],+ },+ {+ type: "instance",+ id: expect.not.stringMatching("body") as unknown as string,+ component: "Body",+ children: [],+ },+ ])+ );+ });++ test("non-home page preserving old path with prefix", () => {+ $instances.set(+ toMap([{ type: "instance", id: "body", component: "Body", children: [] }])+ );+ $pages.set({+ homePage: {+ id: "homeId",+ name: "Home",+ path: "/",+ title: `"Home"`,+ meta: {},+ rootInstanceId: "home",+ },+ pages: [+ {+ id: "pageId",+ name: "My Name",+ path: "/my-path",+ title: `"My Title"`,+ meta: {},+ rootInstanceId: "body",+ },+ ],+ folders: [],+ });+ duplicatePage("pageId");+ expect($pages.get()?.pages[1]).toEqual({+ id: expect.not.stringMatching("pageId"),+ name: "My Name (1)",+ path: "/copy-1/my-path",+ title: `"My Title"`,+ meta: {},+ rootInstanceId: expect.not.stringMatching("body"),+ });+ });++ test("replace variables in page meta", () => {+ $instances.set(+ toMap([{ type: "instance", id: "body", component: "Body", children: [] }])+ );+ $dataSources.set(+ toMap([+ {+ id: "variableId",+ scopeInstanceId: "body",+ name: "My Variable",+ type: "variable",+ value: { type: "string", value: "value" },+ },+ ])+ );+ $pages.set({+ homePage: {+ id: "pageId",+ name: "My Name",+ path: "/",+ title: `"Title: " + $ws$dataSource$variableId`,+ meta: {+ description: `"Description: " + $ws$dataSource$variableId`,+ excludePageFromSearch: `"Exclude: " + $ws$dataSource$variableId`,+ socialImageUrl: `"Image: " + $ws$dataSource$variableId`,+ custom: [+ {+ property: "Name",+ content: `"Name: " + $ws$dataSource$variableId`,+ },+ ],+ },+ rootInstanceId: "body",+ },+ pages: [],+ folders: [],+ });+ duplicatePage("pageId");+ const [_oldDataSource, newDataSource] = $dataSources.get().values();+ const newVariableName = encodeDataSourceVariable(newDataSource.id);+ expect(newVariableName).not.toEqual("$ws$dataSource$variableId");+ expect($pages.get()?.pages[0]).toEqual({+ id: expect.not.stringMatching("pageId"),+ name: "My Name (1)",+ path: "/copy-1",+ title: `"Title: " + ${newVariableName}`,+ meta: {+ description: `"Description: " + ${newVariableName}`,+ excludePageFromSearch: `"Exclude: " + ${newVariableName}`,+ socialImageUrl: `"Image: " + ${newVariableName}`,+ custom: [+ {+ property: "Name",+ content: `"Name: " + ${newVariableName}`,+ },+ ],+ },+ rootInstanceId: expect.not.stringMatching("body"),+ });+ });++ test("replace path params variable", () => {+ $instances.set(+ toMap([{ type: "instance", id: "body", component: "Body", children: [] }])+ );+ $dataSources.set(+ toMap([+ {+ id: "pathParamsId",+ scopeInstanceId: "body",+ name: "Path Params",+ type: "parameter",+ },+ ])+ );+ $pages.set({+ homePage: {+ id: "pageId",+ name: "My Name",+ path: "/",+ title: `"My Title"`,+ meta: {},+ rootInstanceId: "body",+ pathVariableId: "pathParamsId",+ },+ pages: [],+ folders: [],+ });+ duplicatePage("pageId");+ const [_oldDataSource, newDataSource] = $dataSources.get().values();+ expect(newDataSource.id).not.toEqual("pathParamsId");+ expect($pages.get()?.pages[0]).toEqual({+ id: expect.not.stringMatching("pageId"),+ name: "My Name (1)",+ path: "/copy-1",+ title: `"My Title"`,+ meta: {},+ rootInstanceId: expect.not.stringMatching("body"),+ pathVariableId: newDataSource.id,+ });+ });+});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 177da285a0..195cc6bdcd 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@@ -1,6 +1,11 @@+import { nanoid } from "nanoid";import { computed } from "nanostores";import { createRootFolder } from "@webstudio-is/project-build";-import { encodeDataSourceVariable } from "@webstudio-is/react-sdk";+import {+ decodeDataSourceVariable,+ encodeDataSourceVariable,+ validateExpression,+} from "@webstudio-is/react-sdk";import {type Page,Pages,@@ -10,11 +15,19 @@ import {isRoot,type WebstudioData,getPagePath,+ findParentFolderByChildId,+ DataSource,} from "@webstudio-is/sdk";import { removeByMutable } from "~/shared/array-utils";-import { deleteInstanceMutable } from "~/shared/instance-utils";+import {+ deleteInstanceMutable,+ getInstancesSlice,+ insertInstancesSliceCopy,+ updateWebstudioData,+} from "~/shared/instance-utils";import {$dataSources,+ $pages,$selectedInstanceSelector,$selectedPage,$selectedPageId,@@ -310,3 +323,113 @@ export const $pageRootScope = computed(return { variableValues: values ?? variableValues, scope, aliases };});++const deduplicatePath = (pages: undefined | Pages, path: string) => {+ if (pages === undefined) {+ return path;+ }+ const matchedPage = findPageByIdOrPath(path, pages);+ if (matchedPage === undefined) {+ return path;+ }+ if (path === "/") {+ path = "";+ }+ let counter = 1;+ while (findPageByIdOrPath(`/copy-${counter}${path}`, pages) !== undefined) {+ counter += 1;+ }+ return `/copy-${counter}${path}`;+};++const replaceDataSources = (+ expression: string,+ replacements: Map<DataSource["id"], DataSource["id"]>+) => {+ return validateExpression(expression, {+ effectful: true,+ transformIdentifier: (identifier) => {+ const dataSourceId = decodeDataSourceVariable(identifier);+ if (dataSourceId === undefined) {+ return identifier;+ }+ return encodeDataSourceVariable(+ replacements.get(dataSourceId) ?? dataSourceId+ );+ },+ });+};++export const duplicatePage = (pageId: Page["id"]) => {+ const pages = $pages.get();+ if (pages === undefined) {+ return;+ }+ const page = findPageByIdOrPath(pageId, pages);++ if (page === undefined) {+ return;+ }++ 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 slice = getInstancesSlice(page.rootInstanceId);+ updateWebstudioData((data) => {+ const { newInstanceIds, newDataSourceIds } = insertInstancesSliceCopy({+ data,+ slice,+ availableDataSources: new Set(),+ });+ const newRootInstanceId = newInstanceIds.get(page.rootInstanceId);+ const newPathVariableId =+ page.pathVariableId === undefined+ ? undefined+ : newDataSourceIds.get(page.pathVariableId);+ if (newRootInstanceId === undefined) {+ return;+ }+ const newPage = {+ ...page,+ id: newPageId,+ rootInstanceId: newRootInstanceId,+ pathVariableId: newPathVariableId,+ name: newName,+ path: deduplicatePath(pages, page.path),+ title: replaceDataSources(page.title, newDataSourceIds),+ meta: {+ ...page.meta,+ description:+ page.meta.description === undefined+ ? undefined+ : replaceDataSources(page.meta.description, newDataSourceIds),+ excludePageFromSearch:+ page.meta.excludePageFromSearch === undefined+ ? undefined+ : replaceDataSources(+ page.meta.excludePageFromSearch,+ newDataSourceIds+ ),+ socialImageUrl:+ page.meta.socialImageUrl === undefined+ ? undefined+ : replaceDataSources(page.meta.socialImageUrl, newDataSourceIds),+ custom: page.meta.custom?.map(({ property, content }) => ({+ property,+ content: replaceDataSources(content, newDataSourceIds),+ })),+ },+ } satisfies Page;+ data.pages.pages.push(newPage);+ const currentFolder = findParentFolderByChildId(pageId, data.pages.folders);+ registerFolderChildMutable(+ data.pages.folders,+ newPageId,+ currentFolder?.id+ );+ });+ return newPageId;+};diff --git a/apps/builder/app/builder/shared/commands.ts b/apps/builder/app/builder/shared/commands.tsindex aded431259..9e78347fd6 100644--- a/apps/builder/app/builder/shared/commands.ts+++ b/apps/builder/app/builder/shared/commands.ts@@ -187,7 +187,7 @@ export const { emitCommand, subscribeCommands } = createCommandsEmitter({const parentInstanceSelector = instanceSelector.slice(1);const slice = getInstancesSlice(targetInstanceId);updateWebstudioData((data) => {- const rootInstanceId = insertInstancesSliceCopy({+ const { newInstanceIds } = insertInstancesSliceCopy({data,slice,availableDataSources: findAvailableDataSources(@@ -196,7 +196,8 @@ export const { emitCommand, subscribeCommands } = createCommandsEmitter({parentInstanceSelector),});- if (rootInstanceId === undefined) {+ const newRootInstanceId = newInstanceIds.get(targetInstanceId);+ if (newRootInstanceId === undefined) {return;}const parentInstance = data.instances.get(parentInstanceId);@@ -210,11 +211,11 @@ export const { emitCommand, subscribeCommands } = createCommandsEmitter({const position = indexWithinChildren + 1;parentInstance.children.splice(position, 0, {type: "id",- value: rootInstanceId,+ value: newRootInstanceId,});// select new instance$selectedInstanceSelector.set([- rootInstanceId,+ newRootInstanceId,...parentInstanceSelector,]);});diff --git a/apps/builder/app/shared/copy-paste/plugin-instance.ts b/apps/builder/app/shared/copy-paste/plugin-instance.tsindex 61624fab43..7a24bdf9d5 100644--- a/apps/builder/app/shared/copy-paste/plugin-instance.ts+++ b/apps/builder/app/shared/copy-paste/plugin-instance.ts@@ -190,7 +190,7 @@ export const onPaste = (clipboardData: string): boolean => {}updateWebstudioData((data) => {- const rootInstanceId = insertInstancesSliceCopy({+ const { newInstanceIds } = insertInstancesSliceCopy({data,slice: fragment,availableDataSources: findAvailableDataSources(@@ -199,7 +199,8 @@ export const onPaste = (clipboardData: string): boolean => {instanceSelector),});- if (rootInstanceId === undefined) {+ const newRootInstanceId = newInstanceIds.get(fragment.instances[0].id);+ if (newRootInstanceId === undefined) {return;}let dropTarget = pasteTarget;@@ -220,7 +221,7 @@ export const onPaste = (clipboardData: string): boolean => {}const child: Instance["children"][number] = {type: "id",- value: rootInstanceId,+ value: newRootInstanceId,};const { position } = dropTarget;if (position === "end") {diff --git a/apps/builder/app/shared/instance-utils.ts b/apps/builder/app/shared/instance-utils.tsindex f240cddf01..dc2d04594c 100644--- a/apps/builder/app/shared/instance-utils.ts+++ b/apps/builder/app/shared/instance-utils.ts@@ -463,7 +463,7 @@ export const reparentInstance = (return;}deleteInstanceMutable(data, sourceInstanceSelector);- const rootInstanceId = insertInstancesSliceCopy({+ const { newInstanceIds } = insertInstancesSliceCopy({data,slice: fragment,availableDataSources: findAvailableDataSources(@@ -472,7 +472,8 @@ export const reparentInstance = (reparentDropTarget.parentSelector),});- if (rootInstanceId === undefined) {+ const newRootInstanceId = newInstanceIds.get(rootInstanceId);+ if (newRootInstanceId === undefined) {return;}const [newParentId] = reparentDropTarget.parentSelector;@@ -480,14 +481,14 @@ export const reparentInstance = (if (newParent === undefined) {return;}- const newChild = { type: "id" as const, value: rootInstanceId };+ const newChild = { type: "id" as const, value: newRootInstanceId };if (reparentDropTarget.position === "end") {newParent.children.push(newChild);} else {newParent.children.splice(reparentDropTarget.position, 0, newChild);}$selectedInstanceSelector.set([- rootInstanceId,+ newRootInstanceId,...reparentDropTarget.parentSelector,]);});@@ -910,9 +911,15 @@ export const insertInstancesSliceCopy = ({slice: WebstudioFragment;availableDataSources: Set<DataSource["id"]>;}) => {+ const newInstanceIds = new Map<Instance["id"], Instance["id"]>();+ const newDataSourceIds = new Map<DataSource["id"], DataSource["id"]>();+ const newDataIds = {+ newInstanceIds,+ newDataSourceIds,+ };const projectId = $project.get()?.id;if (projectId === undefined) {- return;+ return newDataIds;}const sliceInstances: Instances = new Map();@@ -1178,13 +1185,11 @@ export const insertInstancesSliceCopy = ({sliceInstances,slice.instances[0].id);- const newInstanceIds = new Map<Instance["id"], Instance["id"]>();for (const instanceId of sliceInstanceIds) {newInstanceIds.set(instanceId, nanoid());}const availableFragmentDataSources = new Set(availableDataSources);- const newDataSourceIds = new Map<DataSource["id"], DataSource["id"]>();const newResourceIds = new Map<Resource["id"], Resource["id"]>();const usedResourceIds = new Set<Resource["id"]>();for (const dataSource of slice.dataSources) {@@ -1392,9 +1397,5 @@ export const insertInstancesSliceCopy = ({}}- // invoke callback to allow additional changes within same transaction- const rootInstanceId =- newInstanceIds.get(slice.instances[0].id) ?? slice.instances[0].id;-- return rootInstanceId;+ return newDataIds;};