The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
feat(studio): page titles for account and org surfaces (#43536)
Danny White817a2710da60
diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/BillingBreakdown/BillingBreakdown.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/BillingBreakdown/BillingBreakdown.tsxindex 490810947cb..3755da11b68 100644--- a/apps/studio/components/interfaces/Organization/BillingSettings/BillingBreakdown/BillingBreakdown.tsx+++ b/apps/studio/components/interfaces/Organization/BillingSettings/BillingBreakdown/BillingBreakdown.tsx@@ -1,7 +1,4 @@import { PermissionAction } from '@supabase/shared-types/out/constants'-import dayjs from 'dayjs'-import Link from 'next/link'-import { useParams } from 'common'import {ScaffoldSection,@@ -12,12 +9,15 @@ import AlertError from 'components/ui/AlertError'import NoPermission from 'components/ui/NoPermission'import SparkBar from 'components/ui/SparkBar'import { useOrgSubscriptionQuery } from 'data/subscriptions/org-subscription-query'+import dayjs from 'dayjs'import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'import { MANAGED_BY } from 'lib/constants/infrastructure'import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'-import UpcomingInvoice from './UpcomingInvoice'++import { UpcomingInvoice } from './UpcomingInvoice'+import { InlineLink } from '@/components/ui/InlineLink'const BillingBreakdown = () => {const { slug: orgSlug } = useParams()@@ -79,14 +79,15 @@ const BillingBreakdown = () => {<p>For a more detailed breakdown, visit the{' '}- <Link href={`/org/${orgSlug}/usage`}>usage page.</Link>+ <InlineLink href={`/org/${orgSlug}/usage`}>usage page.</InlineLink></p></>) : (<>Your upcoming invoice (excluding credits) will continue to update until the end ofyour billing cycle on {billingCycleEnd.format('MMMM DD')}. For a more detailed- breakdown, visit the <Link href={`/org/${orgSlug}/usage`}>usage page.</Link>+ breakdown, visit the{' '}+ <InlineLink href={`/org/${orgSlug}/usage`}>usage page.</InlineLink></>)}</p>diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/BillingBreakdown/UpcomingInvoice.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/BillingBreakdown/UpcomingInvoice.tsxindex 21788d9aefc..93bd17e505f 100644--- a/apps/studio/components/interfaces/Organization/BillingSettings/BillingBreakdown/UpcomingInvoice.tsx+++ b/apps/studio/components/interfaces/Organization/BillingSettings/BillingBreakdown/UpcomingInvoice.tsx@@ -1,5 +1,3 @@-import Link from 'next/link'-import AlertError from 'components/ui/AlertError'import { PricingMetric } from 'data/analytics/org-daily-stats-query'import {@@ -8,11 +6,14 @@ import {} from 'data/invoices/org-invoice-upcoming-query'import { DOCS_URL } from 'lib/constants'import { formatCurrency } from 'lib/helpers'+import Link from 'next/link'import React from 'react'import { Table, TableBody, TableCell, TableFooter, TableRow } from 'ui'import { InfoTooltip } from 'ui-patterns/info-tooltip'import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'+import { billingMetricUnit, formatUsage } from '../helpers'+import { InlineLink } from '@/components/ui/InlineLink'export interface UpcomingInvoiceProps {slug?: string@@ -48,7 +49,7 @@ const usageBillingDocsLink: { [K in PricingMetric]?: string } = {[PricingMetric.LOG_DRAIN]: `${DOCS_URL}/guides/platform/manage-your-usage/log-drains`,}-const UpcomingInvoice = ({ slug }: UpcomingInvoiceProps) => {+export const UpcomingInvoice = ({ slug }: UpcomingInvoiceProps) => {const {data: upcomingInvoice,error: error,@@ -246,17 +247,13 @@ const UpcomingInvoice = ({ slug }: UpcomingInvoiceProps) => {usageBillingDocsLink[item.usage_metric] != null && (<p className="mt-2">See{' '}- <Link- className="underline"- href={usageBillingDocsLink[item.usage_metric]!}- target="_blank"- >+ <InlineLink href={usageBillingDocsLink[item.usage_metric]!}>docs- </Link>{' '}+ </InlineLink>{' '}on how billing for {item.description} works and{' '}- <Link className="underline" href={`/organization/${slug}/usage`}>+ <InlineLink href={`/organization/${slug}/usage`}>usage page- </Link>{' '}+ </InlineLink>{' '}for a detailed breakdown.</p>)}@@ -425,5 +422,3 @@ function ComputeLineItem({</>)}--export default UpcomingInvoicediff --git a/apps/studio/components/interfaces/Organization/BillingSettings/CostControl/CostControl.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/CostControl/CostControl.tsxindex f7c23432868..2903d9f1d0d 100644--- a/apps/studio/components/interfaces/Organization/BillingSettings/CostControl/CostControl.tsx+++ b/apps/studio/components/interfaces/Organization/BillingSettings/CostControl/CostControl.tsx@@ -24,6 +24,7 @@ import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'import { ProjectUpdateDisabledTooltip } from '../ProjectUpdateDisabledTooltip'import SpendCapSidePanel from './SpendCapSidePanel'+import { InlineLink } from '@/components/ui/InlineLink'export interface CostControlProps {}@@ -64,13 +65,7 @@ const CostControl = ({}: CostControlProps) => {<p className="text-foreground text-base m-0">Cost Control</p><p className="text-sm text-foreground-light m-0">Allow scaling beyond your plan's{' '}- <Link- href={`/org/${slug}/usage`}- className="text-green-900 transition hover:text-green-1000"- >- included quota- </Link>- .+ <InlineLink href={`/org/${slug}/usage`}>included quota</InlineLink>.</p></div><div className="space-y-2">diff --git a/apps/studio/components/interfaces/Organization/Documents/Documents.tsx b/apps/studio/components/interfaces/Organization/Documents/Documents.tsxindex ef8b097ed9d..8d3ca07f67f 100644--- a/apps/studio/components/interfaces/Organization/Documents/Documents.tsx+++ b/apps/studio/components/interfaces/Organization/Documents/Documents.tsx@@ -8,6 +8,7 @@ import {import { InlineLinkClassName } from 'components/ui/InlineLink'import { useCustomContent } from 'hooks/custom-content/useCustomContent'import { Fragment } from 'react'+import { CustomDocument } from './CustomDocument'import { DPA } from './DPA'import { HIPAA } from './HIPAA'@@ -31,37 +32,37 @@ export const Documents = () => {return (<>- <ScaffoldContainer id="dpa">+ <ScaffoldContainer id="dpa" className="px-6 xl:px-10"><DPA /></ScaffoldContainer><ScaffoldDivider />- <ScaffoldContainer id="tia">+ <ScaffoldContainer id="tia" className="px-6 xl:px-10"><TIA /></ScaffoldContainer><ScaffoldDivider />- <ScaffoldContainer id="soc2">+ <ScaffoldContainer id="soc2" className="px-6 xl:px-10"><SOC2 /></ScaffoldContainer><ScaffoldDivider />- <ScaffoldContainer id="hipaa">+ <ScaffoldContainer id="hipaa" className="px-6 xl:px-10"><HIPAA /></ScaffoldContainer><ScaffoldDivider />- <ScaffoldContainer id="security-questionnaire">+ <ScaffoldContainer id="security-questionnaire" className="px-6 xl:px-10"><SecurityQuestionnaire /></ScaffoldContainer><ScaffoldDivider />- <ScaffoldContainer>+ <ScaffoldContainer className="px-6 xl:px-10"><ScaffoldSection className="py-12"><ScaffoldSectionDetail className="col-span-full"><p className="text-sm text-foreground-light m-0">diff --git a/apps/studio/components/layouts/AccessTokens/AccessTokensLayout.tsx b/apps/studio/components/layouts/AccessTokens/AccessTokensLayout.tsxindex 43840b62216..8590e9c817a 100644--- a/apps/studio/components/layouts/AccessTokens/AccessTokensLayout.tsx+++ b/apps/studio/components/layouts/AccessTokens/AccessTokensLayout.tsx@@ -1,8 +1,7 @@+import { useFlag } from 'common'import Link from 'next/link'import { useRouter } from 'next/router'import { PropsWithChildren } from 'react'--import { useFlag } from 'common'import { NavMenu, NavMenuItem } from 'ui'import { PageContainer } from 'ui-patterns/PageContainer'import {@@ -14,7 +13,7 @@ import {PageHeaderTitle,} from 'ui-patterns/PageHeader'-const AccessTokensLayout = ({ children }: PropsWithChildren) => {+export const AccessTokensLayout = ({ children }: PropsWithChildren) => {const router = useRouter()const scopedTokensEnabled = useFlag('scopedPAT')@@ -68,5 +67,3 @@ const AccessTokensLayout = ({ children }: PropsWithChildren) => {</>)}--export default AccessTokensLayoutdiff --git a/apps/studio/components/layouts/AccountLayout/AccountLayout.tsx b/apps/studio/components/layouts/AccountLayout/AccountLayout.tsxindex 5a15698b947..7ddf9e57621 100644--- a/apps/studio/components/layouts/AccountLayout/AccountLayout.tsx+++ b/apps/studio/components/layouts/AccountLayout/AccountLayout.tsx@@ -4,6 +4,7 @@ import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'import { useLocalStorageQuery } from 'hooks/misc/useLocalStorage'import { withAuth } from 'hooks/misc/withAuth'import { IS_PLATFORM } from 'lib/constants'+import { buildStudioPageTitle } from 'lib/page-title'import Head from 'next/head'import { useRouter } from 'next/router'import type { PropsWithChildren } from 'react'@@ -27,7 +28,7 @@ const AccountLayout = ({ children, title }: PropsWithChildren<AccountLayoutPropsconst showSecuritySettings = useIsFeatureEnabled('account:show_security_settings')const { appTitle } = useCustomContent(['app:title'])- const titleSuffix = appTitle || 'Supabase'+ const brandTitle = appTitle || 'Supabase'const [lastVisitedOrganization] = useLocalStorageQuery(LOCAL_STORAGE_KEYS.LAST_VISITED_ORGANIZATION,@@ -42,6 +43,11 @@ const AccountLayout = ({ children, title }: PropsWithChildren<AccountLayoutProps: '/organizations'const currentPath = router.pathname+ const pageTitle = buildStudioPageTitle({+ section: title,+ surface: 'Account',+ brand: brandTitle,+ })const sections = useMemo(() => [@@ -107,7 +113,7 @@ const AccountLayout = ({ children, title }: PropsWithChildren<AccountLayoutPropsreturn (<><Head>- <title>{title ? `${title} | ${titleSuffix}` : titleSuffix}</title>+ <title>{pageTitle}</title><meta name="description" content="Supabase Studio" /></Head><div className={cn('flex flex-col w-screen h-[calc(100vh-48px)]')}>diff --git a/apps/studio/components/layouts/AppLayout/AppLayout.tsx b/apps/studio/components/layouts/AppLayout/AppLayout.tsxindex 3ca69ee54ce..4e36604889d 100644--- a/apps/studio/components/layouts/AppLayout/AppLayout.tsx+++ b/apps/studio/components/layouts/AppLayout/AppLayout.tsx@@ -1,7 +1,5 @@import { PropsWithChildren } from 'react'-const AppLayout = ({ children }: PropsWithChildren<{}>) => {+export const AppLayout = ({ children }: PropsWithChildren<{}>) => {return <div className="h-full min-h-[0px] basis-0 flex-1">{children}</div>}--export default AppLayoutdiff --git a/apps/studio/components/layouts/OrganizationLayout.tsx b/apps/studio/components/layouts/OrganizationLayout.tsxindex 2823ca16caf..9478f693d7f 100644--- a/apps/studio/components/layouts/OrganizationLayout.tsx+++ b/apps/studio/components/layouts/OrganizationLayout.tsx@@ -2,34 +2,51 @@ import PartnerIcon from 'components/ui/PartnerIcon'import { PARTNER_TO_NAME } from 'components/ui/PartnerManagedResource'import { useAwsRedirectQuery } from 'data/integrations/aws-redirect-query'import { useVercelRedirectQuery } from 'data/integrations/vercel-redirect-query'+import { useCustomContent } from 'hooks/custom-content/useCustomContent'import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'import { withAuth } from 'hooks/misc/withAuth'import { MANAGED_BY } from 'lib/constants/infrastructure'+import { buildStudioPageTitle } from 'lib/page-title'import { ExternalLink } from 'lucide-react'+import Head from 'next/head'+import { useRouter } from 'next/router'import type { PropsWithChildren } from 'react'import { Alert_Shadcn_, AlertTitle_Shadcn_, Button, cn } from 'ui'import { useRegisterOrgMenu } from './OrganizationLayout/useRegisterOrgMenu'-const OrganizationLayoutContent = ({ children }: PropsWithChildren) => {+interface OrganizationLayoutProps {+ title: string+}++// [Joshen] Just for page title generation for org settings pages+const settingsPages = ['general', 'security', 'sso', 'apps', 'audit', 'documents']++const OrganizationLayoutContent = ({+ children,+ title,+}: PropsWithChildren<OrganizationLayoutProps>) => {+ const router = useRouter()const { data: selectedOrganization } = useSelectedOrganizationQuery()+ const { appTitle } = useCustomContent(['app:title'])++ // Keep title intent close to each page (getLayout) to avoid route-to-title drift in this layout.+ const isSettingsSurface = settingsPages.some((x) => router.pathname.endsWith(x))+ const pageTitle = buildStudioPageTitle({+ section: title,+ surface: isSettingsSurface ? 'Organization Settings' : undefined,+ org: selectedOrganization?.name,+ brand: appTitle || 'Supabase',+ })const vercelQuery = useVercelRedirectQuery(- {- installationId: selectedOrganization?.partner_id,- },- {- enabled: selectedOrganization?.managed_by === MANAGED_BY.VERCEL_MARKETPLACE,- }+ { installationId: selectedOrganization?.partner_id },+ { enabled: selectedOrganization?.managed_by === MANAGED_BY.VERCEL_MARKETPLACE })const awsQuery = useAwsRedirectQuery(- {- organizationSlug: selectedOrganization?.slug,- },- {- enabled: selectedOrganization?.managed_by === MANAGED_BY.AWS_MARKETPLACE,- }+ { organizationSlug: selectedOrganization?.slug },+ { enabled: selectedOrganization?.managed_by === MANAGED_BY.AWS_MARKETPLACE })// Select the appropriate query based on partner@@ -38,6 +55,12 @@ const OrganizationLayoutContent = ({ children }: PropsWithChildren) => {return (<div className={cn('h-full w-full flex flex-col overflow-hidden')}>+ {pageTitle && (+ <Head>+ <title>{pageTitle}</title>+ <meta name="description" content="Supabase Studio" />+ </Head>+ )}{selectedOrganization && selectedOrganization?.managed_by !== 'supabase' && (<Alert_Shadcn_variant="default"@@ -59,9 +82,9 @@ const OrganizationLayoutContent = ({ children }: PropsWithChildren) => {)}-const OrganizationLayout = ({ children }: PropsWithChildren) => {+const OrganizationLayout = ({ children, title }: PropsWithChildren<OrganizationLayoutProps>) => {useRegisterOrgMenu()- return <OrganizationLayoutContent>{children}</OrganizationLayoutContent>+ return <OrganizationLayoutContent title={title}>{children}</OrganizationLayoutContent>}export default withAuth(OrganizationLayout)diff --git a/apps/studio/components/layouts/ProjectLayout/OrganizationSettingsLayout.test.ts b/apps/studio/components/layouts/ProjectLayout/OrganizationSettingsLayout.test.tsindex 6a2b4c0aa97..5cfb64fa8ea 100644--- a/apps/studio/components/layouts/ProjectLayout/OrganizationSettingsLayout.test.ts+++ b/apps/studio/components/layouts/ProjectLayout/OrganizationSettingsLayout.test.ts@@ -3,7 +3,6 @@ import { describe, expect, it } from 'vitest'import {generateOrganizationSettingsMenuItems,generateOrganizationSettingsSections,- getOrganizationSettingsDocumentTitle,normalizeOrganizationSettingsPath,} from './OrganizationSettingsLayout'@@ -103,12 +102,4 @@ describe('OrganizationSettingsLayout helpers', () => {?.isActive).toBe(true)})-- it('uses settings as default document title when page title is not provided', () => {- expect(getOrganizationSettingsDocumentTitle(undefined, 'Supabase')).toBe('Settings | Supabase')- })-- it('uses page title for document title when provided', () => {- expect(getOrganizationSettingsDocumentTitle('General', 'Supabase')).toBe('General | Supabase')- })})diff --git a/apps/studio/components/layouts/ProjectLayout/OrganizationSettingsLayout.tsx b/apps/studio/components/layouts/ProjectLayout/OrganizationSettingsLayout.tsxindex 2671ab7e310..40cb4182717 100644--- a/apps/studio/components/layouts/ProjectLayout/OrganizationSettingsLayout.tsx+++ b/apps/studio/components/layouts/ProjectLayout/OrganizationSettingsLayout.tsx@@ -1,13 +1,10 @@-import Head from 'next/head'-import { PropsWithChildren } from 'react'-import { useParams } from 'common'import { useIsPlatformWebhooksEnabled } from 'components/interfaces/App/FeaturePreview/FeaturePreviewContext'import type { SidebarSection } from 'components/layouts/AccountLayout/AccountLayout.types'import { WithSidebar } from 'components/layouts/AccountLayout/WithSidebar'-import { useCustomContent } from 'hooks/custom-content/useCustomContent'import { useCurrentPath } from 'hooks/misc/useCurrentPath'import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'+import { PropsWithChildren } from 'react'interface OrganizationSettingsMenuItemsProps {slug?: string@@ -21,16 +18,7 @@ interface OrganizationSettingsSectionsProps extends OrganizationSettingsMenuItemcurrentPath: string}-interface OrganizationSettingsLayoutProps {- pageTitle?: string-}-export const normalizeOrganizationSettingsPath = (path: string) => path.split('#')[0]-export const getOrganizationSettingsPageTitle = (pageTitle?: string) => pageTitle ?? 'Settings'-export const getOrganizationSettingsDocumentTitle = (- pageTitle: string | undefined,- title: string-) => `${getOrganizationSettingsPageTitle(pageTitle)} | ${title}`export const generateOrganizationSettingsMenuItems = ({slug,@@ -193,16 +181,11 @@ export const generateOrganizationSettingsSections = ({]}-function OrganizationSettingsLayout({- children,- pageTitle,-}: PropsWithChildren<OrganizationSettingsLayoutProps>) {+export function OrganizationSettingsLayout({ children }: PropsWithChildren) {const { slug } = useParams()const showPlatformWebhooks = useIsPlatformWebhooksEnabled()const fullCurrentPath = useCurrentPath()const currentPath = normalizeOrganizationSettingsPath(fullCurrentPath)- const { appTitle } = useCustomContent(['app:title'])- const titleSuffix = appTitle || 'Supabase'const {organizationShowSsoSettings: showSsoSettings,@@ -223,25 +206,20 @@ function OrganizationSettingsLayout({showPlatformWebhooks,})+ // Browser titles for org settings routes are set by OrganizationLayout.return (- <>- <Head>- <title>{getOrganizationSettingsDocumentTitle(pageTitle, titleSuffix)}</title>- <meta name="description" content="Supabase Studio" />- </Head>- <WithSidebar- title="Organization Settings"- breadcrumbs={[]}- sections={sections}- header={- <div className="border-default flex min-h-[var(--header-height)] items-center border-b px-6">- <h4 className="text-lg">Settings</h4>- </div>- }- >- {children}- </WithSidebar>- </>+ <WithSidebar+ title="Organization Settings"+ breadcrumbs={[]}+ sections={sections}+ header={+ <div className="border-default flex min-h-[var(--header-height)] items-center border-b px-6">+ <h4 className="text-lg">Settings</h4>+ </div>+ }+ >+ {children}+ </WithSidebar>)}diff --git a/apps/studio/pages/account/audit.tsx b/apps/studio/pages/account/audit.tsxindex c54102ac594..8c19dc38eaf 100644--- a/apps/studio/pages/account/audit.tsx+++ b/apps/studio/pages/account/audit.tsx@@ -1,8 +1,7 @@import { AuditLogs } from 'components/interfaces/Account/AuditLogs'import AccountLayout from 'components/layouts/AccountLayout/AccountLayout'-import AppLayout from 'components/layouts/AppLayout/AppLayout'-import DefaultLayout from 'components/layouts/DefaultLayout'-import OrganizationLayout from 'components/layouts/OrganizationLayout'+import { AppLayout } from 'components/layouts/AppLayout/AppLayout'+import { DefaultLayout } from 'components/layouts/DefaultLayout'import type { NextPageWithLayout } from 'types'import { PageContainer } from 'ui-patterns/PageContainer'import {@@ -36,9 +35,7 @@ const Audit: NextPageWithLayout = () => {Audit.getLayout = (page) => (<AppLayout><DefaultLayout headerTitle="Account">- <OrganizationLayout>- <AccountLayout title="Audit Logs">{page}</AccountLayout>- </OrganizationLayout>+ <AccountLayout title="Audit Logs">{page}</AccountLayout></DefaultLayout></AppLayout>)diff --git a/apps/studio/pages/account/me.tsx b/apps/studio/pages/account/me.tsxindex 0dfc31b0cc8..74f9f5d31e4 100644--- a/apps/studio/pages/account/me.tsx+++ b/apps/studio/pages/account/me.tsx@@ -7,10 +7,9 @@ import { InlineEditorSettings } from 'components/interfaces/Account/Preferences/import { ProfileInformation } from 'components/interfaces/Account/Preferences/ProfileInformation'import { ThemeSettings } from 'components/interfaces/Account/Preferences/ThemeSettings'import AccountLayout from 'components/layouts/AccountLayout/AccountLayout'-import AppLayout from 'components/layouts/AppLayout/AppLayout'-import DefaultLayout from 'components/layouts/DefaultLayout'-import OrganizationLayout from 'components/layouts/OrganizationLayout'-import AlertError from 'components/ui/AlertError'+import { AppLayout } from 'components/layouts/AppLayout/AppLayout'+import { DefaultLayout } from 'components/layouts/DefaultLayout'+import { AlertError } from 'components/ui/AlertError'import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'import { useProfile } from 'lib/profile'import type { NextPageWithLayout } from 'types'@@ -32,9 +31,7 @@ const User: NextPageWithLayout = () => {User.getLayout = (page) => (<AppLayout><DefaultLayout headerTitle="Account">- <OrganizationLayout>- <AccountLayout title="Account Settings">{page}</AccountLayout>- </OrganizationLayout>+ <AccountLayout title="Preferences">{page}</AccountLayout></DefaultLayout></AppLayout>)diff --git a/apps/studio/pages/account/security.tsx b/apps/studio/pages/account/security.tsxindex 9a6ff5ff17e..d04a7c163e7 100644--- a/apps/studio/pages/account/security.tsx+++ b/apps/studio/pages/account/security.tsx@@ -1,13 +1,11 @@-import { Smartphone } from 'lucide-react'-import { TOTPFactors } from 'components/interfaces/Account/TOTPFactors'import AccountLayout from 'components/layouts/AccountLayout/AccountLayout'-import AppLayout from 'components/layouts/AppLayout/AppLayout'-import DefaultLayout from 'components/layouts/DefaultLayout'-import OrganizationLayout from 'components/layouts/OrganizationLayout'+import { AppLayout } from 'components/layouts/AppLayout/AppLayout'+import { DefaultLayout } from 'components/layouts/DefaultLayout'import { UnknownInterface } from 'components/ui/UnknownInterface'import { useMfaListFactorsQuery } from 'data/profile/mfa-list-factors-query'import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'+import { Smartphone } from 'lucide-react'import type { NextPageWithLayout } from 'types'import {Badge,@@ -90,9 +88,7 @@ const Security: NextPageWithLayout = () => {Security.getLayout = (page) => (<AppLayout><DefaultLayout headerTitle="Account">- <OrganizationLayout>- <AccountLayout title="Security">{page}</AccountLayout>- </OrganizationLayout>+ <AccountLayout title="Security">{page}</AccountLayout></DefaultLayout></AppLayout>)diff --git a/apps/studio/pages/account/tokens.tsx b/apps/studio/pages/account/tokens.tsxindex deb965d81e2..7ce87e8310f 100644--- a/apps/studio/pages/account/tokens.tsx+++ b/apps/studio/pages/account/tokens.tsx@@ -1,19 +1,19 @@-import { ExternalLink, Search } from 'lucide-react'-import { useState } from 'react'import { AccessTokenList } from 'components/interfaces/Account/AccessTokens/AccessTokenList'import { NewTokenButton } from 'components/interfaces/Account/AccessTokens/Classic/NewTokenButton'-import { AccessTokenNewBanner } from '@/components/interfaces/Account/AccessTokens/AccessTokenNewBanner/AccessTokenNewBanner'-import AccessTokensLayout from 'components/layouts/AccessTokens/AccessTokensLayout'+import { AccessTokensLayout } from 'components/layouts/AccessTokens/AccessTokensLayout'import AccountLayout from 'components/layouts/AccountLayout/AccountLayout'-import AppLayout from 'components/layouts/AppLayout/AppLayout'-import DefaultLayout from 'components/layouts/DefaultLayout'-import OrganizationLayout from 'components/layouts/OrganizationLayout'+import { AppLayout } from 'components/layouts/AppLayout/AppLayout'+import { DefaultLayout } from 'components/layouts/DefaultLayout'import { NewAccessToken } from 'data/access-tokens/access-tokens-create-mutation'import { DOCS_URL } from 'lib/constants'+import { ExternalLink, Search } from 'lucide-react'+import { useState } from 'react'import type { NextPageWithLayout } from 'types'import { Button } from 'ui'import { Input } from 'ui-patterns/DataInputs/Input'+import { AccessTokenNewBanner } from '@/components/interfaces/Account/AccessTokens/AccessTokenNewBanner/AccessTokenNewBanner'+const UserAccessTokens: NextPageWithLayout = () => {const [newToken, setNewToken] = useState<NewAccessToken | undefined>()const [searchString, setSearchString] = useState('')@@ -67,9 +67,7 @@ const UserAccessTokens: NextPageWithLayout = () => {UserAccessTokens.getLayout = (page) => (<AppLayout><DefaultLayout headerTitle="Account">- <OrganizationLayout>- <AccountLayout title="Access Tokens">{page}</AccountLayout>- </OrganizationLayout>+ <AccountLayout title="Access Tokens">{page}</AccountLayout></DefaultLayout></AppLayout>)diff --git a/apps/studio/pages/account/tokens/scoped.tsx b/apps/studio/pages/account/tokens/scoped.tsxindex a2a259fa9a1..80b718810c9 100644--- a/apps/studio/pages/account/tokens/scoped.tsx+++ b/apps/studio/pages/account/tokens/scoped.tsx@@ -1,20 +1,18 @@-import { ExternalLink, Search } from 'lucide-react'-import { useState } from 'react'--import AccessTokensLayout from 'components/layouts/AccessTokens/AccessTokensLayout'import { NewScopedTokenButton } from 'components/interfaces/Account/AccessTokens/Scoped/NewScopedTokenButton'-import { AccessTokenNewBanner } from '@/components/interfaces/Account/AccessTokens/AccessTokenNewBanner/AccessTokenNewBanner'-import { ScopedTokenList } from 'components/interfaces/Account/AccessTokens/Scoped/ScopedTokenList'+import { AccessTokensLayout } from 'components/layouts/AccessTokens/AccessTokensLayout'import AccountLayout from 'components/layouts/AccountLayout/AccountLayout'-import AppLayout from 'components/layouts/AppLayout/AppLayout'-import DefaultLayout from 'components/layouts/DefaultLayout'-import OrganizationLayout from 'components/layouts/OrganizationLayout'+import { AppLayout } from 'components/layouts/AppLayout/AppLayout'+import { DefaultLayout } from 'components/layouts/DefaultLayout'import { NewScopedAccessToken } from 'data/scoped-access-tokens/scoped-access-token-create-mutation'+import { ExternalLink, Search } from 'lucide-react'+import { useState } from 'react'import type { NextPageWithLayout } from 'types'import { Button } from 'ui'import { Input } from 'ui-patterns/DataInputs/Input'+import { AccessTokenNewBanner } from '@/components/interfaces/Account/AccessTokens/AccessTokenNewBanner/AccessTokenNewBanner'+const ScopedTokens: NextPageWithLayout = () => {const [searchString, setSearchString] = useState('')const [newToken, setNewToken] = useState<NewScopedAccessToken | undefined>()@@ -36,7 +34,7 @@ const ScopedTokens: NextPageWithLayout = () => {autoComplete="off"icon={<Search size={12} />}value={searchString}- onChange={(e: any) => setSearchString(e.target.value)}+ onChange={(e) => setSearchString(e.target.value)}name="search"id="search"placeholder="Filter by name"@@ -78,9 +76,7 @@ const ScopedTokens: NextPageWithLayout = () => {ScopedTokens.getLayout = (page) => (<AppLayout><DefaultLayout headerTitle="Account">- <OrganizationLayout>- <AccountLayout title="Access Tokens">{page}</AccountLayout>- </OrganizationLayout>+ <AccountLayout title="Access Tokens">{page}</AccountLayout></DefaultLayout></AppLayout>)diff --git a/apps/studio/pages/new/index.tsx b/apps/studio/pages/new/index.tsxindex b4668efdc7b..51ee8372f0f 100644--- a/apps/studio/pages/new/index.tsx+++ b/apps/studio/pages/new/index.tsx@@ -1,7 +1,7 @@import HCaptcha from '@hcaptcha/react-hcaptcha'import { NewOrgForm } from 'components/interfaces/Organization/NewOrg/NewOrgForm'-import AppLayout from 'components/layouts/AppLayout/AppLayout'-import DefaultLayout from 'components/layouts/DefaultLayout'+import { AppLayout } from 'components/layouts/AppLayout/AppLayout'+import { DefaultLayout } from 'components/layouts/DefaultLayout'import WizardLayout from 'components/layouts/WizardLayout'import { SetupIntentResponse, useSetupIntent } from 'data/stripe/setup-intent-mutation'import { useCallback, useEffect, useState } from 'react'diff --git a/apps/studio/pages/org/[slug]/apps.tsx b/apps/studio/pages/org/[slug]/apps.tsxindex 2d478cb13c3..896f2628468 100644--- a/apps/studio/pages/org/[slug]/apps.tsx+++ b/apps/studio/pages/org/[slug]/apps.tsx@@ -1,7 +1,7 @@import { OAuthApps } from 'components/interfaces/Organization/OAuthApps/OAuthApps'-import DefaultLayout from 'components/layouts/DefaultLayout'+import { DefaultLayout } from 'components/layouts/DefaultLayout'import OrganizationLayout from 'components/layouts/OrganizationLayout'-import OrganizationSettingsLayout from 'components/layouts/ProjectLayout/OrganizationSettingsLayout'+import { OrganizationSettingsLayout } from 'components/layouts/ProjectLayout/OrganizationSettingsLayout'import type { NextPageWithLayout } from 'types'import {PageHeader,@@ -31,8 +31,8 @@ const OrgOAuthApps: NextPageWithLayout = () => {OrgOAuthApps.getLayout = (page) => (<DefaultLayout>- <OrganizationLayout>- <OrganizationSettingsLayout pageTitle="OAuth Apps">{page}</OrganizationSettingsLayout>+ <OrganizationLayout title="OAuth Apps">+ <OrganizationSettingsLayout>{page}</OrganizationSettingsLayout></OrganizationLayout></DefaultLayout>)diff --git a/apps/studio/pages/org/[slug]/audit.tsx b/apps/studio/pages/org/[slug]/audit.tsxindex 1d4277ab1bc..1b875f51588 100644--- a/apps/studio/pages/org/[slug]/audit.tsx+++ b/apps/studio/pages/org/[slug]/audit.tsx@@ -1,10 +1,11 @@import { AuditLogs } from 'components/interfaces/Organization/AuditLogs/AuditLogs'-import DefaultLayout from 'components/layouts/DefaultLayout'+import { DefaultLayout } from 'components/layouts/DefaultLayout'import OrganizationLayout from 'components/layouts/OrganizationLayout'-import OrganizationSettingsLayout from 'components/layouts/ProjectLayout/OrganizationSettingsLayout'+import { OrganizationSettingsLayout } from 'components/layouts/ProjectLayout/OrganizationSettingsLayout'import { usePermissionsQuery } from 'data/permissions/permissions-query'import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'import type { NextPageWithLayout } from 'types'+import { LogoLoader } from 'ui'import {PageHeader,PageHeaderDescription,@@ -12,7 +13,6 @@ import {PageHeaderSummary,PageHeaderTitle,} from 'ui-patterns/PageHeader'-import { LogoLoader } from 'ui'const OrgAuditLogs: NextPageWithLayout = () => {const { isPending: isLoadingPermissions } = usePermissionsQuery()@@ -37,8 +37,8 @@ const OrgAuditLogs: NextPageWithLayout = () => {OrgAuditLogs.getLayout = (page) => (<DefaultLayout>- <OrganizationLayout>- <OrganizationSettingsLayout pageTitle="Audit Logs">{page}</OrganizationSettingsLayout>+ <OrganizationLayout title="Audit Logs">+ <OrganizationSettingsLayout>{page}</OrganizationSettingsLayout></OrganizationLayout></DefaultLayout>)diff --git a/apps/studio/pages/org/[slug]/billing.tsx b/apps/studio/pages/org/[slug]/billing.tsxindex 90bbae48793..8da8f7aa55e 100644--- a/apps/studio/pages/org/[slug]/billing.tsx+++ b/apps/studio/pages/org/[slug]/billing.tsx@@ -1,11 +1,10 @@-import { useEffect } from 'react'-import { useParams } from 'common'import { BillingSettings } from 'components/interfaces/Organization/BillingSettings/BillingSettings'-import DefaultLayout from 'components/layouts/DefaultLayout'+import { DefaultLayout } from 'components/layouts/DefaultLayout'import OrganizationLayout from 'components/layouts/OrganizationLayout'import { UnknownInterface } from 'components/ui/UnknownInterface'import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'+import { useEffect } from 'react'import {ORG_SETTINGS_PANEL_KEYS,useOrgSettingsPageStateSnapshot,@@ -36,7 +35,7 @@ const OrgBillingSettings: NextPageWithLayout = () => {OrgBillingSettings.getLayout = (page) => (<DefaultLayout>- <OrganizationLayout>{page}</OrganizationLayout>+ <OrganizationLayout title="Billing">{page}</OrganizationLayout></DefaultLayout>)export default OrgBillingSettingsdiff --git a/apps/studio/pages/org/[slug]/documents.tsx b/apps/studio/pages/org/[slug]/documents.tsxindex 60ec3dddd7f..7b077e826bc 100644--- a/apps/studio/pages/org/[slug]/documents.tsx+++ b/apps/studio/pages/org/[slug]/documents.tsx@@ -1,18 +1,19 @@import { useParams } from 'common'import { Documents } from 'components/interfaces/Organization/Documents/Documents'-import DefaultLayout from 'components/layouts/DefaultLayout'+import { DefaultLayout } from 'components/layouts/DefaultLayout'import OrganizationLayout from 'components/layouts/OrganizationLayout'-import OrganizationSettingsLayout from 'components/layouts/ProjectLayout/OrganizationSettingsLayout'-import {- ScaffoldContainer,- ScaffoldDescription,- ScaffoldDivider,- ScaffoldHeader,- ScaffoldTitle,-} from 'components/layouts/Scaffold'+import { OrganizationSettingsLayout } from 'components/layouts/ProjectLayout/OrganizationSettingsLayout'+import { ScaffoldDivider } from 'components/layouts/Scaffold'import { UnknownInterface } from 'components/ui/UnknownInterface'import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'import type { NextPageWithLayout } from 'types'+import {+ PageHeader,+ PageHeaderDescription,+ PageHeaderMeta,+ PageHeaderSummary,+ PageHeaderTitle,+} from 'ui-patterns'const OrgDocuments: NextPageWithLayout = () => {const { slug } = useParams()@@ -25,12 +26,16 @@ const OrgDocuments: NextPageWithLayout = () => {return (<>- <ScaffoldContainer>- <ScaffoldHeader>- <ScaffoldTitle>Legal documents</ScaffoldTitle>- <ScaffoldDescription>Compliance documentation and legal agreements</ScaffoldDescription>- </ScaffoldHeader>- </ScaffoldContainer>+ <PageHeader size="default" className="pb-12">+ <PageHeaderMeta>+ <PageHeaderSummary>+ <PageHeaderTitle>Legal Documents</PageHeaderTitle>+ <PageHeaderDescription>+ Compliance documentation and legal agreements+ </PageHeaderDescription>+ </PageHeaderSummary>+ </PageHeaderMeta>+ </PageHeader><ScaffoldDivider /><Documents /></>@@ -39,8 +44,8 @@ const OrgDocuments: NextPageWithLayout = () => {OrgDocuments.getLayout = (page) => (<DefaultLayout>- <OrganizationLayout>- <OrganizationSettingsLayout pageTitle="Legal Documents">{page}</OrganizationSettingsLayout>+ <OrganizationLayout title="Legal Documents">+ <OrganizationSettingsLayout>{page}</OrganizationSettingsLayout></OrganizationLayout></DefaultLayout>)diff --git a/apps/studio/pages/org/[slug]/general.tsx b/apps/studio/pages/org/[slug]/general.tsxindex 045d9ee48a8..4266d3ad0c7 100644--- a/apps/studio/pages/org/[slug]/general.tsx+++ b/apps/studio/pages/org/[slug]/general.tsx@@ -5,6 +5,7 @@ import OrganizationSettingsLayout from 'components/layouts/ProjectLayout/Organizimport { usePermissionsQuery } from 'data/permissions/permissions-query'import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'import type { NextPageWithLayout } from 'types'+import { LogoLoader } from 'ui'import { PageContainer } from 'ui-patterns/PageContainer'import {PageHeader,@@ -13,7 +14,6 @@ import {PageHeaderSummary,PageHeaderTitle,} from 'ui-patterns/PageHeader'-import { LogoLoader } from 'ui'const OrgGeneralSettings: NextPageWithLayout = () => {const { isPending: isLoadingPermissions } = usePermissionsQuery()@@ -44,8 +44,8 @@ const OrgGeneralSettings: NextPageWithLayout = () => {OrgGeneralSettings.getLayout = (page) => (<DefaultLayout>- <OrganizationLayout>- <OrganizationSettingsLayout pageTitle="General">{page}</OrganizationSettingsLayout>+ <OrganizationLayout title="General">+ <OrganizationSettingsLayout>{page}</OrganizationSettingsLayout></OrganizationLayout></DefaultLayout>)diff --git a/apps/studio/pages/org/[slug]/index.tsx b/apps/studio/pages/org/[slug]/index.tsxindex c0493aa9773..e0c5945526d 100644--- a/apps/studio/pages/org/[slug]/index.tsx+++ b/apps/studio/pages/org/[slug]/index.tsx@@ -50,7 +50,7 @@ const ProjectsPage: NextPageWithLayout = () => {ProjectsPage.getLayout = (page) => (<DefaultLayout>- <OrganizationLayout>+ <OrganizationLayout title="Projects"><PageLayout title="Projects">{page}</PageLayout></OrganizationLayout></DefaultLayout>diff --git a/apps/studio/pages/org/[slug]/integrations.tsx b/apps/studio/pages/org/[slug]/integrations.tsxindex 0c95ded0009..b244e3b4b31 100644--- a/apps/studio/pages/org/[slug]/integrations.tsx+++ b/apps/studio/pages/org/[slug]/integrations.tsx@@ -9,7 +9,7 @@ const OrgIntegrationSettings: NextPageWithLayout = () => {OrgIntegrationSettings.getLayout = (page) => (<DefaultLayout>- <OrganizationLayout>{page}</OrganizationLayout>+ <OrganizationLayout title="Integrations">{page}</OrganizationLayout></DefaultLayout>)diff --git a/apps/studio/pages/org/[slug]/security.tsx b/apps/studio/pages/org/[slug]/security.tsxindex a75bff211d5..62d001406ff 100644--- a/apps/studio/pages/org/[slug]/security.tsx+++ b/apps/studio/pages/org/[slug]/security.tsx@@ -41,8 +41,8 @@ const OrgSecuritySettings: NextPageWithLayout = () => {OrgSecuritySettings.getLayout = (page) => (<DefaultLayout>- <OrganizationLayout>- <OrganizationSettingsLayout pageTitle="Security">{page}</OrganizationSettingsLayout>+ <OrganizationLayout title="Security">+ <OrganizationSettingsLayout>{page}</OrganizationSettingsLayout></OrganizationLayout></DefaultLayout>)diff --git a/apps/studio/pages/org/[slug]/sso.tsx b/apps/studio/pages/org/[slug]/sso.tsxindex d5f0d56cae4..9ca6a5ef2c1 100644--- a/apps/studio/pages/org/[slug]/sso.tsx+++ b/apps/studio/pages/org/[slug]/sso.tsx@@ -41,8 +41,8 @@ const OrgSSO: NextPageWithLayout = () => {OrgSSO.getLayout = (page) => (<DefaultLayout>- <OrganizationLayout>- <OrganizationSettingsLayout pageTitle="SSO">{page}</OrganizationSettingsLayout>+ <OrganizationLayout title="SSO">+ <OrganizationSettingsLayout>{page}</OrganizationSettingsLayout></OrganizationLayout></DefaultLayout>)diff --git a/apps/studio/pages/org/[slug]/team.tsx b/apps/studio/pages/org/[slug]/team.tsxindex cc8751263aa..68869dd3f71 100644--- a/apps/studio/pages/org/[slug]/team.tsx+++ b/apps/studio/pages/org/[slug]/team.tsx@@ -19,7 +19,7 @@ const OrgTeamSettings: NextPageWithLayout = () => {OrgTeamSettings.getLayout = (page) => (<DefaultLayout>- <OrganizationLayout>{page}</OrganizationLayout>+ <OrganizationLayout title="Team">{page}</OrganizationLayout></DefaultLayout>)diff --git a/apps/studio/pages/org/[slug]/usage.tsx b/apps/studio/pages/org/[slug]/usage.tsxindex 3f803525bc5..2ac9bb16ee5 100644--- a/apps/studio/pages/org/[slug]/usage.tsx+++ b/apps/studio/pages/org/[slug]/usage.tsx@@ -9,7 +9,7 @@ const OrgUsage: NextPageWithLayout = () => {OrgUsage.getLayout = (page) => (<DefaultLayout>- <OrganizationLayout>{page}</OrganizationLayout>+ <OrganizationLayout title="Usage">{page}</OrganizationLayout></DefaultLayout>)diff --git a/apps/studio/pages/org/[slug]/webhooks/[endpointId].tsx b/apps/studio/pages/org/[slug]/webhooks/[endpointId].tsxindex 1b782142f27..3089898874f 100644--- a/apps/studio/pages/org/[slug]/webhooks/[endpointId].tsx+++ b/apps/studio/pages/org/[slug]/webhooks/[endpointId].tsx@@ -1,9 +1,8 @@-import { useRouter } from 'next/router'-import { PlatformWebhooksPage } from 'components/interfaces/Platform/Webhooks'import DefaultLayout from 'components/layouts/DefaultLayout'import OrganizationLayout from 'components/layouts/OrganizationLayout'import OrganizationSettingsLayout from 'components/layouts/ProjectLayout/OrganizationSettingsLayout'+import { useRouter } from 'next/router'import type { NextPageWithLayout } from 'types'const OrgWebhookEndpointSettings: NextPageWithLayout = () => {@@ -15,7 +14,7 @@ const OrgWebhookEndpointSettings: NextPageWithLayout = () => {OrgWebhookEndpointSettings.getLayout = (page) => (<DefaultLayout>- <OrganizationLayout>+ <OrganizationLayout title="Webhooks"><OrganizationSettingsLayout>{page}</OrganizationSettingsLayout></OrganizationLayout></DefaultLayout>diff --git a/apps/studio/pages/org/[slug]/webhooks/index.tsx b/apps/studio/pages/org/[slug]/webhooks/index.tsxindex 20fb47fcfd6..9296c540070 100644--- a/apps/studio/pages/org/[slug]/webhooks/index.tsx+++ b/apps/studio/pages/org/[slug]/webhooks/index.tsx@@ -10,7 +10,7 @@ const OrgWebhooksSettings: NextPageWithLayout = () => {OrgWebhooksSettings.getLayout = (page) => (<DefaultLayout>- <OrganizationLayout>+ <OrganizationLayout title="Webhooks"><OrganizationSettingsLayout>{page}</OrganizationSettingsLayout></OrganizationLayout></DefaultLayout>diff --git a/apps/studio/pages/org/_/[[...routeSlug]].tsx b/apps/studio/pages/org/_/[[...routeSlug]].tsxindex a8bf05ab446..40744bcbd35 100644--- a/apps/studio/pages/org/_/[[...routeSlug]].tsx+++ b/apps/studio/pages/org/_/[[...routeSlug]].tsx@@ -7,8 +7,11 @@ import { buildOrgUrl } from 'components/interfaces/Organization/Organization.utiimport { PageLayout } from 'components/layouts/PageLayout/PageLayout'import { ScaffoldContainer, ScaffoldSection } from 'components/layouts/Scaffold'import { useOrganizationsQuery } from 'data/organizations/organizations-query'+import { useCustomContent } from 'hooks/custom-content/useCustomContent'import { withAuth } from 'hooks/misc/withAuth'+import { buildStudioPageTitle } from 'lib/page-title'import { NextPage } from 'next'+import Head from 'next/head'import { useRouter } from 'next/router'import { cn } from 'ui'@@ -16,6 +19,7 @@ import { OrganizationCard } from '@/components/interfaces/Organization/Organizatconst GenericOrganizationPage: NextPage = () => {const router = useRouter()+ const { appTitle } = useCustomContent(['app:title'])const { routeSlug, ...queryParams } = router.queryconst queryString =Object.keys(queryParams).length > 0@@ -23,9 +27,18 @@ const GenericOrganizationPage: NextPage = () => {: ''const { data: organizations, isPending: isLoading } = useOrganizationsQuery()+ const pageTitle = buildStudioPageTitle({+ section: 'Select an organization',+ surface: 'Organizations',+ brand: appTitle || 'Supabase',+ })return (<>+ <Head>+ <title>{pageTitle}</title>+ <meta name="description" content="Supabase Studio" />+ </Head><Header /><PageLayout className="flex-grow min-h-0" title="Select an organization to continue"><ScaffoldContainer>diff --git a/apps/studio/pages/org/index.tsx b/apps/studio/pages/org/index.tsxindex 48ea3fd61b5..d75d8623d6e 100644--- a/apps/studio/pages/org/index.tsx+++ b/apps/studio/pages/org/index.tsx@@ -1,12 +1,11 @@-import { useRouter } from 'next/router'-import { useEffect } from 'react'-import { LOCAL_STORAGE_KEYS } from 'common'import { ShimmeringCard } from 'components/interfaces/Home/ProjectList/ShimmeringCard'-import DefaultLayout from 'components/layouts/DefaultLayout'+import { DefaultLayout } from 'components/layouts/DefaultLayout'import OrganizationLayout from 'components/layouts/OrganizationLayout'import { ScaffoldContainerLegacy } from 'components/layouts/Scaffold'import { useLocalStorageQuery } from 'hooks/misc/useLocalStorage'+import { useRouter } from 'next/router'+import { useEffect } from 'react'import type { NextPageWithLayout } from 'types'const OrgIndexPage: NextPageWithLayout = () => {@@ -38,7 +37,7 @@ const OrgIndexPage: NextPageWithLayout = () => {OrgIndexPage.getLayout = (page) => (<DefaultLayout>- <OrganizationLayout>{page}</OrganizationLayout>+ <OrganizationLayout title="Organizations">{page}</OrganizationLayout></DefaultLayout>)diff --git a/apps/studio/pages/organizations.tsx b/apps/studio/pages/organizations.tsxindex 379b333ab51..828adb33f75 100644--- a/apps/studio/pages/organizations.tsx+++ b/apps/studio/pages/organizations.tsx@@ -1,20 +1,22 @@-import { Plus, Search } from 'lucide-react'-import Link from 'next/link'-import { useRouter } from 'next/router'-import { useEffect, useState } from 'react'-import { useParams } from 'common'import { NoOrganizationsState } from 'components/interfaces/Home/ProjectList/EmptyStates'import { OrganizationCard } from 'components/interfaces/Organization/OrganizationCard'-import AppLayout from 'components/layouts/AppLayout/AppLayout'-import DefaultLayout from 'components/layouts/DefaultLayout'+import { AppLayout } from 'components/layouts/AppLayout/AppLayout'+import { DefaultLayout } from 'components/layouts/DefaultLayout'import { PageLayout } from 'components/layouts/PageLayout/PageLayout'import { ScaffoldContainer, ScaffoldSection } from 'components/layouts/Scaffold'-import AlertError from 'components/ui/AlertError'+import { AlertError } from 'components/ui/AlertError'import { NoSearchResults } from 'components/ui/NoSearchResults'import { useOrganizationsQuery } from 'data/organizations/organizations-query'+import { useCustomContent } from 'hooks/custom-content/useCustomContent'import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'import { withAuth } from 'hooks/misc/withAuth'+import { buildStudioPageTitle } from 'lib/page-title'+import { Plus, Search } from 'lucide-react'+import Head from 'next/head'+import Link from 'next/link'+import { useRouter } from 'next/router'+import { useEffect, useState } from 'react'import type { NextPageWithLayout } from 'types'import { Button, Skeleton } from 'ui'import { Admonition } from 'ui-patterns/admonition'@@ -22,9 +24,14 @@ import { Input } from 'ui-patterns/DataInputs/Input'const OrganizationsPage: NextPageWithLayout = () => {const router = useRouter()+ const { appTitle } = useCustomContent(['app:title'])const [search, setSearch] = useState('')const { error: orgNotFoundError, org: orgSlug } = useParams()const orgNotFound = orgNotFoundError === 'org_not_found'+ const pageTitle = buildStudioPageTitle({+ section: 'Organizations',+ brand: appTitle || 'Supabase',+ })const {data: organizations = [],@@ -51,63 +58,69 @@ const OrganizationsPage: NextPageWithLayout = () => {}, [isSuccess, organizations])return (- <ScaffoldContainer>- <ScaffoldSection isFullWidth className="flex flex-col gap-y-4">- {orgNotFound && (- <Admonition- type="destructive"- title="Organization not found"- description={- <>- The organization <code className="text-code-inline">{orgSlug}</code> does not exist- or you do not have permission to access to it. Contact the the owner if you believe- this is a mistake.- </>- }- />- )}-- {organizations.length > 0 && (- <div className="flex items-center justify-between gap-x-2 md:gap-x-3">- <Input- size="tiny"- placeholder="Search for an organization"- icon={<Search />}- className="w-full flex-1 md:w-64"- value={search}- onChange={(event) => setSearch(event.target.value)}+ <>+ <Head>+ <title>{pageTitle}</title>+ <meta name="description" content="Supabase Studio" />+ </Head>+ <ScaffoldContainer>+ <ScaffoldSection isFullWidth className="flex flex-col gap-y-4">+ {orgNotFound && (+ <Admonition+ type="destructive"+ title="Organization not found"+ description={+ <>+ The organization <code className="text-code-inline">{orgSlug}</code> does not+ exist or you do not have permission to access to it. Contact the the owner if you+ believe this is a mistake.+ </>+ }/>+ )}- {organizationCreationEnabled && (- <Button asChild icon={<Plus />} type="primary" className="w-min">- <Link href={`/new`}>New organization</Link>- </Button>- )}- </div>- )}+ {organizations.length > 0 && (+ <div className="flex items-center justify-between gap-x-2 md:gap-x-3">+ <Input+ size="tiny"+ placeholder="Search for an organization"+ icon={<Search />}+ className="w-full flex-1 md:w-64"+ value={search}+ onChange={(event) => setSearch(event.target.value)}+ />- {isSuccess && organizations.length === 0 && !isError && <NoOrganizationsState />}+ {organizationCreationEnabled && (+ <Button asChild icon={<Plus />} type="primary" className="w-min">+ <Link href={`/new`}>New organization</Link>+ </Button>+ )}+ </div>+ )}- {search.length > 0 && filteredOrganizations.length === 0 && (- <NoSearchResults searchString={search} />- )}+ {isSuccess && organizations.length === 0 && !isError && <NoOrganizationsState />}- <div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">- {isLoading && (- <>- <Skeleton className="h-[70px] rounded-md" />- <Skeleton className="h-[70px] rounded-md" />- <Skeleton className="h-[70px] rounded-md" />- </>+ {search.length > 0 && filteredOrganizations.length === 0 && (+ <NoSearchResults searchString={search} />)}- {isError && <AlertError error={error} subject="Failed to load organizations" />}- {isSuccess &&- filteredOrganizations.map((org) => (- <OrganizationCard key={org.id} organization={org} />- ))}- </div>- </ScaffoldSection>- </ScaffoldContainer>++ <div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">+ {isLoading && (+ <>+ <Skeleton className="h-[70px] rounded-md" />+ <Skeleton className="h-[70px] rounded-md" />+ <Skeleton className="h-[70px] rounded-md" />+ </>+ )}+ {isError && <AlertError error={error} subject="Failed to load organizations" />}+ {isSuccess &&+ filteredOrganizations.map((org) => (+ <OrganizationCard key={org.id} organization={org} />+ ))}+ </div>+ </ScaffoldSection>+ </ScaffoldContainer>+ </>)}diff --git a/apps/studio/pages/support/link.tsx b/apps/studio/pages/support/link.tsxindex 107b0f9d824..b82e4f94527 100644--- a/apps/studio/pages/support/link.tsx+++ b/apps/studio/pages/support/link.tsx@@ -1,12 +1,12 @@+import { LinkSupportTicketPage } from 'components/interfaces/Support/LinkSupportTicketPage'+import { AppLayout } from 'components/layouts/AppLayout/AppLayout'+import { DefaultLayout } from 'components/layouts/DefaultLayout'+import { withAuth } from 'hooks/misc/withAuth'+import { IS_PLATFORM } from 'lib/constants'import { useRouter } from 'next/router'import type { ReactElement } from 'react'import { useEffect } from 'react'-import { LinkSupportTicketPage } from 'components/interfaces/Support/LinkSupportTicketPage'-import AppLayout from 'components/layouts/AppLayout/AppLayout'-import DefaultLayout from 'components/layouts/DefaultLayout'-import { withAuth } from 'hooks/misc/withAuth'import type { NextPageWithLayout } from 'types'-import { IS_PLATFORM } from 'lib/constants'const LinkSupportTicketPageRoute: NextPageWithLayout = () => {const router = useRouter()diff --git a/apps/studio/pages/support/new.tsx b/apps/studio/pages/support/new.tsxindex 62952687ac5..5badd49f674 100644--- a/apps/studio/pages/support/new.tsx+++ b/apps/studio/pages/support/new.tsx@@ -1,6 +1,6 @@import { SupportFormPage } from 'components/interfaces/Support/SupportFormPage'-import AppLayout from 'components/layouts/AppLayout/AppLayout'-import DefaultLayout from 'components/layouts/DefaultLayout'+import { AppLayout } from 'components/layouts/AppLayout/AppLayout'+import { DefaultLayout } from 'components/layouts/DefaultLayout'import { withAuth } from 'hooks/misc/withAuth'import type { NextPageWithLayout } from 'types'