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 Transaction already closed: Could not perform operation on InstanceProps (#811)
Ivan Starkovd17b7a1b276d
diff --git a/apps/designer/app/shared/db/misc.server.ts b/apps/designer/app/shared/db/misc.server.tsindex ccb5ff63c0..5352fd7ce4 100644--- a/apps/designer/app/shared/db/misc.server.ts+++ b/apps/designer/app/shared/db/misc.server.ts@@ -1,4 +1,5 @@import { db } from "@webstudio-is/project/server";+import { prisma } from "@webstudio-is/prisma-client";/*** Conceptually publishing is cloning all data that affects user site@@ -24,7 +25,10 @@ export const publish = async ({}const devBuild = await db.build.loadByProjectId(projectId, "dev");- await db.build.create(project.id, "prod", devBuild);++ await prisma.$transaction(async (client) => {+ await db.build.create(project.id, "prod", devBuild, client);+ });const updatedProject = await db.project.update({id: projectId,diff --git a/packages/prisma-client/prisma/migrations/20230119013820_instance-props-uniq/migration.sql b/packages/prisma-client/prisma/migrations/20230119013820_instance-props-uniq/migration.sqlnew file mode 100644index 0000000000..a6f89896a8--- /dev/null+++ b/packages/prisma-client/prisma/migrations/20230119013820_instance-props-uniq/migration.sql@@ -0,0 +1,2 @@+-- CreateIndex+CREATE UNIQUE INDEX "InstanceProps_instanceId_treeId_key" ON "InstanceProps"("instanceId", "treeId");diff --git a/packages/prisma-client/prisma/schema.prisma b/packages/prisma-client/prisma/schema.prismaindex 19ba32c32b..0fb09682cb 100644--- a/packages/prisma-client/prisma/schema.prisma+++ b/packages/prisma-client/prisma/schema.prisma@@ -89,6 +89,8 @@ model InstanceProps {instanceId StringtreeId Stringprops String @default("[]")++ @@unique([instanceId, treeId])}model Breakpoints {diff --git a/packages/prisma-client/src/prisma.ts b/packages/prisma-client/src/prisma.tsindex 64eebe1e0b..ac499311de 100644--- a/packages/prisma-client/src/prisma.ts+++ b/packages/prisma-client/src/prisma.ts@@ -10,7 +10,8 @@ declare global {// this fixes the issue with `warn(prisma-client) There are already 10 instances of Prisma Client actively running.`// explanation here// https://www.prisma.io/docs/guides/database/troubleshooting-orm/help-articles/nextjs-prisma-client-dev-practices-export const prisma = global.prisma || new PrismaClient();+export const prisma =+ global.prisma || new PrismaClient(/* { log: ["query"] } */);if (process.env.NODE_ENV !== "production") {global.prisma = prisma;diff --git a/packages/project/src/db/build.ts b/packages/project/src/db/build.tsindex bc15445e67..9887c18dca 100644--- a/packages/project/src/db/build.ts+++ b/packages/project/src/db/build.ts@@ -201,21 +201,24 @@ const clonePages = async (export async function create(projectId: Build["projectId"],env: "prod",- sourceBuild: Build+ sourceBuild: Build | undefined,+ client: Prisma.TransactionClient): Promise<void>;export async function create(projectId: Build["projectId"],env: "dev",- sourceBuild?: Build+ sourceBuild: Build | undefined,+ client: Prisma.TransactionClient): Promise<void>;// eslint-disable-next-line func-styleexport async function create(projectId: Build["projectId"],env: "dev" | "prod",- sourceBuild?: Build+ sourceBuild: Build | undefined,+ client: Prisma.TransactionClient): Promise<void> {if (env === "dev") {- const count = await prisma.build.count({+ const count = await client.build.count({where: { projectId, isDev: true },});@@ -232,31 +235,29 @@ export async function create(? (await db.breakpoints.load(sourceBuild.id)).values: db.breakpoints.createValues();- await prisma.$transaction(async (client) => {- const pages =- sourceBuild === undefined- ? await createPages(client)- : await clonePages(sourceBuild.pages, client);-- if (env === "prod") {- await client.build.updateMany({- where: { projectId: projectId, isProd: true },- data: { isProd: false },- });- }+ const pages =+ sourceBuild === undefined+ ? await createPages(client)+ : await clonePages(sourceBuild.pages, client);- const build = await client.build.create({- data: {- projectId,- pages: JSON.stringify(pages),- isDev: env === "dev",- isProd: env === "prod",- },+ if (env === "prod") {+ await client.build.updateMany({+ where: { projectId: projectId, isProd: true },+ data: { isProd: false },});+ }- await db.breakpoints.create(build.id, breakpointsValues, client);- if (sourceBuild) {- await designTokensDb.clone(sourceBuild.id, build.id, client);- }+ const build = await client.build.create({+ data: {+ projectId,+ pages: JSON.stringify(pages),+ isDev: env === "dev",+ isProd: env === "prod",+ },});++ await db.breakpoints.create(build.id, breakpointsValues, client);+ if (sourceBuild) {+ await designTokensDb.clone(sourceBuild.id, build.id, client);+ }}diff --git a/packages/project/src/db/project.ts b/packages/project/src/db/project.tsindex f73351b9fe..13dbdc802b 100644--- a/packages/project/src/db/project.ts+++ b/packages/project/src/db/project.ts@@ -67,15 +67,19 @@ export const create = async ({throw new Error(`Minimum ${MIN_TITLE_LENGTH} characters required`);}- const project = await prisma.project.create({- data: {- userId,- title,- domain: generateDomain(title),- },- });+ const project = await prisma.$transaction(async (client) => {+ const project = await client.project.create({+ data: {+ userId,+ title,+ domain: generateDomain(title),+ },+ });- await db.build.create(project.id, "dev");+ await db.build.create(project.id, "dev", undefined, client);++ return project;+ });return project;};@@ -92,15 +96,19 @@ export const clone = async (clonableDomain: string, userId: string) => {throw new Error("Expected project to be published first");}- const project = await prisma.project.create({- data: {- userId,- title: clonableProject.title,- domain: generateDomain(clonableProject.title),- },- });+ const project = await prisma.$transaction(async (client) => {+ const project = await client.project.create({+ data: {+ userId,+ title: clonableProject.title,+ domain: generateDomain(clonableProject.title),+ },+ });- await db.build.create(project.id, "dev", prodBuild);+ await db.build.create(project.id, "dev", prodBuild, client);++ return project;+ });return project;};diff --git a/packages/project/src/db/props.ts b/packages/project/src/db/props.tsindex e79667a7e3..9d1102909f 100644--- a/packages/project/src/db/props.ts+++ b/packages/project/src/db/props.ts@@ -137,9 +137,9 @@ export const clone = async (treeId: nextTreeId,}));- for (const prop of data) {- await client.instanceProps.create({ data: prop });- }+ await client.instanceProps.createMany({+ data,+ });};export const patch = async (@@ -175,22 +175,19 @@ export const patch = async (const propsString = JSON.stringify(propsDb);- const { count } = await prisma.instanceProps.updateMany({- where: { instanceId, treeId },- data: {+ await prisma.instanceProps.upsert({+ // eslint-disable-next-line camelcase+ where: { instanceId_treeId: { instanceId, treeId } },+ create: {+ id: uuid(),+ instanceId,+ treeId,+ props: propsString,+ },+ update: {props: propsString,},});- if (count === 0) {- await prisma.instanceProps.create({- data: {- id: uuid(),- instanceId,- treeId,- props: propsString,- },- });- }}));};