The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
feat: refresh tax preview on address change (#44470)
Ignacio Dobronichf6eb9a024ed6
diff --git a/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/NewPaymentMethodElement.tsx b/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/NewPaymentMethodElement.tsxindex 3710afb8300..6fd104901f4 100644--- a/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/NewPaymentMethodElement.tsx+++ b/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/NewPaymentMethodElement.tsx@@ -85,12 +85,16 @@ export const NewPaymentMethodElement = forwardRef(currentAddress,currentTaxId,customerName,+ onAddressChange,+ onTaxIdChange,}: {email?: string | null | undefinedreadOnly: booleancurrentAddress?: CustomerAddress | nullcurrentTaxId?: CustomerTaxId | nullcustomerName?: string | undefined+ onAddressChange?: (address: CustomerAddress) => void+ onTaxIdChange?: (taxId: CustomerTaxId | null) => void},ref) => {@@ -123,13 +127,25 @@ export const NewPaymentMethodElement = forwardRef(form.setValue('tax_id_name', name)}- const { tax_id_name } = form.watch()+ const { tax_id_name, tax_id_value } = form.watch()const selectedTaxId = TAX_IDS.find((option) => option.name === tax_id_name)const [purchasingAsBusiness, setPurchasingAsBusiness] = useState(currentTaxId != null)const [stripeAddress, setStripeAddress] = useState<StripeAddressElementChangeEvent['value'] | undefined>(undefined)+ useEffect(() => {+ if (!onTaxIdChange) return+ if (purchasingAsBusiness && selectedTaxId && tax_id_value) {+ onTaxIdChange({+ country: getEffectiveTaxCountry(selectedTaxId),+ type: selectedTaxId.type,+ value: tax_id_value,+ })+ } else {+ onTaxIdChange(null)+ }+ }, [purchasingAsBusiness, selectedTaxId, tax_id_value, onTaxIdChange])const availableTaxIds = useMemo(() => {const country = stripeAddress?.address.country || null@@ -272,7 +288,15 @@ export const NewPaymentMethodElement = forwardRef(options={addressOptions}// Force reload after changing purchasingAsBusiness setting, it seems like the element does not reload otherwisekey={`address-elements-${purchasingAsBusiness}`}- onChange={(evt) => setStripeAddress(evt.value)}+ onChange={(evt) => {+ setStripeAddress(evt.value)+ if (onAddressChange && evt.complete) {+ onAddressChange({+ ...evt.value.address,+ line2: evt.value.address.line2 || undefined,+ })+ }+ }}onReady={() => setFullyLoaded(true)}/>diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/CreditTopUp.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/CreditTopUp.tsxindex 4eb34ecbf72..caa483e390b 100644--- a/apps/studio/components/interfaces/Organization/BillingSettings/CreditTopUp.tsx+++ b/apps/studio/components/interfaces/Organization/BillingSettings/CreditTopUp.tsx@@ -84,6 +84,7 @@ export const CreditTopUp = ({ slug }: { slug: string | undefined }) => {})const [topUpModalVisible, setTopUpModalVisible] = useState(false)+ const [useAsDefaultBillingAddress, setUseAsDefaultBillingAddress] = useState(true)const [paymentConfirmationLoading, setPaymentConfirmationLoading] = useState(false)const [captchaToken, setCaptchaToken] = useState<string | null>(null)const [captchaRef, setCaptchaRef] = useState<HCaptcha | null>(null)@@ -281,6 +282,8 @@ export const CreditTopUp = ({ slug }: { slug: string | undefined }) => {onSelectPaymentMethod={(pm) => form.setValue('paymentMethod', pm)}selectedPaymentMethod={form.getValues('paymentMethod')}readOnly={executingTopUp || paymentConfirmationLoading}+ useAsDefaultBillingAddress={useAsDefaultBillingAddress}+ onUseAsDefaultBillingAddressChange={setUseAsDefaultBillingAddress}/>)}/>diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PaymentMethodSelection.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PaymentMethodSelection.tsxindex 3eccf239531..82a0122acfb 100644--- a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PaymentMethodSelection.tsx+++ b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PaymentMethodSelection.tsx@@ -26,6 +26,7 @@ import { useOrganizationCustomerProfileQuery } from '@/data/organizations/organiimport { useOrganizationPaymentMethodSetupIntent } from '@/data/organizations/organization-payment-method-setup-intent-mutation'import { useOrganizationPaymentMethodsQuery } from '@/data/organizations/organization-payment-methods-query'import { useOrganizationTaxIdQuery } from '@/data/organizations/organization-tax-id-query'+import type { CustomerAddress, CustomerTaxId } from '@/data/organizations/types'import { SetupIntentResponse } from '@/data/stripe/setup-intent-mutation'import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { BASE_PATH, STRIPE_PUBLIC_KEY } from '@/lib/constants'@@ -37,6 +38,10 @@ export interface PaymentMethodSelectionProps {onSelectPaymentMethod: (id: string) => voidlayout?: 'vertical' | 'horizontal'readOnly: boolean+ onAddressChange?: (address: CustomerAddress) => void+ onTaxIdChange?: (taxId: CustomerTaxId | null) => void+ useAsDefaultBillingAddress: boolean+ onUseAsDefaultBillingAddressChange: (useAsDefault: boolean) => void}const PaymentMethodSelection = forwardRef(function PaymentMethodSelection(@@ -45,6 +50,10 @@ const PaymentMethodSelection = forwardRef(function PaymentMethodSelection(onSelectPaymentMethod,layout = 'vertical',readOnly,+ onAddressChange,+ onTaxIdChange,+ useAsDefaultBillingAddress,+ onUseAsDefaultBillingAddressChange,}: PaymentMethodSelectionProps,ref) {@@ -53,7 +62,6 @@ const PaymentMethodSelection = forwardRef(function PaymentMethodSelection(const [captchaToken, setCaptchaToken] = useState<string | null>(null)const [captchaRef, setCaptchaRef] = useState<HCaptcha | null>(null)const [setupIntent, setSetupIntent] = useState<SetupIntentResponse | undefined>(undefined)- const [useAsDefaultBillingAddress, setUseAsDefaultBillingAddress] = useState(true)const { resolvedTheme } = useTheme()const paymentRef = useRef<PaymentMethodElementRef | null>(null)const [setupNewPaymentMethod, setSetupNewPaymentMethod] = useState<boolean | null>(null)@@ -281,6 +289,8 @@ const PaymentMethodSelection = forwardRef(function PaymentMethodSelection(customerName={customerProfile?.billing_name}currentAddress={customerProfile?.address}currentTaxId={taxId}+ onAddressChange={onAddressChange}+ onTaxIdChange={onTaxIdChange}/></Elements>@@ -290,7 +300,9 @@ const PaymentMethodSelection = forwardRef(function PaymentMethodSelection(<Checkbox_Shadcn_id="defaultBillingAddress"checked={useAsDefaultBillingAddress}- onCheckedChange={() => setUseAsDefaultBillingAddress(!useAsDefaultBillingAddress)}+ onCheckedChange={() => {+ onUseAsDefaultBillingAddressChange(!useAsDefaultBillingAddress)+ }}/><labelhtmlFor="defaultBillingAddress"diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.tsxindex 0125853d98b..7cf488602b1 100644--- a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.tsx+++ b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/PlanUpdateSidePanel.tsx@@ -1,10 +1,11 @@import { PermissionAction } from '@supabase/shared-types/out/constants'+import { useDebounce } from '@uidotdev/usehooks'import { useParams } from 'common'import { StudioPricingSidePanelOpenedEvent } from 'common/telemetry-constants'import { isArray } from 'lodash'import { Check, ExternalLink } from 'lucide-react'import { useRouter } from 'next/router'-import { useEffect, useMemo, useRef, useState } from 'react'+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'import { plans as subscriptionsPlans } from 'shared-data/plans'import { Button, cn, SidePanel } from 'ui'import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'@@ -22,6 +23,7 @@ import { RequestUpgradeToBillingOwners } from '@/components/ui/RequestUpgradeToBimport { useFreeProjectLimitCheckQuery } from '@/data/organizations/free-project-limit-check-query'import { useOrganizationBillingSubscriptionPreview } from '@/data/organizations/organization-billing-subscription-preview'import { useOrganizationQuery } from '@/data/organizations/organization-query'+import type { CustomerAddress, CustomerTaxId } from '@/data/organizations/types'import { useOrgProjectsInfiniteQuery } from '@/data/projects/org-projects-infinite-query'import { useOrgPlansQuery } from '@/data/subscriptions/org-plans-query'import { useOrgSubscriptionQuery } from '@/data/subscriptions/org-subscription-query'@@ -61,6 +63,26 @@ export const PlanUpdateSidePanel = () => {const [showUpgradeSurvey, setShowUpgradeSurvey] = useState(false)const [showDowngradeError, setShowDowngradeError] = useState(false)const [selectedTier, setSelectedTier] = useState<'tier_free' | 'tier_pro' | 'tier_team'>()+ const [latestAddress, setLatestAddress] = useState<CustomerAddress>()+ const [latestTaxId, setLatestTaxId] = useState<CustomerTaxId | null>()+ const [useAsDefaultBillingAddress, setUseAsDefaultBillingAddress] = useState(true)++ const billingAddress = useAsDefaultBillingAddress ? latestAddress : undefined+ const billingTaxId = useAsDefaultBillingAddress ? latestTaxId : null+ const debouncedAddress = useDebounce(billingAddress, 1000)+ const debouncedTaxId = useDebounce(billingTaxId, 1000)++ const handleAddressChange = useCallback(+ (address: CustomerAddress) => setLatestAddress(address),+ []+ )++ const handleTaxIdChange = useCallback((taxId: CustomerTaxId | null) => setLatestTaxId(taxId), [])++ const handleUseAsDefaultBillingAddressChange = useCallback(+ (useAsDefault: boolean) => setUseAsDefaultBillingAddress(useAsDefault),+ []+ )const { can: canUpdateSubscription } = useAsyncCheckPermissions(PermissionAction.BILLING_WRITE,@@ -104,8 +126,14 @@ export const PlanUpdateSidePanel = () => {data: subscriptionPreview,error: subscriptionPreviewError,isPending: subscriptionPreviewIsLoading,+ isFetching: subscriptionPreviewIsFetching,isSuccess: subscriptionPreviewInitialized,- } = useOrganizationBillingSubscriptionPreview({ tier: selectedTier, organizationSlug: slug })+ } = useOrganizationBillingSubscriptionPreview({+ tier: selectedTier,+ organizationSlug: slug,+ address: debouncedAddress,+ taxId: debouncedTaxId ?? undefined,+ })const availablePlans: OrgPlan[] = plans?.plans ?? []const hasMembersExceedingFreeTierLimit =@@ -118,6 +146,9 @@ export const PlanUpdateSidePanel = () => {useEffect(() => {if (visible) {setSelectedTier(undefined)+ setLatestAddress(undefined)+ setLatestTaxId(undefined)+ setUseAsDefaultBillingAddress(true)const source = Array.isArray(router.query.source)? router.query.source[0]: router.query.source@@ -342,6 +373,7 @@ export const PlanUpdateSidePanel = () => {planMeta={planMeta}subscriptionPreviewError={subscriptionPreviewError}subscriptionPreviewIsLoading={subscriptionPreviewIsLoading}+ subscriptionPreviewIsFetching={subscriptionPreviewIsFetching}subscriptionPreviewInitialized={subscriptionPreviewInitialized}subscriptionPreview={subscriptionPreview}subscription={subscription}@@ -352,6 +384,10 @@ export const PlanUpdateSidePanel = () => {subscriptionsPlans.find((plan) => plan.id === `tier_${subscription?.plan?.id}`)?.features || [],}}+ onAddressChange={handleAddressChange}+ onTaxIdChange={handleTaxIdChange}+ useAsDefaultBillingAddress={useAsDefaultBillingAddress}+ onUseAsDefaultBillingAddressChange={handleUseAsDefaultBillingAddressChange}/><MembersExceedLimitModaldiff --git a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/SubscriptionPlanUpdateDialog.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/SubscriptionPlanUpdateDialog.tsxindex 2fe4f3609fd..85fbca4f2ce 100644--- a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/SubscriptionPlanUpdateDialog.tsx+++ b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/SubscriptionPlanUpdateDialog.tsx@@ -6,7 +6,7 @@ import Link from 'next/link'import { useMemo, useRef, useState } from 'react'import { plans as subscriptionsPlans } from 'shared-data/plans'import { toast } from 'sonner'-import { Button, Dialog, DialogContent, Table, TableBody, TableCell, TableRow } from 'ui'+import { Button, cn, Dialog, DialogContent, Table, TableBody, TableCell, TableRow } from 'ui'import { Admonition } from 'ui-patterns'import { InfoTooltip } from 'ui-patterns/info-tooltip'import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'@@ -21,6 +21,7 @@ import {} from '@/components/interfaces/Billing/Subscription/Subscription.utils'import AlertError from '@/components/ui/AlertError'import { OrganizationBillingSubscriptionPreviewData } from '@/data/organizations/organization-billing-subscription-preview'+import type { CustomerAddress, CustomerTaxId } from '@/data/organizations/types'import { OrgProject } from '@/data/projects/org-projects-infinite-query'import { useConfirmPendingSubscriptionChangeMutation } from '@/data/subscriptions/org-subscription-confirm-pending-change'import { useOrgSubscriptionUpdateMutation } from '@/data/subscriptions/org-subscription-update-mutation'@@ -64,11 +65,16 @@ interface Props {planMeta: anysubscriptionPreviewError: anysubscriptionPreviewIsLoading: boolean+ subscriptionPreviewIsFetching: booleansubscriptionPreviewInitialized: booleansubscriptionPreview: OrganizationBillingSubscriptionPreviewData | undefinedsubscription: anycurrentPlanMeta: anyprojects: OrgProject[]+ onAddressChange?: (address: CustomerAddress) => void+ onTaxIdChange?: (taxId: CustomerTaxId | null) => void+ useAsDefaultBillingAddress: boolean+ onUseAsDefaultBillingAddressChange: (useAsDefault: boolean) => void}export const SubscriptionPlanUpdateDialog = ({@@ -77,11 +83,16 @@ export const SubscriptionPlanUpdateDialog = ({planMeta,subscriptionPreviewError,subscriptionPreviewIsLoading,+ subscriptionPreviewIsFetching,subscriptionPreviewInitialized,subscriptionPreview,subscription,currentPlanMeta,projects,+ onAddressChange,+ onTaxIdChange,+ useAsDefaultBillingAddress,+ onUseAsDefaultBillingAddressChange,}: Props) => {const { resolvedTheme } = useTheme()const { data: selectedOrganization } = useSelectedOrganizationQuery()@@ -325,16 +336,22 @@ export const SubscriptionPlanUpdateDialog = ({<div className="p-8 pb-8 flex flex-col xl:col-span-3"><div className="flex-1"><div>- {!billingViaPartner && subscriptionPreview != null && changeType === 'upgrade' && (- <div className="space-y-2 mb-4">- <PaymentMethodSelection- ref={paymentMethodSelectionRef}- selectedPaymentMethod={selectedPaymentMethod}- onSelectPaymentMethod={(pm) => setSelectedPaymentMethod(pm)}- readOnly={paymentConfirmationLoading || isConfirming || isUpdating}- />- </div>- )}+ {!billingViaPartner &&+ subscriptionPreviewInitialized &&+ changeType === 'upgrade' && (+ <div className="space-y-2 mb-4">+ <PaymentMethodSelection+ ref={paymentMethodSelectionRef}+ selectedPaymentMethod={selectedPaymentMethod}+ onSelectPaymentMethod={(pm) => setSelectedPaymentMethod(pm)}+ readOnly={paymentConfirmationLoading || isConfirming || isUpdating}+ onAddressChange={onAddressChange}+ onTaxIdChange={onTaxIdChange}+ useAsDefaultBillingAddress={useAsDefaultBillingAddress}+ onUseAsDefaultBillingAddressChange={onUseAsDefaultBillingAddressChange}+ />+ </div>+ )}{billingViaPartner && (<div className="mb-4">@@ -368,7 +385,12 @@ export const SubscriptionPlanUpdateDialog = ({)}{subscriptionPreviewInitialized && (<>- <div className="mt-2 mb-4 text-foreground-light text-sm">+ <div+ className={cn(+ 'mt-2 mb-4 text-foreground-light text-sm transition-opacity',+ subscriptionPreviewIsFetching && 'opacity-50'+ )}+ >{breakdownItems.map((item, i) =>item.type === 'amount' ? (<div@@ -668,7 +690,7 @@ export const SubscriptionPlanUpdateDialog = ({<div className="flex space-x-2"><Buttonloading={isUpdating || paymentConfirmationLoading || isConfirming}- disabled={subscriptionPreviewIsLoading}+ disabled={subscriptionPreviewIsLoading || subscriptionPreviewIsFetching}type="primary"onClick={onUpdateSubscription}className="flex-1"diff --git a/apps/studio/data/organizations/keys.ts b/apps/studio/data/organizations/keys.tsindex 95a59322621..0fd0a9093c6 100644--- a/apps/studio/data/organizations/keys.ts+++ b/apps/studio/data/organizations/keys.ts@@ -14,8 +14,11 @@ export const organizationKeys = {slug: string | undefined,{ date_start, date_end }: { date_start: string | undefined; date_end: string | undefined }) => ['organizations', slug, 'audit-logs', { date_start, date_end }] as const,- subscriptionPreview: (slug: string | undefined, tier: string | undefined) =>- ['organizations', slug, 'subscription', 'preview', tier] as const,+ subscriptionPreview: (+ slug: string | undefined,+ tier: string | undefined,+ params?: { address?: Record<string, unknown>; taxId?: Record<string, unknown> }+ ) => ['organizations', slug, 'subscription', 'preview', tier, params] as const,taxId: (slug: string | undefined) => ['organizations', slug, 'tax-ids'] as const,tokenValidation: (slug: string | undefined, token: string | undefined) =>['organizations', slug, 'validate-token', token] as const,diff --git a/apps/studio/data/organizations/organization-billing-subscription-preview.ts b/apps/studio/data/organizations/organization-billing-subscription-preview.tsindex d91aac9749f..b088a3d2313 100644--- a/apps/studio/data/organizations/organization-billing-subscription-preview.ts+++ b/apps/studio/data/organizations/organization-billing-subscription-preview.ts@@ -1,6 +1,7 @@-import { useQuery } from '@tanstack/react-query'+import { keepPreviousData, useQuery } from '@tanstack/react-query'import { organizationKeys } from './keys'+import type { CustomerAddress, CustomerTaxId } from './types'import { handleError, post } from '@/data/fetchers'import type { SubscriptionTier } from '@/data/subscriptions/types'import type { ResponseError, UseCustomQueryOptions } from '@/types'@@ -8,11 +9,15 @@ import type { ResponseError, UseCustomQueryOptions } from '@/types'export type OrganizationBillingSubscriptionPreviewVariables = {organizationSlug?: stringtier?: SubscriptionTier+ address?: CustomerAddress+ taxId?: CustomerTaxId}export async function previewOrganizationBillingSubscription({organizationSlug,tier,+ address,+ taxId,}: OrganizationBillingSubscriptionPreviewVariables) {if (!organizationSlug) throw new Error('organizationSlug is required')if (!tier) throw new Error('tier is required')@@ -23,6 +28,8 @@ export async function previewOrganizationBillingSubscription({params: { path: { slug: organizationSlug } },body: {tier,+ ...(address && { address }),+ ...(taxId && { tax_id: taxId }),},headers: {Version: '2',@@ -42,15 +49,20 @@ export type OrganizationBillingSubscriptionPreviewData = Awaited<export const useOrganizationBillingSubscriptionPreview = <TData = OrganizationBillingSubscriptionPreviewData,>(- { organizationSlug, tier }: OrganizationBillingSubscriptionPreviewVariables,+ { organizationSlug, tier, address, taxId }: OrganizationBillingSubscriptionPreviewVariables,{enabled = true,...options}: UseCustomQueryOptions<OrganizationBillingSubscriptionPreviewData, ResponseError, TData> = {}) =>useQuery<OrganizationBillingSubscriptionPreviewData, ResponseError, TData>({- queryKey: organizationKeys.subscriptionPreview(organizationSlug, tier),- queryFn: () => previewOrganizationBillingSubscription({ organizationSlug, tier }),+ queryKey: organizationKeys.subscriptionPreview(organizationSlug, tier, {+ address: address as Record<string, unknown> | undefined,+ taxId: taxId as Record<string, unknown> | undefined,+ }),+ queryFn: () =>+ previewOrganizationBillingSubscription({ organizationSlug, tier, address, taxId }),enabled: enabled && typeof organizationSlug !== 'undefined' && typeof tier !== 'undefined',+ placeholderData: keepPreviousData,...options,})