Skip to content

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

fix(studio): skip project count query for platform orgs (#44566)

Alaister Young421eaedd508d
diff --git a/apps/studio/components/interfaces/Billing/NoProjectsOnPaidOrgInfo.tsx b/apps/studio/components/interfaces/Billing/NoProjectsOnPaidOrgInfo.tsx
index 2062f15a4d6..81a6a2227f8 100644
--- a/apps/studio/components/interfaces/Billing/NoProjectsOnPaidOrgInfo.tsx
+++ b/apps/studio/components/interfaces/Billing/NoProjectsOnPaidOrgInfo.tsx
@@ -9,7 +9,11 @@ interface NoProjectsOnPaidOrgInfoProps {
}
export const NoProjectsOnPaidOrgInfo = ({ organization }: NoProjectsOnPaidOrgInfoProps) => {
- const { data } = useOrgProjectsInfiniteQuery({ slug: organization?.slug })
+ const isPlatformOrg = organization?.plan?.id === 'platform'
+ const { data } = useOrgProjectsInfiniteQuery(
+ { slug: organization?.slug },
+ { enabled: !isPlatformOrg }
+ )
const projectCount = data?.pages[0].pagination.count ?? 0
if (
@@ -17,7 +21,7 @@ export const NoProjectsOnPaidOrgInfo = ({ organization }: NoProjectsOnPaidOrgInf
organization?.plan === undefined ||
organization.plan.id === 'free' ||
organization.plan.id === 'enterprise' ||
- organization.plan.id === 'platform'
+ isPlatformOrg
)
return null
diff --git a/apps/studio/components/interfaces/Organization/OrganizationCard.tsx b/apps/studio/components/interfaces/Organization/OrganizationCard.tsx
index 492e6024941..417d24004c3 100644
--- a/apps/studio/components/interfaces/Organization/OrganizationCard.tsx
+++ b/apps/studio/components/interfaces/Organization/OrganizationCard.tsx
@@ -23,7 +23,11 @@ export const OrganizationCard = ({
onClick?: () => void
}) => {
const isUserMFAEnabled = useIsMFAEnabled()
- const { data } = useOrgProjectsInfiniteQuery({ slug: organization.slug })
+ const isPlatformOrg = organization.plan?.id === 'platform'
+ const { data } = useOrgProjectsInfiniteQuery(
+ { slug: organization.slug },
+ { enabled: !isPlatformOrg }
+ )
const numProjects = data?.pages[0].pagination.count ?? 0
const isMfaRequired = organization.organization_requires_mfa
diff --git a/apps/studio/components/layouts/Navigation/NavigationBar/OrgSelector.tsx b/apps/studio/components/layouts/Navigation/NavigationBar/OrgSelector.tsx
index 53a3556b291..b3e7e8ea5fb 100644
--- a/apps/studio/components/layouts/Navigation/NavigationBar/OrgSelector.tsx
+++ b/apps/studio/components/layouts/Navigation/NavigationBar/OrgSelector.tsx
@@ -38,15 +38,17 @@ export function OrgSelector() {
const [open, setOpen] = useState(false)
const slug = selectedOrganization?.slug
+ const isPlatformOrg = selectedOrganization?.plan?.id === 'platform'
const selectedOrgInitial = selectedOrganization?.name?.trim().charAt(0).toUpperCase() || 'O'
const { data: projects } = useOrgProjectsInfiniteQuery(
{ slug, limit: 1 },
- { enabled: Boolean(slug) }
+ { enabled: Boolean(slug) && !isPlatformOrg }
)
const numProjects = projects?.pages[0]?.pagination.count
- const projectsLabel =
- typeof numProjects === 'number'
+ const projectsLabel = isPlatformOrg
+ ? 'Platform'
+ : typeof numProjects === 'number'
? `${numProjects} project${numProjects === 1 ? '' : 's'}`
: 'No projects'