Skip to content

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

chore(studio): move organization settings nav to sidebar layout (#43228)

Danny White706207436fe2
diff --git a/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.tsx b/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.tsx
index f2887ca1f4c..ff36e39e6b9 100644
--- a/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.tsx
+++ b/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.tsx
@@ -163,7 +163,7 @@ export const AuditLogs = () => {
if (isLogsNotAvailableBasedOnPlan) {
return (
- <ScaffoldContainer>
+ <ScaffoldContainer className="px-6 xl:px-10">
<ScaffoldSection isFullWidth>
<UpgradeToPro
plan="Team"
@@ -179,7 +179,7 @@ export const AuditLogs = () => {
return (
<>
- <ScaffoldContainer>
+ <ScaffoldContainer className="px-6 xl:px-10">
<ScaffoldSection isFullWidth>
<div className="space-y-4 flex flex-col">
{showFilters && (
diff --git a/apps/studio/components/interfaces/Organization/GeneralSettings/GeneralSettings.tsx b/apps/studio/components/interfaces/Organization/GeneralSettings/GeneralSettings.tsx
index 54194192c44..dd76e2e0d4d 100644
--- a/apps/studio/components/interfaces/Organization/GeneralSettings/GeneralSettings.tsx
+++ b/apps/studio/components/interfaces/Organization/GeneralSettings/GeneralSettings.tsx
@@ -1,10 +1,12 @@
import { NoProjectsOnPaidOrgInfo } from 'components/interfaces/Billing/NoProjectsOnPaidOrgInfo'
-import {
- ScaffoldContainer,
- ScaffoldSection,
- ScaffoldSectionTitle,
-} from 'components/layouts/Scaffold'
import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'
+import {
+ PageSection,
+ PageSectionContent,
+ PageSectionMeta,
+ PageSectionSummary,
+ PageSectionTitle,
+} from 'ui-patterns/PageSection'
import { OrganizationDeletePanel } from './OrganizationDeletePanel'
import { DataPrivacyForm } from './DataPrivacyForm'
@@ -14,20 +16,43 @@ export const GeneralSettings = () => {
const organizationDeletionEnabled = useIsFeatureEnabled('organizations:delete')
return (
- <ScaffoldContainer>
+ <>
<NoProjectsOnPaidOrgInfo />
- <ScaffoldSection isFullWidth>
- <ScaffoldSectionTitle className="mb-4">Organization Details</ScaffoldSectionTitle>
- <OrganizationDetailsForm />
- </ScaffoldSection>
+ <PageSection>
+ <PageSectionMeta>
+ <PageSectionSummary>
+ <PageSectionTitle>Organization details</PageSectionTitle>
+ </PageSectionSummary>
+ </PageSectionMeta>
+ <PageSectionContent>
+ <OrganizationDetailsForm />
+ </PageSectionContent>
+ </PageSection>
- <ScaffoldSection isFullWidth>
- <ScaffoldSectionTitle className="mb-4">Data Privacy</ScaffoldSectionTitle>
- <DataPrivacyForm />
- </ScaffoldSection>
+ <PageSection>
+ <PageSectionMeta>
+ <PageSectionSummary>
+ <PageSectionTitle>Data privacy</PageSectionTitle>
+ </PageSectionSummary>
+ </PageSectionMeta>
+ <PageSectionContent>
+ <DataPrivacyForm />
+ </PageSectionContent>
+ </PageSection>
- {organizationDeletionEnabled && <OrganizationDeletePanel />}
- </ScaffoldContainer>
+ {organizationDeletionEnabled && (
+ <PageSection>
+ <PageSectionMeta>
+ <PageSectionSummary>
+ <PageSectionTitle>Danger zone</PageSectionTitle>
+ </PageSectionSummary>
+ </PageSectionMeta>
+ <PageSectionContent>
+ <OrganizationDeletePanel />
+ </PageSectionContent>
+ </PageSection>
+ )}
+ </>
)
}
diff --git a/apps/studio/components/interfaces/Organization/GeneralSettings/OrganizationDeletePanel.tsx b/apps/studio/components/interfaces/Organization/GeneralSettings/OrganizationDeletePanel.tsx
index d484b76993b..a9ddf0d076b 100644
--- a/apps/studio/components/interfaces/Organization/GeneralSettings/OrganizationDeletePanel.tsx
+++ b/apps/studio/components/interfaces/Organization/GeneralSettings/OrganizationDeletePanel.tsx
@@ -1,4 +1,3 @@
-import { ScaffoldSection, ScaffoldSectionTitle } from 'components/layouts/Scaffold'
import PartnerManagedResource from 'components/ui/PartnerManagedResource'
import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
import { MANAGED_BY } from 'lib/constants/infrastructure'
@@ -8,28 +7,23 @@ import { DeleteOrganizationButton } from './DeleteOrganizationButton'
export const OrganizationDeletePanel = () => {
const { data: selectedOrganization } = useSelectedOrganizationQuery()
- return (
- <ScaffoldSection isFullWidth>
- <ScaffoldSectionTitle className="mb-4">Danger Zone</ScaffoldSectionTitle>
- {selectedOrganization?.managed_by !== 'vercel-marketplace' ? (
- <Admonition
- type="destructive"
- title="Deleting this organization will also remove its projects"
- description="Make sure you have made a backup of your projects if you want to keep your data"
- >
- <DeleteOrganizationButton />
- </Admonition>
- ) : (
- <PartnerManagedResource
- managedBy={MANAGED_BY.VERCEL_MARKETPLACE}
- resource="Organizations"
- cta={{
- installationId: selectedOrganization?.partner_id,
- path: '/settings',
- message: 'Delete organization in Vercel Marketplace',
- }}
- />
- )}
- </ScaffoldSection>
+ return selectedOrganization?.managed_by !== 'vercel-marketplace' ? (
+ <Admonition
+ type="destructive"
+ title="Deleting this organization will also remove its projects"
+ description="Make sure you have made a backup of your projects if you want to keep your data"
+ >
+ <DeleteOrganizationButton />
+ </Admonition>
+ ) : (
+ <PartnerManagedResource
+ managedBy={MANAGED_BY.VERCEL_MARKETPLACE}
+ resource="Organizations"
+ cta={{
+ installationId: selectedOrganization?.partner_id,
+ path: '/settings',
+ message: 'Delete organization in Vercel Marketplace',
+ }}
+ />
)
}
diff --git a/apps/studio/components/interfaces/Organization/OAuthApps/OAuthApps.tsx b/apps/studio/components/interfaces/Organization/OAuthApps/OAuthApps.tsx
index 17312e0b462..c340127cf3c 100644
--- a/apps/studio/components/interfaces/Organization/OAuthApps/OAuthApps.tsx
+++ b/apps/studio/components/interfaces/Organization/OAuthApps/OAuthApps.tsx
@@ -68,7 +68,7 @@ export const OAuthApps = () => {
return (
<>
- <ScaffoldContainer>
+ <ScaffoldContainer className="px-6 xl:px-10">
<ScaffoldSection isFullWidth className="flex flex-col gap-y-8">
<div className="space-y-4">
<div className="flex flex-col md:flex-row items-start md:items-center justify-between gap-2">
diff --git a/apps/studio/components/interfaces/Organization/SSO/SSOConfig.tsx b/apps/studio/components/interfaces/Organization/SSO/SSOConfig.tsx
index 753af528fcc..f6a454b40ed 100644
--- a/apps/studio/components/interfaces/Organization/SSO/SSOConfig.tsx
+++ b/apps/studio/components/interfaces/Organization/SSO/SSOConfig.tsx
@@ -153,7 +153,7 @@ export const SSOConfig = () => {
}, [ssoConfig, form])
return (
- <ScaffoldContainer>
+ <ScaffoldContainer size="small" className="px-6 xl:px-10">
<ScaffoldSection isFullWidth>
{isLoadingEntitlement || (hasAccessToSso && isLoadingSSOConfig) ? (
<Card>
diff --git a/apps/studio/components/interfaces/Organization/SecuritySettings.tsx b/apps/studio/components/interfaces/Organization/SecuritySettings.tsx
index 50162239359..51af92d27de 100644
--- a/apps/studio/components/interfaces/Organization/SecuritySettings.tsx
+++ b/apps/studio/components/interfaces/Organization/SecuritySettings.tsx
@@ -105,7 +105,7 @@ export const SecuritySettings = () => {
}
return (
- <ScaffoldContainer>
+ <ScaffoldContainer size="small" className="px-6 xl:px-10">
<ScaffoldSection isFullWidth>
{!isPaidPlan ? (
<UpgradeToPro
diff --git a/apps/studio/components/interfaces/Sidebar.tsx b/apps/studio/components/interfaces/Sidebar.tsx
index d5686415597..ef2229ea81a 100644
--- a/apps/studio/components/interfaces/Sidebar.tsx
+++ b/apps/studio/components/interfaces/Sidebar.tsx
@@ -373,6 +373,14 @@ const OrganizationLinks = () => {
const showBilling = useIsFeatureEnabled('billing:all')
const activeRoute = router.pathname.split('/')[3]
+ const organizationSettingsRoutes = new Set([
+ 'general',
+ 'security',
+ 'sso',
+ 'apps',
+ 'audit',
+ 'documents',
+ ])
const navMenuItems = [
{
@@ -410,7 +418,7 @@ const OrganizationLinks = () => {
]
: []),
{
- label: 'Organization settings',
+ label: 'Organization Settings',
href: `/org/${organizationSlug}/general`,
key: 'settings',
icon: <Settings size={ICON_SIZE} strokeWidth={ICON_STROKE_WIDTH} />,
@@ -429,11 +437,7 @@ const OrganizationLinks = () => {
i === 0
? activeRoute === undefined
: item.key === 'settings'
- ? router.pathname.includes('/general') ||
- router.pathname.includes('/apps') ||
- router.pathname.includes('/audit') ||
- router.pathname.includes('/documents') ||
- router.pathname.includes('/security')
+ ? organizationSettingsRoutes.has(activeRoute ?? '')
: activeRoute === item.key
}
route={{
diff --git a/apps/studio/components/layouts/ProjectLayout/OrganizationSettingsLayout.test.ts b/apps/studio/components/layouts/ProjectLayout/OrganizationSettingsLayout.test.ts
new file mode 100644
index 00000000000..23a4bfdf06c
--- /dev/null
+++ b/apps/studio/components/layouts/ProjectLayout/OrganizationSettingsLayout.test.ts
@@ -0,0 +1,82 @@
+import { describe, expect, it } from 'vitest'
+
+import {
+ generateOrganizationSettingsSections,
+ getOrganizationSettingsDocumentTitle,
+ normalizeOrganizationSettingsPath,
+} from './OrganizationSettingsLayout'
+
+describe('OrganizationSettingsLayout helpers', () => {
+ it('returns expected organization settings sections and links', () => {
+ const sections = generateOrganizationSettingsSections({
+ slug: 'my-org',
+ currentPath: '/org/my-org/general',
+ showSecuritySettings: true,
+ showSsoSettings: true,
+ showLegalDocuments: true,
+ })
+
+ expect(sections.map((section) => section.heading)).toEqual([
+ 'Configuration',
+ 'Connections',
+ 'Compliance',
+ ])
+ expect(sections.flatMap((section) => section.links.map((item) => item.label))).toEqual([
+ 'General',
+ 'Security',
+ 'SSO',
+ 'OAuth Apps',
+ 'Audit Logs',
+ 'Legal Documents',
+ ])
+ expect(
+ sections.flatMap((section) => section.links).find((item) => item.label === 'General')
+ ?.isActive
+ ).toBe(true)
+ })
+
+ it('hides feature-flagged items when flags are disabled', () => {
+ const sections = generateOrganizationSettingsSections({
+ slug: 'my-org',
+ currentPath: '/org/my-org/general',
+ showSecuritySettings: false,
+ showSsoSettings: false,
+ showLegalDocuments: false,
+ })
+
+ expect(sections.map((section) => section.heading)).toEqual([
+ 'Configuration',
+ 'Connections',
+ 'Compliance',
+ ])
+ expect(sections.flatMap((section) => section.links.map((item) => item.label))).toEqual([
+ 'General',
+ 'OAuth Apps',
+ 'Audit Logs',
+ ])
+ })
+
+ it('normalizes hash paths for active state checks', () => {
+ const currentPath = normalizeOrganizationSettingsPath('/org/my-org/security#sso')
+ const sections = generateOrganizationSettingsSections({
+ slug: 'my-org',
+ currentPath,
+ showSecuritySettings: true,
+ showSsoSettings: true,
+ showLegalDocuments: true,
+ })
+
+ expect(
+ sections.flatMap((section) => section.links).find((item) => item.label === 'Security')
+ ?.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.tsx
index b9f974dc654..a7c7aa10930 100644
--- a/apps/studio/components/layouts/ProjectLayout/OrganizationSettingsLayout.tsx
+++ b/apps/studio/components/layouts/ProjectLayout/OrganizationSettingsLayout.tsx
@@ -1,61 +1,83 @@
-import Link from 'next/link'
+import Head from 'next/head'
import { PropsWithChildren } from 'react'
import { useParams } from 'common'
+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 { NavMenu, NavMenuItem } from 'ui'
-import { ScaffoldContainerLegacy, ScaffoldTitle } from '../Scaffold'
-function OrganizationSettingsLayout({ children }: PropsWithChildren) {
- const { slug } = useParams()
- // Get the path without any hash values
- const fullCurrentPath = useCurrentPath()
- const [currentPath] = fullCurrentPath.split('#')
+interface OrganizationSettingsSectionsProps {
+ slug?: string
+ currentPath: string
+ showSecuritySettings?: boolean
+ showSsoSettings?: boolean
+ showLegalDocuments?: boolean
+}
- const {
- organizationShowSsoSettings: showSsoSettings,
- organizationShowSecuritySettings: showSecuritySettings,
- organizationShowLegalDocuments: showLegalDocuments,
- } = useIsFeatureEnabled([
- 'organization:show_sso_settings',
- 'organization:show_security_settings',
- 'organization:show_legal_documents',
- ])
+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}`
- const navMenuItems = [
+export const generateOrganizationSettingsSections = ({
+ slug,
+ currentPath,
+ showSecuritySettings = true,
+ showSsoSettings = true,
+ showLegalDocuments = true,
+}: OrganizationSettingsSectionsProps): SidebarSection[] => {
+ const configurationLinks = [
{
+ key: 'general',
label: 'General',
href: `/org/${slug}/general`,
},
...(showSecuritySettings
? [
{
+ key: 'security',
label: 'Security',
href: `/org/${slug}/security`,
},
]
: []),
- {
- label: 'OAuth Apps',
- href: `/org/${slug}/apps`,
- },
...(showSsoSettings
? [
{
+ key: 'sso',
label: 'SSO',
href: `/org/${slug}/sso`,
},
]
: []),
+ ]
+
+ const connectionsLinks = [
+ {
+ key: 'apps',
+ label: 'OAuth Apps',
+ href: `/org/${slug}/apps`,
+ },
+ ]
+ const complianceLinks = [
{
+ key: 'audit',
label: 'Audit Logs',
href: `/org/${slug}/audit`,
},
...(showLegalDocuments
? [
{
+ key: 'documents',
label: 'Legal Documents',
href: `/org/${slug}/documents`,
},
@@ -63,19 +85,80 @@ function OrganizationSettingsLayout({ children }: PropsWithChildren) {
: []),
]
+ return [
+ {
+ key: 'configuration',
+ heading: 'Configuration',
+ links: configurationLinks.map((item) => ({
+ ...item,
+ isActive: currentPath === item.href,
+ })),
+ },
+ {
+ key: 'connections',
+ heading: 'Connections',
+ links: connectionsLinks.map((item) => ({
+ ...item,
+ isActive: currentPath === item.href,
+ })),
+ },
+ {
+ key: 'compliance',
+ heading: 'Compliance',
+ links: complianceLinks.map((item) => ({
+ ...item,
+ isActive: currentPath === item.href,
+ })),
+ },
+ ]
+}
+
+function OrganizationSettingsLayout({
+ children,
+ pageTitle,
+}: PropsWithChildren<OrganizationSettingsLayoutProps>) {
+ const { slug } = useParams()
+ const fullCurrentPath = useCurrentPath()
+ const currentPath = normalizeOrganizationSettingsPath(fullCurrentPath)
+ const { appTitle } = useCustomContent(['app:title'])
+ const titleSuffix = appTitle || 'Supabase'
+
+ const {
+ organizationShowSsoSettings: showSsoSettings,
+ organizationShowSecuritySettings: showSecuritySettings,
+ organizationShowLegalDocuments: showLegalDocuments,
+ } = useIsFeatureEnabled([
+ 'organization:show_sso_settings',
+ 'organization:show_security_settings',
+ 'organization:show_legal_documents',
+ ])
+
+ const sections = generateOrganizationSettingsSections({
+ slug,
+ currentPath,
+ showSecuritySettings,
+ showSsoSettings,
+ showLegalDocuments,
+ })
+
return (
<>
- <ScaffoldContainerLegacy className="mb-0">
- <ScaffoldTitle>Organization Settings</ScaffoldTitle>
- <NavMenu className="overflow-x-auto" aria-label="Organization menu navigation">
- {(navMenuItems.filter(Boolean) as { label: string; href: string }[]).map((item) => (
- <NavMenuItem key={item.label} active={currentPath === item.href}>
- <Link href={item.href}>{item.label}</Link>
- </NavMenuItem>
- ))}
- </NavMenu>
- </ScaffoldContainerLegacy>
- <div className="h-full w-full overflow-y-auto">{children}</div>
+ <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>
</>
)
}
diff --git a/apps/studio/components/layouts/ProjectSettingsLayout/SettingsMenu.utils.tsx b/apps/studio/components/layouts/ProjectSettingsLayout/SettingsMenu.utils.tsx
index 17320fc9d33..f92c0bea154 100644
--- a/apps/studio/components/layouts/ProjectSettingsLayout/SettingsMenu.utils.tsx
+++ b/apps/studio/components/layouts/ProjectSettingsLayout/SettingsMenu.utils.tsx
@@ -22,7 +22,7 @@ export const generateSettingsMenu = (
if (!IS_PLATFORM) {
return [
{
- title: 'Project Settings',
+ title: 'Configuration',
items: [
{
name: `Log Drains`,
@@ -42,7 +42,7 @@ export const generateSettingsMenu = (
return [
{
- title: 'Project Settings',
+ title: 'Configuration',
items: [
{
name: 'General',
@@ -106,7 +106,7 @@ export const generateSettingsMenu = (
],
},
{
- title: 'Configuration',
+ title: 'Integrations',
items: [
{
name: 'Data API',
diff --git a/apps/studio/pages/org/[slug]/apps.tsx b/apps/studio/pages/org/[slug]/apps.tsx
index bbbfad68bf6..2d478cb13c3 100644
--- a/apps/studio/pages/org/[slug]/apps.tsx
+++ b/apps/studio/pages/org/[slug]/apps.tsx
@@ -3,15 +3,36 @@ import DefaultLayout from 'components/layouts/DefaultLayout'
import OrganizationLayout from 'components/layouts/OrganizationLayout'
import OrganizationSettingsLayout from 'components/layouts/ProjectLayout/OrganizationSettingsLayout'
import type { NextPageWithLayout } from 'types'
+import {
+ PageHeader,
+ PageHeaderDescription,
+ PageHeaderMeta,
+ PageHeaderSummary,
+ PageHeaderTitle,
+} from 'ui-patterns/PageHeader'
const OrgOAuthApps: NextPageWithLayout = () => {
- return <OAuthApps />
+ return (
+ <>
+ <PageHeader size="default">
+ <PageHeaderMeta>
+ <PageHeaderSummary>
+ <PageHeaderTitle>OAuth Apps</PageHeaderTitle>
+ <PageHeaderDescription>
+ Published and authorized OAuth applications
+ </PageHeaderDescription>
+ </PageHeaderSummary>
+ </PageHeaderMeta>
+ </PageHeader>
+ <OAuthApps />
+ </>
+ )
}
OrgOAuthApps.getLayout = (page) => (
<DefaultLayout>
<OrganizationLayout>
- <OrganizationSettingsLayout>{page}</OrganizationSettingsLayout>
+ <OrganizationSettingsLayout pageTitle="OAuth Apps">{page}</OrganizationSettingsLayout>
</OrganizationLayout>
</DefaultLayout>
)
diff --git a/apps/studio/pages/org/[slug]/audit.tsx b/apps/studio/pages/org/[slug]/audit.tsx
index 7a8393212bb..1d4277ab1bc 100644
--- a/apps/studio/pages/org/[slug]/audit.tsx
+++ b/apps/studio/pages/org/[slug]/audit.tsx
@@ -5,6 +5,13 @@ import OrganizationSettingsLayout from 'components/layouts/ProjectLayout/Organiz
import { usePermissionsQuery } from 'data/permissions/permissions-query'
import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
import type { NextPageWithLayout } from 'types'
+import {
+ PageHeader,
+ PageHeaderDescription,
+ PageHeaderMeta,
+ PageHeaderSummary,
+ PageHeaderTitle,
+} from 'ui-patterns/PageHeader'
import { LogoLoader } from 'ui'
const OrgAuditLogs: NextPageWithLayout = () => {
@@ -13,6 +20,16 @@ const OrgAuditLogs: NextPageWithLayout = () => {
return (
<>
+ <PageHeader size="default">
+ <PageHeaderMeta>
+ <PageHeaderSummary>
+ <PageHeaderTitle>Audit Logs</PageHeaderTitle>
+ <PageHeaderDescription>
+ Organization-level activity history and security event records
+ </PageHeaderDescription>
+ </PageHeaderSummary>
+ </PageHeaderMeta>
+ </PageHeader>
{selectedOrganization === undefined && isLoadingPermissions ? <LogoLoader /> : <AuditLogs />}
</>
)
@@ -21,7 +38,7 @@ const OrgAuditLogs: NextPageWithLayout = () => {
OrgAuditLogs.getLayout = (page) => (
<DefaultLayout>
<OrganizationLayout>
- <OrganizationSettingsLayout>{page}</OrganizationSettingsLayout>
+ <OrganizationSettingsLayout pageTitle="Audit Logs">{page}</OrganizationSettingsLayout>
</OrganizationLayout>
</DefaultLayout>
)
diff --git a/apps/studio/pages/org/[slug]/documents.tsx b/apps/studio/pages/org/[slug]/documents.tsx
index c9e97ece7b6..60ec3dddd7f 100644
--- a/apps/studio/pages/org/[slug]/documents.tsx
+++ b/apps/studio/pages/org/[slug]/documents.tsx
@@ -3,6 +3,13 @@ import { Documents } from 'components/interfaces/Organization/Documents/Document
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 { UnknownInterface } from 'components/ui/UnknownInterface'
import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'
import type { NextPageWithLayout } from 'types'
@@ -16,13 +23,24 @@ const OrgDocuments: NextPageWithLayout = () => {
return <UnknownInterface urlBack={`/org/${slug}`} />
}
- return <Documents />
+ return (
+ <>
+ <ScaffoldContainer>
+ <ScaffoldHeader>
+ <ScaffoldTitle>Legal documents</ScaffoldTitle>
+ <ScaffoldDescription>Compliance documentation and legal agreements</ScaffoldDescription>
+ </ScaffoldHeader>
+ </ScaffoldContainer>
+ <ScaffoldDivider />
+ <Documents />
+ </>
+ )
}
OrgDocuments.getLayout = (page) => (
<DefaultLayout>
<OrganizationLayout>
- <OrganizationSettingsLayout>{page}</OrganizationSettingsLayout>
+ <OrganizationSettingsLayout pageTitle="Legal Documents">{page}</OrganizationSettingsLayout>
</OrganizationLayout>
</DefaultLayout>
)
diff --git a/apps/studio/pages/org/[slug]/general.tsx b/apps/studio/pages/org/[slug]/general.tsx
index 5638f123a25..045d9ee48a8 100644
--- a/apps/studio/pages/org/[slug]/general.tsx
+++ b/apps/studio/pages/org/[slug]/general.tsx
@@ -5,6 +5,14 @@ import OrganizationSettingsLayout from 'components/layouts/ProjectLayout/Organiz
import { usePermissionsQuery } from 'data/permissions/permissions-query'
import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'
import type { NextPageWithLayout } from 'types'
+import { PageContainer } from 'ui-patterns/PageContainer'
+import {
+ PageHeader,
+ PageHeaderDescription,
+ PageHeaderMeta,
+ PageHeaderSummary,
+ PageHeaderTitle,
+} from 'ui-patterns/PageHeader'
import { LogoLoader } from 'ui'
const OrgGeneralSettings: NextPageWithLayout = () => {
@@ -13,11 +21,23 @@ const OrgGeneralSettings: NextPageWithLayout = () => {
return (
<>
- {selectedOrganization === undefined && isLoadingPermissions ? (
- <LogoLoader />
- ) : (
- <GeneralSettings />
- )}
+ <PageHeader size="default">
+ <PageHeaderMeta>
+ <PageHeaderSummary>
+ <PageHeaderTitle>Organization Settings</PageHeaderTitle>
+ <PageHeaderDescription>
+ General configuration, privacy, and lifecycle controls
+ </PageHeaderDescription>
+ </PageHeaderSummary>
+ </PageHeaderMeta>
+ </PageHeader>
+ <PageContainer size="default">
+ {selectedOrganization === undefined && isLoadingPermissions ? (
+ <LogoLoader />
+ ) : (
+ <GeneralSettings />
+ )}
+ </PageContainer>
</>
)
}
@@ -25,7 +45,7 @@ const OrgGeneralSettings: NextPageWithLayout = () => {
OrgGeneralSettings.getLayout = (page) => (
<DefaultLayout>
<OrganizationLayout>
- <OrganizationSettingsLayout>{page}</OrganizationSettingsLayout>
+ <OrganizationSettingsLayout pageTitle="General">{page}</OrganizationSettingsLayout>
</OrganizationLayout>
</DefaultLayout>
)
diff --git a/apps/studio/pages/org/[slug]/security.tsx b/apps/studio/pages/org/[slug]/security.tsx
index a4b867621b0..a75bff211d5 100644
--- a/apps/studio/pages/org/[slug]/security.tsx
+++ b/apps/studio/pages/org/[slug]/security.tsx
@@ -6,6 +6,13 @@ import OrganizationSettingsLayout from 'components/layouts/ProjectLayout/Organiz
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/PageHeader'
const OrgSecuritySettings: NextPageWithLayout = () => {
const { slug } = useParams()
@@ -15,13 +22,27 @@ const OrgSecuritySettings: NextPageWithLayout = () => {
return <UnknownInterface urlBack={`/org/${slug}`} />
}
- return <SecuritySettings />
+ return (
+ <>
+ <PageHeader size="small">
+ <PageHeaderMeta>
+ <PageHeaderSummary>
+ <PageHeaderTitle>Security</PageHeaderTitle>
+ <PageHeaderDescription>
+ Organization-wide security controls and MFA enforcement
+ </PageHeaderDescription>
+ </PageHeaderSummary>
+ </PageHeaderMeta>
+ </PageHeader>
+ <SecuritySettings />
+ </>
+ )
}
OrgSecuritySettings.getLayout = (page) => (
<DefaultLayout>
<OrganizationLayout>
- <OrganizationSettingsLayout>{page}</OrganizationSettingsLayout>
+ <OrganizationSettingsLayout pageTitle="Security">{page}</OrganizationSettingsLayout>
</OrganizationLayout>
</DefaultLayout>
)
diff --git a/apps/studio/pages/org/[slug]/sso.tsx b/apps/studio/pages/org/[slug]/sso.tsx
index 899b1cf7c76..d5f0d56cae4 100644
--- a/apps/studio/pages/org/[slug]/sso.tsx
+++ b/apps/studio/pages/org/[slug]/sso.tsx
@@ -6,6 +6,13 @@ import OrganizationSettingsLayout from 'components/layouts/ProjectLayout/Organiz
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/PageHeader'
const OrgSSO: NextPageWithLayout = () => {
const { slug } = useParams()
@@ -15,13 +22,27 @@ const OrgSSO: NextPageWithLayout = () => {
return <UnknownInterface urlBack={`/org/${slug}/general`} />
}
- return <SSOConfig />
+ return (
+ <>
+ <PageHeader size="small">
+ <PageHeaderMeta>
+ <PageHeaderSummary>
+ <PageHeaderTitle>Single Sign-On</PageHeaderTitle>
+ <PageHeaderDescription>
+ SAML SSO configuration and domain access controls
+ </PageHeaderDescription>
+ </PageHeaderSummary>
+ </PageHeaderMeta>
+ </PageHeader>
+ <SSOConfig />
+ </>
+ )
}
OrgSSO.getLayout = (page) => (
<DefaultLayout>
<OrganizationLayout>
- <OrganizationSettingsLayout>{page}</OrganizationSettingsLayout>
+ <OrganizationSettingsLayout pageTitle="SSO">{page}</OrganizationSettingsLayout>
</OrganizationLayout>
</DefaultLayout>
)