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.

refactor: move project cloning into sql function (#3790)

Bogdan Chadkin6c4b5f5e0e5f
diff --git a/.github/workflows/migrate.yaml b/.github/workflows/migrate.yaml
index adc034cc1d..33ab6f3944 100644
--- a/.github/workflows/migrate.yaml
+++ b/.github/workflows/migrate.yaml
@@ -31,7 +31,7 @@ jobs:
runs-on: ubuntu-latest
environment:
- name: ${{ endsWith(github.ref_name, '.staging') && 'postgres_production' || 'postgres_development' }}
+ name: ${{ (startsWith(github.ref_name, 'release') && endsWith(github.ref_name, '.staging')) && 'postgres_production' || 'postgres_development' }}
timeout-minutes: 20
@@ -66,7 +66,7 @@ jobs:
runs-on: ubuntu-latest
environment:
- name: ${{ endsWith(github.ref_name, '.staging') && 'postgres_production' || 'postgres_development' }}
+ name: ${{ (startsWith(github.ref_name, 'release') && endsWith(github.ref_name, '.staging')) && 'postgres_production' || 'postgres_development' }}
steps:
- uses: actions/checkout@v4
diff --git a/packages/asset-uploader/src/db/clone.ts b/packages/asset-uploader/src/db/clone.ts
deleted file mode 100644
index 3e65cc15ee..0000000000
--- a/packages/asset-uploader/src/db/clone.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import { Prisma, prisma, type Project } from "@webstudio-is/prisma-client";
-import {
- authorizeProject,
- type AppContext,
- AuthorizationError,
-} from "@webstudio-is/trpc-interface/index.server";
-
-export const cloneAssets = async (
- {
- fromProjectId,
- toProjectId,
- checkPermissions = true,
- }: {
- fromProjectId: Project["id"];
- toProjectId: Project["id"];
-
- /**
- * Don't use unless absolutely have to (e.g. because of transactions)
- * and unless it's obvious on the call project that permission is checked
- */
- checkPermissions?: boolean;
- },
- context: AppContext,
- client: Prisma.TransactionClient = prisma
-) => {
- if (checkPermissions) {
- const canView = await authorizeProject.hasProjectPermit(
- { projectId: fromProjectId, permit: "view" },
- context
- );
-
- if (canView === false) {
- throw new AuthorizationError(
- "You don't have access to this project assets"
- );
- }
-
- const canEdit = await authorizeProject.hasProjectPermit(
- { projectId: toProjectId, permit: "edit" },
- context
- );
-
- if (canEdit === false) {
- throw new AuthorizationError(
- "You don't have access to create this project assets"
- );
- }
- }
-
- const assetFields = Object.keys(client.asset.fields);
-
- const assetFieldsFiltered = assetFields.filter(
- (field) => field !== "projectId"
- );
-
- const selectQuery = Prisma.sql`
- SELECT
- ${Prisma.raw(
- assetFieldsFiltered.map((field) => `a."${field}"`).join(", ")
- )}, ${toProjectId} as "projectId"
- FROM "Asset" a, "File" f
- WHERE
- a.name = f.name AND
- f.status = 'UPLOADED' AND
- a."projectId" = ${fromProjectId}`;
-
- const insertQuery = Prisma.sql`
- INSERT INTO "Asset"(${Prisma.raw(
- assetFieldsFiltered.map((field) => `"${field}"`).join(", ")
- )}, "projectId") ${selectQuery}
- `;
-
- await client.$executeRaw(insertQuery);
-};
diff --git a/packages/asset-uploader/src/db/index.ts b/packages/asset-uploader/src/db/index.ts
index d405a57654..01665bd447 100644
--- a/packages/asset-uploader/src/db/index.ts
+++ b/packages/asset-uploader/src/db/index.ts
@@ -1,2 +1 @@
export * from "./load";
-export * from "./clone";
diff --git a/packages/postgrest/src/__generated__/db-types.ts b/packages/postgrest/src/__generated__/db-types.ts
index ca1aede032..06a6086f22 100644
--- a/packages/postgrest/src/__generated__/db-types.ts
+++ b/packages/postgrest/src/__generated__/db-types.ts
@@ -739,13 +739,23 @@ export type Database = {
};
};
Functions: {
- patch_map: {
+ clone_project: {
Args: {
- data_str: string;
- input_type: string;
- patches_str: string;
+ project_id: string;
+ user_id: string;
+ title: string;
+ domain: string;
+ };
+ Returns: {
+ createdAt: string;
+ domain: string;
+ id: string;
+ isDeleted: boolean;
+ marketplaceApprovalStatus: Database["public"]["Enums"]["MarketplaceApprovalStatus"];
+ previewImageAssetId: string | null;
+ title: string;
+ userId: string | null;
};
- Returns: string;
};
};
Enums: {
diff --git a/packages/prisma-client/migrations-cli/commands.ts b/packages/prisma-client/migrations-cli/commands.ts
index e11a103690..8a0ee574e5 100644
--- a/packages/prisma-client/migrations-cli/commands.ts
+++ b/packages/prisma-client/migrations-cli/commands.ts
@@ -144,11 +144,6 @@ export const createSchema = async ({ name }: { name: string }) => {
const sqlScript = await prismaMigrations.cliDiff();
- if (isNoopSql(sqlScript ?? "")) {
- logger.info("No changes to apply");
- process.exit(0);
- }
-
const migrationName = prismaMigrations.generateMigrationName(name);
const filePath = prismaMigrations.getMigrationFilePath(migrationName, "sql");
diff --git a/packages/prisma-client/prisma/migrations/20240725003228_clone_project/migration.sql b/packages/prisma-client/prisma/migrations/20240725003228_clone_project/migration.sql
new file mode 100644
index 0000000000..0496aff176
--- /dev/null
+++ b/packages/prisma-client/prisma/migrations/20240725003228_clone_project/migration.sql
@@ -0,0 +1,68 @@
+DROP FUNCTION IF EXISTS clone_project;
+CREATE FUNCTION clone_project(
+ project_id text,
+ user_id text,
+ title text,
+ domain text
+) RETURNS "Project" AS $$
+DECLARE
+ old_project "Project";
+ new_project "Project";
+BEGIN
+ SELECT * FROM "Project" WHERE id=project_id INTO old_project;
+
+ INSERT INTO "Project" (
+ id,
+ "userId",
+ title,
+ domain,
+ "previewImageAssetId"
+ )
+ VALUES (
+ extensions.uuid_generate_v4(),
+ user_id,
+ title,
+ domain,
+ old_project."previewImageAssetId"
+ )
+ RETURNING * INTO new_project;
+
+ INSERT INTO "Asset" (id, name, "projectId")
+ SELECT asset.id, asset.name, new_project.id AS "projectId"
+ FROM "Asset" AS asset, "File" AS file
+ WHERE
+ asset.name = file.name AND
+ file.status = 'UPLOADED' AND
+ asset."projectId" = old_project.id;
+
+ INSERT INTO "Build" (
+ id,
+ "projectId",
+ pages,
+ "styleSources",
+ "styleSourceSelections",
+ styles,
+ breakpoints,
+ props,
+ instances,
+ "dataSources",
+ resources
+ )
+ SELECT
+ extensions.uuid_generate_v4() AS id,
+ new_project.id AS "projectId",
+ pages,
+ "styleSources",
+ "styleSourceSelections",
+ styles,
+ breakpoints,
+ props,
+ instances,
+ "dataSources",
+ resources
+ FROM "Build"
+ WHERE "projectId" = old_project.id AND deployment IS NULL;
+
+ RETURN new_project;
+END;
+$$ LANGUAGE plpgsql;
diff --git a/packages/project-build/src/db/build.ts b/packages/project-build/src/db/build.ts
index 7fd9425aea..e619d1f9c6 100644
--- a/packages/project-build/src/db/build.ts
+++ b/packages/project-build/src/db/build.ts
@@ -265,7 +265,7 @@ const zBuildCloneResult = z
.length(1)
.transform((result) => result[0]);
-export const cloneBuild = async (
+const cloneBuild = async (
props: {
fromProjectId: Build["projectId"];
toProjectId: Build["projectId"];
diff --git a/packages/project/src/db/project.ts b/packages/project/src/db/project.ts
index 3d5b47abc8..9fe400699e 100644
--- a/packages/project/src/db/project.ts
+++ b/packages/project/src/db/project.ts
@@ -1,14 +1,10 @@
import { prisma, Prisma } from "@webstudio-is/prisma-client";
-import { cloneAssets } from "@webstudio-is/asset-uploader/index.server";
import {
authorizeProject,
type AppContext,
AuthorizationError,
} from "@webstudio-is/trpc-interface/index.server";
-import {
- createBuild,
- cloneBuild,
-} from "@webstudio-is/project-build/index.server";
+import { createBuild } from "@webstudio-is/project-build/index.server";
import { MarketplaceApprovalStatus, Project, Title } from "../shared/schema";
import { generateDomain, validateProjectDomain } from "./project-domain";
@@ -158,54 +154,21 @@ export const clone = async (
}
const { userId } = context.authorization;
-
if (userId === undefined) {
throw new Error("The user must be authenticated to clone the project");
}
- const newProjectId = crypto.randomUUID();
-
- const clonedProject = await prisma.$transaction(async (client) => {
- await cloneAssets(
- {
- fromProjectId: project.id,
- toProjectId: newProjectId,
-
- // Permission check on newProjectId will fail until this transaction is committed.
- // We have to skip it, but it's ok because registerProjectOwner is right above
- checkPermissions: false,
- },
- context,
- client
- );
-
- const clonedProject = await client.project.create({
- data: {
- id: newProjectId,
- userId: userId,
- title: title ?? `${project.title} (copy)`,
- domain: generateDomain(project.title),
- previewImageAssetId: project.previewImageAsset?.id,
- },
- include: {
- previewImageAsset: true,
- },
- });
-
- await cloneBuild(
- {
- fromProjectId: project.id,
- toProjectId: newProjectId,
- deployment: undefined,
- },
- context,
- client
- );
-
- return clonedProject;
+ const clonedProject = await context.postgrest.client.rpc("clone_project", {
+ project_id: projectId,
+ user_id: userId,
+ title: title ?? `${project.title} (copy)`,
+ domain: generateDomain(project.title),
});
+ if (clonedProject.error) {
+ throw clonedProject.error;
+ }
- return Project.parse(clonedProject);
+ return { id: clonedProject.data.id };
};
export const updateDomain = async (