The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
chore: add shadcn input-group components (#44282)
Gildas Garcia18e4ad227e70
diff --git a/apps/design-system/__registry__/index.tsx b/apps/design-system/__registry__/index.tsxindex 8f423322ea9..f6ba8a7f0cd 100644--- a/apps/design-system/__registry__/index.tsx+++ b/apps/design-system/__registry__/index.tsx@@ -731,6 +731,28 @@ export const Index: Record<string, any> = {subcategory: "undefined",chunks: []},+ "data-input-with-reveal-copy-editable": {+ name: "data-input-with-reveal-copy-editable",+ type: "components:example",+ registryDependencies: ["data-input"],+ component: React.lazy(() => import("@/registry/default/example/data-input-with-reveal-copy-editable")),+ source: "",+ files: ["registry/default/example/data-input-with-reveal-copy-editable.tsx"],+ category: "undefined",+ subcategory: "undefined",+ chunks: []+ },+ "data-input-with-reveal-copy-editable-empty": {+ name: "data-input-with-reveal-copy-editable-empty",+ type: "components:example",+ registryDependencies: ["data-input"],+ component: React.lazy(() => import("@/registry/default/example/data-input-with-reveal-copy-editable-empty")),+ source: "",+ files: ["registry/default/example/data-input-with-reveal-copy-editable-empty.tsx"],+ category: "undefined",+ subcategory: "undefined",+ chunks: []+ },"date-picker-demo": {name: "date-picker-demo",type: "components:example",diff --git a/apps/design-system/content/docs/fragments/data-input.mdx b/apps/design-system/content/docs/fragments/data-input.mdxindex 040c3e9dcc5..3badd621883 100644--- a/apps/design-system/content/docs/fragments/data-input.mdx+++ b/apps/design-system/content/docs/fragments/data-input.mdx@@ -22,6 +22,10 @@ Inputs with sensitive values can be both revealed _and_ copied, but only in succ<ComponentPreview name="data-input-with-reveal-copy" peekCode wide />+Inputs can be edited without revealing their value.++<ComponentPreview name="data-input-with-reveal-copy-editable" peekCode wide />+You can also partially truncate the value by overriding the placeholder value.Consider if the value needs to be revealed in the first place, as only copying is sufficient in most cases.diff --git a/apps/design-system/registry/default/example/data-input-with-reveal-copy-editable-empty.tsx b/apps/design-system/registry/default/example/data-input-with-reveal-copy-editable-empty.tsxnew file mode 100644index 00000000000..dbee0094e3b--- /dev/null+++ b/apps/design-system/registry/default/example/data-input-with-reveal-copy-editable-empty.tsx@@ -0,0 +1,5 @@+import { Input } from 'ui-patterns/DataInputs/Input'++export default function DataInputWithRevealCopy() {+ return <Input containerClassName="w-full max-w-sm" reveal copy />+}diff --git a/apps/design-system/registry/default/example/data-input-with-reveal-copy-editable.tsx b/apps/design-system/registry/default/example/data-input-with-reveal-copy-editable.tsxnew file mode 100644index 00000000000..3af57f3e552--- /dev/null+++ b/apps/design-system/registry/default/example/data-input-with-reveal-copy-editable.tsx@@ -0,0 +1,5 @@+import { Input } from 'ui-patterns/DataInputs/Input'++export default function DataInputWithRevealCopy() {+ return <Input containerClassName="w-full max-w-sm" reveal copy defaultValue="1234567890" />+}diff --git a/apps/design-system/registry/default/example/form-patterns-pagelayout.tsx b/apps/design-system/registry/default/example/form-patterns-pagelayout.tsxindex 49f00b4bee9..f1b6cc5ea68 100644--- a/apps/design-system/registry/default/example/form-patterns-pagelayout.tsx+++ b/apps/design-system/registry/default/example/form-patterns-pagelayout.tsx@@ -14,10 +14,14 @@ import {FormControl_Shadcn_,FormField_Shadcn_,Input_Shadcn_,+ InputGroup,+ InputGroupAddon,+ InputGroupInput,+ InputGroupText,+ InputGroupTextarea,Popover_Shadcn_,PopoverContent_Shadcn_,PopoverTrigger_Shadcn_,- PrePostTab,RadioGroupStacked,RadioGroupStackedItem,Select_Shadcn_,@@ -219,9 +223,12 @@ export default function FormPatternsPageLayout() {description="Input with additional unit label"><FormControl_Shadcn_>- <PrePostTab postTab="MB" className="w-full">- <Input_Shadcn_ {...field} type="number" min={5} max={30} />- </PrePostTab>+ <InputGroup>+ <InputGroupInput {...field} type="number" min={5} max={30} />+ <InputGroupAddon align="inline-end">+ <InputGroupText className="font-mono">MB</InputGroupText>+ </InputGroupAddon>+ </InputGroup></FormControl_Shadcn_></FormItemLayout>)}@@ -252,6 +259,35 @@ export default function FormPatternsPageLayout() {/></CardContent>+ {/* Textarea with addon */}+ <CardContent>+ <FormField_Shadcn_+ control={form.control}+ name="description"+ render={({ field }) => (+ <FormItemLayout+ layout="flex-row-reverse"+ label="Textarea"+ description="Multi-line text input for longer content with addon"+ >+ <FormControl_Shadcn_>+ <InputGroup>+ <InputGroupTextarea+ {...field}+ rows={4}+ placeholder="Enter multi-line text"+ className="resize-none"+ />+ <InputGroupAddon align="block-end">+ <InputGroupText>120 characters left</InputGroupText>+ </InputGroupAddon>+ </InputGroup>+ </FormControl_Shadcn_>+ </FormItemLayout>+ )}+ />+ </CardContent>+{/* Icon Upload */}<CardContent><FormField_Shadcn_@@ -622,7 +658,7 @@ export default function FormPatternsPageLayout() {<PopoverTrigger_Shadcn_ asChild><Buttontype="outline"- className="w-full justify-start text-left font-normal px-3 py-4"+ className="bg-control w-full justify-start text-left font-normal px-3 py-4"icon={<CalendarIcon className="h-4 w-4" />}>{field.value ? format(field.value, 'PPP') : 'Pick a date'}diff --git a/apps/design-system/registry/default/example/form-patterns-sidepanel.tsx b/apps/design-system/registry/default/example/form-patterns-sidepanel.tsxindex 2664b6dbb06..52794b904b4 100644--- a/apps/design-system/registry/default/example/form-patterns-sidepanel.tsx+++ b/apps/design-system/registry/default/example/form-patterns-sidepanel.tsx@@ -11,10 +11,13 @@ import {FormControl_Shadcn_,FormField_Shadcn_,Input_Shadcn_,+ InputGroup,+ InputGroupAddon,+ InputGroupInput,+ InputGroupText,Popover_Shadcn_,PopoverContent_Shadcn_,PopoverTrigger_Shadcn_,- PrePostTab,RadioGroupStacked,RadioGroupStackedItem,Select_Shadcn_,@@ -233,9 +236,12 @@ export default function FormPatternsSidePanel() {description="Input with additional unit label"><FormControl_Shadcn_ className="col-span-6">- <PrePostTab postTab="MB" className="w-full">- <Input_Shadcn_ {...field} type="number" min={5} max={30} />- </PrePostTab>+ <InputGroup>+ <InputGroupInput {...field} type="number" min={5} max={30} />+ <InputGroupAddon align="inline-end">+ <InputGroupText>MB</InputGroupText>+ </InputGroupAddon>+ </InputGroup></FormControl_Shadcn_></FormItemLayout>)}@@ -653,7 +659,7 @@ export default function FormPatternsSidePanel() {<PopoverTrigger_Shadcn_ asChild><Buttontype="outline"- className="w-full justify-start text-left font-normal px-3 py-4"+ className="bg-control w-full justify-start text-left font-normal px-3 py-4"icon={<CalendarIcon className="h-4 w-4" />}>{field.value ? format(field.value, 'PPP') : 'Pick a date'}diff --git a/apps/design-system/registry/default/example/page-layout-settings.tsx b/apps/design-system/registry/default/example/page-layout-settings.tsxindex 79c4c46e348..099aba18230 100644--- a/apps/design-system/registry/default/example/page-layout-settings.tsx+++ b/apps/design-system/registry/default/example/page-layout-settings.tsx@@ -8,8 +8,10 @@ import {Form_Shadcn_,FormControl_Shadcn_,FormField_Shadcn_,- Input_Shadcn_,- PrePostTab,+ InputGroup,+ InputGroupAddon,+ InputGroupInput,+ InputGroupText,Switch,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'@@ -125,9 +127,12 @@ export default function PageLayoutSettings() {description="Time interval where the same refresh token can be used multiple times to request for an access token. Recommendation: 10 seconds."><FormControl_Shadcn_>- <PrePostTab postTab="seconds">- <Input_Shadcn_ type="number" min={0} {...field} />- </PrePostTab>+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>seconds</InputGroupText>+ </InputGroupAddon>+ <InputGroupInput type="number" min={0} {...field} />+ </InputGroup></FormControl_Shadcn_></FormItemLayout>)}@@ -196,9 +201,14 @@ export default function PageLayoutSettings() {><div className="flex items-center"><FormControl_Shadcn_>- <PrePostTab postTab={<HoursOrNeverText value={field.value || 0} />}>- <Input_Shadcn_ type="number" min={0} {...field} />- </PrePostTab>+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>+ <HoursOrNeverText value={field.value || 0} />+ </InputGroupText>+ </InputGroupAddon>+ <InputGroupInput type="number" min={0} {...field} />+ </InputGroup></FormControl_Shadcn_></div></FormItemLayout>@@ -218,9 +228,14 @@ export default function PageLayoutSettings() {><div className="flex items-center"><FormControl_Shadcn_>- <PrePostTab postTab={<HoursOrNeverText value={field.value || 0} />}>- <Input_Shadcn_ type="number" {...field} />- </PrePostTab>+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>+ <HoursOrNeverText value={field.value || 0} />+ </InputGroupText>+ </InputGroupAddon>+ <InputGroupInput type="number" {...field} />+ </InputGroup></FormControl_Shadcn_></div></FormItemLayout>diff --git a/apps/design-system/registry/examples.ts b/apps/design-system/registry/examples.tsindex cc3215c8990..4e221c2b19e 100644--- a/apps/design-system/registry/examples.ts+++ b/apps/design-system/registry/examples.ts@@ -439,6 +439,18 @@ export const examples: Registry = [registryDependencies: ['data-input'],files: ['example/data-input-with-reveal-copy.tsx'],},+ {+ name: 'data-input-with-reveal-copy-editable',+ type: 'components:example',+ registryDependencies: ['data-input'],+ files: ['example/data-input-with-reveal-copy-editable.tsx'],+ },+ {+ name: 'data-input-with-reveal-copy-editable-empty',+ type: 'components:example',+ registryDependencies: ['data-input'],+ files: ['example/data-input-with-reveal-copy-editable-empty.tsx'],+ },{name: 'date-picker-demo',type: 'components:example',diff --git a/apps/studio/components/interfaces/Auth/AuthProvidersForm/FormField.tsx b/apps/studio/components/interfaces/Auth/AuthProvidersForm/FormField.tsxindex a33f4ddb2fb..1630965d9aa 100644--- a/apps/studio/components/interfaces/Auth/AuthProvidersForm/FormField.tsx+++ b/apps/studio/components/interfaces/Auth/AuthProvidersForm/FormField.tsx@@ -10,10 +10,12 @@ import {FormControl_Shadcn_,FormField_Shadcn_,Input_Shadcn_,+ InputGroup,+ InputGroupAddon,+ InputGroupInput,Popover_Shadcn_,PopoverContent_Shadcn_,PopoverTrigger_Shadcn_,- PrePostTab,Select_Shadcn_,SelectContent_Shadcn_,SelectItem_Shadcn_,@@ -157,37 +159,8 @@ const FormField = ({}><FormControl_Shadcn_ className="col-span-6">- {properties.units ? (- <PrePostTab- postTab={- <ReactMarkdown unwrapDisallowed disallowedElements={['p']}>- {properties.units}- </ReactMarkdown>- }- className="w-full"- >- {properties.isSecret ? (- <DataInput- {...field}- type={properties.isSecret ? 'password' : 'text'}- id={name}- size="small"- copy- reveal- />- ) : (- <Input_Shadcn_ {...field} id={name} />- )}- </PrePostTab>- ) : properties.isSecret ? (- <DataInput- {...field}- type={properties.isSecret ? 'password' : 'text'}- id={name}- size="small"- copy- reveal- />+ {properties.isSecret ? (+ <DataInput {...field} id={name} size="small" copy reveal />) : (<Input_Shadcn_ {...field} id={name} />)}@@ -255,21 +228,19 @@ const FormField = ({><FormControl_Shadcn_ className="col-span-6">{properties.units ? (- <PrePostTab- postTab={+ <InputGroup>+ <InputGroupAddon align="inline-end"><ReactMarkdown unwrapDisallowed disallowedElements={['p']}>{properties.units}</ReactMarkdown>- }- className="w-full"- >- <Input_Shadcn_+ </InputGroupAddon>+ <InputGroupInput{...field}id={name}type="number"onChange={(e) => field.onChange(Number(e.target.value))}/>- </PrePostTab>+ </InputGroup>) : (<Input_Shadcn_{...field}diff --git a/apps/studio/components/interfaces/Auth/AuthProvidersFormValidation.tsx b/apps/studio/components/interfaces/Auth/AuthProvidersFormValidation.tsxindex 173081f8a6b..20513ffc7d6 100644--- a/apps/studio/components/interfaces/Auth/AuthProvidersFormValidation.tsx+++ b/apps/studio/components/interfaces/Auth/AuthProvidersFormValidation.tsx@@ -80,7 +80,7 @@ const PROVIDER_EMAIL = {title: 'Email OTP length',type: 'number',description: 'Number of digits in the email OTP.',- units: 'number',+ units: 'digits',},},validationSchema: object().shape({diff --git a/apps/studio/components/interfaces/Auth/CustomAuthProviders/CreateOrUpdateCustomProviderSheet.tsx b/apps/studio/components/interfaces/Auth/CustomAuthProviders/CreateOrUpdateCustomProviderSheet.tsxindex d36f03b975c..794a29c1708 100644--- a/apps/studio/components/interfaces/Auth/CustomAuthProviders/CreateOrUpdateCustomProviderSheet.tsx+++ b/apps/studio/components/interfaces/Auth/CustomAuthProviders/CreateOrUpdateCustomProviderSheet.tsx@@ -13,7 +13,10 @@ import {FormField_Shadcn_,Input,Input_Shadcn_,- PrePostTab,+ InputGroup,+ InputGroupAddon,+ InputGroupInput,+ InputGroupText,RadioGroupStacked,RadioGroupStackedItem,Separator,@@ -289,8 +292,11 @@ export const CreateOrUpdateCustomProviderSheet = ({description="Lowercase letters, numbers, and hyphens only. Used in SDK: signInWithOAuth({ provider: 'custom:my-company' })"><FormControl_Shadcn_>- <PrePostTab preTab="custom:" className="w-full">- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-start">+ <InputGroupText>custom:</InputGroupText>+ </InputGroupAddon>+ <InputGroupInput{...field}placeholder="my-company"disabled={isEditMode}@@ -300,7 +306,7 @@ export const CreateOrUpdateCustomProviderSheet = ({field.onChange(userValue)}}/>- </PrePostTab>+ </InputGroup></FormControl_Shadcn_></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Auth/MfaAuthSettingsForm/MfaAuthSettingsForm.tsx b/apps/studio/components/interfaces/Auth/MfaAuthSettingsForm/MfaAuthSettingsForm.tsxindex 58bf221e192..5fae77cc4c8 100644--- a/apps/studio/components/interfaces/Auth/MfaAuthSettingsForm/MfaAuthSettingsForm.tsx+++ b/apps/studio/components/interfaces/Auth/MfaAuthSettingsForm/MfaAuthSettingsForm.tsx@@ -13,22 +13,25 @@ import { useEffect, useState } from 'react'import { useForm } from 'react-hook-form'import { toast } from 'sonner'import {- AlertTitle_Shadcn_,Alert_Shadcn_,+ AlertTitle_Shadcn_,Button,Card,CardContent,CardFooter,+ Form_Shadcn_,FormControl_Shadcn_,FormField_Shadcn_,- Form_Shadcn_,Input_Shadcn_,- PrePostTab,+ InputGroup,+ InputGroupAddon,+ InputGroupInput,+ InputGroupText,+ Select_Shadcn_,SelectContent_Shadcn_,SelectItem_Shadcn_,SelectTrigger_Shadcn_,SelectValue_Shadcn_,- Select_Shadcn_,Switch,WarningIcon,} from 'ui'@@ -369,15 +372,18 @@ export const MfaAuthSettingsForm = () => {description="How many MFA factors can be enrolled at once per user."><FormControl_Shadcn_>- <PrePostTab postTab="factors">- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>factors</InputGroupText>+ </InputGroupAddon>+ <InputGroupInputtype="number"min={0}max={30}{...field}disabled={!canUpdateConfig}/>- </PrePostTab>+ </InputGroup></FormControl_Shadcn_></FormItemLayout>)}@@ -473,13 +479,18 @@ export const MfaAuthSettingsForm = () => {description="Number of digits in OTP"><FormControl_Shadcn_>- <Input_Shadcn_- type="number"- min={6}- max={30}- {...field}- disabled={!canUpdateConfig || !hasAccessToMFA}- />+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>digits</InputGroupText>+ </InputGroupAddon>+ <InputGroupInput+ type="number"+ min={6}+ max={30}+ {...field}+ disabled={!canUpdateConfig || !hasAccessToMFA}+ />+ </InputGroup></FormControl_Shadcn_></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Auth/PerformanceSettingsForm.tsx b/apps/studio/components/interfaces/Auth/PerformanceSettingsForm.tsxindex bc0399d6d17..8d690a315fe 100644--- a/apps/studio/components/interfaces/Auth/PerformanceSettingsForm.tsx+++ b/apps/studio/components/interfaces/Auth/PerformanceSettingsForm.tsx@@ -1,10 +1,5 @@import { zodResolver } from '@hookform/resolvers/zod'import { PermissionAction } from '@supabase/shared-types/out/constants'-import { useEffect, useState } from 'react'-import { useForm } from 'react-hook-form'-import { toast } from 'sonner'-import * as z from 'zod'-import { ScaffoldSection, ScaffoldSectionTitle } from 'components/layouts/Scaffold'import AlertError from 'components/ui/AlertError'import NoPermission from 'components/ui/NoPermission'@@ -16,6 +11,9 @@ import { useCheckEntitlements } from 'hooks/misc/useCheckEntitlements'import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'import { IS_PLATFORM } from 'lib/constants'+import { useEffect, useState } from 'react'+import { useForm } from 'react-hook-form'+import { toast } from 'sonner'import {Button,Card,@@ -24,8 +22,10 @@ import {Form_Shadcn_,FormControl_Shadcn_,FormField_Shadcn_,- Input_Shadcn_,- PrePostTab,+ InputGroup,+ InputGroupAddon,+ InputGroupInput,+ InputGroupText,Select_Shadcn_,SelectContent_Shadcn_,SelectItem_Shadcn_,@@ -34,6 +34,7 @@ import {} from 'ui'import { GenericSkeletonLoader, ShimmeringLoader } from 'ui-patterns'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'+import * as z from 'zod'const FormSchema = z.object({API_MAX_REQUEST_DURATION: z.coerce@@ -226,15 +227,18 @@ export const PerformanceSettingsForm = () => {<div className="flex flex-col gap-2"><FormControl_Shadcn_><div className="relative">- <PrePostTab postTab="seconds">- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>seconds</InputGroupText>+ </InputGroupAddon>+ <InputGroupInputtype="number"min={5}max={30}{...field}disabled={!canUpdateConfig || promptUpgrade}/>- </PrePostTab>+ </InputGroup></div></FormControl_Shadcn_>@@ -366,8 +370,13 @@ export const PerformanceSettingsForm = () => {<FormControl_Shadcn_><div className="flex flex-col gap-2"><div className="relative">- <PrePostTab postTab={chosenUnit === 'percent' ? '%' : 'connections'}>- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>+ {chosenUnit === 'percent' ? '%' : 'connections'}+ </InputGroupText>+ </InputGroupAddon>+ <InputGroupInputtype="number"{...field}min={3}@@ -378,7 +387,7 @@ export const PerformanceSettingsForm = () => {}disabled={!canUpdateConfig || promptUpgrade}/>- </PrePostTab>+ </InputGroup></div>{isLoadingMaxConns ? (<ShimmeringLoader className="py-2 w-16 ml-auto" />diff --git a/apps/studio/components/interfaces/Auth/ProtectionAuthSettingsForm/ProtectionAuthSettingsForm.tsx b/apps/studio/components/interfaces/Auth/ProtectionAuthSettingsForm/ProtectionAuthSettingsForm.tsxindex 011c79f6c66..7a0560d752e 100644--- a/apps/studio/components/interfaces/Auth/ProtectionAuthSettingsForm/ProtectionAuthSettingsForm.tsx+++ b/apps/studio/components/interfaces/Auth/ProtectionAuthSettingsForm/ProtectionAuthSettingsForm.tsx@@ -1,12 +1,5 @@import { yupResolver } from '@hookform/resolvers/yup'import { PermissionAction } from '@supabase/shared-types/out/constants'-import { Eye, EyeOff } from 'lucide-react'-import Link from 'next/link'-import { useEffect, useState } from 'react'-import { useForm } from 'react-hook-form'-import { toast } from 'sonner'-import { boolean, number, object, string } from 'yup'-import { useParams } from 'common'import AlertError from 'components/ui/AlertError'import { InlineLink } from 'components/ui/InlineLink'@@ -15,25 +8,28 @@ import { useAuthConfigQuery } from 'data/auth/auth-config-query'import { useAuthConfigUpdateMutation } from 'data/auth/auth-config-update-mutation'import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'import { DOCS_URL } from 'lib/constants'+import Link from 'next/link'+import { useEffect } from 'react'+import { useForm } from 'react-hook-form'+import { toast } from 'sonner'import {Badge,Button,Card,CardContent,CardFooter,+ Form_Shadcn_,FormControl_Shadcn_,FormField_Shadcn_,- Form_Shadcn_,- Input_Shadcn_,- PrePostTab,+ Select_Shadcn_,SelectContent_Shadcn_,SelectItem_Shadcn_,SelectTrigger_Shadcn_,SelectValue_Shadcn_,- Select_Shadcn_,Switch,} from 'ui'import { GenericSkeletonLoader } from 'ui-patterns'+import { Input } from 'ui-patterns/DataInputs/Input'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import {PageSection,@@ -42,6 +38,8 @@ import {PageSectionSummary,PageSectionTitle,} from 'ui-patterns/PageSection'+import { boolean, number, object, string } from 'yup'+import { NO_REQUIRED_CHARACTERS } from '../Auth.constants'const CAPTCHA_PROVIDERS = [@@ -90,7 +88,6 @@ export const ProtectionAuthSettingsForm = () => {toast.success('Successfully updated settings')},})- const [hidden, setHidden] = useState(true)const { can: canReadConfig } = useAsyncCheckPermissions(PermissionAction.READ,@@ -274,24 +271,7 @@ export const ProtectionAuthSettingsForm = () => {description="Obtain this secret from the provider."><FormControl_Shadcn_>- <div className="flex items-center gap-2">- <PrePostTab- postTab={- <Button- type="text"- className="p-0"- onClick={() => setHidden(!hidden)}- icon={hidden ? <Eye /> : <EyeOff />}- />- }- >- <Input_Shadcn_- {...field}- type={hidden ? 'password' : 'text'}- disabled={!canUpdateConfig}- />- </PrePostTab>- </div>+ <Input {...field} reveal copy disabled={!canUpdateConfig} /></FormControl_Shadcn_></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Auth/RateLimits/RateLimits.tsx b/apps/studio/components/interfaces/Auth/RateLimits/RateLimits.tsxindex 0e5899e7224..462b6229344 100644--- a/apps/studio/components/interfaces/Auth/RateLimits/RateLimits.tsx+++ b/apps/studio/components/interfaces/Auth/RateLimits/RateLimits.tsx@@ -1,27 +1,27 @@import { zodResolver } from '@hookform/resolvers/zod'import { PermissionAction } from '@supabase/shared-types/out/constants'-import Link from 'next/link'-import { useEffect } from 'react'-import { useForm } from 'react-hook-form'-import { toast } from 'sonner'-import * as z from 'zod'-import { useParams } from 'common'import AlertError from 'components/ui/AlertError'import NoPermission from 'components/ui/NoPermission'import { useAuthConfigQuery } from 'data/auth/auth-config-query'import { useAuthConfigUpdateMutation } from 'data/auth/auth-config-update-mutation'import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'+import Link from 'next/link'+import { useEffect } from 'react'+import { useForm } from 'react-hook-form'+import { toast } from 'sonner'import {Button,Card,CardContent,CardFooter,+ Form_Shadcn_,FormControl_Shadcn_,FormField_Shadcn_,- Form_Shadcn_,- Input_Shadcn_,- PrePostTab,+ InputGroup,+ InputGroupAddon,+ InputGroupInput,+ InputGroupText,Tooltip,TooltipContent,TooltipTrigger,@@ -29,6 +29,8 @@ import {import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { PageSection, PageSectionContent } from 'ui-patterns/PageSection'import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'+import * as z from 'zod'+import { isSmtpEnabled } from '../SmtpForm/SmtpForm.utils'export const RateLimits = () => {@@ -191,14 +193,17 @@ export const RateLimits = () => {<Tooltip><TooltipTrigger asChild><FormControl_Shadcn_>- <PrePostTab postTab="emails/h">- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>emails/h</InputGroupText>+ </InputGroupAddon>+ <InputGroupInputtype="number"min={0}{...field}disabled={!canUpdateConfig || !canUpdateEmailLimit}/>- </PrePostTab>+ </InputGroup></FormControl_Shadcn_></TooltipTrigger>{!canUpdateConfig || !canUpdateEmailLimit ? (@@ -259,14 +264,17 @@ export const RateLimits = () => {<Tooltip><TooltipTrigger asChild><FormControl_Shadcn_>- <PrePostTab postTab="sms/h">- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>sms/h</InputGroupText>+ </InputGroupAddon>+ <InputGroupInputtype="number"min={0}{...field}disabled={!canUpdateConfig || !canUpdateSMSRateLimit}/>- </PrePostTab>+ </InputGroup></FormControl_Shadcn_></TooltipTrigger>{!canUpdateConfig || !canUpdateSMSRateLimit ? (@@ -305,14 +313,17 @@ export const RateLimits = () => {<Tooltip><TooltipTrigger asChild><FormControl_Shadcn_>- <PrePostTab postTab="requests/5 min">- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>requests/5 min</InputGroupText>+ </InputGroupAddon>+ <InputGroupInputtype="number"min={0}{...field}disabled={!canUpdateConfig}/>- </PrePostTab>+ </InputGroup></FormControl_Shadcn_></TooltipTrigger>{!canUpdateConfig && (@@ -349,14 +360,17 @@ export const RateLimits = () => {<Tooltip><TooltipTrigger asChild><FormControl_Shadcn_>- <PrePostTab postTab="requests/5 min">- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>requests/5 min</InputGroupText>+ </InputGroupAddon>+ <InputGroupInputtype="number"min={0}{...field}disabled={!canUpdateConfig}/>- </PrePostTab>+ </InputGroup></FormControl_Shadcn_></TooltipTrigger>{!canUpdateConfig && (@@ -393,14 +407,17 @@ export const RateLimits = () => {<Tooltip><TooltipTrigger asChild><FormControl_Shadcn_>- <PrePostTab postTab="requests/h">- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>requests/h</InputGroupText>+ </InputGroupAddon>+ <InputGroupInputtype="number"min={0}{...field}disabled={!canUpdateConfig || !canUpdateAnonymousUsersRateLimit}/>- </PrePostTab>+ </InputGroup></FormControl_Shadcn_></TooltipTrigger>{!canUpdateConfig || !canUpdateAnonymousUsersRateLimit ? (@@ -437,14 +454,17 @@ export const RateLimits = () => {<Tooltip><TooltipTrigger asChild><FormControl_Shadcn_>- <PrePostTab postTab="requests/5 min">- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>requests/5 min</InputGroupText>+ </InputGroupAddon>+ <InputGroupInputtype="number"min={0}{...field}disabled={!canUpdateConfig}/>- </PrePostTab>+ </InputGroup></FormControl_Shadcn_></TooltipTrigger>{!canUpdateConfig && (@@ -481,14 +501,17 @@ export const RateLimits = () => {<Tooltip><TooltipTrigger asChild><FormControl_Shadcn_>- <PrePostTab postTab="requests/5 min">- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>requests/5 min</InputGroupText>+ </InputGroupAddon>+ <InputGroupInputtype="number"min={0}{...field}disabled={!canUpdateConfig || !canUpdateWeb3RateLimit}/>- </PrePostTab>+ </InputGroup></FormControl_Shadcn_></TooltipTrigger>{!canUpdateConfig || !canUpdateWeb3RateLimit ? (diff --git a/apps/studio/components/interfaces/Auth/SessionsAuthSettingsForm/SessionsAuthSettingsForm.tsx b/apps/studio/components/interfaces/Auth/SessionsAuthSettingsForm/SessionsAuthSettingsForm.tsxindex 13b450a3988..0c3d733c6f3 100644--- a/apps/studio/components/interfaces/Auth/SessionsAuthSettingsForm/SessionsAuthSettingsForm.tsx+++ b/apps/studio/components/interfaces/Auth/SessionsAuthSettingsForm/SessionsAuthSettingsForm.tsx@@ -1,10 +1,5 @@import { zodResolver } from '@hookform/resolvers/zod'import { PermissionAction } from '@supabase/shared-types/out/constants'-import { useEffect, useState } from 'react'-import { useForm } from 'react-hook-form'-import { toast } from 'sonner'-import * as z from 'zod'-import { useParams } from 'common'import AlertError from 'components/ui/AlertError'import NoPermission from 'components/ui/NoPermission'@@ -14,16 +9,21 @@ import { useAuthConfigUpdateMutation } from 'data/auth/auth-config-update-mutatiimport { useCheckEntitlements } from 'hooks/misc/useCheckEntitlements'import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'import { IS_PLATFORM } from 'lib/constants'+import { useEffect, useState } from 'react'+import { useForm } from 'react-hook-form'+import { toast } from 'sonner'import {Button,Card,CardContent,CardFooter,+ Form_Shadcn_,FormControl_Shadcn_,FormField_Shadcn_,- Form_Shadcn_,- Input_Shadcn_,- PrePostTab,+ InputGroup,+ InputGroupAddon,+ InputGroupInput,+ InputGroupText,Switch,} from 'ui'import { GenericSkeletonLoader } from 'ui-patterns'@@ -35,6 +35,7 @@ import {PageSectionSummary,PageSectionTitle,} from 'ui-patterns/PageSection'+import * as z from 'zod'function HoursOrNeverText({ value }: { value: number }) {if (value === 0) {@@ -239,14 +240,17 @@ export const SessionsAuthSettingsForm = () => {description="Time interval where the same refresh token can be used multiple times to request for an access token. Recommendation: 10 seconds."><FormControl_Shadcn_ className="w-full">- <PrePostTab postTab="seconds">- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>seconds</InputGroupText>+ </InputGroupAddon>+ <InputGroupInputtype="number"min={0}{...field}disabled={!canUpdateConfig}/>- </PrePostTab>+ </InputGroup></FormControl_Shadcn_></FormItemLayout>)}@@ -323,14 +327,19 @@ export const SessionsAuthSettingsForm = () => {description="The amount of time before a user is forced to sign in again. Use 0 for never."><FormControl_Shadcn_ className="w-full">- <PrePostTab postTab={<HoursOrNeverText value={field.value || 0} />}>- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>+ <HoursOrNeverText value={field.value || 0} />+ </InputGroupText>+ </InputGroupAddon>+ <InputGroupInputtype="number"min={0}{...field}disabled={!canUpdateConfig || !hasUserSessionsEntitlement}/>- </PrePostTab>+ </InputGroup></FormControl_Shadcn_></FormItemLayout>)}@@ -348,14 +357,19 @@ export const SessionsAuthSettingsForm = () => {description="The amount of time a user needs to be inactive to be forced to sign in again. Use 0 for never."><FormControl_Shadcn_ className="w-full">- <PrePostTab postTab={<HoursOrNeverText value={field.value || 0} />}>- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>+ <HoursOrNeverText value={field.value || 0} />+ </InputGroupText>+ </InputGroupAddon>+ <InputGroupInputtype="number"{...field}className="flex-1"disabled={!canUpdateConfig || !hasUserSessionsEntitlement}/>- </PrePostTab>+ </InputGroup></FormControl_Shadcn_></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Auth/SmtpForm/SmtpForm.tsx b/apps/studio/components/interfaces/Auth/SmtpForm/SmtpForm.tsxindex d2e7dd4699f..57800057c5b 100644--- a/apps/studio/components/interfaces/Auth/SmtpForm/SmtpForm.tsx+++ b/apps/studio/components/interfaces/Auth/SmtpForm/SmtpForm.tsx@@ -7,7 +7,6 @@ import NoPermission from 'components/ui/NoPermission'import { useAuthConfigQuery } from 'data/auth/auth-config-query'import { useAuthConfigUpdateMutation } from 'data/auth/auth-config-update-mutation'import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'-import { Eye, EyeOff } from 'lucide-react'import { useEffect, useState } from 'react'import { useForm } from 'react-hook-form'import { toast } from 'sonner'@@ -21,10 +20,14 @@ import {FormControl_Shadcn_,FormField_Shadcn_,Input_Shadcn_,- PrePostTab,+ InputGroup,+ InputGroupAddon,+ InputGroupInput,+ InputGroupText,Switch,} from 'ui'import { Admonition, PageSection, PageSectionContent } from 'ui-patterns'+import { Input } from 'ui-patterns/DataInputs/Input'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import * as yup from 'yup'@@ -49,7 +52,6 @@ export const SmtpForm = () => {const { mutate: updateAuthConfig, isPending: isUpdatingConfig } = useAuthConfigUpdateMutation()const [enableSmtp, setEnableSmtp] = useState(false)- const [hidden, setHidden] = useState(true)const { can: canReadConfig } = useAsyncCheckPermissions(PermissionAction.READ,@@ -189,7 +191,6 @@ export const SmtpForm = () => {toast.error(`Failed to update settings: ${error.message}`)},onSuccess: () => {- setHidden(true)toast.success('Successfully updated settings')},}@@ -394,14 +395,17 @@ export const SmtpForm = () => {description="The minimum time in seconds between emails before another email can be sent to the same user."><FormControl_Shadcn_>- <PrePostTab postTab="seconds">- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>seconds</InputGroupText>+ </InputGroupAddon>+ <InputGroupInputtype="number"value={field.value}onChange={(e) => field.onChange(Number(e.target.value))}disabled={!canUpdateConfig}/>- </PrePostTab>+ </InputGroup></FormControl_Shadcn_></FormItemLayout>)}@@ -435,25 +439,7 @@ export const SmtpForm = () => {description="Password for your SMTP server. For security reasons, this password cannot be viewed once saved."><FormControl_Shadcn_>- <PrePostTab- postTab={- <Button- type="text"- className="p-0"- onClick={() => setHidden(!hidden)}- icon={hidden ? <Eye /> : <EyeOff />}- />- }- >- <Input_Shadcn_- {...field}- type={hidden ? 'password' : 'text'}- placeholder={- authConfig?.SMTP_PASS === null ? 'SMTP Password' : '••••••••'- }- disabled={!canUpdateConfig}- />- </PrePostTab>+ <Input {...field} reveal copy disabled={!canUpdateConfig} /></FormControl_Shadcn_></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/AdvancedSettings.tsx b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/AdvancedSettings.tsxindex 475b47d8246..63096351d16 100644--- a/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/AdvancedSettings.tsx+++ b/apps/studio/components/interfaces/Database/Replication/DestinationPanel/DestinationForm/AdvancedSettings.tsx@@ -8,8 +8,10 @@ import {Badge,FormControl_Shadcn_,FormField_Shadcn_,- Input_Shadcn_,- PrePostTab,+ InputGroup,+ InputGroupAddon,+ InputGroupInput,+ InputGroupText,Select_Shadcn_,SelectContent_Shadcn_,SelectItem_Shadcn_,@@ -68,15 +70,18 @@ export const AdvancedSettings = ({}><FormControl_Shadcn_>- <PrePostTab postTab="milliseconds">- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>milliseconds</InputGroupText>+ </InputGroupAddon>+ <InputGroupInput{...field}type="number"value={field.value ?? ''}onChange={handleNumberChange(field)}placeholder="Default: 10000"/>- </PrePostTab>+ </InputGroup></FormControl_Shadcn_></FormItemLayout>)}@@ -99,15 +104,18 @@ export const AdvancedSettings = ({}><FormControl_Shadcn_>- <PrePostTab postTab="workers">- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>workers</InputGroupText>+ </InputGroupAddon>+ <InputGroupInput{...field}type="number"value={field.value ?? ''}onChange={handleNumberChange(field)}placeholder="Default: 4"/>- </PrePostTab>+ </InputGroup></FormControl_Shadcn_></FormItemLayout>)}@@ -133,15 +141,18 @@ export const AdvancedSettings = ({}><FormControl_Shadcn_>- <PrePostTab postTab="connections">- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>connections</InputGroupText>+ </InputGroupAddon>+ <InputGroupInput{...field}type="number"value={field.value ?? ''}onChange={handleNumberChange(field)}placeholder="Default: 2"/>- </PrePostTab>+ </InputGroup></FormControl_Shadcn_></FormItemLayout>)}@@ -205,15 +216,18 @@ export const AdvancedSettings = ({}><FormControl_Shadcn_>- <PrePostTab postTab="connections">- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>connections</InputGroupText>+ </InputGroupAddon>+ <InputGroupInput{...field}type="number"value={field.value ?? ''}onChange={handleNumberChange(field)}placeholder="Default: 4"/>- </PrePostTab>+ </InputGroup></FormControl_Shadcn_></FormItemLayout>)}@@ -245,15 +259,18 @@ export const AdvancedSettings = ({}><FormControl_Shadcn_>- <PrePostTab postTab="minutes">- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>minutes</InputGroupText>+ </InputGroupAddon>+ <InputGroupInput{...field}type="number"value={field.value ?? ''}onChange={handleNumberChange(field)}placeholder="Default: None (No staleness limit)"/>- </PrePostTab>+ </InputGroup></FormControl_Shadcn_></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/DiskManagement/fields/AutoScaleFields.tsx b/apps/studio/components/interfaces/DiskManagement/fields/AutoScaleFields.tsxindex d1fc6651aee..88e8c416eda 100644--- a/apps/studio/components/interfaces/DiskManagement/fields/AutoScaleFields.tsx+++ b/apps/studio/components/interfaces/DiskManagement/fields/AutoScaleFields.tsx@@ -1,15 +1,21 @@-import { UseFormReturn } from 'react-hook-form'-import { InputVariants } from '@ui/components/shadcn/ui/input'import { useParams } from 'common'import { useDiskAutoscaleCustomConfigQuery } from 'data/config/disk-autoscale-config-query'-import { cn, FormControl_Shadcn_, FormField_Shadcn_, Input_Shadcn_, Skeleton } from 'ui'+import { UseFormReturn } from 'react-hook-form'+import {+ cn,+ FormControl_Shadcn_,+ FormField_Shadcn_,+ InputGroup,+ InputGroupAddon,+ InputGroupInput,+ InputGroupText,+} from 'ui'import { Admonition } from 'ui-patterns'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'+import { DiskStorageSchemaType } from '../DiskManagement.schema'import { DISK_AUTOSCALE_CONFIG_DEFAULTS } from '../ui/DiskManagement.constants'-import FormMessage from '../ui/FormMessage'-import { InputPostTab } from '../ui/InputPostTab'type AutoScaleFieldProps = {form: UseFormReturn<DiskStorageSchemaType>@@ -62,40 +68,30 @@ export const AutoScaleFields = ({ form }: AutoScaleFieldProps) => {}className="[&>div>span]:text-foreground-lighter">- <InputPostTab label="%">- {isLoading ? (- <div- className={cn(- InputVariants({ size: 'small' }),- 'w-32 font-mono rounded-r-none'- )}- >- <Skeleton className="w-10 h-4" />- </div>- ) : (- <FormControl_Shadcn_>- <Input_Shadcn_- {...field}- type="number"- className="flex-grow font-mono rounded-r-none max-w-20"- value={field.value ?? undefined}- disabled={isError}- onChange={(e) => {- setValue(- 'growthPercent',- e.target.value === '' ? null : e.target.valueAsNumber,- {- shouldDirty: true,- shouldValidate: true,- }- )- }}- placeholder={String(DISK_AUTOSCALE_CONFIG_DEFAULTS.growthPercent)}- />- </FormControl_Shadcn_>- )}- </InputPostTab>- {error && <FormMessage type="error" message={error.message} />}+ <FormControl_Shadcn_ className="max-w-20">+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>%</InputGroupText>+ </InputGroupAddon>+ <InputGroupInput+ {...field}+ type="number"+ value={field.value ?? undefined}+ disabled={isError}+ onChange={(e) => {+ setValue(+ 'growthPercent',+ e.target.value === '' ? null : e.target.valueAsNumber,+ {+ shouldDirty: true,+ shouldValidate: true,+ }+ )+ }}+ placeholder={String(DISK_AUTOSCALE_CONFIG_DEFAULTS.growthPercent)}+ />+ </InputGroup>+ </FormControl_Shadcn_></FormItemLayout>)}}@@ -118,40 +114,30 @@ export const AutoScaleFields = ({ form }: AutoScaleFieldProps) => {}className="[&>div>span]:text-foreground-lighter">- <InputPostTab label="GB">- {isLoading ? (- <div- className={cn(- InputVariants({ size: 'small' }),- 'w-32 font-mono rounded-r-none'- )}- >- <Skeleton className="w-10 h-4" />- </div>- ) : (- <FormControl_Shadcn_>- <Input_Shadcn_- {...field}- type="number"- className="flex-grow font-mono rounded-r-none max-w-32"- value={field.value ?? undefined}- disabled={isError}- onChange={(e) => {- setValue(- 'minIncrementGb',- e.target.value === '' ? null : e.target.valueAsNumber,- {- shouldDirty: true,- shouldValidate: true,- }- )- }}- placeholder={String(DISK_AUTOSCALE_CONFIG_DEFAULTS.minIncrementSize)}- />- </FormControl_Shadcn_>- )}- </InputPostTab>- {error && <FormMessage type="error" message={error.message} />}+ <FormControl_Shadcn_ className="max-w-32">+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>GB</InputGroupText>+ </InputGroupAddon>+ <InputGroupInput+ {...field}+ type="number"+ value={field.value ?? undefined}+ disabled={isError}+ onChange={(e) => {+ setValue(+ 'minIncrementGb',+ e.target.value === '' ? null : e.target.valueAsNumber,+ {+ shouldDirty: true,+ shouldValidate: true,+ }+ )+ }}+ placeholder={String(DISK_AUTOSCALE_CONFIG_DEFAULTS.minIncrementSize)}+ />+ </InputGroup>+ </FormControl_Shadcn_></FormItemLayout>)}}@@ -169,40 +155,26 @@ export const AutoScaleFields = ({ form }: AutoScaleFieldProps) => {labelOptional="Maximum size that the disk can grow to"className="[&>div>span]:text-foreground-lighter">- <InputPostTab label="GB">- {isLoading ? (- <div- className={cn(- InputVariants({ size: 'small' }),- 'w-32 font-mono rounded-r-none'- )}- >- <Skeleton className="w-10 h-4" />- </div>- ) : (- <FormControl_Shadcn_>- <Input_Shadcn_- {...field}- type="number"- className="flex-grow font-mono rounded-r-none max-w-32"- value={field.value ?? undefined}- disabled={isError}- onChange={(e) => {- setValue(- 'maxSizeGb',- e.target.value === '' ? null : e.target.valueAsNumber,- {- shouldDirty: true,- shouldValidate: true,- }- )- }}- placeholder={String(DISK_AUTOSCALE_CONFIG_DEFAULTS.maxSizeGb)}- />- </FormControl_Shadcn_>- )}- </InputPostTab>- {error && <FormMessage type="error" message={error.message} />}+ <FormControl_Shadcn_ className="max-w-32">+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>GB</InputGroupText>+ </InputGroupAddon>+ <InputGroupInput+ {...field}+ type="number"+ value={field.value ?? undefined}+ disabled={isError}+ onChange={(e) => {+ setValue('maxSizeGb', e.target.value === '' ? null : e.target.valueAsNumber, {+ shouldDirty: true,+ shouldValidate: true,+ })+ }}+ placeholder={String(DISK_AUTOSCALE_CONFIG_DEFAULTS.maxSizeGb)}+ />+ </InputGroup>+ </FormControl_Shadcn_></FormItemLayout>)}}diff --git a/apps/studio/components/interfaces/DiskManagement/fields/DiskSizeField.tsx b/apps/studio/components/interfaces/DiskManagement/fields/DiskSizeField.tsxindex f47263a7909..676fb52f855 100644--- a/apps/studio/components/interfaces/DiskManagement/fields/DiskSizeField.tsx+++ b/apps/studio/components/interfaces/DiskManagement/fields/DiskSizeField.tsx@@ -1,6 +1,3 @@-import { UseFormReturn } from 'react-hook-form'--import { InputVariants } from '@ui/components/shadcn/ui/input'import { useParams } from 'common'import { DocsButton } from 'components/ui/DocsButton'import { useDiskAttributesQuery } from 'data/config/disk-attributes-query'@@ -9,8 +6,20 @@ import dayjs from 'dayjs'import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'import { DOCS_URL, GB } from 'lib/constants'-import { Button, FormControl_Shadcn_, FormField_Shadcn_, Input_Shadcn_, Skeleton, cn } from 'ui'+import { RotateCcw } from 'lucide-react'+import { UseFormReturn } from 'react-hook-form'+import {+ Button,+ FormControl_Shadcn_,+ FormField_Shadcn_,+ InputGroup,+ InputGroupAddon,+ InputGroupButton,+ InputGroupInput,+ InputGroupText,+} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'+import { DiskStorageSchemaType } from '../DiskManagement.schema'import { calculateDiskSizePrice } from '../DiskManagement.utils'import { BillingChangeBadge } from '../ui/BillingChangeBadge'@@ -19,8 +28,6 @@ import { DiskManagementDiskSizeReadReplicas } from '../ui/DiskManagementReadReplimport { DiskSpaceBar } from '../ui/DiskSpaceBar'import { DiskTypeRecommendationSection } from '../ui/DiskTypeRecommendationSection'import FormMessage from '../ui/FormMessage'-import { InputPostTab } from '../ui/InputPostTab'-import { InputResetButton } from '../ui/InputResetButton'type DiskSizeFieldProps = {form: UseFormReturn<DiskStorageSchemaType>@@ -38,11 +45,7 @@ export function DiskSizeField({const { data: org } = useSelectedOrganizationQuery()const { data: project } = useSelectedProjectQuery()- const {- isPending: isLoadingDiskAttributes,- error: diskAttributesError,- isError: isDiskAttributesError,- } = useDiskAttributesQuery(+ const { error: diskAttributesError, isError: isDiskAttributesError } = useDiskAttributesQuery({ projectRef },{ enabled: project && project.cloud_provider !== 'FLY' })@@ -76,15 +79,15 @@ export function DiskSizeField({PLAN_DETAILS?.[planId as keyof typeof PLAN_DETAILS] ?? {}const includedDiskGB = includedDiskGBMeta[watchedStorageType]+ const { defaultValues, dirtyFields, isDirty, errors } = formStateconst diskSizePrice = calculateDiskSizePrice({planId,- oldSize: formState.defaultValues?.totalSize || 0,- oldStorageType: formState.defaultValues?.storageType as DiskType,+ oldSize: defaultValues?.totalSize || 0,+ oldStorageType: defaultValues?.storageType as DiskType,newSize: getValues('totalSize'),newStorageType: getValues('storageType') as DiskType,})- const isAllocatedStorageDirty = !!formState.dirtyFields.totalSizeconst mainDiskUsed = Math.round(((diskUtil?.metrics.fs_used_bytes ?? 0) / GB) * 100) / 100return (@@ -93,49 +96,46 @@ export function DiskSizeField({<FormField_Shadcn_name="totalSize"control={control}- render={({ field }) => (+ render={({ field, fieldState: { isDirty } }) => (<FormItemLayout label="Disk Size" layout="vertical" id={field.name}>- <div className="relative flex gap-2 items-center">- <InputPostTab label="GB">- {isLoadingDiskAttributes ? (- <div- className={cn(- InputVariants({ size: 'small' }),- 'w-32 font-mono rounded-r-none'- )}- >- <Skeleton className="w-10 h-4" />- </div>- ) : (- <FormControl_Shadcn_>- <Input_Shadcn_- type="number"- id={field.name}- {...field}- disabled={disableInput || isError}- className="w-32 font-mono rounded-r-none"- onWheel={(e) => e.currentTarget.blur()}- onChange={(e) => {- setValue('totalSize', e.target.valueAsNumber, {- shouldDirty: true,- shouldValidate: true,- })+ <FormControl_Shadcn_ className="max-w-32">+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>GB</InputGroupText>+ {isDirty ? (+ <InputGroupButton+ htmlType="button"+ type="default"+ size="tiny"+ className="px-2 text-foreground-light"+ onClick={() => {+ resetField('totalSize')trigger('provisionedIOPS')- trigger('throughput')}}- min={includedDiskGB}- />- </FormControl_Shadcn_>- )}- </InputPostTab>- <InputResetButton- isDirty={isAllocatedStorageDirty}- onClick={() => {- resetField('totalSize')- trigger('provisionedIOPS')- }}- />- </div>+ title="Reset"+ >+ <RotateCcw className="h-4 w-4" aria-hidden="true" />+ </InputGroupButton>+ ) : null}+ </InputGroupAddon>+ <InputGroupInput+ type="number"+ id={field.name}+ {...field}+ disabled={disableInput || isError}+ onWheel={(e) => e.currentTarget.blur()}+ onChange={(e) => {+ setValue('totalSize', e.target.valueAsNumber, {+ shouldDirty: true,+ shouldValidate: true,+ })+ trigger('provisionedIOPS')+ trigger('throughput')+ }}+ min={includedDiskGB}+ />+ </InputGroup>+ </FormControl_Shadcn_></FormItemLayout>)}/>@@ -144,11 +144,7 @@ export function DiskSizeField({className="mt-1"beforePrice={Number(diskSizePrice.oldPrice)}afterPrice={Number(diskSizePrice.newPrice)}- show={- formState.isDirty &&- !formState.errors.totalSize &&- diskSizePrice.oldPrice !== diskSizePrice.newPrice- }+ show={isDirty && !errors.totalSize && diskSizePrice.oldPrice !== diskSizePrice.newPrice}/><span className="text-foreground-lighter text-sm">{includedDiskGB > 0 &&@@ -194,11 +190,11 @@ export function DiskSizeField({)}<DiskManagementDiskSizeReadReplicas- isDirty={formState.dirtyFields.totalSize !== undefined}- totalSize={(formState.defaultValues?.totalSize || 0) * 1.25}+ isDirty={dirtyFields.totalSize !== undefined}+ totalSize={(defaultValues?.totalSize || 0) * 1.25}usedSize={mainDiskUsed}newTotalSize={watchedTotalSize * 1.25}- oldStorageType={formState.defaultValues?.storageType as DiskType}+ oldStorageType={defaultValues?.storageType as DiskType}newStorageType={getValues('storageType') as DiskType}/></div>diff --git a/apps/studio/components/interfaces/DiskManagement/fields/IOPSField.tsx b/apps/studio/components/interfaces/DiskManagement/fields/IOPSField.tsxindex 122eb025659..2c7e8f2ce68 100644--- a/apps/studio/components/interfaces/DiskManagement/fields/IOPSField.tsx+++ b/apps/studio/components/interfaces/DiskManagement/fields/IOPSField.tsx@@ -1,10 +1,17 @@-import { UseFormReturn } from 'react-hook-form'-import { InputVariants } from '@ui/components/shadcn/ui/input'import { useParams } from 'common'import { useDiskAttributesQuery } from 'data/config/disk-attributes-query'-import { Button, cn, FormControl_Shadcn_, FormField_Shadcn_, Input_Shadcn_, Skeleton } from 'ui'+import { UseFormReturn } from 'react-hook-form'+import {+ Button,+ FormControl_Shadcn_,+ FormField_Shadcn_,+ InputGroup,+ InputGroupAddon,+ InputGroupInput,+} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'+import { DiskStorageSchemaType } from '../DiskManagement.schema'import {calculateComputeSizeRequiredForIops,@@ -15,8 +22,6 @@ import { BillingChangeBadge } from '../ui/BillingChangeBadge'import { ComputeSizeRecommendationSection } from '../ui/ComputeSizeRecommendationSection'import { DiskType, RESTRICTED_COMPUTE_FOR_IOPS_ON_GP3 } from '../ui/DiskManagement.constants'import { DiskManagementIOPSReadReplicas } from '../ui/DiskManagementReadReplicas'-import FormMessage from '../ui/FormMessage'-import { InputPostTab } from '../ui/InputPostTab'type IOPSFieldProps = {form: UseFormReturn<DiskStorageSchemaType>@@ -100,32 +105,23 @@ export function IOPSField({ form, disableInput }: IOPSFieldProps) {</>}>- <InputPostTab label="IOPS">- {isLoading ? (- <div- className={cn(InputVariants({ size: 'small' }), 'w-32 font-mono rounded-r-none')}- >- <Skeleton className="w-10 h-4" />- </div>- ) : (- <FormControl_Shadcn_>- <Input_Shadcn_- type="number"- className="flex-grow font-mono rounded-r-none max-w-32"- {...field}- value={field.value}- disabled={disableInput || disableIopsInput || isError}- onChange={(e) => {- setValue('provisionedIOPS', e.target.valueAsNumber, {- shouldDirty: true,- shouldValidate: true,- })- }}- />- </FormControl_Shadcn_>- )}- </InputPostTab>- {error && <FormMessage type="error" message={error.message} />}+ <FormControl_Shadcn_ className="max-w-32">+ <InputGroup>+ <InputGroupAddon align="inline-end">IOPS</InputGroupAddon>+ <InputGroupInput+ type="number"+ {...field}+ value={field.value}+ disabled={disableInput || disableIopsInput || isError}+ onChange={(e) => {+ setValue('provisionedIOPS', e.target.valueAsNumber, {+ shouldDirty: true,+ shouldValidate: true,+ })+ }}+ />+ </InputGroup>+ </FormControl_Shadcn_></FormItemLayout>)}}diff --git a/apps/studio/components/interfaces/DiskManagement/fields/ThroughputField.tsx b/apps/studio/components/interfaces/DiskManagement/fields/ThroughputField.tsxindex 474c44b2001..ba887cad1ef 100644--- a/apps/studio/components/interfaces/DiskManagement/fields/ThroughputField.tsx+++ b/apps/studio/components/interfaces/DiskManagement/fields/ThroughputField.tsx@@ -1,12 +1,19 @@-import { AnimatePresence, motion } from 'framer-motion'-import { useEffect } from 'react'-import { UseFormReturn } from 'react-hook-form'-import { InputVariants } from '@ui/components/shadcn/ui/input'import { useParams } from 'common'import { useDiskAttributesQuery } from 'data/config/disk-attributes-query'-import { cn, FormControl_Shadcn_, FormField_Shadcn_, Input_Shadcn_, Skeleton } from 'ui'+import { AnimatePresence, motion } from 'framer-motion'+import { useEffect } from 'react'+import { UseFormReturn } from 'react-hook-form'+import {+ FormControl_Shadcn_,+ FormField_Shadcn_,+ InputGroup,+ InputGroupAddon,+ InputGroupInput,+ InputGroupText,+} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'+import { DiskStorageSchemaType } from '../DiskManagement.schema'import { calculateThroughputPrice } from '../DiskManagement.utils'import { BillingChangeBadge } from '../ui/BillingChangeBadge'@@ -16,8 +23,6 @@ import {RESTRICTED_COMPUTE_FOR_IOPS_ON_GP3,} from '../ui/DiskManagement.constants'import { DiskManagementThroughputReadReplicas } from '../ui/DiskManagementReadReplicas'-import FormMessage from '../ui/FormMessage'-import { InputPostTab } from '../ui/InputPostTab'type ThroughputFieldProps = {form: UseFormReturn<DiskStorageSchemaType>@@ -113,35 +118,25 @@ export function ThroughputField({ form, disableInput }: ThroughputFieldProps) {</>}>- <InputPostTab label="MB/s">- {isLoading ? (- <div- className={cn(- InputVariants({ size: 'small' }),- 'w-32 font-mono rounded-r-none'- )}- >- <Skeleton className="w-10 h-4" />- </div>- ) : (- <FormControl_Shadcn_>- <Input_Shadcn_- type="number"- {...field}- value={field.value}- onChange={(e) => {- setValue('throughput', e.target.valueAsNumber, {- shouldDirty: true,- shouldValidate: true,- })- }}- className="flex-grow font-mono rounded-r-none max-w-32"- disabled={disableInput || disableIopsInput || watchedStorageType === 'io2'}- />- </FormControl_Shadcn_>- )}- </InputPostTab>- {error && <FormMessage type="error" message={error.message} />}+ <FormControl_Shadcn_ className="max-w-32">+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>MB/s</InputGroupText>+ </InputGroupAddon>+ <InputGroupInput+ type="number"+ {...field}+ value={field.value}+ onChange={(e) => {+ setValue('throughput', e.target.valueAsNumber, {+ shouldDirty: true,+ shouldValidate: true,+ })+ }}+ disabled={disableInput || disableIopsInput || watchedStorageType === 'io2'}+ />+ </InputGroup>+ </FormControl_Shadcn_></FormItemLayout>)}/>diff --git a/apps/studio/components/interfaces/DiskManagement/ui/InputPostTab.tsx b/apps/studio/components/interfaces/DiskManagement/ui/InputPostTab.tsxdeleted file mode 100644index a295b3c5efb..00000000000--- a/apps/studio/components/interfaces/DiskManagement/ui/InputPostTab.tsx+++ /dev/null@@ -1,21 +0,0 @@-import { forwardRef, ReactNode } from 'react'--interface InputPostTabProps {- children: ReactNode- label: string-}--export const InputPostTab = forwardRef<HTMLDivElement, InputPostTabProps>(- ({ children, label }, ref) => {- return (- <div ref={ref} className="flex -space-x-px">- {children}- <div className="border border-strong bg-surface-300 rounded-r-md px-3 flex items-center justify-center">- <span className="text-foreground-lighter text-xs font-mono">{label}</span>- </div>- </div>- )- }-)--InputPostTab.displayName = 'InputPostTab'diff --git a/apps/studio/components/interfaces/DiskManagement/ui/InputResetButton.tsx b/apps/studio/components/interfaces/DiskManagement/ui/InputResetButton.tsxdeleted file mode 100644index e73c3c83bc0..00000000000--- a/apps/studio/components/interfaces/DiskManagement/ui/InputResetButton.tsx+++ /dev/null@@ -1,30 +0,0 @@-import { AnimatePresence, motion } from 'framer-motion'-import { RotateCcw } from 'lucide-react'--import { Button } from 'ui'--export function InputResetButton({ isDirty, onClick }: { isDirty: boolean; onClick: () => void }) {- return (- <AnimatePresence initial={false}>- {isDirty && (- <motion.div- key="reset-disksize"- initial={{ opacity: 0, scale: 0.95, x: -2 }}- animate={{ opacity: 1, scale: 1, x: 0 }}- exit={{ opacity: 0, scale: 0.95, x: -2 }}- transition={{ duration: 0.12 }}- >- <Button- htmlType="button"- type="default"- size="small"- className="px-2 text-foreground-light"- onClick={onClick}- >- <RotateCcw className="h-4 w-4" aria-hidden="true" />- </Button>- </motion.div>- )}- </AnimatePresence>- )-}diff --git a/apps/studio/components/interfaces/Organization/GeneralSettings/OrganizationDetailsForm.tsx b/apps/studio/components/interfaces/Organization/GeneralSettings/OrganizationDetailsForm.tsxindex 7f5257ed41b..7a4326e80b5 100644--- a/apps/studio/components/interfaces/Organization/GeneralSettings/OrganizationDetailsForm.tsx+++ b/apps/studio/components/interfaces/Organization/GeneralSettings/OrganizationDetailsForm.tsx@@ -1,18 +1,15 @@import { zodResolver } from '@hookform/resolvers/zod'import { PermissionAction } from '@supabase/shared-types/out/constants'import { useQueryClient } from '@tanstack/react-query'-import { useEffect } from 'react'-import { useForm } from 'react-hook-form'-import { toast } from 'sonner'-import * as z from 'zod'-import { useParams } from 'common'-import CopyButton from 'components/ui/CopyButton'import { FormActions } from 'components/ui/Forms/FormActions'import { useOrganizationUpdateMutation } from 'data/organizations/organization-update-mutation'import { invalidateOrganizationsQuery } from 'data/organizations/organizations-query'import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'+import { useEffect } from 'react'+import { useForm } from 'react-hook-form'+import { toast } from 'sonner'import type { ResponseError } from 'types'import {Card,@@ -21,10 +18,11 @@ import {Form_Shadcn_,FormControl_Shadcn_,FormField_Shadcn_,- Input_Shadcn_ as Input,- PrePostTab,+ Input_Shadcn_,} from 'ui'+import { Input } from 'ui-patterns/DataInputs/Input'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'+import * as z from 'zod'const OrgDetailsSchema = z.object({name: z.string().min(1, 'Organization name is required'),@@ -92,7 +90,10 @@ export const OrganizationDetailsForm = () => {render={({ field }) => (<FormItemLayout label="Organization name" layout="flex-row-reverse"><FormControl_Shadcn_>- <Input {...field} disabled={!canUpdateOrganization || isUpdatingDetails} />+ <Input_Shadcn_+ {...field}+ disabled={!canUpdateOrganization || isUpdatingDetails}+ /></FormControl_Shadcn_></FormItemLayout>)}@@ -100,14 +101,7 @@ export const OrganizationDetailsForm = () => {</CardContent><CardContent><FormItemLayout label="Organization slug" layout="flex-row-reverse">- <PrePostTab- className="w-full [&>div:first-child]:flex-grow [&>div:last-child]:px-1.5"- postTab={- <CopyButton type="text" iconOnly text={selectedOrganization?.slug ?? ''} />- }- >- <Input disabled id="slug" value={selectedOrganization?.slug ?? ''} />- </PrePostTab>+ <Input 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/Realtime/RealtimeSettings.tsx b/apps/studio/components/interfaces/Realtime/RealtimeSettings.tsxindex f235598abe9..9e7e0b367f8 100644--- a/apps/studio/components/interfaces/Realtime/RealtimeSettings.tsx+++ b/apps/studio/components/interfaces/Realtime/RealtimeSettings.tsx@@ -1,11 +1,5 @@import { zodResolver } from '@hookform/resolvers/zod'import { PermissionAction } from '@supabase/shared-types/out/constants'-import Link from 'next/link'-import { useState } from 'react'-import { SubmitHandler, useForm } from 'react-hook-form'-import { toast } from 'sonner'-import * as z from 'zod'-import { useParams } from 'common'import AlertError from 'components/ui/AlertError'import { ToggleSpendCapButton } from 'components/ui/ToggleSpendCapButton'@@ -20,6 +14,10 @@ import {import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'import { useSelectedOrganizationQuery } from 'hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'+import Link from 'next/link'+import { useState } from 'react'+import { SubmitHandler, useForm } from 'react-hook-form'+import { toast } from 'sonner'import {Button,Card,@@ -29,13 +27,16 @@ import {FormControl_Shadcn_,FormField_Shadcn_,FormMessage_Shadcn_,- Input_Shadcn_,- PrePostTab,+ InputGroup,+ InputGroupAddon,+ InputGroupInput,+ InputGroupText,Switch,} from 'ui'import { Admonition } from 'ui-patterns'import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'+import * as z from 'zod'const formId = 'realtime-configuration-form'@@ -275,14 +276,17 @@ export const RealtimeSettings = () => {description="Realtime Authorization uses this database pool to check client access"><FormControl_Shadcn_>- <PrePostTab postTab="connections">- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>connections</InputGroupText>+ </InputGroupAddon>+ <InputGroupInput{...field}type="number"disabled={!canUpdateConfig}value={field.value || ''}/>- </PrePostTab>+ </InputGroup></FormControl_Shadcn_></FormItemLayout>{!!maxConn && field.value > maxConn.maxConnections * 0.5 && (@@ -308,14 +312,17 @@ export const RealtimeSettings = () => {description="Sets maximum number of concurrent clients that can connect to your Realtime service"><FormControl_Shadcn_>- <PrePostTab postTab="clients">- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>clients</InputGroupText>+ </InputGroupAddon>+ <InputGroupInput{...field}type="number"disabled={!canUpdateConfig}value={field.value || ''}/>- </PrePostTab>+ </InputGroup></FormControl_Shadcn_></FormItemLayout>)}@@ -332,14 +339,17 @@ export const RealtimeSettings = () => {description="Sets maximum number of events per second that can be sent to your Realtime service"><FormControl_Shadcn_>- <PrePostTab postTab="events/s">- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>events/s</InputGroupText>+ </InputGroupAddon>+ <InputGroupInput{...field}type="number"disabled={!isUsageBillingEnabled || !canUpdateConfig}value={field.value || ''}/>- </PrePostTab>+ </InputGroup></FormControl_Shadcn_></FormItemLayout>)}@@ -383,14 +393,17 @@ export const RealtimeSettings = () => {description="Sets maximum number of presence events per second that can be sent to your Realtime service"><FormControl_Shadcn_>- <PrePostTab postTab="events/s">- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>events/s</InputGroupText>+ </InputGroupAddon>+ <InputGroupInput{...field}type="number"disabled={!isUsageBillingEnabled || !canUpdateConfig}value={field.value || ''}/>- </PrePostTab>+ </InputGroup></FormControl_Shadcn_></FormItemLayout>)}@@ -434,14 +447,17 @@ export const RealtimeSettings = () => {description="Sets maximum number of payload size in KB that can be sent to your Realtime service"><FormControl_Shadcn_>- <PrePostTab postTab="KB">- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>KB</InputGroupText>+ </InputGroupAddon>+ <InputGroupInput{...field}type="number"disabled={!isUsageBillingEnabled || !canUpdateConfig}value={field.value || ''}/>- </PrePostTab>+ </InputGroup></FormControl_Shadcn_></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Settings/API/PostgrestConfig.tsx b/apps/studio/components/interfaces/Settings/API/PostgrestConfig.tsxindex 89710a7cb06..792790537e5 100644--- a/apps/studio/components/interfaces/Settings/API/PostgrestConfig.tsx+++ b/apps/studio/components/interfaces/Settings/API/PostgrestConfig.tsx@@ -16,8 +16,10 @@ import {FormControl_Shadcn_,FormField_Shadcn_,FormItem_Shadcn_,- Input_Shadcn_,- PrePostTab,+ InputGroup,+ InputGroupAddon,+ InputGroupInput,+ InputGroupText,Skeleton,Switch,useWatch_Shadcn_,@@ -51,8 +53,8 @@ import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'import { useDataApiGrantTogglesEnabled } from '@/hooks/misc/useDataApiGrantTogglesEnabled'import useLatest from '@/hooks/misc/useLatest'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'-import { IS_PLATFORM } from '@/lib/constants'import { INTERNAL_SCHEMAS } from '@/hooks/useProtectedSchemas'+import { IS_PLATFORM } from '@/lib/constants'import { noop } from '@/lib/void'import type { ResponseError } from '@/types'@@ -608,15 +610,18 @@ export const PostgrestConfig = () => {description="The maximum number of rows returned from a view, table, or stored procedure. Limits payload size for accidental or malicious requests."><FormControl_Shadcn_>- <PrePostTab postTab="rows">- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>rows</InputGroupText>+ </InputGroupAddon>+ <InputGroupInputsize="small"disabled={!canUpdatePostgrestConfig}{...field}type="number"onChange={(e) => field.onChange(Number(e.target.value))}/>- </PrePostTab>+ </InputGroup></FormControl_Shadcn_></FormItemLayout></FormItem_Shadcn_>@@ -635,8 +640,11 @@ export const PostgrestConfig = () => {description="Number of maximum connections to keep open in the Data API server's database pool. Unset to let it be configured automatically based on compute size."><FormControl_Shadcn_>- <PrePostTab postTab="connections">- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>connections</InputGroupText>+ </InputGroupAddon>+ <InputGroupInputsize="small"disabled={!canUpdatePostgrestConfig}{...field}@@ -649,7 +657,7 @@ export const PostgrestConfig = () => {}value={field.value === null ? '' : field.value}/>- </PrePostTab>+ </InputGroup></FormControl_Shadcn_></FormItemLayout></FormItem_Shadcn_>diff --git a/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.tsx b/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.tsxindex e147f12d604..09ffb3fc8cf 100644--- a/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.tsx+++ b/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.tsx@@ -1,14 +1,7 @@import { zodResolver } from '@hookform/resolvers/zod'import { PermissionAction } from '@supabase/shared-types/out/constants'-import { capitalize } from 'lodash'-import { Fragment, useEffect } from 'react'-import { SubmitHandler, useForm } from 'react-hook-form'-import { toast } from 'sonner'-import z from 'zod'-import { useParams } from 'common'import AlertError from 'components/ui/AlertError'-import { Button } from 'ui'import { DocsButton } from 'components/ui/DocsButton'import { setValueAsNullableNumber } from 'components/ui/Forms/Form.constants'import { FormActions } from 'components/ui/Forms/FormActions'@@ -22,19 +15,28 @@ import { useCheckEntitlements } from 'hooks/misc/useCheckEntitlements'import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'import { DOCS_URL } from 'lib/constants'+import { capitalize } from 'lodash'+import Link from 'next/link'+import { Fragment, useEffect } from 'react'+import { SubmitHandler, useForm } from 'react-hook-form'+import { toast } from 'sonner'import {+ Alert_Shadcn_,AlertDescription_Shadcn_,AlertTitle_Shadcn_,- Alert_Shadcn_,Badge,- cn,+ Button,+ Form_Shadcn_,FormControl_Shadcn_,FormField_Shadcn_,- Form_Shadcn_,- Input_Shadcn_,- PrePostTab,+ InputGroup,+ InputGroupAddon,+ InputGroupInput,+ InputGroupText,Separator,} from 'ui'+import { Admonition } from 'ui-patterns'+import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import {PageSection,PageSectionAside,@@ -43,11 +45,10 @@ import {PageSectionSummary,PageSectionTitle,} from 'ui-patterns/PageSection'-import { Admonition } from 'ui-patterns'-import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'+import z from 'zod'+import { POOLING_OPTIMIZATIONS } from './ConnectionPooling.constants'-import Link from 'next/link'const formId = 'pooling-configuration-form'@@ -258,8 +259,11 @@ export const ConnectionPooling = () => {className="[&>div]:md:w-1/2 [&>div]:xl:w-2/5 [&>div>div]:w-full [&>div>div>div]:min-w-100"><FormControl_Shadcn_>- <PrePostTab postTab="connections" className="uppercase">- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>connections</InputGroupText>+ </InputGroupAddon>+ <InputGroupInput{...field}type="number"className="w-full"@@ -269,7 +273,7 @@ export const ConnectionPooling = () => {setValueAs: setValueAsNullableNumber,})}/>- </PrePostTab>+ </InputGroup></FormControl_Shadcn_>{!!maxConnData &&(default_pool_size ?? 15) > maxConnData.maxConnections * 0.8 && (@@ -314,8 +318,11 @@ export const ConnectionPooling = () => {}><FormControl_Shadcn_>- <PrePostTab postTab="clients" className="uppercase">- <Input_Shadcn_+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>clients</InputGroupText>+ </InputGroupAddon>+ <InputGroupInput{...field}type="number"className="w-full"@@ -326,7 +333,7 @@ export const ConnectionPooling = () => {setValueAs: setValueAsNullableNumber,})}/>- </PrePostTab>+ </InputGroup></FormControl_Shadcn_></FormItemLayout>)}diff --git a/apps/studio/components/interfaces/Settings/Database/DiskSizeConfigurationModal.tsx b/apps/studio/components/interfaces/Settings/Database/DiskSizeConfigurationModal.tsxindex 2e571c8e878..19498ff0c6a 100644--- a/apps/studio/components/interfaces/Settings/Database/DiskSizeConfigurationModal.tsx+++ b/apps/studio/components/interfaces/Settings/Database/DiskSizeConfigurationModal.tsx@@ -23,9 +23,11 @@ import {FormControl_Shadcn_,FormField_Shadcn_,InfoIcon,- Input_Shadcn_,+ InputGroup,+ InputGroupAddon,+ InputGroupInput,+ InputGroupText,Modal,- PrePostTab,WarningIcon,} from 'ui'import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'@@ -192,16 +194,19 @@ const DiskSizeConfigurationModal = ({layout="vertical"label="New disk size">- <PrePostTab postTab="GB" className="w-full">+ <InputGroup>+ <InputGroupAddon align="inline-end">+ <InputGroupText>GB</InputGroupText>+ </InputGroupAddon><FormControl_Shadcn_>- <Input_Shadcn_+ <InputGroupInput{...field}id="new-disk-size"type="number"onChange={(e) => field.onChange(Number(e.target.value))}/></FormControl_Shadcn_>- </PrePostTab>+ </InputGroup></FormItemLayout>)}/>diff --git a/packages/ui-patterns/src/DataInputs/Input.tsx b/packages/ui-patterns/src/DataInputs/Input.tsxindex 3c98d52308c..4200f05e70c 100644--- a/packages/ui-patterns/src/DataInputs/Input.tsx+++ b/packages/ui-patterns/src/DataInputs/Input.tsx@@ -4,15 +4,21 @@ import React, {ComponentPropsWithoutRef,ElementRef,forwardRef,+ useMemo,useState,} from 'react'-import { Button, cn, copyToClipboard, Input_Shadcn_ } from 'ui'+import {+ Button,+ cn,+ copyToClipboard,+ Input_Shadcn_,+ InputGroup,+ InputGroupAddon,+ InputGroupButton,+ InputGroupInput,+} from 'ui'import styleHandler from 'ui/src/lib/theme/styleHandler'-import InputIconContainer from '../form/Layout/InputIconContainer'--export const HIDDEN_PLACEHOLDER = '**** **** **** ****'-export interface Props extends Omit<ComponentProps<typeof Input_Shadcn_>, 'onCopy'> {copy?: booleanshowCopyOnHover?: boolean@@ -68,21 +74,26 @@ const Input = forwardRef<if (icon) inputClasses.push(__styles.with_icon[size ?? 'small'])return (- <div className={cn('relative group', containerClassName)}>- <Input_Shadcn_+ <InputGroup className={containerClassName}>+ <InputGroupInputref={ref}+ onFocus={(event) => event.target.select()}{...props}size={size}onCopy={onCopy}- value={reveal && hidden ? HIDDEN_PLACEHOLDER : props.value}- disabled={reveal && hidden ? true : props.disabled}+ type={reveal && hidden ? 'password' : props.type}+ disabled={props.disabled}className={cn(...inputClasses, props.className)}+ data-1p-ignore // 1Password+ data-lpignore="true" // LastPass+ data-form-type="other" // Dashlane+ data-bwignore // Bitwarden/>- {icon && <InputIconContainer size={size} icon={icon} className={iconContainerClassName} />}+ {icon && <InputGroupAddon align="inline-start">{icon}</InputGroupAddon>}{copy || actions ? (- <div className={__styles.actions_container}>+ <InputGroupAddon align="inline-end">{copy && !(reveal && hidden) ? (- <Button+ <InputGroupButtonsize="tiny"type="default"className={cn(showCopyOnHover && 'opacity-0 group-hover:opacity-100 transition')}@@ -90,17 +101,17 @@ const Input = forwardRef<onClick={() => _onCopy(props.value)}>{copyLabel}- </Button>+ </InputGroupButton>) : null}{reveal && hidden ? (- <Button size="tiny" type="default" onClick={onReveal}>+ <InputGroupButton size="tiny" type="default" onClick={onReveal}>Reveal- </Button>+ </InputGroupButton>) : null}{actions && actions}- </div>+ </InputGroupAddon>) : null}- </div>+ </InputGroup>)})diff --git a/packages/ui/index.tsx b/packages/ui/index.tsxindex c746f000789..3207955f943 100644--- a/packages/ui/index.tsx+++ b/packages/ui/index.tsx@@ -46,8 +46,6 @@ export * from './src/components/Toggle'export * from './src/components/Form'export * from './src/components/ExpandingTextArea'-export * from './src/components/PrePostTab'-// layoutexport * from './src/components/LoadingLine'@@ -202,6 +200,8 @@ export { TextArea as TextArea_Shadcn_ } from './src/components/shadcn/ui/text-arexport { Label as Label_Shadcn_ } from './src/components/shadcn/ui/label'+export * from './src/components/shadcn/ui/input-group'+export * from './src/components/shadcn/ui/switch'export { Checkbox as Checkbox_Shadcn_ } from './src/components/shadcn/ui/checkbox'diff --git a/packages/ui/src/components/PrePostTab/PrePostTab.tsx b/packages/ui/src/components/PrePostTab/PrePostTab.tsxdeleted file mode 100644index dc85d071375..00000000000--- a/packages/ui/src/components/PrePostTab/PrePostTab.tsx+++ /dev/null@@ -1,37 +0,0 @@-import { forwardRef, HTMLAttributes, PropsWithChildren, ReactNode } from 'react'--import { cn } from '../../lib/utils'--export interface PrePostTabProps extends HTMLAttributes<HTMLDivElement> {- preTab?: ReactNode | string- postTab?: ReactNode | string-}--export const PrePostTab = forwardRef<HTMLDivElement, PropsWithChildren<PrePostTabProps>>(- ({ preTab, postTab, children, className, ...props }, ref) => {- return (- <div ref={ref} {...props} className={cn('flex -space-x-px', className)}>- {preTab && (- <div className="border border-strong bg-surface-300 rounded-l-md px-3 flex items-center justify-center">- <span className="text-foreground-light text-xs font-mono">{preTab}</span>- </div>- )}- <div- className={cn('flex-1', {- '[&_input]:rounded-l-none [&_select]:rounded-l-none [&_textarea]:rounded-l-none':- Boolean(preTab),- '[&_input]:rounded-r-none [&_select]:rounded-r-none [&_textarea]:rounded-r-none':- Boolean(postTab),- })}- >- {children}- </div>- {postTab && (- <div className="border border-strong bg-surface-300 rounded-r-md px-3 flex items-center justify-center">- <span className="text-foreground-light text-xs font-mono">{postTab}</span>- </div>- )}- </div>- )- }-)diff --git a/packages/ui/src/components/PrePostTab/index.tsx b/packages/ui/src/components/PrePostTab/index.tsxdeleted file mode 100644index 89a9935b84a..00000000000--- a/packages/ui/src/components/PrePostTab/index.tsx+++ /dev/null@@ -1,2 +0,0 @@-export { PrePostTab } from './PrePostTab'-export type { PrePostTabProps } from './PrePostTab'diff --git a/packages/ui/src/components/shadcn/ui/input-group.tsx b/packages/ui/src/components/shadcn/ui/input-group.tsxnew file mode 100644index 00000000000..343ad96e295--- /dev/null+++ b/packages/ui/src/components/shadcn/ui/input-group.tsx@@ -0,0 +1,159 @@+import { cva, type VariantProps } from 'class-variance-authority'+import * as React from 'react'++import { cn } from '../../../lib/utils/cn'+import { Button } from '../../Button'+import { Input, type InputProps } from './input'+import { Textarea, type TextareaProps } from './textarea'++function InputGroup({ className, ...props }: React.ComponentProps<'div'>) {+ return (+ <div+ data-slot="input-group"+ role="group"+ className={cn(+ 'group/input-group relative items-center outline-none transition-[color,box-shadow]',+ 'flex h-10 w-full rounded-md border border-control bg-foreground/[.026] py-2 text-sm',+ 'h-9 has-[>textarea]:h-auto',++ // Variants based on alignment.+ 'has-[>[data-align=inline-start]]:[&>input]:pl-2',+ 'has-[>[data-align=inline-end]]:[&>input]:pr-2',+ 'has-[>[data-align=block-end]]:pb-0',+ 'has-[>[data-align=block-start]]:h-auto has-[>[data-align=block-start]]:flex-col has-[>[data-align=block-start]]:[&>input]:pb-3',+ 'has-[>[data-align=block-end]]:h-auto has-[>[data-align=block-end]]:flex-col has-[>[data-align=block-end]]:[&>input]:pt-3',++ // Focus state.+ 'has-[[data-slot=input-group-control]:focus-visible]:outline-none has-[[data-slot=input-group-control]:focus-visible]:ring-2 has-[[data-slot=input-group-control]:focus-visible]:ring-background-control has-[[data-slot=input-group-control]:focus-visible]:ring-offset-2 has-[[data-slot=input-group-control]:focus-visible]:ring-offset-foreground-muted',++ // Error state.+ 'has-[[data-slot][aria-invalid=true]]:ring-destructive/20 has-[[data-slot][aria-invalid=true]]:border-destructive dark:has-[[data-slot][aria-invalid=true]]:ring-destructive/40',++ // Disabled state.+ 'has-[[data-slot=input-group-control]:disabled]:cursor-not-allowed has-[[data-slot=input-group-control]:disabled]:text-foreground-muted',++ // Readonly state.+ 'has-[[data-slot=input-group-control]:read-only]:border-button',+ className+ )}+ {...props}+ />+ )+}++const inputGroupAddonVariants = cva(+ "text-foreground-light flex h-auto cursor-text select-none items-center justify-center gap-2 py-1.5 text-sm group-data-[disabled=true]/input-group:opacity-50 [&>kbd]:rounded-[calc(var(--radius)-5px)] [&>svg:not([class*='size-'])]:size-4",+ {+ variants: {+ align: {+ 'inline-start': 'order-first pl-3 has-[>button]:ml-[-0.45rem] has-[>kbd]:ml-[-0.35rem]',+ 'inline-end': 'order-last pr-3 has-[>button]:mr-[-0.4rem] has-[>kbd]:mr-[-0.35rem]',+ 'block-start':+ '[.border-b]:pb-3 order-first w-full justify-start px-3 pt-3 group-has-[>input]/input-group:pt-2.5',+ 'block-end':+ '[.border-t]:pt-3 order-last w-full justify-start px-3 pb-3 group-has-[>input]/input-group:pb-2.5',+ },+ },+ defaultVariants: {+ align: 'inline-start',+ },+ }+)++function InputGroupAddon({+ className,+ align = 'inline-start',+ ...props+}: React.ComponentProps<'div'> & VariantProps<typeof inputGroupAddonVariants>) {+ return (+ <div+ role="group"+ data-slot="input-group-addon"+ data-align={align}+ className={cn(inputGroupAddonVariants({ align }), className)}+ onClick={(e) => {+ if ((e.target as HTMLElement).closest('button')) {+ return+ }+ e.currentTarget.parentElement?.querySelector('input')?.focus()+ }}+ {...props}+ />+ )+}++const inputGroupButtonVariants = cva('', {+ variants: {+ size: {+ tiny: "h-6 gap-1 rounded-md px-2 has-[>svg]:px-2 [&>svg:not([class*='size-'])]:size-3.5",+ small: 'h-8 gap-1.5 rounded-md px-2.5 has-[>svg]:px-2.5',+ },+ },+ defaultVariants: {+ size: 'tiny',+ },+})++function InputGroupButton({+ className,+ type = 'text',+ size = 'tiny',+ ...props+}: Omit<React.ComponentProps<typeof Button>, 'size'> &+ VariantProps<typeof inputGroupButtonVariants>) {+ return (+ <Button+ type={type}+ size={size}+ className={cn(inputGroupButtonVariants({ size }), className)}+ {...props}+ />+ )+}++function InputGroupText({ className, ...props }: React.ComponentProps<'span'>) {+ return (+ <span+ className={cn(+ "text-muted-foreground flex items-center gap-2 text-sm [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none",+ className+ )}+ {...props}+ />+ )+}++function InputGroupInput({ className, ...props }: InputProps) {+ return (+ <Input+ data-slot="input-group-control"+ className={cn(+ 'flex-1 rounded-none border-0 bg-transparent shadow-none focus-visible:ring-0 focus-visible:ring-offset-0 dark:bg-transparent',+ className+ )}+ {...props}+ />+ )+}++function InputGroupTextarea({ className, ...props }: TextareaProps) {+ return (+ <Textarea+ data-slot="input-group-control"+ className={cn(+ 'flex-1 resize-none rounded-none border-0 bg-transparent py-0 shadow-none focus-visible:ring-0 focus-visible:ring-offset-0 dark:bg-transparent',+ className+ )}+ {...props}+ />+ )+}++export {+ InputGroup,+ InputGroupAddon,+ InputGroupButton,+ InputGroupText,+ InputGroupInput,+ InputGroupTextarea,+}diff --git a/packages/ui/src/components/shadcn/ui/input.tsx b/packages/ui/src/components/shadcn/ui/input.tsxindex bb0630850da..14b016f3709 100644--- a/packages/ui/src/components/shadcn/ui/input.tsx+++ b/packages/ui/src/components/shadcn/ui/input.tsx@@ -12,7 +12,7 @@ export interface InputPropsexport const InputVariants = cva(cn('flex h-10 w-full rounded-md border border-control read-only:border-button bg-foreground/[.026] px-3 py-2 text-sm file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-foreground-muted read-only:text-foreground-light',- 'focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-background-control focus-visible:ring-offset-2 focus-visible:ring-offset-foreground-muted disabled:cursor-not-allowed disabled:text-foreground-muted',+ 'focus:ring-background-control focus:border-control focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-background-control focus-visible:ring-offset-2 focus-visible:ring-offset-foreground-muted disabled:cursor-not-allowed disabled:text-foreground-muted','aria-[] aria-[invalid=true]:bg-destructive-200 aria-[invalid=true]:border-destructive-400 aria-[invalid=true]:focus:border-destructive aria-[invalid=true]:focus-visible:border-destructive'),{diff --git a/packages/ui/src/components/shadcn/ui/textarea.tsx b/packages/ui/src/components/shadcn/ui/textarea.tsxindex 8220dcfe32b..efc65c4111c 100644--- a/packages/ui/src/components/shadcn/ui/textarea.tsx+++ b/packages/ui/src/components/shadcn/ui/textarea.tsx@@ -9,7 +9,7 @@ const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(return (<textareaclassName={cn(- 'flex min-h-[80px] w-full rounded-md border border-control bg-transparent px-3 py-2 text-sm ring-offset-background placeholder:text-foreground-muted focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50',+ 'flex min-h-[80px] w-full rounded-md border border-control bg-foreground/[.026] px-3 py-2 text-sm ring-offset-background placeholder:text-foreground-muted focus:ring-background-control focus:border-control focus-visible:border-control focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-foreground-muted focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50',className)}ref={ref}