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: migrate dashboard to postgrest (#3902)

Bogdan Chadkin0c6a5ebbbaa4
diff --git a/apps/builder/app/builder/features/topbar/share.tsx b/apps/builder/app/builder/features/topbar/share.tsx
index 34d0a228ef..24380c9b18 100644
--- a/apps/builder/app/builder/features/topbar/share.tsx
+++ b/apps/builder/app/builder/features/topbar/share.tsx
@@ -10,7 +10,6 @@ import {
Tooltip,
rawTheme,
} from "@webstudio-is/design-system";
-import type { Project } from "@webstudio-is/prisma-client";
import { ShareProjectContainer } from "~/shared/share-project";
import { $authPermit } from "~/shared/nano-states";
import { $isShareDialogOpen } from "~/builder/shared/nano-states";
@@ -19,7 +18,7 @@ export const ShareButton = ({
projectId,
hasProPlan,
}: {
- projectId: Project["id"];
+ projectId: string;
hasProPlan: boolean;
}) => {
const isShareDialogOpen = useStore($isShareDialogOpen);
diff --git a/apps/builder/app/dashboard/projects/project-dialogs.tsx b/apps/builder/app/dashboard/projects/project-dialogs.tsx
index 6deba630b3..9ebd6ddae7 100644
--- a/apps/builder/app/dashboard/projects/project-dialogs.tsx
+++ b/apps/builder/app/dashboard/projects/project-dialogs.tsx
@@ -1,3 +1,4 @@
+import { useRevalidator } from "@remix-run/react";
import { useEffect, useState } from "react";
import { useNavigate } from "@remix-run/react";
import {
@@ -17,12 +18,10 @@ import {
theme,
} from "@webstudio-is/design-system";
import { PlusIcon } from "@webstudio-is/icons";
-import type { DashboardProject } from "@webstudio-is/prisma-client";
import { Title } from "@webstudio-is/project";
import { builderPath } from "~/shared/router-utils";
import { ShareProjectContainer } from "~/shared/share-project";
import { trpcClient } from "~/shared/trpc/trpc-client";
-import { useRevalidator } from "@remix-run/react";
type DialogProps = {
title: string;
@@ -188,7 +187,7 @@ const useRenameProject = ({
projectId,
onOpenChange,
}: {
- projectId: DashboardProject["id"];
+ projectId: string;
onOpenChange: (isOpen: boolean) => void;
}) => {
const { send, state } = trpcClient.dashboardProject.rename.useMutation();
@@ -225,7 +224,7 @@ export const RenameProjectDialog = ({
}: {
isOpen: boolean;
title: string;
- projectId: DashboardProject["id"];
+ projectId: string;
onOpenChange: (isOpen: boolean) => void;
}) => {
const { handleSubmit, errors, state } = useRenameProject({
@@ -258,7 +257,7 @@ const useDeleteProject = ({
onOpenChange,
onHiddenChange,
}: {
- projectId: DashboardProject["id"];
+ projectId: string;
title: string;
onOpenChange: (isOpen: boolean) => void;
onHiddenChange: (isHidden: boolean) => void;
@@ -309,7 +308,7 @@ export const DeleteProjectDialog = ({
}: {
isOpen: boolean;
title: string;
- projectId: DashboardProject["id"];
+ projectId: string;
onOpenChange: (isOpen: boolean) => void;
onHiddenChange: (isHidden: boolean) => void;
}) => {
@@ -361,7 +360,7 @@ export const DeleteProjectDialog = ({
);
};
-export const useCloneProject = (projectId: DashboardProject["id"]) => {
+export const useCloneProject = (projectId: string) => {
const { send } = trpcClient.dashboardProject.clone.useMutation();
const revalidator = useRevalidator();
@@ -380,7 +379,7 @@ export const ShareProjectDialog = ({
}: {
isOpen: boolean;
onOpenChange: (isOpen: boolean) => void;
- projectId: DashboardProject["id"];
+ projectId: string;
hasProPlan: boolean;
}) => {
return (
diff --git a/apps/builder/app/shared/share-project/share-project-container.tsx b/apps/builder/app/shared/share-project/share-project-container.tsx
index 28db714319..c601533367 100644
--- a/apps/builder/app/shared/share-project/share-project-container.tsx
+++ b/apps/builder/app/shared/share-project/share-project-container.tsx
@@ -1,11 +1,10 @@
-import { ShareProject, type LinkOptions } from "./share-project";
-import { builderUrl } from "~/shared/router-utils";
import { useEffect, useRef, useState } from "react";
import { useDebouncedCallback } from "use-debounce";
-import type { Project } from "@webstudio-is/prisma-client";
+import { builderUrl } from "~/shared/router-utils";
import { trpcClient } from "../trpc/trpc-client";
+import { ShareProject, type LinkOptions } from "./share-project";
-const useShareProjectContainer = (projectId: Project["id"]) => {
+const useShareProjectContainer = (projectId: string) => {
const {
data,
load,
@@ -89,7 +88,7 @@ const useShareProjectContainer = (projectId: Project["id"]) => {
};
type ShareButtonProps = {
- projectId: Project["id"];
+ projectId: string;
hasProPlan: boolean;
};
diff --git a/apps/builder/package.json b/apps/builder/package.json
index e78a2e9e54..34b3edd90d 100644
--- a/apps/builder/package.json
+++ b/apps/builder/package.json
@@ -131,7 +131,7 @@
"html-tags": "^3.3.1",
"react-router-dom": "^6.26.0",
"react-test-renderer": "18.3.0-canary-14898b6a9-20240318",
- "type-fest": "^4.3.1",
+ "type-fest": "^4.24.0",
"typescript": "5.5.2",
"vite": "^5.3.5"
},
diff --git a/packages/ai/package.json b/packages/ai/package.json
index 3502085410..5c6c25328a 100644
--- a/packages/ai/package.json
+++ b/packages/ai/package.json
@@ -15,7 +15,7 @@
"@webstudio-is/jest-config": "workspace:^",
"@webstudio-is/tsconfig": "workspace:^",
"fast-glob": "^3.2.12",
- "type-fest": "^4.3.1",
+ "type-fest": "^4.24.0",
"typescript": "5.5.2"
},
"exports": {
diff --git a/packages/css-data/package.json b/packages/css-data/package.json
index 5e05d33b2e..6a28f77da4 100644
--- a/packages/css-data/package.json
+++ b/packages/css-data/package.json
@@ -23,7 +23,7 @@
"@webstudio-is/tsconfig": "workspace:*",
"html-tags": "^3.3.1",
"mdn-data": "2.8.0",
- "type-fest": "^4.3.1",
+ "type-fest": "^4.24.0",
"typescript": "5.5.2",
"zod": "^3.22.4"
},
diff --git a/packages/dashboard/package.json b/packages/dashboard/package.json
index a27a712fc4..c7a132bba3 100644
--- a/packages/dashboard/package.json
+++ b/packages/dashboard/package.json
@@ -9,9 +9,9 @@
"typecheck": "tsc"
},
"dependencies": {
- "@webstudio-is/prisma-client": "workspace:*",
"@webstudio-is/project": "workspace:*",
"@webstudio-is/trpc-interface": "workspace:*",
+ "type-fest": "^4.24.0",
"zod": "^3.22.4"
},
"devDependencies": {
diff --git a/packages/dashboard/src/db/projects.ts b/packages/dashboard/src/db/projects.ts
index c4f5d6748e..bc6b0a39b3 100644
--- a/packages/dashboard/src/db/projects.ts
+++ b/packages/dashboard/src/db/projects.ts
@@ -1,56 +1,41 @@
-import { prisma } from "@webstudio-is/prisma-client";
+import type { SetNonNullable } from "type-fest";
import type { AppContext } from "@webstudio-is/trpc-interface/index.server";
-import { DashboardProjects } from "./schema";
+import type { DashboardProjects } from "./schema";
-export const findMany = async (userId: string, _context: AppContext) => {
- const data = await prisma.dashboardProject.findMany({
- where: {
- userId,
- isDeleted: false,
- },
- include: {
- previewImageAsset: true,
- },
- orderBy: [
- {
- createdAt: "desc",
- },
- {
- id: "desc",
- },
- ],
- });
-
- return DashboardProjects.parse(data);
+export const findMany = async (userId: string, context: AppContext) => {
+ const data = await context.postgrest.client
+ .from("DashboardProject")
+ .select("*, previewImageAsset:Asset (*)")
+ .eq("userId", userId)
+ .eq("isDeleted", false)
+ .order("createdAt", { ascending: false })
+ .order("id", { ascending: false });
+ if (data.error) {
+ throw data.error;
+ }
+ return data.data as SetNonNullable<
+ (typeof data.data)[number]
+ >[] satisfies DashboardProjects;
};
export const findManyByIds = async (
projectIds: string[],
- _context: AppContext
+ context: AppContext
) => {
if (projectIds.length === 0) {
- return DashboardProjects.parse([]);
+ return [];
}
-
- const data = await prisma.dashboardProject.findMany({
- where: {
- id: {
- in: projectIds,
- },
- isDeleted: false,
- },
- include: {
- previewImageAsset: true,
- },
- orderBy: [
- {
- createdAt: "desc",
- },
- {
- id: "desc",
- },
- ],
- });
-
- return DashboardProjects.parse(data);
+ const data = await context.postgrest.client
+ .from("DashboardProject")
+ .select("*, previewImageAsset:Asset (*)")
+ .in("id", projectIds)
+ .eq("isDeleted", false)
+ .order("createdAt", { ascending: false })
+ .order("id", { ascending: false });
+ if (data.error) {
+ throw data.error;
+ }
+ return data.data as SetNonNullable<
+ (typeof data.data)[number]
+ >[] satisfies DashboardProjects;
};
diff --git a/packages/jsx-utils/package.json b/packages/jsx-utils/package.json
index 904605f6bc..5f4a4c4d53 100644
--- a/packages/jsx-utils/package.json
+++ b/packages/jsx-utils/package.json
@@ -15,7 +15,7 @@
"@webstudio-is/jest-config": "workspace:^",
"@webstudio-is/tsconfig": "workspace:^",
"fast-glob": "^3.2.12",
- "type-fest": "^4.3.1",
+ "type-fest": "^4.24.0",
"typescript": "5.5.2"
},
"exports": {
diff --git a/packages/project-build/package.json b/packages/project-build/package.json
index dd1210215d..17e6c25c31 100644
--- a/packages/project-build/package.json
+++ b/packages/project-build/package.json
@@ -21,9 +21,9 @@
"test": "NODE_OPTIONS=--experimental-vm-modules jest"
},
"dependencies": {
+ "@webstudio-is/postrest": "workspace:*",
"@webstudio-is/sdk": "workspace:*",
"@webstudio-is/trpc-interface": "workspace:*",
- "@webstudio-is/postrest": "workspace:*",
"nanoid": "^5.0.1",
"zod": "^3.22.4"
},
@@ -32,7 +32,7 @@
"@webstudio-is/http-client": "workspace:*",
"@webstudio-is/jest-config": "workspace:*",
"@webstudio-is/tsconfig": "workspace:*",
- "type-fest": "^4.3.1",
+ "type-fest": "^4.24.0",
"typescript": "5.5.2"
}
}
diff --git a/packages/project/package.json b/packages/project/package.json
index 1b3326a7c0..8aac7c0753 100644
--- a/packages/project/package.json
+++ b/packages/project/package.json
@@ -15,7 +15,7 @@
"@webstudio-is/trpc-interface": "workspace:*",
"nanoid": "^5.0.1",
"slugify": "^1.6.6",
- "type-fest": "^4.3.1",
+ "type-fest": "^4.24.0",
"zod": "^3.22.4"
},
"devDependencies": {
diff --git a/packages/react-sdk/package.json b/packages/react-sdk/package.json
index 3ebb6a1d14..89d7256bde 100644
--- a/packages/react-sdk/package.json
+++ b/packages/react-sdk/package.json
@@ -20,7 +20,7 @@
"react": "18.3.0-canary-14898b6a9-20240318",
"react-dom": "18.3.0-canary-14898b6a9-20240318",
"strip-indent": "^4.0.0",
- "type-fest": "^4.3.1",
+ "type-fest": "^4.24.0",
"typescript": "5.5.2",
"zod": "^3.22.4"
},
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index 51cf9ade52..72059a52fc 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -32,7 +32,7 @@
"@webstudio-is/fonts": "workspace:*",
"acorn": "^8.11.3",
"acorn-walk": "^8.3.2",
- "type-fest": "^4.3.1",
+ "type-fest": "^4.24.0",
"zod": "^3.22.4"
},
"devDependencies": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5ea2c87e43..e2ec4a7629 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -462,8 +462,8 @@ importers:
specifier: 18.3.0-canary-14898b6a9-20240318
version: 18.3.0-canary-14898b6a9-20240318([email protected])
type-fest:
- specifier: ^4.3.1
- version: 4.3.1
+ specifier: ^4.24.0
+ version: 4.24.0
typescript:
specifier: 5.5.2
version: 5.5.2
@@ -892,8 +892,8 @@ importers:
specifier: ^3.2.12
version: 3.2.12
type-fest:
- specifier: ^4.3.1
- version: 4.3.1
+ specifier: ^4.24.0
+ version: 4.24.0
typescript:
specifier: 5.5.2
version: 5.5.2
@@ -1151,8 +1151,8 @@ importers:
specifier: 2.8.0
version: 2.8.0
type-fest:
- specifier: ^4.3.1
- version: 4.3.1
+ specifier: ^4.24.0
+ version: 4.24.0
typescript:
specifier: 5.5.2
version: 5.5.2
@@ -1202,15 +1202,15 @@ importers:
packages/dashboard:
dependencies:
- '@webstudio-is/prisma-client':
- specifier: workspace:*
- version: link:../prisma-client
'@webstudio-is/project':
specifier: workspace:*
version: link:../project
'@webstudio-is/trpc-interface':
specifier: workspace:*
version: link:../trpc-interface
+ type-fest:
+ specifier: ^4.24.0
+ version: 4.24.0
zod:
specifier: ^3.22.4
version: 3.22.4
@@ -1600,8 +1600,8 @@ importers:
specifier: ^3.2.12
version: 3.2.12
type-fest:
- specifier: ^4.3.1
- version: 4.3.1
+ specifier: ^4.24.0
+ version: 4.24.0
typescript:
specifier: 5.5.2
version: 5.5.2
@@ -1671,8 +1671,8 @@ importers:
specifier: ^1.6.6
version: 1.6.6
type-fest:
- specifier: ^4.3.1
- version: 4.3.1
+ specifier: ^4.24.0
+ version: 4.24.0
zod:
specifier: ^3.22.4
version: 3.22.4
@@ -1715,8 +1715,8 @@ importers:
specifier: workspace:*
version: link:../tsconfig
type-fest:
- specifier: ^4.3.1
- version: 4.3.1
+ specifier: ^4.24.0
+ version: 4.24.0
typescript:
specifier: 5.5.2
version: 5.5.2
@@ -1776,8 +1776,8 @@ importers:
specifier: ^4.0.0
version: 4.0.0
type-fest:
- specifier: ^4.3.1
- version: 4.3.1
+ specifier: ^4.24.0
+ version: 4.24.0
typescript:
specifier: 5.5.2
version: 5.5.2
@@ -1800,8 +1800,8 @@ importers:
specifier: ^8.3.2
version: 8.3.2
type-fest:
- specifier: ^4.3.1
- version: 4.3.1
+ specifier: ^4.24.0
+ version: 4.24.0
zod:
specifier: ^3.22.4
version: 3.22.4
@@ -9458,8 +9458,8 @@ packages:
resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==}
engines: {node: '>=12.20'}
- resolution: {integrity: sha512-pphNW/msgOUSkJbH58x8sqpq8uQj6b0ZKGxEsLKMUnGorRcDjrUaLS+39+/ub41JNTwrrMyJcUB8+YZs3mbwqw==}
+ resolution: {integrity: sha512-spAaHzc6qre0TlZQQ2aA/nGMe+2Z/wyGk5Z+Ru2VUfdNwT6kWO6TjevOlpebsATEG1EIQ2sOiDszud3lO5mt/Q==}
engines: {node: '>=16'}
@@ -18700,7 +18700,7 @@ snapshots:
dependencies: