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.

fix: Improve marketplace performance (#3017)

Ivan Starkovcf51f8133050
diff --git a/apps/builder/app/routes/trpc.$.ts b/apps/builder/app/routes/trpc.$.ts
index ef10d82bc2..f5b4e8dafe 100644
--- a/apps/builder/app/routes/trpc.$.ts
+++ b/apps/builder/app/routes/trpc.$.ts
@@ -19,6 +19,11 @@ export const action = async ({ request }: ActionArgs) => {
endpoint: "/trpc",
batching: { enabled: true },
responseMeta(opts) {
+ // Disable trpc cache
+ if (process.env.NODE_ENV !== "production") {
+ return {};
+ }
+
// tRPC batches multiple requests into a single network call.
// The `paths` array lists all request paths included in the batch.
const { paths, errors, type, ctx } = opts;
diff --git a/apps/builder/app/shared/marketplace/db.server.ts b/apps/builder/app/shared/marketplace/db.server.ts
index 316e549966..b25f87350a 100644
--- a/apps/builder/app/shared/marketplace/db.server.ts
+++ b/apps/builder/app/shared/marketplace/db.server.ts
@@ -30,51 +30,22 @@ export const getBuildProdData = async (
export const getAllApprovedProjectIds = async (): Promise<
Array<Project["id"]>
> => {
- const projects = await prisma.project.findMany({
- where: {
- isDeleted: false,
- marketplaceApprovalStatus: "APPROVED",
- NOT: {
- latestBuild: null,
- },
- },
- select: {
- id: true,
- },
- });
+ const approvedMarketplaceProducts =
+ await prisma.approvedMarketplaceProduct.findMany();
- return projects.map((project) => project.id);
+ return approvedMarketplaceProducts.map(
+ (approvedMarketplaceProduct) => approvedMarketplaceProduct.projectId
+ );
};
export const getItems = async (): Promise<Array<MarketplaceOverviewItem>> => {
- const projects = await prisma.project.findMany({
- where: {
- isDeleted: false,
- marketplaceApprovalStatus: "APPROVED",
- NOT: {
- latestBuild: null,
- },
- },
- select: {
- id: true,
- latestBuild: {
- select: {
- build: {
- select: { id: true, marketplaceProduct: true },
- },
- },
- },
- },
- });
+ const approvedMarketplaceProducts =
+ await prisma.approvedMarketplaceProduct.findMany();
const items = [];
- for (const project of projects) {
- if (project.latestBuild === null) {
- continue;
- }
-
+ for (const approvedMarketplaceProduct of approvedMarketplaceProducts) {
const parsedProduct = MarketplaceProduct.safeParse(
- parseConfig(project.latestBuild.build.marketplaceProduct)
+ parseConfig(approvedMarketplaceProduct.marketplaceProduct)
);
if (parsedProduct.success === false) {
@@ -83,7 +54,7 @@ export const getItems = async (): Promise<Array<MarketplaceOverviewItem>> => {
}
items.push({
- projectId: project.id,
+ projectId: approvedMarketplaceProduct.projectId,
...parsedProduct.data,
});
}
diff --git a/packages/prisma-client/prisma/migrations/20240315173349_add-approved-marketplace-product/migration.sql b/packages/prisma-client/prisma/migrations/20240315173349_add-approved-marketplace-product/migration.sql
new file mode 100644
index 0000000000..77e811cb32
--- /dev/null
+++ b/packages/prisma-client/prisma/migrations/20240315173349_add-approved-marketplace-product/migration.sql
@@ -0,0 +1,32 @@
+-- CreateIndex
+CREATE INDEX "Build_projectId_createdAt_idx" ON "Build"("projectId", "createdAt" DESC);
+COMMENT ON INDEX "Build_projectId_createdAt_idx" IS 'Used to speedup ApprovedMarketplaceProduct view';
+
+-- CreateIndex
+CREATE INDEX "Project_isDeleted_marketplaceApprovalStatus_idx" ON "Project"("isDeleted", "marketplaceApprovalStatus");
+COMMENT ON INDEX "Project_isDeleted_marketplaceApprovalStatus_idx" IS 'Used to speedup ApprovedMarketplaceProduct view';
+
+CREATE VIEW "ApprovedMarketplaceProduct" AS
+SELECT DISTINCT ON (build."projectId")
+ build."projectId",
+ build."marketplaceProduct"
+FROM
+ "Build" build
+WHERE
+ build.deployment IS NOT NULL -- published
+ AND build."projectId" IN (
+ SELECT
+ "id"
+ FROM
+ "Project"
+ WHERE ("isDeleted" = FALSE
+ AND "marketplaceApprovalStatus" = CAST('APPROVED'::text AS "MarketplaceApprovalStatus")))
+ORDER BY
+ build."projectId",
+ build."createdAt" DESC,
+ build.id;
+
+COMMENT ON VIEW "ApprovedMarketplaceProduct" IS '
+Get latest published build.marketplaceProduct
+for a non deleted projects with marketplaceApprovalStatus=APPROVED
+';
diff --git a/packages/prisma-client/prisma/schema.prisma b/packages/prisma-client/prisma/schema.prisma
index df70f04536..372b354842 100644
--- a/packages/prisma-client/prisma/schema.prisma
+++ b/packages/prisma-client/prisma/schema.prisma
@@ -156,6 +156,8 @@ model Project {
@@unique([id, isDeleted])
@@unique([domain, isDeleted])
@@unique([id, domain])
+ // ApprovedMarketplaceProduct view performance index
+ @@index([isDeleted, marketplaceApprovalStatus])
}
enum PublishStatus {
@@ -198,6 +200,8 @@ model Build {
latestBuildPerProject LatestBuildPerProject?
@@id([id, projectId])
+ // ApprovedMarketplaceProduct view performance index
+ @@index([projectId, createdAt(sort: Desc)])
}
enum AuthorizationRelation {
@@ -329,3 +333,8 @@ view DashboardProject {
isPublished Boolean
marketplaceApprovalStatus MarketplaceApprovalStatus @default(UNLISTED)
}
+
+view ApprovedMarketplaceProduct {
+ projectId String @id
+ marketplaceProduct String
+}