Files
supabase/apps/studio/components/interfaces/Reports/UpdateModal.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

151 lines
4.2 KiB
TypeScript

import { zodResolver } from '@hookform/resolvers/zod'
import { useParams } from 'common'
import { useEffect } from 'react'
import { SubmitHandler, useForm } from 'react-hook-form'
import { toast } from 'sonner'
import {
Button,
Dialog,
DialogContent,
DialogFooter,
DialogHeader,
DialogSection,
DialogSectionSeparator,
DialogTitle,
Form,
FormControl,
FormField,
Input,
Textarea,
} from 'ui'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
import * as z from 'zod'
import { ContentOfType } from '@/data/content/content-query'
import { useContentUpsertMutation } from '@/data/content/content-upsert-mutation'
const formSchema = z.object({
name: z.string().min(1, 'Required'),
description: z.string().optional(),
})
type CustomReport = z.infer<typeof formSchema>
export interface UpdateCustomReportProps {
selectedReport?: ContentOfType<'report'>
initialValues: CustomReport
onCancel: () => void
}
export const UpdateCustomReportModal = ({
selectedReport,
initialValues,
onCancel,
}: UpdateCustomReportProps) => {
const { ref } = useParams()
const { mutate: updateReport, isPending: isUpdating } = useContentUpsertMutation({
onSuccess: () => {
toast.success('Successfully updated report')
onCancel()
},
onError: (error) => {
toast.error(`Failed to update report: ${error.message}`)
},
})
const onConfirmUpdateReport: SubmitHandler<CustomReport> = (newVals) => {
if (!ref) return console.error('Project ref is required')
if (!selectedReport) return
if (!selectedReport.id) return
if (!selectedReport.project_id) return
updateReport({
projectRef: ref,
payload: {
...selectedReport,
owner_id: selectedReport.owner_id!,
project_id: selectedReport.project_id,
id: selectedReport.id,
name: newVals.name,
description: newVals.description || '',
},
})
}
const handleCancel = () => {
onCancel()
form.reset()
}
const form = useForm<CustomReport>({
resolver: zodResolver(formSchema),
defaultValues: initialValues,
})
const { formState, reset } = form
const { isDirty } = formState
useEffect(() => {
if (isDirty) return
reset(initialValues)
}, [initialValues, isDirty, reset])
return (
<Dialog open={selectedReport !== undefined} onOpenChange={handleCancel}>
<DialogContent size="small">
<DialogHeader>
<DialogTitle>Update custom report</DialogTitle>
</DialogHeader>
<DialogSectionSeparator />
<Form {...form}>
<form onSubmit={form.handleSubmit(onConfirmUpdateReport)} noValidate>
<DialogSection>
<FormField
control={form.control}
name="name"
render={({ field }) => (
<FormItemLayout layout="vertical" label="Name">
<FormControl>
<Input {...field} />
</FormControl>
</FormItemLayout>
)}
/>
</DialogSection>
<DialogSection>
<FormField
control={form.control}
name="description"
render={({ field }) => (
<FormItemLayout layout="vertical" label="Description">
<FormControl>
<Textarea
{...field}
rows={4}
placeholder="Describe your custom report"
className="resize-none"
/>
</FormControl>
</FormItemLayout>
)}
/>
</DialogSection>
<DialogFooter>
<Button type="reset" variant="default" onClick={handleCancel} disabled={isUpdating}>
Cancel
</Button>
<Button
variant="primary"
type="submit"
loading={isUpdating}
disabled={isUpdating || !isDirty}
>
Save custom report
</Button>
</DialogFooter>
</form>
</Form>
</DialogContent>
</Dialog>
)
}