mirror of
https://github.com/supabase/supabase.git
synced 2026-10-08 02:45:07 +03:00
## 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 -->
174 lines
5.2 KiB
TypeScript
174 lines
5.2 KiB
TypeScript
import { zodResolver } from '@hookform/resolvers/zod'
|
|
import { useRouter } from 'next/router'
|
|
import { useMemo } 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 { useContentUpsertMutation } from '@/data/content/content-upsert-mutation'
|
|
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
|
|
import { uuidv4 } from '@/lib/helpers'
|
|
import { useProfile } from '@/lib/profile'
|
|
|
|
export interface CreateReportModal {
|
|
visible: boolean
|
|
onCancel: () => void
|
|
afterSubmit: () => void
|
|
}
|
|
|
|
const formSchema = z.object({
|
|
name: z.string().min(1, 'Required'),
|
|
description: z.string().optional(),
|
|
})
|
|
|
|
type CustomReport = z.infer<typeof formSchema>
|
|
|
|
export const CreateReportModal = ({ visible, onCancel, afterSubmit }: CreateReportModal) => {
|
|
const router = useRouter()
|
|
const { profile } = useProfile()
|
|
const { data: project } = useSelectedProjectQuery()
|
|
const ref = project?.ref ?? 'default'
|
|
|
|
// Preserve date range query parameters when navigating to new report
|
|
const preservedQueryParams = useMemo(() => {
|
|
const { its, ite, isHelper, helperText } = router.query
|
|
const params = new URLSearchParams()
|
|
|
|
if (its && typeof its === 'string') params.set('its', its)
|
|
if (ite && typeof ite === 'string') params.set('ite', ite)
|
|
if (isHelper && typeof isHelper === 'string') params.set('isHelper', isHelper)
|
|
if (helperText && typeof helperText === 'string') params.set('helperText', helperText)
|
|
|
|
const queryString = params.toString()
|
|
return queryString ? `?${queryString}` : ''
|
|
}, [router.query])
|
|
|
|
const { mutate: upsertContent, isPending: isCreating } = useContentUpsertMutation({
|
|
onSuccess: (_, vars) => {
|
|
toast.success('Successfully created new report')
|
|
const newReportId = vars.payload.id
|
|
router.push(`/project/${ref}/observability/${newReportId}${preservedQueryParams}`)
|
|
afterSubmit()
|
|
},
|
|
onError: (error) => {
|
|
toast.error(`Failed to create report: ${error.message}`)
|
|
},
|
|
})
|
|
|
|
const createCustomReport: SubmitHandler<CustomReport> = async ({ name, description }) => {
|
|
if (!ref) return console.error('Project ref is required')
|
|
if (!profile) return console.error('Profile is required')
|
|
|
|
upsertContent({
|
|
projectRef: ref,
|
|
payload: {
|
|
id: uuidv4(),
|
|
type: 'report',
|
|
name,
|
|
description: description || '',
|
|
visibility: 'project',
|
|
owner_id: profile?.id,
|
|
content: {
|
|
schema_version: 1,
|
|
period_start: {
|
|
time_period: '7d',
|
|
date: '',
|
|
},
|
|
period_end: {
|
|
time_period: 'today',
|
|
date: '',
|
|
},
|
|
interval: '1d',
|
|
layout: [],
|
|
},
|
|
},
|
|
})
|
|
}
|
|
|
|
const handleCancel = () => {
|
|
onCancel()
|
|
form.reset()
|
|
}
|
|
|
|
const form = useForm<CustomReport>({
|
|
resolver: zodResolver(formSchema),
|
|
defaultValues: { name: '', description: '' },
|
|
})
|
|
const { isDirty } = form.formState
|
|
|
|
return (
|
|
<Dialog open={visible} onOpenChange={handleCancel}>
|
|
<DialogContent size="small">
|
|
<DialogHeader>
|
|
<DialogTitle>Create a custom report</DialogTitle>
|
|
</DialogHeader>
|
|
<DialogSectionSeparator />
|
|
<Form {...form}>
|
|
<form onSubmit={form.handleSubmit(createCustomReport)} 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={isCreating}>
|
|
Cancel
|
|
</Button>
|
|
<Button
|
|
variant="primary"
|
|
type="submit"
|
|
loading={isCreating}
|
|
disabled={isCreating || !isDirty}
|
|
>
|
|
Create report
|
|
</Button>
|
|
</DialogFooter>
|
|
</form>
|
|
</Form>
|
|
</DialogContent>
|
|
</Dialog>
|
|
)
|
|
}
|