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.

Delete pages with stores (#1289)

Bogdan Chadkin919d5603966a
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx
index 712bb311c6..4ad800e03b 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/pages.tsx
@@ -22,7 +22,6 @@ import {
} from "@webstudio-is/icons";
import type { Page, Pages } from "@webstudio-is/project-build";
import type { Publish } from "~/shared/pubsub";
-import { useProject } from "~/builder/shared/nano-states";
import type { TabName } from "../../types";
import { CloseButton, Header } from "../../header";
import { SettingsPanel } from "./settings-panel";
@@ -228,13 +227,12 @@ const PagesPanel = ({
export const TabContent = (props: TabContentProps) => {
const currentPageId = useStore(selectedPageIdStore);
- const [project] = useProject();
const switchPage = useSwitchPage();
const newPageId = "new-page";
const [editingPageId, setEditingPageId] = useState<string>();
- if (currentPageId === undefined || project === undefined) {
+ if (currentPageId === undefined) {
return null;
}
@@ -272,7 +270,6 @@ export const TabContent = (props: TabContentProps) => {
}
}}
pageId={editingPageId}
- projectId={project.id}
key={editingPageId}
/>
)}
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsx b/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsx
index 07ba1c8917..a1b432a7cf 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/pages/settings.tsx
@@ -27,18 +27,16 @@ import {
Tooltip,
} from "@webstudio-is/design-system";
import { ChevronDoubleLeftIcon, TrashIcon } from "@webstudio-is/icons";
-import { usePersistentFetcher } from "~/shared/fetcher";
-import {
- normalizeErrors,
- toastUnknownFieldErrors,
- useIds,
-} from "~/shared/form-utils";
-import type { DeletePageData } from "~/shared/pages";
-import { restPagesPath } from "~/shared/router-utils";
+import { useIds } from "~/shared/form-utils";
import { Header, HeaderSuffixSpacer } from "../../header";
import { deleteInstance } from "~/shared/instance-utils";
-import { instancesStore, pagesStore } from "~/shared/nano-states";
+import {
+ instancesStore,
+ pagesStore,
+ selectedPageIdStore,
+} from "~/shared/nano-states";
import { nanoid } from "nanoid";
+import { removeByMutable } from "~/shared/array-utils";
const Group = styled(Flex, {
marginBottom: theme.spacing[9],
@@ -414,36 +412,38 @@ const updatePage = (pageId: Page["id"], values: Partial<Values>) => {
});
};
+const deletePage = (pageId: Page["id"]) => {
+ const pages = pagesStore.get();
+ // deselect page before deleting to avoid flash of content
+ if (selectedPageIdStore.get() === pageId) {
+ selectedPageIdStore.set(pages?.homePage.id);
+ }
+ const rootInstanceId = pages?.pages.find(
+ (page) => page.id === pageId
+ )?.rootInstanceId;
+ if (rootInstanceId !== undefined) {
+ deleteInstance([rootInstanceId]);
+ }
+ store.createTransaction([pagesStore], (pages) => {
+ if (pages === undefined) {
+ return;
+ }
+ removeByMutable(pages.pages, (page) => page.id === pageId);
+ });
+};
+
export const PageSettings = ({
onClose,
onDelete,
pageId,
- projectId,
}: {
onClose?: () => void;
onDelete?: () => void;
pageId: string;
- projectId: string;
}) => {
- const submitPersistently = usePersistentFetcher();
-
const pages = useStore(pagesStore);
const page = pages && findPageByIdOrPath(pages, pageId);
- const deleteOnClient = (pageId: Page["id"]) => {
- if (pages === undefined) {
- return;
- }
- const page = pages.pages.find((item) => item.id === pageId);
- if (page) {
- deleteInstance([page.rootInstanceId]);
- }
- pagesStore.set({
- homePage: pages.homePage,
- pages: pages.pages.filter((item) => item.id !== pageId),
- });
- };
-
const isHomePage = page?.id === pages?.homePage.id;
const [unsavedValues, setUnsavedValues] = useState<Partial<Values>>({});
@@ -487,19 +487,7 @@ export const PageSettings = ({
});
const hanldeDelete = () => {
- // We use submitPersistently instead of fetcher.submit
- // because we don't want the request to be canceled when the component unmounts
- submitPersistently<DeletePageData>(
- { id: pageId },
- { method: "delete", action: restPagesPath({ projectId }) },
- (data) => {
- if (data.status === "error") {
- toastUnknownFieldErrors(normalizeErrors(data.errors), []);
- } else {
- deleteOnClient(pageId);
- }
- }
- );
+ deletePage(pageId);
onDelete?.();
};
diff --git a/apps/builder/app/routes/rest/pages.$projectId.ts b/apps/builder/app/routes/rest/pages.$projectId.ts
deleted file mode 100644
index 87250ba613..0000000000
--- a/apps/builder/app/routes/rest/pages.$projectId.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import { zfd } from "zod-form-data";
-import { z } from "zod";
-import type { LoaderArgs, ActionArgs } from "@remix-run/node";
-import type { Pages } from "@webstudio-is/project-build";
-import {
- deletePage,
- loadBuildByProjectId,
-} from "@webstudio-is/project-build/server";
-import { sentryException } from "~/shared/sentry";
-import type { DeletePageData } from "~/shared/pages";
-import { type FetcherData, makeFieldError } from "~/shared/form-utils";
-
-const DeletePageInput = zfd.formData({ id: z.string() });
-
-const handleDelete = async (
- projectId: string,
- request: Request
-): Promise<DeletePageData> => {
- const result = DeletePageInput.safeParse(await request.formData());
- if (result.success === false) {
- return { status: "error", errors: result.error.formErrors };
- }
- const { id } = result.data;
-
- const devBuild = await loadBuildByProjectId(projectId, "dev");
-
- if (devBuild.pages.homePage.id === id) {
- return makeFieldError("id", `Can't delete the home page`);
- }
-
- await deletePage({
- projectId,
- buildId: devBuild.id,
- pageId: id,
- });
-
- return { status: "ok" };
-};
-
-export const action = async ({
- request,
- params,
-}: ActionArgs): Promise<FetcherData<unknown>> => {
- try {
- if (params.projectId === undefined) {
- throw new Error(`Project ID required`);
- }
-
- if (request.method === "DELETE") {
- return await handleDelete(params.projectId, request);
- }
-
- throw new Error(`Method ${request.method} is not supported`);
- } catch (error) {
- sentryException({ error });
- return {
- status: "error",
- errors: error instanceof Error ? error.message : String(error),
- };
- }
-};
-
-export type ErrorData = {
- errors: string;
-};
-
-export const loader = async ({
- params,
-}: LoaderArgs): Promise<Pages | ErrorData> => {
- try {
- if (params.projectId === undefined) {
- throw new Error(`Project ID required`);
- }
-
- const prodBuild = await loadBuildByProjectId(params.projectId, "prod");
-
- if (prodBuild === undefined) {
- throw new Error(
- `Project ${params.projectId} needs to be published first`
- );
- }
-
- return prodBuild.pages;
- } catch (error) {
- sentryException({ error });
- return {
- errors: error instanceof Error ? error.message : String(error),
- };
- }
-};
diff --git a/apps/builder/app/shared/form-utils/validation.ts b/apps/builder/app/shared/form-utils/validation.ts
index 6330a3245f..ca9dc69a68 100644
--- a/apps/builder/app/shared/form-utils/validation.ts
+++ b/apps/builder/app/shared/form-utils/validation.ts
@@ -1,10 +1,6 @@
import { toast } from "@webstudio-is/design-system";
import type { ZodError } from "zod";
-export type FetcherData<Payload> =
- | ({ status: "ok" } & Payload)
- | { status: "error"; errors: string | ZodError["formErrors"] };
-
export const normalizeErrors = (
errors: string | ZodError["formErrors"]
): ZodError["formErrors"] =>
@@ -32,16 +28,3 @@ export const toastUnknownFieldErrors = (
}
}
};
-
-export const makeFieldError = <Payload>(
- fieldName: string,
- error: string
-): FetcherData<Payload> => {
- return {
- status: "error",
- errors: {
- formErrors: [],
- fieldErrors: { [fieldName]: [error] },
- },
- };
-};
diff --git a/apps/builder/app/shared/pages/index.ts b/apps/builder/app/shared/pages/index.ts
index 698795bdbc..d270d13b9c 100644
--- a/apps/builder/app/shared/pages/index.ts
+++ b/apps/builder/app/shared/pages/index.ts
@@ -1,2 +1 @@
-export * from "./types";
export * from "./use-switch-page";
diff --git a/apps/builder/app/shared/pages/types.ts b/apps/builder/app/shared/pages/types.ts
deleted file mode 100644
index 18b33d04d8..0000000000
--- a/apps/builder/app/shared/pages/types.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import type { FetcherData } from "~/shared/form-utils";
-
-// eslint-disable-next-line @typescript-eslint/ban-types
-export type DeletePageData = FetcherData<{}>;
diff --git a/apps/builder/app/shared/router-utils/path-utils.ts b/apps/builder/app/shared/router-utils/path-utils.ts
index cefcf1ce6c..914146b925 100644
--- a/apps/builder/app/shared/router-utils/path-utils.ts
+++ b/apps/builder/app/shared/router-utils/path-utils.ts
@@ -77,9 +77,6 @@ export const authPath = ({
provider: "google" | "github" | "dev";
}) => `/auth/${provider}`;
-export const restPagesPath = ({ projectId }: { projectId: string }) =>
- `/rest/pages/${projectId}`;
-
export const restAssetsPath = ({
projectId,
authToken,
diff --git a/packages/project-build/src/db/build.ts b/packages/project-build/src/db/build.ts
index a745c4a2a2..ca05d11314 100644
--- a/packages/project-build/src/db/build.ts
+++ b/packages/project-build/src/db/build.ts
@@ -6,9 +6,8 @@ import {
Project,
} from "@webstudio-is/prisma-client";
import type { AppContext } from "@webstudio-is/trpc-interface";
-import { findPageByIdOrPath } from "../shared/pages-utils";
import type { Build } from "../types";
-import { type Page, Pages } from "../schema/pages";
+import { Pages } from "../schema/pages";
import {
createInitialBreakpoints,
parseBreakpoints,
@@ -99,23 +98,6 @@ export async function loadBuildByProjectId(
return parseBuild(build);
}
-const updatePages = async (
- { projectId, buildId }: { projectId: Project["id"]; buildId: Build["id"] },
- updater: (currentPages: Pages) => Promise<Pages>
-) => {
- const build = await loadBuildById({ projectId, buildId });
- const updatedPages = Pages.parse(await updater(build.pages));
- const updatedBuild = await prisma.build.update({
- where: {
- id_projectId: { projectId, id: buildId },
- },
- data: {
- pages: JSON.stringify(updatedPages),
- },
- });
- return parseBuild(updatedBuild);
-};
-
const createNewPageInstances = (): Build["instances"] => {
const instanceId = nanoid();
return [
@@ -131,32 +113,6 @@ const createNewPageInstances = (): Build["instances"] => {
];
};
-export const deletePage = async ({
- projectId,
- buildId,
- pageId,
-}: {
- projectId: Project["id"];
- buildId: Build["id"];
- pageId: Page["id"];
-}) => {
- return updatePages({ projectId, buildId }, async (currentPages) => {
- if (pageId === currentPages.homePage.id) {
- throw new Error("Cannot delete home page");
- }
-
- const page = findPageByIdOrPath(currentPages, pageId);
- if (page === undefined) {
- throw new Error(`Page with id "${pageId}" not found`);
- }
-
- return {
- homePage: currentPages.homePage,
- pages: currentPages.pages.filter((page) => page.id !== pageId),
- };
- });
-};
-
/*
* We create "dev" build in two cases:
* 1. when we create a new project