mirror of
https://github.com/supabase/supabase.git
synced 2026-07-15 20:21:17 -04:00
fa20667ec1
## What kind of change does this PR introduce? Bug fix / refactor. Resolves DEPR-573. ## What is the current behavior? `ResetTemplateDialog` (added in #45572) confirms the Auth email template reset using the old `AlertDialog` workaround: an `AlertDialogAction` with `asChild` + `event.preventDefault()` and a manual loading `Button`, driven by `mutate` plus inline callbacks. Reset failures are only reported via a toast from the mutation's default `onError`, so the error disappears from the dialog context. This predates #45960, which added first-class async handling to `AlertDialogAction` (promise-returning handlers, controlled `loading`, and `AlertDialogBody` for inline feedback). #45960 explicitly flagged `ResetTemplateDialog` as needing this follow-up migration. ## What is the new behavior? `ResetTemplateDialog` now uses the async `AlertDialogAction` pattern: - The confirm handler uses `mutateAsync` and returns the reset promise, so the dialog stays open with a loading state while the mutation is pending and closes only after it succeeds. - Reset failures surface inline via a destructive `Admonition` inside `AlertDialogBody`, and the mutation's toast-only error path is suppressed (`onError: () => {}`). The inline error clears when the dialog closes. - `Cancel` is disabled while the reset is in flight. - The `asChild` + `preventDefault()` workaround and the manual loading `Button` are removed; `loading={isResetting}` is retained for parent-controlled loading. This matches the established usage in `DisablePipelinesDialog` / `JitDbAccessDeleteDialog` and the design-system `alert-dialog-async-error` example. ## To test - [ ] Customise an Auth email template, click **Reset template**, confirm the dialog shows loading until the reset succeeds and then closes with the editor refreshed to the default subject/body. - [ ] In DevTools → Network, block `*/templates/*/reset`, click **Reset**, and confirm the dialog stays open with an inline destructive admonition and no toast. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Bug Fixes** * Improved email template reset error handling by showing reset failures inline in the confirmation dialog (with a destructive alert message). * The dialog remains open on reset failure so users can review the error and retry. * “Cancel” is disabled while resetting; success behavior and existing success toast behavior remain unchanged. * **Tests** * Updated reset mutation mock to use async behavior and added coverage for reset failure UI/error handling (including that error toasts are not triggered). <!-- end of auto-generated comment: release notes by coderabbit.ai -->
278 lines
9.0 KiB
TypeScript
278 lines
9.0 KiB
TypeScript
import { screen, waitFor, within } from '@testing-library/react'
|
|
import userEvent from '@testing-library/user-event'
|
|
import { toast } from 'sonner'
|
|
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
|
|
import { TEMPLATES_SCHEMAS } from './AuthTemplatesValidation'
|
|
import { TemplateEditor } from './TemplateEditor'
|
|
import { render } from '@/tests/helpers'
|
|
|
|
const {
|
|
resetTemplateMock,
|
|
updateAuthConfigMock,
|
|
useAuthConfigQueryMock,
|
|
useAuthTemplateResetMutationMock,
|
|
useAuthConfigUpdateMutationMock,
|
|
useAsyncCheckPermissionsMock,
|
|
validateSpamMock,
|
|
} = vi.hoisted(() => ({
|
|
resetTemplateMock: vi.fn(),
|
|
updateAuthConfigMock: vi.fn(),
|
|
useAuthConfigQueryMock: vi.fn(),
|
|
useAuthTemplateResetMutationMock: vi.fn(),
|
|
useAuthConfigUpdateMutationMock: vi.fn(),
|
|
useAsyncCheckPermissionsMock: vi.fn(),
|
|
validateSpamMock: vi.fn(),
|
|
}))
|
|
|
|
vi.mock(import('common'), async (importOriginal) => {
|
|
const actual = await importOriginal()
|
|
|
|
return {
|
|
...actual,
|
|
useParams: vi.fn().mockReturnValue({ ref: 'project-ref' }),
|
|
}
|
|
})
|
|
|
|
vi.mock('@/components/ui/CodeEditor/CodeEditor', () => ({
|
|
CodeEditor: ({
|
|
value,
|
|
onInputChange,
|
|
}: {
|
|
value: string
|
|
onInputChange: (value: string) => void
|
|
}) => (
|
|
<textarea
|
|
aria-label="Body source"
|
|
value={value}
|
|
onChange={(event) => onInputChange(event.target.value)}
|
|
/>
|
|
),
|
|
}))
|
|
|
|
vi.mock('@/components/ui-patterns/Dialogs/PreventNavigationOnUnsavedChanges', () => ({
|
|
PreventNavigationOnUnsavedChanges: () => null,
|
|
}))
|
|
|
|
vi.mock('@/data/auth/auth-config-query', () => ({
|
|
useAuthConfigQuery: useAuthConfigQueryMock,
|
|
}))
|
|
|
|
vi.mock('@/data/auth/auth-config-update-mutation', () => ({
|
|
useAuthConfigUpdateMutation: useAuthConfigUpdateMutationMock,
|
|
}))
|
|
|
|
vi.mock('@/data/auth/auth-template-reset-mutation', () => ({
|
|
useAuthTemplateResetMutation: useAuthTemplateResetMutationMock,
|
|
}))
|
|
|
|
vi.mock('@/data/auth/validate-spam-mutation', () => ({
|
|
useValidateSpamMutation: () => ({ mutate: validateSpamMock }),
|
|
}))
|
|
|
|
vi.mock('@/hooks/misc/useCheckPermissions', () => ({
|
|
useAsyncCheckPermissions: useAsyncCheckPermissionsMock,
|
|
}))
|
|
|
|
vi.mock('sonner', () => ({
|
|
toast: {
|
|
success: vi.fn(),
|
|
error: vi.fn(),
|
|
},
|
|
}))
|
|
|
|
const confirmationTemplate = TEMPLATES_SCHEMAS.find((template) => template.id === 'CONFIRMATION')!
|
|
|
|
const createAuthConfig = ({
|
|
subject = 'Confirm your email address',
|
|
body,
|
|
hasCustomBody,
|
|
hasCustomSubject = false,
|
|
}: {
|
|
subject?: string
|
|
body: string
|
|
hasCustomBody: boolean
|
|
hasCustomSubject?: boolean
|
|
}) => ({
|
|
MAILER_SUBJECTS_CONFIRMATION: subject,
|
|
MAILER_SUBJECTS_CUSTOM_CONTENTS: {
|
|
MAILER_SUBJECTS_CONFIRMATION: hasCustomSubject,
|
|
},
|
|
MAILER_TEMPLATES_CONFIRMATION_CONTENT: body,
|
|
MAILER_TEMPLATES_CUSTOM_CONTENTS: {
|
|
MAILER_TEMPLATES_CONFIRMATION_CONTENT: hasCustomBody,
|
|
},
|
|
SMTP_HOST: 'smtp.example.com',
|
|
SMTP_PASS: 'password',
|
|
SMTP_USER: 'user',
|
|
})
|
|
|
|
const renderTemplateEditor = ({
|
|
body = '<p>Default template</p>',
|
|
canUpdateConfig = true,
|
|
hasCustomBody = false,
|
|
hasCustomSubject = false,
|
|
}: {
|
|
body?: string
|
|
canUpdateConfig?: boolean
|
|
hasCustomBody?: boolean
|
|
hasCustomSubject?: boolean
|
|
} = {}) => {
|
|
useAuthConfigQueryMock.mockReturnValue({
|
|
data: createAuthConfig({ body, hasCustomBody, hasCustomSubject }),
|
|
isSuccess: true,
|
|
})
|
|
useAsyncCheckPermissionsMock.mockReturnValue({ can: canUpdateConfig })
|
|
useAuthConfigUpdateMutationMock.mockReturnValue({ mutate: updateAuthConfigMock })
|
|
useAuthTemplateResetMutationMock.mockImplementation((options = {}) => ({
|
|
mutateAsync: (vars: unknown) => resetTemplateMock(vars, options),
|
|
isPending: false,
|
|
}))
|
|
|
|
return render(<TemplateEditor template={confirmationTemplate} />)
|
|
}
|
|
|
|
describe('TemplateEditor reset to default', () => {
|
|
beforeEach(() => {
|
|
vi.clearAllMocks()
|
|
validateSpamMock.mockImplementation((_vars, callbacks) => callbacks?.onSuccess?.({ rules: [] }))
|
|
})
|
|
|
|
const resetAuthConfig = createAuthConfig({
|
|
subject: 'Confirm your email address',
|
|
body: '<h2>Confirm your email address</h2>\n\n<p>Follow the link below to confirm this email address and finish signing up.</p>\n<p><a href="{{ .ConfirmationURL }}">Confirm email address</a></p>',
|
|
hasCustomBody: false,
|
|
hasCustomSubject: false,
|
|
})
|
|
|
|
it('hides reset when the API does not mark the body as custom', () => {
|
|
renderTemplateEditor()
|
|
|
|
expect(screen.queryByRole('button', { name: 'Reset template' })).not.toBeInTheDocument()
|
|
})
|
|
|
|
it('shows reset when the API marks the body as custom', () => {
|
|
renderTemplateEditor({ hasCustomBody: true })
|
|
|
|
expect(screen.getByRole('button', { name: 'Reset template' })).toBeInTheDocument()
|
|
})
|
|
|
|
it('shows reset when the API marks the subject as custom', () => {
|
|
renderTemplateEditor({ hasCustomSubject: true })
|
|
|
|
expect(screen.getByRole('button', { name: 'Reset template' })).toBeInTheDocument()
|
|
})
|
|
|
|
it('keeps reset visible while there are unsaved editor changes', async () => {
|
|
const user = userEvent.setup()
|
|
renderTemplateEditor({ hasCustomBody: true })
|
|
|
|
await user.clear(screen.getByLabelText('Body source'))
|
|
await user.type(screen.getByLabelText('Body source'), '<p>Unsaved body</p>')
|
|
|
|
expect(screen.getByRole('button', { name: 'Reset template' })).toBeInTheDocument()
|
|
})
|
|
|
|
it('warns that reset discards unsaved changes', async () => {
|
|
const user = userEvent.setup()
|
|
renderTemplateEditor({ hasCustomBody: true })
|
|
|
|
await user.clear(screen.getByLabelText('Body source'))
|
|
await user.type(screen.getByLabelText('Body source'), '<p>Unsaved body</p>')
|
|
await user.click(screen.getByRole('button', { name: 'Reset template' }))
|
|
|
|
expect(
|
|
await screen.findByText(
|
|
'This will discard your unsaved changes and use the default subject line and email body content.'
|
|
)
|
|
).toBeInTheDocument()
|
|
})
|
|
|
|
it('resets the template through the dedicated reset endpoint after confirmation', async () => {
|
|
const user = userEvent.setup()
|
|
resetTemplateMock.mockImplementation((_vars, callbacks) =>
|
|
callbacks?.onSuccess?.(resetAuthConfig)
|
|
)
|
|
|
|
renderTemplateEditor({ hasCustomBody: true })
|
|
|
|
await user.click(screen.getByRole('button', { name: 'Reset template' }))
|
|
const dialog = await screen.findByRole('alertdialog')
|
|
await user.click(within(dialog).getByRole('button', { name: 'Reset' }))
|
|
|
|
await waitFor(() =>
|
|
expect(resetTemplateMock).toHaveBeenCalledWith(
|
|
{ projectRef: 'project-ref', template: 'confirmation' },
|
|
expect.any(Object)
|
|
)
|
|
)
|
|
|
|
expect(toast.success).toHaveBeenCalledWith('Email template reset to default')
|
|
})
|
|
|
|
it('does not reset through the auth config update payload', async () => {
|
|
const user = userEvent.setup()
|
|
resetTemplateMock.mockImplementation((_vars, callbacks) =>
|
|
callbacks?.onSuccess?.(resetAuthConfig)
|
|
)
|
|
|
|
renderTemplateEditor({ hasCustomBody: true })
|
|
|
|
await user.click(screen.getByRole('button', { name: 'Reset template' }))
|
|
const dialog = await screen.findByRole('alertdialog')
|
|
await user.click(within(dialog).getByRole('button', { name: 'Reset' }))
|
|
|
|
await waitFor(() => expect(resetTemplateMock).toHaveBeenCalled())
|
|
|
|
expect(updateAuthConfigMock).not.toHaveBeenCalled()
|
|
})
|
|
|
|
it('uses the reset response as the new editor state', async () => {
|
|
const user = userEvent.setup()
|
|
resetTemplateMock.mockImplementation((_vars, callbacks) =>
|
|
callbacks?.onSuccess?.(resetAuthConfig)
|
|
)
|
|
|
|
renderTemplateEditor({
|
|
body: '<p>Custom body</p>',
|
|
hasCustomBody: true,
|
|
hasCustomSubject: true,
|
|
})
|
|
|
|
await user.click(screen.getByRole('button', { name: 'Reset template' }))
|
|
const dialog = await screen.findByRole('alertdialog')
|
|
await user.click(within(dialog).getByRole('button', { name: 'Reset' }))
|
|
|
|
await waitFor(() => {
|
|
expect(screen.getByDisplayValue('Confirm your email address')).toBeInTheDocument()
|
|
expect(screen.getByLabelText('Body source')).toHaveValue(
|
|
'<h2>Confirm your email address</h2>\n\n<p>Follow the link below to confirm this email address and finish signing up.</p>\n<p><a href="{{ .ConfirmationURL }}">Confirm email address</a></p>'
|
|
)
|
|
})
|
|
})
|
|
|
|
it('disables reset when the user cannot update auth config', () => {
|
|
renderTemplateEditor({ hasCustomBody: true, canUpdateConfig: false })
|
|
|
|
expect(screen.getByRole('button', { name: 'Reset template' })).toBeDisabled()
|
|
})
|
|
|
|
it('keeps the dialog open and shows an inline error when reset fails', async () => {
|
|
const user = userEvent.setup()
|
|
resetTemplateMock.mockImplementation(async () => {
|
|
throw new Error('Reset endpoint unavailable')
|
|
})
|
|
|
|
renderTemplateEditor({ hasCustomBody: true })
|
|
|
|
await user.click(screen.getByRole('button', { name: 'Reset template' }))
|
|
const dialog = await screen.findByRole('alertdialog')
|
|
await user.click(within(dialog).getByRole('button', { name: 'Reset' }))
|
|
|
|
expect(await within(dialog).findByText('Reset endpoint unavailable')).toBeInTheDocument()
|
|
expect(within(dialog).getByText('Unable to reset email template')).toBeInTheDocument()
|
|
expect(within(dialog).getByRole('button', { name: 'Reset' })).toBeInTheDocument()
|
|
expect(toast.error).not.toHaveBeenCalled()
|
|
})
|
|
})
|