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: add more flags for mini plan (#5440)
Bogdan Chadkin8cc145800144
diff --git a/apps/builder/app/builder/builder.tsx b/apps/builder/app/builder/builder.tsxindex 53dcda925d..47a7c969fb 100644--- a/apps/builder/app/builder/builder.tsx+++ b/apps/builder/app/builder/builder.tsx@@ -434,10 +434,12 @@ export const Builder = ({><Inspector navigatorLayout={navigatorLayout} /></SidePanel>+ <Main css={{ pointerEvents: "none" }}>+ <CanvasToolsContainer />+ </Main>{project ? (<Topbarproject={project}- hasProPlan={userPlanFeatures.hasProPlan}css={{ gridArea: "header" }}loading={<LoadingBackgrounddiff --git a/apps/builder/app/builder/features/topbar/domain-checkbox.tsx b/apps/builder/app/builder/features/topbar/domain-checkbox.tsxindex ea5eca6cc3..dfd1ff792e 100644--- a/apps/builder/app/builder/features/topbar/domain-checkbox.tsx+++ b/apps/builder/app/builder/features/topbar/domain-checkbox.tsx@@ -22,14 +22,14 @@ interface DomainCheckboxProps {}export const DomainCheckbox = (props: DomainCheckboxProps) => {- const hasProPlan = useStore($userPlanFeatures).hasProPlan;+ const { allowStagingPublish } = useStore($userPlanFeatures);const project = useStore($project);if (project === undefined) {return;}- const tooltipContentForFreeUsers = hasProPlan ? undefined : (+ const tooltipContentForFreeUsers = allowStagingPublish ? undefined : (<Flex direction="column" gap="2" css={{ maxWidth: theme.spacing[28] }}><Text variant="titles">Publish to Staging</Text><Text>@@ -56,13 +56,13 @@ export const DomainCheckbox = (props: DomainCheckboxProps) => {</Flex>);- const defaultChecked = hasProPlan ? props.defaultChecked : true;- const disabled = hasProPlan ? props.disabled : true;+ const defaultChecked = allowStagingPublish ? props.defaultChecked : true;+ const disabled = allowStagingPublish ? props.disabled : true;const hideDomainCheckbox =project.domainsVirtual.filter((domain) => domain.status === "ACTIVE" && domain.verified- ).length === 0 && hasProPlan;+ ).length === 0 && allowStagingPublish;return (<div style={{ display: hideDomainCheckbox ? "none" : "contents" }}>diff --git a/apps/builder/app/builder/features/topbar/entri.tsx b/apps/builder/app/builder/features/topbar/entri.tsxindex 39af866ed8..a5108c7228 100644--- a/apps/builder/app/builder/features/topbar/entri.tsx+++ b/apps/builder/app/builder/features/topbar/entri.tsx@@ -98,7 +98,8 @@ const useEntri = ({ domain, dnsRecords, onClose }: EntriProps) => {export const Entri = ({ domain, dnsRecords, onClose }: EntriProps) => {entriGlobalStyles();- const { hasProPlan } = useStore($userPlanFeatures);+ const userPlanFeatures = useStore($userPlanFeatures);+ const hasPaidPlan = userPlanFeatures.purchases.length > 0;const { error, isOpen, showDialog } = useEntri({domain,dnsRecords,@@ -113,7 +114,7 @@ export const Entri = ({ domain, dnsRecords, onClose }: EntriProps) => {color="primary"type="button"onClick={() => {- if (hasProPlan) {+ if (hasPaidPlan) {showDialog();} else {setRequestUpgrade(true);diff --git a/apps/builder/app/builder/features/topbar/menu/menu.tsx b/apps/builder/app/builder/features/topbar/menu/menu.tsxindex 6c1406c1bb..234ae92577 100644--- a/apps/builder/app/builder/features/topbar/menu/menu.tsx+++ b/apps/builder/app/builder/features/topbar/menu/menu.tsx@@ -58,7 +58,8 @@ const ViewMenuItem = () => {};export const Menu = () => {- const { hasProPlan } = useStore($userPlanFeatures);+ const userPlanFeatures = useStore($userPlanFeatures);+ const hasPaidPlan = userPlanFeatures.purchases.length > 0;const authPermit = useStore($authPermit);const authTokenPermission = useStore($authTokenPermissions);const authToken = useStore($authToken);@@ -284,7 +285,7 @@ export const Menu = () => {</DropdownMenuSubContent></DropdownMenuSub>- {hasProPlan === false && (+ {hasPaidPlan === false && (<><DropdownMenuSeparator /><DropdownMenuItemdiff --git a/apps/builder/app/builder/features/topbar/publish.tsx b/apps/builder/app/builder/features/topbar/publish.tsxindex 9ffa6f07b8..b6c28680f9 100644--- a/apps/builder/app/builder/features/topbar/publish.tsx+++ b/apps/builder/app/builder/features/topbar/publish.tsx@@ -79,11 +79,7 @@ import {import { AddDomain } from "./add-domain";import { humanizeString } from "~/shared/string-utils";import { trpcClient, nativeClient } from "~/shared/trpc/trpc-client";-import {- isPathnamePattern,- parseComponentName,- type Templates,-} from "@webstudio-is/sdk";+import { isPathnamePattern, type Templates } from "@webstudio-is/sdk";import { DomainCheckbox, domainToPublishName } from "./domain-checkbox";import { CopyToClipboard } from "~/shared/copy-to-clipboard";import { $openProjectSettings } from "~/shared/nano-states/project-settings";@@ -325,9 +321,9 @@ const ChangeProjectDomain = ({);};-const $usedProFeatures = computed(- [$pages, $dataSources, $instances, $project],- (pages, dataSources, instances, project) => {+const $restrictedFeatures = computed(+ [$pages, $dataSources, $instances, $userPlanFeatures],+ (pages, dataSources, instances, userPlanFeatures) => {const features = new Map<string,| undefined@@ -337,48 +333,37 @@ const $usedProFeatures = computed(return features;}// specified emails for default webhook form- if ((pages?.meta?.contactEmail ?? "").trim()) {+ if (+ userPlanFeatures.maxContactEmails === 0 &&+ (pages?.meta?.contactEmail ?? "").trim()+ ) {features.set("Custom contact email", undefined);}- // pages with dynamic paths- for (const page of [pages.homePage, ...pages.pages]) {- const awareness = {- pageId: page.id,- instanceSelector: [page.rootInstanceId],- };- // allow catch all for 404 pages on free plan- if (isPathnamePattern(page.path) && page.path !== "/*") {- features.set("Dynamic path", { awareness, view: "pageSettings" });- }- if (page.meta.redirect && page.meta.redirect !== `""`) {- features.set("Redirect", { awareness, view: "pageSettings" });- }- }- // has resource variables- for (const dataSource of dataSources.values()) {- if (dataSource.type === "resource") {- const instanceId = dataSource.scopeInstanceId ?? "";- features.set("Resource variable", {- awareness: findAwarenessByInstanceId(pages, instances, instanceId),- });+ if (!userPlanFeatures.allowDynamicData) {+ // pages with dynamic paths+ for (const page of [pages.homePage, ...pages.pages]) {+ const awareness = {+ pageId: page.id,+ instanceSelector: [page.rootInstanceId],+ };+ // allow catch all for 404 pages on free plan+ if (isPathnamePattern(page.path) && page.path !== "/*") {+ features.set("Dynamic path", { awareness, view: "pageSettings" });+ }+ if (page.meta.redirect && page.meta.redirect !== `""`) {+ features.set("Redirect", { awareness, view: "pageSettings" });+ }}- }-- // Instances with animations.- for (const instance of instances.values()) {- const [namespace] = parseComponentName(instance.component);- if (namespace === "@webstudio-is/sdk-components-animation") {- features.set("Animation component", {- awareness: findAwarenessByInstanceId(pages, instances, instance.id),- });+ // has resource variables+ for (const dataSource of dataSources.values()) {+ if (dataSource.type === "resource") {+ const instanceId = dataSource.scopeInstanceId ?? "";+ features.set("Resource variable", {+ awareness: findAwarenessByInstanceId(pages, instances, instanceId),+ });+ }}}-- // Custom domains- if (project && project.domainsVirtual.length > 0) {- features.set("Custom domain", undefined);- }-return features;});@@ -429,11 +414,13 @@ const Publish = ({const [isPublishing, setIsPublishing] = useOptimistic(false);const buttonRef = useRef<HTMLButtonElement>(null);const [hasSelectedDomains, setHasSelectedDomains] = useState(false);- const hasProPlan = useStore($userPlanFeatures).hasProPlan;+ const userPlanFeatures = useStore($userPlanFeatures);+ const hasPaidPlan = userPlanFeatures.purchases.length > 0;+ const { allowStagingPublish } = userPlanFeatures;const countdown = usePublishCountdown(isPublishing);useEffect(() => {- if (hasProPlan === false) {+ if (allowStagingPublish === false) {setHasSelectedDomains(true);return;}@@ -465,13 +452,13 @@ const Publish = ({return () => {observer.disconnect();};- }, [hasProPlan]);+ }, [allowStagingPublish]);const handlePublish = async (formData: FormData) => {setPublishError(undefined);setIsPublishing(true);- const domains = hasProPlan+ const domains = allowStagingPublish? formData.getAll(domainToPublishName).map((domainEntry) => domainEntry.toString())@@ -557,7 +544,7 @@ const Publish = ({toast.success(<>The project has been successfully published.{" "}- {hasProPlan === false && (+ {hasPaidPlan === false && (<div>On the free plan, you have {timesLeft} out of{" "}{maxPublishesAllowedPerUser} daily publications remaining. The@@ -766,30 +753,17 @@ const PublishStatic = ({const useCanAddDomain = () => {const { load, data } = trpcClient.domain.countTotalDomains.useQuery();- const { maxDomainsAllowedPerUser, hasProPlan } = useStore($userPlanFeatures);+ const { maxDomainsAllowedPerUser } = useStore($userPlanFeatures);const project = useStore($project);-const activeDomainsCount = project?.domainsVirtual.filter((domain) => domain.status === "ACTIVE" && domain.verified).length;-useEffect(() => {load();}, [load, activeDomainsCount]);-- if (hasProPlan) {- return { canAddDomain: true, maxDomainsAllowedPerUser };- }-- if (data?.success === false) {- return { canAddDomain: false, maxDomainsAllowedPerUser };- }-- const withinFreeLimit = data+ const canAddDomain = data? data.success && data.data < maxDomainsAllowedPerUser: true;- const canAddDomain = hasProPlan || withinFreeLimit;-return { canAddDomain, maxDomainsAllowedPerUser };};@@ -829,7 +803,7 @@ const buttonLinkClass = css({}).toString();const UpgradeBanner = () => {- const usedProFeatures = useStore($usedProFeatures);+ const restrictedFeatures = useStore($restrictedFeatures);const { canAddDomain } = useCanAddDomain();const { userPublishCount, maxPublishesAllowedPerUser } =useUserPublishCount();@@ -854,7 +828,7 @@ const UpgradeBanner = () => {);}- if (usedProFeatures.size > 0) {+ if (restrictedFeatures.size > 0) {return (<PanelBanner><img@@ -865,7 +839,7 @@ const UpgradeBanner = () => {/><Text variant="regularBold">Following Pro features are used:</Text><Text as="ul" color="destructive" css={{ paddingLeft: "1em" }}>- {Array.from(usedProFeatures).map(+ {Array.from(restrictedFeatures).map(([message, { awareness, view, info } = {}], index) => (<li key={index}><Flex align="center" gap="1">@@ -938,14 +912,11 @@ const Content = (props: {projectId: Project["id"];onExportClick: () => void;}) => {- const usedProFeatures = useStore($usedProFeatures);- const { hasProPlan } = useStore($userPlanFeatures);+ const restrictedFeatures = useStore($restrictedFeatures);const [newDomains, setNewDomains] = useState(new Set<string>());const project = useStore($project);- const hasCustomDomains = (project?.domainsVirtual.length ?? 0) > 0;-if (project == null) {throw new Error("Project not found");}@@ -986,15 +957,13 @@ const Content = (props: {}}onExportClick={props.onExportClick}/>- {hasProPlan === false && <UpgradeBanner />}+ <UpgradeBanner /><Publishproject={project}refresh={refreshProject}timesLeft={maxPublishesAllowedPerUser - userPublishCount}disabled={- (usedProFeatures.size > 0 &&- hasProPlan === false &&- hasCustomDomains) ||+ restrictedFeatures.size > 0 ||userPublishCount >= maxPublishesAllowedPerUser}/>diff --git a/apps/builder/app/builder/features/topbar/share.tsx b/apps/builder/app/builder/features/topbar/share.tsxindex 11ef6a3fc3..d8669d883f 100644--- a/apps/builder/app/builder/features/topbar/share.tsx+++ b/apps/builder/app/builder/features/topbar/share.tsx@@ -13,13 +13,7 @@ import { ShareProjectContainer } from "~/shared/share-project";import { $authPermit } from "~/shared/nano-states";import { $isShareDialogOpen } from "~/builder/shared/nano-states";-export const ShareButton = ({- projectId,- hasProPlan,-}: {- projectId: string;- hasProPlan: boolean;-}) => {+export const ShareButton = ({ projectId }: { projectId: string }) => {const isShareDialogOpen = useStore($isShareDialogOpen);const authPermit = useStore($authPermit);@@ -50,7 +44,7 @@ export const ShareButton = ({sideOffset={Number.parseFloat(rawTheme.spacing[8])}css={{ marginRight: theme.spacing[3] }}>- <ShareProjectContainer projectId={projectId} hasProPlan={hasProPlan} />+ <ShareProjectContainer projectId={projectId} /><PopoverTitle>Share</PopoverTitle></PopoverContent></Popover>diff --git a/apps/builder/app/builder/features/topbar/topbar.tsx b/apps/builder/app/builder/features/topbar/topbar.tsxindex 318debc03d..237e66e089 100644--- a/apps/builder/app/builder/features/topbar/topbar.tsx+++ b/apps/builder/app/builder/features/topbar/topbar.tsx@@ -72,12 +72,11 @@ const topbarContainerStyle = css({type TopbarProps = {project: Project;- hasProPlan: boolean;loading: ReactNode;css: CSS;};-export const Topbar = ({ project, hasProPlan, css, loading }: TopbarProps) => {+export const Topbar = ({ project, css, loading }: TopbarProps) => {const pages = useStore($pages);return (<nav className={topbarContainerStyle({ css })}>@@ -111,7 +110,7 @@ export const Topbar = ({ project, hasProPlan, css, loading }: TopbarProps) => {<SyncStatus /><BuilderModeDropDown />- <ShareButton projectId={project.id} hasProPlan={hasProPlan} />+ <ShareButton projectId={project.id} /><PublishButton projectId={project.id} /><CloneButton /></ToolbarToggleGroup>diff --git a/apps/builder/app/builder/shared/asset-manager/asset-info.tsx b/apps/builder/app/builder/shared/asset-manager/asset-info.tsxindex 086bbf65ea..873d8d5453 100644--- a/apps/builder/app/builder/shared/asset-manager/asset-info.tsx+++ b/apps/builder/app/builder/shared/asset-manager/asset-info.tsx@@ -389,7 +389,8 @@ const AssetInfoContent = ({asset: Asset;usages: AssetUsage[];}) => {- const { hasProPlan } = useStore($userPlanFeatures);+ const userPlanFeatures = useStore($userPlanFeatures);+ const hasPaidPlan = userPlanFeatures.purchases.length > 0;const { size, meta, id, name } = asset;const { basename, ext } = parseAssetName(name);const [filenameError, setFilenameError] = useState<string>();@@ -440,7 +441,7 @@ const AssetInfoContent = ({if (authPermit === "view") {downloadError ="Unavailable in View mode. Switch to Edit to download assets.";- } else if (!hasProPlan) {+ } else if (!hasPaidPlan) {downloadError = "Upgrade to Pro to download assets.";}diff --git a/apps/builder/app/dashboard/dashboard.stories.tsx b/apps/builder/app/dashboard/dashboard.stories.tsxindex c816c13d4f..72450462bd 100644--- a/apps/builder/app/dashboard/dashboard.stories.tsx+++ b/apps/builder/app/dashboard/dashboard.stories.tsx@@ -26,13 +26,14 @@ const createRouter = (element: JSX.Element, path: string, current?: string) =>});const userPlanFeatures: UserPlanFeatures = {- hasProPlan: false,- hasSubscription: false,- allowShareAdminLinks: false,+ allowAdditionalPermissions: false,allowDynamicData: false,+ allowContentMode: false,+ allowStagingPublish: false,maxContactEmails: 0,maxDomainsAllowedPerUser: 0,maxPublishesAllowedPerUser: 1,+ purchases: [],};const projects = [diff --git a/apps/builder/app/dashboard/profile-menu.tsx b/apps/builder/app/dashboard/profile-menu.tsxindex 92445f7443..0f5bdcc486 100644--- a/apps/builder/app/dashboard/profile-menu.tsx+++ b/apps/builder/app/dashboard/profile-menu.tsx@@ -61,15 +61,15 @@ export const ProfileMenu = ({}) => {const navigate = useNavigate();const nameOrEmail = user.username ?? user.email ?? defaultUserName;+ const hasPaidPlan = userPlanFeatures.purchases.length > 0;+ const latestPlanName = userPlanFeatures.purchases[0]?.planName;return (<DropdownMenu><DropdownMenuTrigger asChild><ProfileButtonimage={user.image || undefined}name={nameOrEmail}- badge={- userPlanFeatures.hasProPlan ? userPlanFeatures.planName : undefined- }+ badge={latestPlanName}/></DropdownMenuTrigger><DropdownMenuContent align="start">@@ -77,21 +77,24 @@ export const ProfileMenu = ({{user.username ?? defaultUserName}<Text>{user.email}</Text></DropdownMenuLabel>- {userPlanFeatures.hasSubscription && (- <DropdownMenuItem- onSelect={() => navigate(userPlanSubscriptionPath())}- >- Manage Subscription- </DropdownMenuItem>- )}- {userPlanFeatures.hasProPlan === false && (+ {userPlanFeatures.purchases+ .filter((purchase) => Boolean(purchase.subscriptionId))+ .map((purchase) => (+ <DropdownMenuItem+ key={purchase.subscriptionId}+ onSelect={() =>+ navigate(userPlanSubscriptionPath(purchase.subscriptionId))+ }+ >+ Manage {purchase.planName}+ </DropdownMenuItem>+ ))}+ {hasPaidPlan === false && (<DropdownMenuItemonSelect={() => {window.open("https://webstudio.is/pricing");}}- css={{- gap: theme.spacing[3],- }}+ css={{ gap: theme.spacing[3] }}><UpgradeIcon /><div>Upgrade to Pro</div>diff --git a/apps/builder/app/dashboard/projects/project-dialogs.tsx b/apps/builder/app/dashboard/projects/project-dialogs.tsxindex cf76a54d95..ddf7322062 100644--- a/apps/builder/app/dashboard/projects/project-dialogs.tsx+++ b/apps/builder/app/dashboard/projects/project-dialogs.tsx@@ -389,16 +389,14 @@ export const ShareProjectDialog = ({isOpen,onOpenChange,projectId,- hasProPlan,}: {isOpen: boolean;onOpenChange: (isOpen: boolean) => void;projectId: string;- hasProPlan: boolean;}) => {return (<Dialog title="Share Project" isOpen={isOpen} onOpenChange={onOpenChange}>- <ShareProjectContainer hasProPlan={hasProPlan} projectId={projectId} />+ <ShareProjectContainer projectId={projectId} /></Dialog>);};@@ -523,7 +521,6 @@ export const ProjectDialogs = ({isOpen={openDialog === "share"}onOpenChange={(open) => onOpenDialogChange(open ? "share" : undefined)}projectId={projectId}- hasProPlan={userPlanFeatures.hasProPlan}/><TagsDialogprojectId={projectId}diff --git a/apps/builder/app/dashboard/search/search-results.tsx b/apps/builder/app/dashboard/search/search-results.tsxindex bafb7aa1ab..90ad0d6698 100644--- a/apps/builder/app/dashboard/search/search-results.tsx+++ b/apps/builder/app/dashboard/search/search-results.tsx@@ -21,7 +21,7 @@ const initialSearchResults: SearchResults = {export const SearchResults = (props: DashboardData) => {const [searchParams] = useSearchParams();- const { projects, templates, userPlanFeatures, publisherHost } = props;+ const { projects, templates, publisherHost, userPlanFeatures } = props;const search = searchParams.get("q");const results = useMemo(() => {diff --git a/apps/builder/app/shared/db/user-plan-features.server.ts b/apps/builder/app/shared/db/user-plan-features.server.tsindex 48502613de..2ea6cee17c 100644--- a/apps/builder/app/shared/db/user-plan-features.server.ts+++ b/apps/builder/app/shared/db/user-plan-features.server.ts@@ -21,7 +21,7 @@ export const getUserPlanFeatures = async (const productsResult = await postgrest.client.from("Product")- .select("name, meta")+ .select("id, name, meta").in("id",userProducts.map(({ productId }) => productId ?? "")@@ -34,14 +34,35 @@ export const getUserPlanFeatures = async (const products = productsResult.data;+ // Create a map of productId -> product name for quick lookup+ const productIdToName = new Map<string, string>();+ for (const product of products) {+ productIdToName.set(product.id, product.name);+ }++ // Build purchases array - includes all products (subscriptions and LTDs)+ // subscriptionId only set for recurring subscriptions (manageable in Stripe)+ const purchases: Array<{+ planName: string;+ subscriptionId?: string;+ }> = [];+ for (const userProduct of userProducts) {+ if (userProduct.productId) {+ const planName = productIdToName.get(userProduct.productId) ?? "Pro";+ purchases.push({+ planName,+ subscriptionId: userProduct.subscriptionId ?? undefined,+ });+ }+ }+if (userProducts.length > 0) {- const hasSubscription = userProducts.some(- (log) => log.subscriptionId !== null- );const productMetas = products.map((product) => {return {- allowShareAdminLinks: true,+ allowAdditionalPermissions: true,allowDynamicData: true,+ allowContentMode: true,+ allowStagingPublish: true,maxContactEmails: 5,maxDomainsAllowedPerUser: Number.MAX_SAFE_INTEGER,maxPublishesAllowedPerUser: Number.MAX_SAFE_INTEGER,@@ -49,10 +70,14 @@ export const getUserPlanFeatures = async (};});return {- allowShareAdminLinks: productMetas.some(- (item) => item.allowShareAdminLinks+ allowAdditionalPermissions: productMetas.some(+ (item) => item.allowAdditionalPermissions),allowDynamicData: productMetas.some((item) => item.allowDynamicData),+ allowContentMode: productMetas.some((item) => item.allowContentMode),+ allowStagingPublish: productMetas.some(+ (item) => item.allowStagingPublish+ ),maxContactEmails: Math.max(...productMetas.map((item) => item.maxContactEmails)),@@ -62,32 +87,31 @@ export const getUserPlanFeatures = async (maxPublishesAllowedPerUser: Math.max(...productMetas.map((item) => item.maxPublishesAllowedPerUser)),- hasSubscription,- hasProPlan: true,- planName: products[0].name,+ purchases,};}if (env.USER_PLAN === "pro") {return {- allowShareAdminLinks: true,+ allowAdditionalPermissions: true,allowDynamicData: true,+ allowContentMode: true,+ allowStagingPublish: true,maxContactEmails: 5,maxDomainsAllowedPerUser: Number.MAX_SAFE_INTEGER,maxPublishesAllowedPerUser: Number.MAX_SAFE_INTEGER,- hasSubscription: true,- hasProPlan: true,- planName: "env.USER_PLAN Pro",+ purchases: [{ planName: "env.USER_PLAN Pro" }],};}return {- allowShareAdminLinks: false,+ allowAdditionalPermissions: false,allowDynamicData: false,+ allowContentMode: false,+ allowStagingPublish: false,maxContactEmails: 0,maxDomainsAllowedPerUser: 0,maxPublishesAllowedPerUser: 10,- hasSubscription: false,- hasProPlan: false,+ purchases: [],};};diff --git a/apps/builder/app/shared/nano-states/misc.ts b/apps/builder/app/shared/nano-states/misc.tsindex 9884f7be18..7b32b00a47 100644--- a/apps/builder/app/shared/nano-states/misc.ts+++ b/apps/builder/app/shared/nano-states/misc.ts@@ -297,13 +297,14 @@ export const $hoveredInstanceSelector = atom<undefined | InstanceSelector>(// keep in sync with user-plan-features.serverexport const $userPlanFeatures = atom<UserPlanFeatures>({- allowShareAdminLinks: false,+ allowAdditionalPermissions: false,allowDynamicData: false,+ allowContentMode: false,+ allowStagingPublish: false,maxContactEmails: 0,maxDomainsAllowedPerUser: 0,maxPublishesAllowedPerUser: 1,- hasSubscription: false,- hasProPlan: false,+ purchases: [],});const builderModes = ["design", "preview", "content"] as const;@@ -346,7 +347,7 @@ export const $isContentModeAllowed = computed(}// In shared projects, only Pro users can share editable links, so check the plan features of the user who shared the link- return userPlanFeatures.hasProPlan === true;+ return userPlanFeatures.allowContentMode === true;});diff --git a/apps/builder/app/shared/project-settings/section-backups.tsx b/apps/builder/app/shared/project-settings/section-backups.tsxindex f39b23d2d0..e4487bddcd 100644--- a/apps/builder/app/shared/project-settings/section-backups.tsx+++ b/apps/builder/app/shared/project-settings/section-backups.tsx@@ -41,7 +41,8 @@ export const SectionBackups = ({}: {projectId?: string;}) => {- const { hasProPlan } = useStore($userPlanFeatures);+ const userPlanFeatures = useStore($userPlanFeatures);+ const hasPaidPlan = userPlanFeatures.purchases.length > 0;const { data, load } = trpcClient.project.publishedBuilds.useQuery();const project = useStore($project);const projectId = projectIdProp ?? project?.id ?? "";@@ -92,7 +93,7 @@ export const SectionBackups = ({<DialogTrigger asChild><Buttoncss={{ justifySelf: "start" }}- disabled={!hasProPlan || options.length === 0}+ disabled={!hasPaidPlan || options.length === 0}>Restore</Button>@@ -127,7 +128,7 @@ export const SectionBackups = ({</Flex></DialogContent></Dialog>- {!hasProPlan && (+ {!hasPaidPlan && (<PanelBanner><imgsrc={cmsUpgradeBanner}diff --git a/apps/builder/app/shared/router-utils/path-utils.ts b/apps/builder/app/shared/router-utils/path-utils.tsindex a7a1903500..e7e0e19741 100644--- a/apps/builder/app/shared/router-utils/path-utils.ts+++ b/apps/builder/app/shared/router-utils/path-utils.ts@@ -100,9 +100,12 @@ export const loginPath = (params: {export const logoutPath = () => "/logout";export const restLogoutPath = () => "/dashboard-logout";-export const userPlanSubscriptionPath = () => {+export const userPlanSubscriptionPath = (subscriptionId?: string) => {const urlSearchParams = new URLSearchParams();urlSearchParams.set("return_url", window.location.href);+ if (subscriptionId) {+ urlSearchParams.set("subscription", subscriptionId);+ }return `/n8n/billing_portal/sessions?${urlSearchParams.toString()}`;};diff --git a/apps/builder/app/shared/share-project/share-project-container.tsx b/apps/builder/app/shared/share-project/share-project-container.tsxindex c601533367..435e464761 100644--- a/apps/builder/app/shared/share-project/share-project-container.tsx+++ b/apps/builder/app/shared/share-project/share-project-container.tsx@@ -3,6 +3,8 @@ import { useDebouncedCallback } from "use-debounce";import { builderUrl } from "~/shared/router-utils";import { trpcClient } from "../trpc/trpc-client";import { ShareProject, type LinkOptions } from "./share-project";+import { useStore } from "@nanostores/react";+import { $userPlanFeatures } from "../nano-states";const useShareProjectContainer = (projectId: string) => {const {@@ -89,17 +91,14 @@ const useShareProjectContainer = (projectId: string) => {type ShareButtonProps = {projectId: string;- hasProPlan: boolean;};/*** we place the logic inside Popover so that the fetcher does not exist outside of it.* Then remix will not call `trpc.findMany.useQuery` if Popover is closed*/-export const ShareProjectContainer = ({- projectId,- hasProPlan,-}: ShareButtonProps) => {+export const ShareProjectContainer = ({ projectId }: ShareButtonProps) => {+ const { allowAdditionalPermissions } = useStore($userPlanFeatures);const {links,handleChangeDebounced,@@ -110,7 +109,7 @@ export const ShareProjectContainer = ({return (<ShareProject- hasProPlan={hasProPlan}+ allowAdditionalPermissions={allowAdditionalPermissions}links={links}onChange={handleChangeDebounced}onDelete={handleDelete}diff --git a/apps/builder/app/shared/share-project/share-project.stories.tsx b/apps/builder/app/shared/share-project/share-project.stories.tsxindex 8ded655173..80500f7a33 100644--- a/apps/builder/app/shared/share-project/share-project.stories.tsx+++ b/apps/builder/app/shared/share-project/share-project.stories.tsx@@ -98,7 +98,7 @@ export const Empty: StoryFn<typeof ShareProject> = () => {<PopoverContent><ShareProject{...props}- hasProPlan={false}+ allowAdditionalPermissions={false}isPending={false}builderUrl={({ authToken, mode }) =>`https://blabla.com/${authToken}/${mode}`@@ -120,7 +120,7 @@ export const WithLinks: StoryFn<typeof ShareProject> = () => {<PopoverContent><ShareProject{...props}- hasProPlan={false}+ allowAdditionalPermissions={false}isPending={false}builderUrl={({ authToken, mode }) =>`https://blabla.com/${authToken}/${mode}`@@ -142,7 +142,7 @@ export const WithAsyncLinks: StoryFn<typeof ShareProject> = () => {<PopoverContent><ShareProject{...props}- hasProPlan={false}+ allowAdditionalPermissions={false}isPending={false}builderUrl={({ authToken, mode }) =>`https://blabla.com/${authToken}/${mode}`diff --git a/apps/builder/app/shared/share-project/share-project.tsx b/apps/builder/app/shared/share-project/share-project.tsxindex 3390478f73..be9603433a 100644--- a/apps/builder/app/shared/share-project/share-project.tsx+++ b/apps/builder/app/shared/share-project/share-project.tsx@@ -92,12 +92,18 @@ const Permission = ({type MenuProps = {name: string;value: LinkOptions;- hasProPlan: boolean;+ allowAdditionalPermissions: boolean;onChange: (value: LinkOptions) => void;onDelete: () => void;};-const Menu = ({ name, hasProPlan, value, onChange, onDelete }: MenuProps) => {+const Menu = ({+ name,+ allowAdditionalPermissions,+ value,+ onChange,+ onDelete,+}: MenuProps) => {const ids = useIds(["name", "canClone", "canCopy", "canPublish"]);const [isOpen, setIsOpen] = useState(false);const [customLinkName, setCustomLinkName] = useState<string>(name);@@ -163,7 +169,7 @@ const Menu = ({ name, hasProPlan, value, onChange, onDelete }: MenuProps) => {info={<Flex direction="column">Recipients can view, copy instances and clone the project.- {hasProPlan !== true && (+ {!allowAdditionalPermissions && (<><br /><br />@@ -198,7 +204,9 @@ const Menu = ({ name, hasProPlan, value, onChange, onDelete }: MenuProps) => {}}><Checkbox- disabled={hasProPlan !== true || value.relation !== "viewers"}+ disabled={+ !allowAdditionalPermissions || value.relation !== "viewers"+ }checked={value.canClone}onCheckedChange={(canClone) => {onChange({ ...value, canClone: Boolean(canClone) });@@ -207,7 +215,9 @@ const Menu = ({ name, hasProPlan, value, onChange, onDelete }: MenuProps) => {/><LabelhtmlFor={ids.canClone}- disabled={hasProPlan !== true || value.relation !== "viewers"}+ disabled={+ !allowAdditionalPermissions || value.relation !== "viewers"+ }>Can clone</Label>@@ -221,7 +231,9 @@ const Menu = ({ name, hasProPlan, value, onChange, onDelete }: MenuProps) => {}}><Checkbox- disabled={hasProPlan !== true || value.relation !== "viewers"}+ disabled={+ !allowAdditionalPermissions || value.relation !== "viewers"+ }checked={value.canCopy}onCheckedChange={(canCopy) => {onChange({ ...value, canCopy: Boolean(canCopy) });@@ -230,7 +242,9 @@ const Menu = ({ name, hasProPlan, value, onChange, onDelete }: MenuProps) => {/><LabelhtmlFor={ids.canCopy}- disabled={hasProPlan !== true || value.relation !== "viewers"}+ disabled={+ !allowAdditionalPermissions || value.relation !== "viewers"+ }>Can copy</Label>@@ -238,7 +252,7 @@ const Menu = ({ name, hasProPlan, value, onChange, onDelete }: MenuProps) => {</Grid><Permission- disabled={hasProPlan !== true}+ disabled={!allowAdditionalPermissions}onCheckedChange={handleCheckedChange("editors")}checked={value.relation === "editors"}title="Content"@@ -246,7 +260,7 @@ const Menu = ({ name, hasProPlan, value, onChange, onDelete }: MenuProps) => {<Flex direction="column">Recipients can edit content only, such as text, images, andpredefined components.- {hasProPlan !== true && (+ {!allowAdditionalPermissions && (<><br /><br />@@ -281,7 +295,9 @@ const Menu = ({ name, hasProPlan, value, onChange, onDelete }: MenuProps) => {}}><Checkbox- disabled={hasProPlan !== true || value.relation !== "editors"}+ disabled={+ !allowAdditionalPermissions || value.relation !== "editors"+ }checked={value.canPublish}onCheckedChange={(canPublish) => {onChange({ ...value, canPublish: Boolean(canPublish) });@@ -290,7 +306,9 @@ const Menu = ({ name, hasProPlan, value, onChange, onDelete }: MenuProps) => {/><LabelhtmlFor={ids.canPublish}- disabled={hasProPlan !== true || value.relation !== "editors"}+ disabled={+ !allowAdditionalPermissions || value.relation !== "editors"+ }>Can publish</Label>@@ -305,7 +323,7 @@ const Menu = ({ name, hasProPlan, value, onChange, onDelete }: MenuProps) => {/><Permission- disabled={hasProPlan !== true}+ disabled={!allowAdditionalPermissions}onCheckedChange={handleCheckedChange("administrators")}checked={value.relation === "administrators"}title="Admin"@@ -313,7 +331,7 @@ const Menu = ({ name, hasProPlan, value, onChange, onDelete }: MenuProps) => {<Flex direction="column">Recipients can make any changes and can also publish theproject.- {hasProPlan !== true && (+ {!allowAdditionalPermissions && (<><br /><br />@@ -375,7 +393,7 @@ type SharedLinkItemType = {onChange: (value: LinkOptions) => void;onDelete: () => void;builderUrl: (props: { authToken: string; mode: BuilderMode }) => string;- hasProPlan: boolean;+ allowAdditionalPermissions: boolean;};const relationToMode: Record<Relation, BuilderMode> = {@@ -390,7 +408,7 @@ const SharedLinkItem = ({onChange,onDelete,builderUrl,- hasProPlan,+ allowAdditionalPermissions,}: SharedLinkItemType) => {const [currentName, setCurrentName] = useState(value.name);@@ -416,7 +434,7 @@ const SharedLinkItem = ({onChange(value);}}onDelete={onDelete}- hasProPlan={hasProPlan}+ allowAdditionalPermissions={allowAdditionalPermissions}/></Box>);@@ -429,7 +447,7 @@ type ShareProjectProps = {onCreate: () => void;builderUrl: SharedLinkItemType["builderUrl"];isPending: boolean;- hasProPlan: boolean;+ allowAdditionalPermissions: boolean;};const animateCollapsibleHeight = keyframes({@@ -456,7 +474,7 @@ export const ShareProject = ({onCreate,builderUrl,isPending,- hasProPlan,+ allowAdditionalPermissions,}: ShareProjectProps) => {const items = links.map((link) => (<Fragment key={link.token}>@@ -469,7 +487,7 @@ export const ShareProject = ({}}builderUrl={builderUrl}value={link}- hasProPlan={hasProPlan}+ allowAdditionalPermissions={allowAdditionalPermissions}/><Separator /></Fragment>diff --git a/packages/trpc-interface/src/context/context.server.ts b/packages/trpc-interface/src/context/context.server.tsindex 9e4457787c..24a9c110f2 100644--- a/packages/trpc-interface/src/context/context.server.ts+++ b/packages/trpc-interface/src/context/context.server.ts@@ -65,25 +65,19 @@ type DeploymentContext = {};type UserPlanFeatures = {- allowShareAdminLinks: boolean;+ allowAdditionalPermissions: boolean;allowDynamicData: boolean;+ allowContentMode: boolean;+ allowStagingPublish: boolean;maxContactEmails: number;maxDomainsAllowedPerUser: number;maxPublishesAllowedPerUser: number;- hasSubscription: boolean;-} & (- | {- hasProPlan: true;- planName: string;- }- | { hasProPlan: false }-);--// No strings except planName - no secrets-({}) as Omit<UserPlanFeatures, "planName"> satisfies Record<- string,- boolean | number->;+ /** All user purchases (subscriptions and LTDs). subscriptionId present only for recurring subscriptions */+ purchases: Array<{+ planName: string;+ subscriptionId?: string;+ }>;+};type TrpcCache = {setMaxAge: (path: string, value: number) => void;