The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
chore: remove shadcn suffix for `Input`, `Textarea`, `Alert` and `Collapsible` (#45867)
Gildas Garcia0713a1efc164
diff --git a/apps/design-system/components/callout.tsx b/apps/design-system/components/callout.tsxindex 63ed3afc9b8..371acf6b1e4 100644--- a/apps/design-system/components/callout.tsx+++ b/apps/design-system/components/callout.tsx@@ -1,4 +1,4 @@-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_ } from 'ui'+import { Alert, AlertDescription, AlertTitle } from 'ui'interface CalloutProps {icon?: string@@ -8,10 +8,10 @@ interface CalloutProps {export function Callout({ title, children, icon, ...props }: CalloutProps) {return (- <Alert_Shadcn_ {...props}>+ <Alert {...props}>{icon && <span className="mr-4 text-2xl">{icon}</span>}- {title && <AlertTitle_Shadcn_>{title}</AlertTitle_Shadcn_>}- <AlertDescription_Shadcn_>{children}</AlertDescription_Shadcn_>- </Alert_Shadcn_>+ {title && <AlertTitle>{title}</AlertTitle>}+ <AlertDescription>{children}</AlertDescription>+ </Alert>)}diff --git a/apps/design-system/components/code-block-wrapper.tsx b/apps/design-system/components/code-block-wrapper.tsxindex d4be5c110d3..cdb9a53ce5d 100644--- a/apps/design-system/components/code-block-wrapper.tsx+++ b/apps/design-system/components/code-block-wrapper.tsx@@ -1,13 +1,7 @@'use client'import * as React from 'react'-import {- Button,- cn,- Collapsible_Shadcn_ as Collapsible,- CollapsibleContent_Shadcn_ as CollapsibleContent,- CollapsibleTrigger_Shadcn_ as CollapsibleTrigger,-} from 'ui'+import { Button, cn, Collapsible, CollapsibleContent, CollapsibleTrigger } from 'ui'interface CodeBlockProps extends React.HTMLAttributes<HTMLDivElement> {expandButtonTitle?: stringdiff --git a/apps/design-system/components/component-preview.tsx b/apps/design-system/components/component-preview.tsxindex 0189c7ee1ed..094f85a1463 100644--- a/apps/design-system/components/component-preview.tsx+++ b/apps/design-system/components/component-preview.tsx@@ -2,13 +2,7 @@import { ChevronRight, Expand } from 'lucide-react'import * as React from 'react'-import {- Button,- cn,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,-} from 'ui'+import { Button, cn, Collapsible, CollapsibleContent, CollapsibleTrigger } from 'ui'import { Index } from '@/__registry__'import { useConfig } from '@/hooks/use-config'@@ -152,20 +146,20 @@ export function ComponentPreview({<div className="z-10 relative">{ComponentPreview}</div></div>{!hideCode && (- <Collapsible_Shadcn_>- <CollapsibleTrigger_Shadcn_+ <Collapsible>+ <CollapsibleTriggerclassName={`- flex- gap-3 items-center+ flex+ gap-3 items-centerw-fullfont-mono- text-xs+ text-xstext-foreground-light- px-4 py-4- border border-r+ px-4 py-4+ border border-rgroupdata-closed:rounded-bl-md data-closed:rounded-br-md-+`}><ChevronRight@@ -173,8 +167,8 @@ export function ComponentPreview({size={14}/>View code- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_ className="transition-all">+ </CollapsibleTrigger>+ <CollapsibleContent className="transition-all"><divclassName={cn('relative',@@ -186,8 +180,8 @@ export function ComponentPreview({>{Code}</div>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible>)}</div>)diff --git a/apps/design-system/components/mdx-components.tsx b/apps/design-system/components/mdx-components.tsxindex d753761ad15..db2d55473cc 100644--- a/apps/design-system/components/mdx-components.tsx+++ b/apps/design-system/components/mdx-components.tsx@@ -11,9 +11,9 @@ import {AccordionContent_Shadcn_ as AccordionContent,AccordionItem_Shadcn_ as AccordionItem,AccordionTrigger_Shadcn_ as AccordionTrigger,- Alert_Shadcn_ as Alert,- AlertDescription_Shadcn_ as AlertDescription,- AlertTitle_Shadcn_ as AlertTitle,+ Alert,+ AlertDescription,+ AlertTitle,AspectRatio,cn,Tabs_Shadcn_ as Tabs,diff --git a/apps/design-system/registry/default/example/alert-demo.tsx b/apps/design-system/registry/default/example/alert-demo.tsxindex 5618d1c845f..aa41f9c835d 100644--- a/apps/design-system/registry/default/example/alert-demo.tsx+++ b/apps/design-system/registry/default/example/alert-demo.tsx@@ -1,5 +1,5 @@import { Terminal } from 'lucide-react'-import { Alert, AlertDescription, AlertTitle } from 'ui/src/components/shadcn/ui/alert'+import { Alert, AlertDescription, AlertTitle } from 'ui'export default function AlertDemo() {return (diff --git a/apps/design-system/registry/default/example/collapsible-demo.tsx b/apps/design-system/registry/default/example/collapsible-demo.tsxindex a5a5b556bbb..e989e8c154e 100644--- a/apps/design-system/registry/default/example/collapsible-demo.tsx+++ b/apps/design-system/registry/default/example/collapsible-demo.tsx@@ -2,12 +2,7 @@import { ChevronsUpDown } from 'lucide-react'import * as React from 'react'-import { Button } from 'ui'-import {- Collapsible,- CollapsibleContent,- CollapsibleTrigger,-} from 'ui/src/components/shadcn/ui/collapsible'+import { Button, Collapsible, CollapsibleContent, CollapsibleTrigger } from 'ui'export default function CollapsibleDemo() {const [isOpen, setIsOpen] = React.useState(false)diff --git a/apps/design-system/registry/default/example/copy-form-labels.tsx b/apps/design-system/registry/default/example/copy-form-labels.tsxindex 099afe5b906..1d9a83221b6 100644--- a/apps/design-system/registry/default/example/copy-form-labels.tsx+++ b/apps/design-system/registry/default/example/copy-form-labels.tsx@@ -1,6 +1,6 @@'use client'-import { Input_Shadcn_, Label_Shadcn_ } from 'ui'+import { Input, Label_Shadcn_ } from 'ui'export default function CopyFormLabels() {return (@@ -9,7 +9,7 @@ export default function CopyFormLabels() {<span className="text-xs text-foreground-muted">Bad Example</span><div className="grid w-full items-center gap-1.5"><Label_Shadcn_ htmlFor="table-name-bad">Name your table</Label_Shadcn_>- <Input_Shadcn_ id="table-name-bad" placeholder="my_table" />+ <Input id="table-name-bad" placeholder="my_table" /><p className="text-sm text-muted-foreground">This field allows you to specify a name for your table using letters, numbers, andunderscores@@ -20,7 +20,7 @@ export default function CopyFormLabels() {<span className="text-xs text-foreground-muted">Good Example</span><div className="grid w-full items-center gap-1.5"><Label_Shadcn_ htmlFor="table-name-good">Table name</Label_Shadcn_>- <Input_Shadcn_ id="table-name-good" placeholder="my_table" />+ <Input id="table-name-good" placeholder="my_table" /><p className="text-sm text-muted-foreground">Letters, numbers, and underscores only</p></div></div>diff --git a/apps/design-system/registry/default/example/data-table-demo.tsx b/apps/design-system/registry/default/example/data-table-demo.tsxindex 101cc81af01..76f51dcfc8c 100644--- a/apps/design-system/registry/default/example/data-table-demo.tsx+++ b/apps/design-system/registry/default/example/data-table-demo.tsx@@ -24,7 +24,7 @@ import {DropdownMenuItem,DropdownMenuSeparator,DropdownMenuTrigger,- Input_Shadcn_ as Input,+ Input,Table,TableBody,TableCell,diff --git a/apps/design-system/registry/default/example/dialog-centered-off.tsx b/apps/design-system/registry/default/example/dialog-centered-off.tsxindex fd32ad1d7a4..4eebdb01864 100644--- a/apps/design-system/registry/default/example/dialog-centered-off.tsx+++ b/apps/design-system/registry/default/example/dialog-centered-off.tsx@@ -9,7 +9,7 @@ import {DialogSectionSeparator,DialogTitle,DialogTrigger,- Input_Shadcn_,+ Input,Label_Shadcn_,} from 'ui'@@ -30,13 +30,13 @@ export default function DialogDemo() {<Label_Shadcn_ htmlFor="name" className="text-right">Name</Label_Shadcn_>- <Input_Shadcn_ id="name" defaultValue="Pedro Duarte" className="col-span-3" />+ <Input id="name" defaultValue="Pedro Duarte" className="col-span-3" /></div><div><Label_Shadcn_ htmlFor="username" className="text-right">Username</Label_Shadcn_>- <Input_Shadcn_ id="username" defaultValue="@peduarte" className="col-span-3" />+ <Input id="username" defaultValue="@peduarte" className="col-span-3" /></div></DialogSection><DialogFooter>diff --git a/apps/design-system/registry/default/example/dialog-close-button.tsx b/apps/design-system/registry/default/example/dialog-close-button.tsxindex 3f6ab6ef78f..75f38062567 100644--- a/apps/design-system/registry/default/example/dialog-close-button.tsx+++ b/apps/design-system/registry/default/example/dialog-close-button.tsx@@ -11,7 +11,7 @@ import {DialogSectionSeparator,DialogTitle,DialogTrigger,- Input_Shadcn_,+ Input,Label_Shadcn_,} from 'ui'@@ -33,11 +33,7 @@ export default function DialogCloseButton() {<Label_Shadcn_ htmlFor="link" className="sr-only">Link</Label_Shadcn_>- <Input_Shadcn_- id="link"- defaultValue="https://ui.shadcn.com/docs/installation"- readOnly- />+ <Input id="link" defaultValue="https://ui.shadcn.com/docs/installation" readOnly /></div><Button htmlType="submit" size="small" type="secondary" className="px-3"><span className="sr-only">Copy</span>diff --git a/apps/design-system/registry/default/example/dialog-demo.tsx b/apps/design-system/registry/default/example/dialog-demo.tsxindex fdf72b42dc7..2b7afecd9c7 100644--- a/apps/design-system/registry/default/example/dialog-demo.tsx+++ b/apps/design-system/registry/default/example/dialog-demo.tsx@@ -9,7 +9,7 @@ import {DialogSectionSeparator,DialogTitle,DialogTrigger,- Input_Shadcn_,+ Input,Label_Shadcn_,} from 'ui'@@ -28,11 +28,11 @@ export default function DialogDemo() {<DialogSection className="space-y-4"><div><Label_Shadcn_ htmlFor="name">Name</Label_Shadcn_>- <Input_Shadcn_ id="name" defaultValue="Pedro Duarte" />+ <Input id="name" defaultValue="Pedro Duarte" /></div><div><Label_Shadcn_ htmlFor="username">Username</Label_Shadcn_>- <Input_Shadcn_ id="username" defaultValue="@peduarte" />+ <Input id="username" defaultValue="@peduarte" /></div></DialogSection><DialogFooter>diff --git a/apps/design-system/registry/default/example/drawer-dialog.tsx b/apps/design-system/registry/default/example/drawer-dialog.tsxindex 86ff1e05a95..510f8ad9570 100644--- a/apps/design-system/registry/default/example/drawer-dialog.tsx+++ b/apps/design-system/registry/default/example/drawer-dialog.tsx@@ -17,7 +17,7 @@ import {DrawerHeader,DrawerTitle,DrawerTrigger,- Input_Shadcn_,+ Input,Label_Shadcn_,} from 'ui'@@ -75,11 +75,11 @@ function ProfileForm({ className }: React.ComponentProps<'form'>) {<form className={cn('grid items-start gap-4', className)}><div className="grid gap-2"><Label_Shadcn_ htmlFor="email">Email</Label_Shadcn_>- <Input_Shadcn_ type="email" id="email" defaultValue="[email protected]" />+ <Input type="email" id="email" defaultValue="[email protected]" /></div><div className="grid gap-2"><Label_Shadcn_ htmlFor="username">Username</Label_Shadcn_>- <Input_Shadcn_ id="username" defaultValue="@shadcn" />+ <Input id="username" defaultValue="@shadcn" /></div><Button htmlType="submit">Save changes</Button></form>diff --git a/apps/design-system/registry/default/example/field-demo.tsx b/apps/design-system/registry/default/example/field-demo.tsxindex 5f8f48dfda2..09fe7a26a82 100644--- a/apps/design-system/registry/default/example/field-demo.tsx+++ b/apps/design-system/registry/default/example/field-demo.tsx@@ -1,4 +1,4 @@-import { Button, Checkbox, Input_Shadcn_ as Input, Textarea } from 'ui'+import { Button, Checkbox, Input, Textarea } from 'ui'import {Field,FieldDescription,diff --git a/apps/design-system/registry/default/example/field-fieldset.tsx b/apps/design-system/registry/default/example/field-fieldset.tsxindex 1b5f996c8ba..a91c1d4d86e 100644--- a/apps/design-system/registry/default/example/field-fieldset.tsx+++ b/apps/design-system/registry/default/example/field-fieldset.tsx@@ -1,4 +1,4 @@-import { Input_Shadcn_ as Input } from 'ui'+import { Input } from 'ui'import {Field,FieldDescription,diff --git a/apps/design-system/registry/default/example/field-input.tsx b/apps/design-system/registry/default/example/field-input.tsxindex 56089935bf9..17eee8e9b2b 100644--- a/apps/design-system/registry/default/example/field-input.tsx+++ b/apps/design-system/registry/default/example/field-input.tsx@@ -1,4 +1,4 @@-import { Input_Shadcn_ as Input } from 'ui'+import { Input } from 'ui'import {Field,FieldDescription,diff --git a/apps/design-system/registry/default/example/field-responsive.tsx b/apps/design-system/registry/default/example/field-responsive.tsxindex 96ea6b17989..1f00b1a2835 100644--- a/apps/design-system/registry/default/example/field-responsive.tsx+++ b/apps/design-system/registry/default/example/field-responsive.tsx@@ -1,4 +1,4 @@-import { Button, Input_Shadcn_ as Input, Textarea } from 'ui'+import { Button, Input, Textarea } from 'ui'import {Field,FieldContent,diff --git a/apps/design-system/registry/default/example/form-patterns-pagelayout.tsx b/apps/design-system/registry/default/example/form-patterns-pagelayout.tsxindex 0fdddbf9f0b..3637afc32c3 100644--- a/apps/design-system/registry/default/example/form-patterns-pagelayout.tsx+++ b/apps/design-system/registry/default/example/form-patterns-pagelayout.tsx@@ -15,7 +15,7 @@ import {FormField,FormInputGroupInput,FormInputGroupTextArea,- Input_Shadcn_,+ Input,InputGroup,InputGroupAddon,InputGroupText,@@ -32,7 +32,7 @@ import {Switch,Textarea,} from 'ui'-import { Input } from 'ui-patterns/DataInputs/Input'+import { Input as PasswordInput } from 'ui-patterns/DataInputs/Input'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { KeyValueFieldArray } from 'ui-patterns/form/KeyValueFieldArray/KeyValueFieldArray'import { getKeyValueFieldArrayValidationIssues } from 'ui-patterns/form/KeyValueFieldArray/validation'@@ -148,7 +148,7 @@ export default function FormPatternsPageLayout() {description="Single-line text entry for short values"><FormControl>- <Input_Shadcn_ {...field} placeholder="Enter text" />+ <Input {...field} placeholder="Enter text" /></FormControl></FormItemLayout>)}@@ -167,7 +167,7 @@ export default function FormPatternsPageLayout() {description="Masked input for secure text entry"><FormControl>- <Input_Shadcn_ {...field} type="password" placeholder="Enter password" />+ <Input {...field} type="password" placeholder="Enter password" /></FormControl></FormItemLayout>)}@@ -186,7 +186,7 @@ export default function FormPatternsPageLayout() {description="Read-only input with copy-to-clipboard functionality"><FormControl>- <Input+ <PasswordInputcopyreadOnlyvalue={form.getValues('apiKey') || ''}@@ -211,7 +211,7 @@ export default function FormPatternsPageLayout() {description="Numeric input with min/max validation"><FormControl>- <Input_Shadcn_+ <Input{...field}type="number"min={1}diff --git a/apps/design-system/registry/default/example/form-patterns-sidepanel.tsx b/apps/design-system/registry/default/example/form-patterns-sidepanel.tsxindex aa473f292be..f23464f886f 100644--- a/apps/design-system/registry/default/example/form-patterns-sidepanel.tsx+++ b/apps/design-system/registry/default/example/form-patterns-sidepanel.tsx@@ -11,7 +11,7 @@ import {FormControl,FormField,FormInputGroupInput,- Input_Shadcn_,+ Input,InputGroup,InputGroupAddon,InputGroupInput,@@ -36,7 +36,7 @@ import {Switch,Textarea,} from 'ui'-import { Input } from 'ui-patterns/DataInputs/Input'+import { Input as PasswordInput } from 'ui-patterns/DataInputs/Input'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { KeyValueFieldArray } from 'ui-patterns/form/KeyValueFieldArray/KeyValueFieldArray'import { getKeyValueFieldArrayValidationIssues } from 'ui-patterns/form/KeyValueFieldArray/validation'@@ -153,7 +153,7 @@ export default function FormPatternsSidePanel() {description="Single-line text entry for short values"><FormControl className="col-span-6">- <Input_Shadcn_ {...field} placeholder="Enter text" />+ <Input {...field} placeholder="Enter text" /></FormControl></FormItemLayout>)}@@ -174,7 +174,7 @@ export default function FormPatternsSidePanel() {description="Masked input for secure text entry"><FormControl className="col-span-6">- <Input_Shadcn_ {...field} type="password" placeholder="Enter password" />+ <Input {...field} type="password" placeholder="Enter password" /></FormControl></FormItemLayout>)}@@ -195,7 +195,7 @@ export default function FormPatternsSidePanel() {description="Read-only input with copy-to-clipboard functionality"><FormControl className="col-span-6">- <Input+ <PasswordInputcopyreadOnlyclassName="input-mono"@@ -223,7 +223,7 @@ export default function FormPatternsSidePanel() {description="Numeric input with min/max validation"><FormControl className="col-span-6">- <Input_Shadcn_+ <Input{...field}type="number"min={1}diff --git a/apps/design-system/registry/default/example/input-demo.tsx b/apps/design-system/registry/default/example/input-demo.tsxindex ed8cf4c24b2..85898d90675 100644--- a/apps/design-system/registry/default/example/input-demo.tsx+++ b/apps/design-system/registry/default/example/input-demo.tsx@@ -1,5 +1,5 @@-import { Input_Shadcn_ } from 'ui'+import { Input } from 'ui'export default function InputDemo() {- return <Input_Shadcn_ type="email" placeholder="Email" />+ return <Input type="email" placeholder="Email" />}diff --git a/apps/design-system/registry/default/example/input-disabled.tsx b/apps/design-system/registry/default/example/input-disabled.tsxindex 8878a3afb8a..47ed662a07b 100644--- a/apps/design-system/registry/default/example/input-disabled.tsx+++ b/apps/design-system/registry/default/example/input-disabled.tsx@@ -1,5 +1,5 @@-import { Input_Shadcn_ } from 'ui'+import { Input } from 'ui'export default function InputDisabled() {- return <Input_Shadcn_ disabled type="email" placeholder="Email" />+ return <Input disabled type="email" placeholder="Email" />}diff --git a/apps/design-system/registry/default/example/input-file.tsx b/apps/design-system/registry/default/example/input-file.tsxindex f1ef74fd14b..deea0ce033b 100644--- a/apps/design-system/registry/default/example/input-file.tsx+++ b/apps/design-system/registry/default/example/input-file.tsx@@ -1,10 +1,10 @@-import { Input_Shadcn_, Label_Shadcn_ } from 'ui'+import { Input, Label_Shadcn_ } from 'ui'export default function InputFile() {return (<div className="grid w-full max-w-sm items-center gap-1.5"><Label_Shadcn_ htmlFor="picture">Picture</Label_Shadcn_>- <Input_Shadcn_ id="picture" type="file" />+ <Input id="picture" type="file" /></div>)}diff --git a/apps/design-system/registry/default/example/input-form.tsx b/apps/design-system/registry/default/example/input-form.tsxindex 537d632c9f8..d0d229600d6 100644--- a/apps/design-system/registry/default/example/input-form.tsx+++ b/apps/design-system/registry/default/example/input-form.tsx@@ -12,7 +12,7 @@ import {FormItem,FormLabel,FormMessage,- Input_Shadcn_ as Input,+ Input,} from 'ui'import { z } from 'zod'diff --git a/apps/design-system/registry/default/example/input-with-button.tsx b/apps/design-system/registry/default/example/input-with-button.tsxindex 376eca1de3f..739d2f0ea19 100644--- a/apps/design-system/registry/default/example/input-with-button.tsx+++ b/apps/design-system/registry/default/example/input-with-button.tsx@@ -1,9 +1,9 @@-import { Button, Input_Shadcn_ } from 'ui'+import { Button, Input } from 'ui'export default function InputWithButton() {return (<div className="flex w-full max-w-sm items-center space-x-2">- <Input_Shadcn_ type="email" placeholder="Email" />+ <Input type="email" placeholder="Email" /><Button htmlType="submit" type="secondary">Subscribe</Button>diff --git a/apps/design-system/registry/default/example/input-with-label.tsx b/apps/design-system/registry/default/example/input-with-label.tsxindex c9f0ea60256..2314f094b45 100644--- a/apps/design-system/registry/default/example/input-with-label.tsx+++ b/apps/design-system/registry/default/example/input-with-label.tsx@@ -1,10 +1,10 @@-import { Input_Shadcn_, Label_Shadcn_ } from 'ui'+import { Input, Label_Shadcn_ } from 'ui'export default function InputWithLabel() {return (<div className="grid w-full max-w-sm items-center gap-1.5"><Label_Shadcn_ htmlFor="email">Email</Label_Shadcn_>- <Input_Shadcn_ type="email" id="email" placeholder="Email" />+ <Input type="email" id="email" placeholder="Email" /></div>)}diff --git a/apps/design-system/registry/default/example/input-with-text.tsx b/apps/design-system/registry/default/example/input-with-text.tsxindex d401e2de140..db1647b5e8a 100644--- a/apps/design-system/registry/default/example/input-with-text.tsx+++ b/apps/design-system/registry/default/example/input-with-text.tsx@@ -1,10 +1,10 @@-import { Input_Shadcn_, Label_Shadcn_ } from 'ui'+import { Input, Label_Shadcn_ } from 'ui'export default function InputWithText() {return (<div className="grid w-full max-w-sm items-center gap-1.5"><Label_Shadcn_ htmlFor="email-2">Email</Label_Shadcn_>- <Input_Shadcn_ type="email" id="email-2" placeholder="Email" />+ <Input type="email" id="email-2" placeholder="Email" /><p className="text-sm text-muted-foreground">Enter your email address.</p></div>)diff --git a/apps/design-system/registry/default/example/popover-demo.tsx b/apps/design-system/registry/default/example/popover-demo.tsxindex ac0e3615728..63674f67373 100644--- a/apps/design-system/registry/default/example/popover-demo.tsx+++ b/apps/design-system/registry/default/example/popover-demo.tsx@@ -1,6 +1,6 @@import {Button,- Input_Shadcn_,+ Input,Label_Shadcn_,Popover_Shadcn_,PopoverContent_Shadcn_,@@ -22,19 +22,19 @@ export default function PopoverDemo() {<div className="grid gap-2"><div className="grid grid-cols-3 items-center gap-4"><Label_Shadcn_ htmlFor="width">Width</Label_Shadcn_>- <Input_Shadcn_ id="width" defaultValue="100%" className="col-span-2 h-8" />+ <Input id="width" defaultValue="100%" className="col-span-2 h-8" /></div><div className="grid grid-cols-3 items-center gap-4"><Label_Shadcn_ htmlFor="maxWidth">Max. width</Label_Shadcn_>- <Input_Shadcn_ id="maxWidth" defaultValue="300px" className="col-span-2 h-8" />+ <Input id="maxWidth" defaultValue="300px" className="col-span-2 h-8" /></div><div className="grid grid-cols-3 items-center gap-4"><Label_Shadcn_ htmlFor="height">Height</Label_Shadcn_>- <Input_Shadcn_ id="height" defaultValue="25px" className="col-span-2 h-8" />+ <Input id="height" defaultValue="25px" className="col-span-2 h-8" /></div><div className="grid grid-cols-3 items-center gap-4"><Label_Shadcn_ htmlFor="maxHeight">Max. height</Label_Shadcn_>- <Input_Shadcn_ id="maxHeight" defaultValue="none" className="col-span-2 h-8" />+ <Input id="maxHeight" defaultValue="none" className="col-span-2 h-8" /></div></div></div>diff --git a/apps/design-system/registry/default/example/sheet-confirm-on-close-demo.tsx b/apps/design-system/registry/default/example/sheet-confirm-on-close-demo.tsxindex a82d115797a..c094056059e 100644--- a/apps/design-system/registry/default/example/sheet-confirm-on-close-demo.tsx+++ b/apps/design-system/registry/default/example/sheet-confirm-on-close-demo.tsx@@ -9,7 +9,7 @@ import {AlertDialogHeader,AlertDialogTitle,Button,- Input_Shadcn_ as Input,+ Input,Label_Shadcn_ as Label,Separator,Sheet,diff --git a/apps/design-system/registry/default/example/sheet-demo.tsx b/apps/design-system/registry/default/example/sheet-demo.tsxindex 1c2b7d48604..fd32457cb5b 100644--- a/apps/design-system/registry/default/example/sheet-demo.tsx+++ b/apps/design-system/registry/default/example/sheet-demo.tsx@@ -1,6 +1,6 @@import {Button,- Input_Shadcn_,+ Input,Label_Shadcn_,Sheet,SheetClose,@@ -31,13 +31,13 @@ export default function SheetDemo() {<Label_Shadcn_ htmlFor="name" className="text-right">Name</Label_Shadcn_>- <Input_Shadcn_ id="name" value="Pedro Duarte" className="col-span-3" readOnly />+ <Input id="name" value="Pedro Duarte" className="col-span-3" readOnly /></div><div className="grid grid-cols-4 items-center gap-4"><Label_Shadcn_ htmlFor="username" className="text-right">Username</Label_Shadcn_>- <Input_Shadcn_ id="username" value="@peduarte" className="col-span-3" readOnly />+ <Input id="username" value="@peduarte" className="col-span-3" readOnly /></div></div></SheetSection>diff --git a/apps/design-system/registry/default/example/sheet-side.tsx b/apps/design-system/registry/default/example/sheet-side.tsxindex bf2307665d5..220db223d84 100644--- a/apps/design-system/registry/default/example/sheet-side.tsx+++ b/apps/design-system/registry/default/example/sheet-side.tsx@@ -2,7 +2,7 @@import {Button,- Input_Shadcn_,+ Input,Label_Shadcn_,Sheet,SheetClose,@@ -38,13 +38,13 @@ export default function SheetSide() {<Label_Shadcn_ htmlFor="name" className="text-right">Name</Label_Shadcn_>- <Input_Shadcn_ id="name" value="Pedro Duarte" className="col-span-3" />+ <Input id="name" value="Pedro Duarte" className="col-span-3" /></div><div className="grid grid-cols-4 items-center gap-4"><Label_Shadcn_ htmlFor="username" className="text-right">Username</Label_Shadcn_>- <Input_Shadcn_ id="username" value="@peduarte" className="col-span-3" />+ <Input id="username" value="@peduarte" className="col-span-3" /></div></div><SheetFooter>diff --git a/apps/design-system/registry/default/example/tabs-demo.tsx b/apps/design-system/registry/default/example/tabs-demo.tsxindex cd443b6c96f..3568b8ef461 100644--- a/apps/design-system/registry/default/example/tabs-demo.tsx+++ b/apps/design-system/registry/default/example/tabs-demo.tsx@@ -6,7 +6,7 @@ import {CardFooter,CardHeader,CardTitle,- Input_Shadcn_,+ Input,Label_Shadcn_,Tabs_Shadcn_,TabsContent_Shadcn_,@@ -32,11 +32,11 @@ export default function TabsDemo() {<CardContent className="space-y-2"><div className="space-y-1"><Label_Shadcn_ htmlFor="name">Name</Label_Shadcn_>- <Input_Shadcn_ id="name" defaultValue="Pedro Duarte" />+ <Input id="name" defaultValue="Pedro Duarte" /></div><div className="space-y-1"><Label_Shadcn_ htmlFor="username">Username</Label_Shadcn_>- <Input_Shadcn_ id="username" defaultValue="@peduarte" />+ <Input id="username" defaultValue="@peduarte" /></div></CardContent><CardFooter>@@ -55,11 +55,11 @@ export default function TabsDemo() {<CardContent className="space-y-2"><div className="space-y-1"><Label_Shadcn_ htmlFor="current">Current password</Label_Shadcn_>- <Input_Shadcn_ id="current" type="password" />+ <Input id="current" type="password" /></div><div className="space-y-1"><Label_Shadcn_ htmlFor="new">New password</Label_Shadcn_>- <Input_Shadcn_ id="new" type="password" />+ <Input id="new" type="password" /></div></CardContent><CardFooter>diff --git a/apps/docs/components/ApiSchemaOption.tsx b/apps/docs/components/ApiSchemaOption.tsxindex e4107495b27..869506e6d9a 100644--- a/apps/docs/components/ApiSchemaOption.tsx+++ b/apps/docs/components/ApiSchemaOption.tsx@@ -1,6 +1,6 @@import { XCircle } from 'lucide-react'import { type FC, type PropsWithChildren, useState } from 'react'-import { CollapsibleContent_Shadcn_, CollapsibleTrigger_Shadcn_, Collapsible_Shadcn_, cn } from 'ui'+import { CollapsibleContent, CollapsibleTrigger, Collapsible, cn } from 'ui'import ApiSchema from '~/components/ApiSchema'interface IOptions {@@ -16,8 +16,8 @@ type OptionsSubComponents = {const ApiSchemaOptions: FC<PropsWithChildren<IOptions>> & OptionsSubComponents = (props) => {const [open, setOpen] = useState(false)return (- <Collapsible_Shadcn_ open={open} onOpenChange={setOpen} className="mt-0">- <CollapsibleTrigger_Shadcn_ asChild>+ <Collapsible open={open} onOpenChange={setOpen} className="mt-0">+ <CollapsibleTrigger asChild><buttonclassName={cn('px-5',@@ -31,9 +31,9 @@ const ApiSchemaOptions: FC<PropsWithChildren<IOptions>> & OptionsSubComponents =<XCircle size={14} className={open ? '' : 'rotate-45'} />{`${!open ? `Open` : `Close`} ${props.name ?? 'object schema'}`}</button>- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_>{props.children}</CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleTrigger>+ <CollapsibleContent>{props.children}</CollapsibleContent>+ </Collapsible>)}diff --git a/apps/docs/components/AppleSecretGenerator/AppleSecretGenerator.tsx b/apps/docs/components/AppleSecretGenerator/AppleSecretGenerator.tsxindex aeb45ed4bb8..4f6e3145131 100644--- a/apps/docs/components/AppleSecretGenerator/AppleSecretGenerator.tsx+++ b/apps/docs/components/AppleSecretGenerator/AppleSecretGenerator.tsx@@ -1,5 +1,5 @@import { useState } from 'react'-import { Button, Input_Shadcn_ as Input } from 'ui'+import { Button, Input } from 'ui'import { Admonition } from 'ui-patterns/admonition'import { Input as DataInput } from 'ui-patterns/DataInputs/Input'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'diff --git a/apps/docs/components/Extensions/Extensions.tsx b/apps/docs/components/Extensions/Extensions.tsxindex 2d09841d758..c9a3c201d5e 100644--- a/apps/docs/components/Extensions/Extensions.tsx+++ b/apps/docs/components/Extensions/Extensions.tsx@@ -2,7 +2,7 @@ import { X } from 'lucide-react'import Link from 'next/link'import React, { useState } from 'react'import { extensions } from 'shared-data'-import { Badge, Input_Shadcn_ as Input } from 'ui'+import { Badge, Input } from 'ui'import { GlassPanel } from 'ui-patterns/GlassPanel'type Extension = {diff --git a/apps/docs/components/Feedback/FeedbackModal.tsx b/apps/docs/components/Feedback/FeedbackModal.tsxindex 18fc711bf03..8667fff80ff 100644--- a/apps/docs/components/Feedback/FeedbackModal.tsx+++ b/apps/docs/components/Feedback/FeedbackModal.tsx@@ -1,6 +1,6 @@import { zodResolver } from '@hookform/resolvers/zod'import { SubmitHandler, useForm } from 'react-hook-form'-import { Button, Form, FormControl, FormField, Input_Shadcn_, Modal, Textarea } from 'ui'+import { Button, Form, FormControl, FormField, Input, Modal, Textarea } from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import * as z from 'zod'@@ -55,7 +55,7 @@ function FeedbackModal({ visible, page, onCancel, onSubmit }: FeedbackModalPropsrender={({ field }) => (<FormItemLayout layout="vertical" label="Title"><FormControl className="col-span-6">- <Input_Shadcn_ {...field} />+ <Input {...field} /></FormControl></FormItemLayout>)}diff --git a/apps/docs/components/ProjectConfigVariables/ProjectConfigVariables.tsx b/apps/docs/components/ProjectConfigVariables/ProjectConfigVariables.tsxindex ff60b0eca6b..2d3e35735ca 100644--- a/apps/docs/components/ProjectConfigVariables/ProjectConfigVariables.tsx+++ b/apps/docs/components/ProjectConfigVariables/ProjectConfigVariables.tsx@@ -1,25 +1,14 @@'use client'+import {+ ComboBox,+ ComboBoxOption,+} from '~/components/ProjectConfigVariables/ProjectConfigVariables.ComboBox'import type {Branch,Org,Variable,} from '~/components/ProjectConfigVariables/ProjectConfigVariables.utils'--import { Check, Copy } from 'lucide-react'-import Link from 'next/link'-import { useEffect, useMemo, useState } from 'react'-import CopyToClipboard from 'react-copy-to-clipboard'-import { withErrorBoundary } from 'react-error-boundary'-import { proxy, useSnapshot } from 'valtio'--import { LOCAL_STORAGE_KEYS, useIsLoggedIn, useIsUserLoading } from 'common'-import { Button_Shadcn_ as Button, cn, Input_Shadcn_ as Input } from 'ui'--import {- ComboBox,- ComboBoxOption,-} from '~/components/ProjectConfigVariables/ProjectConfigVariables.ComboBox'import {fromBranchValue,fromOrgProjectValue,@@ -41,6 +30,14 @@ import {} from '~/lib/fetch/projects-infinite'import { retrieve, storeOrRemoveNull } from '~/lib/storage'import { useOnLogout } from '~/lib/userAuth'+import { LOCAL_STORAGE_KEYS, useIsLoggedIn, useIsUserLoading } from 'common'+import { Check, Copy } from 'lucide-react'+import Link from 'next/link'+import { useEffect, useMemo, useState } from 'react'+import CopyToClipboard from 'react-copy-to-clipboard'+import { withErrorBoundary } from 'react-error-boundary'+import { Button_Shadcn_ as Button, cn, Input } from 'ui'+import { proxy, useSnapshot } from 'valtio'type ProjectOrgDataState =| 'userLoading'diff --git a/apps/docs/components/RealtimeLimitsEstimator/RealtimeLimitsEstimator.tsx b/apps/docs/components/RealtimeLimitsEstimator/RealtimeLimitsEstimator.tsxindex 6546754dab7..f9cdaa45bd2 100644--- a/apps/docs/components/RealtimeLimitsEstimator/RealtimeLimitsEstimator.tsx+++ b/apps/docs/components/RealtimeLimitsEstimator/RealtimeLimitsEstimator.tsx@@ -3,9 +3,9 @@ import { ChevronDown } from 'lucide-react'import { useState } from 'react'import {Button,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,+ Collapsible,+ CollapsibleContent,+ CollapsibleTrigger,Label_Shadcn_,Select_Shadcn_,SelectContent_Shadcn_,@@ -153,8 +153,8 @@ export default function RealtimeLimitsEstimater({}) {</div>)}- <Collapsible_Shadcn_ open={expandPreview} onOpenChange={setExpandPreview}>- <CollapsibleTrigger_Shadcn_ asChild>+ <Collapsible open={expandPreview} onOpenChange={setExpandPreview}>+ <CollapsibleTrigger asChild><div className="py-1 flex items-center"><p className="text-sm">View raw throughput table</p><Button@@ -170,8 +170,8 @@ export default function RealtimeLimitsEstimater({}) {onClick={() => setExpandPreview(!expandPreview)}/></div>- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_>+ </CollapsibleTrigger>+ <CollapsibleContent><div>{throughputTable.map((l) => l.computeAddOn)@@ -220,8 +220,8 @@ export default function RealtimeLimitsEstimater({}) {</div>))}</div>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible></div>)}diff --git a/apps/docs/features/docs/Reference.introduction.tsx b/apps/docs/features/docs/Reference.introduction.tsxindex 5ccb90e47c3..e20f7ceb322 100644--- a/apps/docs/features/docs/Reference.introduction.tsx+++ b/apps/docs/features/docs/Reference.introduction.tsx@@ -1,11 +1,9 @@-import { AlertTriangle } from 'lucide-react'-import Link from 'next/link'--import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_, cn } from 'ui'-import { getRefMarkdown, MDXRemoteRefs } from '~/features/docs/Reference.mdx'import { ReferenceSectionWrapper } from '~/features/docs/Reference.ui.client'import commonClientLibSections from '~/spec/common-client-libs-sections.json' with { type: 'json' }+import { AlertTriangle } from 'lucide-react'+import Link from 'next/link'+import { Alert, AlertDescription, AlertTitle, cn } from 'ui'function hasIntro(sections: typeof commonClientLibSections, excludeName?: string) {return Boolean(@@ -54,16 +52,16 @@ export async function ClientLibIntroduction({export function OldVersionAlert({ libPath, className }: { libPath: string; className?: string }) {return (- <Alert_Shadcn_ variant="warning" className={cn('not-prose', className)}>+ <Alert variant="warning" className={cn('not-prose', className)}><AlertTriangle />- <AlertTitle_Shadcn_ className="font-medium">Version out of date</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle className="font-medium">Version out of date</AlertTitle>+ <AlertDescription>There's a newer version of this library! Migrate to the{' '}<Link href={`/reference/${libPath}`} className="underline underline-offset-2">newest version</Link>.- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}diff --git a/apps/docs/features/docs/Reference.ui.tsx b/apps/docs/features/docs/Reference.ui.tsxindex de99a59c96b..2cac82a4c0c 100644--- a/apps/docs/features/docs/Reference.ui.tsx+++ b/apps/docs/features/docs/Reference.ui.tsx@@ -14,13 +14,7 @@ import { isEqual } from 'lodash-es'import { ChevronRight, XCircle } from 'lucide-react'import type { HTMLAttributes, PropsWithChildren } from 'react'import ReactMarkdown from 'react-markdown'-import {- Badge,- cn,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,-} from 'ui'+import { Badge, cn, Collapsible, CollapsibleContent, CollapsibleTrigger } from 'ui'import { getTypeDisplayFromSchema, IApiEndPoint, type ISchema } from './Reference.api.utils'import { API_REFERENCE_REQUEST_BODY_SCHEMA_DATA_ATTRIBUTES } from './Reference.ui.shared'@@ -122,8 +116,8 @@ export function StickyHeader({ title, monoFont = false, className }: StickyHeadeexport function CollapsibleDetails({ title, content }: { title: string; content: string }) {return (- <Collapsible_Shadcn_>- <CollapsibleTrigger_Shadcn_+ <Collapsible>+ <CollapsibleTriggerclassName={cn('group','w-full h-8',@@ -138,8 +132,8 @@ export function CollapsibleDetails({ title, content }: { title: string; content:><ChevronRight size={12} className="group-data-open:rotate-90 transition-transform" />{title}- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_+ </CollapsibleTrigger>+ <CollapsibleContentclassName={cn('border border-default bg-surface-100 rounded-b','px-5 py-2',@@ -147,8 +141,8 @@ export function CollapsibleDetails({ title, content }: { title: string; content:)}><MDXRemoteRefs source={content} />- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible>)}@@ -281,8 +275,8 @@ function TypeSubDetails({defaultOpen?: boolean}) {return (- <Collapsible_Shadcn_ defaultOpen={defaultOpen}>- <CollapsibleTrigger_Shadcn_+ <Collapsible defaultOpen={defaultOpen}>+ <CollapsibleTriggerclassName={cn('group','w-fit rounded-full',@@ -306,8 +300,8 @@ function TypeSubDetails({)}/>Details- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_>+ </CollapsibleTrigger>+ <CollapsibleContent><ul className={cn('border-b border-x border-default', 'rounded-b-lg')}>{details.map((detail: SubContent | CustomTypePropertyType | TypeDetails, index: number) => (@@ -324,8 +318,8 @@ function TypeSubDetails({))}</ul>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible>)}@@ -500,8 +494,8 @@ export function ApiSchemaParamSubdetails({: []return (- <Collapsible_Shadcn_>- <CollapsibleTrigger_Shadcn_+ <Collapsible>+ <CollapsibleTriggerclassName={cn('group','w-fit rounded-full',@@ -533,8 +527,8 @@ export function ApiSchemaParamSubdetails({: schema.type === 'object'? 'Object schema': 'Details'}- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_>+ </CollapsibleTrigger>+ <CollapsibleContent>{'type' in schema && schema.type === 'object' ? (<div className={cn('border-b border-x border-fault', 'rounded-b-lg', 'p-5')}><ApiSchema schema={schema} />@@ -570,8 +564,8 @@ export function ApiSchemaParamSubdetails({))}</ul>)}- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible>)}diff --git a/apps/docs/features/docs/Troubleshooting.ui.client.tsx b/apps/docs/features/docs/Troubleshooting.ui.client.tsxindex 97c69ee4b5b..6d1eace163e 100644--- a/apps/docs/features/docs/Troubleshooting.ui.client.tsx+++ b/apps/docs/features/docs/Troubleshooting.ui.client.tsx@@ -1,20 +1,13 @@'use client'+import { useBreakpoint } from 'common'import { ChevronDown, RotateCw, Search, X } from 'lucide-react'import { useQueryStates } from 'nuqs'-import { useEffect, useRef, useState, Suspense, useCallback, useMemo } from 'react'--import { useBreakpoint } from 'common'-import {- Input_Shadcn_,- cn,- Button_Shadcn_,- Collapsible_Shadcn_ as Collapsible,- CollapsibleTrigger_Shadcn_ as CollapsibleTrigger,- CollapsibleContent_Shadcn_ as CollapsibleContent,-} from 'ui'-import ShimmeringLoader from 'ui-patterns/ShimmeringLoader'+import { Suspense, useCallback, useEffect, useMemo, useRef, useState } from 'react'+import { Button_Shadcn_, cn, Collapsible, CollapsibleContent, CollapsibleTrigger, Input } from 'ui'import { MultiSelector } from 'ui-patterns/multi-select'+import ShimmeringLoader from 'ui-patterns/ShimmeringLoader'+import { type ITroubleshootingMetadata } from './Troubleshooting.utils'import {TROUBLESHOOTING_CONTAINER_ID,@@ -251,7 +244,7 @@ function TroubleshootingFilterInternal({</MultiSelector.Content></MultiSelector><div className="relative">- <Input_Shadcn_+ <Inputid="troubleshooting-search"ref={searchInputRef}type="text"diff --git a/apps/learn/components/callout.tsx b/apps/learn/components/callout.tsxindex 63ed3afc9b8..371acf6b1e4 100644--- a/apps/learn/components/callout.tsx+++ b/apps/learn/components/callout.tsx@@ -1,4 +1,4 @@-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_ } from 'ui'+import { Alert, AlertDescription, AlertTitle } from 'ui'interface CalloutProps {icon?: string@@ -8,10 +8,10 @@ interface CalloutProps {export function Callout({ title, children, icon, ...props }: CalloutProps) {return (- <Alert_Shadcn_ {...props}>+ <Alert {...props}>{icon && <span className="mr-4 text-2xl">{icon}</span>}- {title && <AlertTitle_Shadcn_>{title}</AlertTitle_Shadcn_>}- <AlertDescription_Shadcn_>{children}</AlertDescription_Shadcn_>- </Alert_Shadcn_>+ {title && <AlertTitle>{title}</AlertTitle>}+ <AlertDescription>{children}</AlertDescription>+ </Alert>)}diff --git a/apps/lite-studio/app/routes/projects.$ref.tsx b/apps/lite-studio/app/routes/projects.$ref.tsxindex 44e2be70efa..093092cc0f3 100644--- a/apps/lite-studio/app/routes/projects.$ref.tsx+++ b/apps/lite-studio/app/routes/projects.$ref.tsx@@ -5,7 +5,7 @@ import {Button,Card,Checkbox,- Input_Shadcn_ as Input,+ Input,Label_Shadcn_ as Label,Separator,Switch,diff --git a/apps/studio/components/grid/components/header/filter/FilterRow.tsx b/apps/studio/components/grid/components/header/filter/FilterRow.tsxindex e19a0dc2b77..5d21c86bfd1 100644--- a/apps/studio/components/grid/components/header/filter/FilterRow.tsx+++ b/apps/studio/components/grid/components/header/filter/FilterRow.tsx@@ -1,6 +1,6 @@import { ChevronDown, X } from 'lucide-react'import { KeyboardEvent, memo } from 'react'-import { Button, Input_Shadcn_ as Input } from 'ui'+import { Button, Input } from 'ui'import { FilterOperatorOptions } from './Filter.constants'import { DropdownControl } from '@/components/grid/components/common/DropdownControl'diff --git a/apps/studio/components/interfaces/APIKeys/CreatePublishableAPIKeyDialog.tsx b/apps/studio/components/interfaces/APIKeys/CreatePublishableAPIKeyDialog.tsxindex f944dc7e54c..6fa3d38a5ab 100644--- a/apps/studio/components/interfaces/APIKeys/CreatePublishableAPIKeyDialog.tsx+++ b/apps/studio/components/interfaces/APIKeys/CreatePublishableAPIKeyDialog.tsx@@ -17,7 +17,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import * as z from 'zod'@@ -108,7 +108,7 @@ export const CreatePublishableAPIKeyDialog = () => {description="A short name of lowercase alphanumeric characters and underscore, must start with letter or underscore."><FormControl>- <Input_Shadcn_ {...field} />+ <Input {...field} /></FormControl></FormItemLayout>)}@@ -123,7 +123,7 @@ export const CreatePublishableAPIKeyDialog = () => {description="Provide a description about what this key is used for."><FormControl>- <Input_Shadcn_ {...field} placeholder="(Optional)" />+ <Input {...field} placeholder="(Optional)" /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/APIKeys/CreateSecretAPIKeyDialog.tsx b/apps/studio/components/interfaces/APIKeys/CreateSecretAPIKeyDialog.tsxindex 957354c08d8..e8364a7def2 100644--- a/apps/studio/components/interfaces/APIKeys/CreateSecretAPIKeyDialog.tsx+++ b/apps/studio/components/interfaces/APIKeys/CreateSecretAPIKeyDialog.tsx@@ -5,9 +5,9 @@ import { parseAsString, useQueryState } from 'nuqs'import { useForm, type SubmitHandler } from 'react-hook-form'import { toast } from 'sonner'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Button,Dialog,DialogContent,@@ -21,7 +21,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import * as z from 'zod'@@ -115,7 +115,7 @@ export const CreateSecretAPIKeyDialog = () => {description="A short, unique name of lowercased letters, digits and underscore"><FormControl>- <Input_Shadcn_ {...field} placeholder="Example: my_super_secret_key_123" />+ <Input {...field} placeholder="Example: my_super_secret_key_123" /></FormControl></FormItemLayout>)}@@ -127,7 +127,7 @@ export const CreateSecretAPIKeyDialog = () => {render={({ field }) => (<FormItemLayout label="Description" labelOptional="Optional"><FormControl>- <Input_Shadcn_+ <Input{...field}placeholder="Short notes on how or where this key will be used"/>@@ -137,10 +137,10 @@ export const CreateSecretAPIKeyDialog = () => {/></form></Form>- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><ShieldCheck />- <AlertTitle_Shadcn_>Securing your API key</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_ className="">+ <AlertTitle>Securing your API key</AlertTitle>+ <AlertDescription className=""><ul className="list-disc"><li>Keep this key secret.</li><li>Do not use on the web, in mobile or desktop apps.</li>@@ -156,8 +156,8 @@ export const CreateSecretAPIKeyDialog = () => {immediately.</li></ul>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert></DialogSection><DialogFooter><Button form={FORM_ID} htmlType="submit" loading={isCreatingAPIKey}>diff --git a/apps/studio/components/interfaces/Account/AccessTokens/AccessTokenNewBanner/TokenPermissionSection.tsx b/apps/studio/components/interfaces/Account/AccessTokens/AccessTokenNewBanner/TokenPermissionSection.tsxindex 991f0efd7dc..663e3f6fac4 100644--- a/apps/studio/components/interfaces/Account/AccessTokens/AccessTokenNewBanner/TokenPermissionSection.tsx+++ b/apps/studio/components/interfaces/Account/AccessTokens/AccessTokenNewBanner/TokenPermissionSection.tsx@@ -1,11 +1,6 @@import { ChevronDown, ChevronRight } from 'lucide-react'import { useState } from 'react'-import {- Button,- Collapsible_Shadcn_ as Collapsible,- CollapsibleContent_Shadcn_ as CollapsibleContent,- CollapsibleTrigger_Shadcn_ as CollapsibleTrigger,-} from 'ui'+import { Button, Collapsible, CollapsibleContent, CollapsibleTrigger } from 'ui'import { PermissionsList } from './PermissionList'diff --git a/apps/studio/components/interfaces/Account/AccessTokens/Classic/NewTokenDialog.tsx b/apps/studio/components/interfaces/Account/AccessTokens/Classic/NewTokenDialog.tsxindex 7183060262a..7e8327b1949 100644--- a/apps/studio/components/interfaces/Account/AccessTokens/Classic/NewTokenDialog.tsx+++ b/apps/studio/components/interfaces/Account/AccessTokens/Classic/NewTokenDialog.tsx@@ -16,7 +16,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,Select_Shadcn_,SelectContent_Shadcn_,SelectItem_Shadcn_,@@ -189,7 +189,7 @@ export const NewTokenDialog = ({render={({ field }) => (<FormItemLayout name="tokenName" label="Name"><FormControl>- <Input_Shadcn_+ <Inputid="tokenName"{...field}placeholder="Provide a name for your token"diff --git a/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/BasicInfo.tsx b/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/BasicInfo.tsxindex 529d5f8aa26..c323d62bd43 100644--- a/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/BasicInfo.tsx+++ b/apps/studio/components/interfaces/Account/AccessTokens/Scoped/Form/BasicInfo.tsx@@ -4,7 +4,7 @@ import { Control, ControllerRenderProps } from 'react-hook-form'import {FormControl,FormField,- Input_Shadcn_,+ Input,Select_Shadcn_,SelectContent_Shadcn_,SelectItem_Shadcn_,@@ -72,11 +72,7 @@ export const BasicInfo = ({render={({ field }) => (<FormItemLayout name="tokenName" label="Name"><FormControl>- <Input_Shadcn_- id="tokenName"- {...field}- placeholder="Provide a name for your token"- />+ <Input id="tokenName" {...field} placeholder="Provide a name for your token" /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Account/Preferences/AccountDeletion.tsx b/apps/studio/components/interfaces/Account/Preferences/AccountDeletion.tsxindex bad0ec5ace8..89f685d5820 100644--- a/apps/studio/components/interfaces/Account/Preferences/AccountDeletion.tsx+++ b/apps/studio/components/interfaces/Account/Preferences/AccountDeletion.tsx@@ -1,4 +1,4 @@-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_, CriticalIcon } from 'ui'+import { Alert, AlertDescription, AlertTitle, CriticalIcon } from 'ui'import {PageSection,PageSectionContent,@@ -22,18 +22,18 @@ export const AccountDeletion = () => {</PageSectionSummary></PageSectionMeta><PageSectionContent>- <Alert_Shadcn_ variant="destructive">+ <Alert variant="destructive"><CriticalIcon />- <AlertTitle_Shadcn_>Request for account deletion</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Request for account deletion</AlertTitle>+ <AlertDescription>Deleting your account is permanent and cannot be undone. Your data will be deletedwithin 30 days, but we may retain some metadata and logs for longer where required orpermitted by law.- </AlertDescription_Shadcn_>- <AlertDescription_Shadcn_ className="mt-3">+ </AlertDescription>+ <AlertDescription className="mt-3"><DeleteAccountButton />- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert></PageSectionContent></PageSection>)diff --git a/apps/studio/components/interfaces/Account/Preferences/ChangeEmailAddress.tsx b/apps/studio/components/interfaces/Account/Preferences/ChangeEmailAddress.tsxindex 906ad10b576..b7a1167d364 100644--- a/apps/studio/components/interfaces/Account/Preferences/ChangeEmailAddress.tsx+++ b/apps/studio/components/interfaces/Account/Preferences/ChangeEmailAddress.tsx@@ -3,15 +3,7 @@ import { zodResolver } from '@hookform/resolvers/zod'import { useRef, useState } from 'react'import { SubmitHandler, useForm } from 'react-hook-form'import { toast } from 'sonner'-import {- Button,- DialogFooter,- DialogSection,- Form,- FormControl,- FormField,- Input_Shadcn_,-} from 'ui'+import { Button, DialogFooter, DialogSection, Form, FormControl, FormField, Input } from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import * as z from 'zod'@@ -113,7 +105,7 @@ export const ChangeEmailAddressForm = ({ onClose }: { onClose: () => void }) =>description="A confirmation email will be sent to the provided email address"><FormControl>- <Input_Shadcn_ {...field} placeholder="[email protected]" />+ <Input {...field} placeholder="[email protected]" /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Account/Preferences/DeleteAccountButton.tsx b/apps/studio/components/interfaces/Account/Preferences/DeleteAccountButton.tsxindex 35de49e4eba..84e06cad8ed 100644--- a/apps/studio/components/interfaces/Account/Preferences/DeleteAccountButton.tsx+++ b/apps/studio/components/interfaces/Account/Preferences/DeleteAccountButton.tsx@@ -19,7 +19,7 @@ import {FormField,FormItem,FormLabel,- Input_Shadcn_,+ Input,Separator,} from 'ui'import * as z from 'zod'@@ -167,7 +167,7 @@ export const DeleteAccountButton = () => {confirm</FormLabel><FormControl>- <Input_Shadcn_+ <InputautoFocus{...field}autoComplete="off"diff --git a/apps/studio/components/interfaces/Account/Preferences/ProfileInformation.tsx b/apps/studio/components/interfaces/Account/Preferences/ProfileInformation.tsxindex a6890c2170e..82acd1b16cd 100644--- a/apps/studio/components/interfaces/Account/Preferences/ProfileInformation.tsx+++ b/apps/studio/components/interfaces/Account/Preferences/ProfileInformation.tsx@@ -10,7 +10,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,Select_Shadcn_,SelectContent_Shadcn_,SelectItem_Shadcn_,@@ -106,7 +106,7 @@ export const ProfileInformation = () => {render={({ field }) => (<FormItemLayout label="First name" layout="flex-row-reverse"><FormControl className="col-span-8">- <Input_Shadcn_ {...field} placeholder="First name" className="w-full" />+ <Input {...field} placeholder="First name" className="w-full" /></FormControl></FormItemLayout>)}@@ -119,7 +119,7 @@ export const ProfileInformation = () => {render={({ field }) => (<FormItemLayout label="Last name" layout="flex-row-reverse"><FormControl className="col-span-8">- <Input_Shadcn_ {...field} placeholder="Last name" className="w-full" />+ <Input {...field} placeholder="Last name" className="w-full" /></FormControl></FormItemLayout>)}@@ -180,7 +180,7 @@ export const ProfileInformation = () => {><FormControl className="col-span-8"><div className="flex flex-col gap-1">- <Input_Shadcn_+ <Input{...field}className="w-full"placeholder="Username"diff --git a/apps/studio/components/interfaces/Account/TOTPFactors/AddNewFactorModal.tsx b/apps/studio/components/interfaces/Account/TOTPFactors/AddNewFactorModal.tsxindex 2309ff0d0fd..b7ab33bf87e 100644--- a/apps/studio/components/interfaces/Account/TOTPFactors/AddNewFactorModal.tsx+++ b/apps/studio/components/interfaces/Account/TOTPFactors/AddNewFactorModal.tsx@@ -4,8 +4,8 @@ import { LOCAL_STORAGE_KEYS } from 'common'import { useEffect, useState } from 'react'import { useForm, type SubmitHandler } from 'react-hook-form'import { toast } from 'sonner'-import { Form, FormControl, FormField, Input_Shadcn_ } from 'ui'-import { Input } from 'ui-patterns/DataInputs/Input'+import { Form, FormControl, FormField, Input } from 'ui'+import { Input as PasswordInput } from 'ui-patterns/DataInputs/Input'import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'@@ -109,7 +109,7 @@ const FirstStep = ({ visible, isEnrolling, enroll, onClose }: FirstStepProps) =>description="A string will be randomly generated if a name is not provided"><FormControl>- <Input_Shadcn_ id="name" {...field} />+ <Input id="name" {...field} /></FormControl></FormItemLayout>)}@@ -230,7 +230,7 @@ const SecondStep = ({isReactForm={false}label="You can also enter this secret key into your authenticator app">- <Input copy disabled id="ref" size="small" value={factor.totp.secret} />+ <PasswordInput copy disabled id="ref" size="small" value={factor.totp.secret} /></FormItemLayout>}/>@@ -248,7 +248,7 @@ const SecondStep = ({render={({ field }) => (<FormItemLayout name="code" label="Authentication code"><FormControl>- <Input_Shadcn_+ <Inputid="code"autoFocus{...field}diff --git a/apps/studio/components/interfaces/Account/TOTPFactors/index.tsx b/apps/studio/components/interfaces/Account/TOTPFactors/index.tsxindex 4f52f530f84..98f1737f5af 100644--- a/apps/studio/components/interfaces/Account/TOTPFactors/index.tsx+++ b/apps/studio/components/interfaces/Account/TOTPFactors/index.tsx@@ -1,7 +1,7 @@import dayjs from 'dayjs'import { AlertCircle } from 'lucide-react'import { useState } from 'react'-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_, Button } from 'ui'+import { Alert, AlertDescription, AlertTitle, Button } from 'ui'import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'import { AddNewFactorModal } from './AddNewFactorModal'@@ -30,15 +30,15 @@ export const TOTPFactors = () => {{isSuccess && (<>{data.totp.length === 1 && (- <Alert_Shadcn_ variant="default" className="mb-2">+ <Alert variant="default" className="mb-2"><AlertCircle className="h-4 w-4" />- <AlertTitle_Shadcn_>+ <AlertTitle>We recommend configuring two authenticator apps across different devices- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_ className="flex flex-col gap-3">+ </AlertTitle>+ <AlertDescription className="flex flex-col gap-3">The two authenticator apps will serve as a backup for each other.- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}<div>{data.totp.map((factor) => {diff --git a/apps/studio/components/interfaces/Advisors/AdvisorRuleItem.tsx b/apps/studio/components/interfaces/Advisors/AdvisorRuleItem.tsxindex 62dbabdeb9d..b01066a5f65 100644--- a/apps/studio/components/interfaces/Advisors/AdvisorRuleItem.tsx+++ b/apps/studio/components/interfaces/Advisors/AdvisorRuleItem.tsx@@ -8,9 +8,9 @@ import {Card,CardContent,cn,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,+ Collapsible,+ CollapsibleContent,+ CollapsibleTrigger,} from 'ui'import { GenericSkeletonLoader } from 'ui-patterns'import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'@@ -98,7 +98,7 @@ export const AdvisorRuleItem = ({ lint }: AdvisorRuleItemProps) => {return (<>- <Collapsible_Shadcn_+ <Collapsibleid={lint.name}open={expandedLint === lint.name}onOpenChange={(open) => {@@ -106,7 +106,7 @@ export const AdvisorRuleItem = ({ lint }: AdvisorRuleItemProps) => {else setExpandedLint(undefined)}}>- <CollapsibleTrigger_Shadcn_ asChild className="[&[data-state=open]>div>svg]:rotate-90!">+ <CollapsibleTrigger asChild className="[&[data-state=open]>div>svg]:rotate-90!"><Card className="border-b-0 rounded-none"><CardContent className="py-3 flex items-center justify-between text-sm gap-4 cursor-pointer transition hover:bg-surface-200"><div className="flex items-center justify-center [&>svg]:text-foreground-lighter">@@ -135,8 +135,8 @@ export const AdvisorRuleItem = ({ lint }: AdvisorRuleItemProps) => {<ChevronRight strokeWidth={1.5} size={16} className="transition" /></CardContent></Card>- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_+ </CollapsibleTrigger>+ <CollapsibleContentclassName={cn('bg-surface border-x border-t rounded-none!',rules.length > 0 ? 'divide-y' : ''@@ -200,8 +200,8 @@ export const AdvisorRuleItem = ({ lint }: AdvisorRuleItemProps) => {)}</>)}- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible><CreateRuleSheet lint={lint} open={open} onOpenChange={setOpen} />diff --git a/apps/studio/components/interfaces/Advisors/CreateRuleSheet.tsx b/apps/studio/components/interfaces/Advisors/CreateRuleSheet.tsxindex 0eca4194689..eb7c3020b80 100644--- a/apps/studio/components/interfaces/Advisors/CreateRuleSheet.tsx+++ b/apps/studio/components/interfaces/Advisors/CreateRuleSheet.tsx@@ -22,7 +22,7 @@ import {SheetSection,SheetTitle,Switch,- TextArea_Shadcn_ as TextArea,+ TextArea,Tooltip,TooltipContent,TooltipTrigger,diff --git a/apps/studio/components/interfaces/ApiAuthorization/ApiAuthorization.Approved.tsx b/apps/studio/components/interfaces/ApiAuthorization/ApiAuthorization.Approved.tsxindex fb224229007..b2dd9fe93c5 100644--- a/apps/studio/components/interfaces/ApiAuthorization/ApiAuthorization.Approved.tsx+++ b/apps/studio/components/interfaces/ApiAuthorization/ApiAuthorization.Approved.tsx@@ -1,14 +1,6 @@import dayjs from 'dayjs'import type { ReactNode } from 'react'-import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,- Card,- CardContent,- CardHeader,- CheckIcon,-} from 'ui'+import { Alert, AlertDescription, AlertTitle, Card, CardContent, CardHeader, CheckIcon } from 'ui'import { AuthorizeRequesterDetails } from '@/components/interfaces/Organization/OAuthApps/AuthorizeRequesterDetails'import type { ApiAuthorizationResponse } from '@/data/api-authorization/api-authorization-query'@@ -27,10 +19,10 @@ export function ApiAuthorizationApprovedScreen({<Card><CardHeader>Authorize API access for {requester.name}</CardHeader><CardContent className="p-0">- <Alert_Shadcn_ className="border-0 rounded-t-none">+ <Alert className="border-0 rounded-t-none"><CheckIcon />- <AlertTitle_Shadcn_>This authorization request has been approved</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>This authorization request has been approved</AlertTitle>+ <AlertDescription><p>{requester.name} has been approved access to the organization "{organization?.name ?? 'Unknown'}" and all of its projects for the following scopes:@@ -45,8 +37,8 @@ export function ApiAuthorizationApprovedScreen({<p className="mt-2">Approved on: {dayjs(requester.approved_at).format('DD MMM YYYY HH:mm:ss (ZZ)')}</p>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert></CardContent></Card>)diff --git a/apps/studio/components/interfaces/ApiAuthorization/ApiAuthorization.Error.tsx b/apps/studio/components/interfaces/ApiAuthorization/ApiAuthorization.Error.tsxindex 4fbef36eefd..f52235cc76f 100644--- a/apps/studio/components/interfaces/ApiAuthorization/ApiAuthorization.Error.tsx+++ b/apps/studio/components/interfaces/ApiAuthorization/ApiAuthorization.Error.tsx@@ -1,13 +1,5 @@import type { ReactNode } from 'react'-import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,- Card,- CardContent,- CardHeader,- WarningIcon,-} from 'ui'+import { Alert, AlertDescription, AlertTitle, Card, CardContent, CardHeader, WarningIcon } from 'ui'import type { ResourceError } from '@/data/api-authorization/api-authorization-query'@@ -22,16 +14,14 @@ export function ApiAuthorizationErrorScreen({<Card><CardHeader>Authorize API access</CardHeader><CardContent className="p-0">- <Alert_Shadcn_ variant="warning" className="border-0 rounded-t-none">+ <Alert variant="warning" className="border-0 rounded-t-none"><WarningIcon />- <AlertTitle_Shadcn_>- Failed to fetch details for API authorization request- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Failed to fetch details for API authorization request</AlertTitle>+ <AlertDescription><p>Please retry your authorization request from the requesting app</p>{error && <p className="mt-2">Error: {error?.message}</p>}- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert></CardContent></Card>)diff --git a/apps/studio/components/interfaces/ApiAuthorization/ApiAuthorization.Form.tsx b/apps/studio/components/interfaces/ApiAuthorization/ApiAuthorization.Form.tsxindex 05d1497fc0c..7d19dc70279 100644--- a/apps/studio/components/interfaces/ApiAuthorization/ApiAuthorization.Form.tsx+++ b/apps/studio/components/interfaces/ApiAuthorization/ApiAuthorization.Form.tsx@@ -3,9 +3,9 @@ import Link from 'next/link'import { useMemo, type ReactNode } from 'react'import type { UseFormReturn } from 'react-hook-form'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Button,Card,CardContent,@@ -133,26 +133,26 @@ function FormShell({ title, children }: FormShellProps): ReactNode {function McpNotice(): ReactNode {return (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><WarningIcon />- <AlertTitle_Shadcn_>MCP Client Connection</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>MCP Client Connection</AlertTitle>+ <AlertDescription>This is an MCP (Model Context Protocol) client designed to connect with AI applications.Please ensure you trust this application before granting access to your organization's data.- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}function ExpiredNotice(): ReactNode {return (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><WarningIcon />- <AlertTitle_Shadcn_>This authorization request is expired</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>This authorization request is expired</AlertTitle>+ <AlertDescription>Please retry your authorization request from the requesting app- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}@@ -171,40 +171,40 @@ interface OrganizationsErrorNoticeProps {function OrganizationsErrorNotice({ error }: OrganizationsErrorNoticeProps): ReactNode {return (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><WarningIcon />- <AlertTitle_Shadcn_>There was an error loading your organizations</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>There was an error loading your organizations</AlertTitle>+ <AlertDescription>Please try again. If the problem persists, contact support.{error && <p className="mt-2">Error: {error.message}</p>}- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}function OrganizationsEmptyState(): ReactNode {return (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><WarningIcon />- <AlertTitle_Shadcn_>Organization is needed for installing an integration</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Organization is needed for installing an integration</AlertTitle>+ <AlertDescription>Your account isn't associated with any organizations. To use this integration, it must beinstalled within an organization. You'll be redirected to create an organization first.- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}function NotMemberOfOrganizationNotice(): ReactNode {return (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><WarningIcon />- <AlertTitle_Shadcn_>Organization is needed for installing an integration</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Organization is needed for installing an integration</AlertTitle>+ <AlertDescription>Your account is not a member of the pre-selected organization. To use this integration, itmust be installed within an organization your account is associated with.- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}diff --git a/apps/studio/components/interfaces/App/FeaturePreview/CLSPreview.tsx b/apps/studio/components/interfaces/App/FeaturePreview/CLSPreview.tsxindex 672f6bf0c6c..79908aa1ed4 100644--- a/apps/studio/components/interfaces/App/FeaturePreview/CLSPreview.tsx+++ b/apps/studio/components/interfaces/App/FeaturePreview/CLSPreview.tsx@@ -1,6 +1,6 @@import { useParams } from 'common'import Image from 'next/image'-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_, WarningIcon } from 'ui'+import { Alert, AlertDescription, AlertTitle, WarningIcon } from 'ui'import { Markdown } from '@/components/interfaces/Markdown'import { InlineLink } from '@/components/ui/InlineLink'@@ -23,18 +23,18 @@ export const CLSPreview = () => {className="text-foreground-light max-w-full"content={`This is an advanced feature and should be used with caution. Unless you have a very specific use case, we recommend just using [Row-Level Security](${DOCS_URL}${docsRowLevelSecurityGuidePath}).`}/>- <Alert_Shadcn_ variant="warning" className="mt-2">+ <Alert variant="warning" className="mt-2"><WarningIcon />- <AlertTitle_Shadcn_>+ <AlertTitle>Changes to column privileges will not be reflected in migrations when running{' '}<code className="text-code-inline">supabase db diff</code>.- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ </AlertTitle>+ <AlertDescription>Column privileges are not supported in the current version of the Supabase CLI.<br />You will need to manually apply these changes to your database.- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert></div><Imagesrc={`${BASE_PATH}/img/previews/cls-preview.png`}diff --git a/apps/studio/components/interfaces/AuditLogs/LogDetailsPanel.tsx b/apps/studio/components/interfaces/AuditLogs/LogDetailsPanel.tsxindex 803fc2dd8fb..488e5b7386d 100644--- a/apps/studio/components/interfaces/AuditLogs/LogDetailsPanel.tsx+++ b/apps/studio/components/interfaces/AuditLogs/LogDetailsPanel.tsx@@ -1,5 +1,5 @@import dayjs from 'dayjs'-import { Input_Shadcn_ as Input, SidePanel, TextArea_Shadcn_ as TextArea } from 'ui'+import { Input, SidePanel, TextArea } from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import {diff --git a/apps/studio/components/interfaces/Auth/AuthProvidersForm/AuthAlert.tsx b/apps/studio/components/interfaces/Auth/AuthProvidersForm/AuthAlert.tsxindex 83b84d4b1ca..15b6ca2c69c 100644--- a/apps/studio/components/interfaces/Auth/AuthProvidersForm/AuthAlert.tsx+++ b/apps/studio/components/interfaces/Auth/AuthProvidersForm/AuthAlert.tsx@@ -1,13 +1,7 @@import { useParams } from 'common'import { ExternalLink } from 'lucide-react'import Link from 'next/link'-import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,- Button,- WarningIcon,-} from 'ui'+import { Alert, AlertDescription, AlertTitle, Button, WarningIcon } from 'ui'import { DOCS_URL } from '@/lib/constants'@@ -24,10 +18,10 @@ export const AuthAlert = ({// TODO (KM): Remove after 10th October 2024 when we disable the providercase 'Slack (Deprecated)':return (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><WarningIcon />- <AlertTitle_Shadcn_>Slack (Deprecated) Provider</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Slack (Deprecated) Provider</AlertTitle>+ <AlertDescription>Recently, Slack has updated their OAuth API. Please use the new Slack (OIDC) providerbelow. Developers using this provider should move over to the new provider. Please referto our{' '}@@ -39,24 +33,24 @@ export const AuthAlert = ({documentation</a>{' '}for more details.- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)case 'Phone':return (isHookSendSMSEnabled && (- <Alert_Shadcn_>+ <Alert><WarningIcon />- <AlertTitle_Shadcn_>+ <AlertTitle>SMS provider settings are disabled while the SMS hook is enabled.- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_ className="flex flex-col gap-y-3">+ </AlertTitle>+ <AlertDescription className="flex flex-col gap-y-3"><p>The SMS hook will be used in place of the SMS provider configured</p><Button asChild type="default" className="w-min" icon={<ExternalLink />}><Link href={`/project/${ref}/auth/hooks`}>View auth hooks</Link></Button>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>))default:diff --git a/apps/studio/components/interfaces/Auth/AuthProvidersForm/FormField.tsx b/apps/studio/components/interfaces/Auth/AuthProvidersForm/FormField.tsxindex 35a1e364b4b..2d89a01b9f2 100644--- a/apps/studio/components/interfaces/Auth/AuthProvidersForm/FormField.tsx+++ b/apps/studio/components/interfaces/Auth/AuthProvidersForm/FormField.tsx@@ -8,7 +8,7 @@ import {Calendar,FormControl,FormInputGroupInput,- Input_Shadcn_,+ Input,InputGroup,InputGroupAddon,Popover_Shadcn_,@@ -179,7 +179,7 @@ const FormField = ({readOnly={readOnly}/>) : (- <Input_Shadcn_ {...field} id={name} readOnly={readOnly} />+ <Input {...field} id={name} readOnly={readOnly} />)}</FormControl></FormItemLayout>@@ -263,7 +263,7 @@ const FormField = ({</InputGroupAddon></InputGroup>) : (- <Input_Shadcn_+ <Input{...field}id={name}type="number"diff --git a/apps/studio/components/interfaces/Auth/AuthProvidersForm/index.tsx b/apps/studio/components/interfaces/Auth/AuthProvidersForm/index.tsxindex eef32ee931c..55d8667a681 100644--- a/apps/studio/components/interfaces/Auth/AuthProvidersForm/index.tsx+++ b/apps/studio/components/interfaces/Auth/AuthProvidersForm/index.tsx@@ -1,13 +1,7 @@import { useParams } from 'common'import { ExternalLink } from 'lucide-react'import Link from 'next/link'-import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,- Button,- WarningIcon,-} from 'ui'+import { Alert, AlertDescription, AlertTitle, Button, WarningIcon } from 'ui'import {PageSection,PageSectionContent,@@ -54,14 +48,11 @@ export const AuthProvidersForm = () => {) : (<div className="-space-y-px">{authConfig?.EXTERNAL_EMAIL_ENABLED && authConfig?.MAILER_OTP_EXP > 3600 && (- <Alert_Shadcn_- className="flex w-full items-center justify-between my-3"- variant="warning"- >+ <Alert className="flex w-full items-center justify-between my-3" variant="warning"><WarningIcon /><div>- <AlertTitle_Shadcn_>OTP expiry exceeds recommended threshold</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_ className="flex flex-col gap-y-3">+ <AlertTitle>OTP expiry exceeds recommended threshold</AlertTitle>+ <AlertDescription className="flex flex-col gap-y-3"><p>We have detected that you have enabled the email provider with the OTP expiryset to more than an hour. It is recommended to set this value to less than an@@ -72,9 +63,9 @@ export const AuthProvidersForm = () => {View security recommendations</Link></Button>- </AlertDescription_Shadcn_>+ </AlertDescription></div>- </Alert_Shadcn_>+ </Alert>)}<ResourceList>diff --git a/apps/studio/components/interfaces/Auth/BasicAuthSettingsForm.tsx b/apps/studio/components/interfaces/Auth/BasicAuthSettingsForm.tsxindex e050379d5e6..016d5340a4d 100644--- a/apps/studio/components/interfaces/Auth/BasicAuthSettingsForm.tsx+++ b/apps/studio/components/interfaces/Auth/BasicAuthSettingsForm.tsx@@ -7,9 +7,9 @@ import { useEffect } from 'react'import { useForm } from 'react-hook-form'import { toast } from 'sonner'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Button,Card,CardContent,@@ -251,18 +251,18 @@ export const BasicAuthSettingsForm = () => {/>{form.watch('EXTERNAL_ANONYMOUS_USERS_ENABLED') && (- <Alert_Shadcn_+ <AlertclassName="flex w-full items-center justify-between mt-4"variant="warning"><WarningIcon /><div>- <AlertTitle_Shadcn_>+ <AlertTitle>Anonymous users will use the{' '}<code className="text-code-inline">authenticated</code> role when signingin- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_ className="flex flex-col gap-y-3">+ </AlertTitle>+ <AlertDescription className="flex flex-col gap-y-3"><p>As a result, anonymous users will be subjected to RLS policies thatapply to the <code className="text-code-inline">public</code> and{' '}@@ -281,27 +281,27 @@ export const BasicAuthSettingsForm = () => {View access control docs</Link></Button>- </AlertDescription_Shadcn_>+ </AlertDescription></div>- </Alert_Shadcn_>+ </Alert>)}{!authConfig?.SECURITY_CAPTCHA_ENABLED &&form.watch('EXTERNAL_ANONYMOUS_USERS_ENABLED') && (- <Alert_Shadcn_ className="mt-4">+ <Alert className="mt-4"><WarningIcon />- <AlertTitle_Shadcn_>+ <AlertTitle>We highly recommend{' '}<InlineLink href={`/project/${projectRef}/auth/protection`}>enabling captcha</InlineLink>{' '}for anonymous sign-ins- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ </AlertTitle>+ <AlertDescription>This will prevent potential abuse on sign-ins which may bloat yourdatabase and incur costs for monthly active users (MAU)- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}</CardContent><CardContent>diff --git a/apps/studio/components/interfaces/Auth/CustomAuthProviders/CreateOrUpdateCustomProviderSheet.tsx b/apps/studio/components/interfaces/Auth/CustomAuthProviders/CreateOrUpdateCustomProviderSheet.tsxindex 8496b652eff..5a99cb1646a 100644--- a/apps/studio/components/interfaces/Auth/CustomAuthProviders/CreateOrUpdateCustomProviderSheet.tsx+++ b/apps/studio/components/interfaces/Auth/CustomAuthProviders/CreateOrUpdateCustomProviderSheet.tsx@@ -12,7 +12,7 @@ import {FormControl,FormField,FormInputGroupInput,- Input_Shadcn_,+ Input,InputGroup,InputGroupAddon,InputGroupText,@@ -29,7 +29,7 @@ import {Switch,useWatch,} from 'ui'-import { Input } from 'ui-patterns/DataInputs/Input'+import { Input as PasswordInput } from 'ui-patterns/DataInputs/Input'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import * as z from 'zod'@@ -313,7 +313,7 @@ export const CreateOrUpdateCustomProviderSheet = ({render={({ field }) => (<FormItemLayout layout="horizontal" label="Display Name"><FormControl>- <Input_Shadcn_ {...field} placeholder="Provider name" />+ <Input {...field} placeholder="Provider name" /></FormControl></FormItemLayout>)}@@ -355,7 +355,7 @@ export const CreateOrUpdateCustomProviderSheet = ({description="Base URL of your OAuth provider. Discovery runs when you save."><FormControl>- <Input_Shadcn_ {...field} placeholder="https://auth.company.com" />+ <Input {...field} placeholder="https://auth.company.com" /></FormControl></FormItemLayout>)}@@ -369,10 +369,7 @@ export const CreateOrUpdateCustomProviderSheet = ({render={({ field }) => (<FormItemLayout layout="horizontal" label="Authorization URL"><FormControl>- <Input_Shadcn_- {...field}- placeholder="https://auth.company.com/oauth/authorize"- />+ <Input {...field} placeholder="https://auth.company.com/oauth/authorize" /></FormControl></FormItemLayout>)}@@ -383,10 +380,7 @@ export const CreateOrUpdateCustomProviderSheet = ({render={({ field }) => (<FormItemLayout layout="horizontal" label="Token URL"><FormControl>- <Input_Shadcn_- {...field}- placeholder="https://auth.company.com/oauth/token"- />+ <Input {...field} placeholder="https://auth.company.com/oauth/token" /></FormControl></FormItemLayout>)}@@ -397,10 +391,7 @@ export const CreateOrUpdateCustomProviderSheet = ({render={({ field }) => (<FormItemLayout layout="horizontal" label="Userinfo URL"><FormControl>- <Input_Shadcn_- {...field}- placeholder="https://auth.company.com/oauth/userinfo"- />+ <Input {...field} placeholder="https://auth.company.com/oauth/userinfo" /></FormControl></FormItemLayout>)}@@ -415,7 +406,7 @@ export const CreateOrUpdateCustomProviderSheet = ({description="Required for ID token verification"><FormControl>- <Input_Shadcn_+ <Input{...field}placeholder="https://auth.company.com/.well-known/jwks.json"/>@@ -436,7 +427,7 @@ export const CreateOrUpdateCustomProviderSheet = ({description="Leave empty to use standard path: {issuer}/.well-known/openid-configuration. Only needed if your provider uses a non-standard discovery path. Discovery runs when you save."><FormControl>- <Input_Shadcn_+ <Input{...field}placeholder={issuerUrlValue@@ -458,7 +449,7 @@ export const CreateOrUpdateCustomProviderSheet = ({render={({ field }) => (<FormItemLayout layout="horizontal" label="Client ID"><FormControl>- <Input_Shadcn_ {...field} placeholder="Client ID" />+ <Input {...field} placeholder="Client ID" /></FormControl></FormItemLayout>)}@@ -469,7 +460,7 @@ export const CreateOrUpdateCustomProviderSheet = ({render={({ field }) => (<FormItemLayout layout="horizontal" label="Client Secret"><FormControl>- <Input_Shadcn_ {...field} type="password" placeholder="Client secret" />+ <Input {...field} type="password" placeholder="Client secret" /></FormControl></FormItemLayout>)}@@ -487,7 +478,7 @@ export const CreateOrUpdateCustomProviderSheet = ({description="Comma-separated list. Common: openid, email, profile"><FormControl>- <Input_Shadcn_ {...field} placeholder="openid, email, profile" />+ <Input {...field} placeholder="openid, email, profile" /></FormControl></FormItemLayout>)}@@ -515,7 +506,7 @@ export const CreateOrUpdateCustomProviderSheet = ({label="Callback URL"description="Configure this in your OAuth provider's settings.">- <Input+ <PasswordInputcopyreadOnlydisableddiff --git a/apps/studio/components/interfaces/Auth/EmailTemplates/TemplateEditor.tsx b/apps/studio/components/interfaces/Auth/EmailTemplates/TemplateEditor.tsxindex 06369681231..2c66ee2793c 100644--- a/apps/studio/components/interfaces/Auth/EmailTemplates/TemplateEditor.tsx+++ b/apps/studio/components/interfaces/Auth/EmailTemplates/TemplateEditor.tsx@@ -13,7 +13,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,Label_Shadcn_,Tooltip,TooltipContent,@@ -259,7 +259,7 @@ export const TemplateEditor = ({ template }: TemplateEditorProps) => {}><FormControl>- <Input_Shadcn_ id={x} {...field} disabled={!canUpdateConfig} />+ <Input id={x} {...field} disabled={!canUpdateConfig} /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Auth/Hooks/CreateHookSheet.tsx b/apps/studio/components/interfaces/Auth/Hooks/CreateHookSheet.tsxindex ecfe046f5d9..d43a54cb9ea 100644--- a/apps/studio/components/interfaces/Auth/Hooks/CreateHookSheet.tsx+++ b/apps/studio/components/interfaces/Auth/Hooks/CreateHookSheet.tsx@@ -15,7 +15,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,RadioGroupStacked,RadioGroupStackedItem,Separator,@@ -462,7 +462,7 @@ revoke execute on function ${ident(schema)}.${ident(functionName)} from authentidescription="Supabase Auth will send a HTTPS POST request to this URL each time the hook is triggered."><FormControl>- <Input_Shadcn_ {...field} />+ <Input {...field} /></FormControl></FormItemLayout>)}@@ -490,7 +490,7 @@ revoke execute on function ${ident(schema)}.${ident(functionName)} from authenti><FormControl><div className="flex flex-row">- <Input_Shadcn_ {...field} className="rounded-r-none border-r-0" />+ <Input {...field} className="rounded-r-none border-r-0" /><Buttontype="default"size="small"diff --git a/apps/studio/components/interfaces/Auth/MfaAuthSettingsForm/MfaAuthSettingsForm.tsx b/apps/studio/components/interfaces/Auth/MfaAuthSettingsForm/MfaAuthSettingsForm.tsxindex 4bcd42784f5..068b314e4a3 100644--- a/apps/studio/components/interfaces/Auth/MfaAuthSettingsForm/MfaAuthSettingsForm.tsx+++ b/apps/studio/components/interfaces/Auth/MfaAuthSettingsForm/MfaAuthSettingsForm.tsx@@ -5,8 +5,8 @@ import { useEffect, useState } from 'react'import { SubmitHandler, useForm } from 'react-hook-form'import { toast } from 'sonner'import {- Alert_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertTitle,Button,Card,CardContent,@@ -15,7 +15,7 @@ import {FormControl,FormField,FormInputGroupInput,- Input_Shadcn_,+ Input,InputGroup,InputGroupAddon,InputGroupText,@@ -489,12 +489,12 @@ export const MfaAuthSettingsForm = () => {/>{!hasValidMFAProvider && phoneMFAIsEnabled && (- <Alert_Shadcn_ variant="warning" className="mt-3">+ <Alert variant="warning" className="mt-3"><WarningIcon />- <AlertTitle_Shadcn_>+ <AlertTitle>To use MFA with Phone you should set up a Phone provider or Send SMS Hook.- </AlertTitle_Shadcn_>- </Alert_Shadcn_>+ </AlertTitle>+ </Alert>)}</CardContent>@@ -542,7 +542,7 @@ export const MfaAuthSettingsForm = () => {description="To format the OTP code use `{{ .Code }}`"><FormControl>- <Input_Shadcn_+ <Inputtype="text"{...field}disabled={!canUpdateConfig || !hasAccessToMFA}diff --git a/apps/studio/components/interfaces/Auth/OAuthApps/CreateOrUpdateOAuthAppSheet.tsx b/apps/studio/components/interfaces/Auth/OAuthApps/CreateOrUpdateOAuthAppSheet.tsxindex b5ba3d43d2a..1c4bfad927a 100644--- a/apps/studio/components/interfaces/Auth/OAuthApps/CreateOrUpdateOAuthAppSheet.tsx+++ b/apps/studio/components/interfaces/Auth/OAuthApps/CreateOrUpdateOAuthAppSheet.tsx@@ -18,7 +18,7 @@ import {FormDescription,FormField,FormLabel,- Input_Shadcn_,+ Input,Select_Shadcn_,SelectContent_Shadcn_,SelectItem_Shadcn_,@@ -34,7 +34,7 @@ import {SheetTitle,Switch,} from 'ui'-import { Input } from 'ui-patterns/DataInputs/Input'+import { Input as PasswordInput } from 'ui-patterns/DataInputs/Input'import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { SingleValueFieldArray } from 'ui-patterns/form/SingleValueFieldArray/SingleValueFieldArray'@@ -288,7 +288,7 @@ export const CreateOrUpdateOAuthAppSheet = ({render={({ field }) => (<FormItemLayout label="Name"><FormControl>- <Input_Shadcn_ {...field} placeholder="My OAuth App" />+ <Input {...field} placeholder="My OAuth App" /></FormControl></FormItemLayout>)}@@ -317,7 +317,7 @@ export const CreateOrUpdateOAuthAppSheet = ({</div><div className="flex min-w-0 flex-1 items-center gap-2"><div className="group relative min-w-0 flex-1">- <Input_Shadcn_+ <Input{...field}value={field.value ?? ''}className={cn('flex-1', projectRef ? 'pr-10' : '')}@@ -372,7 +372,7 @@ export const CreateOrUpdateOAuthAppSheet = ({render={() => (<FormItemLayout label="Client ID"><FormControl>- <Input+ <PasswordInputcopyreadOnlyclassName="input-mono"diff --git a/apps/studio/components/interfaces/Auth/OAuthApps/OAuthServerSettingsForm.tsx b/apps/studio/components/interfaces/Auth/OAuthApps/OAuthServerSettingsForm.tsxindex f3aab923cab..1be26ad534a 100644--- a/apps/studio/components/interfaces/Auth/OAuthApps/OAuthServerSettingsForm.tsx+++ b/apps/studio/components/interfaces/Auth/OAuthApps/OAuthServerSettingsForm.tsx@@ -14,7 +14,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,Switch,} from 'ui'import { PageSection, PageSectionContent } from 'ui-patterns'@@ -258,7 +258,7 @@ export const OAuthServerSettingsForm = () => {</>}>- <Input_Shadcn_+ <Inputvalue={authConfig?.SITE_URL}disabledplaceholder="https://example.com"@@ -276,7 +276,7 @@ export const OAuthServerSettingsForm = () => {description="Path where you'll implement the OAuth authorization UI (consent screens)."><FormControl>- <Input_Shadcn_ {...field} placeholder="/auth/authorize" />+ <Input {...field} placeholder="/auth/authorize" /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Auth/Passkeys/PasskeysSettingsForm.tsx b/apps/studio/components/interfaces/Auth/Passkeys/PasskeysSettingsForm.tsxindex d6550f1db3c..dcddd12a6df 100644--- a/apps/studio/components/interfaces/Auth/Passkeys/PasskeysSettingsForm.tsx+++ b/apps/studio/components/interfaces/Auth/Passkeys/PasskeysSettingsForm.tsx@@ -11,7 +11,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,Switch,useWatch,} from 'ui'@@ -334,7 +334,7 @@ export const PasskeysSettingsForm = () => {description="A human-readable name for your application shown during passkey registration."><FormControl>- <Input_Shadcn_ {...field} placeholder="My project" />+ <Input {...field} placeholder="My project" /></FormControl></FormItemLayout>)}@@ -351,7 +351,7 @@ export const PasskeysSettingsForm = () => {description='The domain name for your application (e.g. "example.com"). This determines which passkeys can be used.'><FormControl>- <Input_Shadcn_ {...field} placeholder="example.com" />+ <Input {...field} placeholder="example.com" /></FormControl></FormItemLayout>)}@@ -368,7 +368,7 @@ export const PasskeysSettingsForm = () => {description='Comma-separated list of allowed origins (e.g. "https://example.com"). HTTPS is required except for localhost.'><FormControl>- <Input_Shadcn_ {...field} placeholder="https://example.com" />+ <Input {...field} placeholder="https://example.com" /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/PolicyDetailsV2.tsx b/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/PolicyDetailsV2.tsxindex 477095ce075..c04701692e0 100644--- a/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/PolicyDetailsV2.tsx+++ b/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/PolicyDetailsV2.tsx@@ -22,7 +22,7 @@ import {FormItem,FormLabel,FormMessage,- Input_Shadcn_,+ Input,Popover_Shadcn_,PopoverContent_Shadcn_,PopoverTrigger_Shadcn_,@@ -131,7 +131,7 @@ export const PolicyDetailsV2 = ({<FormItem className="col-span-6 flex flex-col gap-y-1"><FormLabel>Policy Name</FormLabel><FormControl>- <Input_Shadcn_+ <Input{...field}disabled={!canUpdatePolicies}className="bg-control border-control"@@ -217,7 +217,7 @@ export const PolicyDetailsV2 = ({)}{authContext === 'realtime' && (<FormControl>- <Input_Shadcn_+ <Inputdisabledvalue="messages.realtime"className="bg-control border-control"diff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/PolicyEditorPanelHeader.tsx b/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/PolicyEditorPanelHeader.tsxindex 52967a692ac..7ea2ad0db2e 100644--- a/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/PolicyEditorPanelHeader.tsx+++ b/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/PolicyEditorPanelHeader.tsx@@ -3,9 +3,9 @@ import { ChevronDown, PanelLeftClose, PanelRightClose, X } from 'lucide-react'import { useState } from 'react'import {cn,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,+ Collapsible,+ CollapsibleContent,+ CollapsibleTrigger,SheetClose,SheetHeader,SheetTitle,@@ -47,12 +47,12 @@ export const PolicyEditorPanelHeader = ({: 'Create a new Row Level Security policy'}</SheetTitle>{selectedPolicy !== undefined && (- <Collapsible_Shadcn_+ <CollapsibleclassName="-mt-1.5 pb-1.5"open={showDetails}onOpenChange={setShowDetails}>- <CollapsibleTrigger_Shadcn_ className="group font-normal p-0 [&[data-state=open]>div>svg]:-rotate-180!">+ <CollapsibleTrigger className="group font-normal p-0 [&[data-state=open]>div>svg]:-rotate-180!"><div className="flex items-center gap-x-2 w-full"><p className="text-xs text-foreground-light group-hover:text-foreground transition">View policy details@@ -63,8 +63,8 @@ export const PolicyEditorPanelHeader = ({size={14}/></div>- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_ className="grid gap-1.5">+ </CollapsibleTrigger>+ <CollapsibleContent className="grid gap-1.5"><div className="flex my-2"><div><div className="text-xs flex items-start space-x-2 border-b py-1.5">@@ -97,8 +97,8 @@ export const PolicyEditorPanelHeader = ({</div></div></div>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible>)}</div></div>diff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/QueryError.tsx b/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/QueryError.tsxindex e6c902bfe87..260698852a6 100644--- a/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/QueryError.tsx+++ b/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/QueryError.tsx@@ -2,13 +2,13 @@ import styles from '@ui/layout/ai-icon-animation/ai-icon-animation-style.module.import { initial, last } from 'lodash'import { Dispatch, SetStateAction } from 'react'import {- Alert_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertTitle,Button,cn,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,+ Collapsible,+ CollapsibleContent,+ CollapsibleTrigger,} from 'ui'import { QueryResponseError } from '@/data/sql/execute-sql-mutation'@@ -27,7 +27,7 @@ export const QueryError = ({return (<div className="flex flex-col gap-y-3 px-5">- <Alert_Shadcn_ variant="destructive">+ <Alert variant="destructive"><svgxmlns="http://www.w3.org/2000/svg"viewBox="0 0 20 20"@@ -41,16 +41,16 @@ export const QueryError = ({/></svg><div className="flex flex-col gap-3">- <AlertTitle_Shadcn_ className="m-0">Error running SQL query</AlertTitle_Shadcn_>+ <AlertTitle className="m-0">Error running SQL query</AlertTitle>- <Collapsible_Shadcn_+ <CollapsibledefaultOpenclassName="flex flex-col gap-3"open={open}onOpenChange={() => setOpen(!open)}><div className="flex gap-2">- <CollapsibleTrigger_Shadcn_ asChild>+ <CollapsibleTrigger asChild><Buttonsize="tiny"type="outline"@@ -58,9 +58,9 @@ export const QueryError = ({>{open ? 'Hide error details' : 'Show error details'}</Button>- </CollapsibleTrigger_Shadcn_>+ </CollapsibleTrigger></div>- <CollapsibleContent_Shadcn_ className="overflow-auto">+ <CollapsibleContent className="overflow-auto">{formattedError.length > 0 ? (formattedError.map((x: string, i: number) => (<pre key={`error-${i}`} className="font-mono text-xs whitespace-pre-wrap">@@ -95,10 +95,10 @@ export const QueryError = ({) : (<p className="font-mono text-xs">{error.error}</p>)}- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible></div>- </Alert_Shadcn_>+ </Alert><div className="overflow-x-auto"></div></div>)diff --git a/apps/studio/components/interfaces/Auth/Policies/PolicySelection.tsx b/apps/studio/components/interfaces/Auth/Policies/PolicySelection.tsxindex dac2ddc7c56..8fc1e8893e0 100644--- a/apps/studio/components/interfaces/Auth/Policies/PolicySelection.tsx+++ b/apps/studio/components/interfaces/Auth/Policies/PolicySelection.tsx@@ -1,6 +1,6 @@import { noop } from 'lodash'import { Edit, ExternalLink, FlaskConical, Grid } from 'lucide-react'-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_, Button, Modal } from 'ui'+import { Alert, AlertDescription, AlertTitle, Button, Modal } from 'ui'import CardButton from '@/components/ui/CardButton'@@ -64,12 +64,12 @@ const PolicySelection = ({</div>{showAssistantPreview && onToggleFeaturePreviewModal !== undefined && (- <Alert_Shadcn_>+ <Alert><FlaskConical />- <AlertTitle_Shadcn_>Try the new Supabase Assistant for RLS policies</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Try the new Supabase Assistant for RLS policies</AlertTitle>+ <AlertDescription>Create RLS policies for your tables with the help of AI- </AlertDescription_Shadcn_>+ </AlertDescription><div className="flex items-center gap-x-2 mt-3"><Button type="default" onClick={onToggleFeaturePreviewModal}>Toggle feature preview@@ -84,7 +84,7 @@ const PolicySelection = ({</a></Button></div>- </Alert_Shadcn_>+ </Alert>)}</Modal.Content>)diff --git a/apps/studio/components/interfaces/Auth/RLSTester/RLSTableCard.tsx b/apps/studio/components/interfaces/Auth/RLSTester/RLSTableCard.tsxindex 6fca3f03b18..b57ae9c168e 100644--- a/apps/studio/components/interfaces/Auth/RLSTester/RLSTableCard.tsx+++ b/apps/studio/components/interfaces/Auth/RLSTester/RLSTableCard.tsx@@ -1,12 +1,6 @@import { Check, ChevronDown, Edit, X } from 'lucide-react'import { useMemo } from 'react'-import {- cn,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,- WarningIcon,-} from 'ui'+import { cn, Collapsible, CollapsibleContent, CollapsibleTrigger, WarningIcon } from 'ui'import type { Policy } from '@/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRow.utils'import { ButtonTooltip } from '@/components/ui/ButtonTooltip'@@ -107,10 +101,10 @@ export const RLSTableCard = ({])return (- <Collapsible_Shadcn_+ <CollapsibleclassName={cn('border rounded-sm', !isRLSEnabled && 'bg-warning-300 border-warning-500')}>- <CollapsibleTrigger_Shadcn_ className="flex items-center justify-between px-3 py-2 w-full [&[data-state=open]>div>svg]:-rotate-180!">+ <CollapsibleTrigger className="flex items-center justify-between px-3 py-2 w-full [&[data-state=open]>div>svg]:-rotate-180!"><div className="w-full flex items-center justify-between"><div className="flex items-center gap-x-2">{!isRLSEnabled ? (@@ -140,16 +134,16 @@ export const RLSTableCard = ({</p><ChevronDown className="transition-transform duration-200" strokeWidth={1.5} size={14} /></div>- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_+ </CollapsibleTrigger>+ <CollapsibleContentclassName={cn('border-t p-3 text-sm text-foreground-light',!isRLSEnabled && 'border-warning-500')}>{tableAccessDescription}- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible>)}diff --git a/apps/studio/components/interfaces/Auth/SiteUrl/SiteUrl.tsx b/apps/studio/components/interfaces/Auth/SiteUrl/SiteUrl.tsxindex 875d218dc1a..6aa34af0ee4 100644--- a/apps/studio/components/interfaces/Auth/SiteUrl/SiteUrl.tsx+++ b/apps/studio/components/interfaces/Auth/SiteUrl/SiteUrl.tsx@@ -4,16 +4,7 @@ import { useParams } from 'common'import { useEffect, useState } from 'react'import { useForm } from 'react-hook-form'import { toast } from 'sonner'-import {- Button,- Card,- CardContent,- CardFooter,- Form,- FormControl,- FormField,- Input_Shadcn_,-} from 'ui'+import { Button, Card, CardContent, CardFooter, Form, FormControl, FormField, Input } from 'ui'import { GenericSkeletonLoader } from 'ui-patterns'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import {@@ -126,7 +117,7 @@ const SiteUrl = () => {description="Configure the default redirect URL used when a redirect URL is not specified or doesn't match one from the allow list. This value is also exposed as a template variable in the email templates section. Wildcards cannot be used here."><FormControl>- <Input_Shadcn_ {...field} disabled={!canUpdateConfig} />+ <Input {...field} disabled={!canUpdateConfig} /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Auth/SmtpForm/SmtpForm.tsx b/apps/studio/components/interfaces/Auth/SmtpForm/SmtpForm.tsxindex 599acb3121d..84a511536d2 100644--- a/apps/studio/components/interfaces/Auth/SmtpForm/SmtpForm.tsx+++ b/apps/studio/components/interfaces/Auth/SmtpForm/SmtpForm.tsx@@ -14,14 +14,14 @@ import {FormControl,FormField,FormInputGroupInput,- Input_Shadcn_,+ Input,InputGroup,InputGroupAddon,InputGroupText,Switch,} from 'ui'import { Admonition, PageSection, PageSectionContent } from 'ui-patterns'-import { Input } from 'ui-patterns/DataInputs/Input'+import { Input as PasswordInput } from 'ui-patterns/DataInputs/Input'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import * as z from 'zod'@@ -284,7 +284,7 @@ export const SmtpForm = () => {description="The email address the emails are sent from."><FormControl>- <Input_Shadcn_+ <Input{...field}placeholder="[email protected]"disabled={!canUpdateConfig}@@ -303,7 +303,7 @@ export const SmtpForm = () => {description="Name displayed in the recipient's inbox."><FormControl>- <Input_Shadcn_+ <Input{...field}placeholder="Your Name"disabled={!canUpdateConfig}@@ -334,7 +334,7 @@ export const SmtpForm = () => {description="Hostname or IP address of your SMTP server."><FormControl>- <Input_Shadcn_+ <Input{...field}placeholder="your.smtp.host.com"disabled={!canUpdateConfig}@@ -372,7 +372,7 @@ export const SmtpForm = () => {}><FormControl>- <Input_Shadcn_+ <Inputtype="number"value={field.value}onChange={(e) => field.onChange(e.target.value)}@@ -418,7 +418,7 @@ export const SmtpForm = () => {description="Username for your SMTP server."><FormControl>- <Input_Shadcn_+ <Input{...field}placeholder="SMTP Username"disabled={!canUpdateConfig}@@ -437,7 +437,7 @@ export const SmtpForm = () => {description="Password for your SMTP server. For security reasons, this password cannot be viewed once saved."><FormControl>- <Input {...field} reveal copy disabled={!canUpdateConfig} />+ <PasswordInput {...field} reveal copy disabled={!canUpdateConfig} /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/CreateAuth0Dialog.tsx b/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/CreateAuth0Dialog.tsxindex 3f702fc6dee..ddd86900a7f 100644--- a/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/CreateAuth0Dialog.tsx+++ b/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/CreateAuth0Dialog.tsx@@ -15,7 +15,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,Separator,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'@@ -140,10 +140,7 @@ export const CreateAuth0IntegrationDialog = ({https://</Button><FormControl>- <Input_Shadcn_- className="border-l-0 rounded-none border-r-0 z-50"- {...field}- />+ <Input className="border-l-0 rounded-none border-r-0 z-50" {...field} /></FormControl><Buttontype="default"diff --git a/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/CreateAwsCognitoAuthDialog.tsx b/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/CreateAwsCognitoAuthDialog.tsxindex 3ab033e4486..85680336f94 100644--- a/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/CreateAwsCognitoAuthDialog.tsx+++ b/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/CreateAwsCognitoAuthDialog.tsx@@ -16,7 +16,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,Separator,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'@@ -152,7 +152,7 @@ export const CreateAwsCognitoAuthIntegrationDialog = ({https://cognito-idp.{awsRegion}.amazonaws.com/</Button><FormControl>- <Input_Shadcn_ className="rounded-l-none border-l-0 z-50" {...field} />+ <Input className="rounded-l-none border-l-0 z-50" {...field} /></FormControl></div></FormItemLayout>diff --git a/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/CreateClerkAuthDialog.tsx b/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/CreateClerkAuthDialog.tsxindex f202773c70d..90ed0cdc739 100644--- a/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/CreateClerkAuthDialog.tsx+++ b/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/CreateClerkAuthDialog.tsx@@ -14,7 +14,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,Separator,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'@@ -122,7 +122,7 @@ export const CreateClerkAuthIntegrationDialog = ({render={({ field }) => (<FormItemLayout label="Clerk Domain"><FormControl>- <Input_Shadcn_+ <Input{...field}placeholder={'https://clerk.example.com or https://example.clerk.accounts.dev'diff --git a/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/CreateFirebaseAuthDialog.tsx b/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/CreateFirebaseAuthDialog.tsxindex 045b7fca9cb..cac0be1077c 100644--- a/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/CreateFirebaseAuthDialog.tsx+++ b/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/CreateFirebaseAuthDialog.tsx@@ -15,7 +15,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,Separator,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'@@ -134,7 +134,7 @@ export const CreateFirebaseAuthIntegrationDialog = ({render={({ field }) => (<FormItemLayout label="Firebase Auth Project ID"><FormControl>- <Input_Shadcn_ {...field} />+ <Input {...field} /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/CreateWorkOSDialog.tsx b/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/CreateWorkOSDialog.tsxindex fd4c525dbf0..80a463ce007 100644--- a/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/CreateWorkOSDialog.tsx+++ b/apps/studio/components/interfaces/Auth/ThirdPartyAuthForm/CreateWorkOSDialog.tsx@@ -15,7 +15,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,Separator,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'@@ -140,7 +140,7 @@ export const CreateWorkOSIntegrationDialog = ({description="Obtain your issuer URL from the WorkOS dashboard."><FormControl>- <Input_Shadcn_+ <Input{...field}placeholder="https://api.workos.com/user_management/client_ABCDEFGHIJKLMNOPQRSTUVWXYZ"/>diff --git a/apps/studio/components/interfaces/Auth/Users/BanUserModal.tsx b/apps/studio/components/interfaces/Auth/Users/BanUserModal.tsxindex 3093e24a399..1056d865d84 100644--- a/apps/studio/components/interfaces/Auth/Users/BanUserModal.tsx+++ b/apps/studio/components/interfaces/Auth/Users/BanUserModal.tsx@@ -10,7 +10,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,Modal,Select_Shadcn_,SelectContent_Shadcn_,@@ -101,7 +101,7 @@ export const BanUserModal = ({ visible, user, onClose }: BanUserModalProps) => {render={({ field }) => (<FormItemLayout className="[&>div>div]:mt-0" label="Set a ban duration"><FormControl>- <Input_Shadcn_ {...field} />+ <Input {...field} /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Auth/Users/CreateUserModal.tsx b/apps/studio/components/interfaces/Auth/Users/CreateUserModal.tsxindex 055d0435b33..e29a13c370c 100644--- a/apps/studio/components/interfaces/Auth/Users/CreateUserModal.tsx+++ b/apps/studio/components/interfaces/Auth/Users/CreateUserModal.tsx@@ -18,7 +18,7 @@ import {FormItem,FormLabel,FormMessage,- Input_Shadcn_,+ Input,} from 'ui'import * as z from 'zod'@@ -87,7 +87,7 @@ const CreateUserModal = ({ visible, setVisible }: CreateUserModalProps) => {className="absolute left-2 top-1/2 transform -translate-y-1/2"strokeWidth={1.5}/>- <Input_Shadcn_+ <InputautoFocus{...field}autoComplete="off"@@ -117,7 +117,7 @@ const CreateUserModal = ({ visible, setVisible }: CreateUserModalProps) => {className="absolute left-2 top-1/2 transform -translate-y-1/2"strokeWidth={1.5}/>- <Input_Shadcn_+ <Input{...field}autoComplete="new-password"type="password"diff --git a/apps/studio/components/interfaces/Auth/Users/InviteUserModal.tsx b/apps/studio/components/interfaces/Auth/Users/InviteUserModal.tsxindex 59b625a4f02..721243e7b50 100644--- a/apps/studio/components/interfaces/Auth/Users/InviteUserModal.tsx+++ b/apps/studio/components/interfaces/Auth/Users/InviteUserModal.tsx@@ -3,7 +3,7 @@ import { PermissionAction } from '@supabase/shared-types/out/constants'import { useParams } from 'common'import { SubmitHandler, useForm } from 'react-hook-form'import { toast } from 'sonner'-import { Button, Form, FormControl, FormField, Input_Shadcn_, Modal } from 'ui'+import { Button, Form, FormControl, FormField, Input, Modal } from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import * as z from 'zod'@@ -71,7 +71,7 @@ const InviteUserModal = ({ visible, setVisible }: InviteUserModalProps) => {render={({ field }) => (<FormItemLayout layout="vertical" label="User email"><FormControl className="relative col-span-6">- <Input_Shadcn_ {...field} />+ <Input {...field} /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Auth/Users/UserPanel.tsx b/apps/studio/components/interfaces/Auth/Users/UserPanel.tsxindex 400d8838cb1..c2a6bd334e3 100644--- a/apps/studio/components/interfaces/Auth/Users/UserPanel.tsx+++ b/apps/studio/components/interfaces/Auth/Users/UserPanel.tsx@@ -4,7 +4,7 @@ import { useState } from 'react'import {Button,cn,- Input_Shadcn_,+ Input,ResizableHandle,ResizablePanel,Tabs_Shadcn_,@@ -115,7 +115,7 @@ export const UserPanel = () => {className={cn('mt-0 grow min-h-0 overflow-y-auto', PANEL_PADDING)}><div className="flex items-center mb-2">- <Input_Shadcn_+ <InputautoFocustype="text"placeholder="Filter..."diff --git a/apps/studio/components/interfaces/Auth/Users/UsersV2.tsx b/apps/studio/components/interfaces/Auth/Users/UsersV2.tsxindex dc6a376784d..5bff6c8593a 100644--- a/apps/studio/components/interfaces/Auth/Users/UsersV2.tsx+++ b/apps/studio/components/interfaces/Auth/Users/UsersV2.tsx@@ -19,9 +19,9 @@ import { UIEvent, useEffect, useMemo, useRef, useState } from 'react'import DataGrid, { Column, DataGridHandle, Row } from 'react-data-grid'import { toast } from 'sonner'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Button,cn,LoadingLine,@@ -534,7 +534,7 @@ export const UsersV2 = () => {<FormHeader className="py-4 px-6 mb-0! border-b" title="Users" />{showImprovedSearchOptIn && (- <Alert_Shadcn_ className="rounded-none mb-0 border-0 relative">+ <Alert className="rounded-none mb-0 border-0 relative"><Tooltip><TooltipTriggeronClick={() => setImprovedSearchDismissed(true)}@@ -545,8 +545,8 @@ export const UsersV2 = () => {<TooltipContent side="bottom">Dismiss</TooltipContent></Tooltip><InfoIcon className="size-4" />- <AlertTitle_Shadcn_>Upgrade to an improved search experience</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_ className="flex justify-between items-center">+ <AlertTitle>Upgrade to an improved search experience</AlertTitle>+ <AlertDescription className="flex justify-between items-center"><div>Enable faster and more reliable searching, sorting, and filtering of your users.</div>@@ -558,15 +558,15 @@ export const UsersV2 = () => {>Upgrade search</Button>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}{indexWorkerInProgress && (- <Alert_Shadcn_ className="rounded-none mb-0 border-0 border-t">+ <Alert className="rounded-none mb-0 border-0 border-t"><InfoIcon className="size-4" />- <AlertTitle_Shadcn_>Index creation is in progress</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_ className="flex justify-between items-center">+ <AlertTitle>Index creation is in progress</AlertTitle>+ <AlertDescription className="flex justify-between items-center"><div>The indexes are currently being created. This process may take some time dependingon the number of users in your project.@@ -580,8 +580,8 @@ export const UsersV2 = () => {View logs</Link></Button>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}<div className="bg-surface-200 py-3 px-4 md:px-6 flex flex-col lg:flex-row lg:items-start justify-between gap-2">diff --git a/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/NewPaymentMethodElement.tsx b/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/NewPaymentMethodElement.tsxindex 465e20783d2..29f8daf7159 100644--- a/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/NewPaymentMethodElement.tsx+++ b/apps/studio/components/interfaces/Billing/Payment/PaymentMethods/NewPaymentMethodElement.tsx@@ -30,7 +30,7 @@ import {FormField,FormItem,FormMessage,- Input_Shadcn_ as Input,+ Input,Popover_Shadcn_ as Popover,PopoverContent_Shadcn_ as PopoverContent,PopoverTrigger_Shadcn_ as PopoverTrigger,diff --git a/apps/studio/components/interfaces/Billing/Usage/UsageWarningAlerts/CPUWarnings.tsx b/apps/studio/components/interfaces/Billing/Usage/UsageWarningAlerts/CPUWarnings.tsxindex 78f960bd60b..78034b7bd53 100644--- a/apps/studio/components/interfaces/Billing/Usage/UsageWarningAlerts/CPUWarnings.tsx+++ b/apps/studio/components/interfaces/Billing/Usage/UsageWarningAlerts/CPUWarnings.tsx@@ -1,7 +1,7 @@import { AlertTitle } from '@ui/components/shadcn/ui/alert'import { AlertCircle } from 'lucide-react'import Link from 'next/link'-import { Alert_Shadcn_, AlertDescription_Shadcn_, Button } from 'ui'+import { Alert, AlertDescription, Button } from 'ui'import { DOCS_URL } from '@/lib/constants'@@ -18,14 +18,14 @@ export const CPUWarnings = ({}: CPUWarningsProps) => {if (severity === 'warning') {return (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><AlertCircle /><AlertTitle>Your max CPU usage has exceeded 80%</AlertTitle>- <AlertDescription_Shadcn_>+ <AlertDescription>High CPU usage could result in slower queries, disruption of daily back up routines, andin rare cases, your instance may become unresponsive. If you need more resources, considerupgrading to a larger compute add-on.- </AlertDescription_Shadcn_>+ </AlertDescription><div className="mt-3 flex items-center space-x-2"><Button asChild type="default"><Link href={`${DOCS_URL}/guides/troubleshooting/high-cpu-usage`}>Learn more</Link>@@ -36,20 +36,20 @@ export const CPUWarnings = ({</Link></Button></div>- </Alert_Shadcn_>+ </Alert>)}if (severity === 'critical') {return (- <Alert_Shadcn_ variant="destructive">+ <Alert variant="destructive"><AlertCircle /><AlertTitle>Your max CPU usage has reached 100%</AlertTitle>- <AlertDescription_Shadcn_>+ <AlertDescription>High CPU usage could result in slower queries, disruption of daily back up routines, andin rare cases, your instance may become unresponsive. If you need more resources, considerupgrading to a larger compute add-on.- </AlertDescription_Shadcn_>+ </AlertDescription><div className="mt-3 flex items-center space-x-2"><Button asChild type="default"><Link href={`${DOCS_URL}/guides/troubleshooting/high-cpu-usage`}>Learn more</Link>@@ -60,7 +60,7 @@ export const CPUWarnings = ({</Link></Button></div>- </Alert_Shadcn_>+ </Alert>)}diff --git a/apps/studio/components/interfaces/Billing/Usage/UsageWarningAlerts/RAMWarnings.tsx b/apps/studio/components/interfaces/Billing/Usage/UsageWarningAlerts/RAMWarnings.tsxindex 39f3c5af0bb..f0ecb091292 100644--- a/apps/studio/components/interfaces/Billing/Usage/UsageWarningAlerts/RAMWarnings.tsx+++ b/apps/studio/components/interfaces/Billing/Usage/UsageWarningAlerts/RAMWarnings.tsx@@ -1,7 +1,7 @@import { AlertTitle } from '@ui/components/shadcn/ui/alert'import { AlertCircle } from 'lucide-react'import Link from 'next/link'-import { Alert_Shadcn_, AlertDescription_Shadcn_, Button } from 'ui'+import { Alert, AlertDescription, Button } from 'ui'import { DOCS_URL } from '@/lib/constants'@@ -18,14 +18,14 @@ export const RAMWarnings = ({}: RAMWarningsProps) => {if (severity === 'warning') {return (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><AlertCircle /><AlertTitle>Your memory usage has exceeded 80%</AlertTitle>- <AlertDescription_Shadcn_>+ <AlertDescription>High memory usage could result in overall degraded performance, and in rare cases, yourinstance may become unresponsive. If you need more resources, consider upgrading to alarger compute add-on.- </AlertDescription_Shadcn_>+ </AlertDescription><div className="mt-3 flex items-center space-x-2"><Button asChild type="default"><Link href={`${DOCS_URL}/guides/troubleshooting/exhaust-ram`}>Learn more</Link>@@ -36,20 +36,20 @@ export const RAMWarnings = ({</Link></Button></div>- </Alert_Shadcn_>+ </Alert>)}if (severity === 'critical') {return (- <Alert_Shadcn_ variant="destructive">+ <Alert variant="destructive"><AlertCircle /><AlertTitle>Your memory usage has reached 100%</AlertTitle>- <AlertDescription_Shadcn_>+ <AlertDescription>High memory usage could result in overall degraded performance, and in rare cases, yourinstance may become unresponsive. If you need more resources, consider upgrading to alarger compute add-on.- </AlertDescription_Shadcn_>+ </AlertDescription><div className="mt-3 flex items-center space-x-2"><Button asChild type="default"><Link href={`${DOCS_URL}/guides/troubleshooting/high-cpu-usage`}>Learn more</Link>@@ -60,7 +60,7 @@ export const RAMWarnings = ({</Link></Button></div>- </Alert_Shadcn_>+ </Alert>)}diff --git a/apps/studio/components/interfaces/BranchManagement/CreateBranchModal.tsx b/apps/studio/components/interfaces/BranchManagement/CreateBranchModal.tsxindex c909450e4eb..8ef75033332 100644--- a/apps/studio/components/interfaces/BranchManagement/CreateBranchModal.tsx+++ b/apps/studio/components/interfaces/BranchManagement/CreateBranchModal.tsx@@ -24,7 +24,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,Label_Shadcn_ as Label,Switch,Tooltip,@@ -316,7 +316,7 @@ export const CreateBranchModal = () => {render={({ field }) => (<FormItemLayout label="Preview Branch Name"><FormControl>- <Input_Shadcn_+ <Input{...field}placeholder="e.g. staging, dev-feature-x"autoComplete="off"@@ -374,7 +374,7 @@ export const CreateBranchModal = () => {><div className="relative w-full"><FormControl>- <Input_Shadcn_+ <Input{...field}placeholder="e.g. main, feat/some-feature"autoComplete="off"diff --git a/apps/studio/components/interfaces/BranchManagement/EditBranchModal.tsx b/apps/studio/components/interfaces/BranchManagement/EditBranchModal.tsxindex ac0c4620c66..5fa0c87af1e 100644--- a/apps/studio/components/interfaces/BranchManagement/EditBranchModal.tsx+++ b/apps/studio/components/interfaces/BranchManagement/EditBranchModal.tsx@@ -20,7 +20,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,Label_Shadcn_ as Label,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'@@ -224,7 +224,7 @@ export const EditBranchModal = ({ branch, visible, onClose }: EditBranchModalProrender={({ field }) => (<FormItemLayout label="Preview branch name"><FormControl>- <Input_Shadcn_+ <Input{...field}placeholder="e.g. staging, dev-feature-x"autoComplete="off"@@ -277,7 +277,7 @@ export const EditBranchModal = ({ branch, visible, onClose }: EditBranchModalPro><div className="relative"><FormControl>- <Input_Shadcn_+ <Input{...field}placeholder="e.g. main, feat/some-feature"autoComplete="off"diff --git a/apps/studio/components/interfaces/Connect/ConnectionPanel.tsx b/apps/studio/components/interfaces/Connect/ConnectionPanel.tsxindex 82ca9c7a8da..1ca2def2dd5 100644--- a/apps/studio/components/interfaces/Connect/ConnectionPanel.tsx+++ b/apps/studio/components/interfaces/Connect/ConnectionPanel.tsx@@ -6,9 +6,9 @@ import {Badge,Button,cn,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,+ Collapsible,+ CollapsibleContent,+ CollapsibleTrigger,WarningIcon,} from 'ui'import { Admonition } from 'ui-patterns/admonition'@@ -234,8 +234,8 @@ export const ConnectionPanel = ({)}{IS_PLATFORM && ipv4Status.type === 'error' && (- <Collapsible_Shadcn_ className="group -space-y-px">- <CollapsibleTrigger_Shadcn_+ <Collapsible className="group -space-y-px">+ <CollapsibleTriggerasChildclassName="group/collapse w-full justify-start rounded-t-none !last:rounded-b group-data-open:rounded-b-none border-muted">@@ -253,8 +253,8 @@ export const ConnectionPanel = ({>Some platforms are IPv4-only:</Button>- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_ className="bg-dash-sidebar rounded-b border px-3 py-2">+ </CollapsibleTrigger>+ <CollapsibleContent className="bg-dash-sidebar rounded-b border px-3 py-2"><div className="flex flex-col gap-2"><p className="text-xs text-foreground-light max-w-xs">A few major platforms are IPv4-only and may not work with a Direct Connection:@@ -282,8 +282,8 @@ export const ConnectionPanel = ({a IPv4 network.</p></div>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible>)}</div>{children}diff --git a/apps/studio/components/interfaces/Connect/ConnectionParameters.tsx b/apps/studio/components/interfaces/Connect/ConnectionParameters.tsxindex 7290919f6a0..841780eeb00 100644--- a/apps/studio/components/interfaces/Connect/ConnectionParameters.tsx+++ b/apps/studio/components/interfaces/Connect/ConnectionParameters.tsx@@ -3,9 +3,9 @@ import { useState } from 'react'import {Button,cn,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,+ Collapsible,+ CollapsibleContent,+ CollapsibleTrigger,copyToClipboard,Separator,} from 'ui'@@ -24,8 +24,8 @@ export const ConnectionParameters = ({ parameters }: ConnectionParametersProps)const [copiedMap, setCopiedMap] = useState<Record<string, boolean>>({})return (- <Collapsible_Shadcn_ open={isOpen} onOpenChange={setIsOpen} className="group -space-y-px">- <CollapsibleTrigger_Shadcn_+ <Collapsible open={isOpen} onOpenChange={setIsOpen} className="group -space-y-px">+ <CollapsibleTriggerasChildclassName="w-full justify-start rounded-t-none !last:rounded-b group-data-open:rounded-b-none px-3">@@ -44,8 +44,8 @@ export const ConnectionParameters = ({ parameters }: ConnectionParametersProps)>View parameters</Button>- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_ className="bg-dash-sidebar rounded-b border font-mono text-sm">+ </CollapsibleTrigger>+ <CollapsibleContent className="bg-dash-sidebar rounded-b border font-mono text-sm"><div className="px-4 py-2">{parameters.map((param) => (<div key={param.key} className="py-0.5 group/param">@@ -83,7 +83,7 @@ export const ConnectionParameters = ({ parameters }: ConnectionParametersProps)<div className="text-foreground-muted text-xs px-4 py-1 font-sans">For security reasons, your database password is never shown.</div>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible>)}diff --git a/apps/studio/components/interfaces/Connect/DatabaseConnectionString.tsx b/apps/studio/components/interfaces/Connect/DatabaseConnectionString.tsxindex ead2181ce33..690dbc6423c 100644--- a/apps/studio/components/interfaces/Connect/DatabaseConnectionString.tsx+++ b/apps/studio/components/interfaces/Connect/DatabaseConnectionString.tsx@@ -6,9 +6,9 @@ import {Badge,Button,cn,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,+ Collapsible,+ CollapsibleContent,+ CollapsibleTrigger,DIALOG_PADDING_X,Select_Shadcn_,SelectContent_Shadcn_,@@ -487,8 +487,8 @@ export const DatabaseConnectionString = () => {{!sharedPoolerPreferred && !ipv4Addon && (<><Separator className="w-full" />- <Collapsible_Shadcn_ className="group">- <CollapsibleTrigger_Shadcn_+ <Collapsible className="group">+ <CollapsibleTriggerasChildclassName="w-full justify-start !last:rounded-b group-data-open:rounded-b-none px-3">@@ -505,8 +505,8 @@ export const DatabaseConnectionString = () => {<Badge variant="success">IPv4 compatible</Badge></div></Button>- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_ className="bg-dash-sidebar rounded-b border text-xs">+ </CollapsibleTrigger>+ <CollapsibleContent className="bg-dash-sidebar rounded-b border text-xs"><CodeBlockwrapperClassName={cn('[&_pre]:border-x-0 [&_pre]:border-t-0 [&_pre]:px-4 [&_pre]:py-3',@@ -522,8 +522,8 @@ export const DatabaseConnectionString = () => {Only recommended when your network does not support IPv6. Added latencycompared to dedicated pooler.</p>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible></>)}</ConnectionPanel>@@ -589,8 +589,8 @@ export const DatabaseConnectionString = () => {{selectedTab === 'python' && (<><Separator />- <Collapsible_Shadcn_ className="px-8 py-5">- <CollapsibleTrigger_Shadcn_ className="group [&[data-state=open]>div>svg]:-rotate-180!">+ <Collapsible className="px-8 py-5">+ <CollapsibleTrigger className="group [&[data-state=open]>div>svg]:-rotate-180!"><div className="flex items-center gap-x-2 w-full"><p className="text-xs text-foreground-light group-hover:text-foreground transition">Connecting to SQL Alchemy@@ -601,8 +601,8 @@ export const DatabaseConnectionString = () => {size={14}/></div>- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_ className="my-2">+ </CollapsibleTrigger>+ <CollapsibleContent className="my-2"><div className="text-foreground-light text-xs grid gap-2"><p>Please use <code>postgresql://</code> instead of <code>postgres://</code> as your@@ -614,8 +614,8 @@ export const DatabaseConnectionString = () => {</p><p className="text-sm font-mono tracking-tight text-foreground-lighter"></p></div>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible></>)}diff --git a/apps/studio/components/interfaces/ConnectSheet/content/steps/direct-connection/IPv4StatusPanel.tsx b/apps/studio/components/interfaces/ConnectSheet/content/steps/direct-connection/IPv4StatusPanel.tsxindex 64968af9ded..87e0c0125cb 100644--- a/apps/studio/components/interfaces/ConnectSheet/content/steps/direct-connection/IPv4StatusPanel.tsx+++ b/apps/studio/components/interfaces/ConnectSheet/content/steps/direct-connection/IPv4StatusPanel.tsx@@ -1,14 +1,7 @@import { ChevronRight, X } from 'lucide-react'import Link from 'next/link'import { ReactNode } from 'react'-import {- Button,- cn,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,- WarningIcon,-} from 'ui'+import { Button, cn, Collapsible, CollapsibleContent, CollapsibleTrigger, WarningIcon } from 'ui'import { IS_PLATFORM } from '@/lib/constants'@@ -124,8 +117,8 @@ export function IPv4StatusPanel({ method, ipv4Status, projectRef }: IPv4StatusPa</div>{ipv4Status.type === 'error' && (- <Collapsible_Shadcn_ className="group -space-y-px">- <CollapsibleTrigger_Shadcn_+ <Collapsible className="group -space-y-px">+ <CollapsibleTriggerasChildclassName="group/collapse w-full justify-start rounded-t-none !last:rounded-b group-data-open:rounded-b-none border-muted">@@ -143,8 +136,8 @@ export function IPv4StatusPanel({ method, ipv4Status, projectRef }: IPv4StatusPa>Some platforms are IPv4-only:</Button>- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_ className="bg-dash-sidebar rounded-b border px-3 py-2">+ </CollapsibleTrigger>+ <CollapsibleContent className="bg-dash-sidebar rounded-b border px-3 py-2"><div className="flex flex-col gap-2"><p className="text-xs text-foreground-light max-w-xs">A few major platforms are IPv4-only and may not work with a Direct Connection:@@ -172,8 +165,8 @@ export function IPv4StatusPanel({ method, ipv4Status, projectRef }: IPv4StatusPaa IPv4 network.</p></div>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible>)}</>)}diff --git a/apps/studio/components/interfaces/Database/Backups/PITR/PITRSelection.tsx b/apps/studio/components/interfaces/Database/Backups/PITR/PITRSelection.tsxindex a7a9230a550..ac3ff50e846 100644--- a/apps/studio/components/interfaces/Database/Backups/PITR/PITRSelection.tsx+++ b/apps/studio/components/interfaces/Database/Backups/PITR/PITRSelection.tsx@@ -2,14 +2,7 @@ import { useParams } from 'common'import Link from 'next/link'import { useRouter } from 'next/router'import { useState } from 'react'-import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,- Button,- Modal,- WarningIcon,-} from 'ui'+import { Alert, AlertDescription, AlertTitle, Button, Modal, WarningIcon } from 'ui'import { BackupsEmpty } from '../BackupsEmpty'import { BackupsStorageAlert } from '../BackupsStorageAlert'@@ -84,15 +77,15 @@ export const PITRSelection = () => {) : (<>{hasReadReplicas && (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><WarningIcon />- <AlertTitle_Shadcn_>+ <AlertTitle>Unable to restore from PITR as project has read replicas enabled- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ </AlertTitle>+ <AlertDescription>You will need to remove all read replicas first from your project's infrastructuresettings prior to starting a PITR restore.- </AlertDescription_Shadcn_>+ </AlertDescription><div className="flex items-center gap-x-2 mt-2">{/* [Joshen] Ideally we have some links to a docs to explain why so */}<Button type="default">@@ -101,7 +94,7 @@ export const PITRSelection = () => {</Link></Button></div>- </Alert_Shadcn_>+ </Alert>)}{!showConfiguration ? (<PITRStatus@@ -164,16 +157,14 @@ export const PITRSelection = () => {</Modal.Content><Modal.Separator /><Modal.Content>- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><WarningIcon />- <AlertTitle_Shadcn_>- This action cannot be undone, not canceled once started- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>This action cannot be undone, not canceled once started</AlertTitle>+ <AlertDescription>Any changes made to your database after this point in time will be lost. This includesany changes to your project's storage and authentication.- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert></Modal.Content><Modal.Separator /><Modal.Content>diff --git a/apps/studio/components/interfaces/Database/Backups/RestoreToNewProject/CreateNewProjectDialog.tsx b/apps/studio/components/interfaces/Database/Backups/RestoreToNewProject/CreateNewProjectDialog.tsxindex d97de08f94d..17c69226639 100644--- a/apps/studio/components/interfaces/Database/Backups/RestoreToNewProject/CreateNewProjectDialog.tsx+++ b/apps/studio/components/interfaces/Database/Backups/RestoreToNewProject/CreateNewProjectDialog.tsx@@ -14,9 +14,9 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,} from 'ui'-import { Input } from 'ui-patterns/DataInputs/Input'+import { Input as PasswordInput } from 'ui-patterns/DataInputs/Input'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { z } from 'zod'@@ -140,7 +140,7 @@ export const CreateNewProjectDialog = ({render={({ field }) => (<FormItemLayout label="New Project Name"><FormControl>- <Input_Shadcn_ placeholder="Enter a name" type="text" {...field} />+ <Input placeholder="Enter a name" type="text" {...field} /></FormControl></FormItemLayout>)}@@ -161,7 +161,7 @@ export const CreateNewProjectDialog = ({}><FormControl>- <Input+ <PasswordInputid="db-password"type="password"placeholder="Type in a strong password"diff --git a/apps/studio/components/interfaces/Database/EnumeratedTypes/CreateEnumeratedTypeSidePanel.tsx b/apps/studio/components/interfaces/Database/EnumeratedTypes/CreateEnumeratedTypeSidePanel.tsxindex fc479c735bb..d1fc45bc3fd 100644--- a/apps/studio/components/interfaces/Database/EnumeratedTypes/CreateEnumeratedTypeSidePanel.tsx+++ b/apps/studio/components/interfaces/Database/EnumeratedTypes/CreateEnumeratedTypeSidePanel.tsx@@ -19,9 +19,9 @@ import { useEffect, useRef } from 'react'import { useFieldArray, useForm } from 'react-hook-form'import { toast } from 'sonner'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Button,cn,Form,@@ -31,7 +31,7 @@ import {FormItem,FormLabel,FormMessage,- Input_Shadcn_,+ Input,SidePanel,} from 'ui'import * as z from 'zod'@@ -153,7 +153,7 @@ const CreateEnumeratedTypeSidePanel = ({<FormItem><FormLabel>Name</FormLabel><FormControl>- <Input_Shadcn_ {...field} />+ <Input {...field} /></FormControl><FormMessage /></FormItem>@@ -166,7 +166,7 @@ const CreateEnumeratedTypeSidePanel = ({<FormItem><FormLabel>Description</FormLabel><FormControl>- <Input_Shadcn_ {...field} />+ <Input {...field} /></FormControl><FormDescription>Optional</FormDescription></FormItem>@@ -183,12 +183,10 @@ const CreateEnumeratedTypeSidePanel = ({>Values</span>- <Alert_Shadcn_>+ <Alert><AlertCircle strokeWidth={1.5} />- <AlertTitle_Shadcn_>- After creation, values cannot be deleted or sorted- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>After creation, values cannot be deleted or sorted</AlertTitle>+ <AlertDescription><p className="leading-normal! track">You will need to delete and recreate the enumerated type with the updated valuesinstead.@@ -207,8 +205,8 @@ const CreateEnumeratedTypeSidePanel = ({Learn more</Link></Button>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert><DndContextsensors={sensors}collisionDetection={closestCenter}diff --git a/apps/studio/components/interfaces/Database/EnumeratedTypes/EditEnumeratedTypeSidePanel.tsx b/apps/studio/components/interfaces/Database/EnumeratedTypes/EditEnumeratedTypeSidePanel.tsxindex b0d11862123..80fea96ed70 100644--- a/apps/studio/components/interfaces/Database/EnumeratedTypes/EditEnumeratedTypeSidePanel.tsx+++ b/apps/studio/components/interfaces/Database/EnumeratedTypes/EditEnumeratedTypeSidePanel.tsx@@ -19,9 +19,9 @@ import { useEffect, useRef } from 'react'import { useFieldArray, useForm } from 'react-hook-form'import { toast } from 'sonner'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Button,cn,Form,@@ -31,7 +31,7 @@ import {FormItem,FormLabel,FormMessage,- Input_Shadcn_,+ Input,SidePanel,} from 'ui'import * as z from 'zod'@@ -188,7 +188,7 @@ const EditEnumeratedTypeSidePanel = ({<FormItem><FormLabel>Name</FormLabel><FormControl>- <Input_Shadcn_ {...field} />+ <Input {...field} /></FormControl><FormMessage /></FormItem>@@ -201,7 +201,7 @@ const EditEnumeratedTypeSidePanel = ({<FormItem><FormLabel>Description</FormLabel><FormControl>- <Input_Shadcn_ {...field} />+ <Input {...field} /></FormControl><FormDescription>Optional</FormDescription></FormItem>@@ -218,10 +218,10 @@ const EditEnumeratedTypeSidePanel = ({>Values</span>- <Alert_Shadcn_>+ <Alert><AlertCircle strokeWidth={1.5} />- <AlertTitle_Shadcn_>Existing values cannot be deleted or sorted</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Existing values cannot be deleted or sorted</AlertTitle>+ <AlertDescription><p className="leading-normal! track">You will need to delete and recreate the enumerated type with the updated valuesinstead.@@ -240,8 +240,8 @@ const EditEnumeratedTypeSidePanel = ({Learn more</Link></Button>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert><DndContextsensors={sensors}collisionDetection={closestCenter}diff --git a/apps/studio/components/interfaces/Database/EnumeratedTypes/EnumeratedTypeValueRow.tsx b/apps/studio/components/interfaces/Database/EnumeratedTypes/EnumeratedTypeValueRow.tsxindex ecafd3db303..5eabf2ddf60 100644--- a/apps/studio/components/interfaces/Database/EnumeratedTypes/EnumeratedTypeValueRow.tsx+++ b/apps/studio/components/interfaces/Database/EnumeratedTypes/EnumeratedTypeValueRow.tsx@@ -2,7 +2,7 @@ import { useSortable } from '@dnd-kit/sortable'import { CSS } from '@dnd-kit/utilities'import { GripVertical, Trash } from 'lucide-react'import type { Control, FieldPath, FieldValues } from 'react-hook-form'-import { Button, FormControl, FormField, FormItem, FormLabel, FormMessage, Input_Shadcn_ } from 'ui'+import { Button, FormControl, FormField, FormItem, FormLabel, FormMessage, Input } from 'ui'interface EnumeratedTypeValueRowProps<TFieldValues extends FieldValues = FieldValues,@@ -56,7 +56,7 @@ const EnumeratedTypeValueRow = <TFieldValues extends FieldValues>({><GripVertical size={16} strokeWidth={1.5} /></button>- <Input_Shadcn_ {...inputField} className="w-full" />+ <Input {...inputField} className="w-full" /><Buttontype="default"size="small"diff --git a/apps/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx b/apps/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsxindex efaa8c30281..9c71ad34c3f 100644--- a/apps/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx+++ b/apps/studio/components/interfaces/Database/Extensions/EnableExtensionModal.tsx@@ -14,7 +14,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,Select_Shadcn_,SelectContent_Shadcn_,SelectItem_Shadcn_,@@ -183,7 +183,7 @@ export const EnableExtensionModal = ({isReactForm={false}label="Select a schema to enable the extension for">- <Input_Shadcn_ disabled value={defaultSchema} />+ <Input disabled value={defaultSchema} /></FormItemLayout><p className="text-sm text-foreground-light">Extension must be installed in the "{defaultSchema}" schema.@@ -251,7 +251,7 @@ export const EnableExtensionModal = ({render={({ field }) => (<FormItemLayout name="name" label="Schema name"><FormControl>- <Input_Shadcn_ {...field} />+ <Input {...field} /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Database/Functions/CreateFunction/index.tsx b/apps/studio/components/interfaces/Database/Functions/CreateFunction/index.tsxindex 946577fbd19..fea6d6c6bd2 100644--- a/apps/studio/components/interfaces/Database/Functions/CreateFunction/index.tsx+++ b/apps/studio/components/interfaces/Database/Functions/CreateFunction/index.tsx@@ -14,7 +14,7 @@ import {FormItem,FormLabel,FormMessage,- Input_Shadcn_,+ Input,RadioGroupStacked,RadioGroupStackedItem,ScrollArea,@@ -186,7 +186,7 @@ export const CreateFunction = ({layout="horizontal"><FormControl>- <Input_Shadcn_ {...field} placeholder="Name of function" />+ <Input {...field} placeholder="Name of function" /></FormControl></FormItemLayout>)}@@ -440,7 +440,7 @@ const FormFieldArgs = ({ readonly }: FormFieldConfigParamsProps) => {render={({ field }) => (<FormItem className="flex-1"><FormControl>- <Input_Shadcn_ {...field} disabled={readonly} placeholder="argument_name" />+ <Input {...field} disabled={readonly} placeholder="argument_name" /></FormControl><FormMessage /></FormItem>@@ -452,7 +452,7 @@ const FormFieldArgs = ({ readonly }: FormFieldConfigParamsProps) => {<FormItem className="flex-1"><FormControl>{readonly ? (- <Input_Shadcn_ value={field.value} disabled readOnly className="h-auto" />+ <Input value={field.value} disabled readOnly className="h-auto" />) : (<><Select_Shadcn_diff --git a/apps/studio/components/interfaces/Database/Hooks/FormContents.tsx b/apps/studio/components/interfaces/Database/Hooks/FormContents.tsxindex f081481aba3..ae940a37b4b 100644--- a/apps/studio/components/interfaces/Database/Hooks/FormContents.tsx+++ b/apps/studio/components/interfaces/Database/Hooks/FormContents.tsx@@ -8,7 +8,7 @@ import {Checkbox,FormControl,FormField,- Input_Shadcn_,+ Input,Label_Shadcn_,RadioGroupStacked,RadioGroupStackedItem,@@ -111,7 +111,7 @@ export const FormContents = ({ form, selectedHook }: FormContentsProps) => {render={({ field }) => (<FormItemLayout label="Name" layout="vertical" className="gap-1"><FormControl>- <Input_Shadcn_ {...field} placeholder="my_webhook" />+ <Input {...field} placeholder="my_webhook" /></FormControl><p className="mt-2 text-xs text-foreground-lighter">Do not use spaces/whitespacesdiff --git a/apps/studio/components/interfaces/Database/Hooks/HTTPRequestConfig.tsx b/apps/studio/components/interfaces/Database/Hooks/HTTPRequestConfig.tsxindex cf07cef8113..a719f99fffd 100644--- a/apps/studio/components/interfaces/Database/Hooks/HTTPRequestConfig.tsx+++ b/apps/studio/components/interfaces/Database/Hooks/HTTPRequestConfig.tsx@@ -5,7 +5,7 @@ import {Button,FormControl,FormField,- Input_Shadcn_,+ Input,Select_Shadcn_,SelectContent_Shadcn_,SelectItem_Shadcn_,@@ -82,7 +82,7 @@ export const HTTPRequestConfig = ({ form }: HTTPRequestConfigProps) => {description="URL of the HTTP request. Must include HTTP/HTTPS"><FormControl>- <Input_Shadcn_ {...field} placeholder="http://api.com/path/resource" />+ <Input {...field} placeholder="http://api.com/path/resource" /></FormControl></FormItemLayout>)}@@ -144,7 +144,7 @@ export const HTTPRequestConfig = ({ form }: HTTPRequestConfigProps) => {><FormControl><div className="relative">- <Input_Shadcn_+ <Input{...field}type="number"onChange={(e) => field.onChange(Number(e.target.value))}diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DestinationNameInput.tsx b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DestinationNameInput.tsxindex 88da0dd38bf..c04a4c1a2dc 100644--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DestinationNameInput.tsx+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DestinationNameInput.tsx@@ -1,5 +1,5 @@import type { UseFormReturn } from 'react-hook-form'-import { FormControl, FormField, Input_Shadcn_ } from 'ui'+import { FormControl, FormField, Input } from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import type { DestinationPanelSchemaType } from './DestinationForm.schema'@@ -16,7 +16,7 @@ export const DestinationNameInput = ({ form }: DestinationNameInputProps) => {render={({ field }) => (<FormItemLayout label="Name" layout="horizontal"><FormControl>- <Input_Shadcn_ {...field} placeholder="My destination" />+ <Input {...field} placeholder="My destination" /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DestinationPanelFields.tsx b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DestinationPanelFields.tsxindex a08a6c472c8..9c82d349cfd 100644--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DestinationPanelFields.tsx+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/DestinationPanelFields.tsx@@ -7,18 +7,18 @@ import {Button,FormControl,FormField,- Input_Shadcn_,+ Input,Select_Shadcn_,SelectContent_Shadcn_,SelectGroup_Shadcn_,SelectItem_Shadcn_,SelectSeparator_Shadcn_,SelectTrigger_Shadcn_,- TextArea_Shadcn_,+ TextArea,WarningIcon,} from 'ui'import { Admonition } from 'ui-patterns'-import { Input } from 'ui-patterns/DataInputs/Input'+import { Input as PasswordInput } from 'ui-patterns/DataInputs/Input'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { CREATE_NEW_KEY, CREATE_NEW_NAMESPACE } from './DestinationForm.constants'@@ -45,7 +45,7 @@ export const BigQueryFields = ({ form }: { form: UseFormReturn<DestinationPanelSdescription="The Google Cloud project ID where data will be sent"><FormControl>- <Input_Shadcn_ {...field} placeholder="my-gcp-project" />+ <Input {...field} placeholder="my-gcp-project" /></FormControl></FormItemLayout>)}@@ -61,7 +61,7 @@ export const BigQueryFields = ({ form }: { form: UseFormReturn<DestinationPanelSdescription="The BigQuery dataset where replicated tables will be created"><FormControl>- <Input_Shadcn_ {...field} placeholder="my_dataset" />+ <Input {...field} placeholder="my_dataset" /></FormControl></FormItemLayout>)}@@ -77,7 +77,7 @@ export const BigQueryFields = ({ form }: { form: UseFormReturn<DestinationPanelSdescription="Service account credentials JSON for authenticating with BigQuery"><FormControl>- <TextArea_Shadcn_+ <TextArea{...field}rows={5}maxLength={5000}@@ -120,7 +120,7 @@ export const DuckLakeFields = ({ form }: { form: UseFormReturn<DestinationPanelSdescription="A PostgreSQL connection string for the DuckLake catalog"><FormControl>- <Input+ <PasswordInputvalue={field.value ?? ''}type={showCatalogUrl ? 'text' : 'password'}placeholder="postgres://user:pass@host:5432/ducklake_catalog"@@ -151,11 +151,7 @@ export const DuckLakeFields = ({ form }: { form: UseFormReturn<DestinationPanelSdescription="An S3 path where DuckLake data files will be written"><FormControl>- <Input_Shadcn_- {...field}- placeholder="s3://bucket/path"- value={field.value ?? ''}- />+ <Input {...field} placeholder="s3://bucket/path" value={field.value ?? ''} /></FormControl></FormItemLayout>)}@@ -171,7 +167,7 @@ export const DuckLakeFields = ({ form }: { form: UseFormReturn<DestinationPanelSdescription="Optional number of concurrent DuckDB connections to use"><FormControl>- <Input_Shadcn_+ <Inputtype="number"min={1}max={6}@@ -207,7 +203,7 @@ export const DuckLakeFields = ({ form }: { form: UseFormReturn<DestinationPanelSdescription="Required access key ID for the object storage provider"><FormControl>- <Input_Shadcn_ {...field} placeholder="my-access-key" value={field.value ?? ''} />+ <Input {...field} placeholder="my-access-key" value={field.value ?? ''} /></FormControl></FormItemLayout>)}@@ -224,7 +220,7 @@ export const DuckLakeFields = ({ form }: { form: UseFormReturn<DestinationPanelSclassName="relative"><FormControl>- <Input_Shadcn_+ <Input{...field}type={showSecretAccessKey ? 'text' : 'password'}placeholder="my-secret-key"@@ -251,7 +247,7 @@ export const DuckLakeFields = ({ form }: { form: UseFormReturn<DestinationPanelSdescription="Required region for the object storage provider"><FormControl>- <Input_Shadcn_ {...field} placeholder="us-east-1" value={field.value ?? ''} />+ <Input {...field} placeholder="us-east-1" value={field.value ?? ''} /></FormControl></FormItemLayout>)}@@ -267,11 +263,7 @@ export const DuckLakeFields = ({ form }: { form: UseFormReturn<DestinationPanelSdescription="Required endpoint without the protocol scheme, for example `127.0.0.1:5000/s3`"><FormControl>- <Input_Shadcn_- {...field}- placeholder="127.0.0.1:5000/s3"- value={field.value ?? ''}- />+ <Input {...field} placeholder="127.0.0.1:5000/s3" value={field.value ?? ''} /></FormControl></FormItemLayout>)}@@ -345,7 +337,7 @@ export const DuckLakeFields = ({ form }: { form: UseFormReturn<DestinationPanelSdescription="Schema used for DuckLake metadata tables in PostgreSQL"><FormControl>- <Input_Shadcn_ {...field} placeholder="ducklake" value={field.value ?? ''} />+ <Input {...field} placeholder="ducklake" value={field.value ?? ''} /></FormControl></FormItemLayout>)}@@ -361,7 +353,7 @@ export const DuckLakeFields = ({ form }: { form: UseFormReturn<DestinationPanelSdescription="Optional snapshot retention interval, for example `7 days`"><FormControl>- <Input_Shadcn_ {...field} placeholder="7 days" value={field.value ?? ''} />+ <Input {...field} placeholder="7 days" value={field.value ?? ''} /></FormControl></FormItemLayout>)}@@ -593,7 +585,7 @@ export const AnalyticsBucketFields = ({description="A unique name for the new namespace"><FormControl>- <Input_Shadcn_ {...field} placeholder="new_namespace" value={field.value || ''} />+ <Input {...field} placeholder="new_namespace" value={field.value || ''} /></FormControl></FormItemLayout>)}@@ -616,7 +608,7 @@ export const AnalyticsBucketFields = ({</>}>- <Input+ <PasswordInputdisabledvalue={field.value}type={showCatalogToken ? 'text' : 'password'}@@ -736,7 +728,7 @@ export const AnalyticsBucketFields = ({description="The secret key corresponding to your selected access key ID"><FormControl>- <Input_Shadcn_+ <Input{...field}type={showSecretAccessKey ? 'text' : 'password'}value={field.value ?? ''}diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/NewPublicationPanel.tsx b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/NewPublicationPanel.tsxindex 6f8f5c05891..4da202ffcd9 100644--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/NewPublicationPanel.tsx+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/NewPublicationPanel.tsx@@ -7,7 +7,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,Sheet,SheetContent,SheetDescription,@@ -102,7 +102,7 @@ export const NewPublicationPanel = ({ visible, sourceId, onClose }: NewPublicatirender={({ field }) => (<FormItemLayout label="Name" layout="vertical"><FormControl>- <Input_Shadcn_ {...field} placeholder="Name" />+ <Input {...field} placeholder="Name" /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Database/Replication/UpdateVersionModal.tsx b/apps/studio/components/interfaces/Database/Replication/UpdateVersionModal.tsxindex 7f45fd1c002..70f79357082 100644--- a/apps/studio/components/interfaces/Database/Replication/UpdateVersionModal.tsx+++ b/apps/studio/components/interfaces/Database/Replication/UpdateVersionModal.tsx@@ -1,12 +1,7 @@import { useParams } from 'common'import { ChevronDown } from 'lucide-react'import { toast } from 'sonner'-import {- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,- DialogSectionSeparator,-} from 'ui'+import { Collapsible, CollapsibleContent, CollapsibleTrigger, DialogSectionSeparator } from 'ui'import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'import { getStatusName } from './Pipeline.utils'@@ -117,12 +112,12 @@ export const UpdateVersionModal = ({</div><DialogSectionSeparator />- <Collapsible_Shadcn_ className="px-5 py-3 group">- <CollapsibleTrigger_Shadcn_ className="w-full flex items-center justify-between text-sm text-foreground-light">+ <Collapsible className="px-5 py-3 group">+ <CollapsibleTrigger className="w-full flex items-center justify-between text-sm text-foreground-light"><p>View version update details</p><ChevronDown size={14} className="group-data-open:-rotate-180 transition" />- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_>+ </CollapsibleTrigger>+ <CollapsibleContent><div className="flex flex-col gap-y-2 mt-2 pb-2"><div className="text-sm text-foreground prose max-w-full"><p className="text-foreground-light mb-1">Current version:</p>{' '}@@ -137,8 +132,8 @@ export const UpdateVersionModal = ({</code></div></div>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible></ConfirmationModal>)}diff --git a/apps/studio/components/interfaces/Database/RestoreToNewProject/RestoreToNewProject.tsx b/apps/studio/components/interfaces/Database/RestoreToNewProject/RestoreToNewProject.tsxindex edd84436fc6..a7a848c0dfb 100644--- a/apps/studio/components/interfaces/Database/RestoreToNewProject/RestoreToNewProject.tsx+++ b/apps/studio/components/interfaces/Database/RestoreToNewProject/RestoreToNewProject.tsx@@ -2,7 +2,7 @@ import { PermissionAction } from '@supabase/shared-types/out/constants'import { Loader2 } from 'lucide-react'import Link from 'next/link'import { useEffect, useState } from 'react'-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_, Button } from 'ui'+import { Alert, AlertDescription, AlertTitle, Button } from 'ui'import { Admonition } from 'ui-patterns/admonition'import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'@@ -257,10 +257,10 @@ export const RestoreToNewProject = () => {}}/>{isRestoring ? (- <Alert_Shadcn_ className="[&>svg]:bg-none! [&>svg]:text-foreground-light mb-6">+ <Alert className="[&>svg]:bg-none! [&>svg]:text-foreground-light mb-6"><Loader2 className="animate-spin" />- <AlertTitle_Shadcn_>Restoration in progress</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Restoration in progress</AlertTitle>+ <AlertDescription><p>The new project {(restoringClone?.target_project as any)?.name || ''} is currentlybeing created. You'll be able to restore again once the project is ready.@@ -270,8 +270,8 @@ export const RestoreToNewProject = () => {Go to new project</Link></Button>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>) : null}{previousClones?.length ? (<div className="flex flex-col gap-2">diff --git a/apps/studio/components/interfaces/Database/Roles/CreateRolePanel.tsx b/apps/studio/components/interfaces/Database/Roles/CreateRolePanel.tsxindex 6e2ef2f2dc2..b8a8d9b888a 100644--- a/apps/studio/components/interfaces/Database/Roles/CreateRolePanel.tsx+++ b/apps/studio/components/interfaces/Database/Roles/CreateRolePanel.tsx@@ -8,7 +8,7 @@ import {FormItem,FormLabel,FormMessage,- Input_Shadcn_,+ Input,SidePanel,Switch,} from 'ui'@@ -108,7 +108,7 @@ export const CreateRolePanel = ({ visible, onClose }: CreateRolePanelProps) => {Name</FormLabel><FormControl className="col-span-8">- <Input_Shadcn_ {...field} className="w-full" />+ <Input {...field} className="w-full" /></FormControl><FormMessage className="col-start-5 col-span-8" /></FormItem>diff --git a/apps/studio/components/interfaces/Database/Roles/RoleRow.tsx b/apps/studio/components/interfaces/Database/Roles/RoleRow.tsxindex 17b56e2f207..e5c71a3a5c7 100644--- a/apps/studio/components/interfaces/Database/Roles/RoleRow.tsx+++ b/apps/studio/components/interfaces/Database/Roles/RoleRow.tsx@@ -6,9 +6,9 @@ import { toast } from 'sonner'import {Button,cn,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,+ Collapsible,+ CollapsibleContent,+ CollapsibleTrigger,DropdownMenu,DropdownMenuContent,DropdownMenuItem,@@ -94,7 +94,7 @@ export const RoleRow = ({ role, disabled = false, onSelectDelete }: RoleRowPropsconst formId = `role-update-form-${role.id}`return (- <Collapsible_Shadcn_+ <Collapsibleopen={isExpanded}className={cn('bg-surface-100',@@ -110,7 +110,7 @@ export const RoleRow = ({ role, disabled = false, onSelectDelete }: RoleRowProps)}><div className={cn('flex items-center relative', !disabled && 'pr-(--card-padding-x)')}>- <CollapsibleTrigger_Shadcn_ asChild>+ <CollapsibleTrigger asChild><buttonid={`collapsible-trigger-${role.id}`}type="button"@@ -151,7 +151,7 @@ export const RoleRow = ({ role, disabled = false, onSelectDelete }: RoleRowProps</p></div></button>- </CollapsibleTrigger_Shadcn_>+ </CollapsibleTrigger>{!disabled && (<DropdownMenu><DropdownMenuTrigger asChild>@@ -177,7 +177,7 @@ export const RoleRow = ({ role, disabled = false, onSelectDelete }: RoleRowProps</DropdownMenu>)}</div>- <CollapsibleContent_Shadcn_>+ <CollapsibleContent><Form {...form}><formid={formId}@@ -229,7 +229,7 @@ export const RoleRow = ({ role, disabled = false, onSelectDelete }: RoleRowProps)}</form></Form>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible>)}diff --git a/apps/studio/components/interfaces/Database/Triggers/TriggerSheet.tsx b/apps/studio/components/interfaces/Database/Triggers/TriggerSheet.tsxindex 7b722bbaf64..6f17bc17770 100644--- a/apps/studio/components/interfaces/Database/Triggers/TriggerSheet.tsx+++ b/apps/studio/components/interfaces/Database/Triggers/TriggerSheet.tsx@@ -11,7 +11,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,Select_Shadcn_,SelectContent_Shadcn_,SelectItem_Shadcn_,@@ -218,7 +218,7 @@ export const TriggerSheet = ({description="Do not use spaces/whitespace."><FormControl>- <Input_Shadcn_ {...field} placeholder="Name of trigger" />+ <Input {...field} placeholder="Name of trigger" /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.tsx b/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.tsxindex f105c7d6e6d..0f98d64dbb9 100644--- a/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.tsx+++ b/apps/studio/components/interfaces/DiskManagement/DiskManagementForm.tsx@@ -10,9 +10,9 @@ import { toast } from 'sonner'import {Button,cn,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,+ Collapsible,+ CollapsibleContent,+ CollapsibleTrigger,DialogSectionSeparator,Form,Separator,@@ -470,11 +470,11 @@ export function DiskManagementForm() {<><Separator />- <Collapsible_Shadcn_+ <Collapsibleopen={advancedSettingsOpen}onOpenChange={() => setAdvancedSettingsOpenState((prev) => !prev)}>- <CollapsibleTrigger_Shadcn_ className="px-card py-3 w-full border flex items-center gap-6 rounded-t data-closed:rounded-b group justify-between">+ <CollapsibleTrigger className="px-card py-3 w-full border flex items-center gap-6 rounded-t data-closed:rounded-b group justify-between"><div className="flex flex-col items-start"><span className="text-sm text-foreground">Advanced disk settings</span><span className="text-sm text-foreground-light text-left">@@ -487,8 +487,8 @@ export function DiskManagementForm() {className="text-foreground-light transition-all group-data-open:rotate-90"strokeWidth={1}/>- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_+ </CollapsibleTrigger>+ <CollapsibleContentref={advancedSettingsRef}className={cn('transition-all rounded-b',@@ -538,8 +538,8 @@ export function DiskManagementForm() {/></div></div>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible></>)}</ScaffoldContainer>diff --git a/apps/studio/components/interfaces/DiskManagement/DiskManagementReviewAndSubmitDialog/DiskManagementReviewAndSubmitDialog.tsx b/apps/studio/components/interfaces/DiskManagement/DiskManagementReviewAndSubmitDialog/DiskManagementReviewAndSubmitDialog.tsxindex 5c54d9acf0b..1f13db93f9f 100644--- a/apps/studio/components/interfaces/DiskManagement/DiskManagementReviewAndSubmitDialog/DiskManagementReviewAndSubmitDialog.tsx+++ b/apps/studio/components/interfaces/DiskManagement/DiskManagementReviewAndSubmitDialog/DiskManagementReviewAndSubmitDialog.tsx@@ -2,8 +2,8 @@ import { PermissionAction } from '@supabase/shared-types/out/constants'import { ArrowRight } from 'lucide-react'import { UseFormReturn } from 'react-hook-form'import {- Alert_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertTitle,Button,ButtonProps,Dialog,@@ -288,10 +288,10 @@ export const DiskManagementReviewAndSubmitDialog = ({<><DialogSectionSeparator /><DialogSection>- <Alert_Shadcn_ variant={message.type === 'error' ? 'destructive' : 'default'}>+ <Alert variant={message.type === 'error' ? 'destructive' : 'default'}><WarningIcon />- <AlertTitle_Shadcn_>{message.message}</AlertTitle_Shadcn_>- </Alert_Shadcn_>+ <AlertTitle>{message.message}</AlertTitle>+ </Alert></DialogSection></>)}diff --git a/apps/studio/components/interfaces/DiskManagement/ui/DiskManagementReadReplicas.tsx b/apps/studio/components/interfaces/DiskManagement/ui/DiskManagementReadReplicas.tsxindex e49082635fe..dcd2ae660e1 100644--- a/apps/studio/components/interfaces/DiskManagement/ui/DiskManagementReadReplicas.tsx+++ b/apps/studio/components/interfaces/DiskManagement/ui/DiskManagementReadReplicas.tsx@@ -1,11 +1,6 @@import { useParams } from 'common'import { AnimatePresence, motion } from 'framer-motion'-import {- Alert_Shadcn_ as Alert,- AlertDescription_Shadcn_ as AlertDescription,- AlertTitle_Shadcn_ as AlertTitle,- InfoIcon,-} from 'ui'+import { Alert, AlertDescription, AlertTitle, InfoIcon } from 'ui'import { BillingChangeBadge } from './BillingChangeBadge'import { DISK_LIMITS, DISK_PRICING, DiskType } from './DiskManagement.constants'diff --git a/apps/studio/components/interfaces/DiskManagement/ui/SpendCapDisabledSection.tsx b/apps/studio/components/interfaces/DiskManagement/ui/SpendCapDisabledSection.tsxindex da0dcef08cc..15ad3687864 100644--- a/apps/studio/components/interfaces/DiskManagement/ui/SpendCapDisabledSection.tsx+++ b/apps/studio/components/interfaces/DiskManagement/ui/SpendCapDisabledSection.tsx@@ -1,11 +1,6 @@import { AnimatePresence, motion } from 'framer-motion'import Link from 'next/link'-import {- AlertDescription_Shadcn_ as AlertDescription,- AlertTitle_Shadcn_ as AlertTitle,- buttonVariants,- cn,-} from 'ui'+import { AlertDescription, AlertTitle, buttonVariants, cn } from 'ui'import { Admonition } from 'ui-patterns/admonition'import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'diff --git a/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionDetails.tsx b/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionDetails.tsxindex cfc0423f80f..a0feafae502 100644--- a/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionDetails.tsx+++ b/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionDetails.tsx@@ -6,9 +6,9 @@ import { useEffect, useMemo, useState } from 'react'import { SubmitHandler, useForm } from 'react-hook-form'import { toast } from 'sonner'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Button,Card,CardContent,@@ -346,15 +346,13 @@ export const EdgeFunctionDetails = () => {</PageSectionSummary></PageSectionMeta><PageSectionContent>- <Alert_Shadcn_ variant="destructive">+ <Alert variant="destructive"><CriticalIcon />- <AlertTitle_Shadcn_>- Once your function is deleted, it can no longer be restored- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Once your function is deleted, it can no longer be restored</AlertTitle>+ <AlertDescription>Make sure you have made a backup if you want to restore your edge function- </AlertDescription_Shadcn_>- <AlertDescription_Shadcn_ className="mt-3">+ </AlertDescription>+ <AlertDescription className="mt-3"><Buttontype="danger"disabled={!canUpdateEdgeFunction}@@ -363,8 +361,8 @@ export const EdgeFunctionDetails = () => {>Delete edge function</Button>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert></PageSectionContent></PageSection><ConfirmationModaldiff --git a/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionTesterSheet.tsx b/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionTesterSheet.tsxindex 6452ae22e74..85329236de0 100644--- a/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionTesterSheet.tsx+++ b/apps/studio/components/interfaces/Functions/EdgeFunctionDetails/EdgeFunctionTesterSheet.tsx@@ -10,7 +10,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_ as Input,+ Input,Label_Shadcn_ as Label,ResizableHandle,ResizablePanel,@@ -29,7 +29,7 @@ import {TabsContent_Shadcn_ as TabsContent,TabsList_Shadcn_ as TabsList,TabsTrigger_Shadcn_ as TabsTrigger,- TextArea_Shadcn_ as Textarea,+ Textarea,} from 'ui'import { CodeBlock } from 'ui-patterns/CodeBlock'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'diff --git a/apps/studio/components/interfaces/Functions/EdgeFunctionSecrets/EditSecretSheet.tsx b/apps/studio/components/interfaces/Functions/EdgeFunctionSecrets/EditSecretSheet.tsxindex afffb1b78cd..d0dfc795df0 100644--- a/apps/studio/components/interfaces/Functions/EdgeFunctionSecrets/EditSecretSheet.tsx+++ b/apps/studio/components/interfaces/Functions/EdgeFunctionSecrets/EditSecretSheet.tsx@@ -10,7 +10,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,Sheet,SheetContent,SheetFooter,@@ -18,7 +18,7 @@ import {SheetSection,SheetTitle,} from 'ui'-import { Input } from 'ui-patterns/DataInputs/Input'+import { Input as PasswordInput } from 'ui-patterns/DataInputs/Input'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import z from 'zod'@@ -98,7 +98,7 @@ export function EditSecretSheet({ secret, visible, onClose }: EditSecretSheetProrender={({ field }) => (<FormItemLayout label="Name" layout="horizontal"><FormControl>- <Input_Shadcn_+ <Input{...field}readOnlyclassName="text-foreground-light! cursor-not-allowed"@@ -117,7 +117,7 @@ export function EditSecretSheet({ secret, visible, onClose }: EditSecretSheetProdescription="Secrets can’t be retrieved once saved. Enter a new value to overwrite the existing value."><FormControl>- <Input+ <PasswordInput{...field}type={showSecretValue ? 'text' : 'password'}placeholder="my-secret-value"diff --git a/apps/studio/components/interfaces/Functions/TerminalInstructions.tsx b/apps/studio/components/interfaces/Functions/TerminalInstructions.tsxindex aa62e519bcd..fe8e76381cc 100644--- a/apps/studio/components/interfaces/Functions/TerminalInstructions.tsx+++ b/apps/studio/components/interfaces/Functions/TerminalInstructions.tsx@@ -3,12 +3,7 @@ import { useParams } from 'common'import { ExternalLink, Maximize2, Minimize2, Terminal } from 'lucide-react'import { useRouter } from 'next/router'import { ComponentPropsWithoutRef, ElementRef, forwardRef, useState } from 'react'-import {- Button,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,-} from 'ui'+import { Button, Collapsible, CollapsibleContent, CollapsibleTrigger } from 'ui'import type { Commands } from './Functions.types'import CommandRender from '@/components/interfaces/Functions/CommandRender'@@ -19,13 +14,13 @@ import { useProjectApiUrl } from '@/data/config/project-endpoint-query'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'import { DOCS_URL } from '@/lib/constants'-interface TerminalInstructionsProps extends ComponentPropsWithoutRef<typeof Collapsible_Shadcn_> {+interface TerminalInstructionsProps extends ComponentPropsWithoutRef<typeof Collapsible> {closable?: booleanremoveBorder?: boolean}export const TerminalInstructions = forwardRef<- ElementRef<typeof Collapsible_Shadcn_>,+ ElementRef<typeof Collapsible>,TerminalInstructionsProps>(({ closable = false, removeBorder = false, ...props }, ref) => {const router = useRouter()@@ -90,14 +85,14 @@ export const TerminalInstructions = forwardRef<]return (- <Collapsible_Shadcn_+ <Collapsibleref={ref}open={showInstructions}className="w-full"onOpenChange={() => setShowInstructions(!showInstructions)}{...props}>- <CollapsibleTrigger_Shadcn_ className="flex w-full justify-between" disabled={!closable}>+ <CollapsibleTrigger className="flex w-full justify-between" disabled={!closable}><div className="flex items-center gap-x-3"><div className="flex items-center justify-center w-8 h-8 p-2 border rounded-sm bg-alternative"><Terminal strokeWidth={2} />@@ -113,8 +108,8 @@ export const TerminalInstructions = forwardRef<)}</div>)}- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_ className="w-full transition-all data-closed:animate-collapsible-up data-open:animate-collapsible-down">+ </CollapsibleTrigger>+ <CollapsibleContent className="w-full transition-all data-closed:animate-collapsible-up data-open:animate-collapsible-down"><CommandRender commands={commands} className="my-4" />{tokens && tokens.length === 0 ? (<div className="py-4 space-y-3 border-t">@@ -150,8 +145,8 @@ export const TerminalInstructions = forwardRef<</div></div>)}- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible>)})diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CreateCronJobSheet.tsx b/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CreateCronJobSheet.tsxindex 2b7c65a63d1..ce90aa4a5d7 100644--- a/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CreateCronJobSheet.tsx+++ b/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CreateCronJobSheet.tsx@@ -11,7 +11,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,RadioGroupStacked,RadioGroupStackedItem,Separator,@@ -309,7 +309,7 @@ export const CreateCronJobSheet = ({ open, selectedCronJob, onClose }: CreateCrorender={({ field }) => (<FormItemLayout label="Name" layout="vertical" className="gap-1 relative"><FormControl>- <Input_Shadcn_ {...field} disabled={isEditing} />+ <Input {...field} disabled={isEditing} /></FormControl><span className="text-foreground-lighter text-xs absolute top-0 right-0">Cron jobs cannot be renamed once createddiff --git a/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CronJobScheduleSection.tsx b/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CronJobScheduleSection.tsxindex d1d7cf442d3..892b3d9cb4c 100644--- a/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CronJobScheduleSection.tsx+++ b/apps/studio/components/interfaces/Integrations/CronJobs/CreateCronJobSheet/CronJobScheduleSection.tsx@@ -13,11 +13,10 @@ import {FormItem,FormLabel,FormMessage,- Input_Shadcn_,+ Input,SheetSection,Switch,} from 'ui'-import { Input } from 'ui-patterns/DataInputs/Input'import { useDebounce } from 'use-debounce'import { formatScheduleString, getScheduleMessage } from '../CronJobs.utils'@@ -103,7 +102,7 @@ export const CronJobScheduleSection = ({ form, supportsSeconds }: CronJobSchedulonChange={(e) => setInputValue(e.target.value)}/>) : (- <Input_Shadcn_+ <Input{...field}autoComplete="off"placeholder="* * * * *"diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/HttpBodyFieldSection.tsx b/apps/studio/components/interfaces/Integrations/CronJobs/HttpBodyFieldSection.tsxindex 4a6fb48d9ea..dbfadd826f0 100644--- a/apps/studio/components/interfaces/Integrations/CronJobs/HttpBodyFieldSection.tsx+++ b/apps/studio/components/interfaces/Integrations/CronJobs/HttpBodyFieldSection.tsx@@ -6,7 +6,7 @@ import {FormLabel,FormMessage,SheetSection,- TextArea_Shadcn_,+ TextArea,} from 'ui'import { CreateCronJobForm } from './CreateCronJobSheet/CreateCronJobSheet.constants'@@ -25,7 +25,7 @@ export const HttpBodyFieldSection = ({ form }: HttpBodyFieldSectionProps) => {<FormItem className="gap-1 flex flex-col"><FormLabel>HTTP Request Body</FormLabel><FormControl>- <TextArea_Shadcn_+ <TextAreaclassName="h-72 rounded-none px-4 outline-hidden"value={field.value}onChange={field.onChange}diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/HttpRequestSection.tsx b/apps/studio/components/interfaces/Integrations/CronJobs/HttpRequestSection.tsxindex ee964d84b76..44d8665f5a6 100644--- a/apps/studio/components/interfaces/Integrations/CronJobs/HttpRequestSection.tsx+++ b/apps/studio/components/interfaces/Integrations/CronJobs/HttpRequestSection.tsx@@ -5,7 +5,7 @@ import {FormItem,FormLabel,FormMessage,- Input_Shadcn_ as Input,+ Input,InputGroup,InputGroupAddon,InputGroupInput,diff --git a/apps/studio/components/interfaces/Integrations/DataApi/DataApiDisabledState.tsx b/apps/studio/components/interfaces/Integrations/DataApi/DataApiDisabledState.tsxindex d2300e0e450..e087da46dff 100644--- a/apps/studio/components/interfaces/Integrations/DataApi/DataApiDisabledState.tsx+++ b/apps/studio/components/interfaces/Integrations/DataApi/DataApiDisabledState.tsx@@ -1,6 +1,6 @@import { useParams } from 'common'import { AlertCircle } from 'lucide-react'-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_ } from 'ui'+import { Alert, AlertDescription, AlertTitle } from 'ui'import { InlineLink } from '@/components/ui/InlineLink'@@ -13,17 +13,17 @@ export const DataApiDisabledState = ({ description }: DataApiDisabledStateProps)return (<div className="flex w-full flex-1 items-center justify-center p-10">- <Alert_Shadcn_ className="max-w-md">+ <Alert className="max-w-md"><AlertCircle size={16} />- <AlertTitle_Shadcn_>Data API is disabled</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Data API is disabled</AlertTitle>+ <AlertDescription>Enable the Data API in the{' '}<InlineLink href={`/project/${projectRef}/integrations/data_api/overview`}>Overview</InlineLink>{' '}tab to {description}.- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert></div>)}diff --git a/apps/studio/components/interfaces/Integrations/DataApi/OverviewTab.tsx b/apps/studio/components/interfaces/Integrations/DataApi/OverviewTab.tsxindex b2e936b8b0f..f19e565bd10 100644--- a/apps/studio/components/interfaces/Integrations/DataApi/OverviewTab.tsx+++ b/apps/studio/components/interfaces/Integrations/DataApi/OverviewTab.tsx@@ -1,6 +1,6 @@import { useFlag, useParams } from 'common'import { AlertCircle } from 'lucide-react'-import { Alert_Shadcn_, AlertTitle_Shadcn_, cn } from 'ui'+import { Alert, AlertTitle, cn } from 'ui'import { Admonition } from 'ui-patterns/admonition'import { IntegrationOverviewTab } from '../Integration/IntegrationOverviewTab'@@ -20,12 +20,10 @@ const DataApiOverview = () => {return (<div className="max-w-4xl flex flex-col">{!isProjectLoading && project?.status !== PROJECT_STATUS.ACTIVE_HEALTHY ? (- <Alert_Shadcn_ variant="destructive">+ <Alert variant="destructive"><AlertCircle size={16} />- <AlertTitle_Shadcn_>- API settings are unavailable as the project is not active- </AlertTitle_Shadcn_>- </Alert_Shadcn_>+ <AlertTitle>API settings are unavailable as the project is not active</AlertTitle>+ </Alert>) : (<><divdiff --git a/apps/studio/components/interfaces/Integrations/Queues/CreateQueueSheet/QueueNameField.tsx b/apps/studio/components/interfaces/Integrations/Queues/CreateQueueSheet/QueueNameField.tsxindex f5cd6e1e396..3170d333f66 100644--- a/apps/studio/components/interfaces/Integrations/Queues/CreateQueueSheet/QueueNameField.tsx+++ b/apps/studio/components/interfaces/Integrations/Queues/CreateQueueSheet/QueueNameField.tsx@@ -1,5 +1,5 @@import { UseFormReturn } from 'react-hook-form'-import { FormControl, FormField, Input_Shadcn_, SheetSection } from 'ui'+import { FormControl, FormField, Input, SheetSection } from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { CreateQueueForm } from './CreateQueueSheet.schema'@@ -13,7 +13,7 @@ export function QueueNameField({ form }: { form: UseFormReturn<CreateQueueForm>render={({ field }) => (<FormItemLayout label="Name" layout="vertical" className="gap-1 relative"><FormControl>- <Input_Shadcn_ {...field} />+ <Input {...field} /></FormControl><span className="text-foreground-lighter text-xs absolute top-0 right-0">Can include letters, numbers, underscores, and hyphensdiff --git a/apps/studio/components/interfaces/Integrations/Vault/Secrets/AddNewSecretModal.tsx b/apps/studio/components/interfaces/Integrations/Vault/Secrets/AddNewSecretModal.tsxindex 2da71487f96..8c14248968c 100644--- a/apps/studio/components/interfaces/Integrations/Vault/Secrets/AddNewSecretModal.tsx+++ b/apps/studio/components/interfaces/Integrations/Vault/Secrets/AddNewSecretModal.tsx@@ -14,9 +14,9 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,} from 'ui'-import { Input } from 'ui-patterns/DataInputs/Input'+import { Input as PasswordInput } from 'ui-patterns/DataInputs/Input'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import * as z from 'zod'@@ -94,7 +94,7 @@ export const AddNewSecretModal = () => {render={({ field }) => (<FormItemLayout layout="vertical" label="Name"><FormControl className="col-span-6">- <Input_Shadcn_ {...field} />+ <Input {...field} /></FormControl></FormItemLayout>)}@@ -105,7 +105,7 @@ export const AddNewSecretModal = () => {render={({ field }) => (<FormItemLayout layout="vertical" label="Description" labelOptional="Optional"><FormControl className="col-span-6">- <Input_Shadcn_ {...field} />+ <Input {...field} /></FormControl></FormItemLayout>)}@@ -116,7 +116,7 @@ export const AddNewSecretModal = () => {render={({ field }) => (<FormItemLayout layout="vertical" label="Secret value"><FormControl className="col-span-6">- <Input reveal copy {...field} />+ <PasswordInput reveal copy {...field} /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Integrations/Vault/Secrets/EditSecretModal.tsx b/apps/studio/components/interfaces/Integrations/Vault/Secrets/EditSecretModal.tsxindex 04e92654896..9347b12837b 100644--- a/apps/studio/components/interfaces/Integrations/Vault/Secrets/EditSecretModal.tsx+++ b/apps/studio/components/interfaces/Integrations/Vault/Secrets/EditSecretModal.tsx@@ -16,7 +16,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'@@ -145,7 +145,7 @@ export const EditSecretModal = () => {render={({ field }) => (<FormItemLayout name="name" label="Name"><FormControl>- <Input_Shadcn_ id="name" {...field} />+ <Input id="name" {...field} /></FormControl></FormItemLayout>)}@@ -161,7 +161,7 @@ export const EditSecretModal = () => {labelOptional="Optional"><FormControl>- <Input_Shadcn_ id="description" {...field} data-lpignore="true" />+ <Input id="description" {...field} data-lpignore="true" /></FormControl></FormItemLayout>)}@@ -174,7 +174,7 @@ export const EditSecretModal = () => {<FormItemLayout name="secret" label="Secret value"><FormControl><div className="relative">- <Input_Shadcn_+ <Inputid="secret"type={showSecretValue ? 'text' : 'password'}{...field}diff --git a/apps/studio/components/interfaces/Integrations/Wrappers/ColumnType.tsx b/apps/studio/components/interfaces/Integrations/Wrappers/ColumnType.tsxindex a26488bb5e8..3451caf89b9 100644--- a/apps/studio/components/interfaces/Integrations/Wrappers/ColumnType.tsx+++ b/apps/studio/components/interfaces/Integrations/Wrappers/ColumnType.tsx@@ -12,9 +12,9 @@ import Link from 'next/link'import { ReactNode, useId, useState } from 'react'import { Control } from 'react-hook-form'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Button,cn,Command_Shadcn_,@@ -29,7 +29,7 @@ import {FormField,FormItem,FormLabel,- Input_Shadcn_,+ Input,Popover_Shadcn_,PopoverContent_Shadcn_,PopoverTrigger_Shadcn_,@@ -124,7 +124,7 @@ export const ColumnType = ({className={className}><FormControl>- <Input_Shadcn_ {...field} id={name} disabled readOnly />+ <Input {...field} id={name} disabled readOnly /></FormControl></FormItemLayout>)@@ -262,14 +262,14 @@ export const ColumnType = ({</PopoverContent_Shadcn_></Popover_Shadcn_>{showRecommendation && recommendation !== undefined && (- <Alert_Shadcn_ variant="warning" className="mt-2">+ <Alert variant="warning" className="mt-2"><CriticalIcon />- <AlertTitle_Shadcn_>+ <AlertTitle>{' '}It is recommended to use{' '}<code className="text-code-inline">{recommendation.alternative}</code> instead- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ </AlertTitle>+ <AlertDescription><p>Postgres recommends against using the data type{' '}<code className="text-code-inline">{field.value}</code> unless you have a very@@ -288,8 +288,8 @@ export const ColumnType = ({Use {recommendation.alternative}</Button></div>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}</FormItem>)diff --git a/apps/studio/components/interfaces/Integrations/Wrappers/CreateIcebergWrapperSheet.tsx b/apps/studio/components/interfaces/Integrations/Wrappers/CreateIcebergWrapperSheet.tsxindex ec390bf1bc9..437857d3681 100644--- a/apps/studio/components/interfaces/Integrations/Wrappers/CreateIcebergWrapperSheet.tsx+++ b/apps/studio/components/interfaces/Integrations/Wrappers/CreateIcebergWrapperSheet.tsx@@ -9,7 +9,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,RadioGroupStacked,RadioGroupStackedItem,SheetFooter,@@ -286,7 +286,7 @@ export const CreateIcebergWrapperSheet = ({}><FormControl>- <Input_Shadcn_ {...field} />+ <Input {...field} /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Integrations/Wrappers/CreateWrapperSheet.tsx b/apps/studio/components/interfaces/Integrations/Wrappers/CreateWrapperSheet.tsxindex 5d30ce9df6f..39779c53d9d 100644--- a/apps/studio/components/interfaces/Integrations/Wrappers/CreateWrapperSheet.tsx+++ b/apps/studio/components/interfaces/Integrations/Wrappers/CreateWrapperSheet.tsx@@ -11,7 +11,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,RadioGroupStacked,RadioGroupStackedItem,SheetFooter,@@ -251,7 +251,7 @@ export const CreateWrapperSheet = ({}><FormControl>- <Input_Shadcn_ id="wrapper_name" {...field} />+ <Input id="wrapper_name" {...field} /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Integrations/Wrappers/EditWrapperSheet.tsx b/apps/studio/components/interfaces/Integrations/Wrappers/EditWrapperSheet.tsxindex e40eb0c0581..8788fa456b0 100644--- a/apps/studio/components/interfaces/Integrations/Wrappers/EditWrapperSheet.tsx+++ b/apps/studio/components/interfaces/Integrations/Wrappers/EditWrapperSheet.tsx@@ -12,7 +12,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,SheetFooter,SheetHeader,SheetSection,@@ -237,7 +237,7 @@ export const EditWrapperSheet = ({}><FormControl>- <Input_Shadcn_ {...field} />+ <Input {...field} /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Integrations/Wrappers/InputField.tsx b/apps/studio/components/interfaces/Integrations/Wrappers/InputField.tsxindex 47cf6446307..9a17a2828a7 100644--- a/apps/studio/components/interfaces/Integrations/Wrappers/InputField.tsx+++ b/apps/studio/components/interfaces/Integrations/Wrappers/InputField.tsx@@ -2,8 +2,8 @@ import { InputVariants } from '@ui/components/shadcn/ui/input'import { HelpCircle } from 'lucide-react'import Link from 'next/link'import type { Control, FieldPath, FieldValues } from 'react-hook-form'-import { cn, FormControl, FormField, Input_Shadcn_, Textarea } from 'ui'-import { Input } from 'ui-patterns/DataInputs/Input'+import { cn, FormControl, FormField, Input, Textarea } from 'ui'+import { Input as PasswordInput } from 'ui-patterns/DataInputs/Input'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import type { ServerOption } from './Wrappers.types'@@ -57,9 +57,9 @@ const InputField = <) : option.isTextArea ? (<Textarea {...field} id={option.name} rows={6} className="input-mono resize-none" />) : option.secureEntry ? (- <Input copy reveal {...field} id={option.name} />+ <PasswordInput copy reveal {...field} id={option.name} />) : (- <Input_Shadcn_ {...field} id={option.name} />+ <Input {...field} id={option.name} />)}</FormControl></FormItemLayout>diff --git a/apps/studio/components/interfaces/Integrations/Wrappers/WrapperTableEditor.tsx b/apps/studio/components/interfaces/Integrations/Wrappers/WrapperTableEditor.tsxindex c62c13585aa..17795f29020 100644--- a/apps/studio/components/interfaces/Integrations/Wrappers/WrapperTableEditor.tsx+++ b/apps/studio/components/interfaces/Integrations/Wrappers/WrapperTableEditor.tsx@@ -21,7 +21,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,Label_Shadcn_,Popover_Shadcn_,PopoverContent_Shadcn_,@@ -223,7 +223,7 @@ const Option = ({ option, control }: { option: TableOption; control: Control<Fierender={({ field }) => (<FormItemLayout layout="vertical" label={option.label} name={option.name}><FormControl>- <Input_Shadcn_ {...field} id={option.name} placeholder={option.placeholder ?? ''} />+ <Input {...field} id={option.name} placeholder={option.placeholder ?? ''} /></FormControl></FormItemLayout>)}@@ -382,7 +382,7 @@ const TableForm = ({render={({ field }) => (<FormItemLayout name="schema_name" layout="vertical" label="Schema name"><FormControl>- <Input_Shadcn_ {...field} id="schema_name" />+ <Input {...field} id="schema_name" /></FormControl></FormItemLayout>)}@@ -400,7 +400,7 @@ const TableForm = ({description="You can query from this table after the wrapper is enabled."><FormControl>- <Input_Shadcn_ {...field} id="table_name" />+ <Input {...field} id="table_name" /></FormControl></FormItemLayout>)}@@ -478,7 +478,7 @@ const TableForm = ({label="Name"><FormControl>- <Input_Shadcn_ {...field} id={`columns.${columnIndex}.name`} />+ <Input {...field} id={`columns.${columnIndex}.name`} /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/JwtSecrets/jwt-settings.tsx b/apps/studio/components/interfaces/JwtSecrets/jwt-settings.tsxindex 9c10d1ad6b0..fead3312577 100644--- a/apps/studio/components/interfaces/JwtSecrets/jwt-settings.tsx+++ b/apps/studio/components/interfaces/JwtSecrets/jwt-settings.tsx@@ -26,9 +26,9 @@ import { useForm, type SubmitHandler } from 'react-hook-form'import { toast } from 'sonner'import {Button,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,+ Collapsible,+ CollapsibleContent,+ CollapsibleTrigger,DropdownMenu,DropdownMenuContent,DropdownMenuItem,@@ -372,16 +372,16 @@ export const JWTSettings = () => {</Admonition>)}- <Collapsible_Shadcn_ className="bg border rounded-md mt-4">- <CollapsibleTrigger_Shadcn_ className="p-4 w-full flex items-center justify-between [&[data-state=open]>svg]:-rotate-180!">+ <Collapsible className="bg border rounded-md mt-4">+ <CollapsibleTrigger className="p-4 w-full flex items-center justify-between [&[data-state=open]>svg]:-rotate-180!"><p className="text-sm">{disableLegacyJwtSecretRotation? 'How to migrate to the new API keys?': 'How to change your JWT secret?'}</p><ChevronDown size={14} className="transition-transform duration-200" />- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_ className="border-t p-4">+ </CollapsibleTrigger>+ <CollapsibleContent className="border-t p-4"><p className="text-sm text-foreground-light text-balance mb-2">{disableLegacyJwtSecretRotation? 'Migrate to the new publishable and secret API keys to enable rotation with zero downtime and without signing users out. The change is reversible until you revoke the legacy secret.'@@ -521,8 +521,8 @@ export const JWTSettings = () => {</DropdownMenu>)}</div>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible></>)}</Panel.Content>diff --git a/apps/studio/components/interfaces/LogDrains/LogDrainDestinationSheetForm.tsx b/apps/studio/components/interfaces/LogDrains/LogDrainDestinationSheetForm.tsxindex 01a4aa9f5be..37630e40738 100644--- a/apps/studio/components/interfaces/LogDrains/LogDrainDestinationSheetForm.tsx+++ b/apps/studio/components/interfaces/LogDrains/LogDrainDestinationSheetForm.tsx@@ -12,7 +12,7 @@ import {FormField,FormItem,FormLabel,- Input_Shadcn_,+ Input,RadioGroupCard,RadioGroupCardItem,Select_Shadcn_,@@ -29,7 +29,7 @@ import {SheetSection,SheetTitle,Switch,- TextArea_Shadcn_,+ TextArea,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { KeyValueFieldArray } from 'ui-patterns/form/KeyValueFieldArray/KeyValueFieldArray'@@ -309,7 +309,7 @@ function LogDrainFormItem({render={({ field }) => (<FormItemLayout layout="horizontal" label={label} description={description || ''}><FormControl>- <Input_Shadcn_ type={type || 'text'} placeholder={placeholder} {...field} />+ <Input type={type || 'text'} placeholder={placeholder} {...field} /></FormControl></FormItemLayout>)}@@ -918,7 +918,7 @@ export function LogDrainDestinationSheetForm({description="PEM encoded CA certificate for verifying the server. Falls back to the system CA bundle if omitted."><FormControl>- <TextArea_Shadcn_+ <TextAreaclassName="font-mono text-xs"placeholder="-----BEGIN CERTIFICATE-----"rows={4}@@ -938,7 +938,7 @@ export function LogDrainDestinationSheetForm({description="PEM encoded client certificate for mTLS."><FormControl>- <TextArea_Shadcn_+ <TextAreaclassName="font-mono text-xs"placeholder="-----BEGIN CERTIFICATE-----"rows={4}@@ -958,7 +958,7 @@ export function LogDrainDestinationSheetForm({description="PEM encoded client private key for mTLS. Required when a client certificate is provided."><FormControl>- <TextArea_Shadcn_+ <TextAreaclassName="font-mono text-xs"placeholder="-----BEGIN PRIVATE KEY-----"rows={4}diff --git a/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.tsx b/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.tsxindex 1d2a4711748..cfbba92202f 100644--- a/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.tsx+++ b/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.tsx@@ -6,13 +6,7 @@ import dayjs from 'dayjs'import { ArrowDown, ArrowUp, RefreshCw, User } from 'lucide-react'import Image from 'next/legacy/image'import { useEffect, useMemo, useState } from 'react'-import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,- Button,- WarningIcon,-} from 'ui'+import { Alert, AlertDescription, AlertTitle, Button, WarningIcon } from 'ui'import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'import { filterByProjects, filterByUsers, sortAuditLogs } from './AuditLogs.utils'@@ -258,14 +252,14 @@ export const AuditLogs = () => {{isError &&(isRangeExceededError ? (- <Alert_Shadcn_ variant="destructive" title="Date range too large">+ <Alert variant="destructive" title="Date range too large"><WarningIcon />- <AlertTitle_Shadcn_>Date range too large</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Date range too large</AlertTitle>+ <AlertDescription>The selected date range exceeds the maximum allowed period. Please select asmaller time range.- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>) : (<AlertError error={error} subject="Failed to retrieve audit logs" />))}diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerDataForm.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerDataForm.tsxindex 80878c296d2..fb4e7d52898 100644--- a/apps/studio/components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerDataForm.tsx+++ b/apps/studio/components/interfaces/Organization/BillingSettings/BillingCustomerData/BillingCustomerDataForm.tsx@@ -19,7 +19,7 @@ import {FormControl,FormField,FormMessage,- Input_Shadcn_ as Input,+ Input,Popover_Shadcn_ as Popover,PopoverContent_Shadcn_ as PopoverContent,PopoverTrigger_Shadcn_ as PopoverTrigger,diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/BillingEmail.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/BillingEmail.tsxindex a50b72fd7a4..c3052aafdc3 100644--- a/apps/studio/components/interfaces/Organization/BillingSettings/BillingEmail.tsx+++ b/apps/studio/components/interfaces/Organization/BillingSettings/BillingEmail.tsx@@ -5,7 +5,7 @@ import { useParams } from 'common'import { useEffect } from 'react'import { useForm } from 'react-hook-form'import { toast } from 'sonner'-import { FormMessage, Input_Shadcn_ } from 'ui'+import { FormMessage, Input } from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { InfoTooltip } from 'ui-patterns/info-tooltip'import {@@ -141,7 +141,7 @@ const BillingEmail = () => {render={({ field }) => (<FormItemLayout label="Email address"><FormControl>- <Input_Shadcn_+ <Inputtype="email"{...field}placeholder="Email"diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/CostControl/CostControl.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/CostControl/CostControl.tsxindex be588279c70..f2cbf98355e 100644--- a/apps/studio/components/interfaces/Organization/BillingSettings/CostControl/CostControl.tsx+++ b/apps/studio/components/interfaces/Organization/BillingSettings/CostControl/CostControl.tsx@@ -4,7 +4,7 @@ import { ExternalLink } from 'lucide-react'import { useTheme } from 'next-themes'import Image from 'next/image'import Link from 'next/link'-import { Alert_Shadcn_, AlertTitle_Shadcn_, Button } from 'ui'+import { Alert, AlertTitle, Button } from 'ui'import { Admonition } from 'ui-patterns/admonition'import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'@@ -102,18 +102,18 @@ const CostControl = ({}: CostControlProps) => {{isError && <AlertError subject="Failed to retrieve subscription" error={error} />}{isSuccess && costControlDisabled && (- <Alert_Shadcn_ className="flex flex-col items-center gap-y-2 border-0 rounded-none">+ <Alert className="flex flex-col items-center gap-y-2 border-0 rounded-none"><PartnerIconorganization={{ managed_by: selectedOrganization?.managed_by }}showTooltip={false}size="large"/>- <AlertTitle_Shadcn_ className="text-sm">+ <AlertTitle className="text-sm">The Spend Cap is not available for organizations managed by{' '}{PARTNER_TO_NAME[selectedOrganization?.managed_by]}.- </AlertTitle_Shadcn_>- </Alert_Shadcn_>+ </AlertTitle>+ </Alert>)}{isSuccess && !costControlDisabled && (diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/CostControl/SpendCapSidePanel.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/CostControl/SpendCapSidePanel.tsxindex 9517fa50f21..6acaa0d0ba6 100644--- a/apps/studio/components/interfaces/Organization/BillingSettings/CostControl/SpendCapSidePanel.tsx+++ b/apps/studio/components/interfaces/Organization/BillingSettings/CostControl/SpendCapSidePanel.tsx@@ -7,14 +7,7 @@ import Link from 'next/link'import { useEffect, useState } from 'react'import { pricing } from 'shared-data/pricing'import { toast } from 'sonner'-import {- Button,- cn,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,- SidePanel,-} from 'ui'+import { Button, cn, Collapsible, CollapsibleContent, CollapsibleTrigger, SidePanel } from 'ui'import { Admonition } from 'ui-patterns/admonition'import Table from '@/components/to-be-cleaned/Table'@@ -133,8 +126,8 @@ const SpendCapSidePanel = () => {exceed the included quota allowance of any billed line item in a billing cycle</p>- <Collapsible_Shadcn_ open={showUsageCosts} onOpenChange={setShowUsageCosts}>- <CollapsibleTrigger_Shadcn_ asChild>+ <Collapsible open={showUsageCosts} onOpenChange={setShowUsageCosts}>+ <CollapsibleTrigger asChild><div className="flex items-center space-x-2 cursor-pointer"><ChevronRightstrokeWidth={1.5}@@ -145,8 +138,8 @@ const SpendCapSidePanel = () => {How are each resource charged after exceeding the included quota?</p></div>- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_ asChild>+ </CollapsibleTrigger>+ <CollapsibleContent asChild><TableclassName="mt-4"head={@@ -191,8 +184,8 @@ const SpendCapSidePanel = () => {)})}/>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible>{isFreePlan && (<Admonitiondiff --git a/apps/studio/components/interfaces/Organization/BillingSettings/CreditCodeRedemption.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/CreditCodeRedemption.tsxindex a6e00f8547b..e3413800bc2 100644--- a/apps/studio/components/interfaces/Organization/BillingSettings/CreditCodeRedemption.tsx+++ b/apps/studio/components/interfaces/Organization/BillingSettings/CreditCodeRedemption.tsx@@ -19,7 +19,7 @@ import {DialogTrigger,Form,FormField,- Input_Shadcn_,+ Input,Separator,} from 'ui'import { Admonition, ShimmeringLoader, TimestampInfo } from 'ui-patterns'@@ -276,7 +276,7 @@ export const CreditCodeRedemption = ({className="gap-1"layout="horizontal">- <Input_Shadcn_+ <Input{...field}className="uppercase w-56 ml-auto"placeholder="ABCD-1234-EFGH-5678"diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/CreditTopUp.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/CreditTopUp.tsxindex ec044eb0a4c..d6081a4f940 100644--- a/apps/studio/components/interfaces/Organization/BillingSettings/CreditTopUp.tsx+++ b/apps/studio/components/interfaces/Organization/BillingSettings/CreditTopUp.tsx@@ -11,9 +11,9 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react'import { SubmitHandler, useForm } from 'react-hook-form'import { toast } from 'sonner'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Button,Dialog,DialogContent,@@ -26,7 +26,7 @@ import {DialogTrigger,Form,FormField,- Input_Shadcn_,+ Input,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'@@ -331,7 +331,7 @@ export const CreditTopUp = ({ slug }: { slug: string | undefined }) => {name="amount"render={({ field }) => (<FormItemLayout label="Amount (USD)" className="gap-1">- <Input_Shadcn_ {...field} type="number" placeholder="300" />+ <Input {...field} type="number" placeholder="300" /></FormItemLayout>)}/>@@ -354,36 +354,32 @@ export const CreditTopUp = ({ slug }: { slug: string | undefined }) => {/>{paymentIntentConfirmation && paymentIntentConfirmation.error && (- <Alert_Shadcn_ variant="destructive">+ <Alert variant="destructive"><AlertCircle className="h-4 w-4" />- <AlertTitle_Shadcn_>Error confirming payment</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>- {paymentIntentConfirmation.error.message}- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ <AlertTitle>Error confirming payment</AlertTitle>+ <AlertDescription>{paymentIntentConfirmation.error.message}</AlertDescription>+ </Alert>)}{paymentIntentConfirmation?.paymentIntent &&paymentIntentConfirmation.paymentIntent.status === 'processing' && (- <Alert_Shadcn_ variant="default">+ <Alert variant="default"><Info className="h-4 w-4" />- <AlertTitle_Shadcn_>Payment processing</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Payment processing</AlertTitle>+ <AlertDescription>Your payment is processing and we are waiting for a confirmation from yourcard issuer. If the payment goes through you'll automatically be credited.Please check back later.- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}{errorInitiatingTopUp && (- <Alert_Shadcn_ variant="destructive">+ <Alert variant="destructive"><AlertCircle className="h-4 w-4" />- <AlertTitle_Shadcn_>Error topping up balance</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>- {errorInitiatingTopUp.message}- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ <AlertTitle>Error topping up balance</AlertTitle>+ <AlertDescription>{errorInitiatingTopUp.message}</AlertDescription>+ </Alert>)}{!!validAmount && !creditPreviewInitialized && creditPreviewIsFetching && (diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/Restriction.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/Restriction.tsxindex fbc8331f34e..ccdbc9e7302 100644--- a/apps/studio/components/interfaces/Organization/BillingSettings/Restriction.tsx+++ b/apps/studio/components/interfaces/Organization/BillingSettings/Restriction.tsx@@ -2,14 +2,7 @@ import dayjs from 'dayjs'import { ExternalLink } from 'lucide-react'import Link from 'next/link'import { usePathname } from 'next/navigation'-import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,- Button,- CriticalIcon,- WarningIcon,-} from 'ui'+import { Alert, AlertDescription, AlertTitle, Button, CriticalIcon, WarningIcon } from 'ui'import { PricingMetric } from '@/data/analytics/org-daily-stats-query'import { VIOLATION_TYPE_LABELS } from '@/data/usage/constants'@@ -66,13 +59,11 @@ export const Restriction = () => {return (<>{shownAlert === 'exceededLimits' && (- <Alert_Shadcn_ variant="destructive">+ <Alert variant="destructive"><CriticalIcon />- <AlertTitle_Shadcn_>- Your organization's usage has exceeded its included quota- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Your organization's usage has exceeded its included quota</AlertTitle>+ <AlertDescription><p>Your projects can become unresponsive or enter read-only mode.{' '}{org.plan.id === 'free'@@ -98,14 +89,14 @@ export const Restriction = () => {<a href={`${DOCS_URL}/guides/platform/cost-control#spend-cap`}>About spend cap</a></Button></div>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}{shownAlert === 'gracePeriod' && (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><WarningIcon />- <AlertTitle_Shadcn_>Your grace period has started.</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Your grace period has started.</AlertTitle>+ <AlertDescription><p className="leading-tight">Your organization went over its quota in the previous billing cycle{violationLabels && ` ${violationLabels}`}. You can continue with your projects until@@ -143,14 +134,14 @@ export const Restriction = () => {</a></Button></div>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}{shownAlert === 'gracePeriodOver' && (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><WarningIcon />- <AlertTitle_Shadcn_>Your grace period is over.</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Your grace period is over.</AlertTitle>+ <AlertDescription><p>Your grace period ended on{' '}<span className="text-foreground">@@ -183,14 +174,14 @@ export const Restriction = () => {</a></Button></div>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}{shownAlert === 'restricted' && (- <Alert_Shadcn_ variant="destructive">+ <Alert variant="destructive"><CriticalIcon />- <AlertTitle_Shadcn_>All services are restricted.</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>All services are restricted.</AlertTitle>+ <AlertDescription><p>Fair Use Policy applies and your service is restricted. Your projects are not able toserve requests and will respond with a 402 status code. You have exceeded your plan's@@ -223,8 +214,8 @@ export const Restriction = () => {</a></Button></div>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}</>)diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/ExitSurveyModal.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/ExitSurveyModal.tsxindex 2b8c6a68239..4ec2e4d1e25 100644--- a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/ExitSurveyModal.tsx+++ b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/ExitSurveyModal.tsx@@ -1,7 +1,7 @@import { useFlag, useParams } from 'common'import { useState } from 'react'import { toast } from 'sonner'-import { Button, cn, Modal, TextArea_Shadcn_ as TextArea } from 'ui'+import { Button, cn, Modal, TextArea } from 'ui'import { Admonition } from 'ui-patterns/admonition'import { ProjectUpdateDisabledTooltip } from '../ProjectUpdateDisabledTooltip'diff --git a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/UpgradeModal.tsx b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/UpgradeModal.tsxindex b1454f2862a..d9a9c5d3507 100644--- a/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/UpgradeModal.tsx+++ b/apps/studio/components/interfaces/Organization/BillingSettings/Subscription/UpgradeModal.tsx@@ -2,7 +2,7 @@ import { useParams } from 'common'import { includes, without } from 'lodash'import { useReducer, useState } from 'react'import { toast } from 'sonner'-import { Modal, TextArea_Shadcn_ as TextArea } from 'ui'+import { Modal, TextArea } from 'ui'import { generateUpgradeReasons } from '../helpers'import { useSendUpgradeFeedbackMutation } from '@/data/feedback/upgrade-survey-send'diff --git a/apps/studio/components/interfaces/Organization/CloudMarketplace/AwsMarketplaceAutoRenewalWarning.tsx b/apps/studio/components/interfaces/Organization/CloudMarketplace/AwsMarketplaceAutoRenewalWarning.tsxindex 9aa1e25f0e2..4231f00c245 100644--- a/apps/studio/components/interfaces/Organization/CloudMarketplace/AwsMarketplaceAutoRenewalWarning.tsx+++ b/apps/studio/components/interfaces/Organization/CloudMarketplace/AwsMarketplaceAutoRenewalWarning.tsx@@ -1,6 +1,6 @@import dayjs from 'dayjs'import Link from 'next/link'-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_ } from 'ui'+import { Alert, AlertDescription, AlertTitle } from 'ui'interface Props {awsContractEndDate: string@@ -13,11 +13,11 @@ const AwsMarketplaceAutoRenewalWarning = ({}: Props) => {return (<div className="mt-5 mb-10">- <Alert_Shadcn_ variant="warning">- <AlertTitle_Shadcn_ className="text-foreground font-bold text-orange-1000">+ <Alert variant="warning">+ <AlertTitle className="text-foreground font-bold text-orange-1000">“Auto Renewal” is turned OFF for your AWS Marketplace subscription- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_ className="flex flex-col gap-3 wrap-break-word">+ </AlertTitle>+ <AlertDescription className="flex flex-col gap-3 wrap-break-word"><div>As a result, your Supabase organization will be downgraded to the Free Plan on{' '}{dayjs(awsContractEndDate).format('MMMM DD')}. If you have more than 2 projects running,@@ -28,8 +28,8 @@ const AwsMarketplaceAutoRenewalWarning = ({</Link>.</div>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert></div>)}diff --git a/apps/studio/components/interfaces/Organization/CloudMarketplace/AwsMarketplaceLinkExistingOrg.tsx b/apps/studio/components/interfaces/Organization/CloudMarketplace/AwsMarketplaceLinkExistingOrg.tsxindex f5fc42eb5bf..d388900bbdf 100644--- a/apps/studio/components/interfaces/Organization/CloudMarketplace/AwsMarketplaceLinkExistingOrg.tsx+++ b/apps/studio/components/interfaces/Organization/CloudMarketplace/AwsMarketplaceLinkExistingOrg.tsx@@ -9,9 +9,9 @@ import { SubmitHandler, useForm } from 'react-hook-form'import { toast } from 'sonner'import {Button,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,+ Collapsible,+ CollapsibleContent,+ CollapsibleTrigger,Form,FormField,Skeleton,@@ -236,12 +236,12 @@ export const AwsMarketplaceLinkExistingOrg = ({</Form>{orgsNotLinkable.length > 0 && !isLoadingOnboardingInfo && (- <Collapsible_Shadcn_+ <CollapsibleclassName="-space-y-px"open={isNotLinkableOrgListOpen || orgsLinkable.length === 0}onOpenChange={() => setIsNotLinkableOrgListOpen((prev) => !prev)}>- <CollapsibleTrigger_Shadcn_ className="py-2 w-full flex items-center group justify-between">+ <CollapsibleTrigger className="py-2 w-full flex items-center group justify-between"><p className="text-xs font-bold text-foreground-light">Organizations that can't be linked</p>@@ -250,8 +250,8 @@ export const AwsMarketplaceLinkExistingOrg = ({className="text-foreground-lighter transition-all group-data-open:rotate-90"strokeWidth={1}/>- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_+ </CollapsibleTrigger>+ <CollapsibleContentclassName={cn('flex flex-col gap-4 transition-all','data-closed:animate-collapsible-up data-open:animate-collapsible-down'@@ -274,8 +274,8 @@ export const AwsMarketplaceLinkExistingOrg = ({/>))}</div>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible>)}<div className={cn('flex gap-3 justify-end')}>diff --git a/apps/studio/components/interfaces/Organization/CloudMarketplace/NewAwsMarketplaceOrgForm.tsx b/apps/studio/components/interfaces/Organization/CloudMarketplace/NewAwsMarketplaceOrgForm.tsxindex 18a2c9f5fcf..7716e3d8a1a 100644--- a/apps/studio/components/interfaces/Organization/CloudMarketplace/NewAwsMarketplaceOrgForm.tsx+++ b/apps/studio/components/interfaces/Organization/CloudMarketplace/NewAwsMarketplaceOrgForm.tsx@@ -4,7 +4,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,Label_Shadcn_,Select_Shadcn_,SelectContent_Shadcn_,@@ -70,7 +70,7 @@ const NewAwsMarketplaceOrgForm = ({ onSubmit }: Props) => {<FormItemLayout label="Name" layout="horizontal"><FormControl><>- <Input_Shadcn_ {...field} placeholder="Organization name" />+ <Input {...field} placeholder="Organization name" /><div className="mt-1"><Label_Shadcn_htmlFor="name"diff --git a/apps/studio/components/interfaces/Organization/GeneralSettings/OrganizationDetailsForm.tsx b/apps/studio/components/interfaces/Organization/GeneralSettings/OrganizationDetailsForm.tsxindex 2559618c65a..7c821a4f86e 100644--- a/apps/studio/components/interfaces/Organization/GeneralSettings/OrganizationDetailsForm.tsx+++ b/apps/studio/components/interfaces/Organization/GeneralSettings/OrganizationDetailsForm.tsx@@ -5,8 +5,8 @@ import { useParams } from 'common'import { useEffect } from 'react'import { useForm } from 'react-hook-form'import { toast } from 'sonner'-import { Card, CardContent, CardFooter, Form, FormControl, FormField, Input_Shadcn_ } from 'ui'-import { Input } from 'ui-patterns/DataInputs/Input'+import { Card, CardContent, CardFooter, Form, FormControl, FormField, Input } from 'ui'+import { Input as PasswordInput } from 'ui-patterns/DataInputs/Input'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import * as z from 'zod'@@ -83,10 +83,7 @@ export const OrganizationDetailsForm = () => {render={({ field }) => (<FormItemLayout label="Organization name" layout="flex-row-reverse"><FormControl>- <Input_Shadcn_- {...field}- disabled={!canUpdateOrganization || isUpdatingDetails}- />+ <Input {...field} disabled={!canUpdateOrganization || isUpdatingDetails} /></FormControl></FormItemLayout>)}@@ -94,7 +91,7 @@ export const OrganizationDetailsForm = () => {</CardContent><CardContent><FormItemLayout label="Organization slug" layout="flex-row-reverse">- <Input copy readOnly id="slug" value={selectedOrganization?.slug ?? ''} />+ <PasswordInput copy disabled id="slug" value={selectedOrganization?.slug ?? ''} /></FormItemLayout></CardContent><CardFooter className="flex justify-end p-4 md:px-8">diff --git a/apps/studio/components/interfaces/Organization/NewOrg/NewOrgForm.tsx b/apps/studio/components/interfaces/Organization/NewOrg/NewOrgForm.tsxindex 8bbf7267711..3fba92ee488 100644--- a/apps/studio/components/interfaces/Organization/NewOrg/NewOrgForm.tsx+++ b/apps/studio/components/interfaces/Organization/NewOrg/NewOrgForm.tsx@@ -17,7 +17,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,Select_Shadcn_,SelectContent_Shadcn_,SelectItem_Shadcn_,@@ -431,7 +431,7 @@ export const NewOrgForm = ({description="What's the name of your company or team? You can change this later."><FormControl>- <Input_Shadcn_+ <InputautoFocustype="text"placeholder="Organization name"diff --git a/apps/studio/components/interfaces/Organization/OAuthApps/OAuthSecrets/OAuthSecrets.tsx b/apps/studio/components/interfaces/Organization/OAuthApps/OAuthSecrets/OAuthSecrets.tsxindex e4a64920007..8027f693adb 100644--- a/apps/studio/components/interfaces/Organization/OAuthApps/OAuthSecrets/OAuthSecrets.tsx+++ b/apps/studio/components/interfaces/Organization/OAuthApps/OAuthSecrets/OAuthSecrets.tsx@@ -1,7 +1,7 @@import { PermissionAction } from '@supabase/shared-types/out/constants'import { useParams } from 'common'import { useState } from 'react'-import { Alert_Shadcn_, AlertTitle_Shadcn_, InfoIcon } from 'ui'+import { Alert, AlertTitle, InfoIcon } from 'ui'import { SecretRow } from './SecretRow'import { ButtonTooltip } from '@/components/ui/ButtonTooltip'@@ -71,12 +71,12 @@ export const OAuthSecrets = ({ selectedApp }: Props) => {</div>{createdSecret && (- <Alert_Shadcn_ variant="default">+ <Alert variant="default"><InfoIcon />- <AlertTitle_Shadcn_>+ <AlertTitle>Make sure to copy your new client secret now. You won't be able to see it again.- </AlertTitle_Shadcn_>- </Alert_Shadcn_>+ </AlertTitle>+ </Alert>)}<div className="-space-y-px">diff --git a/apps/studio/components/interfaces/Organization/OAuthApps/PublishAppSidePanel/index.tsx b/apps/studio/components/interfaces/Organization/OAuthApps/PublishAppSidePanel/index.tsxindex 96bdd311743..cdfe5866d53 100644--- a/apps/studio/components/interfaces/Organization/OAuthApps/PublishAppSidePanel/index.tsx+++ b/apps/studio/components/interfaces/Organization/OAuthApps/PublishAppSidePanel/index.tsx@@ -16,7 +16,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,InputGroup,InputGroupAddon,InputGroupButton,@@ -234,7 +234,7 @@ export const PublishAppSidePanel = ({description={selectedApp?.id && `ID: ${selectedApp.id}`}><FormControl className="col-span-6">- <Input_Shadcn_ {...field} />+ <Input {...field} /></FormControl></FormItemLayout>)}@@ -245,7 +245,7 @@ export const PublishAppSidePanel = ({render={({ field }) => (<FormItemLayout layout="vertical" label="Website URL"><FormControl className="col-span-6">- <Input_Shadcn_ {...field} placeholder="https://my-website.com" />+ <Input {...field} placeholder="https://my-website.com" /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Organization/PrivateApps/Apps/CreateAppSheet/CreateAppSheet.tsx b/apps/studio/components/interfaces/Organization/PrivateApps/Apps/CreateAppSheet/CreateAppSheet.tsxindex d053b4b19c6..3532bf5c994 100644--- a/apps/studio/components/interfaces/Organization/PrivateApps/Apps/CreateAppSheet/CreateAppSheet.tsx+++ b/apps/studio/components/interfaces/Organization/PrivateApps/Apps/CreateAppSheet/CreateAppSheet.tsx@@ -11,7 +11,7 @@ import {CommandInput_Shadcn_,CommandItem_Shadcn_,CommandList_Shadcn_,- Input_Shadcn_,+ Input,Popover_Shadcn_,PopoverContent_Shadcn_,PopoverTrigger_Shadcn_,@@ -160,7 +160,7 @@ export function CreateAppSheet({ visible, onClose, onCreated }: CreateAppSheetPrdisabled={keyRevealed}><FormLayout label="Name" id="app-name">- <Input_Shadcn_+ <Inputid="app-name"placeholder="My integration"value={name}diff --git a/apps/studio/components/interfaces/Organization/PrivateApps/Apps/ViewAppSheet/ViewAppSheetDangerZone.tsx b/apps/studio/components/interfaces/Organization/PrivateApps/Apps/ViewAppSheet/ViewAppSheetDangerZone.tsxindex dd7d4820507..52693b413cf 100644--- a/apps/studio/components/interfaces/Organization/PrivateApps/Apps/ViewAppSheet/ViewAppSheetDangerZone.tsx+++ b/apps/studio/components/interfaces/Organization/PrivateApps/Apps/ViewAppSheet/ViewAppSheetDangerZone.tsx@@ -1,10 +1,4 @@-import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,- Button,- CriticalIcon,-} from 'ui'+import { Alert, AlertDescription, AlertTitle, Button, CriticalIcon } from 'ui'interface ViewAppSheetDangerZoneProps {onDelete: () => void@@ -14,18 +8,16 @@ export function ViewAppSheetDangerZone({ onDelete }: ViewAppSheetDangerZonePropsreturn (<div className="px-5 sm:px-6 py-6 space-y-3"><h3 className="text-sm font-medium text-foreground">Danger Zone</h3>- <Alert_Shadcn_ variant="destructive">+ <Alert variant="destructive"><CriticalIcon />- <AlertTitle_Shadcn_>Delete app</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>- Permanently delete this app and all its installations.- </AlertDescription_Shadcn_>+ <AlertTitle>Delete app</AlertTitle>+ <AlertDescription>Permanently delete this app and all its installations.</AlertDescription><div className="mt-2"><Button type="danger" onClick={onDelete}>Delete app</Button></div>- </Alert_Shadcn_>+ </Alert></div>)}diff --git a/apps/studio/components/interfaces/Organization/ProjectClaim/confirm.tsx b/apps/studio/components/interfaces/Organization/ProjectClaim/confirm.tsxindex d4fdffbdf0b..d85feaf490a 100644--- a/apps/studio/components/interfaces/Organization/ProjectClaim/confirm.tsx+++ b/apps/studio/components/interfaces/Organization/ProjectClaim/confirm.tsx@@ -4,13 +4,7 @@ import { CheckCircle2, ChevronRight, ChevronsLeftRight } from 'lucide-react'import Image from 'next/image'import { useRouter } from 'next/router'import { toast } from 'sonner'-import {- Button,- cn,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,-} from 'ui'+import { Button, cn, Collapsible, CollapsibleContent, CollapsibleTrigger } from 'ui'import { Admonition } from 'ui-patterns/admonition'import { ScopeSection } from '../OAuthApps/AuthorizeRequesterDetails'@@ -171,8 +165,8 @@ export const ProjectClaimConfirm = ({permissions to operate. This is normal and no action is needed from your side.</span>) : (- <Collapsible_Shadcn_>- <CollapsibleTrigger_Shadcn_ className="pb-3 w-full flex items-center justify-between group">+ <Collapsible>+ <CollapsibleTrigger className="pb-3 w-full flex items-center justify-between group"><p className="text-sm text-foreground-light text-left"><span className="font-foreground">List of permissions</span> that{' '}<span className="text-foreground">{requester.name}</span> will have for the{' '}@@ -186,8 +180,8 @@ export const ProjectClaimConfirm = ({className="text-foreground-light transition-all group-data-open:rotate-90 w-20"strokeWidth={1}/>- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_+ </CollapsibleTrigger>+ <CollapsibleContentclassName={cn('flex flex-col gap-8 transition-all','data-closed:animate-collapsible-up data-open:animate-collapsible-down'@@ -255,8 +249,8 @@ export const ProjectClaimConfirm = ({hasWriteScope={requester.scopes.includes(OAuthScope.STORAGE_WRITE)}/></div>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible>)}</div></div>diff --git a/apps/studio/components/interfaces/Organization/SSO/SSODomains.tsx b/apps/studio/components/interfaces/Organization/SSO/SSODomains.tsxindex 58a22900ec3..8ecc96de285 100644--- a/apps/studio/components/interfaces/Organization/SSO/SSODomains.tsx+++ b/apps/studio/components/interfaces/Organization/SSO/SSODomains.tsx@@ -1,6 +1,6 @@import { Plus, Trash } from 'lucide-react'import { useFieldArray, useForm } from 'react-hook-form'-import { Button, FormControl, FormField, FormItem, FormMessage, Input_Shadcn_ } from 'ui'+import { Button, FormControl, FormField, FormItem, FormMessage, Input } from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { SSOConfigFormSchema } from './SSOConfig'@@ -43,7 +43,7 @@ export const SSODomains = ({ form }: { form: ReturnType<typeof useForm<SSOConfigrender={({ field }) => (<FormItem className="flex-1"><FormControl>- <Input_Shadcn_ {...field} autoComplete="off" placeholder="example.com" />+ <Input {...field} autoComplete="off" placeholder="example.com" /></FormControl><FormMessage /></FormItem>diff --git a/apps/studio/components/interfaces/Organization/SSO/SSOMetadata.tsx b/apps/studio/components/interfaces/Organization/SSO/SSOMetadata.tsxindex a7d5c078858..1138daeebae 100644--- a/apps/studio/components/interfaces/Organization/SSO/SSOMetadata.tsx+++ b/apps/studio/components/interfaces/Organization/SSO/SSOMetadata.tsx@@ -7,7 +7,7 @@ import {FormField,FormItem,FormMessage,- Input_Shadcn_,+ Input,Tabs_Shadcn_,TabsContent_Shadcn_,TabsList_Shadcn_,@@ -84,7 +84,7 @@ export const SSOMetadata = ({render={({ field }) => (<FormItem><FormControl>- <Input_Shadcn_+ <Input{...field}placeholder="https://example.com/metadata.xml"autoComplete="off"diff --git a/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.tsx b/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.tsxindex b1a2c426ffb..0242574451c 100644--- a/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.tsx+++ b/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.tsx@@ -3,14 +3,14 @@ import { isEqual } from 'lodash'import { ChevronDown, X } from 'lucide-react'import { useEffect, useMemo, useState } from 'react'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Button,cn,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,+ Collapsible,+ CollapsibleContent,+ CollapsibleTrigger,Select_Shadcn_,SelectContent_Shadcn_,SelectGroup_Shadcn_,@@ -198,30 +198,28 @@ export const UpdateRolesPanel = ({ visible, member, onClose }: UpdateRolesPanelP)}{projectsRoleConfiguration.length === 0 && (- <Alert_Shadcn_>+ <Alert><WarningIcon />- <AlertTitle_Shadcn_>- Team members need to be assigned at least one role- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Team members need to be assigned at least one role</AlertTitle>+ <AlertDescription>You may not remove all roles from a team member- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}{!isApplyingRoleToAllProjects &&projectsRoleConfiguration.length > 0 &&projectsRoleConfiguration.length < totalNumOrgProjects && (- <Collapsible_Shadcn_ className="bg-alternative border rounded-lg py-4 group">- <CollapsibleTrigger_Shadcn_ className="w-full text-left px-4 flex items-center justify-between">+ <Collapsible className="bg-alternative border rounded-lg py-4 group">+ <CollapsibleTrigger className="w-full text-left px-4 flex items-center justify-between"><span className="text-sm">{hasNoChanges? `This member only has access to ${numberOfProjectsWithAccess} project${numberOfProjectsWithAccess > 1 ? 's' : ''}`: `This member will only have access to ${numberOfProjectsWithAccess} project${numberOfProjectsWithAccess > 1 ? 's' : ''}`}</span><ChevronDown size={14} className="transition group-data-open:-rotate-180" />- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_ className="text-foreground-light text-sm px-4">+ </CollapsibleTrigger>+ <CollapsibleContent className="text-foreground-light text-sm px-4"><p>{member.username} {hasNoChanges ? 'does' : 'will'} not have access to thefollowing {noAccessProjects.length} project@@ -232,8 +230,8 @@ export const UpdateRolesPanel = ({ visible, member, onClose }: UpdateRolesPanelPreturn <li key={project.ref}>{project.name}</li>})}</ul>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible>)}<div className="flex flex-col divide-y divide-border">diff --git a/apps/studio/components/interfaces/Organization/Usage/UsageSection/DatabaseSizeUsage.tsx b/apps/studio/components/interfaces/Organization/Usage/UsageSection/DatabaseSizeUsage.tsxindex 45eacff7606..24334d7dcfe 100644--- a/apps/studio/components/interfaces/Organization/Usage/UsageSection/DatabaseSizeUsage.tsx+++ b/apps/studio/components/interfaces/Organization/Usage/UsageSection/DatabaseSizeUsage.tsx@@ -1,12 +1,6 @@import Link from 'next/link'import { useMemo } from 'react'-import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,- Button,- CriticalIcon,-} from 'ui'+import { Alert, AlertDescription, AlertTitle, Button, CriticalIcon } from 'ui'import { InfoTooltip } from 'ui-patterns/info-tooltip'import { SectionContent } from '../SectionContent'@@ -47,14 +41,14 @@ const DatabaseSizeUsage = ({<SectionContent section={attribute}><div className="space-y-4">{currentBillingCycleSelected && hasProjectsExceedingDatabaseSize && (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><CriticalIcon />- <AlertTitle_Shadcn_>Projects exceeding quota</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Projects exceeding quota</AlertTitle>+ <AlertDescription>You have projects that are exceeding 0.5 GB of database size. Reduce the databasesize or upgrade to a paid plan.- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}<div>diff --git a/apps/studio/components/interfaces/Organization/Usage/UsageSection/DiskUsage.tsx b/apps/studio/components/interfaces/Organization/Usage/UsageSection/DiskUsage.tsxindex 9c3673ca47f..b65ee501eaa 100644--- a/apps/studio/components/interfaces/Organization/Usage/UsageSection/DiskUsage.tsx+++ b/apps/studio/components/interfaces/Organization/Usage/UsageSection/DiskUsage.tsx@@ -1,13 +1,7 @@import MotionNumber from '@number-flow/react'import Link from 'next/link'import { useMemo } from 'react'-import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,- Button,- CriticalIcon,-} from 'ui'+import { Alert, AlertDescription, AlertTitle, Button, CriticalIcon } from 'ui'import { InfoTooltip } from 'ui-patterns/info-tooltip'import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'@@ -100,15 +94,15 @@ export const DiskUsage = ({{currentBillingCycleSelected &&subscription?.usage_billing_enabled === false &&hasProjectsExceedingDiskSize && (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><CriticalIcon />- <AlertTitle_Shadcn_>Projects exceeding quota</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Projects exceeding quota</AlertTitle>+ <AlertDescription>You have projects that are exceeding 8 GB of provisioned disk size, but do notallow any overages with the Spend Cap on. Reduce the disk size or disable thespend cap.- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}<div>diff --git a/apps/studio/components/interfaces/Platform/Webhooks/PlatformWebhooksEndpointSheet.tsx b/apps/studio/components/interfaces/Platform/Webhooks/PlatformWebhooksEndpointSheet.tsxindex ec94a011f8e..c4dedde53b7 100644--- a/apps/studio/components/interfaces/Platform/Webhooks/PlatformWebhooksEndpointSheet.tsx+++ b/apps/studio/components/interfaces/Platform/Webhooks/PlatformWebhooksEndpointSheet.tsx@@ -13,7 +13,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_ as InputField,+ Input,Label_Shadcn_ as Label,Separator,Sheet,@@ -24,7 +24,7 @@ import {SheetSection,SheetTitle,Switch,- TextArea_Shadcn_ as Textarea,+ Textarea,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { KeyValueFieldArray } from 'ui-patterns/form/KeyValueFieldArray/KeyValueFieldArray'@@ -286,7 +286,7 @@ export const PlatformWebhooksEndpointSheet = ({className="gap-1"><FormControl>- <InputField {...field} placeholder="winged-envelope" maxLength={64} />+ <Input {...field} placeholder="winged-envelope" maxLength={64} /></FormControl></FormItemLayout>)}@@ -298,10 +298,7 @@ export const PlatformWebhooksEndpointSheet = ({render={({ field }) => (<FormItemLayout label="Endpoint URL" layout="vertical" className="gap-1"><FormControl>- <InputField- {...field}- placeholder="https://api.example.com/webhooks/supabase"- />+ <Input {...field} placeholder="https://api.example.com/webhooks/supabase" /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/ProjectAPIDocs/SecondLevelNav.Layout.tsx b/apps/studio/components/interfaces/ProjectAPIDocs/SecondLevelNav.Layout.tsxindex ca039d39157..478e8521347 100644--- a/apps/studio/components/interfaces/ProjectAPIDocs/SecondLevelNav.Layout.tsx+++ b/apps/studio/components/interfaces/ProjectAPIDocs/SecondLevelNav.Layout.tsx@@ -1,9 +1,9 @@import { ChevronLeft, Code } from 'lucide-react'import { useMemo, useState, type PropsWithChildren, type ReactNode } from 'react'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Button,cn,Popover_Shadcn_,@@ -169,11 +169,11 @@ type MoreInformationProps = {const MoreInformation = ({ docsUrl }: MoreInformationProps) => {return (- <Alert_Shadcn_ className="p-3">- <AlertTitle_Shadcn_>+ <Alert className="p-3">+ <AlertTitle><p className="text-xs">Unable to find what you're looking for?</p>- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_ className="space-y-1">+ </AlertTitle>+ <AlertDescription className="space-y-1"><p className="text-xs leading-normal!">The API methods shown here are only the commonly used ones to get you started buildingquickly.@@ -182,7 +182,7 @@ const MoreInformation = ({ docsUrl }: MoreInformationProps) => {Head over to our docs site for the full API documentation.</p><DocsButton className="mt-2!" href={docsUrl} />- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}diff --git a/apps/studio/components/interfaces/ProjectCreation/AdvancedConfiguration.tsx b/apps/studio/components/interfaces/ProjectCreation/AdvancedConfiguration.tsxindex 2bad28d99b4..52edab624ce 100644--- a/apps/studio/components/interfaces/ProjectCreation/AdvancedConfiguration.tsx+++ b/apps/studio/components/interfaces/ProjectCreation/AdvancedConfiguration.tsx@@ -4,9 +4,9 @@ import { UseFormReturn } from 'react-hook-form'import {Badge,cn,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,+ Collapsible,+ CollapsibleContent,+ CollapsibleTrigger,FormControl,FormField,FormItem,@@ -33,16 +33,16 @@ export const AdvancedConfiguration = ({ form }: AdvancedConfigurationProps) => {return (<Panel.Content>- <Collapsible_Shadcn_>- <CollapsibleTrigger_Shadcn_ className="group/advanced-trigger font-mono uppercase tracking-widest text-xs flex items-center gap-1 text-foreground-lighter/75 hover:text-foreground-light transition data-open:text-foreground-light">+ <Collapsible>+ <CollapsibleTrigger className="group/advanced-trigger font-mono uppercase tracking-widest text-xs flex items-center gap-1 text-foreground-lighter/75 hover:text-foreground-light transition data-open:text-foreground-light">Advanced Configuration<ChevronRightsize={16}strokeWidth={1}className="mr-2 group-data-open/advanced-trigger:rotate-90 group-hover/advanced-trigger:text-foreground-light transition"/>- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_+ </CollapsibleTrigger>+ <CollapsibleContentclassName={cn('pt-2 data-closed:animate-collapsible-up data-open:animate-collapsible-down')}@@ -129,8 +129,8 @@ export const AdvancedConfiguration = ({ form }: AdvancedConfigurationProps) => {</>)}/>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible></Panel.Content>)}diff --git a/apps/studio/components/interfaces/ProjectCreation/InternalOnlyConfiguration.tsx b/apps/studio/components/interfaces/ProjectCreation/InternalOnlyConfiguration.tsxindex 159f2d1c1d2..e9cac41b78d 100644--- a/apps/studio/components/interfaces/ProjectCreation/InternalOnlyConfiguration.tsx+++ b/apps/studio/components/interfaces/ProjectCreation/InternalOnlyConfiguration.tsx@@ -3,12 +3,12 @@ import { ChevronRight } from 'lucide-react'import { UseFormReturn } from 'react-hook-form'import { type CloudProvider } from 'shared-data'import {- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,+ Collapsible,+ CollapsibleContent,+ CollapsibleTrigger,FormControl,FormField,- Input_Shadcn_,+ Input,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'@@ -28,16 +28,16 @@ export const InternalOnlyConfiguration = ({ form }: InternalOnlyConfigurationProreturn (<Panel.Content>- <Collapsible_Shadcn_>- <CollapsibleTrigger_Shadcn_ className="group/advanced-trigger font-mono uppercase tracking-widest text-xs flex items-center gap-1 text-foreground-lighter/75 hover:text-foreground-light transition data-open:text-foreground-light">+ <Collapsible>+ <CollapsibleTrigger className="group/advanced-trigger font-mono uppercase tracking-widest text-xs flex items-center gap-1 text-foreground-lighter/75 hover:text-foreground-light transition data-open:text-foreground-light">Internal-only Configuration<ChevronRightsize={16}strokeWidth={1}className="mr-2 group-data-open/advanced-trigger:rotate-90 group-hover/advanced-trigger:text-foreground-light transition"/>- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_ className="pt-2 data-closed:animate-collapsible-up data-open:animate-collapsible-down flex flex-col gap-y-6">+ </CollapsibleTrigger>+ <CollapsibleContent className="pt-2 data-closed:animate-collapsible-up data-open:animate-collapsible-down flex flex-col gap-y-6"><div><p className="text-xs text-foreground-lighter mb-6">These settings are only visible to internal staff@@ -79,7 +79,7 @@ export const InternalOnlyConfiguration = ({ form }: InternalOnlyConfigurationProdescription="Specify a custom version of Postgres (defaults to the latest)."><FormControl>- <Input_Shadcn_ placeholder="e.g 17.6.1.104" {...field} autoComplete="off" />+ <Input placeholder="e.g 17.6.1.104" {...field} autoComplete="off" /></FormControl></FormItemLayout>)}@@ -95,7 +95,7 @@ export const InternalOnlyConfiguration = ({ form }: InternalOnlyConfigurationProdescription="Specify a custom instance type."><FormControl>- <Input_Shadcn_ placeholder="e.g t3.nano" {...field} autoComplete="off" />+ <Input placeholder="e.g t3.nano" {...field} autoComplete="off" /></FormControl></FormItemLayout>)}@@ -103,8 +103,8 @@ export const InternalOnlyConfiguration = ({ form }: InternalOnlyConfigurationPro</div></div>)}- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible></Panel.Content>)}diff --git a/apps/studio/components/interfaces/ProjectCreation/ProjectNameInput.tsx b/apps/studio/components/interfaces/ProjectCreation/ProjectNameInput.tsxindex 00ffe8a6d93..a8f53ec33af 100644--- a/apps/studio/components/interfaces/ProjectCreation/ProjectNameInput.tsx+++ b/apps/studio/components/interfaces/ProjectCreation/ProjectNameInput.tsx@@ -1,5 +1,5 @@import { UseFormReturn } from 'react-hook-form'-import { FormControl, FormField, Input_Shadcn_ } from 'ui'+import { FormControl, FormField, Input } from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { CreateProjectForm } from './ProjectCreation.schema'@@ -18,7 +18,7 @@ export const ProjectNameInput = ({ form }: ProjectNameInputProps) => {render={({ field }) => (<FormItemLayout label="Project name" layout="horizontal"><FormControl>- <Input_Shadcn_ {...field} placeholder="Project name" />+ <Input {...field} placeholder="Project name" /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/QueryPerformance/IndexAdvisor/IndexAdvisorDisabledState.tsx b/apps/studio/components/interfaces/QueryPerformance/IndexAdvisor/IndexAdvisorDisabledState.tsxindex 1a709ddd6c3..a92791953f8 100644--- a/apps/studio/components/interfaces/QueryPerformance/IndexAdvisor/IndexAdvisorDisabledState.tsx+++ b/apps/studio/components/interfaces/QueryPerformance/IndexAdvisor/IndexAdvisorDisabledState.tsx@@ -1,7 +1,7 @@import { useParams } from 'common'import Link from 'next/link'import { toast } from 'sonner'-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_, Button } from 'ui'+import { Alert, AlertDescription, AlertTitle, Button } from 'ui'import { Markdown } from '../../Markdown'import { getIndexAdvisorExtensions } from './index-advisor.utils'@@ -52,8 +52,8 @@ export const IndexAdvisorDisabledState = () => {}return (- <Alert_Shadcn_ className="mb-6">- <AlertTitle_Shadcn_>+ <Alert className="mb-6">+ <AlertTitle><MarkdownclassName="text-foreground"content={@@ -62,8 +62,8 @@ export const IndexAdvisorDisabledState = () => {: 'Postgres extensions `index_advisor` and `hypopg` required'}/>- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ </AlertTitle>+ <AlertDescription><Markdowncontent={indexAdvisor === undefined@@ -71,9 +71,9 @@ export const IndexAdvisorDisabledState = () => {: 'These extensions can help in recommending database indexes to reduce the costs of your query.'}/>- </AlertDescription_Shadcn_>+ </AlertDescription>- <AlertDescription_Shadcn_ className="mt-3">+ <AlertDescription className="mt-3"><div className="flex items-center gap-x-2">{indexAdvisor === undefined ? (<Button asChild type="default">@@ -91,7 +91,7 @@ export const IndexAdvisorDisabledState = () => {)}<DocsButton href={`${DOCS_URL}/guides/database/extensions/index_advisor`} /></div>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}diff --git a/apps/studio/components/interfaces/QueryPerformance/QueryDetail.tsx b/apps/studio/components/interfaces/QueryPerformance/QueryDetail.tsxindex e43faa9643f..0fe56e6b638 100644--- a/apps/studio/components/interfaces/QueryPerformance/QueryDetail.tsx+++ b/apps/studio/components/interfaces/QueryPerformance/QueryDetail.tsx@@ -1,7 +1,7 @@import { ChevronsUpDown, Lightbulb } from 'lucide-react'import dynamic from 'next/dynamic'import { useEffect, useState } from 'react'-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_, Button, cn } from 'ui'+import { Alert, AlertDescription, AlertTitle, Button, cn } from 'ui'import { QueryPanelContainer, QueryPanelSection } from './QueryPanel'import { buildQueryExplanationPrompt } from './QueryPerformance.ai'@@ -104,21 +104,21 @@ export const QueryDetail = ({ selectedRow, onClickViewSuggestion, onClose }: QuewrapperClassName={cn('pl-3 bg-surface-100', !isExpanded && 'pointer-events-none')}/>{isLinterWarning && (- <Alert_Shadcn_+ <Alertvariant="default"className="mt-2 border-brand-400 bg-alternative [&>svg]:p-0.5 [&>svg]:bg-transparent [&>svg]:text-brand"><Lightbulb />- <AlertTitle_Shadcn_>Suggested optimization: Add an index</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Suggested optimization: Add an index</AlertTitle>+ <AlertDescription>Adding an index will help this query execute faster- </AlertDescription_Shadcn_>- <AlertDescription_Shadcn_>+ </AlertDescription>+ <AlertDescription><Button className="mt-3" onClick={() => onClickViewSuggestion()}>View suggestion</Button>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}</div><divdiff --git a/apps/studio/components/interfaces/QueryPerformance/QueryIndexes.tsx b/apps/studio/components/interfaces/QueryPerformance/QueryIndexes.tsxindex 0cc7a166066..3ca5c8e4b43 100644--- a/apps/studio/components/interfaces/QueryPerformance/QueryIndexes.tsx+++ b/apps/studio/components/interfaces/QueryPerformance/QueryIndexes.tsx@@ -5,14 +5,14 @@ import {Accordion_Shadcn_,AccordionContent_Shadcn_,AccordionItem_Shadcn_,- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Button,cn,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,+ Collapsible,+ CollapsibleContent,+ CollapsibleTrigger,} from 'ui'import { Admonition } from 'ui-patterns'import { CodeBlock } from 'ui-patterns/CodeBlock'@@ -299,32 +299,32 @@ export const QueryIndexes = ({description="Index advisor could not analyze this query. This can happen if the query references tables, functions, or extensions that no longer exist or were deleted."/>) : (index_statements ?? []).length === 0 ? (- <Alert_Shadcn_ className="[&>svg]:rounded-full">+ <Alert className="[&>svg]:rounded-full"><Check />- <AlertTitle_Shadcn_>This query is optimized</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>This query is optimized</AlertTitle>+ <AlertDescription>Recommendations for indexes will show here- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>) : (<>{isLinterWarning ? (- <Alert_Shadcn_+ <Alertvariant="default"className="border-brand-400 bg-alternative [&>svg]:p-0.5 [&>svg]:bg-transparent [&>svg]:text-brand my-3"><Lightbulb />- <AlertTitle_Shadcn_>+ <AlertTitle>We have {index_statements.length} index recommendation{index_statements.length > 1 ? 's' : ''}- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ </AlertTitle>+ <AlertDescription>You can improve this query's performance by{' '}<span className="text-brand">{totalImprovement.toFixed(2)}%</span> byadding the following suggested{' '}{index_statements.length > 1 ? 'indexes' : 'index'}- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>) : (<IndexImprovementTextindexStatements={index_statements}@@ -368,8 +368,8 @@ export const QueryIndexes = ({before={total_cost_before}after={total_cost_after}/>- <Collapsible_Shadcn_ open={showStartupCosts} onOpenChange={setShowStartupCosts}>- <CollapsibleContent_Shadcn_ asChild className="pb-3">+ <Collapsible open={showStartupCosts} onOpenChange={setShowStartupCosts}>+ <CollapsibleContent asChild className="pb-3"><QueryPanelScoreSectionhideArrowMarkersclassName="border-t"@@ -378,11 +378,11 @@ export const QueryIndexes = ({before={startup_cost_before}after={startup_cost_after}/>- </CollapsibleContent_Shadcn_>- <CollapsibleTrigger_Shadcn_ className="text-xs py-1.5 border-t text-foreground-light bg-studio w-full rounded-b-md">+ </CollapsibleContent>+ <CollapsibleTrigger className="text-xs py-1.5 border-t text-foreground-light bg-studio w-full rounded-b-md">View {showStartupCosts ? 'less' : 'more'}- </CollapsibleTrigger_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleTrigger>+ </Collapsible></div></div></QueryPanelSection>diff --git a/apps/studio/components/interfaces/Realtime/Inspector/ChooseChannelPopover.tsx b/apps/studio/components/interfaces/Realtime/Inspector/ChooseChannelPopover.tsxindex fbe832cd2e0..d239d593e9f 100644--- a/apps/studio/components/interfaces/Realtime/Inspector/ChooseChannelPopover.tsx+++ b/apps/studio/components/interfaces/Realtime/Inspector/ChooseChannelPopover.tsx@@ -11,7 +11,7 @@ import {FormField,FormItem,FormLabel,- Input_Shadcn_,+ Input,Popover_Shadcn_,PopoverContent_Shadcn_,PopoverTrigger_Shadcn_,@@ -111,7 +111,7 @@ export const ChooseChannelPopover = ({ config, onChangeConfig }: ChooseChannelPo<label className="text-foreground text-xs">Name of channel</label><div className="flex flex-row"><FormControl>- <Input_Shadcn_+ <Input{...field}autoComplete="off"className="rounded-r-none text-xs px-2.5 py-1 h-auto"diff --git a/apps/studio/components/interfaces/Realtime/Inspector/RealtimeFilterPopover/TableSelector.tsx b/apps/studio/components/interfaces/Realtime/Inspector/RealtimeFilterPopover/TableSelector.tsxindex bc1b3e7b5be..4915dff9f99 100644--- a/apps/studio/components/interfaces/Realtime/Inspector/RealtimeFilterPopover/TableSelector.tsx+++ b/apps/studio/components/interfaces/Realtime/Inspector/RealtimeFilterPopover/TableSelector.tsx@@ -2,9 +2,9 @@ import { debounce } from 'lodash'import { Check, Code, Loader } from 'lucide-react'import { useEffect, useState } from 'react'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Button,Command_Shadcn_,CommandEmpty_Shadcn_,@@ -115,17 +115,15 @@ const TableSelector = ({)}{showError && isError && (- <Alert_Shadcn_ variant="warning" className="px-3! py-3! border-0! rounded-none">- <AlertTitle_Shadcn_ className="text-xs text-amber-900">- Failed to load tables- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_ className="text-xs mb-2">+ <Alert variant="warning" className="px-3! py-3! border-0! rounded-none">+ <AlertTitle className="text-xs text-amber-900">Failed to load tables</AlertTitle>+ <AlertDescription className="text-xs mb-2">Error: {(error as any)?.message}- </AlertDescription_Shadcn_>+ </AlertDescription><Button type="default" size="tiny" onClick={() => refetch()}>Reload tables</Button>- </Alert_Shadcn_>+ </Alert>)}{isSuccess && (diff --git a/apps/studio/components/interfaces/Realtime/Inspector/RealtimeFilterPopover/index.tsx b/apps/studio/components/interfaces/Realtime/Inspector/RealtimeFilterPopover/index.tsxindex 3cd0dcd96d0..317b13560fb 100644--- a/apps/studio/components/interfaces/Realtime/Inspector/RealtimeFilterPopover/index.tsx+++ b/apps/studio/components/interfaces/Realtime/Inspector/RealtimeFilterPopover/index.tsx@@ -9,7 +9,7 @@ import {IconBroadcast,IconDatabaseChanges,IconPresence,- Input_Shadcn_ as Input,+ Input,Popover_Shadcn_,PopoverContent_Shadcn_,PopoverTrigger_Shadcn_,diff --git a/apps/studio/components/interfaces/Realtime/Inspector/SendMessageModal.tsx b/apps/studio/components/interfaces/Realtime/Inspector/SendMessageModal.tsxindex 5b989bf58d7..cee116fd3ba 100644--- a/apps/studio/components/interfaces/Realtime/Inspector/SendMessageModal.tsx+++ b/apps/studio/components/interfaces/Realtime/Inspector/SendMessageModal.tsx@@ -1,5 +1,5 @@import { useEffect, useState } from 'react'-import { Input_Shadcn_ as Input, Modal } from 'ui'+import { Input, Modal } from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import CodeEditor from '@/components/ui/CodeEditor/CodeEditor'diff --git a/apps/studio/components/interfaces/Reports/CreateReportModal.tsx b/apps/studio/components/interfaces/Reports/CreateReportModal.tsxindex 000f9ee4596..7991445d41d 100644--- a/apps/studio/components/interfaces/Reports/CreateReportModal.tsx+++ b/apps/studio/components/interfaces/Reports/CreateReportModal.tsx@@ -3,7 +3,7 @@ import { useRouter } from 'next/router'import { useMemo } from 'react'import { SubmitHandler, useForm } from 'react-hook-form'import { toast } from 'sonner'-import { Button, Form, FormControl, FormField, Input_Shadcn_, Modal, Textarea } from 'ui'+import { Button, Form, FormControl, FormField, Input, Modal, Textarea } from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import * as z from 'zod'@@ -115,7 +115,7 @@ export const CreateReportModal = ({ visible, onCancel, afterSubmit }: CreateReporender={({ field }) => (<FormItemLayout name="name" layout="vertical" label="Name"><FormControl>- <Input_Shadcn_ {...field} id="name" />+ <Input {...field} id="name" /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Reports/ReportFilterBar.tsx b/apps/studio/components/interfaces/Reports/ReportFilterBar.tsxindex ef0e1edb77b..f51343fda5e 100644--- a/apps/studio/components/interfaces/Reports/ReportFilterBar.tsx+++ b/apps/studio/components/interfaces/Reports/ReportFilterBar.tsx@@ -12,7 +12,7 @@ import {DropdownMenuItem,DropdownMenuSeparator,DropdownMenuTrigger,- Input_Shadcn_,+ Input,Select_Shadcn_,SelectContent_Shadcn_,SelectGroup_Shadcn_,@@ -361,7 +361,7 @@ const ReportFilterBar = ({className="gap-[2px]"size="tiny">- <Input_Shadcn_+ <Inputplaceholder={addFilterValues.compare === 'matches'? 'Provide a regex expression'diff --git a/apps/studio/components/interfaces/Reports/ReportFilterPopover.tsx b/apps/studio/components/interfaces/Reports/ReportFilterPopover.tsxindex 0a1fdc9de08..1b41f127e40 100644--- a/apps/studio/components/interfaces/Reports/ReportFilterPopover.tsx+++ b/apps/studio/components/interfaces/Reports/ReportFilterPopover.tsx@@ -10,7 +10,7 @@ import {CommandInput_Shadcn_,CommandItem_Shadcn_,CommandList_Shadcn_,- Input_Shadcn_ as Input,+ Input,Popover_Shadcn_,PopoverContent_Shadcn_,PopoverSeparator_Shadcn_,diff --git a/apps/studio/components/interfaces/Reports/UpdateModal.tsx b/apps/studio/components/interfaces/Reports/UpdateModal.tsxindex 6cc1e4f9f7f..23b13a8ea0f 100644--- a/apps/studio/components/interfaces/Reports/UpdateModal.tsx+++ b/apps/studio/components/interfaces/Reports/UpdateModal.tsx@@ -3,7 +3,7 @@ import { useParams } from 'common'import { useEffect } from 'react'import { SubmitHandler, useForm } from 'react-hook-form'import { toast } from 'sonner'-import { Button, Form, FormControl, FormField, Input_Shadcn_, Modal, Textarea } from 'ui'+import { Button, Form, FormControl, FormField, Input, Modal, Textarea } from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import * as z from 'zod'@@ -92,7 +92,7 @@ export const UpdateCustomReportModal = ({render={({ field }) => (<FormItemLayout name="name" layout="vertical" label="Name"><FormControl>- <Input_Shadcn_ {...field} id="name" />+ <Input {...field} id="name" /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Reports/renderers/ApiRenderers.tsx b/apps/studio/components/interfaces/Reports/renderers/ApiRenderers.tsxindex 92cfc8e5f4b..1605756437f 100644--- a/apps/studio/components/interfaces/Reports/renderers/ApiRenderers.tsx+++ b/apps/studio/components/interfaces/Reports/renderers/ApiRenderers.tsx@@ -5,13 +5,13 @@ import { useTheme } from 'next-themes'import { Fragment, useRef, useState, type ReactNode } from 'react'import { ComposableMap, Geographies, Geography, Marker, ZoomableGroup } from 'react-simple-maps'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Button,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,+ Collapsible,+ CollapsibleContent,+ CollapsibleTrigger,WarningIcon,} from 'ui'import * as z from 'zod'@@ -72,11 +72,11 @@ export const NetworkTrafficRenderer = (return <AlertError subject="Failed to retrieve network traffic" error={error} />} else if (isError) {return (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><WarningIcon />- <AlertTitle_Shadcn_>Failed to retrieve network traffic</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>{error?.message ?? 'Unknown error'}</AlertDescription_Shadcn_>- </Alert_Shadcn_>+ <AlertTitle>Failed to retrieve network traffic</AlertTitle>+ <AlertDescription>{error?.message ?? 'Unknown error'}</AlertDescription>+ </Alert>)}@@ -136,11 +136,11 @@ export const TotalRequestsChartRenderer = (return <AlertError subject="Failed to retrieve total requests" error={error} />} else if (isError) {return (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><WarningIcon />- <AlertTitle_Shadcn_>Failed to retrieve total requests</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>{error?.message ?? 'Unknown error'}</AlertDescription_Shadcn_>- </Alert_Shadcn_>+ <AlertTitle>Failed to retrieve total requests</AlertTitle>+ <AlertDescription>{error?.message ?? 'Unknown error'}</AlertDescription>+ </Alert>)}@@ -266,11 +266,11 @@ export const ErrorCountsChartRenderer = (return <AlertError subject="Failed to retrieve request errors" error={error} />} else if (isError) {return (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><WarningIcon />- <AlertTitle_Shadcn_>Failed to retrieve request errors</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>{error?.message ?? 'Unknown error'}</AlertDescription_Shadcn_>- </Alert_Shadcn_>+ <AlertTitle>Failed to retrieve request errors</AlertTitle>+ <AlertDescription>{error?.message ?? 'Unknown error'}</AlertDescription>+ </Alert>)}@@ -317,11 +317,11 @@ export const ResponseSpeedChartRenderer = (return <AlertError subject="Failed to retrieve response speeds" error={error} />} else if (isError) {return (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><WarningIcon />- <AlertTitle_Shadcn_>Failed to retrieve response speeds</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>{error?.message ?? 'Unknown error'}</AlertDescription_Shadcn_>- </Alert_Shadcn_>+ <AlertTitle>Failed to retrieve response speeds</AlertTitle>+ <AlertDescription>{error?.message ?? 'Unknown error'}</AlertDescription>+ </Alert>)}@@ -347,8 +347,8 @@ interface RouteTdContentProps {search: string}const RouteTdContent = (datum: RouteTdContentProps) => (- <Collapsible_Shadcn_>- <CollapsibleTrigger_Shadcn_ asChild>+ <Collapsible>+ <CollapsibleTrigger asChild><div className="flex gap-2 items-center"><Button asChild type="text" className=" py-0! p-1!" title="Show more route details"><span>@@ -376,8 +376,8 @@ const RouteTdContent = (datum: RouteTdContentProps) => (/></div></div>- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_ className="pt-2">+ </CollapsibleTrigger>+ <CollapsibleContent className="pt-2">{datum.search ? (<pre className="syntax-highlight overflow-auto whitespace-pre-wrap wrap-break-word rounded-sm bg-surface-100 p-2 text-xs! [&_span]:whitespace-pre-wrap!"><div@@ -390,8 +390,8 @@ const RouteTdContent = (datum: RouteTdContentProps) => () : (<p className="text-xs text-foreground-lighter">No query parameters in this request</p>)}- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible>)export const RequestsByCountryMapRenderer = (props: ReportWidgetProps<{diff --git a/apps/studio/components/interfaces/RoleImpersonationSelector/UserImpersonationSelector.tsx b/apps/studio/components/interfaces/RoleImpersonationSelector/UserImpersonationSelector.tsxindex 9e63551331e..4d35621a178 100644--- a/apps/studio/components/interfaces/RoleImpersonationSelector/UserImpersonationSelector.tsx+++ b/apps/studio/components/interfaces/RoleImpersonationSelector/UserImpersonationSelector.tsx@@ -7,11 +7,11 @@ import { toast } from 'sonner'import {Button,cn,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,+ Collapsible,+ CollapsibleContent,+ CollapsibleTrigger,DropdownMenuSeparator,- Input_Shadcn_ as Input,+ Input,InputGroup,InputGroupAddon,InputGroupButton,@@ -297,8 +297,8 @@ export const UserImpersonationSelector = () => {<div>{previousSearches.length > 0 ? (<>- <Collapsible_Shadcn_ className="relative">- <CollapsibleTrigger_Shadcn_ className="group font-normal p-0 [&[data-state=open]>div>svg]:-rotate-180!">+ <Collapsible className="relative">+ <CollapsibleTrigger className="group font-normal p-0 [&[data-state=open]>div>svg]:-rotate-180!"><div className="flex items-center gap-x-1 w-full"><p className="text-xs text-foreground-light group-hover:text-foreground transition">Recents@@ -309,9 +309,9 @@ export const UserImpersonationSelector = () => {size={14}/></div>- </CollapsibleTrigger_Shadcn_>+ </CollapsibleTrigger>- <CollapsibleContent_Shadcn_ className="mt-1 flex flex-col gap-y-4">+ <CollapsibleContent className="mt-1 flex flex-col gap-y-4"><Buttonsize="tiny"type="text"@@ -331,8 +331,8 @@ export const UserImpersonationSelector = () => {))}</ul></ScrollArea>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible></>) : (<div className="p-4 text-center text-muted-foreground">@@ -393,8 +393,8 @@ export const UserImpersonationSelector = () => {<><DropdownMenuSeparator className="m-0" /><div className="px-5 py-2 flex flex-col gap-2 relative">- <Collapsible_Shadcn_>- <CollapsibleTrigger_Shadcn_ className="group font-normal p-0 [&[data-state=open]>div>svg]:-rotate-180!">+ <Collapsible>+ <CollapsibleTrigger className="group font-normal p-0 [&[data-state=open]>div>svg]:-rotate-180!"><div className="flex items-center gap-x-1 w-full"><p className="text-xs text-foreground-light group-hover:text-foreground transition">Advanced options@@ -405,8 +405,8 @@ export const UserImpersonationSelector = () => {size={14}/></div>- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_ className="mt-1 flex flex-col gap-y-4">+ </CollapsibleTrigger>+ <CollapsibleContent className="mt-1 flex flex-col gap-y-4"><div className="flex flex-row items-center gap-x-4 text-sm text-foreground-light"><div className="flex items-center gap-x-1"><h3>MFA assurance level</h3>@@ -424,8 +424,8 @@ export const UserImpersonationSelector = () => {<p className={aal === 'aal2' ? undefined : 'text-foreground-lighter'}>AAL2</p></div></div>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible></div></>) : null}diff --git a/apps/studio/components/interfaces/SQLEditor/MoveQueryModal.tsx b/apps/studio/components/interfaces/SQLEditor/MoveQueryModal.tsxindex e66211cdf83..6fc52d5ac45 100644--- a/apps/studio/components/interfaces/SQLEditor/MoveQueryModal.tsx+++ b/apps/studio/components/interfaces/SQLEditor/MoveQueryModal.tsx@@ -28,7 +28,7 @@ import {FormItem,FormLabel,FormMessage,- Input_Shadcn_,+ Input,Label_Shadcn_,Popover_Shadcn_,PopoverContent_Shadcn_,@@ -341,7 +341,7 @@ export const MoveQueryModal = ({ visible, snippets = [], onClose }: MoveQueryMod<FormItem className="flex flex-col gap-y-2"><FormLabel>Provide a name for your new folder</FormLabel><FormControl>- <Input_Shadcn_+ <InputautoFocus{...field}autoComplete="off"diff --git a/apps/studio/components/interfaces/SQLEditor/RenameQueryModal.tsx b/apps/studio/components/interfaces/SQLEditor/RenameQueryModal.tsxindex a166ad0cfcf..495353385db 100644--- a/apps/studio/components/interfaces/SQLEditor/RenameQueryModal.tsx+++ b/apps/studio/components/interfaces/SQLEditor/RenameQueryModal.tsx@@ -4,16 +4,7 @@ import { useRouter } from 'next/router'import { useEffect } from 'react'import { SubmitHandler, useForm } from 'react-hook-form'import { toast } from 'sonner'-import {- AiIconAnimation,- Button,- Form,- FormControl,- FormField,- Input_Shadcn_,- Modal,- Textarea,-} from 'ui'+import { AiIconAnimation, Button, Form, FormControl, FormField, Input, Modal, Textarea } from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import * as z from 'zod'@@ -182,7 +173,7 @@ const RenameQueryModal = ({render={({ field }) => (<FormItemLayout name="name" layout="vertical" label="Name"><FormControl>- <Input_Shadcn_ {...field} id="name" />+ <Input {...field} id="name" /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Settings/API/DataApiDisabledAlert.tsx b/apps/studio/components/interfaces/Settings/API/DataApiDisabledAlert.tsxindex e17deb9f168..f101dcc32ff 100644--- a/apps/studio/components/interfaces/Settings/API/DataApiDisabledAlert.tsx+++ b/apps/studio/components/interfaces/Settings/API/DataApiDisabledAlert.tsx@@ -1,11 +1,11 @@-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_, WarningIcon } from 'ui'+import { Alert, AlertDescription, AlertTitle, WarningIcon } from 'ui'export const DataApiDisabledAlert = () => {return (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><WarningIcon />- <AlertTitle_Shadcn_>No schemas can be queried</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>No schemas can be queried</AlertTitle>+ <AlertDescription><p>With this setting disabled, you will not be able to query any schemas via the Data API.</p>@@ -13,7 +13,7 @@ export const DataApiDisabledAlert = () => {You will see errors from the Postgrest endpoint{' '}<code className="text-code-inline">/rest/v1/</code>.</p>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}diff --git a/apps/studio/components/interfaces/Settings/API/DataApiEnableSwitchStates.tsx b/apps/studio/components/interfaces/Settings/API/DataApiEnableSwitchStates.tsxindex 4fcf33d557a..d166636c097 100644--- a/apps/studio/components/interfaces/Settings/API/DataApiEnableSwitchStates.tsx+++ b/apps/studio/components/interfaces/Settings/API/DataApiEnableSwitchStates.tsx@@ -1,5 +1,5 @@import { AlertCircle } from 'lucide-react'-import { Alert_Shadcn_, AlertTitle_Shadcn_, CardContent } from 'ui'+import { Alert, AlertTitle, CardContent } from 'ui'import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'export const DataApiEnableSwitchLoading = () => (@@ -10,8 +10,8 @@ export const DataApiEnableSwitchLoading = () => ()export const DataApiEnableSwitchError = () => (- <Alert_Shadcn_ variant="destructive">+ <Alert variant="destructive"><AlertCircle size={16} />- <AlertTitle_Shadcn_>Failed to retrieve Data API settings</AlertTitle_Shadcn_>- </Alert_Shadcn_>+ <AlertTitle>Failed to retrieve Data API settings</AlertTitle>+ </Alert>)diff --git a/apps/studio/components/interfaces/Settings/API/DataApiProjectUrlCard.tsx b/apps/studio/components/interfaces/Settings/API/DataApiProjectUrlCard.tsxindex d70ff35b079..5f12b13bb54 100644--- a/apps/studio/components/interfaces/Settings/API/DataApiProjectUrlCard.tsx+++ b/apps/studio/components/interfaces/Settings/API/DataApiProjectUrlCard.tsx@@ -2,7 +2,7 @@ import { useParams } from 'common'import { AlertCircle } from 'lucide-react'import { parseAsString, useQueryState } from 'nuqs'import { useEffect } from 'react'-import { Alert_Shadcn_, AlertTitle_Shadcn_ } from 'ui'+import { Alert, AlertTitle } from 'ui'import {PageSection,PageSectionAside,@@ -93,10 +93,10 @@ export const DataApiProjectUrlCard = () => {<ShimmeringLoader className="w-3/4" delayIndex={1} /></div>) : isError ? (- <Alert_Shadcn_ variant="destructive">+ <Alert variant="destructive"><AlertCircle size={16} />- <AlertTitle_Shadcn_>Failed to retrieve project URL</AlertTitle_Shadcn_>- </Alert_Shadcn_>+ <AlertTitle>Failed to retrieve project URL</AlertTitle>+ </Alert>) : (<Input copy readOnly className="font-mono" value={endpoint} />)}diff --git a/apps/studio/components/interfaces/Settings/API/HardenAPIModal.tsx b/apps/studio/components/interfaces/Settings/API/HardenAPIModal.tsxindex 46332736e5a..3fad1ad0881 100644--- a/apps/studio/components/interfaces/Settings/API/HardenAPIModal.tsx+++ b/apps/studio/components/interfaces/Settings/API/HardenAPIModal.tsx@@ -1,12 +1,12 @@import { Check, ChevronDown } from 'lucide-react'import { toast } from 'sonner'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,+ Collapsible,+ CollapsibleContent,+ CollapsibleTrigger,Dialog,DialogContent,DialogDescription,@@ -129,8 +129,8 @@ export const HardenAPIModal = ({ visible, onClose }: HardenAPIModalProps) => {<DialogSectionSeparator />- <Collapsible_Shadcn_>- <CollapsibleTrigger_Shadcn_ className="py-4 px-5 w-full flex items-center justify-between text-sm">+ <Collapsible>+ <CollapsibleTrigger className="py-4 px-5 w-full flex items-center justify-between text-sm"><p>1. Create a custom <code className="text-code-inline">api</code> schema and expose it</p>@@ -142,8 +142,8 @@ export const HardenAPIModal = ({ visible, onClose }: HardenAPIModalProps) => {className="transition data-open-parent:rotate-180 data-closed-parent:rotate-0"/>)}- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_ className="text-sm text-foreground-light flex flex-col gap-y-4">+ </CollapsibleTrigger>+ <CollapsibleContent className="text-sm text-foreground-light flex flex-col gap-y-4"><p className="mx-5">Click the button below to create a new schema named{' '}<code className="text-code-inline">api</code> and grant the{' '}@@ -207,13 +207,13 @@ export const HardenAPIModal = ({ visible, onClose }: HardenAPIModalProps) => {{`grant select on table api.<your_table> to anon;\ngrant select, insert, update, delete on table api.<your_table> to authenticated;`}</CodeBlock></div>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible><DialogSectionSeparator />- <Collapsible_Shadcn_>- <CollapsibleTrigger_Shadcn_ className="py-4 px-5 w-full flex items-center justify-between text-sm">+ <Collapsible>+ <CollapsibleTrigger className="py-4 px-5 w-full flex items-center justify-between text-sm"><p>2. Remove the <code className="text-code-inline">public</code> schema from the exposedschemas@@ -226,21 +226,21 @@ export const HardenAPIModal = ({ visible, onClose }: HardenAPIModalProps) => {className="transition data-open-parent:rotate-180 data-closed-parent:rotate-0"/>)}- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_ className="text-sm text-foreground-light">+ </CollapsibleTrigger>+ <CollapsibleContent className="text-sm text-foreground-light"><div className="px-5 pb-4 flex flex-col gap-y-4">- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><WarningIcon />- <AlertTitle_Shadcn_ className="text-foreground">+ <AlertTitle className="text-foreground">Ensure that your app is no longer using the{' '}<code className="text-code-inline">public</code> schema- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ </AlertTitle>+ <AlertDescription>The <code className="text-code-inline">public</code> schema will not be accessiblevia the API once its not exposed. You should be using the{' '}<code className="text-code-inline">api</code> schema instead.- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert><p>Click the button below to remove the{' '}<code className="text-code-inline">public</code> schema from both Exposed schemas@@ -262,8 +262,8 @@ export const HardenAPIModal = ({ visible, onClose }: HardenAPIModalProps) => {Remove public schema from exposed schemas</ButtonTooltip></div>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible></DialogContent></Dialog>)diff --git a/apps/studio/components/interfaces/Settings/API/ServiceList.tsx b/apps/studio/components/interfaces/Settings/API/ServiceList.tsxindex 5fc24b9606b..ba79e886de1 100644--- a/apps/studio/components/interfaces/Settings/API/ServiceList.tsx+++ b/apps/studio/components/interfaces/Settings/API/ServiceList.tsx@@ -1,5 +1,5 @@import { AlertCircle } from 'lucide-react'-import { Alert_Shadcn_, AlertTitle_Shadcn_ } from 'ui'+import { Alert, AlertTitle } from 'ui'import { PostgrestConfig } from './PostgrestConfig'import { ScaffoldSection } from '@/components/layouts/Scaffold'@@ -12,12 +12,10 @@ export const ServiceList = () => {return (<ScaffoldSection isFullWidth id="api-settings" className="gap-6">{!isLoading && project?.status !== PROJECT_STATUS.ACTIVE_HEALTHY ? (- <Alert_Shadcn_ variant="destructive">+ <Alert variant="destructive"><AlertCircle size={16} />- <AlertTitle_Shadcn_>- API settings are unavailable as the project is not active- </AlertTitle_Shadcn_>- </Alert_Shadcn_>+ <AlertTitle>API settings are unavailable as the project is not active</AlertTitle>+ </Alert>) : (<PostgrestConfig />)}diff --git a/apps/studio/components/interfaces/Settings/API/UnsafeEntitiesConfirmModal.tsx b/apps/studio/components/interfaces/Settings/API/UnsafeEntitiesConfirmModal.tsxindex 9769ecbe6fb..bfc59b067da 100644--- a/apps/studio/components/interfaces/Settings/API/UnsafeEntitiesConfirmModal.tsx+++ b/apps/studio/components/interfaces/Settings/API/UnsafeEntitiesConfirmModal.tsx@@ -1,11 +1,6 @@import { ChevronRight, ChevronUp } from 'lucide-react'import { useMemo, useState } from 'react'-import {- Button,- Collapsible_Shadcn_ as Collapsible,- CollapsibleContent_Shadcn_ as CollapsibleContent,- CollapsibleTrigger_Shadcn_ as CollapsibleTrigger,-} from 'ui'+import { Button, Collapsible, CollapsibleContent, CollapsibleTrigger } from 'ui'import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'import { type ExposedEntity } from './DataApiEnableSwitch.utils'diff --git a/apps/studio/components/interfaces/Settings/Addons/Addons.tsx b/apps/studio/components/interfaces/Settings/Addons/Addons.tsxindex bd04cc9ce25..400b4529bac 100644--- a/apps/studio/components/interfaces/Settings/Addons/Addons.tsx+++ b/apps/studio/components/interfaces/Settings/Addons/Addons.tsx@@ -4,9 +4,9 @@ import { Lock } from 'lucide-react'import { useTheme } from 'next-themes'import Image from 'next/image'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Badge,Button,Tooltip,@@ -143,24 +143,24 @@ export const Addons = () => {if (pitrAlertState === 'hipaa') {pitrAlert = (- <Alert_Shadcn_ className="rounded-none border-0 border-b px-6">- <AlertTitle_Shadcn_>PITR cannot be changed with HIPAA</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <Alert className="rounded-none border-0 border-b px-6">+ <AlertTitle>PITR cannot be changed with HIPAA</AlertTitle>+ <AlertDescription>All projects should have PITR enabled by default and cannot be changed with HIPAA enabled.Contact support for further assistance.- </AlertDescription_Shadcn_>+ </AlertDescription><div className="mt-4"><Button type="default" asChild><SupportLink>Contact support</SupportLink></Button></div>- </Alert_Shadcn_>+ </Alert>)} else if (pitrAlertState === 'legacy-project') {pitrAlert = (- <Alert_Shadcn_ className="rounded-none border-0 border-b px-6">- <AlertTitle_Shadcn_>Your project is too old to enable PITR</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <Alert className="rounded-none border-0 border-b px-6">+ <AlertTitle>Your project is too old to enable PITR</AlertTitle>+ <AlertDescription><p className="text-sm leading-normal mb-2">Reach out to us via support if you're interested</p>@@ -175,17 +175,15 @@ export const Addons = () => {Contact support</SupportLink></Button>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)} else if (pitrAlertState === 'orioledb') {pitrAlert = (- <Alert_Shadcn_ className="rounded-none border-0 border-b px-6">- <AlertTitle_Shadcn_>PITR not supported</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>- Point in time recovery is not supported with OrioleDB- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ <Alert className="rounded-none border-0 border-b px-6">+ <AlertTitle>PITR not supported</AlertTitle>+ <AlertDescription>Point in time recovery is not supported with OrioleDB</AlertDescription>+ </Alert>)}diff --git a/apps/studio/components/interfaces/Settings/Addons/CustomDomainSidePanel.tsx b/apps/studio/components/interfaces/Settings/Addons/CustomDomainSidePanel.tsxindex 6be9f4753c5..8e6564eaf9c 100644--- a/apps/studio/components/interfaces/Settings/Addons/CustomDomainSidePanel.tsx+++ b/apps/studio/components/interfaces/Settings/Addons/CustomDomainSidePanel.tsx@@ -4,9 +4,9 @@ import { AlertCircle } from 'lucide-react'import { useEffect, useState } from 'react'import { toast } from 'sonner'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,cn,RadioGroupCard,RadioGroupCardItem,@@ -130,16 +130,14 @@ const CustomDomainSidePanel = () => {{subscriptionCDOption === undefined &&selectedCustomDomain !== undefined &&customDomainsDisabledDueToQuota && (- <Alert_Shadcn_ variant="default" className="mb-2">+ <Alert variant="default" className="mb-2"><AlertCircle className="h-4 w-4" />- <AlertTitle_Shadcn_>- Adding new custom domains temporarily disabled- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_ className="flex flex-col gap-3">+ <AlertTitle>Adding new custom domains temporarily disabled</AlertTitle>+ <AlertDescription className="flex flex-col gap-3">We are working with our upstream DNS provider before we are able to sign up newcustom domains. Please check back in a few hours.- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}<p className="text-sm">Custom domains allow you to present a branded experience to your users. You may set updiff --git a/apps/studio/components/interfaces/Settings/Addons/PITRSidePanel.tsx b/apps/studio/components/interfaces/Settings/Addons/PITRSidePanel.tsxindex c60817aeb13..5c8a41e69d5 100644--- a/apps/studio/components/interfaces/Settings/Addons/PITRSidePanel.tsx+++ b/apps/studio/components/interfaces/Settings/Addons/PITRSidePanel.tsx@@ -4,9 +4,9 @@ import { useTheme } from 'next-themes'import { useEffect, useState } from 'react'import { toast } from 'sonner'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Button,cn,CriticalIcon,@@ -234,31 +234,29 @@ const PITRSidePanel = () => {</div>{selectedCategory === 'off' && subscriptionPitr !== undefined && isBranchingEnabled && (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><CriticalIcon />- <AlertTitle_Shadcn_>- Are you sure you want to disable this while using Branching?- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Are you sure you want to disable this while using Branching?</AlertTitle>+ <AlertDescription>Without PITR, you might not be able to recover lost data if you accidentally merge abranch that deletes a column or user data. We don't recommend this.- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}{blockDowngradeDueToHipaa ? (- <Alert_Shadcn_>- <AlertTitle_Shadcn_>PITR cannot be disabled on HIPAA projects</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <Alert>+ <AlertTitle>PITR cannot be disabled on HIPAA projects</AlertTitle>+ <AlertDescription>PITR is enabled by default for all HIPAA projects and cannot be turned off. Contactsupport for further assistance.- </AlertDescription_Shadcn_>+ </AlertDescription><div className="mt-4"><Button type="default" asChild><SupportLink>Contact support</SupportLink></Button></div>- </Alert_Shadcn_>+ </Alert>) : null}{selectedCategory === 'on' && (diff --git a/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.tsx b/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.tsxindex 112d8b3cb36..5a02349d7b0 100644--- a/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.tsx+++ b/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.tsx@@ -7,9 +7,9 @@ import { Fragment, useEffect } from 'react'import { SubmitHandler, useForm } from 'react-hook-form'import { toast } from 'sonner'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Badge,Button,Form,@@ -286,16 +286,16 @@ export const ConnectionPooling = () => {</FormControl>{!!maxConnData &&(default_pool_size ?? 15) > maxConnData.maxConnections * 0.8 && (- <Alert_Shadcn_ variant="warning" className="mt-2">- <AlertTitle_Shadcn_ className="text-foreground">+ <Alert variant="warning" className="mt-2">+ <AlertTitle className="text-foreground">Pool size is greater than 80% of the max connections ({maxConnData.maxConnections}) on your database- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ </AlertTitle>+ <AlertDescription>This may result in instability and unreliability with yourdatabase connections.- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}</FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Settings/Database/DatabaseReadOnlyAlert.tsx b/apps/studio/components/interfaces/Settings/Database/DatabaseReadOnlyAlert.tsxindex 9130b7be5f4..0b963ceb8c0 100644--- a/apps/studio/components/interfaces/Settings/Database/DatabaseReadOnlyAlert.tsx+++ b/apps/studio/components/interfaces/Settings/Database/DatabaseReadOnlyAlert.tsx@@ -2,7 +2,7 @@ import { useParams } from 'common'import { AlertTriangle, ExternalLink } from 'lucide-react'import Link from 'next/link'import { useState } from 'react'-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_, Button } from 'ui'+import { Alert, AlertDescription, AlertTitle, Button } from 'ui'import ConfirmDisableReadOnlyModeModal from './DatabaseSettings/ConfirmDisableReadOnlyModal'import { useResourceWarningsQuery } from '@/data/usage/resource-warnings-query'@@ -24,12 +24,12 @@ export const DatabaseReadOnlyAlert = () => {return (<>{isReadOnlyMode && (- <Alert_Shadcn_ variant="destructive">+ <Alert variant="destructive"><AlertTriangle />- <AlertTitle_Shadcn_>+ <AlertTitle>Project is in read-only mode and database is no longer accepting write requests- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ </AlertTitle>+ <AlertDescription>You have reached 95% of your project's disk space, and read-only mode has been enabledto preserve your database's stability and prevent your project from exceeding itscurrent billing plan. To resolve this, you may:@@ -57,7 +57,7 @@ export const DatabaseReadOnlyAlert = () => {</li>) : null}</ul>- </AlertDescription_Shadcn_>+ </AlertDescription><div className="mt-4 flex items-center space-x-2"><Button type="default" onClick={() => setShowConfirmationModal(true)}>Disable read-only mode@@ -72,7 +72,7 @@ export const DatabaseReadOnlyAlert = () => {</a></Button></div>- </Alert_Shadcn_>+ </Alert>)}<ConfirmDisableReadOnlyModeModalvisible={showConfirmationModal}diff --git a/apps/studio/components/interfaces/Settings/Database/DiskSizeConfiguration.tsx b/apps/studio/components/interfaces/Settings/Database/DiskSizeConfiguration.tsxindex 3c42066a24c..a620d7c1788 100644--- a/apps/studio/components/interfaces/Settings/Database/DiskSizeConfiguration.tsx+++ b/apps/studio/components/interfaces/Settings/Database/DiskSizeConfiguration.tsx@@ -4,7 +4,7 @@ import { ExternalLink, Info } from 'lucide-react'import Link from 'next/link'import { SetStateAction } from 'react'import { toast } from 'sonner'-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_, Button, InfoIcon } from 'ui'+import { Alert, AlertDescription, AlertTitle, Button, InfoIcon } from 'ui'import {PageSection,PageSectionContent,@@ -153,10 +153,10 @@ export const DiskSizeConfiguration = ({ disabled = false }: DiskSizeConfiguratio</div><div className="col-span-8">- <Alert_Shadcn_>+ <Alert><Info size={16} />- <AlertTitle_Shadcn_>Importing a lot of data?</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Importing a lot of data?</AlertTitle>+ <AlertDescription><MarkdownclassName="max-w-full"content={`@@ -168,8 +168,8 @@ manually increase the size here.Read more about [disk management](${DOCS_URL}/guides/platform/database-size#disk-management) and how to [free up storage space](${DOCS_URL}/guides/platform/database-size#vacuum-operations).`}/>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert></div></div></div>@@ -178,14 +178,14 @@ Read more about [disk management](${DOCS_URL}/guides/platform/database-size#disk</Panel></div>) : (- <Alert_Shadcn_>+ <Alert><InfoIcon />- <AlertTitle_Shadcn_>+ <AlertTitle>{hasAccessToDiskSizeConfig === false? 'Disk size configuration is not available for projects on the Free Plan': 'Disk size configuration is only available when the spend cap has been disabled'}- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ </AlertTitle>+ <AlertDescription>{hasAccessToDiskSizeConfig === false ? (<p>If you are intending to use more than 500MB of disk space, then you will need to@@ -209,8 +209,8 @@ Read more about [disk management](${DOCS_URL}/guides/platform/database-size#disk: 'Disable spend cap'}</Link></Button>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}</PageSectionContent></PageSection>diff --git a/apps/studio/components/interfaces/Settings/Database/DiskSizeConfigurationModal.tsx b/apps/studio/components/interfaces/Settings/Database/DiskSizeConfigurationModal.tsxindex 20c04264cc8..94490aa5b08 100644--- a/apps/studio/components/interfaces/Settings/Database/DiskSizeConfigurationModal.tsx+++ b/apps/studio/components/interfaces/Settings/Database/DiskSizeConfigurationModal.tsx@@ -8,9 +8,9 @@ import { SetStateAction, useEffect, useMemo } from 'react'import { SubmitHandler, useForm } from 'react-hook-form'import { toast } from 'sonner'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Button,Form,FormControl,@@ -137,10 +137,10 @@ const DiskSizeConfigurationModal = ({hasAccessToDiskModifications ? (<>{currentDiskSize >= maxDiskSize ? (- <Alert_Shadcn_ variant="warning" className="rounded-t-none border-0">+ <Alert variant="warning" className="rounded-t-none border-0"><WarningIcon />- <AlertTitle_Shadcn_>Maximum manual disk size increase reached</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Maximum manual disk size increase reached</AlertTitle>+ <AlertDescription><p>You cannot manually expand the disk size any more than {maxDiskSize}GB. If youneed more than this, contact us via support for help.@@ -156,17 +156,15 @@ const DiskSizeConfigurationModal = ({Contact support</SupportLink></Button>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>) : (<><Modal.Content className="w-full space-y-4">- <Alert_Shadcn_ variant={isAbleToResizeDatabase ? 'default' : 'warning'}>+ <Alert variant={isAbleToResizeDatabase ? 'default' : 'warning'}><Info size={16} />- <AlertTitle_Shadcn_>- This operation is only possible every 4 hours- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>This operation is only possible every 4 hours</AlertTitle>+ <AlertDescription><div className="mb-4">{isAbleToResizeDatabase? `Upon updating your disk size, the next disk size update will only be available from ${dayjs().format(@@ -181,8 +179,8 @@ const DiskSizeConfigurationModal = ({Read more about disk management</Link></Button>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert><Form {...form}><form id={formId} onSubmit={form.handleSubmit(handleSubmit)} noValidate><FormField@@ -233,14 +231,14 @@ const DiskSizeConfigurationModal = ({)}</>) : (- <Alert_Shadcn_ className="border-none">+ <Alert className="border-none"><InfoIcon />- <AlertTitle_Shadcn_>+ <AlertTitle>{hasAccessToDiskModifications === false? 'Disk size configuration is not available for projects on the Free Plan': 'Disk size configuration is only available when the spend cap has been disabled'}- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ </AlertTitle>+ <AlertDescription>{hasAccessToDiskModifications === false ? (<p>If you are intending to use more than 500MB of disk space, then you will need to@@ -264,8 +262,8 @@ const DiskSizeConfigurationModal = ({: 'Disable spend cap'}</Link></Button>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}</Modal>)diff --git a/apps/studio/components/interfaces/Settings/Database/NetworkRestrictions/AddRestrictionModal.tsx b/apps/studio/components/interfaces/Settings/Database/NetworkRestrictions/AddRestrictionModal.tsxindex a03ccf282a7..8e97b4b58fd 100644--- a/apps/studio/components/interfaces/Settings/Database/NetworkRestrictions/AddRestrictionModal.tsx+++ b/apps/studio/components/interfaces/Settings/Database/NetworkRestrictions/AddRestrictionModal.tsx@@ -9,7 +9,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,Modal,Tooltip,TooltipContent,@@ -172,7 +172,7 @@ const AddRestrictionModal = ({render={({ field }) => (<FormItemLayout layout="vertical" label={`${type} address`}><FormControl>- <Input_Shadcn_ {...field} placeholder={type === 'IPv4' ? '0.0.0.0' : '::0'} />+ <Input {...field} placeholder={type === 'IPv4' ? '0.0.0.0' : '::0'} /></FormControl></FormItemLayout>)}@@ -204,7 +204,7 @@ const AddRestrictionModal = ({}><FormControl>- <Input_Shadcn_+ <Input{...field}type="number"min={0}diff --git a/apps/studio/components/interfaces/Settings/Database/PoolingModesModal.tsx b/apps/studio/components/interfaces/Settings/Database/PoolingModesModal.tsxindex 2dc69ec7bf1..62b17c21785 100644--- a/apps/studio/components/interfaces/Settings/Database/PoolingModesModal.tsx+++ b/apps/studio/components/interfaces/Settings/Database/PoolingModesModal.tsx@@ -1,9 +1,9 @@import { useParams } from 'common'import { AlertTriangleIcon } from 'lucide-react'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Button,Dialog,DialogClose,@@ -77,12 +77,10 @@ This mode is similar to connecting to your database directly. There is full supp</DialogSection>{primaryConfig?.pool_mode === 'session' && (<div className="px-6">- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><AlertTriangleIcon strokeWidth={2} />- <AlertTitle_Shadcn_>- Pooling mode is currently configured to use session mode- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Pooling mode is currently configured to use session mode</AlertTitle>+ <AlertDescription>To use transaction mode concurrently with session mode, change the pooling mode totransaction first in the{' '}<span@@ -97,8 +95,8 @@ This mode is similar to connecting to your database directly. There is full supp</span>. After this, you can use transaction mode on port 6543 and session mode on port5432.- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert></div>)}<DialogFooter>diff --git a/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainVerify.tsx b/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainVerify.tsxindex 92f8c0f3c78..c5ed57c5794 100644--- a/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainVerify.tsx+++ b/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainVerify.tsx@@ -2,13 +2,7 @@ import { useParams } from 'common'import { AlertCircle, RefreshCw } from 'lucide-react'import { useEffect } from 'react'import { toast } from 'sonner'-import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,- Button,- WarningIcon,-} from 'ui'+import { Alert, AlertDescription, AlertTitle, Button, WarningIcon } from 'ui'import { Admonition } from 'ui-patterns/admonition'import { DNSRecord } from './DNSRecord'@@ -122,27 +116,25 @@ export const CustomDomainVerify = () => {</div>{hasCAAErrors && (- <Alert_Shadcn_>+ <Alert><WarningIcon />- <AlertTitle_Shadcn_>- Certificate Authority Authentication (CAA) error- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Certificate Authority Authentication (CAA) error</AlertTitle>+ <AlertDescription>Please add a CAA record allowing "digicert.com" to issue certificates for{' '}<code className="text-code-inline">{customDomain?.hostname}</code>. For example:{' '}<code className="text-code-inline">0 issue "digicert.com"</code>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}{customDomain?.ssl.status === 'validation_timed_out' ? (- <Alert_Shadcn_>+ <Alert><WarningIcon />- <AlertTitle_Shadcn_>Validation timed out</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Validation timed out</AlertTitle>+ <AlertDescription>Please click "Verify" again to retry the validation of the records- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>) : (<div className="space-y-2"><DNSTableHeaders display={customDomain?.ssl.txt_name ?? ''} />diff --git a/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainsConfigureHostname.tsx b/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainsConfigureHostname.tsxindex 53f9638c7cf..7b82908cc07 100644--- a/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainsConfigureHostname.tsx+++ b/apps/studio/components/interfaces/Settings/General/CustomDomainConfig/CustomDomainsConfigureHostname.tsx@@ -12,7 +12,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { z } from 'zod'@@ -96,7 +96,7 @@ export const CustomDomainsConfigureHostname = () => {className="[&>div]:md:w-1/2"><FormControl>- <Input_Shadcn_+ <Input{...field}placeholder="subdomain.example.com"disabled={!canConfigureCustomDomain || isSubmitting}diff --git a/apps/studio/components/interfaces/Settings/General/DeleteProjectPanel/DeleteProjectModal.tsx b/apps/studio/components/interfaces/Settings/General/DeleteProjectPanel/DeleteProjectModal.tsxindex 2f05a0c7c9e..1f6c291d868 100644--- a/apps/studio/components/interfaces/Settings/General/DeleteProjectPanel/DeleteProjectModal.tsx+++ b/apps/studio/components/interfaces/Settings/General/DeleteProjectPanel/DeleteProjectModal.tsx@@ -2,7 +2,7 @@ import { LOCAL_STORAGE_KEYS } from 'common'import { useRouter } from 'next/router'import { useEffect, useState } from 'react'import { toast } from 'sonner'-import { TextArea_Shadcn_ as TextArea } from 'ui'+import { TextArea } from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { CANCELLATION_REASONS } from '@/components/interfaces/Billing/Billing.constants'diff --git a/apps/studio/components/interfaces/Settings/General/DeleteProjectPanel/DeleteProjectPanel.tsx b/apps/studio/components/interfaces/Settings/General/DeleteProjectPanel/DeleteProjectPanel.tsxindex 95f6d35bc68..d9096501e29 100644--- a/apps/studio/components/interfaces/Settings/General/DeleteProjectPanel/DeleteProjectPanel.tsx+++ b/apps/studio/components/interfaces/Settings/General/DeleteProjectPanel/DeleteProjectPanel.tsx@@ -1,4 +1,4 @@-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_, CriticalIcon } from 'ui'+import { Alert, AlertDescription, AlertTitle, CriticalIcon } from 'ui'import {PageSection,PageSectionContent,@@ -39,14 +39,14 @@ export const DeleteProjectPanel = () => {</PageSectionMeta><PageSectionContent>- <Alert_Shadcn_ variant="destructive">+ <Alert variant="destructive"><CriticalIcon />- <AlertTitle_Shadcn_>{title}</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>{description}</AlertDescription_Shadcn_>+ <AlertTitle>{title}</AlertTitle>+ <AlertDescription>{description}</AlertDescription><div className="mt-2"><DeleteProjectButton /></div>- </Alert_Shadcn_>+ </Alert></PageSectionContent></PageSection>)diff --git a/apps/studio/components/interfaces/Settings/General/General.tsx b/apps/studio/components/interfaces/Settings/General/General.tsxindex b4d6fbac1a1..b8d85c59b34 100644--- a/apps/studio/components/interfaces/Settings/General/General.tsx+++ b/apps/studio/components/interfaces/Settings/General/General.tsx@@ -2,18 +2,9 @@ import { zodResolver } from '@hookform/resolvers/zod'import { PermissionAction } from '@supabase/shared-types/out/constants'import { useForm } from 'react-hook-form'import { toast } from 'sonner'-import {- Button,- Card,- CardContent,- CardFooter,- Form,- FormControl,- FormField,- Input_Shadcn_,-} from 'ui'+import { Button, Card, CardContent, CardFooter, Form, FormControl, FormField, Input } from 'ui'import { Admonition } from 'ui-patterns'-import { Input } from 'ui-patterns/DataInputs/Input'+import { Input as PasswordInput } from 'ui-patterns/DataInputs/Input'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import {PageSection,@@ -121,7 +112,7 @@ export const General = () => {className="[&>div]:md:w-1/2"><FormControl>- <Input_Shadcn_+ <Input{...field}disabled={isBranch || !canUpdateProject}autoComplete="off"@@ -140,7 +131,7 @@ export const General = () => {className="[&>div]:md:w-1/2 [&>div>div]:md:w-full"><FormControl>- <Input copy readOnly size="small" value={project.ref} />+ <PasswordInput copy readOnly size="small" value={project.ref} /></FormControl></FormItemLayout></CardContent>@@ -153,7 +144,7 @@ export const General = () => {className="[&>div]:md:w-1/2 [&>div>div]:md:w-full"><FormControl>- <Input copy readOnly size="small" value={project.region} />+ <PasswordInput copy readOnly size="small" value={project.region} /></FormControl></FormItemLayout></CardContent>diff --git a/apps/studio/components/interfaces/Settings/General/Infrastructure/ProjectUpgradeAlert.tsx b/apps/studio/components/interfaces/Settings/General/Infrastructure/ProjectUpgradeAlert.tsxindex 1ddd3d0bab9..38ebb7cc942 100644--- a/apps/studio/components/interfaces/Settings/General/Infrastructure/ProjectUpgradeAlert.tsx+++ b/apps/studio/components/interfaces/Settings/General/Infrastructure/ProjectUpgradeAlert.tsx@@ -7,9 +7,9 @@ import { useEffect, useState } from 'react'import { useForm } from 'react-hook-form'import { toast } from 'sonner'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Badge,Button,Form,@@ -115,11 +115,9 @@ export const ProjectUpgradeAlert = () => {return (<>- <Alert_Shadcn_ title="Your project can be upgraded to the latest version of Postgres">- <AlertTitle_Shadcn_>- Your project can be upgraded to the latest version of Postgres- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <Alert title="Your project can be upgraded to the latest version of Postgres">+ <AlertTitle>Your project can be upgraded to the latest version of Postgres</AlertTitle>+ <AlertDescription><p>The latest version of Postgres ({latestPgVersion}) is available for your project.</p><Tooltip><TooltipTrigger asChild>@@ -139,8 +137,8 @@ export const ProjectUpgradeAlert = () => {</TooltipContent>)}</Tooltip>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert><ModalhideFooter@@ -173,10 +171,10 @@ export const ProjectUpgradeAlert = () => {)}{/* @ts-ignore */}{(data?.potential_breaking_changes ?? []).length > 0 && (- <Alert_Shadcn_ variant="destructive" title="Breaking changes">+ <Alert variant="destructive" title="Breaking changes"><AlertCircle className="h-4 w-4" strokeWidth={2} />- <AlertTitle_Shadcn_>Breaking changes</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_ className="flex flex-col gap-3">+ <AlertTitle>Breaking changes</AlertTitle>+ <AlertDescription className="flex flex-col gap-3"><p>Your project will be upgraded across major versions of Postgres. This mayinvolve breaking changes.@@ -193,19 +191,19 @@ export const ProjectUpgradeAlert = () => {</Link></Button></div>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}{legacyAuthCustomRoles.length > 0 && (- <Alert_Shadcn_+ <Alertvariant="warning"title="Custom Postgres roles using md5 authentication have been detected"><AlertTriangle className="h-4 w-4" strokeWidth={2} />- <AlertTitle_Shadcn_>+ <AlertTitle>Custom Postgres roles will not work automatically after upgrade- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_ className="flex flex-col gap-3">+ </AlertTitle>+ <AlertDescription className="flex flex-col gap-3"><p>You must run a series of commands after upgrading.</p><p>This is because new Postgres versions use scram-sha-256 authentication by@@ -235,8 +233,8 @@ export const ProjectUpgradeAlert = () => {</Link></Button></div>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}<FormFieldcontrol={form.control}diff --git a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureInfo.tsx b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureInfo.tsxindex a74871d7ef7..7468e0c470b 100644--- a/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureInfo.tsx+++ b/apps/studio/components/interfaces/Settings/Infrastructure/InfrastructureInfo.tsx@@ -3,7 +3,7 @@ import Link from 'next/link'import {Badge,Button,- Input_Shadcn_ as Input,+ Input,InputGroup,InputGroupAddon,InputGroupInput,diff --git a/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkForm.tsx b/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkForm.tsxindex 10526604724..f56ae90fc66 100644--- a/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkForm.tsx+++ b/apps/studio/components/interfaces/Settings/Integrations/AWSPrivateLink/AWSPrivateLinkForm.tsx@@ -8,7 +8,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,Sheet,SheetContent,SheetDescription,@@ -181,7 +181,7 @@ export const AWSPrivateLinkForm = ({ account, open, onOpenChange }: AWSPrivateLidescription="The ID of the AWS account you want to connect to."><FormControl>- <Input_Shadcn_+ <Input{...field}readOnly={!isNew}autoFocus={isNew}@@ -204,7 +204,7 @@ export const AWSPrivateLinkForm = ({ account, open, onOpenChange }: AWSPrivateLidescription="A name for this account connection."><FormControl>- <Input_Shadcn_+ <Input{...field}readOnly={!isNew}onFocus={(e) => {diff --git a/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubIntegrationConnectionForm.tsx b/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubIntegrationConnectionForm.tsxindex 72e326beee5..69fc2863742 100644--- a/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubIntegrationConnectionForm.tsx+++ b/apps/studio/components/interfaces/Settings/Integrations/GithubIntegration/GitHubIntegrationConnectionForm.tsx@@ -14,7 +14,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,Switch,} from 'ui'import { Admonition } from 'ui-patterns/admonition'@@ -439,7 +439,7 @@ export const GitHubIntegrationConnectionForm = ({}><FormControl>- <Input_Shadcn_+ <Input{...field}placeholder="."autoComplete="off"@@ -490,7 +490,7 @@ export const GitHubIntegrationConnectionForm = ({><div className="relative w-full"><FormControl>- <Input_Shadcn_+ <Input{...field}autoComplete="off"disabled={!canUpdateGitHubConnection || !enableProductionSync}@@ -572,7 +572,7 @@ export const GitHubIntegrationConnectionForm = ({description="Maximum number of preview branches"><FormControl>- <Input_Shadcn_+ <Input{...field}type="number"autoComplete="off"diff --git a/apps/studio/components/interfaces/Settings/Integrations/VercelIntegration/VercelIntegrationConnectionForm.tsx b/apps/studio/components/interfaces/Settings/Integrations/VercelIntegration/VercelIntegrationConnectionForm.tsxindex 66e9a372dcc..d4807abd37c 100644--- a/apps/studio/components/interfaces/Settings/Integrations/VercelIntegration/VercelIntegrationConnectionForm.tsx+++ b/apps/studio/components/interfaces/Settings/Integrations/VercelIntegration/VercelIntegrationConnectionForm.tsx@@ -3,9 +3,9 @@ import Link from 'next/link'import { useForm } from 'react-hook-form'import { toast } from 'sonner'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Form,FormControl,FormDescription,@@ -13,7 +13,7 @@ import {FormItem,FormLabel,FormMessage,- Input_Shadcn_,+ Input,Switch,} from 'ui'import * as z from 'zod'@@ -100,11 +100,9 @@ const VercelIntegrationConnectionForm = ({<div className="px-6 py-4 flex flex-col gap-y-4"><div className="flex flex-col gap-4">{org?.managed_by === 'vercel-marketplace' ? (- <Alert_Shadcn_>- <AlertTitle_Shadcn_ className="text-sm">- Vercel Marketplace managed project- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_ className="text-xs">+ <Alert>+ <AlertTitle className="text-sm">Vercel Marketplace managed project</AlertTitle>+ <AlertDescription className="text-xs">This project is managed via Vercel Marketplace. Environment variables areautomatically synchronized for your connected Vercel projects. This integrationpurpose is synchronizing preview deployments environment variables with our{' '}@@ -117,8 +115,8 @@ const VercelIntegrationConnectionForm = ({Branching</Link>{' '}feature.- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>) : (<div><h5 className="text-foreground ">@@ -205,7 +203,7 @@ const VercelIntegrationConnectionForm = ({Prefix</FormLabel><FormControl className="col-span-8">- <Input_Shadcn_+ <Input{...field}className="w-full"disabled={disabled}diff --git a/apps/studio/components/interfaces/Settings/Logs/ErrorCodeDialog.tsx b/apps/studio/components/interfaces/Settings/Logs/ErrorCodeDialog.tsxindex e523588bb07..e09b2316887 100644--- a/apps/studio/components/interfaces/Settings/Logs/ErrorCodeDialog.tsx+++ b/apps/studio/components/interfaces/Settings/Logs/ErrorCodeDialog.tsx@@ -1,8 +1,8 @@import { AlertTriangle } from 'lucide-react'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Badge,Button_Shadcn_,Dialog,@@ -98,16 +98,16 @@ const ErrorExplanation = ({}const ErrorState = ({ refetch }: { refetch?: () => void }) => (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><AlertTriangle />- <AlertTitle_Shadcn_>Lookup failed</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Lookup failed</AlertTitle>+ <AlertDescription><p>Failed to look up error code help info</p>{refetch && (<Button_Shadcn_ variant="outline" size="sm" className="mt-2" onClick={refetch}>Try again</Button_Shadcn_>)}- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)diff --git a/apps/studio/components/interfaces/Settings/Logs/Logs.DatePickers.tsx b/apps/studio/components/interfaces/Settings/Logs/Logs.DatePickers.tsxindex ecb03f8848b..1120614d7f9 100644--- a/apps/studio/components/interfaces/Settings/Logs/Logs.DatePickers.tsx+++ b/apps/studio/components/interfaces/Settings/Logs/Logs.DatePickers.tsx@@ -10,7 +10,7 @@ import {Calendar,cn,copyToClipboard,- Input_Shadcn_,+ Input,Popover_Shadcn_,PopoverContent_Shadcn_,PopoverTrigger_Shadcn_,@@ -332,7 +332,7 @@ export const LogsDatePicker = ({{...popoverContentProps}><div className="border-r p-2 flex flex-col gap-px">- <Input_Shadcn_+ <Inputtype="text"placeholder="e.g. 2h, 30m, 7d"value={customValue}diff --git a/apps/studio/components/interfaces/Settings/Logs/Logs.UpdateSavedQueryModal.tsx b/apps/studio/components/interfaces/Settings/Logs/Logs.UpdateSavedQueryModal.tsxindex 1ad0ad3ff07..fecd04e41a2 100644--- a/apps/studio/components/interfaces/Settings/Logs/Logs.UpdateSavedQueryModal.tsx+++ b/apps/studio/components/interfaces/Settings/Logs/Logs.UpdateSavedQueryModal.tsx@@ -1,7 +1,7 @@import { zodResolver } from '@hookform/resolvers/zod'import { useEffect } from 'react'import { SubmitHandler, useForm } from 'react-hook-form'-import { Button, Form, FormControl, FormField, Input_Shadcn_, Modal, Textarea } from 'ui'+import { Button, Form, FormControl, FormField, Input, Modal, Textarea } from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import * as z from 'zod'@@ -55,7 +55,7 @@ export const UpdateSavedQueryModal = ({render={({ field }) => (<FormItemLayout layout="vertical" label="Name"><FormControl>- <Input_Shadcn_ {...field} placeholder="Enter text" />+ <Input {...field} placeholder="Enter text" /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/SignIn/ForgotPasswordWizard.tsx b/apps/studio/components/interfaces/SignIn/ForgotPasswordWizard.tsxindex c948469a1b3..6abda7a93d5 100644--- a/apps/studio/components/interfaces/SignIn/ForgotPasswordWizard.tsx+++ b/apps/studio/components/interfaces/SignIn/ForgotPasswordWizard.tsx@@ -4,7 +4,7 @@ import { useRouter } from 'next/router'import { useRef, useState } from 'react'import { SubmitHandler, useForm } from 'react-hook-form'import { toast } from 'sonner'-import { Button, Form, FormControl, FormField, Input_Shadcn_ } from 'ui'+import { Button, Form, FormControl, FormField, Input } from 'ui'import { Admonition } from 'ui-patterns'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import * as z from 'zod'@@ -90,12 +90,7 @@ const ConfirmResetCodeForm = ({ email }: { email: string }) => {render={({ field }) => (<FormItemLayout label="Code"><FormControl>- <Input_Shadcn_- {...field}- placeholder="123456"- autoComplete="off"- disabled={isLoading}- />+ <Input {...field} placeholder="123456" autoComplete="off" disabled={isLoading} /></FormControl></FormItemLayout>)}@@ -162,7 +157,7 @@ const ForgotPasswordForm = ({ onSuccess }: { onSuccess: (email: string) => voidrender={({ field }) => (<FormItemLayout label="Email"><FormControl>- <Input_Shadcn_+ <Input{...field}type="email"placeholder="[email protected]"diff --git a/apps/studio/components/interfaces/SignIn/SignInForm.tsx b/apps/studio/components/interfaces/SignIn/SignInForm.tsxindex 72b889dfc64..80c62609c54 100644--- a/apps/studio/components/interfaces/SignIn/SignInForm.tsx+++ b/apps/studio/components/interfaces/SignIn/SignInForm.tsx@@ -8,7 +8,7 @@ import { useRouter } from 'next/router'import { useEffect, useRef, useState } from 'react'import { useForm, type SubmitHandler } from 'react-hook-form'import { toast } from 'sonner'-import { Button, Form, FormControl, FormField, Input_Shadcn_ } from 'ui'+import { Button, Form, FormControl, FormField, Input } from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import z from 'zod'@@ -128,7 +128,7 @@ export const SignInForm = () => {render={({ field }) => (<FormItemLayout name="email" label="Email"><FormControl>- <Input_Shadcn_+ <Inputid="email"type="email"autoComplete="email"@@ -150,7 +150,7 @@ export const SignInForm = () => {<FormItemLayout name="password" label="Password"><FormControl><div className="relative">- <Input_Shadcn_+ <Inputid="password"type={passwordHidden ? 'password' : 'text'}autoComplete="current-password"diff --git a/apps/studio/components/interfaces/SignIn/SignInMfaForm.tsx b/apps/studio/components/interfaces/SignIn/SignInMfaForm.tsxindex 68f3260188d..e143b2c5d2e 100644--- a/apps/studio/components/interfaces/SignIn/SignInMfaForm.tsx+++ b/apps/studio/components/interfaces/SignIn/SignInMfaForm.tsx@@ -8,7 +8,7 @@ import Link from 'next/link'import { useRouter } from 'next/router'import { useEffect, useState } from 'react'import { SubmitHandler, useForm } from 'react-hook-form'-import { Button, Form, FormControl, FormField, Input_Shadcn_ } from 'ui'+import { Button, Form, FormControl, FormField, Input } from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'import z from 'zod'@@ -139,7 +139,7 @@ export const SignInMfaForm = ({ context = 'sign-in' }: SignInMfaFormProps) => {<div className="absolute inset-y-0 left-0 pl-3 flex items-center pointer-events-none text-foreground-light [&_svg]:stroke-[1.5] [&_svg]:h-[20px] [&_svg]:w-[20px]"><Lock /></div>- <Input_Shadcn_+ <Inputid="code"className="pl-10 font-mono"{...field}diff --git a/apps/studio/components/interfaces/SignIn/SignInSSOForm.tsx b/apps/studio/components/interfaces/SignIn/SignInSSOForm.tsxindex bfb2862a080..9d5ca57fdf7 100644--- a/apps/studio/components/interfaces/SignIn/SignInSSOForm.tsx+++ b/apps/studio/components/interfaces/SignIn/SignInSSOForm.tsx@@ -4,7 +4,7 @@ import { useQueryClient } from '@tanstack/react-query'import { useRef, useState } from 'react'import { useForm, type SubmitHandler } from 'react-hook-form'import { toast } from 'sonner'-import { Button, Form, FormControl, FormField, Input_Shadcn_ } from 'ui'+import { Button, Form, FormControl, FormField, Input } from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import z from 'zod'@@ -81,7 +81,7 @@ export const SignInSSOForm = () => {render={({ field }) => (<FormItemLayout name="email" label="Email"><FormControl>- <Input_Shadcn_+ <Inputid="email"type="email"autoComplete="email"diff --git a/apps/studio/components/interfaces/SignIn/SignUpForm.tsx b/apps/studio/components/interfaces/SignIn/SignUpForm.tsxindex e6233d8732b..53de4879692 100644--- a/apps/studio/components/interfaces/SignIn/SignUpForm.tsx+++ b/apps/studio/components/interfaces/SignIn/SignUpForm.tsx@@ -8,15 +8,15 @@ import { useRef, useState } from 'react'import { SubmitHandler, useForm } from 'react-hook-form'import { toast } from 'sonner'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Button,cn,Form,FormControl,FormField,- Input_Shadcn_,+ Input,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import z from 'zod'@@ -127,14 +127,14 @@ export const SignUpForm = () => {transition={{ duration: 0.5, delay: 0.3 }}className="absolute top-0 w-full">- <Alert_Shadcn_ variant="default">+ <Alert variant="default"><CheckCircle />- <AlertTitle_Shadcn_>Check your email to confirm</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_ className="text-xs">+ <AlertTitle>Check your email to confirm</AlertTitle>+ <AlertDescription className="text-xs">You've successfully signed up. Please check your email to confirm your account beforesigning in to the Supabase dashboard. The confirmation link expires in 10 minutes.- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert></motion.div>)}<div@@ -152,7 +152,7 @@ export const SignUpForm = () => {render={({ field }) => (<FormItemLayout name="email" label="Email"><FormControl>- <Input_Shadcn_+ <Inputid="email"autoComplete="email"disabled={isSubmitting}@@ -172,7 +172,7 @@ export const SignUpForm = () => {<FormItemLayout name="password" label="Password"><FormControl><div className="relative">- <Input_Shadcn_+ <Inputid="password"type={passwordHidden ? 'password' : 'text'}autoComplete="new-password"diff --git a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/CreateTable/CreateTableSheet.tsx b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/CreateTable/CreateTableSheet.tsxindex 51d2b1493a8..5a22ab3106f 100644--- a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/CreateTable/CreateTableSheet.tsx+++ b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/CreateTable/CreateTableSheet.tsx@@ -11,7 +11,7 @@ import {FormControl,FormField,FormInputGroupInput,- Input_Shadcn_,+ Input,InputGroup,InputGroupAddon,Select_Shadcn_,@@ -193,10 +193,7 @@ export const CreateTableSheet = ({ open, onOpenChange }: CreateTableSheetProps)render={({ field }) => (<FormItemLayout name="newNamespace" label="Name of new namespace"><FormControl>- <Input_Shadcn_- {...field}- placeholder="Provide a name for your new namespace"- />+ <Input {...field} placeholder="Provide a name for your new namespace" /></FormControl></FormItemLayout>)}@@ -214,10 +211,7 @@ export const CreateTableSheet = ({ open, onOpenChange }: CreateTableSheetProps)render={({ field }) => (<FormItemLayout name="name" label="Name of table"><FormControl>- <Input_Shadcn_- {...field}- placeholder="Provide a name for your new table"- />+ <Input {...field} placeholder="Provide a name for your new table" /></FormControl></FormItemLayout>)}@@ -258,7 +252,7 @@ export const CreateTableSheet = ({ open, onOpenChange }: CreateTableSheetProps)render={({ field }) => (<FormItemLayout><FormControl>- <Input_Shadcn_+ <Input{...field}placeholder="Provide a column name"disabled={isCreating}diff --git a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/InitializeForeignSchemaDialog.tsx b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/InitializeForeignSchemaDialog.tsxindex ab519ef630c..8664bb61a44 100644--- a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/InitializeForeignSchemaDialog.tsx+++ b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/InitializeForeignSchemaDialog.tsx@@ -15,7 +15,7 @@ import {DialogTrigger,Form,FormField,- Input_Shadcn_,+ Input,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import z from 'zod'@@ -110,7 +110,7 @@ export const InitializeForeignSchemaDialog = ({ namespace }: { namespace: stringname="schema"render={({ field }) => (<FormItemLayout layout="vertical" label="Schema name">- <Input_Shadcn_ {...field} placeholder="Provide a name for your schema" />+ <Input {...field} placeholder="Provide a name for your schema" /></FormItemLayout>)}/>diff --git a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/CreateAnalyticsBucketForm.tsx b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/CreateAnalyticsBucketForm.tsxindex 8cc03aa25c2..445e0216e2f 100644--- a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/CreateAnalyticsBucketForm.tsx+++ b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/CreateAnalyticsBucketForm.tsx@@ -10,7 +10,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,SheetFooter,SheetSection,} from 'ui'@@ -209,7 +209,7 @@ export const CreateAnalyticsBucketForm = ({description="Must be between 3 – 63 characters. Only lowercase letters, numbers, and hyphens are allowed."><FormControl>- <Input_Shadcn_+ <Inputid="name"data-1p-ignoredata-lpignore="true"diff --git a/apps/studio/components/interfaces/Storage/CreateBucketModal.tsx b/apps/studio/components/interfaces/Storage/CreateBucketModal.tsxindex 4f9e8933463..027a9634093 100644--- a/apps/studio/components/interfaces/Storage/CreateBucketModal.tsx+++ b/apps/studio/components/interfaces/Storage/CreateBucketModal.tsx@@ -16,7 +16,7 @@ import {FormControl,FormField,FormMessage,- Input_Shadcn_,+ Input,Select_Shadcn_,SelectContent_Shadcn_,SelectItem_Shadcn_,@@ -210,7 +210,7 @@ export const CreateBucketModal = ({ open, onOpenChange }: CreateBucketModalPropslabelOptional="Cannot be changed after creation"><FormControl>- <Input_Shadcn_+ <Inputid="name"data-1p-ignoredata-lpignore="true"@@ -301,7 +301,7 @@ export const CreateBucketModal = ({ open, onOpenChange }: CreateBucketModalProps<div className="grid grid-cols-12 gap-x-2"><div className="col-span-8"><FormControl>- <Input_Shadcn_+ <Inputid="formatted_size_limit"aria-label="File size limit"type="number"@@ -391,7 +391,7 @@ export const CreateBucketModal = ({ open, onOpenChange }: CreateBucketModalPropsdescription="Wildcards are allowed, e.g. image/*."><FormControl>- <Input_Shadcn_+ <Inputid="allowed_mime_types"{...field}placeholder="e.g image/jpeg, image/png, audio/mpeg, video/mp4, etc"diff --git a/apps/studio/components/interfaces/Storage/EditBucketModal.tsx b/apps/studio/components/interfaces/Storage/EditBucketModal.tsxindex 3df84560307..e183308d9ff 100644--- a/apps/studio/components/interfaces/Storage/EditBucketModal.tsx+++ b/apps/studio/components/interfaces/Storage/EditBucketModal.tsx@@ -16,7 +16,7 @@ import {FormControl,FormField,FormMessage,- Input_Shadcn_,+ Input,Select_Shadcn_,SelectContent_Shadcn_,SelectItem_Shadcn_,@@ -217,7 +217,7 @@ export const EditBucketModal = ({ visible, bucket, onClose }: EditBucketModalProlabelOptional="Cannot be changed after creation"><FormControl>- <Input_Shadcn_ id="name" {...field} disabled />+ <Input id="name" {...field} disabled /></FormControl></FormItemLayout>)}@@ -323,7 +323,7 @@ export const EditBucketModal = ({ visible, bucket, onClose }: EditBucketModalPro<div className="grid grid-cols-12 gap-x-2"><div className="col-span-8"><FormControl>- <Input_Shadcn_+ <Inputid="formatted_size_limit"aria-label="File size limit"type="number"@@ -413,7 +413,7 @@ export const EditBucketModal = ({ visible, bucket, onClose }: EditBucketModalProdescription="Wildcards are allowed, e.g. image/*."><FormControl>- <Input_Shadcn_+ <Inputid="allowed_mime_types"{...field}placeholder="e.g image/jpeg, image/png, audio/mpeg, video/mp4, etc"diff --git a/apps/studio/components/interfaces/Storage/ImportForeignSchemaDialog.tsx b/apps/studio/components/interfaces/Storage/ImportForeignSchemaDialog.tsxindex 24ca071b16f..e83e9e40d29 100644--- a/apps/studio/components/interfaces/Storage/ImportForeignSchemaDialog.tsx+++ b/apps/studio/components/interfaces/Storage/ImportForeignSchemaDialog.tsx@@ -4,7 +4,7 @@ import { uniq } from 'lodash'import { useEffect, useState } from 'react'import { SubmitHandler, useForm } from 'react-hook-form'import { toast } from 'sonner'-import { Button, Form, FormField, Input_Shadcn_, Modal, Separator } from 'ui'+import { Button, Form, FormField, Input, Modal, Separator } from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import z from 'zod'@@ -184,7 +184,7 @@ export const ImportForeignSchemaDialog = ({label="Target schema"description="Where your analytics tables will be stored.">- <Input_Shadcn_ {...field} placeholder="Enter schema name" />+ <Input {...field} placeholder="Enter schema name" /></FormItemLayout>)}/>diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/CustomExpiryModal.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/CustomExpiryModal.tsxindex f7255ceeb75..0f05c381ea4 100644--- a/apps/studio/components/interfaces/Storage/StorageExplorer/CustomExpiryModal.tsx+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/CustomExpiryModal.tsx@@ -6,7 +6,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,Modal,Select_Shadcn_,SelectContent_Shadcn_,@@ -99,7 +99,7 @@ export const CustomExpiryModal = () => {render={({ field }) => (<FormItemLayout layout="vertical" label="Duration"><FormControl>- <Input_Shadcn_+ <Input{...field}type="number"onChange={(e) => {diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/MoveItemsModal.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/MoveItemsModal.tsxindex 6c953e9dfbf..8046bffaad8 100644--- a/apps/studio/components/interfaces/Storage/StorageExplorer/MoveItemsModal.tsx+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/MoveItemsModal.tsx@@ -1,6 +1,6 @@import { noop } from 'lodash'import { useEffect, useState } from 'react'-import { Button, Input_Shadcn_ as Input, Modal } from 'ui'+import { Button, Input, Modal } from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { StorageItemWithColumn } from '../Storage.types'diff --git a/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesBucketsSection.tsx b/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesBucketsSection.tsxindex 57eb6db432c..477c384f635 100644--- a/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesBucketsSection.tsx+++ b/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesBucketsSection.tsx@@ -1,13 +1,7 @@import { useVirtualizer } from '@tanstack/react-virtual'import { ChevronUp, Search, X } from 'lucide-react'import { forwardRef, useEffect, useState, type HTMLAttributes, type ReactNode } from 'react'-import {- Button,- cn,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,-} from 'ui'+import { Button, cn, Collapsible, CollapsibleContent, CollapsibleTrigger } from 'ui'import { ShimmeringLoader } from 'ui-patterns'import { Input } from 'ui-patterns/DataInputs/Input'import {@@ -60,7 +54,7 @@ export const BucketsPolicies = ({return (<PageSection>- <Collapsible_Shadcn_ open={expanded} onOpenChange={setExpanded}>+ <Collapsible open={expanded} onOpenChange={setExpanded}><PageSectionMeta><PageSectionSummary><PageSectionTitle>Buckets</PageSectionTitle>@@ -68,7 +62,7 @@ export const BucketsPolicies = ({Write policies for each bucket to control access to the bucket and its contents</PageSectionDescription></PageSectionSummary>- <CollapsibleTrigger_Shadcn_ asChild>+ <CollapsibleTrigger asChild><button><span className="sr-only">Toggle bucket list</span><ChevronUp@@ -80,9 +74,9 @@ export const BucketsPolicies = ({)}/></button>- </CollapsibleTrigger_Shadcn_>+ </CollapsibleTrigger></PageSectionMeta>- <CollapsibleContent_Shadcn_>+ <CollapsibleContent><PageSectionContent className="mt-6">{showEmptyState && <StoragePoliciesPlaceholder />}@@ -124,8 +118,8 @@ export const BucketsPolicies = ({pagination={pagination}/></PageSectionContent>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible></PageSection>)}diff --git a/apps/studio/components/interfaces/Storage/StorageSettings/S3Connection.tsx b/apps/studio/components/interfaces/Storage/StorageSettings/S3Connection.tsxindex 7a3f7fdd7c0..c484289147d 100644--- a/apps/studio/components/interfaces/Storage/StorageSettings/S3Connection.tsx+++ b/apps/studio/components/interfaces/Storage/StorageSettings/S3Connection.tsx@@ -7,8 +7,8 @@ import { useEffect, useState } from 'react'import { SubmitHandler, useForm } from 'react-hook-form'import { toast } from 'sonner'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,+ Alert,+ AlertDescription,Button,Card,CardContent,@@ -243,18 +243,18 @@ export const S3Connection = () => {</CardFooter></Card>) : (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><WarningIcon /><AlertTitle>Project is paused</AlertTitle>- <AlertDescription_Shadcn_>+ <AlertDescription>To connect to your S3 bucket, you need to restore your project.- </AlertDescription_Shadcn_>+ </AlertDescription><div className="mt-3 flex items-center space-x-2"><Button asChild type="default"><Link href={`/project/${projectRef}`}>Restore project</Link></Button></div>- </Alert_Shadcn_>+ </Alert>)}</form></Form>@@ -280,18 +280,18 @@ export const S3Connection = () => {) : !canReadS3Credentials ? (<NoPermission resourceText="view this project's S3 access keys" />) : !isProjectActive ? (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><WarningIcon /><AlertTitle>Can't fetch S3 access keys</AlertTitle>- <AlertDescription_Shadcn_>+ <AlertDescription>To fetch your S3 access keys, you need to restore your project.- </AlertDescription_Shadcn_>- <AlertDescription_Shadcn_>+ </AlertDescription>+ <AlertDescription><Button asChild type="default" className="mt-3"><Link href={`/project/${projectRef}`}>Restore project</Link></Button>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>) : (<>{isLoadingStorageCreds ? (diff --git a/apps/studio/components/interfaces/Storage/StorageSettings/StorageSettings.tsx b/apps/studio/components/interfaces/Storage/StorageSettings/StorageSettings.tsxindex cfc6a9b2f91..f1cf774c371 100644--- a/apps/studio/components/interfaces/Storage/StorageSettings/StorageSettings.tsx+++ b/apps/studio/components/interfaces/Storage/StorageSettings/StorageSettings.tsx@@ -13,7 +13,7 @@ import {FormControl,FormField,FormMessage,- Input_Shadcn_,+ Input,Select_Shadcn_,SelectContent_Shadcn_,SelectItem_Shadcn_,@@ -356,7 +356,7 @@ export const StorageSettings = () => {><FormControl><div className="flex items-center justify-end">- <Input_Shadcn_+ <Inputtype="number"{...field}onChange={(e) => {diff --git a/apps/studio/components/interfaces/Storage/VectorBuckets/CreateVectorBucketDialog.tsx b/apps/studio/components/interfaces/Storage/VectorBuckets/CreateVectorBucketDialog.tsxindex e24851aabe1..12ea5714826 100644--- a/apps/studio/components/interfaces/Storage/VectorBuckets/CreateVectorBucketDialog.tsx+++ b/apps/studio/components/interfaces/Storage/VectorBuckets/CreateVectorBucketDialog.tsx@@ -15,7 +15,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,} from 'ui'import { Admonition } from 'ui-patterns/admonition'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'@@ -189,7 +189,7 @@ export const CreateVectorBucketDialog = ({description="Must be between 3–63 characters. Only lowercase letters, numbers, and hyphens are allowed"><FormControl>- <Input_Shadcn_+ <Inputid="name"data-1p-ignoredata-lpignore="true"diff --git a/apps/studio/components/interfaces/Storage/VectorBuckets/CreateVectorTableSheet.tsx b/apps/studio/components/interfaces/Storage/VectorBuckets/CreateVectorTableSheet.tsxindex 40a6b72fef3..af0a1b2e206 100644--- a/apps/studio/components/interfaces/Storage/VectorBuckets/CreateVectorTableSheet.tsx+++ b/apps/studio/components/interfaces/Storage/VectorBuckets/CreateVectorTableSheet.tsx@@ -11,7 +11,7 @@ import {Form,FormControl,FormField,- Input_Shadcn_,+ Input,RadioGroupStacked,RadioGroupStackedItem,Separator,@@ -248,7 +248,7 @@ export const CreateVectorTableSheet = ({ bucketName }: CreateVectorTableSheetProlayout="horizontal"><FormControl>- <Input_Shadcn_+ <Inputid="name"data-1p-ignoredata-lpignore="true"@@ -276,7 +276,7 @@ export const CreateVectorTableSheet = ({ bucketName }: CreateVectorTableSheetProlayout="horizontal"><FormControl>- <Input_Shadcn_+ <Inputid="dimension"type="number"placeholder="Enter a numeric value"@@ -353,7 +353,7 @@ export const CreateVectorTableSheet = ({ bucketName }: CreateVectorTableSheetProlayout="vertical"><FormControl>- <Input_Shadcn_+ <Input{...field}value={field.value}size="small"diff --git a/apps/studio/components/interfaces/Storage/VectorBuckets/VectorBucketDetails/InitializeForeignSchemaDialog.tsx b/apps/studio/components/interfaces/Storage/VectorBuckets/VectorBucketDetails/InitializeForeignSchemaDialog.tsxindex 3340056aced..6c963607987 100644--- a/apps/studio/components/interfaces/Storage/VectorBuckets/VectorBucketDetails/InitializeForeignSchemaDialog.tsx+++ b/apps/studio/components/interfaces/Storage/VectorBuckets/VectorBucketDetails/InitializeForeignSchemaDialog.tsx@@ -18,7 +18,7 @@ import {DialogTrigger,Form,FormField,- Input_Shadcn_,+ Input,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import z from 'zod'@@ -160,7 +160,7 @@ export const InitializeForeignSchemaDialog = () => {name="schema"render={({ field }) => (<FormItemLayout layout="vertical" label="Schema name">- <Input_Shadcn_ {...field} placeholder="Provide a name for your schema" />+ <Input {...field} placeholder="Provide a name for your schema" /></FormItemLayout>)}/>diff --git a/apps/studio/components/interfaces/Support/DashboardLogsToggle.tsx b/apps/studio/components/interfaces/Support/DashboardLogsToggle.tsxindex 764384b269c..35f20e34840 100644--- a/apps/studio/components/interfaces/Support/DashboardLogsToggle.tsx+++ b/apps/studio/components/interfaces/Support/DashboardLogsToggle.tsx@@ -1,13 +1,7 @@import { ChevronRight } from 'lucide-react'import { useMemo, useState } from 'react'import type { UseFormReturn } from 'react-hook-form'-import {- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,- FormField,- Switch,-} from 'ui'+import { Collapsible, CollapsibleContent, CollapsibleTrigger, FormField, Switch } from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { DASHBOARD_LOG_CATEGORIES } from './dashboard-logs'@@ -53,12 +47,8 @@ export function DashboardLogsToggle({<span className="text-foreground-light">Share sanitized logs of recent dashboard actions to help reproduce the issue.</span>- <Collapsible_Shadcn_- className="mt-2"- open={isPreviewOpen}- onOpenChange={setIsPreviewOpen}- >- <CollapsibleTrigger_Shadcn_+ <Collapsible className="mt-2" open={isPreviewOpen} onOpenChange={setIsPreviewOpen}>+ <CollapsibleTriggerclassName={'group flex items-center gap-x-1 group-data-open:text-foreground hover:text-foreground transition'}@@ -68,13 +58,13 @@ export function DashboardLogsToggle({className="transition-all group-data-open:rotate-90 text-foreground-muted -ml-1"/><span className="text-sm">Preview log</span>- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_ className="mt-2">+ </CollapsibleTrigger>+ <CollapsibleContent className="mt-2"><pre className="bg-background-surface-200 border border-strong rounded-lg p-3 max-h-60 overflow-y-auto overflow-x-auto text-xs text-foreground-light whitespace-pre-wrap">{sanitizedLogJson}</pre>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible></div>}>diff --git a/apps/studio/components/interfaces/Support/IPV4SuggestionAlert.tsx b/apps/studio/components/interfaces/Support/IPV4SuggestionAlert.tsxindex 81f5abe3a56..8e6dea6eaa0 100644--- a/apps/studio/components/interfaces/Support/IPV4SuggestionAlert.tsx+++ b/apps/studio/components/interfaces/Support/IPV4SuggestionAlert.tsx@@ -1,13 +1,13 @@import { ExternalLink, HelpCircle } from 'lucide-react'import Link from 'next/link'-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_, Button } from 'ui'+import { Alert, AlertDescription, AlertTitle, Button } from 'ui'export const IPV4SuggestionAlert = () => {return (- <Alert_Shadcn_ variant="default">+ <Alert variant="default"><HelpCircle strokeWidth={2} />- <AlertTitle_Shadcn_>Connection issues?</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_ className="grid gap-3">+ <AlertTitle>Connection issues?</AlertTitle>+ <AlertDescription className="grid gap-3"><p>Having trouble connecting to your project? It could be related to our migration fromPGBouncer and IPv4.@@ -27,7 +27,7 @@ export const IPV4SuggestionAlert = () => {</Link></Button></p>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}diff --git a/apps/studio/components/interfaces/Support/LinkSupportTicketForm.tsx b/apps/studio/components/interfaces/Support/LinkSupportTicketForm.tsxindex 0ee0cb3525e..4df96058116 100644--- a/apps/studio/components/interfaces/Support/LinkSupportTicketForm.tsx+++ b/apps/studio/components/interfaces/Support/LinkSupportTicketForm.tsx@@ -4,7 +4,7 @@ import { useEffect } from 'react'import type { SubmitHandler } from 'react-hook-form'import { useForm } from 'react-hook-form'import { toast } from 'sonner'-import { Button, DialogSectionSeparator, Form, FormControl, FormField, Input_Shadcn_ } from 'ui'+import { Button, DialogSectionSeparator, Form, FormControl, FormField, Input } from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { CategoryAndSeverityInfo } from './CategoryAndSeverityInfo'@@ -117,7 +117,7 @@ export const LinkSupportTicketForm = ({render={({ field }) => (<FormItemLayout hideMessage layout="vertical" label="Conversation ID"><FormControl>- <Input_Shadcn_ {...field} readOnly />+ <Input {...field} readOnly /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Support/MessageField.tsx b/apps/studio/components/interfaces/Support/MessageField.tsxindex 1bdef3e1bd9..41f13db835a 100644--- a/apps/studio/components/interfaces/Support/MessageField.tsx+++ b/apps/studio/components/interfaces/Support/MessageField.tsx@@ -1,7 +1,7 @@import type { UseFormReturn } from 'react-hook-form'// End of third-party imports-import { FormControl, FormField, TextArea_Shadcn_ } from 'ui'+import { FormControl, FormField, TextArea } from 'ui'import { Admonition } from 'ui-patterns/admonition'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'@@ -31,7 +31,7 @@ export function MessageField({ form, originalError }: MessageFieldProps) {}><FormControl>- <TextArea_Shadcn_+ <TextArea{...field}rows={4}maxLength={5000}diff --git a/apps/studio/components/interfaces/Support/SubjectAndSuggestionsInfo.tsx b/apps/studio/components/interfaces/Support/SubjectAndSuggestionsInfo.tsxindex 77962f32867..c1bf234e13b 100644--- a/apps/studio/components/interfaces/Support/SubjectAndSuggestionsInfo.tsx+++ b/apps/studio/components/interfaces/Support/SubjectAndSuggestionsInfo.tsx@@ -4,7 +4,7 @@ import { SupportCategories } from '@supabase/shared-types/out/constants'import { ExternalLink } from 'lucide-react'import Link from 'next/link'import type { UseFormReturn } from 'react-hook-form'-import { FormControl, FormField, Input_Shadcn_ } from 'ui'+import { FormControl, FormField, Input } from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { DocsSuggestions } from './DocsSuggestions'@@ -35,7 +35,7 @@ export function SubjectAndSuggestionsInfo({render={({ field }) => (<FormItemLayout layout="vertical" label="Subject"><FormControl>- <Input_Shadcn_ {...field} placeholder="Summary of the problem you have" />+ <Input {...field} placeholder="Summary of the problem you have" /></FormControl></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Support/SupportAccessToggle.tsx b/apps/studio/components/interfaces/Support/SupportAccessToggle.tsxindex a809814a211..146d68a5dd5 100644--- a/apps/studio/components/interfaces/Support/SupportAccessToggle.tsx+++ b/apps/studio/components/interfaces/Support/SupportAccessToggle.tsx@@ -4,14 +4,7 @@ import { SupportCategories } from '@supabase/shared-types/out/constants'import { ChevronRight } from 'lucide-react'import Link from 'next/link'import type { UseFormReturn } from 'react-hook-form'-import {- Badge,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,- FormField,- Switch,-} from 'ui'+import { Badge, Collapsible, CollapsibleContent, CollapsibleTrigger, FormField, Switch } from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import type { ExtendedSupportCategories } from './Support.constants'@@ -53,8 +46,8 @@ export function SupportAccessToggle({ form, align = 'left', className }: Support<span className="text-foreground-light">Human support and AI diagnostic access.</span>- <Collapsible_Shadcn_ className="mt-2">- <CollapsibleTrigger_Shadcn_+ <Collapsible className="mt-2">+ <CollapsibleTriggerclassName={'group flex items-center gap-x-1 group-data-open:text-foreground hover:text-foreground transition'}@@ -64,8 +57,8 @@ export function SupportAccessToggle({ form, align = 'left', className }: SupportclassName="transition-all group-data-open:rotate-90 text-foreground-muted -ml-1"/><span className="text-sm">More information</span>- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_ className="text-sm text-foreground-light mt-2 space-y-2">+ </CollapsibleTrigger>+ <CollapsibleContent className="text-sm text-foreground-light mt-2 space-y-2"><p>By enabling this, you grant permission for our support team to access yourproject temporarily and, if applicable, to use AI tools to assist in@@ -85,8 +78,8 @@ export function SupportAccessToggle({ form, align = 'left', className }: SupportPrivacy Policy</Link></p>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible></div>}>diff --git a/apps/studio/components/interfaces/TableGridEditor/DeleteConfirmationDialogs.tsx b/apps/studio/components/interfaces/TableGridEditor/DeleteConfirmationDialogs.tsxindex adf297e1690..5fc2646c469 100644--- a/apps/studio/components/interfaces/TableGridEditor/DeleteConfirmationDialogs.tsx+++ b/apps/studio/components/interfaces/TableGridEditor/DeleteConfirmationDialogs.tsx@@ -1,7 +1,7 @@import { ExternalLink } from 'lucide-react'import Link from 'next/link'import { toast } from 'sonner'-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_, Button, Checkbox } from 'ui'+import { Alert, AlertDescription, AlertTitle, Button, Checkbox } from 'ui'import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'import { useTableFilter } from '@/components/grid/hooks/useTableFilter'@@ -235,15 +235,15 @@ const DeleteConfirmationDialogs = ({</div></div>{isDeleteWithCascade && (- <Alert_Shadcn_+ <Alertvariant="warning"title="Warning: Dropping with cascade may result in unintended consequences">- <AlertTitle_Shadcn_>+ <AlertTitle>All dependent objects will be removed, as will any objects that depend on them,recursively.- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ </AlertTitle>+ <AlertDescription><Button asChild size="tiny" type="default" icon={<ExternalLink />}><Linkhref="https://www.postgresql.org/docs/current/ddl-depend.html"@@ -253,8 +253,8 @@ const DeleteConfirmationDialogs = ({About dependency tracking</Link></Button>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}</div></ConfirmationModal>@@ -296,15 +296,15 @@ const DeleteConfirmationDialogs = ({</div></div>{isDeleteWithCascade && (- <Alert_Shadcn_ variant="warning">- <AlertTitle_Shadcn_>+ <Alert variant="warning">+ <AlertTitle>Warning: Dropping with cascade may result in unintended consequences- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ </AlertTitle>+ <AlertDescription>All dependent objects will be removed, as will any objects that depend on them,recursively.- </AlertDescription_Shadcn_>- <AlertDescription_Shadcn_ className="mt-4">+ </AlertDescription>+ <AlertDescription className="mt-4"><Button asChild size="tiny" type="default" icon={<ExternalLink />}><Linkhref="https://www.postgresql.org/docs/current/ddl-depend.html"@@ -314,8 +314,8 @@ const DeleteConfirmationDialogs = ({About dependency tracking</Link></Button>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}</div></ConfirmationModal>diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnType.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnType.tsxindex b3d03f6f9f2..e0cec443f61 100644--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnType.tsx+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnType.tsx@@ -12,9 +12,9 @@ import {import Link from 'next/link'import { ReactNode, useId, useState } from 'react'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Button,cn,Command_Shadcn_,@@ -26,6 +26,9 @@ import {CommandSeparator_Shadcn_,CriticalIcon,Input,+ InputGroup,+ InputGroupAddon,+ InputGroupInput,Label_Shadcn_,Popover_Shadcn_,PopoverContent_Shadcn_,@@ -35,6 +38,7 @@ import {TooltipContent,TooltipTrigger,} from 'ui'+import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import {POSTGRES_DATA_TYPE_OPTIONS,@@ -134,17 +138,19 @@ const ColumnType = ({return (<Tooltip><TooltipTrigger>- <Input- readOnly- disabled- label={showLabel ? 'Type' : ''}+ <FormItemLayoutlayout={showLabel ? layout : undefined}- className="md:gap-x-0 [&>div>div]:text-left"- size="small"- icon={inferIcon(getOptionType(value))}- value={displayValue}- descriptionText={showLabel ? unsupportedDataTypeText : undefined}- />+ label={showLabel ? 'Type' : ''}+ description={showLabel ? unsupportedDataTypeText : undefined}+ isReactForm={false}+ >+ <InputGroup>+ <InputGroupInput readOnly disabled size="small" value={displayValue} />+ <InputGroupAddon align="inline-start">+ {inferIcon(getOptionType(value))}+ </InputGroupAddon>+ </InputGroup>+ </FormItemLayout></TooltipTrigger>{!showLabel && (<TooltipContent side="bottom" className="w-80">@@ -159,15 +165,14 @@ const ColumnType = ({return (<Tooltip><TooltipTrigger>- <Input- readOnly- disabled+ <FormItemLayout+ layout={showLabel ? layout : undefined}label={showLabel ? 'Type' : ''}- layout={showLabel ? 'horizontal' : undefined}- className="md:gap-x-0"- size="small"- value={displayValue}- />+ description={showLabel ? unsupportedDataTypeText : undefined}+ isReactForm={false}+ >+ <Input readOnly disabled size="small" value={displayValue} />+ </FormItemLayout></TooltipTrigger>{!showLabel && description && (<TooltipContent side="bottom">@@ -300,14 +305,14 @@ const ColumnType = ({</Popover_Shadcn_>{showRecommendation && recommendation !== undefined && (- <Alert_Shadcn_ variant="warning" className="mt-2">+ <Alert variant="warning" className="mt-2"><CriticalIcon />- <AlertTitle_Shadcn_>+ <AlertTitle>{' '}It is recommended to use{' '}<code className="text-code-inline">{recommendation.alternative}</code> instead- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ </AlertTitle>+ <AlertDescription><p>Postgres recommends against using the data type{' '}<code className="text-code-inline">{displayValue}</code> unless you have a very@@ -326,8 +331,8 @@ const ColumnType = ({Use {recommendation.alternative}</Button></div>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}</div>)diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ForeignKeySelector/ForeignKeySelector.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ForeignKeySelector/ForeignKeySelector.tsxindex 441d6f1f7a0..a123ab4b51d 100644--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ForeignKeySelector/ForeignKeySelector.tsx+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ForeignKeySelector/ForeignKeySelector.tsx@@ -4,9 +4,9 @@ import { sortBy } from 'lodash'import { ArrowRight, HelpCircle, Loader2, X } from 'lucide-react'import { Fragment, useEffect, useState } from 'react'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Button,Select_Shadcn_,SelectContent_Shadcn_,@@ -402,11 +402,11 @@ export const ForeignKeySelector = ({{fk.schema}.{fk.table}</div>{fk.columns.length === 0 && (- <Alert_Shadcn_ className="col-span-10 py-2 px-3">- <AlertDescription_Shadcn_>+ <Alert className="col-span-10 py-2 px-3">+ <AlertDescription>There are no foreign key relations between the tables- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}{fk.columns.map((_, idx) => (<Fragment key={`${fk.schema}-${fk.table}-${idx}`}>@@ -493,12 +493,12 @@ export const ForeignKeySelector = ({</Button>{errors.columns && <p className="text-red-900 text-sm">{errors.columns}</p>}{hasTypeErrors && (- <Alert_Shadcn_ variant="warning">- <AlertTitle_Shadcn_>Column types do not match</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <Alert variant="warning">+ <AlertTitle>Column types do not match</AlertTitle>+ <AlertDescription>The following columns cannot be referenced as they are not of the sametype:- </AlertDescription_Shadcn_>+ </AlertDescription><ul className="list-disc pl-5 mt-2 text-foreground-light">{(errors?.types ?? []).map((x, idx: number) => {if (x === undefined) return null@@ -521,15 +521,15 @@ export const ForeignKeySelector = ({)})}</ul>- </Alert_Shadcn_>+ </Alert>)}{hasTypeNotices && (- <Alert_Shadcn_>- <AlertTitle_Shadcn_>Column types will be updated</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <Alert>+ <AlertTitle>Column types will be updated</AlertTitle>+ <AlertDescription>The following columns will have their types updated to match theirreferenced column- </AlertDescription_Shadcn_>+ </AlertDescription><ul className="list-disc pl-5 mt-2 text-foreground-light">{(errors?.typeNotice ?? []).map((x, idx: number) => {if (x === undefined) return null@@ -548,7 +548,7 @@ export const ForeignKeySelector = ({)})}</ul>- </Alert_Shadcn_>+ </Alert>)}</div></div>diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/InputField.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/InputField.tsxindex 71172e3305a..95d379af4df 100644--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/InputField.tsx+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/InputField.tsx@@ -6,7 +6,7 @@ import {DropdownMenuItem,DropdownMenuSeparator,DropdownMenuTrigger,- Input_Shadcn_ as Input,+ Input,InputGroup,InputGroupAddon,InputGroupButton,@@ -18,7 +18,7 @@ import {SelectItem_Shadcn_,SelectTrigger_Shadcn_,SelectValue_Shadcn_,- TextArea_Shadcn_ as TextArea,+ TextArea,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SchemaEditor.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SchemaEditor.tsxindex d320b34e3c8..bcd6e2af1d7 100644--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SchemaEditor.tsx+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SchemaEditor.tsx@@ -1,6 +1,6 @@import { useEffect, useState } from 'react'import { toast } from 'sonner'-import { Input_Shadcn_ as Input, SidePanel } from 'ui'+import { Input, SidePanel } from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { useSchemaCreateMutation } from '@/data/database/schema-create-mutation'diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SpreadsheetImport/SpreadSheetImportConfiguration.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SpreadsheetImport/SpreadSheetImportConfiguration.tsxindex 12945b58997..332754996f6 100644--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SpreadsheetImport/SpreadSheetImportConfiguration.tsx+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SpreadsheetImport/SpreadSheetImportConfiguration.tsx@@ -1,13 +1,6 @@import { ChevronDown } from 'lucide-react'import { useState } from 'react'-import {- Button,- cn,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,- SidePanel,-} from 'ui'+import { Button, cn, Collapsible, CollapsibleContent, CollapsibleTrigger, SidePanel } from 'ui'import { MultiSelector } from 'ui-patterns/multi-select'import type { SpreadsheetData } from './SpreadsheetImport.types'@@ -33,12 +26,8 @@ const SpreadsheetImportConfiguration = ({)return (- <Collapsible_Shadcn_- open={expandConfiguration}- onOpenChange={setExpandConfiguration}- className={''}- >- <CollapsibleTrigger_Shadcn_ asChild>+ <Collapsible open={expandConfiguration} onOpenChange={setExpandConfiguration} className={''}>+ <CollapsibleTrigger asChild><SidePanel.Content><div className="py-1 flex items-center justify-between"><p className="text-sm">Configure import data</p>@@ -57,8 +46,8 @@ const SpreadsheetImportConfiguration = ({/></div></SidePanel.Content>- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_>+ </CollapsibleTrigger>+ <CollapsibleContent><SidePanel.Content><div className="py-2 space-y-3"><div>@@ -118,8 +107,8 @@ const SpreadsheetImportConfiguration = ({</div></div></SidePanel.Content>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible>)}diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SpreadsheetImport/SpreadSheetTextInput.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SpreadsheetImport/SpreadSheetTextInput.tsxindex 1b389b8a0f8..1622c2576ed 100644--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SpreadsheetImport/SpreadSheetTextInput.tsx+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SpreadsheetImport/SpreadSheetTextInput.tsx@@ -1,4 +1,4 @@-import { TextArea_Shadcn_ as TextArea } from 'ui'+import { TextArea } from 'ui'interface SpreadSheetTextInputProps {input: stringdiff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SpreadsheetImport/SpreadsheetImportPreview.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SpreadsheetImport/SpreadsheetImportPreview.tsxindex b9111671bd8..f7a6b6e9fcc 100644--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SpreadsheetImport/SpreadsheetImportPreview.tsx+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SpreadsheetImport/SpreadsheetImportPreview.tsx@@ -1,15 +1,15 @@import { AlertCircle, ArrowRight, ChevronDown, ChevronRight } from 'lucide-react'import { useEffect, useState } from 'react'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Badge,Button,cn,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,+ Collapsible,+ CollapsibleContent,+ CollapsibleTrigger,SidePanel,WarningIcon,} from 'ui'@@ -70,8 +70,8 @@ export const SpreadsheetImportPreview = ({)return (- <Collapsible_Shadcn_ open={expandPreview} onOpenChange={setExpandPreview} className={''}>- <CollapsibleTrigger_Shadcn_ asChild>+ <Collapsible open={expandPreview} onOpenChange={setExpandPreview} className={''}>+ <CollapsibleTrigger asChild><SidePanel.Content><div className="py-1 flex items-center justify-between"><div className="flex items-center space-x-2">@@ -97,8 +97,8 @@ export const SpreadsheetImportPreview = ({/></div></SidePanel.Content>- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_>+ </CollapsibleTrigger>+ <CollapsibleContent><SidePanel.Content><div className="mb-4"><p className="text-sm text-foreground-light">@@ -136,10 +136,10 @@ export const SpreadsheetImportPreview = ({)}</div>{(!isCompatible || dedupedErrors.length > 0) && (- <Alert_Shadcn_ variant="warning" className="my-4">+ <Alert variant="warning" className="my-4"><WarningIcon />- <AlertTitle_Shadcn_>Issues found in spreadsheet</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Issues found in spreadsheet</AlertTitle>+ <AlertDescription><div className="space-y-2">{isCompatible ? (<p className="text-sm">@@ -235,11 +235,11 @@ export const SpreadsheetImportPreview = ({})}</ul></div>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}</SidePanel.Content>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible>)}diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/ColumnManagement.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/ColumnManagement.tsxindex ea1302544f9..1c1b4f502b2 100644--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/ColumnManagement.tsx+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/ColumnManagement.tsx@@ -18,9 +18,9 @@ import { isEmpty, noop, partition } from 'lodash'import { Edit, ExternalLink, HelpCircle, Key, Trash } from 'lucide-react'import { useState } from 'react'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Button,Tooltip,TooltipContent,@@ -212,14 +212,14 @@ export const ColumnManagement = ({)}{primaryKeyColumns.length === 0 && (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><WarningIcon />- <AlertTitle_Shadcn_>Warning: No primary keys selected</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Warning: No primary keys selected</AlertTitle>+ <AlertDescription>Tables should have at least one column as the primary key to identify each row.Without a primary key, you will not be able to update or delete rows from the table.- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}{primaryKeyColumns.length > 1 && (diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/TableEditor.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/TableEditor.tsxindex e276e18af5c..a313d55eb3c 100644--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/TableEditor.tsx+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/TableEditor.tsx@@ -4,6 +4,7 @@ import { toast } from 'sonner'import { Badge, Checkbox, Input, SidePanel } from 'ui'import { Admonition } from 'ui-patterns'import { ConfirmationModal } from 'ui-patterns/Dialogs/ConfirmationModal'+import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { ActionBar } from '../ActionBar'import type { ForeignKey } from '../ForeignKeySelector/ForeignKeySelector.types'@@ -357,25 +358,35 @@ export const TableEditor = ({}><SidePanel.Content className="space-y-10 py-6">- <Input- data-testid="table-name-input"- label="Name"+ <FormItemLayoutid="name"+ isReactForm={false}layout="horizontal"- type="text"+ label="Name"error={errors.name ? String(errors.name) : undefined}- value={tableFields?.name}- onChange={(event) => onUpdateField({ name: event.target.value })}- />- <Input- label="Description"+ >+ <Input+ data-testid="table-name-input"+ id="name"+ type="text"+ value={tableFields?.name}+ onChange={(event) => onUpdateField({ name: event.target.value })}+ />+ </FormItemLayout>+ <FormItemLayoutid="description"- placeholder="Optional"+ isReactForm={false}layout="horizontal"- type="text"- value={tableFields?.comment ?? ''}- onChange={(event) => onUpdateField({ comment: event.target.value })}- />+ label="Description"+ >+ <Input+ id="description"+ placeholder="Optional"+ type="text"+ value={tableFields?.comment ?? ''}+ onChange={(event) => onUpdateField({ comment: event.target.value })}+ />+ </FormItemLayout></SidePanel.Content><SidePanel.Separator />diff --git a/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/shared/CollapsibleSection.tsx b/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/shared/CollapsibleSection.tsxindex cba902138df..27ef2f97c2a 100644--- a/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/shared/CollapsibleSection.tsx+++ b/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/shared/CollapsibleSection.tsx@@ -1,12 +1,7 @@import { Table } from '@tanstack/react-table'import { ChevronDown, ChevronRight } from 'lucide-react'import { useState } from 'react'-import {- Button,- Collapsible_Shadcn_ as Collapsible,- CollapsibleContent_Shadcn_ as CollapsibleContent,- CollapsibleTrigger_Shadcn_ as CollapsibleTrigger,-} from 'ui'+import { Button, Collapsible, CollapsibleContent, CollapsibleTrigger } from 'ui'import { BlockFieldConfig } from '../../types'import { BlockField } from './BlockField'diff --git a/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/shared/FieldWithSeeMore.tsx b/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/shared/FieldWithSeeMore.tsxindex c8da51d9c90..c210412ea46 100644--- a/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/shared/FieldWithSeeMore.tsx+++ b/apps/studio/components/interfaces/UnifiedLogs/ServiceFlow/components/shared/FieldWithSeeMore.tsx@@ -1,13 +1,7 @@import { Table } from '@tanstack/react-table'import { X } from 'lucide-react'import { useState } from 'react'-import {- Badge,- Collapsible_Shadcn_ as Collapsible,- CollapsibleContent_Shadcn_ as CollapsibleContent,- CollapsibleTrigger_Shadcn_ as CollapsibleTrigger,- Skeleton,-} from 'ui'+import { Badge, Collapsible, CollapsibleContent, CollapsibleTrigger, Skeleton } from 'ui'import { BlockFieldConfig } from '../../types'import { BlockField } from './BlockField'diff --git a/apps/studio/components/layouts/AppLayout/EnableBranchingButton/BranchingPlanNotice.tsx b/apps/studio/components/layouts/AppLayout/EnableBranchingButton/BranchingPlanNotice.tsxindex 48e8fd8f8b3..bdf5d7ed817 100644--- a/apps/studio/components/layouts/AppLayout/EnableBranchingButton/BranchingPlanNotice.tsx+++ b/apps/studio/components/layouts/AppLayout/EnableBranchingButton/BranchingPlanNotice.tsx@@ -1,6 +1,6 @@import { AlertCircleIcon } from 'lucide-react'import Link from 'next/link'-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_, Button } from 'ui'+import { Alert, AlertDescription, AlertTitle, Button } from 'ui'import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useAppStateSnapshot } from '@/state/app-state'@@ -10,16 +10,14 @@ export const BranchingPlanNotice = () => {const { data: selectedOrg } = useSelectedOrganizationQuery()return (- <Alert_Shadcn_ className="rounded-none px-7 py-6 [&>svg]:top-6 [&>svg]:left-6 border-0 border-t">+ <Alert className="rounded-none px-7 py-6 [&>svg]:top-6 [&>svg]:left-6 border-0 border-t"><AlertCircleIcon />- <AlertTitle_Shadcn_>- Database branching is only available on the Pro Plan and above- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Database branching is only available on the Pro Plan and above</AlertTitle>+ <AlertDescription>Go to your organization's billing settings and upgrade your plan to enable branching forthis project- </AlertDescription_Shadcn_>- <AlertDescription_Shadcn_>+ </AlertDescription>+ <AlertDescription><Button size="tiny" type="default" className="mt-4"><Linkhref={`/org/${selectedOrg?.slug}/billing?panel=subscriptionPlan&source=enableBranchingButton`}@@ -28,7 +26,7 @@ export const BranchingPlanNotice = () => {Upgrade to Pro</Link></Button>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}diff --git a/apps/studio/components/layouts/AppLayout/EnableBranchingButton/BranchingPostgresVersionNotice.tsx b/apps/studio/components/layouts/AppLayout/EnableBranchingButton/BranchingPostgresVersionNotice.tsxindex 6f8c5ae3d14..0038a5b7e71 100644--- a/apps/studio/components/layouts/AppLayout/EnableBranchingButton/BranchingPostgresVersionNotice.tsx+++ b/apps/studio/components/layouts/AppLayout/EnableBranchingButton/BranchingPostgresVersionNotice.tsx@@ -1,7 +1,7 @@import { useParams } from 'common'import { AlertCircleIcon } from 'lucide-react'import Link from 'next/link'-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_, Button } from 'ui'+import { Alert, AlertDescription, AlertTitle, Button } from 'ui'import { useAppStateSnapshot } from '@/state/app-state'@@ -10,16 +10,16 @@ export const BranchingPostgresVersionNotice = () => {const snap = useAppStateSnapshot()return (- <Alert_Shadcn_ className="rounded-none px-7 py-6 [&>svg]:top-6 [&>svg]:left-6 border-t-0! border-l-0! border-r-0!">+ <Alert className="rounded-none px-7 py-6 [&>svg]:top-6 [&>svg]:left-6 border-t-0! border-l-0! border-r-0!"><AlertCircleIcon />- <AlertTitle_Shadcn_ className="text-base">+ <AlertTitle className="text-base">Your project needs to be on Postgres 15 to enable branching- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ </AlertTitle>+ <AlertDescription>Head over to your project's infrastructure settings to upgrade to the latest version ofPostgres before enabling branching.- </AlertDescription_Shadcn_>- <AlertDescription_Shadcn_>+ </AlertDescription>+ <AlertDescription><Button size="tiny" type="default" className="mt-4"><Linkhref={`/project/${ref}/settings/infrastructure`}@@ -28,7 +28,7 @@ export const BranchingPostgresVersionNotice = () => {Head to project settings</Link></Button>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}diff --git a/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsx b/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsxindex 2fe8acbf791..557f1b1838b 100644--- a/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsx+++ b/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsx@@ -7,9 +7,9 @@ import {Badge,Button,cn,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,+ Collapsible,+ CollapsibleContent,+ CollapsibleTrigger,Separator,} from 'ui'import {@@ -45,17 +45,17 @@ export function SidebarCollapsible({defaultOpen?: boolean}) {return (- <Collapsible_Shadcn_ defaultOpen={defaultOpen}>- <CollapsibleTrigger_Shadcn_ className="flex items-center gap-x-2 px-4 [&[data-state=open]>svg]:rotate-90! pb-2">+ <Collapsible defaultOpen={defaultOpen}>+ <CollapsibleTrigger className="flex items-center gap-x-2 px-4 [&[data-state=open]>svg]:rotate-90! pb-2"><ChevronRightsize={16}className={'text-foreground-light transition-transform duration-200'}/><span className="text-foreground-light font-mono text-sm uppercase">{title}</span>- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_>{children}</CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleTrigger>+ <CollapsibleContent>{children}</CollapsibleContent>+ </Collapsible>)}diff --git a/apps/studio/components/layouts/Navigation/LayoutHeader/FeedbackDropdown/FeedbackWidget.tsx b/apps/studio/components/layouts/Navigation/LayoutHeader/FeedbackDropdown/FeedbackWidget.tsxindex 3c6d8909e10..7756dda8d86 100644--- a/apps/studio/components/layouts/Navigation/LayoutHeader/FeedbackDropdown/FeedbackWidget.tsx+++ b/apps/studio/components/layouts/Navigation/LayoutHeader/FeedbackDropdown/FeedbackWidget.tsx@@ -15,7 +15,7 @@ import {DropdownMenuSeparator,DropdownMenuTrigger,PopoverSeparator_Shadcn_,- TextArea_Shadcn_,+ TextArea,} from 'ui'import { Admonition } from 'ui-patterns'@@ -197,7 +197,7 @@ export const FeedbackWidget = ({ onClose, onSwitchToIssueOptions }: FeedbackWidg) : (<><div className="p-4">- <TextArea_Shadcn_+ <TextAreaplaceholder="My idea for improving Supabase is..."rows={6}value={feedback}diff --git a/apps/studio/components/layouts/OrganizationLayout.tsx b/apps/studio/components/layouts/OrganizationLayout.tsxindex 61586395230..7e5923a6e2b 100644--- a/apps/studio/components/layouts/OrganizationLayout.tsx+++ b/apps/studio/components/layouts/OrganizationLayout.tsx@@ -3,7 +3,7 @@ import { ExternalLink, XIcon } from 'lucide-react'import Head from 'next/head'import { useRouter } from 'next/router'import type { PropsWithChildren } from 'react'-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_, Button, cn } from 'ui'+import { Alert, AlertDescription, AlertTitle, Button, cn } from 'ui'import { useRegisterOrgMenu } from './OrganizationLayout/useRegisterOrgMenu'import { ButtonTooltip } from '@/components/ui/ButtonTooltip'@@ -140,14 +140,14 @@ const OrganizationLayoutContent = ({</Head>)}{selectedOrganization && bannerConfig && !isBannerDismissed && (- <Alert_Shadcn_+ <Alertvariant="default"className="flex items-center gap-4 border-t-0 border-x-0 rounded-none"><PartnerIcon organization={selectedOrganization} showTooltip={false} size="medium" /><div className="flex-1">- <AlertTitle_Shadcn_>{bannerConfig.title}</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>{bannerConfig.description}</AlertDescription_Shadcn_>+ <AlertTitle>{bannerConfig.title}</AlertTitle>+ <AlertDescription>{bannerConfig.description}</AlertDescription></div><div className="flex items-center gap-2">{selectedRedirectQuery?.data?.url && (@@ -166,7 +166,7 @@ const OrganizationLayoutContent = ({tooltip={{ content: { text: 'Dismiss' } }}/></div>- </Alert_Shadcn_>+ </Alert>)}<main className="h-full w-full overflow-y-auto flex flex-col">{children}</main></div>diff --git a/apps/studio/components/layouts/ProjectLayout/RestorePaidPlanProjectNotice.tsx b/apps/studio/components/layouts/ProjectLayout/RestorePaidPlanProjectNotice.tsxindex b9da9a7a8dd..0288983b353 100644--- a/apps/studio/components/layouts/ProjectLayout/RestorePaidPlanProjectNotice.tsx+++ b/apps/studio/components/layouts/ProjectLayout/RestorePaidPlanProjectNotice.tsx@@ -1,26 +1,18 @@import { ExternalLink } from 'lucide-react'-import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,- Button,- WarningIcon,-} from 'ui'+import { Alert, AlertDescription, AlertTitle, Button, WarningIcon } from 'ui'import { DOCS_URL } from '@/lib/constants'export const RestorePaidPlanProjectNotice = () => {return (- <Alert_Shadcn_>+ <Alert><WarningIcon />- <AlertTitle_Shadcn_>- Project will count towards compute usage once restored- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Project will count towards compute usage once restored</AlertTitle>+ <AlertDescription>For every hour your instance is active, we will bill you based on the compute size of yourproject.- </AlertDescription_Shadcn_>- <AlertDescription_Shadcn_ className="mt-3">+ </AlertDescription>+ <AlertDescription className="mt-3"><Button asChild type="default" icon={<ExternalLink />}><ahref={`${DOCS_URL}/guides/platform/manage-your-usage/compute`}@@ -30,7 +22,7 @@ export const RestorePaidPlanProjectNotice = () => {More information</a></Button>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}diff --git a/apps/studio/components/layouts/ProjectLayout/index.test.tsx b/apps/studio/components/layouts/ProjectLayout/index.test.tsxindex c9405d79e0c..1c3592104df 100644--- a/apps/studio/components/layouts/ProjectLayout/index.test.tsx+++ b/apps/studio/components/layouts/ProjectLayout/index.test.tsx@@ -93,9 +93,9 @@ vi.mock('framer-motion', () => ({vi.mock('ui', () => ({cn: (...classes: Array<string | false | null | undefined>) => classes.filter(Boolean).join(' '),- Alert_Shadcn_: ({ children, ...props }: any) => <div {...props}>{children}</div>,- AlertDescription_Shadcn_: ({ children, ...props }: any) => <div {...props}>{children}</div>,- AlertTitle_Shadcn_: ({ children, ...props }: any) => <div {...props}>{children}</div>,+ Alert: ({ children, ...props }: any) => <div {...props}>{children}</div>,+ AlertDescription: ({ children, ...props }: any) => <div {...props}>{children}</div>,+ AlertTitle: ({ children, ...props }: any) => <div {...props}>{children}</div>,CommandInput_Shadcn_: { displayName: 'CommandInput' },Command_Shadcn_: { displayName: 'Command' },CommandGroup_Shadcn_: { displayName: 'CommandGroup' },diff --git a/apps/studio/components/layouts/ProjectLayout/index.tsx b/apps/studio/components/layouts/ProjectLayout/index.tsxindex c9547a6ab8d..c7052c78529 100644--- a/apps/studio/components/layouts/ProjectLayout/index.tsx+++ b/apps/studio/components/layouts/ProjectLayout/index.tsx@@ -12,9 +12,9 @@ import {type ReactNode,} from 'react'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,cn,LogoLoader,ResizableHandle,@@ -299,7 +299,7 @@ export const ProjectLayout = forwardRef<HTMLDivElement, PropsWithChildren<Projecref={combinedRef}>{showStripeProjectBanner && (- <Alert_Shadcn_+ <Alertvariant="default"className="flex items-center gap-4 border-t-0 border-x-0 rounded-none">@@ -309,10 +309,10 @@ export const ProjectLayout = forwardRef<HTMLDivElement, PropsWithChildren<Projecsize="medium"/><div className="flex-1">- <AlertTitle_Shadcn_>This project is connected to Stripe</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>This project is connected to Stripe</AlertTitle>+ <AlertDescription>Changes made here may affect your connected Stripe project.- </AlertDescription_Shadcn_>+ </AlertDescription></div><ButtonTooltiptype="text"@@ -322,7 +322,7 @@ export const ProjectLayout = forwardRef<HTMLDivElement, PropsWithChildren<Projecaria-label="Dismiss project integration banner"tooltip={{ content: { text: 'Dismiss' } }}/>- </Alert_Shadcn_>+ </Alert>)}{showPausedState ? (<div className="mx-auto my-16 w-full h-full max-w-7xl flex items-center px-4">diff --git a/apps/studio/components/ui/AIAssistantPanel/AIAssistantChatSelector.tsx b/apps/studio/components/ui/AIAssistantPanel/AIAssistantChatSelector.tsxindex c650b54358e..b460fff5326 100644--- a/apps/studio/components/ui/AIAssistantPanel/AIAssistantChatSelector.tsx+++ b/apps/studio/components/ui/AIAssistantPanel/AIAssistantChatSelector.tsx@@ -10,7 +10,7 @@ import {CommandItem_Shadcn_,CommandList_Shadcn_,CommandSeparator_Shadcn_,- Input_Shadcn_,+ Input,Popover_Shadcn_,PopoverContent_Shadcn_,PopoverTrigger_Shadcn_,@@ -116,7 +116,7 @@ export const AIAssistantChatSelector = ({ disabled = false }: AIAssistantChatSel<div className="flex items-center w-full flex-1 min-w-0">{editingChatId === id ? (<div className="flex items-center gap-2 w-full">- <Input_Shadcn_+ <Inputvalue={editingChatName}onChange={(e) => setEditingChatName(e.target.value)}autoFocusdiff --git a/apps/studio/components/ui/AIAssistantPanel/Message.Actions.tsx b/apps/studio/components/ui/AIAssistantPanel/Message.Actions.tsxindex 2cc955e0b9b..184935fdb5c 100644--- a/apps/studio/components/ui/AIAssistantPanel/Message.Actions.tsx+++ b/apps/studio/components/ui/AIAssistantPanel/Message.Actions.tsx@@ -11,7 +11,7 @@ import {Popover_Shadcn_,PopoverContent_Shadcn_,PopoverTrigger_Shadcn_,- TextArea_Shadcn_,+ TextArea,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import * as z from 'zod'@@ -187,7 +187,7 @@ function MessageActionsThumbsDown({render={({ field }) => (<FormItemLayout label="What went wrong?" labelOptional="optional"><FormControl>- <TextArea_Shadcn_+ <TextAreaplaceholder="Describe why the response was not helpful..."autoComplete="off"rows={4}diff --git a/apps/studio/components/ui/AIAssistantPanel/elements/Tool.tsx b/apps/studio/components/ui/AIAssistantPanel/elements/Tool.tsxindex 925b447a873..fef049927a6 100644--- a/apps/studio/components/ui/AIAssistantPanel/elements/Tool.tsx+++ b/apps/studio/components/ui/AIAssistantPanel/elements/Tool.tsx@@ -1,10 +1,5 @@import type { PropsWithChildren, ReactNode } from 'react'-import {- cn,- Collapsible_Shadcn_ as Collapsible,- CollapsibleContent_Shadcn_ as CollapsibleContent,- CollapsibleTrigger_Shadcn_ as CollapsibleTrigger,-} from 'ui'+import { cn, Collapsible, CollapsibleContent, CollapsibleTrigger } from 'ui'type ToolProps = PropsWithChildren<{className?: stringdiff --git a/apps/studio/components/ui/EditorPanel/SaveSnippetDialog.tsx b/apps/studio/components/ui/EditorPanel/SaveSnippetDialog.tsxindex 20fa3f0b4ce..3990ea14566 100644--- a/apps/studio/components/ui/EditorPanel/SaveSnippetDialog.tsx+++ b/apps/studio/components/ui/EditorPanel/SaveSnippetDialog.tsx@@ -11,7 +11,7 @@ import {DialogSection,DialogSectionSeparator,DialogTitle,- Input_Shadcn_,+ Input,Label_Shadcn_,} from 'ui'@@ -73,7 +73,7 @@ export const SaveSnippetDialog = ({ open, sql, onOpenChange, onSave }: SaveSnipp<DialogSection className="flex flex-col gap-y-4 py-5"><div className="flex flex-col gap-y-2"><Label_Shadcn_ htmlFor="snippet-name">Name</Label_Shadcn_>- <Input_Shadcn_+ <Inputid="snippet-name"autoFocusvalue={name}diff --git a/apps/studio/components/ui/ErrorBoundary/ErrorBoundary.tsx b/apps/studio/components/ui/ErrorBoundary/ErrorBoundary.tsxindex 49f4721c771..97f37d97a86 100644--- a/apps/studio/components/ui/ErrorBoundary/ErrorBoundary.tsx+++ b/apps/studio/components/ui/ErrorBoundary/ErrorBoundary.tsx@@ -2,7 +2,7 @@ import * as Sentry from '@sentry/nextjs'import { AlertCircle } from 'lucide-react'import { ErrorInfo } from 'react'import { ErrorBoundary as ReactErrorBoundary } from 'react-error-boundary'-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_, Button } from 'ui'+import { Alert, AlertDescription, AlertTitle, Button } from 'ui'interface ErrorFallbackProps {error: Error@@ -23,12 +23,10 @@ const ErrorFallback = ({}: ErrorFallbackProps) => {return (<div className="p-4 bg-destructive-foreground h-full flex flex-col justify-center items-center">- <Alert_Shadcn_ variant="destructive">+ <Alert variant="destructive"><AlertCircle />- <AlertTitle_Shadcn_>{message}</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>- We've been notified and will review and fix this issue.- </AlertDescription_Shadcn_>+ <AlertTitle>{message}</AlertTitle>+ <AlertDescription>We've been notified and will review and fix this issue.</AlertDescription><div className="mt-4 flex gap-2"><Button type="default" onClick={resetErrorBoundary} className="text-sm">Try again@@ -39,7 +37,7 @@ const ErrorFallback = ({</Button>))}</div>- </Alert_Shadcn_>+ </Alert></div>)}diff --git a/apps/studio/components/ui/FunctionSelector.tsx b/apps/studio/components/ui/FunctionSelector.tsxindex ebfc735f4cb..53c9eee9714 100644--- a/apps/studio/components/ui/FunctionSelector.tsx+++ b/apps/studio/components/ui/FunctionSelector.tsx@@ -5,9 +5,9 @@ import Link from 'next/link'import { useRouter } from 'next/router'import { useState } from 'react'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Button,Command_Shadcn_,CommandEmpty_Shadcn_,@@ -87,19 +87,15 @@ const FunctionSelector = ({)}{showError && isError && (- <Alert_Shadcn_ variant="warning" className="px-3! py-3!">- <AlertTitle_Shadcn_ className="text-xs text-amber-900">- Failed to load functions- </AlertTitle_Shadcn_>+ <Alert variant="warning" className="px-3! py-3!">+ <AlertTitle className="text-xs text-amber-900">Failed to load functions</AlertTitle>- <AlertDescription_Shadcn_ className="text-xs mb-2">- Error: {error.message}- </AlertDescription_Shadcn_>+ <AlertDescription className="text-xs mb-2">Error: {error.message}</AlertDescription><Button type="default" size="tiny" onClick={() => refetch()}>Reload functions</Button>- </Alert_Shadcn_>+ </Alert>)}{isSuccess && (diff --git a/apps/studio/components/ui/GrafanaPromoBanner.tsx b/apps/studio/components/ui/GrafanaPromoBanner.tsxindex 9615d24d3f0..8a6a2647308 100644--- a/apps/studio/components/ui/GrafanaPromoBanner.tsx+++ b/apps/studio/components/ui/GrafanaPromoBanner.tsx@@ -1,14 +1,14 @@import { useParams } from 'common'import { BookOpen } from 'lucide-react'import Link from 'next/link'-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_, Button, cn } from 'ui'+import { Alert, AlertDescription, AlertTitle, Button, cn } from 'ui'import { useSendEventMutation } from '@/data/telemetry/send-event-mutation'import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { BASE_PATH, DOCS_URL } from '@/lib/constants'const GrafanaPromoBanner = () => (- <Alert_Shadcn_ className="relative overflow-hidden">+ <Alert className="relative overflow-hidden"><div className="absolute inset-0 z-0"><imgsrc={`${BASE_PATH}/img/reports/bg-grafana-dark.svg`}@@ -37,17 +37,17 @@ const GrafanaPromoBanner = () => (</svg><div className="flex flex-col md:flex-row gap-2 mt-1">- <AlertTitle_Shadcn_ className="grow">Advanced observability</AlertTitle_Shadcn_>+ <AlertTitle className="grow">Advanced observability</AlertTitle><GrafanaBannerActions className="hidden xl:flex" /></div>- <AlertDescription_Shadcn_ className="relative flex flex-col xl:flex-row gap-2 md:max-w-lg">+ <AlertDescription className="relative flex flex-col xl:flex-row gap-2 md:max-w-lg"><p className="grow">Set up the Supabase Grafana Dashboard to visualize over 200 database performance and healthmetrics on your Supabase project.</p><GrafanaBannerActions className="xl:hidden" />- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)const GrafanaBannerActions = ({ className }: { className?: string }) => {diff --git a/apps/studio/components/ui/PartnerManagedResource.tsx b/apps/studio/components/ui/PartnerManagedResource.tsxindex 19211d4add4..5b5c0ff5ad3 100644--- a/apps/studio/components/ui/PartnerManagedResource.tsx+++ b/apps/studio/components/ui/PartnerManagedResource.tsx@@ -1,6 +1,6 @@import { ExternalLink } from 'lucide-react'import type { ReactNode } from 'react'-import { Alert_Shadcn_, AlertTitle_Shadcn_, Button } from 'ui'+import { Alert, AlertTitle, Button } from 'ui'import PartnerIcon from './PartnerIcon'import { useAwsRedirectQuery } from '@/data/integrations/aws-redirect-query'@@ -78,10 +78,10 @@ function PartnerManagedResource({: `${resource} are managed by ${PARTNER_TO_NAME[managedBy]}`)return (- <Alert_Shadcn_ className="flex flex-col items-center gap-y-2 border-0 rounded-none bg-none">+ <Alert className="flex flex-col items-center gap-y-2 border-0 rounded-none bg-none"><PartnerIcon organization={{ managed_by: managedBy }} showTooltip={false} size="large" />- <AlertTitle_Shadcn_ className="text-sm font-normal">{partnerHeading}</AlertTitle_Shadcn_>+ <AlertTitle className="text-sm font-normal">{partnerHeading}</AlertTitle>{details && <div className="text-sm text-foreground-light text-center">{details}</div>}@@ -92,7 +92,7 @@ function PartnerManagedResource({</a></Button>)}- </Alert_Shadcn_>+ </Alert>)}diff --git a/apps/studio/components/ui/RequestUpgradeToBillingOwners.tsx b/apps/studio/components/ui/RequestUpgradeToBillingOwners.tsxindex bebbc3b06fe..078c8dc239c 100644--- a/apps/studio/components/ui/RequestUpgradeToBillingOwners.tsx+++ b/apps/studio/components/ui/RequestUpgradeToBillingOwners.tsx@@ -17,7 +17,7 @@ import {Form,FormControl,FormField,- TextArea_Shadcn_,+ TextArea,Tooltip,TooltipContent,TooltipTrigger,@@ -217,7 +217,7 @@ export const RequestUpgradeToBillingOwners = ({layout="vertical"><FormControl>- <TextArea_Shadcn_+ <TextAreaid="note"{...field}rows={3}diff --git a/apps/studio/components/ui/ResourceExhaustionWarningBanner/ResourceExhaustionWarningBanner.tsx b/apps/studio/components/ui/ResourceExhaustionWarningBanner/ResourceExhaustionWarningBanner.tsxindex 04afa74bac1..56a172de247 100644--- a/apps/studio/components/ui/ResourceExhaustionWarningBanner/ResourceExhaustionWarningBanner.tsx+++ b/apps/studio/components/ui/ResourceExhaustionWarningBanner/ResourceExhaustionWarningBanner.tsx@@ -4,9 +4,9 @@ import Link from 'next/link'import { useRouter } from 'next/router'import { COMPUTE_DISK } from 'shared-data'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Button,cn,DropdownMenu,@@ -224,7 +224,7 @@ export const ResourceExhaustionWarningBanner = () => {}return (- <Alert_Shadcn_+ <Alertvariant={isCritical ? 'destructive' : 'warning'}className={cn('flex items-center justify-between',@@ -233,8 +233,8 @@ export const ResourceExhaustionWarningBanner = () => {><AlertTriangle /><div className="">- <AlertTitle_Shadcn_>{title}</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>{description}</AlertDescription_Shadcn_>+ <AlertTitle>{title}</AlertTitle>+ <AlertDescription>{description}</AlertDescription></div><div className="flex items-center gap-x-2">{learnMoreUrl !== undefined && aiPrompt !== undefined ? (@@ -304,6 +304,6 @@ export const ResourceExhaustionWarningBanner = () => {</Button>)}</div>- </Alert_Shadcn_>+ </Alert>)}diff --git a/apps/studio/components/ui/SchemaComboBox.tsx b/apps/studio/components/ui/SchemaComboBox.tsxindex caac063e000..dbc6b79e51f 100644--- a/apps/studio/components/ui/SchemaComboBox.tsx+++ b/apps/studio/components/ui/SchemaComboBox.tsx@@ -1,9 +1,9 @@import { Check, ChevronsUpDown } from 'lucide-react'import { useState } from 'react'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Button,Command_Shadcn_,CommandEmpty_Shadcn_,@@ -79,17 +79,15 @@ export const SchemaComboBox = ({)}{showError && isSchemasError && (- <Alert_Shadcn_ variant="warning" className="px-3! py-3!">- <AlertTitle_Shadcn_ className="text-xs text-amber-900">- Failed to load schemas- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_ className="text-xs mb-2 wrap-break-word">+ <Alert variant="warning" className="px-3! py-3!">+ <AlertTitle className="text-xs text-amber-900">Failed to load schemas</AlertTitle>+ <AlertDescription className="text-xs mb-2 wrap-break-word">Error: {(schemasError as any)?.message}- </AlertDescription_Shadcn_>+ </AlertDescription><Button type="default" size="tiny" onClick={() => refetchSchemas()}>Reload schemas</Button>- </Alert_Shadcn_>+ </Alert>)}{isSchemasSuccess && (diff --git a/apps/studio/components/ui/SchemaSelector.tsx b/apps/studio/components/ui/SchemaSelector.tsxindex 150603b400d..a248575bae5 100644--- a/apps/studio/components/ui/SchemaSelector.tsx+++ b/apps/studio/components/ui/SchemaSelector.tsx@@ -2,9 +2,9 @@ import { PermissionAction } from '@supabase/shared-types/out/constants'import { Check, ChevronsUpDown, Plus } from 'lucide-react'import { ComponentPropsWithoutRef, forwardRef, useState } from 'react'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Button,Command_Shadcn_,CommandEmpty_Shadcn_,@@ -105,17 +105,15 @@ export const SchemaSelector = forwardRef<HTMLDivElement, SchemaSelectorProps>()}{showError && isSchemasError && (- <Alert_Shadcn_ variant="warning" className="px-3! py-3!">- <AlertTitle_Shadcn_ className="text-xs text-amber-900">- Failed to load schemas- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_ className="text-xs mb-2 wrap-break-word">+ <Alert variant="warning" className="px-3! py-3!">+ <AlertTitle className="text-xs text-amber-900">Failed to load schemas</AlertTitle>+ <AlertDescription className="text-xs mb-2 wrap-break-word">Error: {(schemasError as any)?.message}- </AlertDescription_Shadcn_>+ </AlertDescription><Button type="default" size="tiny" onClick={() => refetchSchemas()}>Reload schemas</Button>- </Alert_Shadcn_>+ </Alert>)}{isSchemasSuccess && (diff --git a/apps/studio/components/ui/org-selector.tsx b/apps/studio/components/ui/org-selector.tsxindex 5f70220eac5..5be121dce5d 100644--- a/apps/studio/components/ui/org-selector.tsx+++ b/apps/studio/components/ui/org-selector.tsx@@ -2,7 +2,7 @@ import { ChevronDown } from 'lucide-react'import Link from 'next/link'import { parseAsString, useQueryState } from 'nuqs'import { useMemo, useState } from 'react'-import { Badge, Button, Card, CardHeader, CardTitle, Input_Shadcn_ } from 'ui'+import { Badge, Button, Card, CardHeader, CardTitle, Input } from 'ui'import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'import { ButtonTooltip } from './ButtonTooltip'@@ -136,7 +136,7 @@ export function OrganizationSelector({</span>) : (<>- <Input_Shadcn_+ <Inputtype="text"value={search}onChange={(e) => setSearch(e.target.value)}diff --git a/apps/studio/pages/account/security.tsx b/apps/studio/pages/account/security.tsxindex 5db12525323..426e9cd5a4e 100644--- a/apps/studio/pages/account/security.tsx+++ b/apps/studio/pages/account/security.tsx@@ -1,11 +1,5 @@import { Smartphone } from 'lucide-react'-import {- Badge,- cn,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,-} from 'ui'+import { Badge, cn, Collapsible, CollapsibleContent, CollapsibleTrigger } from 'ui'import { PageContainer } from 'ui-patterns/PageContainer'import {PageHeader,@@ -59,8 +53,8 @@ const Security: NextPageWithLayout = () => {</PageHeaderMeta></PageHeader><PageContainer size="small">- <Collapsible_Shadcn_ className={cn('mt-8', collapsibleClasses)}>- <CollapsibleTrigger_Shadcn_ asChild>+ <Collapsible className={cn('mt-8', collapsibleClasses)}>+ <CollapsibleTrigger asChild><buttontype="button"className="group flex w-full items-center justify-between rounded-sm py-3 px-4 md:px-6 text-foreground"@@ -76,11 +70,11 @@ const Security: NextPageWithLayout = () => {</Badge>) : null}</button>- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_ className="group border-t border-default bg-surface-100 py-6 px-4 md:px-6 text-foreground">+ </CollapsibleTrigger>+ <CollapsibleContent className="group border-t border-default bg-surface-100 py-6 px-4 md:px-6 text-foreground"><TOTPFactors />- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible></PageContainer></>)diff --git a/apps/studio/pages/integrations/vercel/[slug]/deploy-button/new-project.tsx b/apps/studio/pages/integrations/vercel/[slug]/deploy-button/new-project.tsxindex 7fb4563f1ae..21639073241 100644--- a/apps/studio/pages/integrations/vercel/[slug]/deploy-button/new-project.tsx+++ b/apps/studio/pages/integrations/vercel/[slug]/deploy-button/new-project.tsx@@ -5,7 +5,7 @@ import { toast } from 'sonner'import {Button,Checkbox,- Input_Shadcn_ as Input,+ Input,Select_Shadcn_,SelectContent_Shadcn_,SelectItem_Shadcn_,diff --git a/apps/studio/pages/integrations/vercel/install.tsx b/apps/studio/pages/integrations/vercel/install.tsxindex 5a1637a3e1b..ebc5f82559a 100644--- a/apps/studio/pages/integrations/vercel/install.tsx+++ b/apps/studio/pages/integrations/vercel/install.tsx@@ -4,7 +4,7 @@ import Link from 'next/link'import { useRouter } from 'next/router'import { useEffect, useMemo, useState } from 'react'import { toast } from 'sonner'-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_, Button } from 'ui'+import { Alert, AlertDescription, AlertTitle, Button } from 'ui'import OrganizationPicker from '@/components/interfaces/Integrations/Vercel/OrganizationPicker'import { Markdown } from '@/components/interfaces/Markdown'@@ -203,29 +203,27 @@ const VercelIntegration: NextPageWithLayout = () => {configurationId={configurationId}/>{alreadyInstalled && (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><AlertTriangle className="h-4 w-4" strokeWidth={2} />- <AlertTitle_Shadcn_>Vercel Integration is already installed.</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Vercel Integration is already installed.</AlertTitle>+ <AlertDescription>You will need to choose another organization to install the integration.- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}{noOrganizations && (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><AlertTriangle className="h-4 w-4" strokeWidth={2} />- <AlertTitle_Shadcn_>- No Supabase Organizations to install Integration.- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_ className="prose">+ <AlertTitle>No Supabase Organizations to install Integration.</AlertTitle>+ <AlertDescription className="prose">You will need to create a Supabase Organization before you can install the VercelIntegration. You can create a new organization{' '}<Link href="https://supabase.com/dashboard/new" target="_blank">here</Link>.- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}<div className="flex flex-row w-full justify-end"><Button@@ -242,13 +240,13 @@ const VercelIntegration: NextPageWithLayout = () => {</ScaffoldColumn></ScaffoldContainer><ScaffoldContainer className="flex flex-col gap-6 py-3">- <Alert_Shadcn_ variant="default">+ <Alert variant="default"><Info className="h-4 w-4" strokeWidth={2} />- <AlertTitle_Shadcn_>You can uninstall this Integration at any time.</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>You can uninstall this Integration at any time.</AlertTitle>+ <AlertDescription>Remove this integration at any time from Vercel or the Supabase dashboard.- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert></ScaffoldContainer></>)diff --git a/apps/studio/pages/project/[ref]/database/backups/pitr.tsx b/apps/studio/pages/project/[ref]/database/backups/pitr.tsxindex 62b23cc8aff..30fb2f51173 100644--- a/apps/studio/pages/project/[ref]/database/backups/pitr.tsx+++ b/apps/studio/pages/project/[ref]/database/backups/pitr.tsx@@ -1,7 +1,7 @@import { PermissionAction } from '@supabase/shared-types/out/constants'import { useParams } from 'common'import { AlertCircle } from 'lucide-react'-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_ } from 'ui'+import { Alert, AlertDescription, AlertTitle } from 'ui'import { Admonition } from 'ui-patterns'import { PageContainer } from 'ui-patterns/PageContainer'import {@@ -120,15 +120,15 @@ const PITR = () => {}/>) : !isActiveHealthy ? (- <Alert_Shadcn_>+ <Alert><AlertCircle />- <AlertTitle_Shadcn_>+ <AlertTitle>Point in Time Recovery is not available while project is offline- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ </AlertTitle>+ <AlertDescription>Your project needs to be online to restore your database with Point in Time Recovery- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>) : (<><PITRNotice />diff --git a/apps/studio/pages/project/[ref]/database/column-privileges.tsx b/apps/studio/pages/project/[ref]/database/column-privileges.tsxindex d0b73017191..46b58de7045 100644--- a/apps/studio/pages/project/[ref]/database/column-privileges.tsx+++ b/apps/studio/pages/project/[ref]/database/column-privileges.tsx@@ -3,7 +3,7 @@ import { AlertCircle, XIcon } from 'lucide-react'import Link from 'next/link'import { useCallback, useEffect, useMemo, useState } from 'react'import { toast } from 'sonner'-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_, Button } from 'ui'+import { Alert, AlertDescription, AlertTitle, Button } from 'ui'import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'import {@@ -241,17 +241,17 @@ const PrivilegesPage: NextPageWithLayout = () => {{isEnabled ? (<>{!diffWarningDismissed && (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><AlertCircle strokeWidth={2} />- <AlertTitle_Shadcn_>+ <AlertTitle>Changes to column privileges will not be reflected in migrations when running{' '}<code className="text-code-inline">supabase db diff</code>.- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ </AlertTitle>+ <AlertDescription>Column privileges are not supported in the current version of the Supabase CLI.<br />You will need to manually apply these changes to your database.- </AlertDescription_Shadcn_>+ </AlertDescription><Buttontype="outline"aria-label="Dismiss"@@ -262,16 +262,14 @@ const PrivilegesPage: NextPageWithLayout = () => {><XIcon width={14} height={14} /></Button>- </Alert_Shadcn_>+ </Alert>)}{!selectStarWarningDismissed && (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><AlertCircle strokeWidth={2} />- <AlertTitle_Shadcn_>- Changing column privileges can break existing queries.- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Changing column privileges can break existing queries.</AlertTitle>+ <AlertDescription>If you remove a column privilege for a role, that role will lose all access tothat column.<br />@@ -281,7 +279,7 @@ const PrivilegesPage: NextPageWithLayout = () => {<code className="text-code-inline">insert</code>,{' '}<code className="text-code-inline">update</code>, and{' '}<code className="text-code-inline">delete</code>) will fail.- </AlertDescription_Shadcn_>+ </AlertDescription><Buttontype="outline"aria-label="Dismiss"@@ -292,7 +290,7 @@ const PrivilegesPage: NextPageWithLayout = () => {><XIcon width={14} height={14} /></Button>- </Alert_Shadcn_>+ </Alert>)}<PrivilegesHead@@ -349,19 +347,17 @@ const PrivilegesPage: NextPageWithLayout = () => {)}</>) : (- <Alert_Shadcn_>- <AlertTitle_Shadcn_>- Column-level privileges is a dashboard feature preview- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <Alert>+ <AlertTitle>Column-level privileges is a dashboard feature preview</AlertTitle>+ <AlertDescription>You may access this feature by enabling it under dashboard feature previews.- </AlertDescription_Shadcn_>+ </AlertDescription><div className="mt-4"><Button type="default" onClick={() => toggleFeaturePreviewModal(true)}>View feature previews</Button></div>- </Alert_Shadcn_>+ </Alert>)}</div></ScaffoldSection>diff --git a/apps/studio/pages/project/[ref]/functions/[functionSlug]/index.tsx b/apps/studio/pages/project/[ref]/functions/[functionSlug]/index.tsxindex e6d93001bb0..cde7da576c9 100644--- a/apps/studio/pages/project/[ref]/functions/[functionSlug]/index.tsx+++ b/apps/studio/pages/project/[ref]/functions/[functionSlug]/index.tsx@@ -6,14 +6,7 @@ import meanBy from 'lodash/meanBy'import sumBy from 'lodash/sumBy'import { useRouter } from 'next/router'import { useMemo, useState } from 'react'-import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,- Button,- LogoLoader,- WarningIcon,-} from 'ui'+import { Alert, AlertDescription, AlertTitle, Button, LogoLoader, WarningIcon } from 'ui'import { PageContainer } from 'ui-patterns/PageContainer'import { PageSection, PageSectionContent } from 'ui-patterns/PageSection'@@ -187,13 +180,13 @@ const LegacyEdgeFunctionOverview = () => {isLoading={combinedStatsResults.isLoading}renderer={(props) => {return isErrorCombinedStats ? (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><WarningIcon />- <AlertTitle_Shadcn_>Failed to reterieve execution time</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Failed to reterieve execution time</AlertTitle>+ <AlertDescription>{combinedStatsError?.message ?? 'Unknown error'}- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>) : (<div className="space-y-8"><AreaChart@@ -230,13 +223,13 @@ const LegacyEdgeFunctionOverview = () => {renderer={(props) => {if (isErrorCombinedStats) {return (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><WarningIcon />- <AlertTitle_Shadcn_>Failed to reterieve invocations</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Failed to reterieve invocations</AlertTitle>+ <AlertDescription>{combinedStatsError?.message ?? 'Unknown error'}- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)} else {const requestData = props.data@@ -330,13 +323,13 @@ const LegacyEdgeFunctionOverview = () => {isLoading={combinedStatsResults.isLoading}renderer={(props) => {return isErrorCombinedStats ? (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><WarningIcon />- <AlertTitle_Shadcn_>Failed to retrieve CPU time</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Failed to retrieve CPU time</AlertTitle>+ <AlertDescription>{combinedStatsError?.message ?? 'Unknown error'}- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>) : (<div className="space-y-8"><AreaChart@@ -371,13 +364,13 @@ const LegacyEdgeFunctionOverview = () => {renderer={(props) => {if (isErrorCombinedStats) {return (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><WarningIcon />- <AlertTitle_Shadcn_>Failed to retrieve memory usage</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Failed to retrieve memory usage</AlertTitle>+ <AlertDescription>{combinedStatsError?.message ?? 'Unknown error'}- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)}diff --git a/apps/studio/pages/project/[ref]/functions/new.tsx b/apps/studio/pages/project/[ref]/functions/new.tsxindex 27beabf7d10..5827e0515a7 100644--- a/apps/studio/pages/project/[ref]/functions/new.tsx+++ b/apps/studio/pages/project/[ref]/functions/new.tsx@@ -20,7 +20,7 @@ import {FormControl,FormField,FormItem,- Input_Shadcn_,+ Input,Label_Shadcn_,Popover_Shadcn_,PopoverContent_Shadcn_,@@ -388,7 +388,7 @@ const NewFunctionPage = () => {<FormItem className="flex flex-col gap-0 m-0"><div className="flex items-center"><FormControl>- <Input_Shadcn_+ <Inputid="functionName"type="text"size={'large'}diff --git a/apps/studio/pages/project/[ref]/observability/database.tsx b/apps/studio/pages/project/[ref]/observability/database.tsxindex 7c8fc2c62b9..14e65530f23 100644--- a/apps/studio/pages/project/[ref]/observability/database.tsx+++ b/apps/studio/pages/project/[ref]/observability/database.tsx@@ -6,7 +6,7 @@ import { ArrowRight, ExternalLink, RefreshCw } from 'lucide-react'import Link from 'next/link'import { useEffect, useRef, useState } from 'react'import { toast } from 'sonner'-import { Alert_Shadcn_, AlertDescription_Shadcn_, Button } from 'ui'+import { Alert, AlertDescription, Button } from 'ui'import ReportHeader from '@/components/interfaces/Reports/ReportHeader'import ReportPadding from '@/components/interfaces/Reports/ReportPadding'@@ -404,8 +404,8 @@ const DatabaseUsage = () => {}}append={() => (<div className="px-6 pb-6">- <Alert_Shadcn_ variant="default" className="mt-4">- <AlertDescription_Shadcn_>+ <Alert variant="default" className="mt-4">+ <AlertDescription><div className="space-y-2"><p>New Supabase projects have a database size of ~40-60mb. This space includes@@ -424,8 +424,8 @@ const DatabaseUsage = () => {</Link></Button></div>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert></div>)}/>diff --git a/apps/studio/pages/project/[ref]/settings/log-drains.tsx b/apps/studio/pages/project/[ref]/settings/log-drains.tsxindex b0ed2b6178c..ac16e7686cc 100644--- a/apps/studio/pages/project/[ref]/settings/log-drains.tsx+++ b/apps/studio/pages/project/[ref]/settings/log-drains.tsx@@ -4,7 +4,7 @@ import { ChevronDown } from 'lucide-react'import { cloneElement, useState } from 'react'import { toast } from 'sonner'import {- Alert_Shadcn_,+ Alert,Button,DropdownMenu,DropdownMenuContent,@@ -147,9 +147,7 @@ const LogDrainsSettings: NextPageWithLayout = () => {{isLoadingPermissions ? (<GenericSkeletonLoader />) : !canManageLogDrains ? (- <Alert_Shadcn_ variant="default">- You do not have permission to manage log drains- </Alert_Shadcn_>+ <Alert variant="default">You do not have permission to manage log drains</Alert>) : (<LogDrains onUpdateDrainClick={handleUpdateClick} onNewDrainClick={handleNewClick} />)}diff --git a/apps/studio/pages/project/_/[[...routeSlug]].tsx b/apps/studio/pages/project/_/[[...routeSlug]].tsxindex b7e7c9e8520..36509491046 100644--- a/apps/studio/pages/project/_/[[...routeSlug]].tsx+++ b/apps/studio/pages/project/_/[[...routeSlug]].tsx@@ -4,9 +4,9 @@ import { NextPage } from 'next'import { useRouter } from 'next/router'import { useEffect, useState } from 'react'import {- Alert_Shadcn_,- AlertDescription_Shadcn_,- AlertTitle_Shadcn_,+ Alert,+ AlertDescription,+ AlertTitle,Select_Shadcn_,SelectContent_Shadcn_,SelectItem_Shadcn_,@@ -115,11 +115,11 @@ const GenericProjectPage: NextPage = () => {{isLoadingOrganizations ? (<LoadingCardView />) : isErrorOrganizations ? (- <Alert_Shadcn_ variant="warning">+ <Alert variant="warning"><AlertTriangleIcon />- <AlertTitle_Shadcn_>Failed to load your Supabase organizations</AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>Try refreshing the page</AlertDescription_Shadcn_>- </Alert_Shadcn_>+ <AlertTitle>Failed to load your Supabase organizations</AlertTitle>+ <AlertDescription>Try refreshing the page</AlertDescription>+ </Alert>) : organizations.length === 0 ? (<NoOrganizationsState />) : !!selectedOrganization ? (diff --git a/apps/ui-library/components/callout.tsx b/apps/ui-library/components/callout.tsxindex 63ed3afc9b8..371acf6b1e4 100644--- a/apps/ui-library/components/callout.tsx+++ b/apps/ui-library/components/callout.tsx@@ -1,4 +1,4 @@-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_ } from 'ui'+import { Alert, AlertDescription, AlertTitle } from 'ui'interface CalloutProps {icon?: string@@ -8,10 +8,10 @@ interface CalloutProps {export function Callout({ title, children, icon, ...props }: CalloutProps) {return (- <Alert_Shadcn_ {...props}>+ <Alert {...props}>{icon && <span className="mr-4 text-2xl">{icon}</span>}- {title && <AlertTitle_Shadcn_>{title}</AlertTitle_Shadcn_>}- <AlertDescription_Shadcn_>{children}</AlertDescription_Shadcn_>- </Alert_Shadcn_>+ {title && <AlertTitle>{title}</AlertTitle>}+ <AlertDescription>{children}</AlertDescription>+ </Alert>)}diff --git a/apps/ui-library/components/component-preview.tsx b/apps/ui-library/components/component-preview.tsxindex 41e518ab56f..e13dd56b3e8 100644--- a/apps/ui-library/components/component-preview.tsx+++ b/apps/ui-library/components/component-preview.tsx@@ -2,7 +2,7 @@import { ChevronRight } from 'lucide-react'import * as React from 'react'-import { cn, Collapsible_Shadcn_, CollapsibleContent_Shadcn_, CollapsibleTrigger_Shadcn_ } from 'ui'+import { cn, Collapsible, CollapsibleContent, CollapsibleTrigger } from 'ui'import { Index } from '@/__registry__'import { useConfig } from '@/hooks/use-config'@@ -97,8 +97,8 @@ export function ComponentPreview({<div className="z-10 relative">{ComponentPreview}</div></div>{showCode && (- <Collapsible_Shadcn_>- <CollapsibleTrigger_Shadcn_+ <Collapsible>+ <CollapsibleTriggerclassName={`flexgap-3 items-center@@ -118,8 +118,8 @@ export function ComponentPreview({size={14}/>View code- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_ className="transition-all">+ </CollapsibleTrigger>+ <CollapsibleContent className="transition-all"><divclassName={cn('relative',@@ -131,8 +131,8 @@ export function ComponentPreview({>{Code}</div>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible>)}</div>)diff --git a/apps/www/components/AIDemo/Panel.tsx b/apps/www/components/AIDemo/Panel.tsxindex 83d188f07c0..613384a2ce1 100644--- a/apps/www/components/AIDemo/Panel.tsx+++ b/apps/www/components/AIDemo/Panel.tsx@@ -3,7 +3,7 @@ import { AnimatePresence, motion } from 'framer-motion'import Image from 'next/image'import errorGif from 'public/images/ai/error.gif'import { useEffect, useRef, useState } from 'react'-import { AiIconAnimation, cn, Input_Shadcn_ as Input } from 'ui'+import { AiIconAnimation, cn, Input } from 'ui'import styles from './assistant.module.css'diff --git a/apps/www/components/Blog/BlogCollapsible.tsx b/apps/www/components/Blog/BlogCollapsible.tsxindex 95d0497be25..6dc8b201def 100644--- a/apps/www/components/Blog/BlogCollapsible.tsx+++ b/apps/www/components/Blog/BlogCollapsible.tsx@@ -2,7 +2,7 @@import { Triangle } from 'lucide-react'import type { PropsWithChildren } from 'react'-import { Collapsible_Shadcn_, CollapsibleContent_Shadcn_, CollapsibleTrigger_Shadcn_ } from 'ui'+import { Collapsible, CollapsibleContent, CollapsibleTrigger } from 'ui'type BlogCollapsibleProps = PropsWithChildren<{title: string@@ -11,8 +11,8 @@ type BlogCollapsibleProps = PropsWithChildren<{const BlogCollapsible = ({ title, containerClassName, ...props }: BlogCollapsibleProps) => {return (- <Collapsible_Shadcn_ className={containerClassName}>- <CollapsibleTrigger_Shadcn_+ <Collapsible className={containerClassName}>+ <CollapsibleTriggerclassName="data-[state=open]:texthover:text-foreground-light@@ -26,9 +26,9 @@ const BlogCollapsible = ({ title, containerClassName, ...props }: BlogCollapsibl><Triangle size={10} /><span>{title}</span>- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_ {...props} />- </Collapsible_Shadcn_>+ </CollapsibleTrigger>+ <CollapsibleContent {...props} />+ </Collapsible>)}diff --git a/apps/www/components/Contribute/SimilarSolvedThreads.tsx b/apps/www/components/Contribute/SimilarSolvedThreads.tsxindex 322bad79ad0..9a6003d16a1 100644--- a/apps/www/components/Contribute/SimilarSolvedThreads.tsx+++ b/apps/www/components/Contribute/SimilarSolvedThreads.tsx@@ -25,7 +25,7 @@ import {DialogSectionSeparator,DialogTitle,Label_Shadcn_,- TextArea_Shadcn_,+ TextArea,Tooltip,TooltipContent,TooltipProvider,@@ -287,7 +287,7 @@ export const SimilarSolvedThreads = ({ threads, parentThreadId }: SimilarSolvedT<Label_Shadcn_ htmlFor="feedback">Additional feedback <span className="text-foreground-muted">(optional)</span></Label_Shadcn_>- <TextArea_Shadcn_+ <TextAreaid="feedback"placeholder="What was helpful or missing?"rows={4}diff --git a/apps/www/components/Contribute/UnansweredThreadsTable.tsx b/apps/www/components/Contribute/UnansweredThreadsTable.tsxindex df3ad6c5038..0e3f69a80b4 100644--- a/apps/www/components/Contribute/UnansweredThreadsTable.tsx+++ b/apps/www/components/Contribute/UnansweredThreadsTable.tsx@@ -10,7 +10,7 @@ import {Button,Card,cn,- Input_Shadcn_,+ Input,Popover_Shadcn_,PopoverContent_Shadcn_,PopoverTrigger_Shadcn_,@@ -296,7 +296,7 @@ export function UnansweredThreadsTable({{/* Search Input */}<form onSubmit={handleSearchSubmit} className="relative md:max-w-xs w-full flex-1"><Search className="absolute left-3 top-1/2 transform -translate-y-1/2 h-4 w-4 text-foreground-lighter" />- <Input_Shadcn_+ <Inputtype="text"size="tiny"placeholder="Search threads by title..."diff --git a/apps/www/components/Events/new/EventGalleryFilters.tsx b/apps/www/components/Events/new/EventGalleryFilters.tsxindex 8396225b1e3..a221249aaff 100644--- a/apps/www/components/Events/new/EventGalleryFilters.tsx+++ b/apps/www/components/Events/new/EventGalleryFilters.tsx@@ -2,7 +2,7 @@import { useEvents } from '~/app/events/context'import { SearchIcon } from 'lucide-react'-import { Badge, Input_Shadcn_ as Input } from 'ui'+import { Badge, Input } from 'ui'const CATEGORIES_FILTERS = [{ name: 'All', value: 'all' },diff --git a/apps/www/components/Footer/index.tsx b/apps/www/components/Footer/index.tsxindex 8929a3c0ecf..c836fef8440 100644--- a/apps/www/components/Footer/index.tsx+++ b/apps/www/components/Footer/index.tsx@@ -18,7 +18,7 @@ import {IconTikTok,IconTwitterX,IconYoutubeSolid,- Input_Shadcn_,+ Input,} from 'ui'import { ThemeToggle } from 'ui-patterns/ThemeToggle'@@ -178,7 +178,7 @@ const Footer = (props: Props) => {<p className="text-foreground-lighter text-sm">Get product updates and news from Supabase.</p>- <Input_Shadcn_+ <Inputtype="email"placeholder="Your email"aria-label="Email for newsletter"diff --git a/apps/www/components/Forms/ApplyToSupaSquadForm.tsx b/apps/www/components/Forms/ApplyToSupaSquadForm.tsxindex cc788a2c71c..19da099f240 100644--- a/apps/www/components/Forms/ApplyToSupaSquadForm.tsx+++ b/apps/www/components/Forms/ApplyToSupaSquadForm.tsx@@ -15,9 +15,9 @@ import {FormItem,FormLabel,FormMessage,- Input_Shadcn_,+ Input,Separator,- TextArea_Shadcn_,+ TextArea,} from 'ui'import {MultiSelector,@@ -45,7 +45,7 @@ interface FormItem {placeholder: stringrequired: booleanclassName?: string- component: typeof TextArea_Shadcn_ | typeof Input_Shadcn_+ component: typeof TextArea | typeof Input}interface Track {@@ -155,11 +155,7 @@ const FormContent = memo(function FormContent({<FormItem className="w-full md:flex-1"><FormLabel className="text-foreground">First Name *</FormLabel><FormControl>- <Input_Shadcn_- placeholder="Your first name"- autoComplete="given-name"- {...field}- />+ <Input placeholder="Your first name" autoComplete="given-name" {...field} /></FormControl><FormMessage />@@ -175,11 +171,7 @@ const FormContent = memo(function FormContent({<FormLabel className="text-foreground">Last Name *</FormLabel><FormControl><div className="relative ">- <Input_Shadcn_- placeholder="Your last name"- autoComplete="family-name"- {...field}- />+ <Input placeholder="Your last name" autoComplete="family-name" {...field} /></div></FormControl>@@ -197,7 +189,7 @@ const FormContent = memo(function FormContent({<FormLabel className="text-foreground">Email Address *</FormLabel><FormControl><div className="relative">- <Input_Shadcn_+ <Inputtype="email"placeholder="Your personal or work email"autoComplete="email"@@ -282,7 +274,7 @@ const FormContent = memo(function FormContent({</FormDescription><FormControl><div className="relative">- <TextArea_Shadcn_+ <TextAreaautoComplete="off"rows={3}className="bg-foreground/[.026]"@@ -315,7 +307,7 @@ const FormContent = memo(function FormContent({</FormDescription><FormControl><div className="relative">- <TextArea_Shadcn_+ <TextAreaautoComplete="off"rows={3}className="bg-foreground/[.026]"@@ -384,7 +376,7 @@ const FormContent = memo(function FormContent({</FormDescription><FormControl><div className="relative mt-1">- <Input_Shadcn_ type="text" {...field} />+ <Input type="text" {...field} /></div></FormControl><FormMessage />@@ -423,7 +415,7 @@ const FormContent = memo(function FormContent({<FormLabel className="text-foreground">City *</FormLabel><FormControl><div className="relative mt-1">- <Input_Shadcn_ type="text" placeholder="City" {...field} />+ <Input type="text" placeholder="City" {...field} /></div></FormControl><FormMessage />@@ -443,7 +435,7 @@ const FormContent = memo(function FormContent({</FormDescription><FormControl><div className="relative mt-1">- <Input_Shadcn_ {...field} />+ <Input {...field} /></div></FormControl><FormMessage />@@ -506,7 +498,7 @@ const FormContent = memo(function FormContent({<FormLabel className="text-foreground">Discord</FormLabel><FormControl><div className="relative mt-1">- <Input_Shadcn_ type="text" placeholder="#username" {...field} />+ <Input type="text" placeholder="#username" {...field} /></div></FormControl><FormMessage />@@ -522,7 +514,7 @@ const FormContent = memo(function FormContent({<FormLabel className="text-foreground">GitHub</FormLabel><FormControl><div className="relative mt-1">- <Input_Shadcn_ type="text" placeholder="@yourusername" {...field} />+ <Input type="text" placeholder="@yourusername" {...field} /></div></FormControl><FormMessage />@@ -538,7 +530,7 @@ const FormContent = memo(function FormContent({<FormLabel className="text-foreground">Twitter</FormLabel><FormControl><div className="relative mt-1">- <Input_Shadcn_ type="text" placeholder="@yourhandle" {...field} />+ <Input type="text" placeholder="@yourhandle" {...field} /></div></FormControl><FormMessage />diff --git a/apps/www/components/Forms/RequestADemoForm.tsx b/apps/www/components/Forms/RequestADemoForm.tsxindex 2cc8018afc3..4d0829d729d 100644--- a/apps/www/components/Forms/RequestADemoForm.tsx+++ b/apps/www/components/Forms/RequestADemoForm.tsx@@ -1,9 +1,9 @@-import { FC, useEffect, useState } from 'react'-import Link from 'next/link'+import { useSendTelemetryEvent } from '~/lib/telemetry'import { CircleAlert } from 'lucide-react'-import { Button, cn, Input_Shadcn_, Label_Shadcn_, Separator, TextArea_Shadcn_ } from 'ui'+import Link from 'next/link'+import { FC, useEffect, useState } from 'react'+import { Button, cn, Input, Label_Shadcn_, Separator, TextArea } from 'ui'import { Alert } from 'ui/src/components/shadcn/ui/alert'-import { useSendTelemetryEvent } from '~/lib/telemetry'interface FormData {firstName: string@@ -18,7 +18,7 @@ interface FormItem {placeholder: stringrequired: booleanclassName?: string- component: typeof TextArea_Shadcn_ | typeof Input_Shadcn_+ component: typeof TextArea | typeof Input}type FormConfig = {@@ -36,7 +36,7 @@ const formConfig: FormConfig = {placeholder: 'First Name',required: true,className: 'md:col-span-1',- component: Input_Shadcn_,+ component: Input,},secondName: {type: 'text',@@ -44,7 +44,7 @@ const formConfig: FormConfig = {placeholder: 'Last Name',required: true,className: 'md:col-span-1',- component: Input_Shadcn_,+ component: Input,},companyEmail: {type: 'text',@@ -52,7 +52,7 @@ const formConfig: FormConfig = {placeholder: 'Company Email',required: true,className: '',- component: Input_Shadcn_,+ component: Input,},message: {type: 'textarea',@@ -60,7 +60,7 @@ const formConfig: FormConfig = {placeholder: 'Share more about what you want to accomplish',required: true,className: '[&_textarea]:min-h-[100px] [&_textarea]:bg-foreground/[.026]',- component: TextArea_Shadcn_,+ component: TextArea,},}diff --git a/apps/www/components/Forms/TalkToPartnershipTeamForm.tsx b/apps/www/components/Forms/TalkToPartnershipTeamForm.tsxindex 2d33d76c74e..3c215e0c787 100644--- a/apps/www/components/Forms/TalkToPartnershipTeamForm.tsx+++ b/apps/www/components/Forms/TalkToPartnershipTeamForm.tsx@@ -2,7 +2,7 @@ import { useSendTelemetryEvent } from '~/lib/telemetry'import { CircleAlert } from 'lucide-react'import Link from 'next/link'import { FC, useEffect, useState } from 'react'-import { Button, cn, Input_Shadcn_, Label_Shadcn_, Separator, TextArea_Shadcn_ } from 'ui'+import { Button, cn, Input, Label_Shadcn_, Separator, TextArea } from 'ui'import { Alert } from 'ui/src/components/shadcn/ui/alert'interface FormData {@@ -17,7 +17,7 @@ interface FormItem {placeholder: stringrequired: booleanclassName?: string- component: typeof TextArea_Shadcn_ | typeof Input_Shadcn_+ component: typeof TextArea | typeof Input}type FormConfig = {@@ -35,7 +35,7 @@ const formConfig: FormConfig = {placeholder: 'First Name',required: true,className: 'col-span-full',- component: Input_Shadcn_,+ component: Input,},secondName: {type: 'text',@@ -43,7 +43,7 @@ const formConfig: FormConfig = {placeholder: 'Last Name',required: true,className: 'col-span-full',- component: Input_Shadcn_,+ component: Input,},companyEmail: {type: 'text',@@ -51,7 +51,7 @@ const formConfig: FormConfig = {placeholder: 'Company Email',required: true,className: '',- component: Input_Shadcn_,+ component: Input,},}diff --git a/apps/www/components/SecurityNewsletterForm.tsx b/apps/www/components/SecurityNewsletterForm.tsxindex df52661a01a..0cabfb31e3d 100644--- a/apps/www/components/SecurityNewsletterForm.tsx+++ b/apps/www/components/SecurityNewsletterForm.tsx@@ -1,5 +1,5 @@import { useState } from 'react'-import { Button, Input_Shadcn_, Label_Shadcn_ } from 'ui'+import { Button, Input, Label_Shadcn_ } from 'ui'const isValidEmail = (email: string): boolean => {const emailPattern = /^[\w-\.+]+@([\w-]+\.)+[\w-]{2,8}$/@@ -67,7 +67,7 @@ const SecurityNewsletterForm = () => {<div className="grid grid-cols-1 md:grid-cols-2 gap-4"><div className="flex flex-col gap-2"><Label_Shadcn_ htmlFor="security-first-name">First Name</Label_Shadcn_>- <Input_Shadcn_+ <Inputid="security-first-name"type="text"value={firstName}@@ -78,7 +78,7 @@ const SecurityNewsletterForm = () => {</div><div className="flex flex-col gap-2"><Label_Shadcn_ htmlFor="security-last-name">Last Name</Label_Shadcn_>- <Input_Shadcn_+ <Inputid="security-last-name"type="text"value={lastName}@@ -90,7 +90,7 @@ const SecurityNewsletterForm = () => {</div><div className="flex flex-col gap-2"><Label_Shadcn_ htmlFor="security-email">Email Address</Label_Shadcn_>- <Input_Shadcn_+ <Inputid="security-email"type="email"value={email}diff --git a/apps/www/data/solutions/postgres-developers.tsx b/apps/www/data/solutions/postgres-developers.tsxindex e356937706a..ce2ae1cfbaf 100644--- a/apps/www/data/solutions/postgres-developers.tsx+++ b/apps/www/data/solutions/postgres-developers.tsx@@ -19,7 +19,7 @@ import {import dynamic from 'next/dynamic'import { useState } from 'react'import { PRODUCT_SHORTNAMES } from 'shared-data/products'-import { cn, Input_Shadcn_, Switch } from 'ui'+import { cn, Input, Switch } from 'ui'import { Image } from 'ui-patterns/Image'import MainProducts from '../MainProducts'@@ -443,7 +443,7 @@ const data: () => {<p className="text-sm text-foreground-light">Name of function</p><div className="flex flex-col gap-2">- <Input_Shadcn_ placeholder="Name of function" />+ <Input placeholder="Name of function" /><span className="text-foreground-muted text-sm">Name will also be used for the function name in postgres</span>diff --git a/apps/www/pages/changelog.tsx b/apps/www/pages/changelog.tsxindex 7862a3e72be..c20c0364136 100644--- a/apps/www/pages/changelog.tsx+++ b/apps/www/pages/changelog.tsx@@ -10,7 +10,7 @@ import Link from 'next/link'import { parseAsArrayOf, parseAsString, useQueryState } from 'nuqs'import { NuqsAdapter } from 'nuqs/adapters/next/pages'import { useEffect, useMemo, useState } from 'react'-import { Badge, Button, cn, IconYCombinator, Input_Shadcn_ } from 'ui'+import { Badge, Button, cn, IconYCombinator, Input } from 'ui'import { ChangelogLlmMarkdownButton } from '@/components/Changelog/ChangelogLlmMarkdownButton'import { ChangelogTimelineList } from '@/components/Changelog/ChangelogTimelineList'@@ -262,7 +262,7 @@ function ChangelogIndex({ featured, restIndex, allIndex }: PageProps) {<label htmlFor="changelog-filter-search" className="sr-only">Search changelog</label>- <Input_Shadcn_+ <Inputid="changelog-filter-search"size="small"placeholder="Search changelog..."diff --git a/packages/dev-tools/DevToolbar.tsx b/packages/dev-tools/DevToolbar.tsxindex 1c63322264e..21c9bb1f3c6 100644--- a/packages/dev-tools/DevToolbar.tsx+++ b/packages/dev-tools/DevToolbar.tsx@@ -15,7 +15,7 @@ import {Badge,Button,cn,- Input_Shadcn_ as Input,+ Input,InputGroup,InputGroupAddon,InputGroupInput,diff --git a/packages/marketing/src/forms/MarketingForm.tsx b/packages/marketing/src/forms/MarketingForm.tsxindex 42b8a12ce65..47fdee98658 100644--- a/packages/marketing/src/forms/MarketingForm.tsx+++ b/packages/marketing/src/forms/MarketingForm.tsx@@ -5,13 +5,13 @@ import ReactMarkdown from 'react-markdown'import {Button,Checkbox,- Input_Shadcn_,+ Input,Select_Shadcn_,SelectContent_Shadcn_,SelectItem_Shadcn_,SelectTrigger_Shadcn_,SelectValue_Shadcn_,- TextArea_Shadcn_,+ TextArea,} from 'ui'import type { z } from 'zod'@@ -83,7 +83,7 @@ function FieldInput({case 'email':case 'url':return (- <Input_Shadcn_+ <Inputtype={field.type}placeholder={field.placeholder}required={field.required}@@ -93,7 +93,7 @@ function FieldInput({)case 'textarea':return (- <TextArea_Shadcn_+ <TextAreaplaceholder={field.placeholder}required={field.required}rows={field.rows}diff --git a/packages/marketing/src/go/sections/hubspot-meeting/BookingForm.tsx b/packages/marketing/src/go/sections/hubspot-meeting/BookingForm.tsxindex f83a5c314d8..79b5ce62b6d 100644--- a/packages/marketing/src/go/sections/hubspot-meeting/BookingForm.tsx+++ b/packages/marketing/src/go/sections/hubspot-meeting/BookingForm.tsx@@ -1,7 +1,7 @@'use client'import { useState } from 'react'-import { Button, Input_Shadcn_ } from 'ui'+import { Button, Input } from 'ui'interface BookingFormProps {onSubmit: (data: {@@ -86,7 +86,7 @@ export default function BookingForm({<label htmlFor="hs-firstName" className="text-foreground-light text-sm font-medium">First name *</label>- <Input_Shadcn_+ <Inputid="hs-firstName"type="text"required@@ -100,7 +100,7 @@ export default function BookingForm({<label htmlFor="hs-lastName" className="text-foreground-light text-sm font-medium">Last name *</label>- <Input_Shadcn_+ <Inputid="hs-lastName"type="text"required@@ -114,7 +114,7 @@ export default function BookingForm({<label htmlFor="hs-email" className="text-foreground-light text-sm font-medium">Email *</label>- <Input_Shadcn_+ <Inputid="hs-email"type="email"requireddiff --git a/packages/ui-patterns/src/CommandMenu/prepackaged/ai/AiWarning.tsx b/packages/ui-patterns/src/CommandMenu/prepackaged/ai/AiWarning.tsxindex 40b8e26a265..d3f2165ff30 100644--- a/packages/ui-patterns/src/CommandMenu/prepackaged/ai/AiWarning.tsx+++ b/packages/ui-patterns/src/CommandMenu/prepackaged/ai/AiWarning.tsx@@ -1,16 +1,14 @@import { Microscope } from 'lucide-react'-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_, cn } from 'ui'+import { Alert, AlertDescription, AlertTitle, cn } from 'ui'const AiWarning = ({ className }: { className?: string }) => (- <Alert_Shadcn_ className={cn('m-0!', className)} variant="warning">+ <Alert className={cn('m-0!', className)} variant="warning"><Microscope strokeWidth={1.5} size={18} className="text-foreground-muted" />- <AlertTitle_Shadcn_>- Supabase AI is experimental and may produce incorrect answers.- </AlertTitle_Shadcn_>- <AlertDescription_Shadcn_>+ <AlertTitle>Supabase AI is experimental and may produce incorrect answers.</AlertTitle>+ <AlertDescription><p>Always verify the output before executing.</p>- </AlertDescription_Shadcn_>- </Alert_Shadcn_>+ </AlertDescription>+ </Alert>)export { AiWarning }diff --git a/packages/ui-patterns/src/DataInputs/Input.tsx b/packages/ui-patterns/src/DataInputs/Input.tsxindex d24148cc850..72f29da66d5 100644--- a/packages/ui-patterns/src/DataInputs/Input.tsx+++ b/packages/ui-patterns/src/DataInputs/Input.tsx@@ -7,16 +7,16 @@ import React, {useState,} from 'react'import {+ Input as BaseInput,cn,copyToClipboard,- Input_Shadcn_,InputGroup,InputGroupAddon,InputGroupButton,InputGroupInput,} from 'ui'-export interface Props extends Omit<ComponentProps<typeof Input_Shadcn_>, 'onCopy'> {+export interface Props extends Omit<ComponentProps<typeof BaseInput>, 'onCopy'> {copy?: booleanshowCopyOnHover?: booleanonCopy?: () => void@@ -28,8 +28,8 @@ export interface Props extends Omit<ComponentProps<typeof Input_Shadcn_>, 'onCop}const Input = forwardRef<- ElementRef<typeof Input_Shadcn_>,- ComponentPropsWithoutRef<typeof Input_Shadcn_> & Props+ ElementRef<typeof BaseInput>,+ ComponentPropsWithoutRef<typeof BaseInput> & Props>(({diff --git a/packages/ui-patterns/src/Dialogs/ConfirmationModal.tsx b/packages/ui-patterns/src/Dialogs/ConfirmationModal.tsxindex e53cf6a9d24..659532377d5 100644--- a/packages/ui-patterns/src/Dialogs/ConfirmationModal.tsx+++ b/packages/ui-patterns/src/Dialogs/ConfirmationModal.tsx@@ -5,7 +5,7 @@import { Dialog as _RadixDialog } from 'radix-ui'import { forwardRef, MouseEventHandler, useEffect, useState } from 'react'import {- Alert_Shadcn_,+ Alert,Button,cn,Dialog,@@ -30,9 +30,9 @@ export interface ConfirmationModalProps {onConfirm: () => voidonCancel: () => voiddisabled?: boolean- variant?: React.ComponentProps<typeof Alert_Shadcn_>['variant']+ variant?: React.ComponentProps<typeof Alert>['variant']alert?: {- base?: React.ComponentProps<typeof Alert_Shadcn_>+ base?: React.ComponentProps<typeof Alert>title?: stringdescription?: string | React.ReactNode}diff --git a/packages/ui-patterns/src/Dialogs/TextConfirmModal.tsx b/packages/ui-patterns/src/Dialogs/TextConfirmModal.tsxindex 9222f46f289..b8a70e8615b 100644--- a/packages/ui-patterns/src/Dialogs/TextConfirmModal.tsx+++ b/packages/ui-patterns/src/Dialogs/TextConfirmModal.tsx@@ -8,7 +8,7 @@ import { Dialog as _RadixDialog } from 'radix-ui'import { forwardRef, ReactNode, useEffect, useState } from 'react'import { useForm } from 'react-hook-form'import {- Alert_Shadcn_,+ Alert,Button,cn,copyToClipboard,@@ -24,7 +24,7 @@ import {FormItem,FormLabel,FormMessage,- Input_Shadcn_,+ Input,} from 'ui'import { DialogHeader } from 'ui/src/components/shadcn/ui/dialog'import { z } from 'zod'@@ -43,13 +43,13 @@ export interface TextConfirmModalProps {text?: string | ReactNodeonConfirm: () => voidonCancel: () => void- variant?: React.ComponentProps<typeof Alert_Shadcn_>['variant']+ variant?: React.ComponentProps<typeof Alert>['variant']alert?: {- base?: React.ComponentProps<typeof Alert_Shadcn_>+ base?: React.ComponentProps<typeof Alert>title?: stringdescription?: string | ReactNode}- input?: React.ComponentProps<typeof Input_Shadcn_>+ input?: React.ComponentProps<typeof Input>label?: React.ComponentProps<typeof FormLabel>formMessage?: React.ComponentProps<typeof FormMessage>description?: React.ComponentProps<typeof FormDescription>@@ -204,7 +204,7 @@ export const TextConfirmModal = forwardRef<to confirm.</FormLabel><FormControl>- <Input_Shadcn_+ <InputautoComplete="off"placeholder={confirmPlaceholder}{...input}diff --git a/packages/ui-patterns/src/FilterBar/FilterCondition.tsx b/packages/ui-patterns/src/FilterBar/FilterCondition.tsxindex f2c76551802..f217bb8ce0d 100644--- a/packages/ui-patterns/src/FilterBar/FilterCondition.tsx+++ b/packages/ui-patterns/src/FilterBar/FilterCondition.tsx@@ -5,7 +5,7 @@ import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'import {Button,cn,- Input_Shadcn_,+ Input,Popover_Shadcn_,PopoverAnchor_Shadcn_,PopoverContent_Shadcn_,@@ -276,7 +276,7 @@ export function FilterCondition({<PopoverAnchor_Shadcn_ asChild><div ref={propertyLabelRef} className="relative inline-flex items-center shrink-0">{isPropertyActive ? (- <Input_Shadcn_+ <Inputtype="text"value={propertySearchText}onChange={(e) => setPropertySearchText(e.target.value)}@@ -329,7 +329,7 @@ export function FilterCondition({<Popover_Shadcn_ open={isOperatorActive && !isLoading && operatorItems.length > 0}><PopoverAnchor_Shadcn_ asChild><div className="relative inline-block">- <Input_Shadcn_+ <Inputref={operatorRef}type="text"value={isOperatorActive ? localOperator : conditionOperator}@@ -380,7 +380,7 @@ export function FilterCondition({<Popover_Shadcn_ open={isActive && !isLoading && (showValueCustom || valueItems.length > 0)}><PopoverAnchor_Shadcn_ asChild><div className="relative inline-block max-w-[180px]">- <Input_Shadcn_+ <Inputref={valueRef}type="text"value={localValue}diff --git a/packages/ui-patterns/src/FilterBar/FilterGroup.tsx b/packages/ui-patterns/src/FilterBar/FilterGroup.tsxindex 61bc28d2869..83facf70718 100644--- a/packages/ui-patterns/src/FilterBar/FilterGroup.tsx+++ b/packages/ui-patterns/src/FilterBar/FilterGroup.tsx@@ -1,13 +1,7 @@'use client'import React, { useEffect, useMemo, useRef, useState } from 'react'-import {- cn,- Input_Shadcn_,- Popover_Shadcn_,- PopoverAnchor_Shadcn_,- PopoverContent_Shadcn_,-} from 'ui'+import { cn, Input, Popover_Shadcn_, PopoverAnchor_Shadcn_, PopoverContent_Shadcn_ } from 'ui'import { DefaultCommandList } from './DefaultCommandList'import { useFilterBar } from './FilterBarContext'@@ -187,7 +181,7 @@ export function FilterGroup({ group, path }: FilterGroupProps) {><PopoverAnchor_Shadcn_ asChild>{isRootGroup ? (- <Input_Shadcn_+ <Inputref={freeformInputRef}type="text"value={isActive ? freeformText : localFreeformValue}@@ -208,7 +202,7 @@ export function FilterGroup({ group, path }: FilterGroupProps) {/>) : (<div className="relative inline-block py-1">- <Input_Shadcn_+ <Inputref={freeformInputRef}type="text"value={isActive ? freeformText : localFreeformValue}diff --git a/packages/ui-patterns/src/InnerSideMenu/index.tsx b/packages/ui-patterns/src/InnerSideMenu/index.tsxindex 2da896df05c..fe84a336ca1 100644--- a/packages/ui-patterns/src/InnerSideMenu/index.tsx+++ b/packages/ui-patterns/src/InnerSideMenu/index.tsx@@ -7,15 +7,15 @@ import { Collapsible as _RadixCollapsible, DropdownMenu as _RadixDropdownMenu }import { ElementRef, forwardRef } from 'react'import {cn,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,+ Collapsible,+ CollapsibleContent,+ CollapsibleTrigger,DropdownMenu,DropdownMenuContent,DropdownMenuRadioGroup,DropdownMenuRadioItem,DropdownMenuTrigger,- Input_Shadcn_,+ Input,Skeleton,Tooltip,TooltipContent,@@ -42,24 +42,18 @@ const InnerSideBarTitle = forwardRef<HTMLSpanElement, React.ComponentPropsWithou)const InnerSideMenuCollapsible = forwardRef<- ElementRef<typeof Collapsible_Shadcn_>,- React.ComponentPropsWithoutRef<typeof Collapsible_Shadcn_>+ ElementRef<typeof Collapsible>,+ React.ComponentPropsWithoutRef<typeof Collapsible>>(({ ...props }, ref) => {- return (- <Collapsible_Shadcn_- ref={ref}- {...props}- className={cn('w-full px-2 group', props.className)}- />- )+ return <Collapsible ref={ref} {...props} className={cn('w-full px-2 group', props.className)} />})const InnerSideMenuCollapsibleTrigger = forwardRef<- ElementRef<typeof CollapsibleTrigger_Shadcn_>,- React.ComponentPropsWithoutRef<typeof CollapsibleTrigger_Shadcn_>+ ElementRef<typeof CollapsibleTrigger>,+ React.ComponentPropsWithoutRef<typeof CollapsibleTrigger>>(({ ...props }, ref) => {return (- <CollapsibleTrigger_Shadcn_+ <CollapsibleTriggerref={ref}{...props}className={cn(@@ -73,16 +67,16 @@ const InnerSideMenuCollapsibleTrigger = forwardRef<strokeWidth={1.5}/><span className="group-hover:not-disabled:text-foreground">{props.title}</span>- </CollapsibleTrigger_Shadcn_>+ </CollapsibleTrigger>)})const InnerSideMenuCollapsibleContent = forwardRef<- ElementRef<typeof CollapsibleContent_Shadcn_>,- React.ComponentPropsWithoutRef<typeof CollapsibleContent_Shadcn_>+ ElementRef<typeof CollapsibleContent>,+ React.ComponentPropsWithoutRef<typeof CollapsibleContent>>(({ ...props }, ref) => {return (- <CollapsibleContent_Shadcn_+ <CollapsibleContentref={ref}{...props}className={cn('w-full flex flex-col gap-0', props.className)}@@ -173,7 +167,7 @@ const InnerSideBarFilters = forwardRef<HTMLDivElement, React.ComponentPropsWithoconst InnerSideBarFilterSearchInput = forwardRef<HTMLInputElement,- React.ComponentPropsWithoutRef<typeof Input_Shadcn_> & {+ React.ComponentPropsWithoutRef<typeof Input> & {'aria-labelledby': stringname: stringisLoading?: boolean@@ -182,7 +176,7 @@ const InnerSideBarFilterSearchInput = forwardRef<return (<label htmlFor={props.name} className="relative w-full"><span className="sr-only">{props['aria-labelledby']}</span>- <Input_Shadcn_+ <Inputref={ref}type="text"className={cn(diff --git a/packages/ui-patterns/src/SqlToRest/sql-to-rest.tsx b/packages/ui-patterns/src/SqlToRest/sql-to-rest.tsxindex b616eb1fc8a..b790abf4f82 100644--- a/packages/ui-patterns/src/SqlToRest/sql-to-rest.tsx+++ b/packages/ui-patterns/src/SqlToRest/sql-to-rest.tsx@@ -28,14 +28,7 @@ import {} from 'react'import Markdown from 'react-markdown'import { format } from 'sql-formatter'-import {- Alert_Shadcn_ as Alert,- cn,- Collapsible_Shadcn_,- CollapsibleContent_Shadcn_,- CollapsibleTrigger_Shadcn_,- Tabs,-} from 'ui'+import { Alert, cn, Collapsible, CollapsibleContent, CollapsibleTrigger, Tabs } from 'ui'import { CodeBlock } from 'ui-patterns/CodeBlock'import { assumptions } from './assumptions'@@ -434,11 +427,11 @@ export default function SqlToRest({<><h3 className="my-1 text-base text-inherit">FAQs</h3>{relevantFaqs.map((faq) => (- <Collapsible_Shadcn_+ <Collapsiblekey={faq.id}className="flex flex-col items-stretch justify-start bg-surface-100 rounded-sm border border-default px-4">- <CollapsibleTrigger_Shadcn_ asChild>+ <CollapsibleTrigger asChild><buttontype="button"className="flex justify-between items-center p-3 text-sm text-left"@@ -452,8 +445,8 @@ export default function SqlToRest({</Markdown><ChevronUp className="transition data-open-parent:rotate-0 data-closed-parent:rotate-180" /></button>- </CollapsibleTrigger_Shadcn_>- <CollapsibleContent_Shadcn_>+ </CollapsibleTrigger>+ <CollapsibleContent><div className="text-foreground flex flex-col justify-start items-center px-3 pb-4 text-sm"><Markdowncomponents={{@@ -463,8 +456,8 @@ export default function SqlToRest({{faq.answer}</Markdown></div>- </CollapsibleContent_Shadcn_>- </Collapsible_Shadcn_>+ </CollapsibleContent>+ </Collapsible>))}</>)}diff --git a/packages/ui-patterns/src/admonition.tsx b/packages/ui-patterns/src/admonition.tsxindex a20321f904c..00bdfe238d5 100644--- a/packages/ui-patterns/src/admonition.tsx+++ b/packages/ui-patterns/src/admonition.tsx@@ -1,6 +1,6 @@import { cva } from 'class-variance-authority'import { ComponentProps, forwardRef, ReactNode } from 'react'-import { Alert_Shadcn_, AlertDescription_Shadcn_, AlertTitle_Shadcn_, cn } from 'ui'+import { Alert, AlertDescription, AlertTitle, cn } from 'ui'export type AdmonitionType =| 'note'@@ -22,8 +22,8 @@ export interface AdmonitionProps {children?: ReactNodeshowIcon?: booleanchildProps?: {- title?: ComponentProps<typeof AlertTitle_Shadcn_>- description?: ComponentProps<typeof AlertDescription_Shadcn_>+ title?: ComponentProps<typeof AlertTitle>+ description?: ComponentProps<typeof AlertDescription>}layout?: 'horizontal' | 'vertical' | 'responsive'actions?: ReactNode@@ -103,8 +103,8 @@ const admonitionBodyClassName ='[&_p]:!mt-0 [&_p]:!mb-1.5 [&_p:last-child]:!mb-0 [&_p:only-child]:!mb-0 [&_ul]:!my-1.5 [&_ol]:!my-1.5 [&_li]:!my-0.5'export const Admonition = forwardRef<- React.ElementRef<typeof Alert_Shadcn_>,- Omit<React.ComponentPropsWithoutRef<typeof Alert_Shadcn_>, keyof AdmonitionProps | 'children'> &+ React.ElementRef<typeof Alert>,+ Omit<React.ComponentPropsWithoutRef<typeof Alert>, keyof AdmonitionProps | 'children'> &AdmonitionProps>((@@ -129,7 +129,7 @@ export const Admonition = forwardRef<const heading = title ?? labelreturn (- <Alert_Shadcn_+ <Alertref={ref}variant={typeMapped}{...props}@@ -163,7 +163,7 @@ export const Admonition = forwardRef<><div>{heading && (- <AlertTitle_Shadcn_+ <AlertTitle{...childProps.title}className={cn('text mt-0.5 flex gap-3 text-sm',@@ -172,10 +172,10 @@ export const Admonition = forwardRef<)}>{heading}- </AlertTitle_Shadcn_>+ </AlertTitle>)}{description && (- <AlertDescription_Shadcn_+ <AlertDescription{...childProps.description}className={cn(admonitionBodyClassName,@@ -184,11 +184,11 @@ export const Admonition = forwardRef<)}>{description}- </AlertDescription_Shadcn_>+ </AlertDescription>)}{/* // children is to handle Docs and MDX issues with children and <p> elements */}{children && (- <AlertDescription_Shadcn_+ <AlertDescription{...childProps.description}className={cn(admonitionBodyClassName,@@ -197,7 +197,7 @@ export const Admonition = forwardRef<)}>{children}- </AlertDescription_Shadcn_>+ </AlertDescription>)}</div>{actions && (@@ -213,7 +213,7 @@ export const Admonition = forwardRef<</div>)}</div>- </Alert_Shadcn_>+ </Alert>)})diff --git a/packages/ui-patterns/src/form/KeyValueFieldArray/KeyValueFieldArray.tsx b/packages/ui-patterns/src/form/KeyValueFieldArray/KeyValueFieldArray.tsxindex b30f9d67941..1c607717295 100644--- a/packages/ui-patterns/src/form/KeyValueFieldArray/KeyValueFieldArray.tsx+++ b/packages/ui-patterns/src/form/KeyValueFieldArray/KeyValueFieldArray.tsx@@ -21,7 +21,7 @@ import {FormField,FormItem,FormMessage,- Input_Shadcn_,+ Input,} from 'ui'export type KeyValueFieldArrayAction<TItem> = {@@ -50,7 +50,7 @@ export interface KeyValueFieldArrayProps<addLabel: stringaddActions?: KeyValueFieldArrayAction<TItem>[]disabled?: boolean- inputSize?: React.ComponentProps<typeof Input_Shadcn_>['size']+ inputSize?: React.ComponentProps<typeof Input>['size']className?: stringrowsClassName?: stringrowClassName?: string@@ -132,7 +132,7 @@ export const KeyValueFieldArray = <render={({ field }) => (<FormItem className="flex-1"><FormControl>- <Input_Shadcn_+ <Input{...field}size={inputSize}className={cn('w-full', keyInputClassName)}@@ -151,7 +151,7 @@ export const KeyValueFieldArray = <render={({ field }) => (<FormItem className="flex-1"><FormControl>- <Input_Shadcn_+ <Input{...field}size={inputSize}className={cn('w-full', valueInputClassName)}diff --git a/packages/ui-patterns/src/form/SingleValueFieldArray/SingleValueFieldArray.tsx b/packages/ui-patterns/src/form/SingleValueFieldArray/SingleValueFieldArray.tsxindex d01f90f3828..9fa05bd3a25 100644--- a/packages/ui-patterns/src/form/SingleValueFieldArray/SingleValueFieldArray.tsx+++ b/packages/ui-patterns/src/form/SingleValueFieldArray/SingleValueFieldArray.tsx@@ -8,7 +8,7 @@ import {FieldValues,useFieldArray,} from 'react-hook-form'-import { Button, cn, FormControl, FormField, FormItem, FormMessage, Input_Shadcn_ } from 'ui'+import { Button, cn, FormControl, FormField, FormItem, FormMessage, Input } from 'ui'export interface SingleValueFieldArrayProps<TFieldValues extends FieldValues,@@ -27,7 +27,7 @@ export interface SingleValueFieldArrayProps<removeLabel?: stringdisabled?: booleanminimumRows?: number- inputSize?: React.ComponentProps<typeof Input_Shadcn_>['size']+ inputSize?: React.ComponentProps<typeof Input>['size']inputAutoComplete?: stringclassName?: stringrowsClassName?: string@@ -95,7 +95,7 @@ export const SingleValueFieldArray = <render={({ field }) => (<FormItem className="flex-1"><FormControl>- <Input_Shadcn_+ <Input{...field}size={inputSize}autoComplete={inputAutoComplete}diff --git a/packages/ui/index.tsx b/packages/ui/index.tsxindex 39f6463219c..55ac18fb721 100644--- a/packages/ui/index.tsx+++ b/packages/ui/index.tsx@@ -32,8 +32,6 @@ export * from './src/components/AnimatedCounter'export * from './src/lib/utils'// DATA ENTRY--export * from './src/components/Input'export * from './src/components/ExpandingTextArea'// layout@@ -99,11 +97,7 @@ export {export * from './src/components/shadcn/ui/dialog'-export {- Alert as Alert_Shadcn_,- AlertTitle as AlertTitle_Shadcn_,- AlertDescription as AlertDescription_Shadcn_,-} from './src/components/shadcn/ui/alert'+export * from './src/components/shadcn/ui/alert'export {Field as Field_Shadcn_,@@ -153,7 +147,7 @@ export * from './src/components/shadcn/ui/radio-group'export { Slider as Slider_Shadcn_ } from './src/components/shadcn/ui/slider'-export { Input as Input_Shadcn_ } from './src/components/shadcn/ui/input'+export * from './src/components/shadcn/ui/input'export { Button as Button_Shadcn_ } from './src/components/shadcn/ui/button'@@ -169,7 +163,7 @@ export {BreadcrumbSeparator as BreadcrumbSeparator_Shadcn_,} from './src/components/shadcn/ui/breadcrumb'-export { TextArea as TextArea_Shadcn_ } from './src/components/shadcn/ui/text-area'+export * from './src/components/shadcn/ui/text-area'export { Label as Label_Shadcn_ } from './src/components/shadcn/ui/label'@@ -188,11 +182,7 @@ export * from './src/components/shadcn/ui/aspect-ratio'export * from './src/components/shadcn/ui/table'export * from './src/components/ShadowScrollArea'-export {- Collapsible as Collapsible_Shadcn_,- CollapsibleTrigger as CollapsibleTrigger_Shadcn_,- CollapsibleContent as CollapsibleContent_Shadcn_,-} from './src/components/shadcn/ui/collapsible'+export * from './src/components/shadcn/ui/collapsible'export {Tabs as Tabs_Shadcn_,diff --git a/packages/ui/src/components/Input/Input.tsx b/packages/ui/src/components/Input/Input.tsxindex 8323feab7ce..f405f1953c7 100644--- a/packages/ui/src/components/Input/Input.tsx+++ b/packages/ui/src/components/Input/Input.tsx@@ -39,7 +39,7 @@ export interface Props extends Omit<}/**- * @deprecated Use `import { Input_Shadcn_ } from 'ui'` instead or `import { Input } from 'ui-patterns/DataInputs/Input'`+ * @deprecated Use `import { Input } from 'ui'` instead or `import { Input } from 'ui-patterns/DataInputs/Input'`*/function Input({autoComplete,