mirror of
https://github.com/supabase/supabase.git
synced 2026-09-08 19:08:44 +08: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>
55 lines
1.7 KiB
TypeScript
55 lines
1.7 KiB
TypeScript
import type { UseFormReturn } from 'react-hook-form'
|
||
// End of third-party imports
|
||
|
||
import { FormControl, FormField, TextArea } from 'ui'
|
||
import { Admonition } from 'ui-patterns/Admonition'
|
||
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
|
||
|
||
import { IPV4SuggestionAlert } from './IPV4SuggestionAlert'
|
||
import { IPV4_MIGRATION_STRINGS } from './Support.constants'
|
||
import type { SupportFormValues } from './SupportForm.schema'
|
||
|
||
interface MessageFieldProps {
|
||
form: UseFormReturn<SupportFormValues>
|
||
originalError: string | null | undefined
|
||
}
|
||
|
||
export function MessageField({ form, originalError }: MessageFieldProps) {
|
||
return (
|
||
<FormField
|
||
name="message"
|
||
control={form.control}
|
||
render={({ field }) => (
|
||
<FormItemLayout
|
||
layout="vertical"
|
||
label="Message"
|
||
labelOptional="5000 character limit"
|
||
description={
|
||
IPV4_MIGRATION_STRINGS.some((str) => field.value.includes(str)) && (
|
||
<IPV4SuggestionAlert />
|
||
)
|
||
}
|
||
>
|
||
<FormControl>
|
||
<TextArea
|
||
{...field}
|
||
rows={4}
|
||
maxLength={5000}
|
||
placeholder="Describe the issue you’re facing, along with any relevant information. Please be as detailed and specific as possible."
|
||
/>
|
||
</FormControl>
|
||
{originalError && (
|
||
<Admonition
|
||
showIcon={false}
|
||
type="default"
|
||
className="mt-2 max-h-[150px] overflow-y-auto"
|
||
title="The error that you ran into will be included in your message for reference"
|
||
description={`Error: ${originalError}`}
|
||
/>
|
||
)}
|
||
</FormItemLayout>
|
||
)}
|
||
/>
|
||
)
|
||
}
|