Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.
Python agentagentic-aiagentic-frameworkagentic-workflowaiautomationclaudedeepseekgenaigptllmlow-codemcpnextjsno-codeopenaipythonskillsworkflow
fix: route billing interval changes to checkout (#43669)
Joele5f9b47c626b
diff --git a/web/__tests__/billing/cloud-plan-payment-flow.test.tsx b/web/__tests__/billing/cloud-plan-payment-flow.test.tsxindex c87c3975d62..b74bfeba4f0 100644--- a/web/__tests__/billing/cloud-plan-payment-flow.test.tsx+++ b/web/__tests__/billing/cloud-plan-payment-flow.test.tsx@@ -91,7 +91,12 @@ const renderCloudPlanItem = ({<CloudPlanItemplan={plan}billingInterval={billingInterval}- billing={{ currentPlan, isEducationDiscountEligible, isEducationDiscountActivated: false }}+ billing={{+ currentPlan,+ currentBillingInterval: 'month',+ isEducationDiscountEligible,+ isEducationDiscountActivated: false,+ }}/></>,{ wrapper },diff --git a/web/app/components/billing/pricing/__tests__/content.spec.tsx b/web/app/components/billing/pricing/__tests__/content.spec.tsxindex f1928bf60dd..ff79ff75e5b 100644--- a/web/app/components/billing/pricing/__tests__/content.spec.tsx+++ b/web/app/components/billing/pricing/__tests__/content.spec.tsx@@ -254,7 +254,7 @@ it('keeps the current paid plan billing action available while education loads oqueries: { retry: false, retryOnMount: false, staleTime: Infinity },})seedFeatures(queryClient, {- billing: { subscription: { plan: 'professional' } },+ billing: { subscription: { plan: 'professional', interval: 'month' } },education: { enabled: true },})let rejectEducation!: (error: Error) => void@@ -306,6 +306,58 @@ it('uses the visible billing label to name and toggle the switch', async () => {expect(screen.getByText('$59')).toBeVisible()})+it.each([+ ['professional', 'month', 'year'],+ ['professional', 'year', 'month'],+ ['team', 'month', 'year'],+ ['team', 'year', 'month'],+] as const)(+ 'checks out %s when changing from %s to %s',+ async (plan, currentInterval, selectedInterval) => {+ const user = userEvent.setup()+ const { queryClient, show } = setup()+ seedFeatures(queryClient, {+ billing: { subscription: { plan, interval: currentInterval } },+ })+ const navigate = vi.spyOn(window.location, 'href', 'set').mockImplementation(() => {})+ const fetchCheckout = vi.spyOn(globalThis, 'fetch').mockResolvedValue(+ new Response(JSON.stringify({ url: 'https://checkout.example.com' }), {+ headers: { 'Content-Type': 'application/json' },+ }),+ )+ show()+ if (selectedInterval === 'year') await user.click(screen.getByRole('switch'))+ await user.click(screen.getByRole('button', { name: 'billing.plansCommon.currentPlan' }))+ await waitFor(() => expect(navigate).toHaveBeenCalledWith('https://checkout.example.com'))+ const request = fetchCheckout.mock.calls[0]?.[0]+ const requestUrl = request instanceof Request ? request.url : String(request)+ expect(requestUrl).toContain('/billing/subscription')+ expect(requestUrl).toContain(`plan=${plan}`)+ expect(requestUrl).toContain(`interval=${selectedInterval}`)+ expect(openBillingWindow).not.toHaveBeenCalled()+ },+)++it.each(['month', 'year'] as const)(+ 'opens the portal for the current %s subscription',+ async (interval) => {+ const user = userEvent.setup()+ const { queryClient, show } = setup()+ seedFeatures(queryClient, {+ billing: { subscription: { plan: 'professional', interval } },+ })+ vi.spyOn(globalThis, 'fetch').mockResolvedValue(+ new Response(JSON.stringify({ url: 'https://billing.example.com' }), {+ headers: { 'Content-Type': 'application/json' },+ }),+ )+ openBillingWindow.mockImplementation((getUrl: () => Promise<string>) => getUrl())+ show()+ if (interval === 'year') await user.click(screen.getByRole('switch'))+ await user.click(screen.getByRole('button', { name: 'billing.plansCommon.currentPlan' }))+ await waitFor(() => expect(openBillingWindow).toHaveResolvedWith('https://billing.example.com'))+ },+)it('includes the marketplace in the Premium purchase link name', async () => {const user = userEvent.setup()const { queryClient, show } = setup()diff --git a/web/app/components/billing/pricing/content.tsx b/web/app/components/billing/pricing/content.tsxindex d18fe8f8ac4..19358b0649e 100644--- a/web/app/components/billing/pricing/content.tsx+++ b/web/app/components/billing/pricing/content.tsx@@ -48,6 +48,7 @@ export function PricingContent() {const billing = currentCloudPlan? {currentPlan: currentCloudPlan,+ currentBillingInterval: features.billing.subscription.interval,isEducationDiscountEligible,isEducationDiscountActivated: features.education.activated,}diff --git a/web/app/components/billing/pricing/plans/cloud-plan-item/index.tsx b/web/app/components/billing/pricing/plans/cloud-plan-item/index.tsxindex 8a6097661b2..e276ba93be5 100644--- a/web/app/components/billing/pricing/plans/cloud-plan-item/index.tsx+++ b/web/app/components/billing/pricing/plans/cloud-plan-item/index.tsx@@ -36,6 +36,7 @@ type CloudPlanItemProps = {billing:| {currentPlan: CloudPlan+ currentBillingInterval: stringisEducationDiscountEligible: boolean | undefinedisEducationDiscountActivated: boolean}@@ -55,11 +56,12 @@ export function CloudPlanItem({ plan, billingInterval, billing }: CloudPlanItemPconst planInfo = ALL_PLANS[plan]const isCurrent = plan === currentPlanconst isCurrentPaidPlan = isCurrent && !isFreePlan+ const isCurrentSubscription =+ isCurrentPaidPlan && billingInterval === billing?.currentBillingIntervalconst isPlanDisabled =!billing ||- (!isCurrentPaidPlan &&- (billing.isEducationDiscountEligible === undefined ||- planInfo.level <= ALL_PLANS[billing.currentPlan].level))+ (!isCurrentSubscription && billing.isEducationDiscountEligible === undefined) ||+ (!isCurrentPaidPlan && planInfo.level <= ALL_PLANS[billing.currentPlan].level)const isEducationDiscountSupportedPlan = plan === 'professional' && isYearlyconst educationDiscountWarningText =canManageBilling &&@@ -93,7 +95,7 @@ export function CloudPlanItem({ plan, billingInterval, billing }: CloudPlanItemPsetIsPlanActionPending(true)try {- if (isCurrentPaidPlan) {+ if (isCurrentSubscription) {if (!canManageBilling) {toast.error(t(($) => $.buyPermissionDeniedTip, { ns: 'billing' }))return