Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

feat(billing): Lazy load BillingSettings queries for components that are not in view (#48454)

Daniel Guerra5a3e3598d0a3
diff --git a/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/PaymentMethods.test.tsx b/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/PaymentMethods.test.tsx
index fecbfd6e02f..29dbe25a73c 100644
--- a/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/PaymentMethods.test.tsx
+++ b/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/PaymentMethods.test.tsx
@@ -1,10 +1,13 @@
import { screen } from '@testing-library/react'
+import { mockIntersectionObserver } from 'jsdom-testing-mocks'
import { beforeEach, describe, expect, it, vi } from 'vitest'
import PaymentMethods from './PaymentMethods'
import { MANAGED_BY } from '@/lib/constants/infrastructure'
import { createMockOrganization, render } from '@/tests/helpers'
+mockIntersectionObserver()
+
const { mockSelectedOrganization, mockPaymentMethodsQuery, mockSubscription } = vi.hoisted(() => ({
mockSelectedOrganization: vi.fn(),
mockPaymentMethodsQuery: vi.fn(),
diff --git a/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/PaymentMethods.tsx b/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/PaymentMethods.tsx
index fda065cad11..09ef0267878 100644
--- a/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/PaymentMethods.tsx
+++ b/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/PaymentMethods.tsx
@@ -2,6 +2,7 @@ import { PermissionAction, SupportCategories } from '@supabase/shared-types/out/
import { useParams } from 'common'
import { CreditCardIcon, ExternalLink, Plus } from 'lucide-react'
import { useState } from 'react'
+import { useInView } from 'react-intersection-observer'
import { toast } from 'sonner'
import { Button } from 'ui'
import { Admonition } from 'ui-patterns/Admonition'
@@ -37,14 +38,15 @@ const PaymentMethods = () => {
const [selectedMethodToDelete, setSelectedMethodToDelete] = useState<any>()
const [showAddPaymentMethodModal, setShowAddPaymentMethodModal] = useState(false)
- const { data: subscription } = useOrgSubscriptionQuery({ orgSlug: slug })
+ const { ref, inView } = useInView({ triggerOnce: true })
+ const { data: subscription } = useOrgSubscriptionQuery({ orgSlug: slug }, { enabled: inView })
const {
data: paymentMethods,
error,
isPending: isLoading,
isError,
isSuccess,
- } = useOrganizationPaymentMethodsQuery({ slug })
+ } = useOrganizationPaymentMethodsQuery({ slug }, { enabled: inView })
const { can: canReadPaymentMethods, isSuccess: isPermissionsLoaded } = useAsyncCheckPermissions(
PermissionAction.BILLING_READ,
@@ -61,7 +63,7 @@ const PaymentMethods = () => {
selectedOrganization?.managed_by === MANAGED_BY.STRIPE_PROJECTS
return (
<>
- <ScaffoldSection>
+ <ScaffoldSection ref={ref}>
<ScaffoldSectionDetail>
<div className="sticky space-y-2 top-12">
<p className="text-foreground text-base m-0">Payment Methods</p>
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/BillingBreakdown/UpcomingInvoice.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/BillingBreakdown/UpcomingInvoice.tsx
index 3b8c7f2390e..eddb54f4696 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/BillingBreakdown/UpcomingInvoice.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/BillingBreakdown/UpcomingInvoice.tsx
@@ -1,4 +1,5 @@
import React from 'react'
+import { useInView } from 'react-intersection-observer'
import { Table, TableBody, TableCell, TableFooter, TableRow } from 'ui'
import { InfoTooltip } from 'ui-patterns/info-tooltip'
import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
@@ -53,13 +54,15 @@ const usageBillingDocsLink: { [K in PricingMetric]?: string } = {
}
export const UpcomingInvoice = ({ slug }: UpcomingInvoiceProps) => {
+ const { ref, inView } = useInView({ triggerOnce: true })
+
const {
data: upcomingInvoice,
error: error,
isPending: isLoading,
isError,
isSuccess,
- } = useOrgUpcomingInvoiceQuery({ orgSlug: slug })
+ } = useOrgUpcomingInvoiceQuery({ orgSlug: slug }, { enabled: inView })
const { data: organization } = useOrganizationQuery({ slug })
@@ -109,7 +112,7 @@ export const UpcomingInvoice = ({ slug }: UpcomingInvoiceProps) => {
!planItem && upcomingInvoice?.fixed_fees_billing_mode === 'in_arrears'
return (
- <>
+ <div ref={ref}>
{isLoading && (
<div className="space-y-2">
<ShimmeringLoader />
@@ -398,7 +401,7 @@ export const UpcomingInvoice = ({ slug }: UpcomingInvoiceProps) => {
</div>
</div>
)}
- </>
+ </div>
)
}
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerData.test.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerData.test.tsx
index e2ae0ef10ab..203c3879cc1 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerData.test.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerData.test.tsx
@@ -1,4 +1,5 @@
import { screen } from '@testing-library/react'
+import { mockIntersectionObserver } from 'jsdom-testing-mocks'
import type { ReactNode } from 'react'
import { beforeEach, describe, expect, it, vi } from 'vitest'
@@ -6,6 +7,8 @@ import { BillingCustomerData } from './BillingCustomerData'
import { MANAGED_BY } from '@/lib/constants/infrastructure'
import { createMockOrganization, render } from '@/tests/helpers'
+mockIntersectionObserver()
+
const mockSelectedOrganization = vi.hoisted(() => vi.fn())
vi.mock('common', async (importOriginal) => {
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerData.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerData.tsx
index 98c584f1744..42f0369936f 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerData.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerData.tsx
@@ -5,6 +5,7 @@ import { useQueryClient } from '@tanstack/react-query'
import { useParams } from 'common'
import { useTheme } from 'next-themes'
import { useEffect, useMemo, useRef, useState } from 'react'
+import { useInView } from 'react-intersection-observer'
import { toast } from 'sonner'
import { Button, Card, CardFooter, Form } from 'ui'
import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
@@ -47,19 +48,24 @@ export const BillingCustomerData = () => {
'stripe.customer'
)
+ const { ref, inView } = useInView({ triggerOnce: true })
+
const {
data: customerProfile,
error,
isPending: isLoading,
isSuccess,
- } = useOrganizationCustomerProfileQuery({ slug }, { enabled: canReadBillingCustomerData })
+ } = useOrganizationCustomerProfileQuery(
+ { slug },
+ { enabled: canReadBillingCustomerData && inView }
+ )
const {
data: taxId,
error: errorLoadingTaxId,
isPending: isLoadingTaxId,
isSuccess: loadedTaxId,
- } = useOrganizationTaxIdQuery({ slug })
+ } = useOrganizationTaxIdQuery({ slug }, { enabled: inView })
const { mutateAsync: updateCustomerProfile } = useOrganizationCustomerProfileUpdateMutation({
onError: () => {},
@@ -165,7 +171,7 @@ export const BillingCustomerData = () => {
)
return (
- <ScaffoldSection>
+ <ScaffoldSection ref={ref}>
<ScaffoldSectionDetail>
<div className="sticky space-y-2 top-12 pr-3">
<p className="text-foreground text-base m-0">Billing Address &amp; Tax ID</p>
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/BillingEmail.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/BillingEmail.tsx
index 6e3a172b0d4..f2b7e943f76 100644
--- a/apps/studio/components/interfaces/Organization/BillingSettings/BillingEmail.tsx
+++ b/apps/studio/components/interfaces/Organization/BillingSettings/BillingEmail.tsx
@@ -4,6 +4,7 @@ import { Form, FormControl, FormField } from '@ui/components/shadcn/ui/form'
import { useParams } from 'common'
import { useEffect } from 'react'
import { useForm, useWatch } from 'react-hook-form'
+import { useInView } from 'react-intersection-observer'
import { toast } from 'sonner'
import { FormMessage, Input } from 'ui'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
@@ -51,8 +52,10 @@ const BillingEmail = () => {
'organizations'
)
+ const { ref, inView } = useInView({ triggerOnce: true })
+
const { data: billingCustomer, isPending: loadingBillingCustomer } =
- useOrganizationCustomerProfileQuery({ slug }, { enabled: canReadBillingEmail })
+ useOrganizationCustomerProfileQuery({ slug }, { enabled: canReadBillingEmail && inView })
const form = useForm<z.infer<typeof formSchema>>({
resolver: zodResolver(formSchema),
@@ -103,7 +106,7 @@ const BillingEmail = () => {
}, [billingCustomer])
return (
- <ScaffoldSection>
+ <ScaffoldSection ref={ref}>
<ScaffoldSectionDetail>
<div className="sticky space-y-2 top-12">
<p className="text-foreground text-base m-0">Email Recipient</p>
diff --git a/apps/studio/components/interfaces/Organization/InvoicesSettings/InvoicesSettings.test.tsx b/apps/studio/components/interfaces/Organization/InvoicesSettings/InvoicesSettings.test.tsx
index 2c9d8d58344..baffd645a80 100644
--- a/apps/studio/components/interfaces/Organization/InvoicesSettings/InvoicesSettings.test.tsx
+++ b/apps/studio/components/interfaces/Organization/InvoicesSettings/InvoicesSettings.test.tsx
@@ -1,10 +1,13 @@
import { screen } from '@testing-library/react'
+import { mockIntersectionObserver } from 'jsdom-testing-mocks'
import { beforeEach, describe, expect, it, vi } from 'vitest'
import { InvoicesSettings } from './InvoicesSettings'
import { MANAGED_BY } from '@/lib/constants/infrastructure'
import { createMockOrganization, render } from '@/tests/helpers'
+mockIntersectionObserver()
+
const { mockSelectedOrganization, mockInvoicesQuery, mockInvoicesCountQuery } = vi.hoisted(() => ({
mockSelectedOrganization: vi.fn(),
mockInvoicesQuery: vi.fn(),
diff --git a/apps/studio/components/interfaces/Organization/InvoicesSettings/InvoicesSettings.tsx b/apps/studio/components/interfaces/Organization/InvoicesSettings/InvoicesSettings.tsx
index b25978116dd..ebbb793c58d 100644
--- a/apps/studio/components/interfaces/Organization/InvoicesSettings/InvoicesSettings.tsx
+++ b/apps/studio/components/interfaces/Organization/InvoicesSettings/InvoicesSettings.tsx
@@ -1,6 +1,7 @@
import dayjs from 'dayjs'
import { ChevronLeft, ChevronRight, FileText, Receipt, ScrollText } from 'lucide-react'
import { useEffect, useState } from 'react'
+import { useInView } from 'react-intersection-observer'
import { toast } from 'sonner'
import {
Button,
@@ -56,13 +57,16 @@ export const InvoicesSettings = () => {
const isPartnerBilledOrganization = isPartnerBillingOrganization(
selectedOrganization?.billing_partner
)
+
+ const { ref, inView } = useInView({ triggerOnce: true })
+
const offset = (page - 1) * PAGE_LIMIT
const { data: count, isError: isErrorCount } = useInvoicesCountQuery(
{
slug,
},
- { enabled: !isPartnerBilledOrganization }
+ { enabled: !isPartnerBilledOrganization && inView }
)
const {
data,
@@ -75,7 +79,7 @@ export const InvoicesSettings = () => {
offset,
limit: PAGE_LIMIT,
},
- { enabled: !isPartnerBilledOrganization }
+ { enabled: !isPartnerBilledOrganization && inView }
)
const invoices = data || []
@@ -118,7 +122,7 @@ export const InvoicesSettings = () => {
isLoading || invoices.length === 0 ? 'text-foreground-muted' : undefined
return (
- <Card>
+ <Card ref={ref}>
<Table>
<TableHeader>
<TableRow>