Skip to content

Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.

♻️ Infer form types from zod resolver (#2134)

Luke Vellaefc4770bc9c4
diff --git a/apps/web/src/app/[locale]/(auth)/forgot-password/components/forgot-password-form.tsx b/apps/web/src/app/[locale]/(auth)/forgot-password/components/forgot-password-form.tsx
index 0523fc136..a440db11e 100644
--- a/apps/web/src/app/[locale]/(auth)/forgot-password/components/forgot-password-form.tsx
+++ b/apps/web/src/app/[locale]/(auth)/forgot-password/components/forgot-password-form.tsx
@@ -28,14 +28,12 @@ function useForgotPasswordSchema() {
}, [t]);
}
-type ForgotPasswordValues = z.infer<ReturnType<typeof useForgotPasswordSchema>>;
-
export function ForgotPasswordForm() {
const searchParams = useSearchParams();
const emailFromUrl = searchParams?.get("email") || "";
const forgotPasswordSchema = useForgotPasswordSchema();
const [submitted, setSubmitted] = React.useState(false);
- const form = useForm<ForgotPasswordValues>({
+ const form = useForm({
defaultValues: {
email: emailFromUrl,
},
diff --git a/apps/web/src/app/[locale]/(auth)/login/components/login-email-form.tsx b/apps/web/src/app/[locale]/(auth)/login/components/login-email-form.tsx
index c88811643..90262bf92 100644
--- a/apps/web/src/app/[locale]/(auth)/login/components/login-email-form.tsx
+++ b/apps/web/src/app/[locale]/(auth)/login/components/login-email-form.tsx
@@ -36,14 +36,12 @@ function useLoginWithEmailSchema() {
}, [t]);
}
-type LoginWithEmailValues = z.infer<ReturnType<typeof useLoginWithEmailSchema>>;
-
export function LoginWithEmailForm() {
const router = useRouter();
const loginWithEmailSchema = useLoginWithEmailSchema();
const searchParams = useSearchParams();
const [showPasswordField, setShowPasswordField] = React.useState(false);
- const form = useForm<LoginWithEmailValues>({
+ const form = useForm({
defaultValues: {
identifier: "",
password: "",
diff --git a/apps/web/src/app/[locale]/(auth)/login/verify/components/otp-form.tsx b/apps/web/src/app/[locale]/(auth)/login/verify/components/otp-form.tsx
index b600a7b7c..5bb71e6ef 100644
--- a/apps/web/src/app/[locale]/(auth)/login/verify/components/otp-form.tsx
+++ b/apps/web/src/app/[locale]/(auth)/login/verify/components/otp-form.tsx
@@ -24,11 +24,9 @@ const otpFormSchema = z.object({
otp: z.string().length(6),
});
-type OTPFormValues = z.infer<typeof otpFormSchema>;
-
export function OTPForm({ email }: { email: string }) {
const { t } = useTranslation();
- const form = useForm<OTPFormValues>({
+ const form = useForm({
defaultValues: {
otp: "",
},
diff --git a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/duplicate-form.tsx b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/duplicate-form.tsx
index 7ba50b58e..ca99973ff 100644
--- a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/duplicate-form.tsx
+++ b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/duplicate-form.tsx
@@ -17,18 +17,16 @@ const formSchema = z.object({
title: z.string().trim().min(1),
});
-type DuplicateFormData = z.infer<typeof formSchema>;
-
export function DuplicateForm({
name,
onSubmit,
defaultValues,
}: {
name?: string;
- onSubmit?: (data: DuplicateFormData) => void;
- defaultValues?: DuplicateFormData;
+ onSubmit?: (data: z.infer<typeof formSchema>) => void;
+ defaultValues?: z.infer<typeof formSchema>;
}) {
- const form = useForm<DuplicateFormData>({
+ const form = useForm({
resolver: zodResolver(formSchema),
defaultValues,
});
diff --git a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-details/page.tsx b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-details/page.tsx
index 6330520ad..0c4f87b01 100644
--- a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-details/page.tsx
+++ b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-details/page.tsx
@@ -13,7 +13,6 @@ import Link from "next/link";
import { useRouter } from "next/navigation";
import { useForm } from "react-hook-form";
-import type { PollDetailsData } from "@/components/forms/poll-details-form";
import { PollDetailsForm } from "@/components/forms/poll-details-form";
import { useUpdatePollMutation } from "@/components/poll/mutations";
import { usePoll } from "@/components/poll-context";
@@ -32,7 +31,7 @@ const Page = () => {
router.push(pollLink);
};
- const form = useForm<PollDetailsData>({
+ const form = useForm({
defaultValues: {
title: poll.title,
location: poll.location ?? "",
diff --git a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-options/page.tsx b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-options/page.tsx
index c1a20fca3..62eae37cc 100644
--- a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-options/page.tsx
+++ b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-options/page.tsx
@@ -7,7 +7,6 @@ import Link from "next/link";
import { useRouter } from "next/navigation";
import { useForm } from "react-hook-form";
-import type { PollOptionsData } from "@/components/forms";
import PollOptionsForm from "@/components/forms/poll-options-form";
import { useModalContext } from "@/components/modal/modal-provider";
import { useUpdatePollMutation } from "@/components/poll/mutations";
@@ -54,10 +53,10 @@ const Page = () => {
firstDate = firstDate.utc();
}
- const form = useForm<PollOptionsData>({
+ const form = useForm({
defaultValues: {
navigationDate: firstDate.format("YYYY-MM-DD"),
- view: "month",
+ view: "month" as const,
options: poll.options.map((option) => {
let start = dayjs(option.startTime);
if (poll.timeZone) {
@@ -67,7 +66,7 @@ const Page = () => {
}
return option.duration > 0
? {
- type: "timeSlot",
+ type: "timeSlot" as const,
start: start.format("YYYY-MM-DDTHH:mm:ss"),
duration: option.duration,
end: start
@@ -75,7 +74,7 @@ const Page = () => {
.format("YYYY-MM-DDTHH:mm:ss"),
}
: {
- type: "date",
+ type: "date" as const,
date: start.format("YYYY-MM-DD"),
};
}),
diff --git a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-settings/page.tsx b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-settings/page.tsx
index 9840ec8b9..82af0549e 100644
--- a/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-settings/page.tsx
+++ b/apps/web/src/app/[locale]/(optional-space)/poll/[urlId]/edit-settings/page.tsx
@@ -6,7 +6,6 @@ import Link from "next/link";
import { useRouter } from "next/navigation";
import { useForm } from "react-hook-form";
-import type { PollSettingsFormData } from "@/components/forms/poll-settings";
import { PollSettingsForm } from "@/components/forms/poll-settings";
import { useUpdatePollMutation } from "@/components/poll/mutations";
import { Trans } from "@/components/trans";
@@ -25,7 +24,7 @@ const Page = () => {
const update = useUpdatePollMutation();
- const form = useForm<PollSettingsFormData>({
+ const form = useForm({
defaultValues: {
hideParticipants: poll.hideParticipants,
hideScores: poll.hideScores,
diff --git a/apps/web/src/app/[locale]/(space)/settings/api-keys/components/create-api-key-button.tsx b/apps/web/src/app/[locale]/(space)/settings/api-keys/components/create-api-key-button.tsx
index 55de93515..91f14027f 100644
--- a/apps/web/src/app/[locale]/(space)/settings/api-keys/components/create-api-key-button.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/api-keys/components/create-api-key-button.tsx
@@ -36,8 +36,6 @@ const formSchema = z.object({
name: z.string().min(1).max(100),
});
-type FormData = z.infer<typeof formSchema>;
-
export function CreateApiKeyButton() {
const { t } = useTranslation();
const dialog = useDialog();
@@ -47,7 +45,7 @@ export function CreateApiKeyButton() {
const [, copy] = useCopyToClipboard();
const [didCopy, setDidCopy] = React.useState(false);
- const form = useForm<FormData>({
+ const form = useForm({
resolver: zodResolver(formSchema),
defaultValues: {
name: "",
@@ -73,21 +71,6 @@ export function CreateApiKeyButton() {
}
};
- const onSubmit = async (data: FormData) => {
- try {
- const result = await createApiKey.mutateAsync(data);
- setCreatedApiKey(result.apiKey);
- await utils.apiKeys.list.invalidate();
- form.reset();
- } catch {
- toast.error(
- t("createFailed", {
- defaultValue: "Failed to create",
- }),
- );
- }
- };
-
return (
<>
<Button onClick={() => dialog.trigger()}>
@@ -166,7 +149,22 @@ export function CreateApiKeyButton() {
</DialogDescription>
</DialogHeader>
<Form {...form}>
- <form onSubmit={form.handleSubmit(onSubmit)}>
+ <form
+ onSubmit={form.handleSubmit(async (data) => {
+ try {
+ const result = await createApiKey.mutateAsync(data);
+ setCreatedApiKey(result.apiKey);
+ await utils.apiKeys.list.invalidate();
+ form.reset();
+ } catch {
+ toast.error(
+ t("createFailed", {
+ defaultValue: "Failed to create",
+ }),
+ );
+ }
+ })}
+ >
<div className="space-y-4">
<FormField
control={form.control}
diff --git a/apps/web/src/app/[locale]/(space)/settings/general/components/space-settings-form.tsx b/apps/web/src/app/[locale]/(space)/settings/general/components/space-settings-form.tsx
index 3f1b1a994..a7045cc23 100644
--- a/apps/web/src/app/[locale]/(space)/settings/general/components/space-settings-form.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/general/components/space-settings-form.tsx
@@ -38,8 +38,6 @@ const spaceSettingsSchema = z.object({
.max(100, "Space name must be less than 100 characters"),
});
-type SpaceSettingsData = z.infer<typeof spaceSettingsSchema>;
-
interface SpaceSettingsFormProps {
space: SpaceDTO;
disabled?: boolean;
@@ -56,32 +54,13 @@ export function SpaceSettingsForm({
const updateImage = useSafeAction(updateSpaceImageAction);
const removeImage = useSafeAction(removeSpaceImageAction);
- const form = useForm<SpaceSettingsData>({
+ const form = useForm({
resolver: zodResolver(spaceSettingsSchema),
defaultValues: {
name: space.name,
},
});
- const onSubmit = async (data: SpaceSettingsData) => {
- toast.promise(
- updateSpace.executeAsync({
- name: data.name,
- }),
- {
- loading: t("updatingSpace", { defaultValue: "Updating space..." }),
- success: t("spaceUpdatedSuccess", {
- defaultValue: "Space updated successfully",
- }),
- error: t("spaceUpdatedError", {
- defaultValue: "Failed to update space",
- }),
- },
- );
-
- form.reset(data);
- };
-
const handleImageUploadSuccess = async (imageKey: string) => {
await updateImage.executeAsync({ imageKey });
router.refresh();
@@ -94,7 +73,29 @@ export function SpaceSettingsForm({
return (
<Form {...form}>
- <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-6">
+ <form
+ onSubmit={form.handleSubmit(async (data) => {
+ toast.promise(
+ updateSpace.executeAsync({
+ name: data.name,
+ }),
+ {
+ loading: t("updatingSpace", {
+ defaultValue: "Updating space...",
+ }),
+ success: t("spaceUpdatedSuccess", {
+ defaultValue: "Space updated successfully",
+ }),
+ error: t("spaceUpdatedError", {
+ defaultValue: "Failed to update space",
+ }),
+ },
+ );
+
+ form.reset(data);
+ })}
+ className="space-y-6"
+ >
<div>
<FormLabel>
<Trans i18nKey="image" defaults="Image" />
diff --git a/apps/web/src/app/[locale]/(space)/settings/members/components/invite-member-dialog.tsx b/apps/web/src/app/[locale]/(space)/settings/members/components/invite-member-dialog.tsx
index f0784275d..b3f238693 100644
--- a/apps/web/src/app/[locale]/(space)/settings/members/components/invite-member-dialog.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/members/components/invite-member-dialog.tsx
@@ -59,10 +59,10 @@ export function InviteMemberForm({ onSuccess }: { onSuccess?: () => void }) {
const { t } = useTranslation();
const formSchema = useInviteMemberFormSchema();
- const form = useForm<z.infer<typeof formSchema>>({
+ const form = useForm({
defaultValues: {
email: "",
- role: "member",
+ role: "member" as const,
},
resolver: zodResolver(formSchema),
});
diff --git a/apps/web/src/app/[locale]/(space)/settings/preferences/components/date-time-preferences.tsx b/apps/web/src/app/[locale]/(space)/settings/preferences/components/date-time-preferences.tsx
index 48f6534a2..b4bc8fb32 100644
--- a/apps/web/src/app/[locale]/(space)/settings/preferences/components/date-time-preferences.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/preferences/components/date-time-preferences.tsx
@@ -30,13 +30,11 @@ const formSchema = z.object({
weekStart: z.number().min(0).max(6),
});
-type FormData = z.infer<typeof formSchema>;
-
const DateTimePreferencesForm = () => {
const { timeFormat, weekStart, timeZone } = useDayjs();
const { updatePreferences } = usePreferences();
- const form = useForm<FormData>({
+ const form = useForm({
resolver: zodResolver(formSchema),
defaultValues: {
timeFormat,
diff --git a/apps/web/src/app/[locale]/(space)/settings/preferences/components/language-preference.tsx b/apps/web/src/app/[locale]/(space)/settings/preferences/components/language-preference.tsx
index d9ede6f94..6e2d2b51b 100644
--- a/apps/web/src/app/[locale]/(space)/settings/preferences/components/language-preference.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/preferences/components/language-preference.tsx
@@ -22,12 +22,10 @@ const formSchema = z.object({
language: z.string(),
});
-type FormData = z.infer<typeof formSchema>;
-
export const LanguagePreference = () => {
const { i18n } = useTranslation();
const router = useRouter();
- const form = useForm<FormData>({
+ const form = useForm({
defaultValues: {
language: i18n.language,
},
diff --git a/apps/web/src/app/[locale]/(space)/settings/profile/profile-email-address.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/profile-email-address.tsx
index 21232082c..87b1fdbec 100644
--- a/apps/web/src/app/[locale]/(space)/settings/profile/profile-email-address.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/profile/profile-email-address.tsx
@@ -25,11 +25,9 @@ const emailChangeFormData = z.object({
email: z.email(),
});
-type EmailChangeFormData = z.infer<typeof emailChangeFormData>;
-
export const ProfileEmailAddress = ({ email }: { email: string }) => {
const requestEmailChange = trpc.user.requestEmailChange.useMutation();
- const form = useForm<EmailChangeFormData>({
+ const form = useForm({
defaultValues: {
email,
},
diff --git a/apps/web/src/app/[locale]/(space)/settings/profile/profile-settings.tsx b/apps/web/src/app/[locale]/(space)/settings/profile/profile-settings.tsx
index c22e929ea..9aae4b894 100644
--- a/apps/web/src/app/[locale]/(space)/settings/profile/profile-settings.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/profile/profile-settings.tsx
@@ -23,8 +23,6 @@ const profileSettingsFormData = z.object({
name: z.string().min(1).max(100),
});
-type ProfileSettingsFormData = z.infer<typeof profileSettingsFormData>;
-
export const ProfileSettings = ({
name,
image,
@@ -34,7 +32,7 @@ export const ProfileSettings = ({
}) => {
const changeName = trpc.user.changeName.useMutation();
const router = useRouter();
- const form = useForm<ProfileSettingsFormData>({
+ const form = useForm({
defaultValues: {
name,
},
diff --git a/apps/web/src/app/[locale]/(space)/settings/security/components/change-password-form.tsx b/apps/web/src/app/[locale]/(space)/settings/security/components/change-password-form.tsx
index dabfb39e0..1b204682a 100644
--- a/apps/web/src/app/[locale]/(space)/settings/security/components/change-password-form.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/security/components/change-password-form.tsx
@@ -41,11 +41,9 @@ function useChangePasswordSchema() {
});
}
-type ChangePasswordValues = z.infer<ReturnType<typeof useChangePasswordSchema>>;
-
export function ChangePasswordForm() {
const changePasswordSchema = useChangePasswordSchema();
- const form = useForm<ChangePasswordValues>({
+ const form = useForm({
defaultValues: {
currentPassword: "",
newPassword: "",
@@ -55,42 +53,42 @@ export function ChangePasswordForm() {
const { handleSubmit, formState } = form;
const { t } = useTranslation();
- const onSubmit = async (data: ChangePasswordValues) => {
- const res = await authClient.changePassword({
- currentPassword: data.currentPassword,
- newPassword: data.newPassword,
- revokeOtherSessions: true,
- });
-
- if (res.error) {
- switch (res.error.code) {
- case "INVALID_PASSWORD":
- form.setError("currentPassword", {
- message: t("passwordIncorrect", {
- defaultValue: "Current password is incorrect",
- }),
- });
- break;
- default:
- form.setError("root", {
- message: res.error.message,
+ return (
+ <Form {...form}>
+ <form
+ onSubmit={handleSubmit(async (data) => {
+ const res = await authClient.changePassword({
+ currentPassword: data.currentPassword,
+ newPassword: data.newPassword,
+ revokeOtherSessions: true,
});
- break;
- }
- return;
- }
- form.reset();
- toast.success(
- t("passwordChangedSuccess", {
- defaultValue: "Your password has been changed successfully",
- }),
- );
- };
+ if (res.error) {
+ switch (res.error.code) {
+ case "INVALID_PASSWORD":
+ form.setError("currentPassword", {
+ message: t("passwordIncorrect", {
+ defaultValue: "Current password is incorrect",
+ }),
+ });
+ break;
+ default:
+ form.setError("root", {
+ message: res.error.message,
+ });
+ break;
+ }
+ return;
+ }
- return (
- <Form {...form}>
- <form onSubmit={handleSubmit(onSubmit)}>
+ form.reset();
+ toast.success(
+ t("passwordChangedSuccess", {
+ defaultValue: "Your password has been changed successfully",
+ }),
+ );
+ })}
+ >
{form.formState.errors.root?.message && (
<FormMessage>{form.formState.errors.root.message}</FormMessage>
)}
diff --git a/apps/web/src/app/[locale]/(space)/settings/spaces/components/leave-space-dialog.tsx b/apps/web/src/app/[locale]/(space)/settings/spaces/components/leave-space-dialog.tsx
index a3447ff4c..f6f8dbabb 100644
--- a/apps/web/src/app/[locale]/(space)/settings/spaces/components/leave-space-dialog.tsx
+++ b/apps/web/src/app/[locale]/(space)/settings/spaces/components/leave-space-dialog.tsx
@@ -56,7 +56,7 @@ export function LeaveSpaceDialog({
[spaceName, t],
);
- const form = useForm<z.infer<typeof formSchema>>({
+ const form = useForm({
resolver: zodResolver(formSchema),
defaultValues: { spaceName: "" },
});
diff --git a/apps/web/src/components/new-participant-modal.tsx b/apps/web/src/components/new-participant-modal.tsx
index 3f748c088..cc3a5cae4 100644
--- a/apps/web/src/components/new-participant-modal.tsx
+++ b/apps/web/src/components/new-participant-modal.tsx
@@ -37,8 +37,6 @@ const optionalEmailSchema = z.object({
const schema = z.union([requiredEmailSchema, optionalEmailSchema]);
-type NewParticipantFormData = z.infer<typeof schema>;
-
interface NewParticipantModalProps {
votes: { optionId: string; type: VoteType }[];
onSubmit?: (data: { id: string }) => void;
@@ -96,7 +94,7 @@ export const NewParticipantForm = (props: NewParticipantModalProps) => {
const { timezone } = useTimezone();
const { user, createGuestIfNeeded } = useUser();
const isLoggedIn = user && !user.isGuest;
- const form = useForm<NewParticipantFormData>({
+ const form = useForm({
resolver: zodResolver(schema),
defaultValues: {
requireEmail: isEmailRequired,
diff --git a/apps/web/src/components/participant-dropdown.tsx b/apps/web/src/components/participant-dropdown.tsx
index e63c0260c..a4fc13505 100644
--- a/apps/web/src/components/participant-dropdown.tsx
+++ b/apps/web/src/components/participant-dropdown.tsx
@@ -206,7 +206,7 @@ const ChangeNameModal = (props: {
});
},
});
- const form = useForm<ChangeNameForm>({
+ const form = useForm({
defaultValues: {
name: props.oldName,
},
diff --git a/apps/web/src/components/poll/manage-poll/finalize-poll-dialog.tsx b/apps/web/src/components/poll/manage-poll/finalize-poll-dialog.tsx
index d97d6e6ee..10bea1559 100644
--- a/apps/web/src/components/poll/manage-poll/finalize-poll-dialog.tsx
+++ b/apps/web/src/components/poll/manage-poll/finalize-poll-dialog.tsx
@@ -114,10 +114,10 @@ export const FinalizePollForm = ({
return { ...option, votes: scoreByOptionId[option.id] };
});
- const form = useForm<FinalizeFormData>({
+ const form = useForm({
defaultValues: {
selectedOptionId: options[0].id,
- notify: "all",
+ notify: "all" as const,
},
resolver: zodResolver(formSchema),
});
diff --git a/apps/web/src/features/feedback/components/feedback-dialog.tsx b/apps/web/src/features/feedback/components/feedback-dialog.tsx
index 064d14fbd..0d4ef6a8b 100644
--- a/apps/web/src/features/feedback/components/feedback-dialog.tsx
+++ b/apps/web/src/features/feedback/components/feedback-dialog.tsx
@@ -20,12 +20,11 @@ import { Trans } from "@/components/trans";
import { useSafeAction } from "@/lib/safe-action/client";
import { isSelfHosted } from "@/utils/constants";
import { submitFeedbackAction } from "../actions";
-import type { Feedback } from "../schema";
import { feedbackSchema } from "../schema";
export function FeedbackDialog(props: DialogProps) {
const submitFeedback = useSafeAction(submitFeedbackAction);
- const form = useForm<Feedback>({
+ const form = useForm({
resolver: zodResolver(feedbackSchema),
});
diff --git a/apps/web/src/features/licensing/components/license-key-form.tsx b/apps/web/src/features/licensing/components/license-key-form.tsx
index 8fb1b79cf..9e65e04c6 100644
--- a/apps/web/src/features/licensing/components/license-key-form.tsx
+++ b/apps/web/src/features/licensing/components/license-key-form.tsx
@@ -26,12 +26,10 @@ const formSchema = z.object({
}),
});
-type LicenseKeyFormValues = z.infer<typeof formSchema>;
-
export function LicenseKeyForm() {
const { t } = useTranslation();
const router = useRouter();
- const form = useForm<LicenseKeyFormValues>({
+ const form = useForm({
defaultValues: {
licenseKey: "",
},
@@ -40,32 +38,34 @@ export function LicenseKeyForm() {
const validateLicenseKey = useSafeAction(validateLicenseKeyAction);
- const onSubmit = async (data: LicenseKeyFormValues) => {
- try {
- const result = await validateLicenseKey.executeAsync({
- key: data.licenseKey,
- });
-
- if (!result.data) {
- form.setError("licenseKey", {
- message: t("licenseKeyErrorInvalidLicenseKey", {
- defaultValue: "Invalid license key",
- }),
- });
- }
- } catch (_error) {
- form.setError("licenseKey", {
- message: t("licenseKeyGenericError", {
- defaultValue: "An error occurred while validating the license key",
- }),
- });
- }
- router.refresh();
- };
-
return (
<Form {...form}>
- <form className="space-y-4" onSubmit={form.handleSubmit(onSubmit)}>
+ <form
+ className="space-y-4"
+ onSubmit={form.handleSubmit(async (data) => {
+ try {
+ const result = await validateLicenseKey.executeAsync({
+ key: data.licenseKey,
+ });
+
+ if (!result.data) {
+ form.setError("licenseKey", {
+ message: t("licenseKeyErrorInvalidLicenseKey", {
+ defaultValue: "Invalid license key",
+ }),
+ });
+ }
+ } catch (_error) {
+ form.setError("licenseKey", {
+ message: t("licenseKeyGenericError", {
+ defaultValue:
+ "An error occurred while validating the license key",
+ }),
+ });
+ }
+ router.refresh();
+ })}
+ >
<FormField
name="licenseKey"
render={({ field }) => {
diff --git a/apps/web/src/features/setup/components/create-space-form.tsx b/apps/web/src/features/setup/components/create-space-form.tsx
index b685ef4ef..b973213b3 100644
--- a/apps/web/src/features/setup/components/create-space-form.tsx
+++ b/apps/web/src/features/setup/components/create-space-form.tsx
@@ -24,13 +24,11 @@ const createSpaceFormSchema = z.object({
name: z.string().min(1).max(100),
});
-type CreateSpaceFormValues = z.infer<typeof createSpaceFormSchema>;
-
export function CreateSpaceForm() {
const { t } = useTranslation();
const router = useRouter();
- const form = useForm<CreateSpaceFormValues>({
+ const form = useForm({
resolver: zodResolver(createSpaceFormSchema),
defaultValues: {
name: t("personal", { defaultValue: "Personal" }),
diff --git a/apps/web/src/features/space/components/create-space-dialog.tsx b/apps/web/src/features/space/components/create-space-dialog.tsx
index 5e9a2a258..a0cc35525 100644
--- a/apps/web/src/features/space/components/create-space-dialog.tsx
+++ b/apps/web/src/features/space/components/create-space-dialog.tsx
@@ -31,12 +31,10 @@ const createSpaceFormSchema = z.object({
name: z.string().min(1).max(100),
});
-type CreateSpaceFormValues = z.infer<typeof createSpaceFormSchema>;
-
export function CreateSpaceDialog(props: DialogProps) {
const { t } = useTranslation();
- const form = useForm<CreateSpaceFormValues>({
+ const form = useForm({
resolver: zodResolver(createSpaceFormSchema),
defaultValues: {
name: "",