mirror of
https://github.com/supabase/supabase.git
synced 2026-10-07 10:25:06 +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 -->
171 lines
5.0 KiB
TypeScript
171 lines
5.0 KiB
TypeScript
import { zodResolver } from '@hookform/resolvers/zod'
|
|
import { useParams } from 'common'
|
|
import { Trash } from 'lucide-react'
|
|
import { useEffect } from 'react'
|
|
import { SubmitHandler, useForm } from 'react-hook-form'
|
|
import { toast } from 'sonner'
|
|
import {
|
|
Button,
|
|
Dialog,
|
|
DialogContent,
|
|
DialogFooter,
|
|
DialogHeader,
|
|
DialogSection,
|
|
DialogTitle,
|
|
Form,
|
|
FormControl,
|
|
FormField,
|
|
Input,
|
|
Separator,
|
|
} from 'ui'
|
|
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
|
|
import * as z from 'zod'
|
|
|
|
import { useCreateThirdPartyAuthIntegrationMutation } from '@/data/third-party-auth/integration-create-mutation'
|
|
|
|
interface CreateFirebaseAuthIntegrationProps {
|
|
visible: boolean
|
|
onClose: () => void
|
|
// TODO: Remove this if this Dialog is only used for creating.
|
|
onDelete: () => void
|
|
}
|
|
|
|
const FORM_ID = 'create-firebase-auth-integration-form'
|
|
|
|
const FormSchema = z.object({
|
|
enabled: z.boolean(),
|
|
firebaseProjectId: z
|
|
.string()
|
|
.trim()
|
|
.min(1)
|
|
.regex(/^[A-Za-z0-9-]+$/, 'The project ID contains invalid characters.'), // Only allow alphanumeric characters and hyphens.
|
|
})
|
|
|
|
export const CreateFirebaseAuthIntegrationDialog = ({
|
|
visible,
|
|
onClose,
|
|
onDelete,
|
|
}: CreateFirebaseAuthIntegrationProps) => {
|
|
// TODO: Remove this if this Dialog is only used for creating.
|
|
const isCreating = true
|
|
|
|
const { ref: projectRef } = useParams()
|
|
const { mutate: createAuthIntegration, isPending } = useCreateThirdPartyAuthIntegrationMutation({
|
|
onSuccess: () => {
|
|
toast.success(`Successfully created a new Firebase Auth integration.`)
|
|
onClose()
|
|
},
|
|
})
|
|
|
|
const form = useForm<z.infer<typeof FormSchema>>({
|
|
resolver: zodResolver(FormSchema),
|
|
defaultValues: {
|
|
enabled: true,
|
|
firebaseProjectId: '',
|
|
},
|
|
})
|
|
|
|
useEffect(() => {
|
|
if (visible) {
|
|
form.reset({
|
|
enabled: true,
|
|
firebaseProjectId: '',
|
|
})
|
|
// the form input doesn't exist when the form is reset
|
|
setTimeout(() => {
|
|
form.setFocus('firebaseProjectId')
|
|
}, 25)
|
|
}
|
|
}, [visible])
|
|
|
|
const onSubmit: SubmitHandler<z.infer<typeof FormSchema>> = async (values) => {
|
|
createAuthIntegration({
|
|
projectRef: projectRef!,
|
|
oidcIssuerUrl: `https://securetoken.google.com/${values.firebaseProjectId}`,
|
|
})
|
|
}
|
|
|
|
return (
|
|
<Dialog open={visible} onOpenChange={() => onClose()}>
|
|
<DialogContent>
|
|
<DialogHeader>
|
|
<DialogTitle className="truncate">
|
|
{isCreating
|
|
? `Add new Firebase Auth connection`
|
|
: `Update existing Firebase Auth connection`}
|
|
</DialogTitle>
|
|
</DialogHeader>
|
|
|
|
<Separator />
|
|
<DialogSection>
|
|
<Form {...form}>
|
|
<form id={FORM_ID} onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
|
|
{/* Enabled flag can't be changed for now because there's no update API call for integrations */}
|
|
{/* <FormField
|
|
key="enabled"
|
|
control={form.control}
|
|
name="enabled"
|
|
render={({ field }) => (
|
|
<FormItemLayout
|
|
className="px-8"
|
|
label={`Enable Firebase Auth Connection`}
|
|
layout="flex"
|
|
>
|
|
<FormControl>
|
|
<Switch
|
|
checked={field.value}
|
|
onCheckedChange={field.onChange}
|
|
disabled={field.disabled}
|
|
/>
|
|
</FormControl>
|
|
</FormItemLayout>
|
|
)}
|
|
/>
|
|
<Separator /> */}
|
|
|
|
<p className="text-sm text-foreground-light">
|
|
This will enable a JWT token from a specific Firebase project to access data from
|
|
this Supabase project.
|
|
</p>
|
|
<FormField
|
|
key="firebaseProjectId"
|
|
control={form.control}
|
|
name="firebaseProjectId"
|
|
render={({ field }) => (
|
|
<FormItemLayout label="Firebase Auth Project ID">
|
|
<FormControl>
|
|
<Input {...field} />
|
|
</FormControl>
|
|
</FormItemLayout>
|
|
)}
|
|
/>
|
|
</form>
|
|
</Form>
|
|
</DialogSection>
|
|
<DialogFooter>
|
|
{!isCreating && (
|
|
<div className="flex-1">
|
|
<Button variant="danger" onClick={() => onDelete()} icon={<Trash />}>
|
|
Remove connection
|
|
</Button>
|
|
</div>
|
|
)}
|
|
|
|
<Button disabled={isPending} variant="default" onClick={() => onClose()}>
|
|
Cancel
|
|
</Button>
|
|
<Button
|
|
variant="primary"
|
|
form={FORM_ID}
|
|
type="submit"
|
|
disabled={isPending}
|
|
loading={isPending}
|
|
>
|
|
{isCreating ? 'Create connection' : 'Update connection'}
|
|
</Button>
|
|
</DialogFooter>
|
|
</DialogContent>
|
|
</Dialog>
|
|
)
|
|
}
|