Skip to content

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

chore: update InviteUserModal to use rhf (#44177)

Gildas Garciaa8578384ea5c
diff --git a/apps/studio/components/interfaces/Auth/Users/InviteUserModal.tsx b/apps/studio/components/interfaces/Auth/Users/InviteUserModal.tsx
index 6edd5664f0c..f53f86d7fe4 100644
--- a/apps/studio/components/interfaces/Auth/Users/InviteUserModal.tsx
+++ b/apps/studio/components/interfaces/Auth/Users/InviteUserModal.tsx
@@ -1,19 +1,39 @@
+import { zodResolver } from '@hookform/resolvers/zod'
import { PermissionAction } from '@supabase/shared-types/out/constants'
-import { Mail } from 'lucide-react'
-import { toast } from 'sonner'
-
import { useParams } from 'common'
import { useUserInviteMutation } from 'data/auth/user-invite-mutation'
import { useAsyncCheckPermissions } from 'hooks/misc/useCheckPermissions'
-import { Button, Form, Input, Modal } from 'ui'
+import { SubmitHandler, useForm } from 'react-hook-form'
+import { toast } from 'sonner'
+import {
+ Button,
+ Form_Shadcn_,
+ FormControl_Shadcn_,
+ FormField_Shadcn_,
+ Input_Shadcn_,
+ Modal,
+} from 'ui'
+import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'
+import * as z from 'zod'
export type InviteUserModalProps = {
visible: boolean
setVisible: (visible: boolean) => void
}
+const formSchema = z.object({
+ email: z.string().min(1, 'Please enter a valid email').email('Please enter a valid email'),
+})
+const formId = 'invite-user-form'
+
const InviteUserModal = ({ visible, setVisible }: InviteUserModalProps) => {
const { ref: projectRef } = useParams()
+ const form = useForm<z.infer<typeof formSchema>>({
+ resolver: zodResolver(formSchema),
+ defaultValues: {
+ email: '',
+ },
+ })
const handleToggle = () => setVisible(!visible)
const { mutate: inviteUser, isPending: isInviting } = useUserInviteMutation({
@@ -27,23 +47,16 @@ const InviteUserModal = ({ visible, setVisible }: InviteUserModalProps) => {
'invite_user'
)
- const validate = (values: any) => {
- const errors: any = {}
- const emailValidateRegex =
- /^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/
-
- if (values.email.length === 0) {
- errors.email = 'Please enter a valid email'
- } else if (!emailValidateRegex.test(values.email)) {
- errors.email = `${values.email} is an invalid email`
- }
-
- return errors
- }
-
- const onInviteUser = async (values: any) => {
+ const onInviteUser: SubmitHandler<z.infer<typeof formSchema>> = async (values) => {
if (!projectRef) return console.error('Project ref is required')
- inviteUser({ projectRef, email: values.email })
+ inviteUser(
+ { projectRef, email: values.email },
+ {
+ onSuccess: () => {
+ form.reset()
+ },
+ }
+ )
}
return (
@@ -55,40 +68,36 @@ const InviteUserModal = ({ visible, setVisible }: InviteUserModalProps) => {
header="Invite a new user"
onCancel={handleToggle}
>
- <Form
- validateOnBlur={false}
- initialValues={{ email: '' }}
- validate={validate}
- onSubmit={onInviteUser}
- >
- {() => (
- <>
- <Modal.Content>
- <Input
- id="email"
- className="w-full"
- label="User email"
- icon={<Mail />}
- type="email"
- name="email"
- placeholder="User email"
- />
- </Modal.Content>
+ <Form_Shadcn_ {...form}>
+ <Modal.Content>
+ <form id={formId} onSubmit={form.handleSubmit(onInviteUser)} noValidate>
+ <FormField_Shadcn_
+ control={form.control}
+ name="email"
+ render={({ field }) => (
+ <FormItemLayout layout="vertical" label="User email">
+ <FormControl_Shadcn_ className="relative col-span-6">
+ <Input_Shadcn_ {...field} />
+ </FormControl_Shadcn_>
+ </FormItemLayout>
+ )}
+ />
+ </form>
+ </Modal.Content>
- <Modal.Content>
- <Button
- block
- size="small"
- htmlType="submit"
- loading={isInviting}
- disabled={!canInviteUsers || isInviting}
- >
- Invite user
- </Button>
- </Modal.Content>
- </>
- )}
- </Form>
+ <Modal.Content>
+ <Button
+ form={formId}
+ block
+ size="small"
+ htmlType="submit"
+ loading={isInviting}
+ disabled={!canInviteUsers || isInviting}
+ >
+ Invite user
+ </Button>
+ </Modal.Content>
+ </Form_Shadcn_>
</Modal>
)
}