Files
supabase/apps/studio/components/interfaces/Reports/UpdateModal.tsx
Gildas Garcia 3146650a5a Fix FormItemLayout usages for a11y (#49761)
Follow up of #49637. Usages that impacted tests were fixed in the
previous PR. This PR fixes the other usages so that label are correctly
linked to their inputs.

No visual changes

## How to test

1. Design system: [Form
examples](https://design-system-git-fix-form-item-layout-usages-supabase.vercel.app/design-system/docs/ui-patterns/forms):
moved `FormControl` around the `SelectTrigger` so that the label is
linked to the button (It's actually done like this in the [Select Form
example](https://design-system-git-fix-form-item-layout-usages-supabase.vercel.app/design-system/docs/components/select#form)
and Radix recommend targeting the button too in their
[documentation](https://www.radix-ui.com/primitives/docs/components/select#labelling))
2. [Access
tokens](https://studio-staging-463111oii-supabase.vercel.app/dashboard/account/tokens):
updated usage to fallback on generated ids and fixed the select just
like _1_
3. [New TOTP
factor](https://studio-staging-463111oii-supabase.vercel.app/dashboard/account/security):
updated usage to fallback on generated ids
4. _Studio/Database/Extensions_
(`https://studio-staging-463111oii-supabase.vercel.app/dashboard/project/[PROJECT]/database/extensions`):
updated the extension enabling modal to fallback on generated ids
5. _Studio/Integrations/Vault
(`https://studio-staging-463111oii-supabase.vercel.app/dashboard/project/[PROJECT]/integrations/vault/secrets`):
updated the secret edition modal to fallback on generated ids
6.
_Studio/Observability(`https://studio-staging-463111oii-supabase.vercel.app/dashboard/project/[PROJECT]/observability`):
updated the report creation and edition modals to fallback on generated
ids
7. _Studio/SQL
Editor(`https://studio-staging-463111oii-supabase.vercel.app/dashboard/project/[PROJECT]/sql/new`):
updated the query renaming modal to fallback on generated ids
8.
_Studio/Storage/Analytics(`https://studio-staging-463111oii-supabase.vercel.app/dashboard/project/[PROJECT]/storage/analytics`):
updated the table creation sheet to fallback on generated ids (you must
have a bucket first)
9.
_Studio/Workers(`https://studio-staging-463111oii-supabase.vercel.app/dashboard/project/[PROJECT]/workers`):
updated the worker creation modal to fallback on generated ids (you must
have a bucket first)
10. Updated
[Signup](https://studio-staging-463111oii-supabase.vercel.app/dashboard/sign-up?returnTo=%2Fnew),
[Signin](https://studio-staging-463111oii-supabase.vercel.app/dashboard/sign-in)
and [SSO
Signin](https://studio-staging-463111oii-supabase.vercel.app/dashboard/sign-in-sso)
forms to fallback on generated ids

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

- **Improvements**
- Standardized form field presentation across access tokens,
authentication, reports, integrations, database extensions, SQL editor,
storage, and worker deployment workflows.
- Updated password fields and visibility toggles for more consistent
input behavior.
- Refined token expiration selection, verification code entry, and
dropdown layouts.
- Preserved existing labels, validation, options, and form functionality
while simplifying the interface structure.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
2026-09-01 15:22:55 +02:00

146 lines
4.1 KiB
TypeScript

import { zodResolver } from '@hookform/resolvers/zod'
import { useParams } from 'common'
import { useEffect } from 'react'
import { SubmitHandler, useForm } from 'react-hook-form'
import { toast } from 'sonner'
import {
Button,
Dialog,
DialogContent,
DialogFooter,
DialogHeader,
DialogSection,
DialogSectionSeparator,
DialogTitle,
Form,
FormControl,
FormField,
Input,
Textarea,
} from 'ui'
import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
import * as z from 'zod'
import { ContentOfType } from '@/data/content/content-query'
import { useContentUpsertMutation } from '@/data/content/content-upsert-mutation'
const formSchema = z.object({
name: z.string().min(1, 'Required'),
description: z.string().optional(),
})
type CustomReport = z.infer<typeof formSchema>
export interface UpdateCustomReportProps {
selectedReport?: ContentOfType<'report'>
initialValues: CustomReport
onCancel: () => void
}
export const UpdateCustomReportModal = ({
selectedReport,
initialValues,
onCancel,
}: UpdateCustomReportProps) => {
const { ref } = useParams()
const { mutate: updateReport, isPending: isUpdating } = useContentUpsertMutation({
onSuccess: () => {
toast.success('Successfully updated report')
onCancel()
},
onError: (error) => {
toast.error(`Failed to update report: ${error.message}`)
},
})
const onConfirmUpdateReport: SubmitHandler<CustomReport> = (newVals) => {
if (!ref) return console.error('Project ref is required')
if (!selectedReport) return
if (!selectedReport.id) return
if (!selectedReport.project_id) return
updateReport({
projectRef: ref,
payload: {
...selectedReport,
owner_id: selectedReport.owner_id!,
project_id: selectedReport.project_id,
id: selectedReport.id,
name: newVals.name,
description: newVals.description || '',
},
})
}
const handleCancel = () => {
onCancel()
form.reset()
}
const form = useForm<CustomReport>({
resolver: zodResolver(formSchema),
defaultValues: initialValues,
})
const { formState, reset } = form
const { isDirty } = formState
useEffect(() => {
if (isDirty) return
reset(initialValues)
}, [initialValues, isDirty, reset])
return (
<Dialog open={selectedReport !== undefined} onOpenChange={handleCancel}>
<DialogContent size="small">
<DialogHeader>
<DialogTitle>Update custom report</DialogTitle>
</DialogHeader>
<DialogSectionSeparator />
<Form {...form}>
<form onSubmit={form.handleSubmit(onConfirmUpdateReport)} noValidate>
<DialogSection>
<FormField
control={form.control}
name="name"
render={({ field }) => (
<FormItemLayout layout="vertical" label="Name">
<FormControl>
<Input {...field} />
</FormControl>
</FormItemLayout>
)}
/>
</DialogSection>
<DialogSection>
<FormField
control={form.control}
name="description"
render={({ field }) => (
<FormItemLayout layout="vertical" label="Description">
<FormControl>
<Textarea
{...field}
rows={4}
placeholder="Describe your custom report"
className="resize-none"
/>
</FormControl>
</FormItemLayout>
)}
/>
</DialogSection>
<DialogFooter>
<Button type="reset" variant="default" onClick={handleCancel} disabled={isUpdating}>
Cancel
</Button>
<Button type="submit" loading={isUpdating} disabled={isUpdating || !isDirty}>
Save custom report
</Button>
</DialogFooter>
</form>
</Form>
</DialogContent>
</Dialog>
)
}