Patrick/medassist-ng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow medications with only a generic name (no commercial name required) (#311)

Browse Source 
* Initial plan

* feat: allow generic name only for medications (frontend changes)

- Add getMedDisplayName() helper for consistent name display
- Update validation to require either commercial or generic name
- Update all display locations to use display name fallback
- Add i18n keys for nameOrGenericRequired in en.json and de.json
- Remove required attribute from commercial name field
- Update FIELD_LIMITS.name.min from 1 to 0

Co-authored-by: DanielVolz <3275994+DanielVolz@users.noreply.github.com>

* feat: allow generic name only for medications (backend changes)

- Update Zod schema to allow empty name with cross-field refinement
- Update reminder scheduler to use name || genericName for display
- Update planner routes to match medications by display name
- Update existing tests to match new validation behavior

Co-authored-by: DanielVolz <3275994+DanielVolz@users.noreply.github.com>

* fix: update placeholder text and fix FIELD_LIMITS test

- Remove "(optional)" from generic name placeholder in en/de
- Update types.test.ts to expect FIELD_LIMITS.name.min = 0

Co-authored-by: DanielVolz <3275994+DanielVolz@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: DanielVolz <3275994+DanielVolz@users.noreply.github.com>
This commit is contained in:
Copilot
2026-02-25 21:29:25 +01:00
committed by GitHub
parent 691550fb33
commit 2a9ca39c24
23 changed files with 151 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/hooks/useMedicationForm.ts
+9 -4
View File
@@ -115,9 +115,6 @@ export function useMedicationForm(): UseMedicationFormReturn {
// Skip validation for takenBy array (individual items validated on add)
if (field === "takenBy") return undefined;
const strValue = typeof value === "string" ? value : "";
if (field === "name" && (!strValue || strValue.trim().length === 0)) {
return t("common.validation.required");
}
if ("max" in limits && strValue.length > limits.max) {
return t("common.validation.maxLength", { max: limits.max, current: strValue.length });
}
@@ -150,8 +147,16 @@ export function useMedicationForm(): UseMedicationFormReturn {
const error = validateField(f, form[f]);
if (error) errors[f] = error;
});
// Cross-field validation: at least one of name or genericName is required
const hasName = form.name && form.name.trim().length > 0;
const hasGenericName = form.genericName && form.genericName.trim().length > 0;
if (!hasName && !hasGenericName) {
const msg = t("common.validation.nameOrGenericRequired");
errors.name = errors.name || msg;
errors.genericName = errors.genericName || msg;
}
setFieldErrors(errors);
}, [form.name, form.genericName, form.notes, validateField, form]);
}, [form.name, form.genericName, form.notes, validateField, form, t]);
const setBlisterValue = useCallback((idx: number, field: keyof FormBlister, value: string) => {
setForm((prev) => {