mirror of
https://github.com/supabase/supabase.git
synced 2026-09-08 19:08:44 +08:00
ca2b50a0a7
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>
90 lines
2.2 KiB
TypeScript
90 lines
2.2 KiB
TypeScript
import { useRouter } from 'next/router'
|
|
import { Button } from 'ui'
|
|
import { Admonition } from 'ui-patterns/Admonition'
|
|
|
|
import { OrganizationInviteByToken } from '@/data/organization-members/organization-invitation-token-query'
|
|
import { useSignOut } from '@/lib/auth'
|
|
import { useProfile } from '@/lib/profile'
|
|
import type { ResponseError } from '@/types'
|
|
|
|
interface OrganizationInviteError {
|
|
data?: OrganizationInviteByToken
|
|
error?: ResponseError | null
|
|
isError: boolean
|
|
isInvalidInvite?: boolean
|
|
}
|
|
|
|
export const OrganizationInviteError = ({
|
|
data,
|
|
error,
|
|
isError,
|
|
isInvalidInvite,
|
|
}: OrganizationInviteError) => {
|
|
const router = useRouter()
|
|
const signOut = useSignOut()
|
|
const { profile } = useProfile()
|
|
|
|
const handleSignOut = async () => {
|
|
await signOut()
|
|
router.reload()
|
|
}
|
|
|
|
if (isInvalidInvite) {
|
|
return (
|
|
<Admonition
|
|
type="warning"
|
|
description="Open the full invite link again, or ask the organization owner for a new invite."
|
|
/>
|
|
)
|
|
}
|
|
|
|
if (isError) {
|
|
return (
|
|
<Admonition
|
|
type="danger"
|
|
description={error?.message ?? 'Open the full invite link again, or ask for a new invite.'}
|
|
/>
|
|
)
|
|
}
|
|
|
|
if (!data?.email_match) {
|
|
return (
|
|
<div className="flex flex-col gap-3">
|
|
<Admonition
|
|
type="warning"
|
|
description={
|
|
profile?.primary_email ? (
|
|
<>
|
|
You are signed in as{' '}
|
|
<span className="font-medium text-foreground">{profile.primary_email}</span>. Sign
|
|
in with the email address that received this invite.
|
|
</>
|
|
) : (
|
|
'Sign in with the email address that received this invite.'
|
|
)
|
|
}
|
|
/>
|
|
<Button variant="default" block onClick={handleSignOut}>
|
|
Sign out
|
|
</Button>
|
|
</div>
|
|
)
|
|
}
|
|
|
|
if (data.expired_token) {
|
|
return (
|
|
<Admonition
|
|
type="warning"
|
|
description="Ask the organization owner to send you a new invite."
|
|
/>
|
|
)
|
|
}
|
|
|
|
return (
|
|
<Admonition
|
|
type="warning"
|
|
description="Open the full invite link again, or ask the organization owner for a new invite."
|
|
/>
|
|
)
|
|
}
|