mirror of
https://github.com/supabase/supabase.git
synced 2026-09-07 02:20:52 +08:00
GraphiQL (`@graphiql/react`) runs a second Monaco instance that injects
two global, page-wide styles which corrupt Studio's other editors once a
GraphiQL chunk has loaded (it persists across client-side navigation, so
a full reload hides it). After visiting GraphiQL and returning to e.g.
the SQL editor, the editor collapses to a ~5px sliver and its syntax
colors swap to GraphiQL's theme.
**Changed:**
- `monaco.css` — a higher-specificity counter-rule
(`.monaco-editor.monaco-editor { position: relative !important }`) beats
GraphiQL's runtime-injected `.monaco-editor { position: absolute
!important }`, which otherwise pulls Studio's `@monaco-editor/react`
wrapper out of flow and collapses it to ~5px.
- GraphiQL now uses the primary `supabase` Monaco theme instead of a
separate `supabase-graphql-*` theme, so the global `.mtk*` token palette
stays identical and syntax colors no longer bleed into other editors.
**Added:**
- E2E test (`monaco-graphiql-coexistence.spec.ts`) reproducing both bugs
via client-side SQL editor → GraphiQL → SQL editor navigation (a full
reload unloads the chunk and hides the bug).
- Component test (`CodeEditor.test.tsx`) guarding the height-class
precedence regression from #47339/#47350 — a caller height (e.g. the
email template editor's `h-96`) must win over the default `h-full`.
Covered as a component test since the email source editor isn't
reachable on self-hosted.
## To test
- Open the SQL editor → **Integrations → GraphiQL** → back to the SQL
editor (in-app navigation, not a reload). It should stay full height and
keep its own syntax colors.
- Confirm autocomplete still works in the SQL editor.
- `pnpm --prefix e2e/studio run e2e --
features/monaco-graphiql-coexistence.spec.ts`
- `pnpm --prefix apps/studio test -- CodeEditor.test`
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
* **Bug Fixes**
* Improved Monaco editor styling so GraphiQL no longer affects the SQL
editor’s theme or layout when navigating between them.
* Fixed editor sizing so a custom height now takes precedence over the
default full-height setting.
* Polished GraphiQL panel styling for more consistent spacing and
appearance across themes.
* **New Features**
* GraphiQL now uses the shared editor theme for better visual
consistency with Studio.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
---------
Co-authored-by: Alaister Young <10985857+alaister@users.noreply.github.com>
Co-authored-by: Joshen Lim <joshenlimek@gmail.com>
186 lines
6.5 KiB
TypeScript
186 lines
6.5 KiB
TypeScript
import 'graphiql/setup-workers/webpack'
|
|
import './graphiql-styles.css'
|
|
|
|
import { useMonaco, type GraphiQLPlugin } from '@graphiql/react'
|
|
import { createGraphiQLFetcher, Fetcher } from '@graphiql/toolkit'
|
|
import { PermissionAction } from '@supabase/shared-types/out/constants'
|
|
import { useParams } from 'common'
|
|
import { GraphiQL, HISTORY_PLUGIN } from 'graphiql'
|
|
import { User as IconUser } from 'lucide-react'
|
|
import { useTheme } from 'next-themes'
|
|
import { useCallback, useEffect, useMemo, useState } from 'react'
|
|
import { toast } from 'sonner'
|
|
import { LogoLoader } from 'ui'
|
|
|
|
import { DEFAULT_INTROSPECTION_SCHEMA } from './constants'
|
|
import styles from './graphiql.module.css'
|
|
import { IntrospectionDisabledNotice } from './IntrospectionDisabledNotice'
|
|
import { IntrospectionEnabledNotice } from './IntrospectionEnabledNotice'
|
|
import { usePgGraphqlIntrospectionStatus } from './usePgGraphqlIntrospectionStatus'
|
|
import { getTheme } from '@/components/interfaces/App/MonacoThemeProvider'
|
|
import { RoleImpersonationSelector } from '@/components/interfaces/RoleImpersonationSelector'
|
|
import { BASE_MONACO_EDITOR_OPTIONS } from '@/components/ui/CodeEditor/CodeEditor.utils'
|
|
import { useSessionAccessTokenQuery } from '@/data/auth/session-access-token-query'
|
|
import { useProjectPostgrestConfigQuery } from '@/data/config/project-postgrest-config-query'
|
|
import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
|
|
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
|
|
import { API_URL, IS_PLATFORM } from '@/lib/constants'
|
|
import { getRoleImpersonationJWT } from '@/lib/role-impersonation'
|
|
import { useGetImpersonatedRoleState } from '@/state/role-impersonation-state'
|
|
|
|
const ROLE_IMPERSONATION_PLUGIN: GraphiQLPlugin = {
|
|
title: 'Role Impersonation',
|
|
icon: () => <IconUser />,
|
|
content: () => <RoleImpersonationSelector orientation="vertical" />,
|
|
}
|
|
|
|
/**
|
|
* GraphiQL (@graphiql/react) bundles its own Monaco instance, separate from the AMD-loaded one
|
|
* the rest of Studio uses — they only share the global `.monaco-*` CSS class names, not JS state.
|
|
* So theme/options applied here via @graphiql/react's `useMonaco` touch GraphiQL's editors only
|
|
* and never leak onto Studio's editors
|
|
*/
|
|
const GraphiQLEditorSettings = ({ theme }: { theme: 'dark' | 'light' }) => {
|
|
const { monaco } = useMonaco()
|
|
|
|
useEffect(() => {
|
|
if (!monaco) return
|
|
monaco.editor.defineTheme('supabase', getTheme(theme))
|
|
monaco.editor.setTheme('supabase')
|
|
}, [monaco, theme])
|
|
|
|
useEffect(() => {
|
|
if (!monaco) return
|
|
const options = {
|
|
...BASE_MONACO_EDITOR_OPTIONS,
|
|
padding: { top: 16, bottom: 16 },
|
|
glyphMargin: true,
|
|
}
|
|
const applyToEditor = (editor: ReturnType<typeof monaco.editor.getEditors>[number]) =>
|
|
editor.updateOptions(options)
|
|
|
|
monaco.editor.getEditors().forEach(applyToEditor)
|
|
const disposable = monaco.editor.onDidCreateEditor(applyToEditor)
|
|
|
|
return () => disposable.dispose()
|
|
}, [monaco])
|
|
|
|
return null
|
|
}
|
|
|
|
export const GraphiQLTab = () => {
|
|
const { ref: projectRef } = useParams()
|
|
|
|
const { resolvedTheme } = useTheme()
|
|
const currentTheme = resolvedTheme?.includes('dark') ? 'dark' : 'light'
|
|
|
|
const { data: accessToken } = useSessionAccessTokenQuery({ enabled: IS_PLATFORM })
|
|
const { data: project } = useSelectedProjectQuery()
|
|
|
|
const { data: config } = useProjectPostgrestConfigQuery({ projectRef })
|
|
const jwtSecret = config?.jwt_secret
|
|
|
|
const getImpersonatedRoleState = useGetImpersonatedRoleState()
|
|
|
|
const { can: canReadJWTSecret } = useAsyncCheckPermissions(
|
|
PermissionAction.READ,
|
|
'field.jwt_secret'
|
|
)
|
|
|
|
const { notice, schemaComment } = usePgGraphqlIntrospectionStatus({
|
|
projectRef,
|
|
connectionString: project?.connectionString,
|
|
schema: DEFAULT_INTROSPECTION_SCHEMA,
|
|
})
|
|
|
|
// Bumped to force GraphiQL to re-mount and re-run introspection after the
|
|
// introspection setting changes in either direction.
|
|
const [graphiqlKey, setGraphiqlKey] = useState(0)
|
|
|
|
const plugins = useMemo<GraphiQLPlugin[]>(
|
|
() => (canReadJWTSecret ? [HISTORY_PLUGIN, ROLE_IMPERSONATION_PLUGIN] : [HISTORY_PLUGIN]),
|
|
[canReadJWTSecret]
|
|
)
|
|
|
|
const fetcher = useMemo(() => {
|
|
const fetcherFn = createGraphiQLFetcher({
|
|
// [Joshen] Opting to hard code /platform for local to match the routes, so that it's clear what's happening
|
|
url: `${API_URL}${IS_PLATFORM ? '' : '/platform'}/projects/${projectRef}/api/graphql`,
|
|
fetch,
|
|
})
|
|
const customFetcher: Fetcher = async (graphqlParams, opts) => {
|
|
let userAuthorization: string | undefined
|
|
|
|
const role = getImpersonatedRoleState().role
|
|
if (
|
|
projectRef !== undefined &&
|
|
jwtSecret !== undefined &&
|
|
role !== undefined &&
|
|
role.type === 'postgrest'
|
|
) {
|
|
try {
|
|
const token = await getRoleImpersonationJWT(projectRef, jwtSecret, role)
|
|
userAuthorization = 'Bearer ' + token
|
|
} catch (err: any) {
|
|
toast.error(`Failed to get JWT for role: ${err.message}`)
|
|
}
|
|
}
|
|
|
|
return fetcherFn(graphqlParams, {
|
|
...opts,
|
|
headers: {
|
|
...opts?.headers,
|
|
...(accessToken && {
|
|
Authorization: `Bearer ${accessToken}`,
|
|
}),
|
|
'x-graphql-authorization':
|
|
opts?.headers?.['Authorization'] ??
|
|
opts?.headers?.['authorization'] ??
|
|
userAuthorization ??
|
|
accessToken,
|
|
},
|
|
})
|
|
}
|
|
|
|
return customFetcher
|
|
}, [projectRef, getImpersonatedRoleState, jwtSecret, accessToken])
|
|
|
|
const handleIntrospectionChanged = useCallback(() => {
|
|
setGraphiqlKey((k) => k + 1)
|
|
}, [])
|
|
|
|
if (IS_PLATFORM && !accessToken) {
|
|
return <LogoLoader />
|
|
}
|
|
|
|
return (
|
|
<div className="flex flex-col h-full">
|
|
<GraphiQLEditorSettings theme={currentTheme} />
|
|
{notice === 'opt-in' && (
|
|
<IntrospectionDisabledNotice
|
|
schema={DEFAULT_INTROSPECTION_SCHEMA}
|
|
currentSchemaComment={schemaComment}
|
|
onEnabled={handleIntrospectionChanged}
|
|
/>
|
|
)}
|
|
{notice === 'opt-out' && (
|
|
<IntrospectionEnabledNotice
|
|
schema={DEFAULT_INTROSPECTION_SCHEMA}
|
|
currentSchemaComment={schemaComment}
|
|
onDisabled={handleIntrospectionChanged}
|
|
/>
|
|
)}
|
|
<div className="flex-1 min-h-0">
|
|
<GraphiQL
|
|
key={graphiqlKey}
|
|
fetcher={fetcher}
|
|
forcedTheme={currentTheme}
|
|
editorTheme={{ dark: 'supabase', light: 'supabase' }}
|
|
className={styles.root}
|
|
plugins={plugins}
|
|
/>
|
|
</div>
|
|
</div>
|
|
)
|
|
}
|