Files
supabase/apps/studio/components/interfaces/DiskManagement/fields/IOPSField.tsx
T
Gildas GarciaandIvan Vasilov d95fdfd566 fix: input-group don't have the proper validation attributes (#44703)
## Problem

The input groups components introduced in #44282 don't have the
validation attributes when invalid. This hurts accessibility and also
break the design:
<img width="1730" height="324" alt="image"
src="https://github.com/user-attachments/assets/a3fb8d86-f3a8-46bb-aa53-d0599c11f056"
/>

## Solution

This is because the wrapper `<FormControl_Shadcn_>` passes the
validation props to its direct child.
The solution is to avoid applying them on the `<InputGroup>` and to
apply them manually on the inputs.

I also fixed a small accessibility issue by moving the addon texts after
the input so that screen readers announce them in the correct order. No
visual change for this

<img width="587" height="158" alt="image"
src="https://github.com/user-attachments/assets/1f8858ea-6659-45f9-964e-8c43a7fe14ba"
/>


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

* **Style**
* Unified numeric input layout by moving unit labels/suffixes (e.g.,
"seconds", "GB", "%", "connections", "digits", "IOPS", "MB/s", "rows")
to appear after their inputs for a consistent, predictable form
appearance.

* **Accessibility**
* Form controls now expose IDs and ARIA attributes from form context
when available, improving screen-reader descriptions and error
association.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->

---------

Co-authored-by: Ivan Vasilov <vasilov.ivan@gmail.com>
2026-04-10 11:45:30 +10:00

131 lines
4.9 KiB
TypeScript

import { InputVariants } from '@ui/components/shadcn/ui/input'
import { useParams } from 'common'
import { UseFormReturn } from 'react-hook-form'
import {
Button,
FormControl_Shadcn_,
FormField_Shadcn_,
FormInputGroupInput,
InputGroup,
InputGroupAddon,
} from 'ui'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
import { DiskStorageSchemaType } from '../DiskManagement.schema'
import {
calculateComputeSizeRequiredForIops,
calculateIOPSPrice,
mapAddOnVariantIdToComputeSize,
} from '../DiskManagement.utils'
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 { useDiskAttributesQuery } from '@/data/config/disk-attributes-query'
type IOPSFieldProps = {
form: UseFormReturn<DiskStorageSchemaType>
disableInput: boolean
}
export function IOPSField({ form, disableInput }: IOPSFieldProps) {
const { ref: projectRef } = useParams()
const { control, formState, setValue, trigger, getValues, watch } = form
const watchedStorageType = watch('storageType')
const watchedComputeSize = watch('computeSize')
const watchedIOPS = watch('provisionedIOPS') ?? 0
const { isPending: isLoading, error, isError } = useDiskAttributesQuery({ projectRef })
const iopsPrice = calculateIOPSPrice({
oldStorageType: formState.defaultValues?.storageType as DiskType,
oldProvisionedIOPS: formState.defaultValues?.provisionedIOPS || 0,
newStorageType: getValues('storageType') as DiskType,
newProvisionedIOPS: getValues('provisionedIOPS'),
})
const disableIopsInput =
RESTRICTED_COMPUTE_FOR_IOPS_ON_GP3.includes(watchedComputeSize) && watchedStorageType === 'gp3'
return (
<FormField_Shadcn_
control={control}
name="provisionedIOPS"
render={({ field }) => {
const reccomendedComputeSize = calculateComputeSizeRequiredForIops(watchedIOPS)
return (
<FormItemLayout
layout="horizontal"
label="IOPS"
id={field.name}
description={
<span className="flex flex-col gap-y-2">
<p>Use higher IOPS for high-throughput apps.</p>
<ComputeSizeRecommendationSection
form={form}
actions={
<Button
type="default"
onClick={() => {
setValue('computeSize', reccomendedComputeSize ?? 'ci_nano')
trigger('provisionedIOPS')
}}
>
Update to {mapAddOnVariantIdToComputeSize(reccomendedComputeSize)}
</Button>
}
/>
{!formState.errors.provisionedIOPS && (
<DiskManagementIOPSReadReplicas
isDirty={formState.dirtyFields.provisionedIOPS !== undefined}
oldIOPS={formState.defaultValues?.provisionedIOPS ?? 0}
newIOPS={field.value}
oldStorageType={formState.defaultValues?.storageType as DiskType}
newStorageType={getValues('storageType') as DiskType}
/>
)}
</span>
}
labelOptional={
<>
<BillingChangeBadge
show={
(watchedStorageType !== formState.defaultValues?.storageType ||
(watchedStorageType === 'gp3' &&
field.value !== formState.defaultValues?.provisionedIOPS)) &&
!formState.errors.provisionedIOPS &&
!disableIopsInput
}
beforePrice={Number(iopsPrice.oldPrice)}
afterPrice={Number(iopsPrice.newPrice)}
className="mb-2"
/>
<p className="text-foreground-lighter">Input/output operations per second.</p>
</>
}
>
<FormControl_Shadcn_ className="max-w-32">
<InputGroup>
<FormInputGroupInput
type="number"
{...field}
value={field.value}
disabled={disableInput || disableIopsInput || isError}
onChange={(e) => {
setValue('provisionedIOPS', e.target.valueAsNumber, {
shouldDirty: true,
shouldValidate: true,
})
}}
/>
<InputGroupAddon align="inline-end">IOPS</InputGroupAddon>
</InputGroup>
</FormControl_Shadcn_>
</FormItemLayout>
)
}}
/>
)
}