Files
supabase/apps/studio/components/interfaces/Storage/StorageSettings/CreateCredentialModal.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

187 lines
5.9 KiB
TypeScript

import { zodResolver } from '@hookform/resolvers/zod'
import { PermissionAction } from '@supabase/shared-types/out/constants'
import { useParams } from 'common'
import { Plus } from 'lucide-react'
import { useState } from 'react'
import { useForm } from 'react-hook-form'
import {
Button,
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogSection,
DialogSectionSeparator,
DialogTitle,
DialogTrigger,
Form,
FormField,
Tooltip,
TooltipContent,
TooltipTrigger,
} from 'ui'
import { Input } from 'ui-patterns/DataInputs/Input'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
import { z } from 'zod'
import { useProjectStorageConfigQuery } from '@/data/config/project-storage-config-query'
import { useS3AccessKeyCreateMutation } from '@/data/storage/s3-access-key-create-mutation'
import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
import { useIsProjectActive } from '@/hooks/misc/useSelectedProject'
interface CreateCredentialModalProps {
visible: boolean
onOpenChange: (value: boolean) => void
}
export const CreateCredentialModal = ({ visible, onOpenChange }: CreateCredentialModalProps) => {
const { ref: projectRef } = useParams()
const isProjectActive = useIsProjectActive()
const [showSuccess, setShowSuccess] = useState(false)
const { can: canCreateCredentials } = useAsyncCheckPermissions(
PermissionAction.STORAGE_ADMIN_WRITE,
'*'
)
const { data: config } = useProjectStorageConfigQuery({ projectRef })
const isS3ConnectionEnabled = config?.features.s3Protocol.enabled
const disableCreation = !isProjectActive || !canCreateCredentials || !isS3ConnectionEnabled
const FormSchema = z.object({
description: z.string().min(3, {
message: 'Description must be at least 3 characters long',
}),
})
const form = useForm<z.infer<typeof FormSchema>>({
resolver: zodResolver(FormSchema),
defaultValues: {
description: '',
},
})
const {
data: createS3KeyData,
mutate: createS3AccessKey,
isPending: isCreating,
} = useS3AccessKeyCreateMutation({
onSuccess: () => {
setShowSuccess(true)
form.reset()
},
})
async function onSubmit(data: z.infer<typeof FormSchema>) {
createS3AccessKey({ projectRef, ...data })
}
return (
<Dialog
open={visible}
onOpenChange={(open) => {
onOpenChange(open)
if (!open) setShowSuccess(false)
}}
>
<Tooltip>
<TooltipTrigger asChild>
<DialogTrigger asChild>
<Button
variant="default"
icon={<Plus size={14} />}
disabled={disableCreation}
className="pointer-events-auto"
>
New access key
</Button>
</DialogTrigger>
</TooltipTrigger>
{disableCreation && (
<TooltipContent side="bottom">
{!isProjectActive
? 'Restore your project to create new access keys'
: !isS3ConnectionEnabled
? 'Connection via S3 protocol is currently disabled'
: !canCreateCredentials
? 'You need additional permissions to create new access keys'
: ''}
</TooltipContent>
)}
</Tooltip>
<DialogContent
onInteractOutside={(e) => {
if (showSuccess) e.preventDefault()
}}
>
{showSuccess ? (
<>
<DialogHeader>
<DialogTitle>Save your new S3 access keys</DialogTitle>
<DialogDescription>
You won't be able to see them again. If you lose these access keys, you'll need to
create a new ones.
</DialogDescription>
</DialogHeader>
<DialogSectionSeparator />
<DialogSection className="flex flex-col gap-4">
<FormItemLayout label="Access key ID" isReactForm={false}>
<Input className="input-mono" readOnly copy value={createS3KeyData?.access_key} />
</FormItemLayout>
<FormItemLayout label={'Secret access key'} isReactForm={false}>
<Input className="input-mono" readOnly copy value={createS3KeyData?.secret_key} />
</FormItemLayout>
</DialogSection>
<DialogFooter>
<Button
onClick={() => {
onOpenChange(false)
setShowSuccess(false)
}}
>
Done
</Button>
</DialogFooter>
</>
) : (
<>
<DialogHeader>
<DialogTitle>Create new S3 access keys</DialogTitle>
<DialogDescription>
S3 access keys provide full access to all S3 operations across all buckets and
bypass any existing RLS policies.
</DialogDescription>
</DialogHeader>
<DialogSectionSeparator />
<Form {...form}>
<form onSubmit={form.handleSubmit(onSubmit)}>
<DialogSection>
<FormField
name="description"
render={({ field }) => (
<FormItemLayout label="Description">
<Input
autoComplete="off"
placeholder="My test key"
type="text"
{...field}
/>
</FormItemLayout>
)}
/>
</DialogSection>
<DialogFooter>
<Button variant="primary" type="submit" loading={isCreating}>
Create access key
</Button>
</DialogFooter>
</form>
</Form>
</>
)}
</DialogContent>
</Dialog>
)
}