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.

Optimistic rename project (#939)

Oleg Isonen1d5d73691561
diff --git a/apps/designer/app/dashboard/projects/project-dialogs.tsx b/apps/designer/app/dashboard/projects/project-dialogs.tsx
index b5f72c802c..f1164145f9 100644
--- a/apps/designer/app/dashboard/projects/project-dialogs.tsx
+++ b/apps/designer/app/dashboard/projects/project-dialogs.tsx
@@ -21,6 +21,7 @@ import {
} from "./dialog";
import { DashboardProject } from "@webstudio-is/prisma-client";
import { ShareProjectContainer } from "~/shared/share-project";
+import { Title } from "@webstudio-is/project";
const DialogContent = ({
onSubmit,
@@ -95,33 +96,52 @@ const trpc = createTrpcRemixProxy<DashboardProjectRouter>(dashboardProjectPath);
const useCreateProject = () => {
const navigate = useNavigate();
const { send, data, state } = trpc.create.useMutation();
+ const [errors, setErrors] = useState<string>();
useEffect(() => {
- if (data === undefined || "errors" in data) {
+ if (data === undefined) {
return;
}
navigate(designerPath({ projectId: data.id }));
}, [data, navigate]);
+ const handleSubmit = ({ title }: { title: string }) => {
+ const parsed = Title.safeParse(title);
+ const errors =
+ "error" in parsed
+ ? parsed.error.issues.map((issue) => issue.message).join("\n")
+ : undefined;
+ setErrors(errors);
+ if (parsed.success) {
+ send({ title });
+ }
+ };
+
+ const handleOpenChange = () => {
+ setErrors(undefined);
+ };
+
return {
- handleSubmit: send,
- errors: data && "errors" in data ? data.errors : undefined,
+ handleSubmit,
+ handleOpenChange,
state,
+ errors,
};
};
export const CreateProject = () => {
- const { handleSubmit, errors, state } = useCreateProject();
+ const { handleSubmit, handleOpenChange, state, errors } = useCreateProject();
return (
<Dialog
title="New Project"
trigger={<Button prefix={<PlusIcon />}>New Project</Button>}
+ onOpenChange={handleOpenChange}
>
<DialogContent
onSubmit={handleSubmit}
- errors={errors}
placeholder="New Project"
label="Project Title"
+ errors={errors}
primaryButton={
<Button
state={state === "idle" ? undefined : "pending"}
@@ -142,17 +162,20 @@ const useRenameProject = ({
projectId: DashboardProject["id"];
onOpenChange: (isOpen: boolean) => void;
}) => {
- const { send, data, state } = trpc.rename.useMutation();
- const errors = data && "errors" in data ? data.errors : undefined;
+ const { send, state } = trpc.rename.useMutation();
+ const [errors, setErrors] = useState<string>();
- useEffect(() => {
- if (errors === undefined && state === "loading") {
+ const handleSubmit = ({ title }: { title: string }) => {
+ const parsed = Title.safeParse(title);
+ const errors =
+ "error" in parsed
+ ? parsed.error.issues.map((issue) => issue.message).join("\n")
+ : undefined;
+ setErrors(errors);
+ if (parsed.success) {
+ send({ projectId, title });
onOpenChange(false);
}
- }, [errors, state, onOpenChange]);
-
- const handleSubmit = ({ title }: { title: string }) => {
- send({ projectId, title });
};
return {
diff --git a/packages/project/src/db/breakpoints.ts b/packages/project/src/db/breakpoints.ts
index a58992a842..f0c6ee10e9 100644
--- a/packages/project/src/db/breakpoints.ts
+++ b/packages/project/src/db/breakpoints.ts
@@ -6,7 +6,7 @@ import {
prisma,
} from "@webstudio-is/prisma-client";
import { Breakpoints } from "@webstudio-is/css-data";
-import type { Project } from "./schema";
+import type { Project } from "../shared/schema";
import {
authorizeProject,
type AppContext,
diff --git a/packages/project/src/db/build.ts b/packages/project/src/db/build.ts
index d16ec1e8fd..3ec9654178 100644
--- a/packages/project/src/db/build.ts
+++ b/packages/project/src/db/build.ts
@@ -8,7 +8,7 @@ import {
import { Breakpoints } from "@webstudio-is/css-data";
import { StyleSources } from "@webstudio-is/project-build";
import * as db from ".";
-import { Build, Page, Pages } from "./schema";
+import { Build, Page, Pages } from "../shared/schema";
import * as pagesUtils from "../shared/pages";
import { parseStyles, serializeStyles } from "./styles";
diff --git a/packages/project/src/db/project.ts b/packages/project/src/db/project.ts
index cdc43bcf96..0255b20d83 100644
--- a/packages/project/src/db/project.ts
+++ b/packages/project/src/db/project.ts
@@ -7,7 +7,7 @@ import {
type AppContext,
} from "@webstudio-is/trpc-interface/server";
import { v4 as uuid } from "uuid";
-import { Project, Projects } from "./schema";
+import { Project, Projects, Title } from "../shared/schema";
const nanoid = customAlphabet("1234567890abcdefghijklmnopqrstuvwxyz");
@@ -85,7 +85,6 @@ export const loadManyByCurrentUserId = async (
const slugifyOptions = { lower: true, strict: true };
const MIN_DOMAIN_LENGTH = 10;
-const MIN_TITLE_LENGTH = 2;
const generateDomain = (title: string) => {
const slugifiedTitle = slugify(title, slugifyOptions);
@@ -101,9 +100,7 @@ export const create = async (
{ title }: { title: string },
context: AppContext
) => {
- if (title.length < MIN_TITLE_LENGTH) {
- return { errors: `Minimum ${MIN_TITLE_LENGTH} characters required` };
- }
+ Title.parse(title);
const userId = context.authorization.userId;
@@ -161,9 +158,7 @@ export const rename = async (
},
context: AppContext
) => {
- if (title.length < MIN_TITLE_LENGTH) {
- return { errors: `Minimum ${MIN_TITLE_LENGTH} characters required` };
- }
+ Title.parse(title);
const canEdit = await authorizeProject.hasProjectPermit(
{ projectId, permit: "edit" },
diff --git a/packages/project/src/db/props.ts b/packages/project/src/db/props.ts
index 858a3eee8b..e0447076aa 100644
--- a/packages/project/src/db/props.ts
+++ b/packages/project/src/db/props.ts
@@ -3,7 +3,7 @@ import { type Tree, StoredProps, Props } from "@webstudio-is/project-build";
import { applyPatches, type Patch } from "immer";
import { prisma } from "@webstudio-is/prisma-client";
import { formatAsset } from "@webstudio-is/asset-uploader/server";
-import type { Project } from "./schema";
+import type { Project } from "../shared/schema";
import {
authorizeProject,
type AppContext,
diff --git a/packages/project/src/db/style-source-selections.ts b/packages/project/src/db/style-source-selections.ts
index e95a113ba4..fdb4091b67 100644
--- a/packages/project/src/db/style-source-selections.ts
+++ b/packages/project/src/db/style-source-selections.ts
@@ -5,7 +5,7 @@ import {
type AppContext,
} from "@webstudio-is/trpc-interface/server";
import { StyleSourceSelections, type Tree } from "@webstudio-is/project-build";
-import type { Project } from "./schema";
+import type { Project } from "../shared/schema";
export const patch = async (
{ treeId, projectId }: { treeId: Tree["id"]; projectId: Project["id"] },
diff --git a/packages/project/src/db/style-sources.ts b/packages/project/src/db/style-sources.ts
index ec65464a39..eb54345650 100644
--- a/packages/project/src/db/style-sources.ts
+++ b/packages/project/src/db/style-sources.ts
@@ -5,7 +5,7 @@ import {
type AppContext,
} from "@webstudio-is/trpc-interface/server";
import { StyleSources } from "@webstudio-is/project-build";
-import type { Build, Project } from "./schema";
+import type { Build, Project } from "../shared/schema";
export const patch = async (
{ buildId, projectId }: { buildId: Build["id"]; projectId: Project["id"] },
diff --git a/packages/project/src/db/styles.ts b/packages/project/src/db/styles.ts
index 3d056cdda6..1c350377fd 100644
--- a/packages/project/src/db/styles.ts
+++ b/packages/project/src/db/styles.ts
@@ -4,7 +4,7 @@ import { prisma } from "@webstudio-is/prisma-client";
import type { Asset } from "@webstudio-is/asset-uploader";
import { formatAsset } from "@webstudio-is/asset-uploader/server";
import { StoredStyles, Styles } from "@webstudio-is/project-build";
-import type { Build, Project } from "./schema";
+import type { Build, Project } from "../shared/schema";
import {
authorizeProject,
type AppContext,
diff --git a/packages/project/src/db/tree.ts b/packages/project/src/db/tree.ts
index 02316b8d35..86697179c8 100644
--- a/packages/project/src/db/tree.ts
+++ b/packages/project/src/db/tree.ts
@@ -11,7 +11,7 @@ import {
import { prisma, type Prisma } from "@webstudio-is/prisma-client";
import { utils } from "../index";
import { parseProps, serializeProps } from "./props";
-import type { Project } from "./schema";
+import type { Project } from "../shared/schema";
import {
authorizeProject,
type AppContext,
diff --git a/packages/project/src/index.ts b/packages/project/src/index.ts
index 07766df5db..a5a08fd3e8 100644
--- a/packages/project/src/index.ts
+++ b/packages/project/src/index.ts
@@ -9,7 +9,7 @@ export const utils = {
} as const;
export * from "./shared/styles";
-export * from "./db/schema";
+export * from "./shared/schema";
export * from "./shared/canvas-components";
export type { InstanceInsertionSpec } from "./shared/tree-utils";
export type { ProjectRouter } from "./trpc";
diff --git a/packages/project/src/shared/pages/find-by-id-or-path.ts b/packages/project/src/shared/pages/find-by-id-or-path.ts
index db280ea623..f3fc717e13 100644
--- a/packages/project/src/shared/pages/find-by-id-or-path.ts
+++ b/packages/project/src/shared/pages/find-by-id-or-path.ts
@@ -1,4 +1,4 @@
-import { type Pages, type Page } from "../../db/schema";
+import { type Pages, type Page } from "../schema";
export const findByIdOrPath = (
pages: Pages,
diff --git a/packages/project/src/db/schema.ts b/packages/project/src/shared/schema.ts
similarity index 92%
rename from packages/project/src/db/schema.ts
rename to packages/project/src/shared/schema.ts
index 44d2f4fd2e..d17c202d3e 100644
--- a/packages/project/src/db/schema.ts
+++ b/packages/project/src/shared/schema.ts
@@ -3,9 +3,18 @@ import type { Breakpoints } from "@webstudio-is/css-data";
import type { Styles, StyleSources } from "@webstudio-is/project-build";
import type { Data } from "@webstudio-is/react-sdk";
+const MIN_TITLE_LENGTH = 2;
+
+export const Title = z
+ .string()
+ .refine(
+ (val) => val.length >= MIN_TITLE_LENGTH,
+ `Minimum ${MIN_TITLE_LENGTH} characters required`
+ );
+
export const Project = z.object({
id: z.string(),
- title: z.string(),
+ title: Title,
createdAt: z.date().transform((date) => date.toISOString()),
userId: z.string().nullable(),
isDeleted: z.boolean(),
@@ -19,7 +28,7 @@ export type Projects = z.infer<typeof Projects>;
const commonPageFields = {
id: z.string(),
name: z.string().refine((val) => val !== "", "Can't be empty"),
- title: z.string(),
+ title: Title,
meta: z.record(z.string(), z.string()),
treeId: z.string(),
} as const;
diff --git a/packages/project/src/trpc/project-router.ts b/packages/project/src/trpc/project-router.ts
index a655db2fb7..f49f8ee9ba 100644
--- a/packages/project/src/trpc/project-router.ts
+++ b/packages/project/src/trpc/project-router.ts
@@ -1,12 +1,13 @@
import * as db from "../db";
import { z } from "zod";
import { router, procedure } from "./trpc";
+import { Title } from "../shared/schema";
export const projectRouter = router({
rename: procedure
.input(
z.object({
- title: z.string(),
+ title: Title,
projectId: z.string(),
})
)
@@ -26,7 +27,7 @@ export const projectRouter = router({
return await db.project.duplicate(input.projectId, ctx);
}),
create: procedure
- .input(z.object({ title: z.string() }))
+ .input(z.object({ title: Title }))
.mutation(async ({ input, ctx }) => {
return await db.project.create(input, ctx);
}),