Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

fix: invalid react-hook-form usage (#44391)

Gildas Garcia62dbdeede8d3
diff --git a/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.tsx b/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.tsx
index 09ffb3fc8cf..e0189d5085e 100644
--- a/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.tsx
+++ b/apps/studio/components/interfaces/Settings/Database/ConnectionPooling/ConnectionPooling.tsx
@@ -53,8 +53,14 @@ import { POOLING_OPTIMIZATIONS } from './ConnectionPooling.constants'
const formId = 'pooling-configuration-form'
const PoolingConfigurationFormSchema = z.object({
- default_pool_size: z.number().nullable(),
- max_client_conn: z.number().nullable(),
+ default_pool_size: z.preprocess(
+ (val) => (val === '' || val === null || val === undefined ? undefined : val),
+ z.coerce.number().optional()
+ ),
+ max_client_conn: z.preprocess(
+ (val) => (val === '' || val === null || val === undefined ? undefined : val),
+ z.coerce.number().optional()
+ ),
})
/**
@@ -105,7 +111,7 @@ export const ConnectionPooling = () => {
resolver: zodResolver(PoolingConfigurationFormSchema),
defaultValues: {
default_pool_size: undefined,
- max_client_conn: null,
+ max_client_conn: undefined,
},
})
const { default_pool_size } = form.watch()
@@ -267,11 +273,15 @@ export const ConnectionPooling = () => {
{...field}
type="number"
className="w-full"
- value={field.value || ''}
+ value={field.value ?? ''}
placeholder={defaultPoolSize.toString()}
- {...form.register('default_pool_size', {
- setValueAs: setValueAsNullableNumber,
- })}
+ onChange={(event) =>
+ field.onChange(
+ isNaN(event.target.valueAsNumber)
+ ? null
+ : event.target.valueAsNumber
+ )
+ }
/>
</InputGroup>
</FormControl_Shadcn_>
@@ -296,6 +306,7 @@ export const ConnectionPooling = () => {
<FormField_Shadcn_
control={form.control}
+ disabled
name="max_client_conn"
render={({ field }) => (
<FormItemLayout
@@ -326,12 +337,15 @@ export const ConnectionPooling = () => {
{...field}
type="number"
className="w-full"
- value={pgbouncerConfig?.max_client_conn || ''}
- disabled={true}
+ value={pgbouncerConfig?.max_client_conn ?? ''}
placeholder={defaultMaxClientConn.toString()}
- {...form.register('max_client_conn', {
- setValueAs: setValueAsNullableNumber,
- })}
+ onChange={(event) =>
+ field.onChange(
+ isNaN(event.target.valueAsNumber)
+ ? null
+ : event.target.valueAsNumber
+ )
+ }
/>
</InputGroup>
</FormControl_Shadcn_>
diff --git a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/CreateTable/CreateTableSheet.schema.ts b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/CreateTable/CreateTableSheet.schema.ts
index d9aac58c843..05f0edee7ba 100644
--- a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/CreateTable/CreateTableSheet.schema.ts
+++ b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/CreateTable/CreateTableSheet.schema.ts
@@ -1,4 +1,5 @@
import { z } from 'zod'
+
import { NEW_NAMESPACE_MARKER } from './CreateTableSheet.constants'
const getValidRegex = (type: 'namespace' | 'table') =>
@@ -69,6 +70,35 @@ export const createFormSchema = () =>
}
}
+ data.columns.forEach((column, index) => {
+ if (column.type === 'decimal') {
+ if (column.precision == null) {
+ ctx.addIssue({
+ code: z.ZodIssueCode.custom,
+ message: 'Required',
+ path: [`columns.${index}.precision`],
+ })
+ }
+ if (column.scale == null) {
+ ctx.addIssue({
+ code: z.ZodIssueCode.custom,
+ message: 'Required',
+ path: [`columns.${index}.scale`],
+ })
+ }
+ }
+
+ if (column.type === 'fixed') {
+ if (column.length == null) {
+ ctx.addIssue({
+ code: z.ZodIssueCode.custom,
+ message: 'Required',
+ path: [`columns.${index}.length`],
+ })
+ }
+ }
+ })
+
if (data.name) {
const newTableError = validateName({ name: data.name, type: 'table' })
if (newTableError) {
diff --git a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/CreateTable/CreateTableSheet.tsx b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/CreateTable/CreateTableSheet.tsx
index 93e72e74cf5..923a0324488 100644
--- a/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/CreateTable/CreateTableSheet.tsx
+++ b/apps/studio/components/interfaces/Storage/AnalyticsBuckets/AnalyticsBucketDetails/CreateTable/CreateTableSheet.tsx
@@ -18,6 +18,9 @@ import {
FormControl_Shadcn_,
FormField_Shadcn_,
Input_Shadcn_,
+ InputGroup,
+ InputGroupAddon,
+ InputGroupInput,
Select_Shadcn_,
SelectContent_Shadcn_,
SelectItem_Shadcn_,
@@ -298,42 +301,35 @@ export const CreateTableSheet = ({ open, onOpenChange }: CreateTableSheetProps)
{additionalFields.length > 0 && (
<div className="col-span-full flex items-center mt-2">
- <div className="grid grid-cols-2 gap-x-1 w-[85%]">
- {additionalFields.map((x, index) => (
- <div
- key={x.name}
- className="flex items-center"
- style={
- additionalFields.length % 2 === 1 && index % 2 === 0
- ? { gridColumnStart: 2 }
- : undefined
- }
- >
- <div className="font-mono text-xs px-2 border border-r-0 rounded-l h-full flex items-center justify-center">
- {x.name}
- </div>
- <FormField_Shadcn_
- control={form.control}
- key={`columns.${idx}.${x.name}`}
- name={`columns.${idx}.${x.name}` as any}
- render={({ field }) => (
+ <div className="flex items-center justify-end gap-1 w-[85%] ">
+ {additionalFields.map((x) => (
+ <FormField_Shadcn_
+ control={form.control}
+ key={`columns.${idx}.${x.name}`}
+ name={`columns.${idx}.${x.name}` as any}
+ render={({ field }) => (
+ <InputGroup>
+ <InputGroupAddon align="inline-start">
+ {x.name}
+ </InputGroupAddon>
<FormControl_Shadcn_>
- <Input_Shadcn_
+ <InputGroupInput
{...field}
type={x.type === 'number' ? 'number' : 'text'}
disabled={isCreating}
className="h-[34px] rounded-l-none"
- {...form.register(
- `columns.${idx}.${x.name}` as any,
- {
- valueAsNumber: true, // Ensure the value is handled as a number
- }
- )}
+ onChange={(event) =>
+ field.onChange(
+ isNaN(event.target.valueAsNumber)
+ ? null
+ : event.target.valueAsNumber
+ )
+ }
/>
</FormControl_Shadcn_>
- )}
- />
- </div>
+ </InputGroup>
+ )}
+ />
))}
</div>
<div className="w-4 h-[1.6rem] border-r border-b rounded-br mr-3 border-control -translate-y-3" />