Files
supabase/apps/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx
T
Danny White 1131e3e2ce fix(ui): default Button variant to default instead of primary (#50160)
## What kind of change does this PR introduce?

Bug fix / design-system alignment for the legacy `Button` from `ui`.

## What is the current behavior?

Omitting `variant` on the legacy `Button` falls back to brand-green
`primary`. That makes accidental greens easy, and it is hard to spot the
real main action on busy pages.

## What is the new behavior?

- Legacy `Button` now defaults to neutral `default`
- Intentional primary CTAs (create, save, submit, marketing CTAs, and
matching `ButtonTooltip` usages) now set `variant="primary"` so their
appearance is unchanged
- Neutral actions that previously relied on the old fallback (cancel,
close, back, dashboard nav, and similar) become grey/white
- Design-system docs updated; regression tests cover the new default

`Button_Shadcn_` is unchanged. It already uses its own CVA default.

This is PR 1 of 2 in a stack. PR 2 drops now-redundant
`variant="default"` props.

## To test

Studio (http://localhost:8082):

- `/sign-in`: Sign in stays green
- Open a project → Database → Tables: New table stays green
- Auth → Users → Invite: Invite user stays green; Cancel / dismiss
controls stay neutral
- Project Settings → General: edit a field so Cancel and Save appear.
Cancel is neutral, Save is green

Design system (http://localhost:3003):

- Components → Button: default demo is neutral; primary demo is green;
featured preview is the default variant

Marketing (optional):

- www header: Start your project stays green; logged-in Dashboard is
neutral

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

- **Style**
- Buttons now default to a neutral style, while primary actions across
Studio, documentation, marketing pages, forms, dialogs, and error states
use prominent primary styling.
- Updated button examples and previews clarify the distinction between
default and primary variants.
  - Event registration now includes a directional arrow icon.

- **Tests**
- Added coverage confirming default button styling and explicit primary
styling behave as expected.
- Updated related test fixtures to use primary styling where
appropriate.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
2026-09-10 11:23:17 +10:00

274 lines
9.5 KiB
TypeScript

import { zodResolver } from '@hookform/resolvers/zod'
import { useMemo } from 'react'
import { useForm, useWatch } from 'react-hook-form'
import { toast } from 'sonner'
import {
Badge,
Button,
Dialog,
DialogContent,
DialogFooter,
DialogHeader,
DialogSection,
DialogSectionSeparator,
DialogTitle,
Form,
FormControl,
FormField,
Input,
Select,
SelectContent,
SelectItem,
SelectSeparator,
SelectTrigger,
SelectValue,
} from 'ui'
import { Admonition } from 'ui-patterns/Admonition'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
import * as z from 'zod'
import { extensionsWithRecommendedSchemas } from './Extensions.constants'
import { DocsButton } from '@/components/ui/DocsButton'
import { useDatabaseExtensionEnableMutation } from '@/data/database-extensions/database-extension-enable-mutation'
import { type DatabaseExtension } from '@/data/database-extensions/database-extensions-query'
import { useSchemasQuery } from '@/data/database/schemas-query'
import { useSchemasFilteredForHighAvailability } from '@/hooks/misc/useHighAvailability'
import { useIsOrioleDb, useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { useProtectedSchemas } from '@/hooks/useProtectedSchemas'
import { DOCS_URL } from '@/lib/constants'
const orioleExtCallOuts = ['vector', 'postgis']
const FormSchema = z.object({ name: z.string(), schema: z.string() }).superRefine((val, ctx) => {
if (val.schema === 'custom' && val.name.length === 0) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
path: ['name'],
message: 'Please provide a name for the schema',
})
}
})
interface EnableExtensionModalProps {
visible: boolean
extension: DatabaseExtension
onCancel: () => void
}
export const EnableExtensionModal = ({
visible,
extension,
onCancel,
}: EnableExtensionModalProps) => {
const isOrioleDb = useIsOrioleDb()
const { data: project } = useSelectedProjectQuery()
const { data: protectedSchemas } = useProtectedSchemas({ excludeSchemas: ['extensions'] })
const recommendedSchema = extensionsWithRecommendedSchemas[extension.name]
const { data: schemas = [], isPending: isLoading } = useSchemasQuery(
{
projectRef: project?.ref,
connectionString: project?.connectionString,
},
{ enabled: visible }
)
const visibleSchemas = useSchemasFilteredForHighAvailability(schemas)
const availableSchemas = useMemo(
() =>
visibleSchemas.filter(
(schema) =>
schema.name === recommendedSchema ||
!protectedSchemas.some((protectedSchema) => protectedSchema.name === schema.name)
),
[visibleSchemas, recommendedSchema, protectedSchemas]
)
// [Joshen] Hard-coding pg_cron here as this is enforced on our end (Not via pg_available_extension_versions)
const defaultSchema =
extension.name === 'pg_cron' ? 'pg_catalog' : extension.default_version_schema
const { mutate: enableExtension, isPending: isEnabling } = useDatabaseExtensionEnableMutation({
onSuccess: () => {
toast.success(`Extension "${extension.name}" is now enabled`)
onCancel()
},
onError: (error) => {
toast.error(`Failed to enable ${extension.name}: ${error.message}`)
},
})
const defaultValues = { name: extension.name, schema: recommendedSchema ?? 'extensions' }
const form = useForm<z.infer<typeof FormSchema>>({
mode: 'onBlur',
reValidateMode: 'onBlur',
resolver: zodResolver(FormSchema),
defaultValues,
})
const schema = useWatch({ control: form.control, name: 'schema' })
const onSubmit = async (values: z.infer<typeof FormSchema>) => {
if (project === undefined) return console.error('Project is required')
const schema =
defaultSchema !== undefined && defaultSchema !== null
? defaultSchema
: values.schema === 'custom'
? values.name
: values.schema
enableExtension({
projectRef: project.ref,
connectionString: project?.connectionString,
schema,
name: extension.name,
version: extension.default_version,
cascade: true,
createSchema: !schema.startsWith('pg_'),
})
}
return (
<Dialog
open={visible}
onOpenChange={(open: boolean) => {
if (!open) onCancel()
}}
>
<DialogContent size="small" aria-describedby={undefined}>
<DialogHeader>
<DialogTitle>Enable {extension.name}</DialogTitle>
</DialogHeader>
<DialogSectionSeparator />
{isOrioleDb && orioleExtCallOuts.includes(extension.name) && (
<Admonition
type="default"
title="Extension is limited by OrioleDB"
className="border-x-0 border-t-0 rounded-none"
>
<span className="block">
{extension.name} cannot be accelerated by indexes on tables that are using the
OrioleDB access method
</span>
<DocsButton abbrev={false} className="mt-2" href={`${DOCS_URL}`} />
</Admonition>
)}
<DialogSection>
<Form {...form}>
<form id="enable-extensions-form" onSubmit={form.handleSubmit(onSubmit)}>
{isLoading ? (
<div className="space-y-2">
<ShimmeringLoader />
<div className="w-3/4">
<ShimmeringLoader />
</div>
</div>
) : !!defaultSchema ? (
<div className="flex flex-col gap-y-2">
<FormItemLayout
isReactForm={false}
label="Select a schema to enable the extension for"
>
<Input disabled value={defaultSchema} />
</FormItemLayout>
<p className="text-sm text-foreground-light">
Extension must be installed in the "{defaultSchema}" schema.
</p>
</div>
) : (
<div className="flex flex-col gap-y-2">
<FormField
key="schema"
name="schema"
control={form.control}
render={({ field }) => (
<FormItemLayout
name="schema"
label="Select a schema to enable the extension for"
>
<FormControl>
<Select
value={field.value}
onValueChange={field.onChange}
disabled={!!defaultSchema}
>
<SelectTrigger>
<SelectValue placeholder="Select a schema" />
</SelectTrigger>
<SelectContent>
<SelectItem value="custom">
Create a new schema{' '}
<code className="text-code-inline">{extension.name}</code>
</SelectItem>
<SelectSeparator />
{availableSchemas.map((schema) => {
return (
<SelectItem key={schema.id} value={schema.name}>
{schema.name}
{schema.name === recommendedSchema ? (
<Badge className="ml-2" variant="success">
Recommended
</Badge>
) : !defaultSchema && schema.name === 'extensions' ? (
<Badge className="ml-2">Default</Badge>
) : null}
</SelectItem>
)
})}
</SelectContent>
</Select>
</FormControl>
</FormItemLayout>
)}
/>
{!!recommendedSchema && (
<p className="text-sm text-foreground-light">
Use the "{recommendedSchema}" schema for full compatibility with related
features.
</p>
)}
{schema === 'custom' && (
<FormField
key="name"
name="name"
control={form.control}
render={({ field }) => (
<FormItemLayout label="Schema name">
<FormControl>
<Input {...field} />
</FormControl>
</FormItemLayout>
)}
/>
)}
</div>
)}
</form>
</Form>
</DialogSection>
<DialogFooter>
<Button variant="default" disabled={isEnabling} onClick={() => onCancel()}>
Cancel
</Button>
<Button
variant="primary"
type="submit"
form="enable-extensions-form"
loading={isEnabling}
disabled={isLoading || isEnabling}
>
Enable extension
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
)
}