Files
supabase/apps/studio/components/interfaces/Connect/OrganizationSelector.tsx
Danny WhiteandJoshen Lim e65da2c3e7 feat(studio): move redeem credits to connect interstitial (#45909)
## What kind of change does this PR introduce?

Feature. Part of DEPR-556.

## What is the current behavior?

The `/redeem` credit redemption page uses the legacy redeem credits
layout and scaffolded two-column UI. It is visually separate from the
newer connect interstitial surfaces.

## What is the new behavior?

`/redeem` now uses the shared connect interstitial layout with a
Supabase logo, signed-in account row, organisation selector, and
full-width redeem action.

The existing `CreditCodeRedemption` modal still owns the actual code
entry, hCaptcha, permission checks, mutation, and success/error
handling. Creating a new organisation links to `/new` with a return URL,
and the returned organisation is preselected when present.

Temporary mock states are available on non-production and Vercel preview
environments:

- `/redeem?mock=loading`
- `/redeem?mock=ready`
- `/redeem?mock=redeeming`
- `/redeem?mock=redeemed`
- `/redeem?mock=already-redeemed`
- `/redeem?mock=invalid`
- `/redeem?mock=wrong-account`
- `/redeem?mock=error`

| Before | After |
| --- | --- |
| <img width="1024" height="759" alt="Redeem Credits
Supabase-66AF2C81-89A0-4F95-A591-3550AAD7112A"
src="https://github.com/user-attachments/assets/1e0dd7af-3168-4566-a7d9-0b889fe69d4e"
/> | <img width="1024" height="759" alt="Redeem Credits
Supabase-7F9C59DD-73EC-4717-B2B7-3E6BB325273C"
src="https://github.com/user-attachments/assets/60e44213-d2ab-4b5c-b03e-38a3425dbd27"
/> |
| <img width="1024" height="759" alt="Redeem Credits
Supabase-A77F2F93-98C3-42E9-B028-049E1AAC0CA3"
src="https://github.com/user-attachments/assets/25087b51-94cb-40c7-9dde-1fc957b7dd8e"
/> | <img width="1024" height="759" alt="Redeem Credits
Supabase-4C4B7818-16A5-430E-B54F-E7FF34229CA0"
src="https://github.com/user-attachments/assets/4da11122-b547-4e1e-a953-8d2e4c478431"
/> |
| <img width="1024" height="759" alt="Redeem Credits
Supabase-A77F2F93-98C3-42E9-B028-049E1AAC0CA3"
src="https://github.com/user-attachments/assets/25087b51-94cb-40c7-9dde-1fc957b7dd8e"
/> | <img width="1024" height="759" alt="Redeem Credits
Supabase-4C4B7818-16A5-430E-B54F-E7FF34229CA0"
src="https://github.com/user-attachments/assets/4da11122-b547-4e1e-a953-8d2e4c478431"
/> | <img width="1024" height="759" alt="Redeem Credits
Supabase-49FC982C-2605-41B3-8216-B8F270825247"
src="https://github.com/user-attachments/assets/8e5fc351-6e11-4fef-9d55-1a60fa34a89a"
/> |
| <img width="1024" height="759" alt="Redeem Credits
Supabase-6AF18EF8-1699-4341-A900-34E3AEB59703"
src="https://github.com/user-attachments/assets/7adf3d15-73a7-4ef1-9d25-bfcb07b1b15c"
/> | <img width="1024" height="759" alt="Redeem Credits
Supabase-4F8BBF66-6AF6-403F-B949-079F8E47200B"
src="https://github.com/user-attachments/assets/b05461de-1fd3-4251-9a22-9d1a4dea2b20"
/> |
| <img width="1024" height="759" alt="Redeem Credits
Supabase-320E56E7-A291-426B-92B4-5CD4518C85B6"
src="https://github.com/user-attachments/assets/aa172303-0219-425d-9c8b-07044a9f5cac"
/> | <img width="1024" height="759" alt="Redeem Credits
Supabase-7E55274C-E39E-443B-B636-63B597E11494"
src="https://github.com/user-attachments/assets/4a09d19e-a61c-4c1d-a0a2-e535e53aeee7"
/> |
| <img width="1024" height="759" alt="Redeem Credits
Supabase-4D5A1985-D36B-48E1-8108-E95C10C52A12"
src="https://github.com/user-attachments/assets/e3baffe9-e0ac-4dff-8f4c-1b01d34fbfe4"
/> | <img width="1024" height="759" alt="Redeem Credits
Supabase-B1296556-9DDF-48ED-A0DA-4BEFF5D20FBA"
src="https://github.com/user-attachments/assets/27ed8201-960b-45e3-a32f-115045d0443e"
/> |
| <img width="1024" height="759" alt="Redeem Credits
Supabase-193C4266-29BC-4B03-A746-4C2CE3BD29EB"
src="https://github.com/user-attachments/assets/230fb7a0-4049-46b7-84d4-eb549099863b"
/> | <img width="1024" height="759" alt="Redeem Credits
Supabase-751A900D-A8CF-425C-A745-1511B6DC81E3"
src="https://github.com/user-attachments/assets/55ab5719-a77c-486b-b2d0-5926a524a7b4"
/> |
| <img width="1024" height="759" alt="Redeem Credits
Supabase-29305C15-19B7-4015-9041-62B79E0C95A8"
src="https://github.com/user-attachments/assets/a1b2ba08-2d1a-4a95-a6ac-4d9e3faf9327"
/> | <img width="1024" height="759" alt="Redeem Credits
Supabase-A1628FDB-CFBE-47E7-83D7-3D3D426C3C1E"
src="https://github.com/user-attachments/assets/7fbbf75e-1f8e-478f-83ec-2ab06dff0545"
/> |


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

## Release Notes

* **New Features**
  * Added organization selector to the credits redemption workflow.
* New "Create Organization" card for quick access to organization
creation.

* **Refactor**
* Streamlined the credits redemption page for improved user experience.
  * Enhanced organization card display with customizable descriptions.

* **Style**
  * Removed "Coming soon" beta indicators from action cards.

<!-- review_stack_entry_start -->

[![Review Change
Stack](https://storage.googleapis.com/coderabbit_public_assets/review-stack-in-coderabbit-ui.svg)](https://app.coderabbit.ai/change-stack/supabase/supabase/pull/45909?utm_source=github_walkthrough&utm_medium=github&utm_campaign=change_stack)

<!-- review_stack_entry_end -->
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Co-authored-by: Joshen Lim <joshenlimek@gmail.com>
2026-05-18 19:02:51 +10:00

181 lines
6.4 KiB
TypeScript

import { LOCAL_STORAGE_KEYS } from 'common'
import { Check, ChevronDown } from 'lucide-react'
import { useMemo, useState, type ReactNode } from 'react'
import { cn, Collapsible, CollapsibleContent, CollapsibleTrigger } from 'ui'
import {
CreateOrganizationCard,
OrganizationCard,
} from '@/components/interfaces/Organization/OrganizationCard'
import { useLocalStorageQuery } from '@/hooks/misc/useLocalStorage'
import type { Organization } from '@/types'
const VISIBLE_ORGANIZATIONS_LIMIT = 3
const CONNECT_DISCLOSURE_TRIGGER_CLASSNAME =
'mx-auto flex h-7 cursor-pointer items-center justify-center gap-1.5 rounded-md px-2 text-xs text-foreground-lighter transition-colors hover:bg-surface-200 hover:text-foreground'
export const OrganizationSelector = ({
organizations,
selectedSlug,
disabled = false,
description,
createLabel,
createHrefParams,
onSelect,
getOrganizationDescription,
}: {
organizations: Organization[]
selectedSlug?: string | null
disabled?: boolean
description?: ReactNode
createLabel?: string
createHrefParams?: { [key: string]: string }
onSelect: (slug: string) => void
getOrganizationDescription?: (organization: Organization) => ReactNode
}) => {
const [showMore, setShowMore] = useState(false)
const [lastVisitedOrganization] = useLocalStorageQuery(
LOCAL_STORAGE_KEYS.LAST_VISITED_ORGANIZATION,
''
)
const { visibleOrganizations, overflowOrganizations } = useMemo(() => {
const lastVisitedOrg = organizations.find(({ slug }) => slug === lastVisitedOrganization)
const selectedIndex = organizations.findIndex(({ slug }) => slug === selectedSlug)
const selectedInOverflow = selectedIndex >= VISIBLE_ORGANIZATIONS_LIMIT
if (!!lastVisitedOrg) {
const withoutLastVisited = organizations.filter(
({ slug }) => slug !== lastVisitedOrganization
)
return {
visibleOrganizations: [
lastVisitedOrg,
...withoutLastVisited.slice(0, VISIBLE_ORGANIZATIONS_LIMIT - 1),
],
overflowOrganizations: withoutLastVisited.slice(VISIBLE_ORGANIZATIONS_LIMIT - 1),
}
}
if (!selectedInOverflow || !selectedSlug) {
return {
visibleOrganizations: organizations.slice(0, VISIBLE_ORGANIZATIONS_LIMIT),
overflowOrganizations: organizations.slice(VISIBLE_ORGANIZATIONS_LIMIT),
}
}
const selected = organizations[selectedIndex]
const withoutSelected = organizations.filter(({ slug }) => slug !== selectedSlug)
return {
visibleOrganizations: [
...withoutSelected.slice(0, VISIBLE_ORGANIZATIONS_LIMIT - 1),
selected,
],
overflowOrganizations: withoutSelected.slice(VISIBLE_ORGANIZATIONS_LIMIT - 1),
}
}, [lastVisitedOrganization, organizations, selectedSlug])
const hasOverflow = overflowOrganizations.length > 0
return (
<section className="space-y-2" aria-label="Organizations">
<div className="space-y-1">
<p className="text-xs font-medium uppercase tracking-wider text-foreground-light">
Organization
</p>
{description && <p className="text-xs text-foreground-lighter pr-4">{description}</p>}
</div>
<div className="space-y-2">
{visibleOrganizations.map((organization) => (
<ConnectOrganizationButton
key={organization.slug}
organization={organization}
selected={selectedSlug === organization.slug}
disabled={disabled}
onClick={() => onSelect(organization.slug)}
description={
getOrganizationDescription?.(organization) ?? getPlanDescription(organization)
}
/>
))}
{!!createLabel && !!createHrefParams && (
<CreateOrganizationCard params={createHrefParams} label={createLabel} />
)}
{hasOverflow && (
<Collapsible open={showMore} onOpenChange={setShowMore}>
<CollapsibleTrigger className={CONNECT_DISCLOSURE_TRIGGER_CLASSNAME}>
<span>{showMore ? 'Show fewer' : `Show ${overflowOrganizations.length} more`}</span>
<ChevronDown
className={cn('size-3.5 transition-transform', showMore && 'rotate-180')}
/>
</CollapsibleTrigger>
<CollapsibleContent className="data-closed:animate-collapsible-up data-open:animate-collapsible-down overflow-hidden">
<div className="space-y-2 pt-1">
{overflowOrganizations.map((organization) => (
<ConnectOrganizationButton
key={organization.slug}
organization={organization}
selected={selectedSlug === organization.slug}
disabled={disabled}
onClick={() => onSelect(organization.slug)}
description={
getOrganizationDescription?.(organization) ?? getPlanDescription(organization)
}
/>
))}
</div>
</CollapsibleContent>
</Collapsible>
)}
</div>
</section>
)
}
const getPlanDescription = (organization: Organization) => `${organization.plan.name} Plan`
const ConnectOrganizationButton = ({
organization,
selected,
disabled,
onClick,
description,
}: {
organization: Organization
selected?: boolean
disabled?: boolean
onClick?: () => void
description?: ReactNode
}) => (
<button
type="button"
disabled={disabled}
onClick={onClick}
aria-pressed={selected}
className={cn(
'group relative block w-full cursor-pointer text-left disabled:cursor-not-allowed disabled:opacity-50',
disabled && 'pointer-events-none'
)}
>
<OrganizationCard
isLink={false}
organization={organization}
description={description}
className={cn(
'pointer-events-none shadow-none transition-colors',
!disabled && !selected && 'group-hover:border-default group-hover:bg-surface-200',
selected &&
'border-brand bg-brand-200/20 dark:bg-brand-300 pr-10 group-hover:border-brand group-hover:bg-brand-200/20'
)}
/>
{selected && (
<span className="pointer-events-none absolute right-3 top-1/2 flex size-5 -translate-y-1/2 items-center justify-center rounded-full bg-brand-500 dark:bg-brand-200 text-white dark:text-brand">
<Check className="size-3.5" strokeWidth={2} />
</span>
)}
</button>
)