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
feat: Scale publishing allowance with workspace seats (#6352)
Oleg Isoneneb61139e5a72
diff --git a/apps/builder/app/builder/features/publish/publish.tsx b/apps/builder/app/builder/features/publish/publish.tsxindex 95975b8dfc..4014954323 100644--- a/apps/builder/app/builder/features/publish/publish.tsx+++ b/apps/builder/app/builder/features/publish/publish.tsx@@ -470,8 +470,7 @@ const Publish = ({refresh: () => Promise<void>;restrictedFeatures: Map<string, RestrictedFeature>;}) => {- const { maxDailyPublishesPerUser } = useStore($permissions);- const { userPublishCount } = useUserPublishCount();+ const { userPublishCount, maxDailyPublishesPerUser } = useUserPublishCount();const [publishError, setPublishError] = useState<undefined | JSX.Element | string>();@@ -927,7 +926,8 @@ const useUserPublishCount = () => {}, [load, project?.id]);return {userPublishCount: data?.success ? data.data : 0,- maxDailyPublishesPerUser,+ maxDailyPublishesPerUser:+ data?.success && "limit" in data ? data.limit : maxDailyPublishesPerUser,};};diff --git a/packages/project/src/trpc/project-router.test.ts b/packages/project/src/trpc/project-router.test.tsindex e5ae9580b0..9d278ba3d7 100644--- a/packages/project/src/trpc/project-router.test.ts+++ b/packages/project/src/trpc/project-router.test.ts@@ -26,6 +26,8 @@ const createContext = (Promise.resolve({...defaultPlanFeatures,maxWorkspaces: 20,+ maxDailyPublishesPerUser: 100,+ seatsIncluded: 4,}),...overrides,}) as unknown as AppContext;@@ -43,6 +45,7 @@ describe("userPublishCount", () => {db.get("WorkspaceProjectAuthorization", () =>json([{ relation: "editors" }])),+ db.get("Product", () => json([])),db.get("user_publish_count", ({ request }) => {const url = new URL(request.url);expect(url.searchParams.get("user_id")).toBe("eq.owner-1");@@ -53,7 +56,7 @@ describe("userPublishCount", () => {const caller = createCaller(createContext());const result = await caller.userPublishCount({ projectId: "proj-1" });- expect(result).toEqual({ success: true, data: 42 });+ expect(result).toEqual({ success: true, data: 42, limit: 500 });});test("counts publishes for the caller when projectId is omitted", async () => {diff --git a/packages/project/src/trpc/project-router.ts b/packages/project/src/trpc/project-router.tsindex ec7ad5ca6b..e6342c879b 100644--- a/packages/project/src/trpc/project-router.ts+++ b/packages/project/src/trpc/project-router.ts@@ -6,8 +6,11 @@ import {AuthorizationError,authorizeProject,createErrorResponse,+ getPlanFeaturesByOwnerId,getProjectOwnerId,} from "@webstudio-is/trpc-interface/index.server";+import { defaultPlanFeatures } from "@webstudio-is/plans";+import { getExtraPaidSeats } from "@webstudio-is/plans/index.server";import { projectTitle } from "../shared/project-schema";import { marketplaceApprovalStatus } from "../shared/marketplace-schema";@@ -101,6 +104,7 @@ export const projectRouter = router({: ctx.authorization.ownerId;let ownerId = userId;+ let limit: number | undefined;if (input?.projectId !== undefined) {const canView = await authorizeProject.hasProjectPermit(@@ -115,6 +119,12 @@ export const projectRouter = router({}ownerId = await getProjectOwnerId(input.projectId, ctx);+ const plan = await getPlanFeaturesByOwnerId(ownerId, ctx);+ limit = plan.maxDailyPublishesPerUser;+ if (limit > defaultPlanFeatures.maxDailyPublishesPerUser) {+ const extraSeats = await getExtraPaidSeats(ownerId, ctx);+ limit *= 1 + plan.seatsIncluded + (extraSeats ?? 0);+ }}const result = await ctx.postgrest.client@@ -125,10 +135,11 @@ export const projectRouter = router({if (result.error) {throw result.error;}- return {- success: true,- data: result.data?.count ?? 0,- };+ const count = result.data?.count ?? 0;+ if (limit === undefined) {+ return { success: true, data: count };+ }+ return { success: true, data: count, limit };} catch (error) {return createErrorResponse(error);}