The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
feat(billing): show billing address modal to users other than owners/admins (#44132)
Kanishk Dudejad37de74cba29
diff --git a/apps/studio/components/interfaces/App/UpdateBillingAddressModal.tsx b/apps/studio/components/interfaces/App/UpdateBillingAddressModal.tsxindex 468d846aa72..63efad95af4 100644--- a/apps/studio/components/interfaces/App/UpdateBillingAddressModal.tsx+++ b/apps/studio/components/interfaces/App/UpdateBillingAddressModal.tsx@@ -40,11 +40,19 @@ export function UpdateBillingAddressModal() {const { data: org } = useSelectedOrganizationQuery()const slug = org?.slug- const { can: canBillingWrite, isSuccess: permissionsLoaded } = useAsyncCheckPermissions(+ const { can: canBillingRead, isSuccess: billingReadLoaded } = useAsyncCheckPermissions(+ PermissionAction.BILLING_READ,+ 'stripe.customer'+ )+ const { can: canBillingWrite, isSuccess: billingWriteLoaded } = useAsyncCheckPermissions(PermissionAction.BILLING_WRITE,'stripe.customer')+ const permissionsLoaded = billingReadLoaded && billingWriteLoaded+ const canViewModal = canBillingRead || canBillingWrite+ const canManageBillingAddress = canBillingWrite+const shouldShow = Boolean(IS_PLATFORM &&showMissingAddressModal &&@@ -53,22 +61,29 @@ export function UpdateBillingAddressModal() {org.organization_missing_address &&!org.billing_partner &&permissionsLoaded &&- canBillingWrite+ canViewModal)const {data: customerProfile,isSuccess: profileLoaded,isError: profileError,- } = useOrganizationCustomerProfileQuery({ slug }, { enabled: shouldShow && !dismissed && !!slug })+ } = useOrganizationCustomerProfileQuery(+ { slug },+ { enabled: shouldShow && !dismissed && !!slug && canManageBillingAddress }+ )const {data: taxId,isSuccess: taxIdLoaded,isError: taxIdError,- } = useOrganizationTaxIdQuery({ slug }, { enabled: shouldShow && !dismissed && !!slug })+ } = useOrganizationTaxIdQuery(+ { slug },+ { enabled: shouldShow && !dismissed && !!slug && canManageBillingAddress }+ )- const open = shouldShow && !dismissed && !profileError && !taxIdError+ const open =+ shouldShow && !dismissed && (!canManageBillingAddress || (!profileError && !taxIdError))const initialCustomerData = useMemo<Partial<BillingCustomerDataFormValues>>(() => ({@@ -128,45 +143,56 @@ export function UpdateBillingAddressModal() {><DialogContentsize="medium"- hideClose+ hideClose={canManageBillingAddress}onInteractOutside={(e) => e.preventDefault()}onEscapeKeyDown={(e) => e.preventDefault()}><DialogHeader><DialogTitle>Billing address required</DialogTitle><DialogDescription>- Please provide a billing address for your organization. If you are a registered business- and have a Tax ID, please add your Tax ID too.+ {canManageBillingAddress ? (+ 'Please provide a billing address for your organization. If you are a registered business and have a Tax ID, please add your Tax ID too.'+ ) : (+ <>+ Your organization requires a billing address. If you are a registered business, a+ Tax ID is also required.+ <br />+ <br />+ Please ask an organization administrator or owner to update it as soon as possible+ to avoid service restrictions.+ </>+ )}</DialogDescription></DialogHeader>- {!profileLoaded || !taxIdLoaded ? (- <DialogSection>- <div className="space-y-2">- <ShimmeringLoader />- <ShimmeringLoader className="w-3/4" />- <ShimmeringLoader className="w-1/2" />- </div>- </DialogSection>- ) : (- <Form {...form}>- <form onSubmit={form.handleSubmit(handleSubmit)}>- <DialogSection className="max-h-[60vh] overflow-y-auto">- <BillingCustomerDataForm form={form} />- </DialogSection>- <DialogFooter>- <Button- type="primary"- htmlType="submit"- loading={isSubmitting}- disabled={!isDirty || isSubmitting}- >- Save address- </Button>- </DialogFooter>- </form>- </Form>- )}+ {canManageBillingAddress &&+ (!profileLoaded || !taxIdLoaded ? (+ <DialogSection>+ <div className="space-y-2">+ <ShimmeringLoader />+ <ShimmeringLoader className="w-3/4" />+ <ShimmeringLoader className="w-1/2" />+ </div>+ </DialogSection>+ ) : (+ <Form {...form}>+ <form onSubmit={form.handleSubmit(handleSubmit)}>+ <DialogSection className="max-h-[60vh] overflow-y-auto">+ <BillingCustomerDataForm form={form} />+ </DialogSection>+ <DialogFooter>+ <Button+ type="primary"+ htmlType="submit"+ loading={isSubmitting}+ disabled={!isDirty || isSubmitting}+ >+ Save address+ </Button>+ </DialogFooter>+ </form>+ </Form>+ ))}</DialogContent></Dialog>)