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 page templates init map (#5792)
Oleg Isonen9cdc746bde81
diff --git a/packages/project-migrations/src/pages.test.ts b/packages/project-migrations/src/pages.test.tsindex 0f83042755..4d094d745e 100644--- a/packages/project-migrations/src/pages.test.ts+++ b/packages/project-migrations/src/pages.test.ts@@ -2,7 +2,7 @@ import { expect, test } from "vitest";import type { Pages } from "@webstudio-is/sdk";import { migratePages, serializePages } from "./pages";-test("keeps current pages shape unchanged", () => {+test("keeps current pages shape unchanged when page templates exist", () => {const pages: Pages = {homePageId: "home",rootFolderId: "root",@@ -19,6 +19,7 @@ test("keeps current pages shape unchanged", () => {},],]),+ pageTemplates: new Map(),folders: new Map([["root",@@ -35,6 +36,39 @@ test("keeps current pages shape unchanged", () => {expect(migratePages(pages)).toBe(pages);});+test("adds missing page templates map to current pages shape", () => {+ const pages = migratePages({+ homePageId: "home",+ rootFolderId: "root",+ pages: new Map([+ [+ "home",+ {+ id: "home",+ name: "Home",+ path: "",+ title: `"Home"`,+ meta: {},+ rootInstanceId: "homeRoot",+ },+ ],+ ]),+ folders: new Map([+ [+ "root",+ {+ id: "root",+ name: "Root",+ slug: "",+ children: ["home"],+ },+ ],+ ]),+ });++ expect(pages.pageTemplates).toEqual(new Map());+});+test("removes orphan folder children from current pages shape", () => {expect(migratePages({@@ -184,29 +218,30 @@ test("migrates serialized array pages into maps", () => {});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({});+ const pages = migratePages({+ homePageId: "home",+ rootFolderId: "root",+ pages: [+ {+ id: "home",+ name: "Home",+ path: "",+ title: `"Home"`,+ rootInstanceId: "homeRoot",+ },+ ],+ folders: [+ {+ id: "root",+ name: "Root",+ slug: "",+ children: ["home"],+ },+ ],+ });++ expect(pages.pages.get("home")?.meta).toEqual({});+ expect(pages.pageTemplates).toEqual(new Map());});test("migrates serialized record pages into maps", () => {@@ -240,6 +275,7 @@ test("migrates serialized record pages into maps", () => {homePageId: "home",rootFolderId: "root",pages: new Map([["home", expect.objectContaining({ id: "home" })]]),+ pageTemplates: new Map(),folders: new Map([["root",diff --git a/packages/project-migrations/src/pages.ts b/packages/project-migrations/src/pages.tsindex 2e0499cf72..b93ad9054d 100644--- a/packages/project-migrations/src/pages.ts+++ b/packages/project-migrations/src/pages.ts@@ -116,7 +116,7 @@ export const migratePages = (pages: unknown): Pages => {) {const currentPages = pages as Pages;const result = PagesSchema.safeParse(currentPages);- if (result.success) {+ if (result.success && currentPages.pageTemplates !== undefined) {return currentPages;}return {@@ -141,7 +141,7 @@ export const migratePages = (pages: unknown): Pages => {pages: nextPages,pageTemplates:pages.pageTemplates === undefined- ? undefined+ ? new Map(): toMap<PageTemplate>(pages.pageTemplates),folders: removeOrphanFolderChildren(nextPages, nextFolders),};