mirror of
https://github.com/supabase/supabase.git
synced 2026-10-10 20:05: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>
136 lines
4.3 KiB
TypeScript
136 lines
4.3 KiB
TypeScript
import { GitBranchIcon } from 'lucide-react'
|
|
import { useState } from 'react'
|
|
import {
|
|
AlertDialog,
|
|
AlertDialogAction,
|
|
AlertDialogCancel,
|
|
AlertDialogContent,
|
|
AlertDialogDescription,
|
|
AlertDialogFooter,
|
|
AlertDialogHeader,
|
|
AlertDialogTitle,
|
|
AlertDialogTrigger,
|
|
Button,
|
|
} from 'ui'
|
|
import { Admonition } from 'ui-patterns/Admonition'
|
|
|
|
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
|
|
import { useTrack } from '@/lib/telemetry/track'
|
|
|
|
interface OutOfDateNoticeProps {
|
|
isBranchOutOfDateMigrations: boolean
|
|
missingMigrationsCount: number
|
|
hasMissingFunctions: boolean
|
|
missingFunctionsCount: number
|
|
hasOutOfDateFunctions: boolean
|
|
outOfDateFunctionsCount: number
|
|
hasEdgeFunctionModifications: boolean
|
|
modifiedFunctionsCount: number
|
|
isPushing: boolean
|
|
onPush: () => void
|
|
}
|
|
|
|
export const OutOfDateNotice = ({
|
|
isBranchOutOfDateMigrations,
|
|
missingMigrationsCount,
|
|
hasMissingFunctions,
|
|
hasOutOfDateFunctions,
|
|
hasEdgeFunctionModifications,
|
|
modifiedFunctionsCount,
|
|
isPushing,
|
|
onPush,
|
|
}: OutOfDateNoticeProps) => {
|
|
const [isDialogOpen, setIsDialogOpen] = useState(false)
|
|
const hasOutdatedMigrations = isBranchOutOfDateMigrations && missingMigrationsCount > 0
|
|
const { data: project } = useSelectedProjectQuery()
|
|
const track = useTrack()
|
|
|
|
const isBranch = project?.parent_project_ref !== undefined
|
|
const parentProjectRef = isBranch ? project?.parent_project_ref : project?.ref
|
|
|
|
const getTitle = () => {
|
|
if (hasOutdatedMigrations && (hasMissingFunctions || hasOutOfDateFunctions)) {
|
|
return 'Your database schema and edge functions are out of date'
|
|
} else if (hasOutdatedMigrations) {
|
|
return 'Your database schema is out of date'
|
|
} else if (hasMissingFunctions || hasOutOfDateFunctions) {
|
|
return 'Your functions are out of date'
|
|
}
|
|
return 'Branch is out of date'
|
|
}
|
|
|
|
const getDescription = () => {
|
|
return 'Update this branch to get the latest changes from the production branch.'
|
|
}
|
|
|
|
const handleUpdate = (shouldCloseDialog = false) => {
|
|
if (shouldCloseDialog) {
|
|
setIsDialogOpen(false)
|
|
}
|
|
|
|
track(
|
|
'branch_updated',
|
|
{
|
|
modifiedEdgeFunctions: hasEdgeFunctionModifications,
|
|
source: 'out_of_date_notice',
|
|
},
|
|
{ project: parentProjectRef }
|
|
)
|
|
|
|
onPush()
|
|
}
|
|
|
|
return (
|
|
<Admonition type="warning" className="my-4">
|
|
<div className="w-full flex items-center justify-between">
|
|
<div>
|
|
<h3 className="text-sm font-medium">{getTitle()}</h3>
|
|
<p className="text-sm text-foreground-light">{getDescription()}</p>
|
|
</div>
|
|
|
|
{hasEdgeFunctionModifications ? (
|
|
<AlertDialog open={isDialogOpen} onOpenChange={setIsDialogOpen}>
|
|
<AlertDialogTrigger asChild>
|
|
<Button
|
|
variant="default"
|
|
loading={isPushing}
|
|
icon={<GitBranchIcon size={16} strokeWidth={1.5} />}
|
|
className="shrink-0"
|
|
>
|
|
{isPushing ? 'Updating...' : 'Update branch'}
|
|
</Button>
|
|
</AlertDialogTrigger>
|
|
<AlertDialogContent>
|
|
<AlertDialogHeader>
|
|
<AlertDialogTitle>Update branch with modified functions</AlertDialogTitle>
|
|
<AlertDialogDescription>
|
|
This branch has {modifiedFunctionsCount} modified edge function
|
|
{modifiedFunctionsCount !== 1 ? 's' : ''} that will be overwritten when updating
|
|
with the latest functions from the production branch. This action cannot be
|
|
undone.
|
|
</AlertDialogDescription>
|
|
</AlertDialogHeader>
|
|
<AlertDialogFooter>
|
|
<AlertDialogCancel>Cancel</AlertDialogCancel>
|
|
<AlertDialogAction variant="warning" onClick={() => handleUpdate(true)}>
|
|
Update anyway
|
|
</AlertDialogAction>
|
|
</AlertDialogFooter>
|
|
</AlertDialogContent>
|
|
</AlertDialog>
|
|
) : (
|
|
<Button
|
|
variant="default"
|
|
loading={isPushing}
|
|
onClick={() => handleUpdate()}
|
|
icon={<GitBranchIcon size={16} strokeWidth={1.5} />}
|
|
className="shrink-0"
|
|
>
|
|
{isPushing ? 'Updating...' : 'Update branch'}
|
|
</Button>
|
|
)}
|
|
</div>
|
|
</Admonition>
|
|
)
|
|
}
|