mirror of
https://github.com/supabase/supabase.git
synced 2026-10-09 19:35:06 +03:00
Follow-up to #48344: collapses the two resolution paths for the Admonition module into one. `src/admonition.tsx` was a back-compat shim re-exporting `src/Admonition/`. Two ways to resolve one module is exactly what produced the macOS self-import bug fixed in #48344, and the local typecheck errors that #48374 worked around. This removes the shim and standardizes on the PascalCase subpath, matching every other export in the package. **Changed:** - Codemodded all 246 `ui-patterns/admonition` imports to `ui-patterns/Admonition` (240 `.tsx`, 5 `.mdx`, 1 `.ts` across studio, docs, www, design-system, and lite-studio) - Pointed the 5 internal `'../admonition'` imports back at the `'../Admonition'` directory **Removed:** - `packages/ui-patterns/src/admonition.tsx`, and its `./admonition` entry in the exports map (regenerated with `pnpm gen:exports`) ## To test - `grep -r "ui-patterns/admonition" --include='*.ts*'` → no hits - `pnpm test:case-hazards` → passes - `pnpm typecheck` → all 15 tasks green - `pnpm --filter studio run lint:ratchet` → passes - `pnpm --filter ui-patterns vitest run src/Admonition` → 11 tests pass <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Bug Fixes** * Standardized Admonition component imports across the application and documentation. * Improved compatibility with case-sensitive environments by using the canonical component path. * Removed the legacy Admonition import entry point. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Alaister Young <10985857+alaister@users.noreply.github.com>
117 lines
3.5 KiB
TypeScript
117 lines
3.5 KiB
TypeScript
import { PermissionAction } from '@supabase/shared-types/out/constants'
|
|
import { useParams } from 'common'
|
|
import { useState } from 'react'
|
|
import { toast } from 'sonner'
|
|
import {
|
|
AlertDialog,
|
|
AlertDialogAction,
|
|
AlertDialogBody,
|
|
AlertDialogCancel,
|
|
AlertDialogContent,
|
|
AlertDialogDescription,
|
|
AlertDialogFooter,
|
|
AlertDialogHeader,
|
|
AlertDialogTitle,
|
|
AlertDialogTrigger,
|
|
Button,
|
|
} from 'ui'
|
|
import { Admonition } from 'ui-patterns/Admonition'
|
|
|
|
import { type AuthTemplate } from './EmailTemplates.types'
|
|
import { getAuthTemplateType } from './EmailTemplates.utils'
|
|
import { AuthConfigResponse } from '@/data/auth/auth-config-query'
|
|
import { useAuthTemplateResetMutation } from '@/data/auth/auth-template-reset-mutation'
|
|
import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
|
|
|
|
export const ResetTemplateDialog = ({
|
|
template,
|
|
hasUnsavedChanges,
|
|
onResetSuccess,
|
|
}: {
|
|
template: AuthTemplate
|
|
hasUnsavedChanges: boolean
|
|
onResetSuccess: (config: AuthConfigResponse) => void
|
|
}) => {
|
|
const { ref: projectRef } = useParams()
|
|
const [open, setOpen] = useState(false)
|
|
const [error, setError] = useState<string | null>(null)
|
|
const { can: canUpdateConfig } = useAsyncCheckPermissions(
|
|
PermissionAction.UPDATE,
|
|
'custom_config_gotrue'
|
|
)
|
|
|
|
const { id } = template
|
|
const templateType = getAuthTemplateType(id)
|
|
|
|
const { mutateAsync: resetAuthTemplate, isPending: isResetting } = useAuthTemplateResetMutation({
|
|
onSuccess: (config) => {
|
|
toast.success('Email template reset to default')
|
|
onResetSuccess(config)
|
|
},
|
|
onError: () => {},
|
|
})
|
|
|
|
const resetTemplateToDefault = async () => {
|
|
if (!projectRef) throw new Error('Project ref is required')
|
|
if (!templateType) throw new Error('Template type is required')
|
|
|
|
setError(null)
|
|
|
|
try {
|
|
await resetAuthTemplate({ projectRef, template: templateType })
|
|
} catch (error) {
|
|
setError(
|
|
error instanceof Error
|
|
? error.message
|
|
: 'An unknown error occurred while resetting the template'
|
|
)
|
|
throw error
|
|
}
|
|
}
|
|
|
|
return (
|
|
<AlertDialog
|
|
open={open}
|
|
onOpenChange={(next) => {
|
|
setOpen(next)
|
|
if (!next) setError(null)
|
|
}}
|
|
>
|
|
<AlertDialogTrigger asChild>
|
|
<Button variant="default" type="button" disabled={!canUpdateConfig}>
|
|
Reset template
|
|
</Button>
|
|
</AlertDialogTrigger>
|
|
<AlertDialogContent>
|
|
<AlertDialogHeader>
|
|
<AlertDialogTitle>Reset template to default</AlertDialogTitle>
|
|
<AlertDialogDescription>
|
|
{hasUnsavedChanges
|
|
? 'This will discard your unsaved changes and use the default subject line and email body content.'
|
|
: 'This will remove your custom subject line and email body content. The default values will be used instead.'}
|
|
</AlertDialogDescription>
|
|
</AlertDialogHeader>
|
|
{error && (
|
|
<AlertDialogBody>
|
|
<Admonition
|
|
type="destructive"
|
|
title="Unable to reset email template"
|
|
description={error}
|
|
/>
|
|
</AlertDialogBody>
|
|
)}
|
|
<AlertDialogFooter>
|
|
<AlertDialogCancel disabled={isResetting}>Cancel</AlertDialogCancel>
|
|
<AlertDialogAction
|
|
variant="warning"
|
|
loading={isResetting}
|
|
onClick={resetTemplateToDefault}
|
|
>
|
|
Reset
|
|
</AlertDialogAction>
|
|
</AlertDialogFooter>
|
|
</AlertDialogContent>
|
|
</AlertDialog>
|
|
)
|
|
}
|