feat(web): code-aware field errors + min count validation (#46)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
2026-06-07 23:20:30 +02:00
parent 3900bc362c
commit 537b847acb
6 changed files with 57 additions and 15 deletions
+19 -9
View File
@@ -51,6 +51,7 @@ export function ObjectForm({
onCancel,
formError,
fieldErrorKey,
fieldErrorCode,
}: {
mode: "create" | "edit";
defaults?: { core: ObjectCore; fields: Record<string, unknown> };
@@ -58,6 +59,7 @@ export function ObjectForm({
onCancel: () => void;
formError?: string | null;
fieldErrorKey?: string | null;
fieldErrorCode?: string | null;
}) {
const { t } = useTranslation();
const { default_language } = useConfig();
@@ -80,12 +82,14 @@ export function ObjectForm({
useEffect(() => {
if (fieldErrorKey) {
form.setError(`fields.${fieldErrorKey}` as never, {
type: "server",
message: t("form.fieldRejected", { field: fieldErrorKey }),
});
const codeKey = fieldErrorCode ? `form.fieldError.${fieldErrorCode}` : "";
const message =
fieldErrorCode && t(codeKey) !== codeKey
? t(codeKey)
: t("form.fieldRejected", { field: fieldErrorKey });
form.setError(`fields.${fieldErrorKey}` as never, { type: "server", message });
}
}, [fieldErrorKey, form, t]);
}, [fieldErrorKey, fieldErrorCode, form, t]);
const runSubmit = (createAnother: boolean) =>
handleSubmit(async (data) => {
@@ -106,7 +110,7 @@ export function ObjectForm({
const coreField = (
key: keyof ObjectCore,
labelKey: string,
opts?: { type?: string; required?: boolean },
opts?: { type?: string; required?: boolean; min?: number },
) => (
<div className="space-y-1">
<Label htmlFor={key}>{t(`fieldsLabels.${labelKey}`)}</Label>
@@ -117,14 +121,20 @@ export function ObjectForm({
{...register(
`core.${key}` as const,
opts?.type === "number"
? { valueAsNumber: true, required: opts?.required }
? {
valueAsNumber: true,
required: opts?.required,
...(opts?.min !== undefined
? { min: { value: opts.min, message: t("form.minCount") } }
: {}),
}
: { required: opts?.required },
)}
/>
{errors.core?.[key] && (
<p role="alert" className="text-xs text-destructive">
{t("form.required")}
{errors.core[key]?.message || t("form.required")}
</p>
)}
</div>
@@ -149,7 +159,7 @@ export function ObjectForm({
{coreField("object_number", "objectNumber", { required: true })}
{coreField("object_name", "objectName", { required: true })}
{coreField("number_of_objects", "count", { type: "number", required: true })}
{coreField("number_of_objects", "count", { type: "number", required: true, min: 1 })}
{coreField("brief_description", "briefDescription")}
{coreField("current_location", "currentLocation")}
{coreField("current_owner", "currentOwner")}