Skip to content

fix: update WebsiteDialog form state handling. #251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
izadoesdev merged 2 commits into from
Jan 3, 2026
Merged

fix: update WebsiteDialog form state handling. #251

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
deb9271
fix: update WebsiteDialog form state handling.
sbansal1999 Jan 1, 2026
fd393fd
Add validation messages to website dialog.
sbansal1999 Jan 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions apps/dashboard/components/website-dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
"use client";

import { WEBSITE_NAME_REGEX } from "@databuddy/validation";
import { zodResolver } from "@hookform/resolvers/zod";
import { useEffect } from "react";
import { useForm } from "react-hook-form";
import { type SubmitHandler, useForm } from "react-hook-form";
import { toast } from "sonner";
import { z } from "zod";
import { useOrganizationsContext } from "@/components/providers/organizations-provider";
Expand Down Expand Up @@ -41,7 +42,11 @@ const domainRegex =
const wwwRegex = /^www\./;

const formSchema = z.object({
name: z.string().min(1, "Name is required"),
name: z
.string()
.trim()
.min(1, "Name is required")
.regex(WEBSITE_NAME_REGEX, "Use alphanumeric, spaces, -, _, or ."),
domain: z
.string()
.min(1, "Domain is required")
Expand Down Expand Up @@ -72,6 +77,7 @@ export function WebsiteDialog({

const form = useForm<FormData>({
resolver: zodResolver(formSchema),
mode: "onBlur",
defaultValues: {
name: "",
domain: "",
Expand Down Expand Up @@ -117,8 +123,7 @@ export function WebsiteDialog({
return rpcError?.message || defaultMessage;
};

const handleSubmit = async () => {
const formData = form.getValues();
const handleSubmit: SubmitHandler<FormData> = async (formData) => {
const submissionData: CreateWebsiteData = {
name: formData.name,
domain: formData.domain,
Expand Down Expand Up @@ -154,7 +159,10 @@ export function WebsiteDialog({
const isPending =
createWebsiteMutation.isPending || updateWebsiteMutation.isPending;

const isSubmitDisabled = !(form.formState.isValid && form.formState.isDirty);
// Should not access directly (form.formState.isValid); that doesn't trigger re-render
// https://react-hook-form.com/docs/useform/formstate
const { isValid, isDirty } = form.formState;
const isSubmitDisabled = !(isValid && isDirty);

return (
<FormDialog
Expand Down
Loading