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: Fix regression with page settings saving (#5737)
Oleg Isonena82b339e5260
diff --git a/packages/sdk/src/migrations/pages.test.ts b/packages/sdk/src/migrations/pages.test.tsindex eeccd2a530..8a0babdcfa 100644--- a/packages/sdk/src/migrations/pages.test.ts+++ b/packages/sdk/src/migrations/pages.test.ts@@ -124,6 +124,32 @@ test("migrates serialized array pages into maps", () => {).toEqual(new Map([["home", expect.objectContaining({ id: "home" })]]));});+test("adds missing page meta while migrating serialized pages", () => {+ expect(+ migratePages({+ homePageId: "home",+ rootFolderId: "root",+ pages: [+ {+ id: "home",+ name: "Home",+ path: "",+ title: `"Home"`,+ rootInstanceId: "homeRoot",+ },+ ],+ folders: [+ {+ id: "root",+ name: "Root",+ slug: "",+ children: ["home"],+ },+ ],+ }).pages.get("home")?.meta+ ).toEqual({});+});+test("migrates serialized record pages into maps", () => {expect(migratePages({diff --git a/packages/sdk/src/migrations/pages.ts b/packages/sdk/src/migrations/pages.tsindex 53ec8d444a..6c4c3d7d12 100644--- a/packages/sdk/src/migrations/pages.ts+++ b/packages/sdk/src/migrations/pages.ts@@ -26,15 +26,23 @@ type MigratablePages = Omit<Pages, "pages" | "folders"> & {};const toMap = <Item extends { id: string }>(- items: Item[] | Record<Item["id"], Item> | Map<Item["id"], Item>+ items: Item[] | Record<Item["id"], Item> | Map<Item["id"], Item>,+ normalizeItem: (item: Item) => Item = (item) => item) => {if (items instanceof Map) {- return items;+ return new Map(+ Array.from(items, ([id, item]) => [id, normalizeItem(item)])+ );}const list: Item[] = Array.isArray(items) ? items : Object.values(items);- return new Map(list.map((item) => [item.id, item]));+ return new Map(list.map((item) => [item.id, normalizeItem(item)]));};+const normalizePage = (page: Page): Page => ({+ ...page,+ meta: page.meta ?? {},+});+const isLegacyPages = (pages: unknown): pages is LegacyPages => {if (typeof pages !== "object" || pages === null) {return false;@@ -86,7 +94,7 @@ export const migratePages = (pages: unknown): Pages => {redirects: pages.redirects,homePageId: pages.homePageId,rootFolderId: pages.rootFolderId,- pages: toMap<Page>(pages.pages),+ pages: toMap<Page>(pages.pages, normalizePage),folders: toMap<Folder>(pages.folders),};}@@ -96,7 +104,7 @@ export const migratePages = (pages: unknown): Pages => {}const homePage: Page = {- ...pages.homePage,+ ...normalizePage(pages.homePage),path: "",};const nextPages: Pages["pages"] = new Map([[homePage.id, homePage]]);@@ -104,7 +112,7 @@ export const migratePages = (pages: unknown): Pages => {if (page.id === homePage.id) {continue;}- nextPages.set(page.id, page);+ nextPages.set(page.id, normalizePage(page));}const nextFolders: Pages["folders"] = new Map();