mirror of
https://github.com/supabase/supabase.git
synced 2026-10-10 11:55:05 +03:00
## 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 --> [](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>
146 lines
4.5 KiB
TypeScript
146 lines
4.5 KiB
TypeScript
import { screen, waitFor } from '@testing-library/react'
|
|
import userEvent from '@testing-library/user-event'
|
|
import { FeatureFlagContext } from 'common'
|
|
import { HttpResponse } from 'msw'
|
|
import { beforeEach, describe, expect, test, vi } from 'vitest'
|
|
|
|
import { RedeemCreditsScreen } from './RedeemCredits'
|
|
import type { ProfileContextType } from '@/lib/profile'
|
|
import { createMockOrganization } from '@/tests/helpers'
|
|
import { customRender } from '@/tests/lib/custom-render'
|
|
import { addAPIMock } from '@/tests/lib/msw'
|
|
import { routerMock } from '@/tests/lib/route-mock'
|
|
|
|
const { creditRedemptionProps } = vi.hoisted(() => ({
|
|
creditRedemptionProps: vi.fn(),
|
|
}))
|
|
const { creditRedemptionQueryCode } = vi.hoisted(() => ({
|
|
creditRedemptionQueryCode: { current: undefined as string | undefined },
|
|
}))
|
|
|
|
vi.mock('@/components/interfaces/Organization/BillingSettings/CreditCodeRedemption', () => {
|
|
return {
|
|
CreditCodeRedemption: (props: { slug?: string }) => {
|
|
creditRedemptionProps({ ...props, queryCode: creditRedemptionQueryCode.current })
|
|
return (
|
|
<div data-testid="credit-redemption">
|
|
Credit redemption for {props.slug} with code {creditRedemptionQueryCode.current}
|
|
</div>
|
|
)
|
|
},
|
|
}
|
|
})
|
|
|
|
const DEFAULT_PROFILE_CONTEXT: ProfileContextType = {
|
|
profile: {
|
|
id: 1,
|
|
auth0_id: 'auth0|test',
|
|
gotrue_id: 'gotrue-test',
|
|
username: 'testuser',
|
|
primary_email: 'test@example.com',
|
|
first_name: null,
|
|
last_name: null,
|
|
mobile: null,
|
|
is_alpha_user: false,
|
|
is_sso_user: false,
|
|
disabled_features: [],
|
|
free_project_limit: null,
|
|
},
|
|
error: null,
|
|
isLoading: false,
|
|
isError: false,
|
|
isSuccess: true,
|
|
}
|
|
|
|
const ORGANIZATION = createMockOrganization({
|
|
id: 1,
|
|
name: 'Acme Production',
|
|
slug: 'acme-production',
|
|
plan: { id: 'pro', name: 'Pro' },
|
|
})
|
|
|
|
function renderScreen() {
|
|
return customRender(
|
|
<FeatureFlagContext.Provider value={{ configcat: {}, posthog: {}, hasLoaded: true }}>
|
|
<RedeemCreditsScreen />
|
|
</FeatureFlagContext.Provider>,
|
|
{ profileContext: DEFAULT_PROFILE_CONTEXT }
|
|
)
|
|
}
|
|
|
|
describe('RedeemCreditsScreen', () => {
|
|
beforeEach(() => {
|
|
vi.clearAllMocks()
|
|
creditRedemptionQueryCode.current = undefined
|
|
routerMock.setCurrentUrl('/redeem')
|
|
})
|
|
|
|
test('renders ready state from organizations query and opens redemption for selected organization', async () => {
|
|
const user = userEvent.setup()
|
|
routerMock.setCurrentUrl('/redeem?code=SUPA-CREDIT-123')
|
|
creditRedemptionQueryCode.current = 'SUPA-CREDIT-123'
|
|
addAPIMock({
|
|
method: 'get',
|
|
path: '/platform/organizations',
|
|
response: () => HttpResponse.json([ORGANIZATION]),
|
|
})
|
|
|
|
renderScreen()
|
|
|
|
await user.click(await screen.findByRole('button', { name: /Acme Production/ }))
|
|
await user.click(screen.getByRole('button', { name: 'Redeem credits' }))
|
|
|
|
expect(await screen.findByTestId('credit-redemption')).toHaveTextContent(
|
|
'Credit redemption for acme-production with code SUPA-CREDIT-123'
|
|
)
|
|
expect(creditRedemptionProps).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
slug: 'acme-production',
|
|
queryCode: 'SUPA-CREDIT-123',
|
|
})
|
|
)
|
|
})
|
|
|
|
test('routes new organization creation back to the current redeem URL', async () => {
|
|
routerMock.setCurrentUrl('/redeem?code=SUPA-CREDIT-123')
|
|
addAPIMock({
|
|
method: 'get',
|
|
path: '/platform/organizations',
|
|
response: () => HttpResponse.json([ORGANIZATION]),
|
|
})
|
|
|
|
renderScreen()
|
|
|
|
const createOrganizationLink = await screen.findByRole('link', {
|
|
name: /Create new organization/,
|
|
})
|
|
|
|
expect(createOrganizationLink).toHaveAttribute(
|
|
'href',
|
|
'/new?returnTo=%2Fredeem%3Fcode%3DSUPA-CREDIT-123&returnToOrgParam=selected_org'
|
|
)
|
|
})
|
|
|
|
test('preselects an organization returned from new organization creation', async () => {
|
|
const user = userEvent.setup()
|
|
routerMock.setCurrentUrl('/redeem?code=SUPA-CREDIT-123&selected_org=acme-production')
|
|
creditRedemptionQueryCode.current = 'SUPA-CREDIT-123'
|
|
addAPIMock({
|
|
method: 'get',
|
|
path: '/platform/organizations',
|
|
response: () => HttpResponse.json([ORGANIZATION]),
|
|
})
|
|
|
|
renderScreen()
|
|
|
|
const redeemButton = await screen.findByRole('button', { name: 'Redeem credits' })
|
|
|
|
await waitFor(() => expect(redeemButton).toBeEnabled())
|
|
await user.click(redeemButton)
|
|
|
|
expect(await screen.findByTestId('credit-redemption')).toHaveTextContent(
|
|
'Credit redemption for acme-production with code SUPA-CREDIT-123'
|
|
)
|
|
})
|
|
})
|