Skip to content

Fully autonomous AI Agents system capable of performing complex penetration testing tasks

feat(forms): silent-until-submit validation convention via useAppForm

Sergey Kozyrenkod31c73d35a84
diff --git a/frontend/src/components/shared/markdown-editor/markdown-editor-field.tsx b/frontend/src/components/shared/markdown-editor/markdown-editor-field.tsx
index e9c79a18..739bcd1a 100644
--- a/frontend/src/components/shared/markdown-editor/markdown-editor-field.tsx
+++ b/frontend/src/components/shared/markdown-editor/markdown-editor-field.tsx
@@ -86,7 +86,7 @@ export function MarkdownEditorField({
aria-invalid={ariaInvalid}
autoSize={false}
// Raw config is applied LAST so a consumer `className` can't override the byte-exact source styling.
- className={cn(className, 'resize-none font-mono text-sm')}
+ className={cn(className, 'aria-invalid:border-destructive resize-none font-mono text-sm')}
disabled={disabled}
id={id}
onBlur={onBlur}
diff --git a/frontend/src/components/shared/markdown-editor/markdown-editor-styles.ts b/frontend/src/components/shared/markdown-editor/markdown-editor-styles.ts
index 4fabe9cb..29a7d2ce 100644
--- a/frontend/src/components/shared/markdown-editor/markdown-editor-styles.ts
+++ b/frontend/src/components/shared/markdown-editor/markdown-editor-styles.ts
@@ -1,4 +1,4 @@
// Shell classes for the editor box. Kept in this tiny leaf module (no tiptap import) so MarkdownEditorField's
// lazy-load fallback can wear the same box as the mounted editor without pulling the tiptap chunk eagerly.
export const MARKDOWN_EDITOR_WRAPPER_CLASS =
- 'border-input dark:bg-input/30 group/markdown-editor flex w-full flex-col overflow-hidden rounded-md border shadow-2xs outline-hidden transition-[color,box-shadow]';
+ 'border-input dark:bg-input/30 group/markdown-editor flex w-full flex-col overflow-hidden rounded-md border shadow-2xs outline-hidden transition-[color,box-shadow] has-[[aria-invalid=true]]:border-destructive';
diff --git a/frontend/src/features/flows/files/flow-files-promote-dialog.tsx b/frontend/src/features/flows/files/flow-files-promote-dialog.tsx
index cd4e336d..be246349 100644
--- a/frontend/src/features/flows/files/flow-files-promote-dialog.tsx
+++ b/frontend/src/features/flows/files/flow-files-promote-dialog.tsx
@@ -1,7 +1,5 @@
-import { zodResolver } from '@hookform/resolvers/zod';
import { BookmarkPlus } from 'lucide-react';
import { useEffect, useMemo } from 'react';
-import { useForm } from 'react-hook-form';
import type { FileNode } from '@/components/shared/file-manager';
import type { OverwriteConflict } from '@/components/shared/overwrite';
@@ -11,6 +9,7 @@ import { Button } from '@/components/ui/button';
import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog';
import { Form, FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage } from '@/components/ui/form';
import { Input } from '@/components/ui/input';
+import { useAppForm } from '@/hooks/use-app-form';
import { useResources } from '@/providers/resources-provider';
import { stripFlowRootPrefix } from './flow-files-utils';
@@ -147,10 +146,9 @@ function FlowFilesPromoteDialogForm({ files, flowId, onClose }: FlowFilesPromote
return buildSingleDefaultDestination(files[0]);
}, [files, isMulti]);
- const form = useForm<FlowFilesPromoteFormValues>({
+ const form = useAppForm<FlowFilesPromoteFormValues>({
defaultValues: { destination: defaultDestination },
- mode: 'onChange',
- resolver: zodResolver(flowFilesPromoteFormSchema),
+ schema: flowFilesPromoteFormSchema,
});
useEffect(() => {
@@ -183,7 +181,9 @@ function FlowFilesPromoteDialogForm({ files, flowId, onClose }: FlowFilesPromote
await overwriteAction.forceExecute(buildPromotePlan(files, values));
});
- const isSubmitDisabled = !form.formState.isValid;
+ // Convention: stay enabled until the first submit, then reflect validity (so an invalid submit surfaces
+ // errors instead of a silently-dead button). Mirrors FormSubmitButton's requireValid gate.
+ const isSubmitDisabled = form.formState.isSubmitted && !form.formState.isValid;
const titleText = isMulti ? `Save ${files.length} items as resources` : 'Save as resource';
const overwriteCtaLabel = isMulti ? `Save ${files.length} with overwrite` : 'Save with overwrite';
diff --git a/frontend/src/features/knowledges/knowledge-form-controls.tsx b/frontend/src/features/knowledges/knowledge-form-controls.tsx
index 49e07939..da887c5b 100644
--- a/frontend/src/features/knowledges/knowledge-form-controls.tsx
+++ b/frontend/src/features/knowledges/knowledge-form-controls.tsx
@@ -99,7 +99,7 @@ export function KnowledgeContentField({
{hasLabel ? <FormLabel>Content</FormLabel> : null}
<FormControl>
<MarkdownEditorField
- className={fillParent ? 'min-h-0 flex-1' : 'min-h-[320px]'}
+ className={fillParent ? 'min-h-0 flex-1' : 'min-h-[calc(100dvh-5rem)]'}
disabled={isSaving}
mode={viewMode}
onBlur={field.onBlur}
@@ -109,7 +109,10 @@ export function KnowledgeContentField({
value={field.value}
/>
</FormControl>
- <FormMessage />
+ {/* Full-height field: the invalid state shows as a red editor border (via aria-invalid), not
+ text below it — a message here would eat a line the flex layout has no room for. Kept as
+ sr-only so screen readers still announce it via aria-describedby. */}
+ <FormMessage className="sr-only" />
</FormItem>
)}
/>
@@ -129,7 +132,7 @@ export function KnowledgeMetaFields({ control, isNew, isSaving }: KnowledgeMetaF
const handleDocTypeChange = (next: KnowledgeDocType, fieldOnChange: (value: KnowledgeDocType) => void) => {
fieldOnChange(next);
- const opts = { shouldDirty: true, shouldValidate: true };
+ const opts = { shouldDirty: true };
if (next !== KnowledgeDocType.Answer) {
setValue('answerType', undefined, opts);
diff --git a/frontend/src/features/knowledges/knowledge-form.tsx b/frontend/src/features/knowledges/knowledge-form.tsx
index 73beba0f..102ddbad 100644
--- a/frontend/src/features/knowledges/knowledge-form.tsx
+++ b/frontend/src/features/knowledges/knowledge-form.tsx
@@ -1,8 +1,7 @@
import { useMutation } from '@apollo/client/react';
-import { zodResolver } from '@hookform/resolvers/zod';
import { Save } from 'lucide-react';
import { type ComponentProps, useCallback, useState } from 'react';
-import { type Control, type FieldPath, type SubmitHandler, useForm, useWatch } from 'react-hook-form';
+import { type Control, type FieldPath, type SubmitHandler, useWatch } from 'react-hook-form';
import { useNavigate } from 'react-router-dom';
import { toast } from 'sonner';
import { z } from 'zod';
@@ -19,6 +18,7 @@ import { UnsavedChangesDialog, useUnsavedChangesGuard } from '@/components/share
import { Form } from '@/components/ui/form';
import { Spinner } from '@/components/ui/spinner';
import { AnonymizeTextDocument, KnowledgeAnswerType, KnowledgeDocType, KnowledgeGuideType } from '@/graphql/types';
+import { useAppForm } from '@/hooks/use-app-form';
import { useBreakpoint } from '@/hooks/use-breakpoint';
import { Log } from '@/lib/log';
import { useUser } from '@/providers/user-provider';
@@ -199,11 +199,8 @@ export function KnowledgeForm({ initialValues, isNew, knowledge, onSubmit }: Kno
const { authInfo } = useUser();
const canAnonymize = authInfo?.privileges?.includes('anonymize.call') ?? false;
- const form = useForm<FormValues>({
+ const form = useAppForm<FormValues>({
defaultValues: initialValues,
- // Not `onChange`: that would run the entire Zod schema on every keystroke, including every emit
- // from the multi-kilobyte `content` markdown editor.
- mode: 'onTouched',
resetOptions: {
// When `values` changes (e.g. a GraphQL subscription pushes an
// updated document after an inline rename from the header),
@@ -212,7 +209,7 @@ export function KnowledgeForm({ initialValues, isNew, knowledge, onSubmit }: Kno
// would silently wipe their in-flight changes.
keepDirtyValues: true,
},
- resolver: zodResolver(formSchema),
+ schema: formSchema,
// `values` reactively syncs the form with `initialValues`. The page
// recomputes `initialValues` from `knowledge` whenever the cache
// refreshes (rename, refetch, etc.), and RHF reapplies the new
@@ -314,7 +311,10 @@ export function KnowledgeForm({ initialValues, isNew, knowledge, onSubmit }: Kno
[isSaving, navigate, performSave, skipNextBlock],
);
- const canSubmit = !isSaving && isValid && (isNew || isDirty);
+ // Not gated on `isValid`: the button must be clickable to trigger the first submit, which is what turns
+ // validation on (mode:'onSubmit'). Clicking an invalid form surfaces the errors instead of silently doing
+ // nothing. `isDirty` still gates edits so an unchanged existing doc can't be re-saved.
+ const canSubmit = !isSaving && (isNew || isDirty);
const saveButton = (
<AppHeaderAction
@@ -350,7 +350,7 @@ export function KnowledgeForm({ initialValues, isNew, knowledge, onSubmit }: Kno
return;
}
- form.setValue('content', anonymizedContent, { shouldDirty: true, shouldValidate: true });
+ form.setValue('content', anonymizedContent, { shouldDirty: true });
toast.success('Content anonymized');
} catch (error) {
Log.error('Failed to anonymize content', error);
diff --git a/frontend/src/features/resources/resources-copy-dialog.tsx b/frontend/src/features/resources/resources-copy-dialog.tsx
index 5b2a5205..d974158b 100644
--- a/frontend/src/features/resources/resources-copy-dialog.tsx
+++ b/frontend/src/features/resources/resources-copy-dialog.tsx
@@ -1,7 +1,5 @@
-import { zodResolver } from '@hookform/resolvers/zod';
import { Copy } from 'lucide-react';
import { useEffect, useMemo } from 'react';
-import { useForm } from 'react-hook-form';
import type { FileNode } from '@/components/shared/file-manager';
import type { OverwriteConflict } from '@/components/shared/overwrite';
@@ -11,6 +9,7 @@ import { Button } from '@/components/ui/button';
import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog';
import { Form, FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage } from '@/components/ui/form';
import { Input } from '@/components/ui/input';
+import { useAppForm } from '@/hooks/use-app-form';
import { useResources } from '@/providers/resources-provider';
import { resourcesCopyFormSchema, type ResourcesCopyFormValues, useResourcesCopy } from './use-resources-copy';
@@ -148,10 +147,9 @@ function ResourcesCopyDialogForm({ files, onClose }: ResourcesCopyDialogFormProp
return buildSingleDefaultDestination(files[0]);
}, [files, isMulti]);
- const form = useForm<ResourcesCopyFormValues>({
+ const form = useAppForm<ResourcesCopyFormValues>({
defaultValues: { destination: defaultDestination },
- mode: 'onChange',
- resolver: zodResolver(resourcesCopyFormSchema),
+ schema: resourcesCopyFormSchema,
});
useEffect(() => {
@@ -182,7 +180,9 @@ function ResourcesCopyDialogForm({ files, onClose }: ResourcesCopyDialogFormProp
await overwriteAction.forceExecute(buildCopyPlan(files, values));
});
- const isSubmitDisabled = !form.formState.isValid;
+ // Convention: stay enabled until the first submit, then reflect validity (so an invalid submit surfaces
+ // errors instead of a silently-dead button). Mirrors FormSubmitButton's requireValid gate.
+ const isSubmitDisabled = form.formState.isSubmitted && !form.formState.isValid;
const titleText = isMulti ? `Copy ${files.length} items` : files[0].isDir ? 'Copy directory' : 'Copy resource';
const overwriteCtaLabel = isMulti ? `Copy ${files.length} with overwrite` : 'Copy with overwrite';
diff --git a/frontend/src/features/resources/resources-mkdir-dialog.tsx b/frontend/src/features/resources/resources-mkdir-dialog.tsx
index 448a2f16..a361cc60 100644
--- a/frontend/src/features/resources/resources-mkdir-dialog.tsx
+++ b/frontend/src/features/resources/resources-mkdir-dialog.tsx
@@ -1,13 +1,12 @@
-import { zodResolver } from '@hookform/resolvers/zod';
import { FolderPlus } from 'lucide-react';
import { useEffect } from 'react';
-import { useForm } from 'react-hook-form';
import { Button } from '@/components/ui/button';
import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog';
import { Form, FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage } from '@/components/ui/form';
import { FormSubmitButton } from '@/components/ui/form-submit-button';
import { Input } from '@/components/ui/input';
+import { useAppForm } from '@/hooks/use-app-form';
import { resourcesMkdirFormSchema, type ResourcesMkdirFormValues, useResourcesMkdir } from './use-resources-mkdir';
@@ -51,10 +50,9 @@ export function ResourcesMkdirDialog({ defaultParentPath = '', isOpen, onClose }
function ResourcesMkdirDialogForm({ defaultParentPath, onClose }: ResourcesMkdirDialogFormProps) {
const { isCreating, mkdir } = useResourcesMkdir();
- const form = useForm<ResourcesMkdirFormValues>({
+ const form = useAppForm<ResourcesMkdirFormValues>({
defaultValues: { path: buildDefaultPath(defaultParentPath) },
- mode: 'onChange',
- resolver: zodResolver(resourcesMkdirFormSchema),
+ schema: resourcesMkdirFormSchema,
});
useEffect(() => {
diff --git a/frontend/src/features/resources/resources-move-dialog.tsx b/frontend/src/features/resources/resources-move-dialog.tsx
index d59ee0c1..2eab1f82 100644
--- a/frontend/src/features/resources/resources-move-dialog.tsx
+++ b/frontend/src/features/resources/resources-move-dialog.tsx
@@ -1,7 +1,5 @@
-import { zodResolver } from '@hookform/resolvers/zod';
import { FolderInput } from 'lucide-react';
import { useEffect, useMemo } from 'react';
-import { useForm } from 'react-hook-form';
import type { FileNode } from '@/components/shared/file-manager';
import type { OverwriteConflict } from '@/components/shared/overwrite';
@@ -11,6 +9,7 @@ import { Button } from '@/components/ui/button';
import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from '@/components/ui/dialog';
import { Form, FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage } from '@/components/ui/form';
import { Input } from '@/components/ui/input';
+import { useAppForm } from '@/hooks/use-app-form';
import { useResources } from '@/providers/resources-provider';
import { resourcesMoveFormSchema, type ResourcesMoveFormValues, useResourcesMove } from './use-resources-move';
@@ -139,10 +138,9 @@ function ResourcesMoveDialogForm({ files, onClose }: ResourcesMoveDialogFormProp
return files[0].path;
}, [files, isMulti]);
- const form = useForm<ResourcesMoveFormValues>({
+ const form = useAppForm<ResourcesMoveFormValues>({
defaultValues: { destination: defaultDestination },
- mode: 'onChange',
- resolver: zodResolver(resourcesMoveFormSchema),
+ schema: resourcesMoveFormSchema,
});
useEffect(() => {
@@ -180,7 +178,9 @@ function ResourcesMoveDialogForm({ files, onClose }: ResourcesMoveDialogFormProp
await overwriteAction.forceExecute(buildMovePlan(files, values));
});
- const isSubmitDisabled = !form.formState.isValid;
+ // Convention: stay enabled until the first submit, then reflect validity (so an invalid submit surfaces
+ // errors instead of a silently-dead button). Mirrors FormSubmitButton's requireValid gate.
+ const isSubmitDisabled = form.formState.isSubmitted && !form.formState.isValid;
const titleText = isMulti
? `Move ${files.length} items`
: files[0].isDir
diff --git a/frontend/src/hooks/use-app-form.ts b/frontend/src/hooks/use-app-form.ts
new file mode 100644
index 00000000..5716e9eb
--- /dev/null
+++ b/frontend/src/hooks/use-app-form.ts
@@ -0,0 +1,42 @@
+import type { FieldValues, Resolver, UseFormProps, UseFormReturn } from 'react-hook-form';
+import type { z } from 'zod';
+
+import { zodResolver } from '@hookform/resolvers/zod';
+import { useForm } from 'react-hook-form';
+
+interface UseAppFormProps<TFieldValues extends FieldValues, TContext, TTransformedValues> extends Omit<
+ UseFormProps<TFieldValues, TContext, TTransformedValues>,
+ 'mode' | 'resolver' | 'reValidateMode'
+> {
+ // The schema's OUTPUT is the form's transformed values; its INPUT is the raw field values (they differ when
+ // the schema has defaults/transforms). zodResolver maps input→output — the cast below keeps callers from
+ // having to align the two by hand, matching how `useForm<Input, ctx, Output>` is used directly.
+ schema: z.ZodType<TTransformedValues>;
+}
+
+// Project form convention (see the forms note in memory): validation stays SILENT until the first submit, then
+// re-validates live on every change — react-hook-form's default (mode 'onSubmit' + reValidateMode 'onChange').
+// This wrapper owns the timing and the zod resolver so no form can drift back to eager 'onTouched'/'onChange',
+// which paints fields red on input before the user has tried to save. Callers pass `schema` in place of
+// `resolver`, plus the usual defaultValues/values/resetOptions; the `Omit` makes the timing keys unreachable.
+// The three generics mirror `useForm<TFieldValues, TContext, TTransformedValues>` so schemas that transform
+// (input ≠ output) keep their precise typing.
+export function useAppForm<TFieldValues extends FieldValues, TContext = unknown, TTransformedValues = TFieldValues>({
+ schema,
+ ...options
+}: UseAppFormProps<TFieldValues, TContext, TTransformedValues>): UseFormReturn<
+ TFieldValues,
+ TContext,
+ TTransformedValues
+> {
+ return useForm<TFieldValues, TContext, TTransformedValues>({
+ mode: 'onSubmit',
+ reValidateMode: 'onChange',
+ ...options,
+ resolver: zodResolver(schema as z.ZodType<TTransformedValues, TFieldValues>) as Resolver<
+ TFieldValues,
+ TContext,
+ TTransformedValues
+ >,
+ });
+}
diff --git a/frontend/src/pages/settings/settings-api-tokens.tsx b/frontend/src/pages/settings/settings-api-tokens.tsx
index 2e2063f7..0e88ff56 100644
--- a/frontend/src/pages/settings/settings-api-tokens.tsx
+++ b/frontend/src/pages/settings/settings-api-tokens.tsx
@@ -1,7 +1,6 @@
import type { ColumnDef } from '@tanstack/react-table';
import { useMutation, useQuery, useSubscription } from '@apollo/client/react';
-import { zodResolver } from '@hookform/resolvers/zod';
import { format } from 'date-fns';
import { enUS } from 'date-fns/locale';
import {
@@ -19,7 +18,7 @@ import {
X,
} from 'lucide-react';
import { useCallback, useId, useMemo, useState } from 'react';
-import { type Control, Controller, useForm, useFormState } from 'react-hook-form';
+import { type Control, Controller, useFormState } from 'react-hook-form';
import { toast } from 'sonner';
import * as z from 'zod';
@@ -55,6 +54,7 @@ import {
TokenStatus as TokenStatusEnum,
UpdateApiTokenDocument,
} from '@/graphql/types';
+import { useAppForm } from '@/hooks/use-app-form';
import { useTableState } from '@/hooks/use-table-state';
import { cn } from '@/lib/utils';
import { formatDate } from '@/lib/utils/format';
@@ -295,15 +295,13 @@ function SettingsAPITokens() {
// Form state lives in the parent so that subscription-driven DataTable
// re-renders and row remounts cannot drop user input. <Controller> in each
// cell re-subscribes to this state on remount — no values are lost.
- const createForm = useForm<CreateTokenFormInput, unknown, CreateTokenFormValues>({
+ const createForm = useAppForm<CreateTokenFormInput, unknown, CreateTokenFormValues>({
defaultValues: CREATE_TOKEN_DEFAULTS,
- mode: 'onChange',
- resolver: zodResolver(createTokenFormSchema),
+ schema: createTokenFormSchema,
});
- const editForm = useForm<EditTokenFormInput, unknown, EditTokenFormValues>({
+ const editForm = useAppForm<EditTokenFormInput, unknown, EditTokenFormValues>({
defaultValues: EDIT_TOKEN_DEFAULTS,
- mode: 'onChange',
- resolver: zodResolver(editTokenFormSchema),
+ schema: editTokenFormSchema,
});
const { filter, pageIndex: currentPage, setFilter, setPage: handlePageChange } = useTableState();
diff --git a/frontend/src/pages/settings/settings-prompt.tsx b/frontend/src/pages/settings/settings-prompt.tsx
index ab344615..eb28918a 100644
--- a/frontend/src/pages/settings/settings-prompt.tsx
+++ b/frontend/src/pages/settings/settings-prompt.tsx
@@ -1,5 +1,4 @@
import { useMutation, useQuery } from '@apollo/client/react';
-import { zodResolver } from '@hookform/resolvers/zod';
import {
AlertCircle,
Bot,
@@ -23,7 +22,6 @@ import {
type FieldPathByValue,
type FieldValues,
useController,
- useForm,
useFormState,
useWatch,
} from 'react-hook-form';
@@ -81,6 +79,7 @@ import {
UpdatePromptDocument,
ValidatePromptDocument,
} from '@/graphql/types';
+import { useAppForm } from '@/hooks/use-app-form';
import { useBreakpoint } from '@/hooks/use-breakpoint';
import { composeRefs } from '@/lib/compose-refs';
import { formatPromptId } from '@/lib/route-titles/format-prompt-id';
@@ -266,7 +265,9 @@ function FormMarkdownItem<T extends FieldValues>({
value={field.value}
/>
</FormControl>
- {fieldState.error && <FormMessage>{fieldState.error.message}</FormMessage>}
+ {/* Full-height field: the invalid state shows as the editor's red border (via aria-invalid), not
+ text below it (no room in the flex layout). Kept sr-only so screen readers still announce it. */}
+ {fieldState.error && <FormMessage className="sr-only">{fieldState.error.message}</FormMessage>}
</FormItem>
);
}
@@ -382,22 +383,20 @@ function SettingsPrompt() {
}
};
- const systemForm = useForm<SystemFormData>({
+ const systemForm = useAppForm<SystemFormData>({
defaultValues: {
template: '',
},
- mode: 'onTouched',
resetOptions: { keepDirtyValues: true },
- resolver: zodResolver(systemFormSchema),
+ schema: systemFormSchema,
});
- const humanForm = useForm<HumanFormData>({
+ const humanForm = useAppForm<HumanFormData>({
defaultValues: {
template: '',
},
- mode: 'onTouched',
resetOptions: { keepDirtyValues: true },
- resolver: zodResolver(humanFormSchema),
+ schema: humanFormSchema,
});
const { isDirty: isSystemDirty, isValid: isSystemValid } = useFormState({ control: systemForm.control });
diff --git a/frontend/src/pages/settings/settings-provider.tsx b/frontend/src/pages/settings/settings-provider.tsx
index 6246a7e4..d7e61ffc 100644
--- a/frontend/src/pages/settings/settings-provider.tsx
+++ b/frontend/src/pages/settings/settings-provider.tsx
@@ -1,5 +1,4 @@
import { useMutation, useQuery } from '@apollo/client/react';
-import { zodResolver } from '@hookform/resolvers/zod';
import {
AlertCircle,
Check,
@@ -21,7 +20,6 @@ import {
type FieldPath,
type FieldValues,
useController,
- useForm,
type UseFormSetValue,
useFormState,
useWatch,
@@ -73,6 +71,7 @@ import {
TestProviderDocument,
UpdateProviderDocument,
} from '@/graphql/types';
+import { useAppForm } from '@/hooks/use-app-form';
import { useBreakpoint } from '@/hooks/use-breakpoint';
import { routes } from '@/lib/routes';
import { cn } from '@/lib/utils';
@@ -1107,14 +1106,13 @@ function SettingsProvider() {
const isLoading = isCreateLoading || isUpdateLoading || isDeleteLoading;
const { isDesktop } = useBreakpoint();
- const form = useForm<FormInput, unknown, FormData>({
+ const form = useAppForm<FormInput, unknown, FormData>({
defaultValues: {
agents: {},
name: undefined,
type: undefined,
},
- mode: 'onTouched',
- resolver: zodResolver(formSchema),
+ schema: formSchema,
});
const { control, formState, handleSubmit: handleFormSubmit, reset, setValue, trigger, watch } = form;
diff --git a/frontend/src/pages/templates/template.tsx b/frontend/src/pages/templates/template.tsx
index a7339176..b31126a3 100644
--- a/frontend/src/pages/templates/template.tsx
+++ b/frontend/src/pages/templates/template.tsx
@@ -1,10 +1,8 @@
import type { ReactNode } from 'react';
import { skipToken, useQuery } from '@apollo/client/react';
-import { zodResolver } from '@hookform/resolvers/zod';
import { ChevronDown, Ellipsis, FileSymlink, FileText, Loader2, Pencil, Save, Trash } from 'lucide-react';
import { useCallback, useMemo, useState } from 'react';
-import { useForm } from 'react-hook-form';
import { useNavigate, useParams } from 'react-router-dom';
import { toast } from 'sonner';
import { z } from 'zod';
@@ -32,13 +30,14 @@ import {
DropdownMenuSeparator,
DropdownMenuTrigger,
} from '@/components/ui/dropdown-menu';
-import { Form, FormControl, FormField, FormItem } from '@/components/ui/form';
+import { Form, FormControl, FormField, FormItem, FormMessage } from '@/components/ui/form';
import { FormSubmitButton } from '@/components/ui/form-submit-button';
import { Input } from '@/components/ui/input';
import { Spinner } from '@/components/ui/spinner';
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip';
import { useTemplateDetailNavigation } from '@/features/templates/use-template-detail-navigation';
import { FlowTemplateDocument } from '@/graphql/types';
+import { useAppForm } from '@/hooks/use-app-form';
import { useBreakpoint } from '@/hooks/use-breakpoint';
import { routes } from '@/lib/routes';
import { cn } from '@/lib/utils';
@@ -278,11 +277,10 @@ function Template() {
[templateData?.flowTemplate],
);
- const form = useForm<FormValues>({
+ const form = useAppForm<FormValues>({
defaultValues: initialValues,
- mode: 'onTouched',
resetOptions: { keepDirtyValues: true },
- resolver: zodResolver(formSchema),
+ schema: formSchema,
values: initialValues,
});
@@ -465,7 +463,7 @@ function Template() {
)}
{(isNew || !!templateData?.flowTemplate) && (
<FormSubmitButton
- disabled={isSaving || !isValid || (!isNew && !hasUnsavedChanges)}
+ disabled={isSaving || (!isNew && !hasUnsavedChanges)}
form="template-form"
icon={<Save className="size-4" />}
loading={isSaving}
@@ -684,6 +682,9 @@ function Template() {
value={field.value}
/>
</FormControl>
+ {/* Full-height field: the invalid state shows as the editor's red border (via aria-invalid),
+ not text below it (no room in the flex layout). Kept sr-only for screen readers. */}
+ <FormMessage className="sr-only" />
</FormItem>
)}
/>