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
refactor: restrict publish count per account (#5030)
Bogdan Chadkin5c3a6e5fcd24
diff --git a/apps/builder/app/builder/features/topbar/publish.tsx b/apps/builder/app/builder/features/topbar/publish.tsxindex eefc875318..9c23d58084 100644--- a/apps/builder/app/builder/features/topbar/publish.tsx+++ b/apps/builder/app/builder/features/topbar/publish.tsx@@ -242,13 +242,16 @@ const $usedProFeatures = computed(const Publish = ({project,- refresh,+ timesLeft,disabled,+ refresh,}: {project: Project;- refresh: () => Promise<void>;+ timesLeft: number;disabled: boolean;+ refresh: () => Promise<void>;}) => {+ const { maxPublishesAllowedPerUser } = useStore($userPlanFeatures);const [publishError, setPublishError] = useState<undefined | JSX.Element | string>();@@ -379,6 +382,19 @@ const Publish = ({};if (status === "PUBLISHED") {+ toast.success(+ <>+ The project has been successfully published. The project is+ successfully published.{" "}+ {hasProPlan === false && (+ <div>+ On the free plan, you have {timesLeft} out of{" "}+ {maxPublishesAllowedPerUser} daily publications remaining. The+ counter resets tomorrow.+ </div>+ )}+ </>+ );break;}@@ -601,6 +617,18 @@ const useCanAddDomain = () => {return { canAddDomain, maxDomainsAllowedPerUser };};+const useUserPublishCount = () => {+ const { load, data } = trpcClient.project.userPublishCount.useQuery();+ const { maxPublishesAllowedPerUser } = useStore($userPlanFeatures);+ useEffect(() => {+ load();+ }, [load]);+ return {+ userPublishCount: data?.success ? data.data : 0,+ maxPublishesAllowedPerUser,+ };+};+const refreshProject = async () => {const result = await nativeClient.domain.project.query({@@ -634,11 +662,29 @@ const Content = (props: {const projectState = "idle";const { canAddDomain, maxDomainsAllowedPerUser } = useCanAddDomain();+ const { userPublishCount, maxPublishesAllowedPerUser } =+ useUserPublishCount();return (<form><ScrollArea>- {usedProFeatures.size > 0 && hasProPlan === false ? (+ {userPublishCount >= maxPublishesAllowedPerUser ? (+ <PanelBanner>+ <Text variant="regularBold">+ Upgrade to publish more than {maxPublishesAllowedPerUser} times+ per day:+ </Text>+ <Link+ className={buttonStyle({ color: "gradient" })}+ color="contrast"+ underline="none"+ href="https://webstudio.is/pricing"+ target="_blank"+ >+ Upgrade+ </Link>+ </PanelBanner>+ ) : usedProFeatures.size > 0 && hasProPlan === false ? (<PanelBanner><imgsrc={cmsUpgradeBanner}@@ -719,7 +765,11 @@ const Content = (props: {<Publishproject={project}refresh={refreshProject}- disabled={usedProFeatures.size > 0 && hasProPlan === false}+ timesLeft={maxPublishesAllowedPerUser - userPublishCount}+ disabled={+ (usedProFeatures.size > 0 && hasProPlan === false) ||+ userPublishCount >= maxPublishesAllowedPerUser+ }/></Flex></form>diff --git a/apps/builder/app/dashboard/dashboard.stories.tsx b/apps/builder/app/dashboard/dashboard.stories.tsxindex 6f6a3a4412..69f2b7e2a7 100644--- a/apps/builder/app/dashboard/dashboard.stories.tsx+++ b/apps/builder/app/dashboard/dashboard.stories.tsx@@ -32,6 +32,7 @@ const userPlanFeatures: UserPlanFeatures = {allowDynamicData: false,maxContactEmails: 0,maxDomainsAllowedPerUser: 1,+ maxPublishesAllowedPerUser: 1,};const projects = [diff --git a/apps/builder/app/shared/db/user-plan-features.server.ts b/apps/builder/app/shared/db/user-plan-features.server.tsindex f1dad96091..166c7253b6 100644--- a/apps/builder/app/shared/db/user-plan-features.server.ts+++ b/apps/builder/app/shared/db/user-plan-features.server.ts@@ -24,7 +24,7 @@ export const getUserPlanFeatures = async (.select("name").in("id",- userProducts.map(({ productId }) => productId)+ userProducts.map(({ productId }) => productId ?? ""));if (productsResult.error) {@@ -46,6 +46,7 @@ export const getUserPlanFeatures = async (allowDynamicData: true,maxContactEmails: 5,maxDomainsAllowedPerUser: Number.MAX_SAFE_INTEGER,+ maxPublishesAllowedPerUser: Number.MAX_SAFE_INTEGER,hasSubscription,hasProPlan: true,planName: products[0].name,@@ -58,6 +59,7 @@ export const getUserPlanFeatures = async (allowDynamicData: true,maxContactEmails: 5,maxDomainsAllowedPerUser: Number.MAX_SAFE_INTEGER,+ maxPublishesAllowedPerUser: Number.MAX_SAFE_INTEGER,hasSubscription: true,hasProPlan: true,planName: "env.USER_PLAN Pro",@@ -69,6 +71,7 @@ export const getUserPlanFeatures = async (allowDynamicData: false,maxContactEmails: 0,maxDomainsAllowedPerUser: 1,+ maxPublishesAllowedPerUser: 10,hasSubscription: false,hasProPlan: false,};diff --git a/apps/builder/app/shared/nano-states/misc.ts b/apps/builder/app/shared/nano-states/misc.tsindex fd67ee39b9..5f6251da8b 100644--- a/apps/builder/app/shared/nano-states/misc.ts+++ b/apps/builder/app/shared/nano-states/misc.ts@@ -317,6 +317,7 @@ export const $userPlanFeatures = atom<UserPlanFeatures>({allowDynamicData: false,maxContactEmails: 0,maxDomainsAllowedPerUser: 1,+ maxPublishesAllowedPerUser: 1,hasSubscription: false,hasProPlan: false,});diff --git a/packages/postgrest/package.json b/packages/postgrest/package.jsonindex 3f40048775..629d224e61 100644--- a/packages/postgrest/package.json+++ b/packages/postgrest/package.json@@ -21,7 +21,7 @@"db-test": "docker run --rm --network host -v ./supabase/tests:/tests -e PGOPTIONS='--search_path=pgtap,public' supabase/pg_prove:3.36 pg_prove -d ${DIRECT_URL:-postgresql://postgres:pass@localhost/webstudio} --ext .sql /tests"},"dependencies": {- "@supabase/postgrest-js": "^1.16.2"+ "@supabase/postgrest-js": "^1.19.3"},"devDependencies": {"@webstudio-is/tsconfig": "workspace:*"diff --git a/packages/postgrest/src/__generated__/db-types.ts b/packages/postgrest/src/__generated__/db-types.tsindex 935fe3c23b..7d581eda00 100644--- a/packages/postgrest/src/__generated__/db-types.ts+++ b/packages/postgrest/src/__generated__/db-types.ts@@ -805,6 +805,21 @@ export type Database = {},];};+ user_publish_count: {+ Row: {+ count: number | null;+ user_id: string | null;+ };+ Relationships: [+ {+ foreignKeyName: "Project_userId_fkey";+ columns: ["user_id"];+ isOneToOne: false;+ referencedRelation: "User";+ referencedColumns: ["id"];+ },+ ];+ };UserProduct: {Row: {customerEmail: string | null;@@ -851,7 +866,7 @@ export type Database = {};domainsVirtual: {Args: {- "": unknown;+ "": Database["public"]["Tables"]["Project"]["Row"];};Returns: {cname: string;@@ -868,16 +883,10 @@ export type Database = {verified: boolean;}[];};- f_is_json: {- Args: {- _txt: string;- };- Returns: boolean;- };latestBuildVirtual:| {Args: {- "": unknown;+ "": Database["public"]["Tables"]["Project"]["Row"];};Returns: {buildId: string;@@ -890,7 +899,7 @@ export type Database = {}| {Args: {- "": unknown;+ "": Database["public"]["Tables"]["domainsVirtual"]["Row"];};Returns: {buildId: string;@@ -903,7 +912,7 @@ export type Database = {};latestProjectDomainBuildVirtual: {Args: {- "": unknown;+ "": Database["public"]["Tables"]["Project"]["Row"];};Returns: {buildId: string;@@ -914,10 +923,6 @@ export type Database = {publishStatus: Database["public"]["Enums"]["PublishStatus"];}[];};- uuid_generate_v4: {- Args: Record<PropertyKey, never>;- Returns: string;- };};Enums: {AuthorizationRelation:diff --git a/packages/prisma-client/prisma/migrations/20250322141808_user_publish_count/migration.sql b/packages/prisma-client/prisma/migrations/20250322141808_user_publish_count/migration.sqlnew file mode 100644index 0000000000..c0a8cb65e3--- /dev/null+++ b/packages/prisma-client/prisma/migrations/20250322141808_user_publish_count/migration.sql@@ -0,0 +1,7 @@+CREATE OR REPLACE VIEW user_publish_count AS+SELECT DISTINCT "userId" AS user_id, count(*)+FROM "Build"+LEFT JOIN "Project" ON "Project".id="Build"."projectId"+WHERE DATE_TRUNC('day', "Build"."createdAt") = DATE_TRUNC('day', NOW())+AND "Build".deployment IS NOT NULL+GROUP BY "userId";diff --git a/packages/project/src/trpc/project-router.ts b/packages/project/src/trpc/project-router.tsindex 4d3c2a9686..bfb3ab8071 100644--- a/packages/project/src/trpc/project-router.ts+++ b/packages/project/src/trpc/project-router.ts@@ -63,6 +63,38 @@ export const projectRouter = router({return projectIds.map((project) => project.id);}),++ userPublishCount: procedure.query(async ({ ctx }) => {+ try {+ if (+ ctx.authorization.type !== "user" &&+ ctx.authorization.type !== "token"+ ) {+ throw new Error("Not authorized");+ }+ const userId =+ ctx.authorization.type === "user"+ ? ctx.authorization.userId+ : ctx.authorization.ownerId;+ const result = await ctx.postgrest.client+ .from("user_publish_count")+ .select("count")+ .eq("user_id", userId)+ .maybeSingle();+ if (result.error) {+ throw result.error;+ }+ return {+ success: true,+ data: result.data?.count ?? 0,+ };+ } catch (error) {+ return {+ success: false,+ error: error instanceof Error ? error.message : "Unknown error",+ } as const;+ }+ }),});export type ProjectRouter = typeof projectRouter;diff --git a/packages/trpc-interface/src/context/context.server.ts b/packages/trpc-interface/src/context/context.server.tsindex efcc8c8a58..651bf0844c 100644--- a/packages/trpc-interface/src/context/context.server.ts+++ b/packages/trpc-interface/src/context/context.server.ts@@ -68,6 +68,7 @@ type UserPlanFeatures = {allowDynamicData: boolean;maxContactEmails: number;maxDomainsAllowedPerUser: number;+ maxPublishesAllowedPerUser: number;hasSubscription: boolean;} & (| {diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 5193fc5240..cfe49c17e5 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -1634,8 +1634,8 @@ importers:packages/postgrest:dependencies:'@supabase/postgrest-js':- specifier: ^1.16.2- version: 1.16.2+ specifier: ^1.19.3+ version: 1.19.3devDependencies:'@webstudio-is/tsconfig':specifier: workspace:*@@ -5051,8 +5051,8 @@ packages:resolution: {integrity: sha512-1ibVeYUacxWYi9i0cf5efil6adJ9WRyZBLivgjs+AUpewx1F3xPi7gLgaASI2SmIQxPoCEjAsLAzKPgMJVgOUQ==}engines: {node: 4.x || >=6.0.0}- '@supabase/[email protected]':- resolution: {integrity: sha512-dA/CIrSO2YDQ6ABNpbvEg9DwBMMbuKfWaFuZAU9c66PenoLSoIoyXk1Yq/wC2XISgEIqaMHmTrDAAsO80kjHqg==}+ '@supabase/[email protected]':+ resolution: {integrity: sha512-6wwAdDaDES6HGTjRjr1GeEqAUqZxUbxyX/RW6BNlP0SmVkXUymCtB98383N7lBaaUf6KBryngPMnapDIzNaSfQ==}'@svgo/[email protected]':resolution: {integrity: sha512-0e4B41q+GnS8TI+SWHQw78ziW6V07Li2TMLS8FwbvKOTIJL0ua1Sat1AI0AFAjHlAePz9b+1VtyJzv1516edJw==}@@ -12165,7 +12165,7 @@ snapshots:dependencies:whatwg-url: 5.0.0- '@supabase/[email protected]':+ '@supabase/[email protected]':dependencies:'@supabase/node-fetch': 2.6.15