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

219 lines
7.7 KiB
TypeScript

// End of third-party imports
import { useParams } from 'common'
import { AnimatePresence, motion } from 'framer-motion'
import { Check, ChevronsUpDown, ExternalLink } from 'lucide-react'
import Link from 'next/link'
import type { UseFormReturn } from 'react-hook-form'
import { toast } from 'sonner'
import { Button, cn, CommandGroup, CommandItem, FormControl, FormField } from 'ui'
import { Admonition } from 'ui-patterns/Admonition'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
import type { ExtendedSupportCategories } from './Support.constants'
import type { SupportFormValues } from './SupportForm.schema'
import { NO_ORG_MARKER, NO_PROJECT_MARKER } from './SupportForm.utils'
import CopyButton from '@/components/ui/CopyButton'
import { OrganizationProjectSelector } from '@/components/ui/OrganizationProjectSelector'
import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'
interface ProjectAndPlanProps {
form: UseFormReturn<SupportFormValues>
orgSlug: string | null
projectRef: string | null
// Unused — kept optional so SupportFormV2 (which still passes it) doesn't need updating.
category?: ExtendedSupportCategories
subscriptionPlanId: string | undefined
}
export function ProjectAndPlanInfo({
form,
orgSlug,
projectRef,
subscriptionPlanId: _subscriptionPlanId,
}: ProjectAndPlanProps) {
const hasProjectSelected = projectRef && projectRef !== NO_PROJECT_MARKER
return (
<div className="flex flex-col gap-y-2">
<ProjectSelector form={form} orgSlug={orgSlug} projectRef={projectRef} />
<ProjectRefHighlighted projectRef={projectRef} />
{!hasProjectSelected && (
<Admonition type="default" description="No project has been selected." />
)}
</div>
)
}
interface ProjectSelectorProps {
form: UseFormReturn<SupportFormValues>
orgSlug: string | null
projectRef: string | null
}
function ProjectSelector({ form, orgSlug, projectRef }: ProjectSelectorProps) {
const { ref: routeProjectRef } = useParams()
return (
<FormField
name="projectRef"
control={form.control}
render={({ field }) => (
<FormItemLayout layout="vertical" label="Which project is affected?">
<FormControl>
<OrganizationProjectSelector
key={orgSlug}
sameWidthAsTrigger
fetchOnMount
checkPosition="left"
slug={!orgSlug || orgSlug === NO_ORG_MARKER ? undefined : orgSlug}
selectedRef={field.value}
onInitialLoad={(projects) => {
const hasSelectedProject = !!projectRef && projectRef !== NO_PROJECT_MARKER
const hasRouteProjectInList =
!!routeProjectRef && projects.some((project) => project.ref === routeProjectRef)
if (!hasRouteProjectInList && !hasSelectedProject) {
field.onChange(projects[0]?.ref ?? NO_PROJECT_MARKER)
}
}}
onSelect={(project) => field.onChange(project.ref)}
renderTrigger={({ isLoading, project, listboxId, open }) => {
return (
<Button
block
variant="default"
role="combobox"
aria-label="Select a project"
aria-expanded={open}
aria-controls={listboxId}
size="small"
className="justify-between"
iconRight={<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />}
>
{!!orgSlug && isLoading ? (
<ShimmeringLoader className="w-44 py-2" />
) : !field.value || field.value === NO_PROJECT_MARKER ? (
'No specific project'
) : (
(project?.name ?? 'Unknown project')
)}
</Button>
)
}}
renderActions={(setOpen) => (
<CommandGroup>
<CommandItem
className="w-full gap-x-2"
onSelect={() => {
field.onChange(NO_PROJECT_MARKER)
setOpen(false)
}}
>
{field.value === NO_PROJECT_MARKER && <Check size={16} />}
<p className={cn(field.value !== NO_PROJECT_MARKER && 'ml-6')}>
No specific project
</p>
</CommandItem>
</CommandGroup>
)}
/>
</FormControl>
</FormItemLayout>
)}
/>
)
}
interface ProjectRefHighlightedProps {
projectRef: string | null
}
function ProjectRefHighlighted({ projectRef }: ProjectRefHighlightedProps) {
const isVisible = !!projectRef && projectRef !== NO_PROJECT_MARKER
return (
<AnimatePresence>
{isVisible && (
<motion.div
initial={{ opacity: 0, height: 0 }}
animate={{ opacity: 1, height: 'auto' }}
exit={{ opacity: 0, height: 0 }}
transition={{ duration: 0.3 }}
className="flex items-center gap-x-1"
>
<p className="text-sm transition text-foreground-lighter">
Project ID:{' '}
<code className="text-code-inline text-foreground-light!">{projectRef}</code>
</p>
<CopyButton
iconOnly
variant="text"
text={projectRef}
onClick={() => toast.success('Copied project ID to clipboard')}
/>
</motion.div>
)}
</AnimatePresence>
)
}
interface PlanExpectationInfoContentProps {
orgSlug: string
planId?: string
}
export const PlanExpectationInfoContent = ({
orgSlug,
planId,
}: PlanExpectationInfoContentProps) => {
const { billingAll } = useIsFeatureEnabled(['billing:all'])
const shouldShowUpgradeActions = billingAll && planId !== 'enterprise'
return (
<div className="flex flex-col gap-y-3 text-sm text-foreground-light">
{planId === 'free' && (
<p>
Support on the Free plan is provided through the community and by the team on a
best-effort basis. For a guaranteed response time, we recommend upgrading to the Pro plan.
Enhanced support SLAs are available on the Enterprise plan.
</p>
)}
{planId === 'pro' && (
<p>
Pro includes email support with typical 1-business-day responses; upgrade to Team for
prioritized ticketing and engineering escalation, or Enterprise for enhanced SLAs.
</p>
)}
{planId === 'team' && (
<p>
The Team plan includes email support with prioritized ticketing and escalation to product
engineering. Low, normal, and high-severity tickets are typically handled within 1
business day. Urgent issues are handled within 1 day, 365 days a year. Enhanced support
SLAs are available on the Enterprise plan.
</p>
)}
{shouldShowUpgradeActions && (
<div className="flex flex-wrap gap-2 pt-1">
<Button variant="primary" asChild size="tiny">
<Link
href={`/org/${orgSlug}/billing?panel=subscriptionPlan&source=planSupportExpectationInfoBox`}
>
Upgrade plan
</Link>
</Button>
<Button asChild variant="default" size="tiny" icon={<ExternalLink />}>
<Link href="https://supabase.com/contact/enterprise" target="_blank" rel="noreferrer">
Enquire about Enterprise
</Link>
</Button>
</div>
)}
</div>
)
}