Files
Alaister YoungandAlaister Young ca2b50a0a7 chore(ui-patterns): collapse the admonition shim into ui-patterns/Admonition (#48377)
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>
2026-07-29 00:48:56 +08:00

112 lines
3.8 KiB
TypeScript

import { useParams } from 'common'
import { toast } from 'sonner'
import {
AlertDialog,
AlertDialogAction,
AlertDialogCancel,
AlertDialogContent,
AlertDialogDescription,
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
} from 'ui'
import { Admonition } from 'ui-patterns/Admonition'
import { useNetworkRestrictionsQuery } from '@/data/network-restrictions/network-restrictions-query'
import { useNetworkRestrictionsApplyMutation } from '@/data/network-restrictions/network-retrictions-apply-mutation'
interface RemoveRestrictionModalProps {
visible: boolean
selectedRestriction?: string
onClose: () => void
}
const RemoveRestrictionModal = ({
visible,
selectedRestriction,
onClose,
}: RemoveRestrictionModalProps) => {
const { ref } = useParams()
const { data } = useNetworkRestrictionsQuery({ projectRef: ref }, { enabled: visible })
const ipv4Restrictions = data?.config?.dbAllowedCidrs ?? []
// @ts-ignore [Joshen] API typing issue
const ipv6Restrictions: string[] = data?.config?.dbAllowedCidrsV6 ?? []
const restrictedIps = ipv4Restrictions.concat(ipv6Restrictions)
const { mutateAsync: applyNetworkRestrictions, isPending: isApplying } =
useNetworkRestrictionsApplyMutation({
onSuccess: () => onClose(),
onError: (error) => {
toast.error(`Failed to remove restriction: ${error.message}`)
},
})
const isRemovingOnlyRestriction =
restrictedIps.length === 1 && restrictedIps[0] === selectedRestriction
const onSubmit = async () => {
if (!ref) return console.error('Project ref is required')
if (!selectedRestriction) return console.error('Missing selected restriction')
const dbAllowedCidrs = ipv4Restrictions.includes(selectedRestriction)
? ipv4Restrictions.filter((ip) => ip !== selectedRestriction)
: ipv4Restrictions
const dbAllowedCidrsV6 = ipv6Restrictions.includes(selectedRestriction)
? ipv6Restrictions.filter((ip) => ip !== selectedRestriction)
: ipv6Restrictions
if (dbAllowedCidrs.length === 0 && dbAllowedCidrsV6.length === 0) {
await applyNetworkRestrictions({
projectRef: ref,
dbAllowedCidrs: ['0.0.0.0/0'],
dbAllowedCidrsV6: ['::/0'],
})
} else {
await applyNetworkRestrictions({ projectRef: ref, dbAllowedCidrs, dbAllowedCidrsV6 })
}
}
return (
<AlertDialog open={visible} onOpenChange={onClose}>
<AlertDialogContent>
<AlertDialogHeader>
<AlertDialogTitle>Confirm to remove restriction</AlertDialogTitle>
<AlertDialogDescription>
<div className="flex flex-col space-y-4">
<p>
The IPv4 address <code className="text-code-inline">{selectedRestriction}</code>{' '}
will be removed from your list of network restrictions
{isRemovingOnlyRestriction
? '.'
: ", and no longer have access to your project's database."}
</p>
{isRemovingOnlyRestriction && (
<Admonition
type="warning"
title="Database access will no longer be restricted"
description="Removing all network restrictions will default to your database being accessible from
all IP addresses."
/>
)}
</div>
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel disabled={isApplying}>Cancel</AlertDialogCancel>
<AlertDialogAction
onClick={onSubmit}
disabled={isApplying}
loading={isApplying}
variant="danger"
>
Remove restriction
</AlertDialogAction>
</AlertDialogFooter>
</AlertDialogContent>
</AlertDialog>
)
}
export default RemoveRestrictionModal