From 59153573d8a5d368adfe41b0f5cebc4d6d44a9f3 Mon Sep 17 00:00:00 2001 From: Innei Date: Thu, 1 Aug 2024 13:45:27 +0800 Subject: [PATCH] fix: invitation page error display area Signed-off-by: Innei --- .../src/pages/(external)/invitation.tsx | 13 +++++++++--- src/renderer/src/queries/invitations.ts | 21 +++++++++++-------- src/renderer/src/queries/types.d.ts | 6 ++++++ 3 files changed, 28 insertions(+), 12 deletions(-) create mode 100644 src/renderer/src/queries/types.d.ts diff --git a/src/renderer/src/pages/(external)/invitation.tsx b/src/renderer/src/pages/(external)/invitation.tsx index 735d1784a..fba106bf7 100644 --- a/src/renderer/src/pages/(external)/invitation.tsx +++ b/src/renderer/src/pages/(external)/invitation.tsx @@ -10,6 +10,7 @@ import { FormMessage, } from "@renderer/components/ui/form" import { Input } from "@renderer/components/ui/input" +import { getFetchErrorMessage } from "@renderer/lib/api-fetch" import { useInvitationMutation } from "@renderer/queries/invitations" import { useEffect } from "react" import { useForm } from "react-hook-form" @@ -25,7 +26,12 @@ export function Component() { const form = useForm>({ resolver: zodResolver(formSchema), }) - const invitationMutation = useInvitationMutation() + const invitationMutation = useInvitationMutation({ + onError(error) { + const message = getFetchErrorMessage(error) + form.setError("code", { message }) + }, + }) function onSubmit(values: z.infer) { invitationMutation.mutate(values.code) @@ -46,7 +52,6 @@ export function Component() { className="w-[512px] max-w-full space-y-8" > ( @@ -55,7 +60,9 @@ export function Component() { - +
+ +
)} /> diff --git a/src/renderer/src/queries/invitations.ts b/src/renderer/src/queries/invitations.ts index a73b5c005..b5379a1bb 100644 --- a/src/renderer/src/queries/invitations.ts +++ b/src/renderer/src/queries/invitations.ts @@ -1,11 +1,14 @@ -import { apiClient, getFetchErrorMessage } from "@renderer/lib/api-fetch" +import { apiClient } from "@renderer/lib/api-fetch" import { useMutation } from "@tanstack/react-query" -import { toast } from "sonner" -export const useInvitationMutation = () => useMutation({ - mutationFn: (code: string) => apiClient.invitations.use.$post({ json: { code } }), - onSuccess() {}, - async onError(err) { - toast.error(await getFetchErrorMessage(err)) - }, -}) +import type { MutationBaseProps } from "./types" + +export const useInvitationMutation = ({ onError }: MutationBaseProps = {}) => + useMutation({ + mutationFn: (code: string) => + apiClient.invitations.use.$post({ json: { code } }), + + onError: (error) => { + onError?.(error) + }, + }) diff --git a/src/renderer/src/queries/types.d.ts b/src/renderer/src/queries/types.d.ts new file mode 100644 index 000000000..ad9367aab --- /dev/null +++ b/src/renderer/src/queries/types.d.ts @@ -0,0 +1,6 @@ +export interface MutationBaseProps { + onSuccess?: () => void + onError?: (error: Error) => void +} + +export {}