feat(admin): normalize Persian/Arabic digits in every numeric field
Users typing on a Persian keyboard produced two distinct failures. Fields with type="number" silently returned an empty string — the browser rejects Persian digits, so the value was lost and saved as empty or zero. Text fields passed the Persian characters straight through to the database, where a mobile stored as ۰۹۱۲… never matches 09… again. The secretary form hit the second case with no validation at all. Frontend: - Adds digitsOnly() and the national-code schemas to lib/utils, plus lib/forms with numericField()/latinDigitsField() wrappers for React Hook Form fields. - Converts every type="number" input to type="text" inputMode="numeric" with digit normalization; none remain. Fields that legitimately carry non-digits (sheba, landline) only get the digits translated, keeping IR and separators. - Points the patient national-code and mobile schemas at the shared normalizing schemas, which accept Persian input instead of rejecting it. - Drops two duplicate local digit converters in favour of the shared helper. Backend: - Adds NumericFieldNormalizerSubscriber, translating digits in whitelisted numeric keys of JSON request bodies under /api/v1/ before controllers run, so nobat724_front and clinic-pro-tauri are covered too. Translation only — no characters are stripped, non-string values and other keys are untouched. Three component tests asserted on role="spinbutton" and numeric input values; both are properties of type="number", so they were updated to match the new text inputs. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -5,6 +5,7 @@ import { CheckBadgeIcon, TrashIcon, PlusIcon } from '@heroicons/react/24/outline
|
||||
import { api } from '../lib/api';
|
||||
import type { ApiResponse } from '../lib/api';
|
||||
import PersianDatePicker from '../components/ui/PersianDatePicker';
|
||||
import { toEnglishDigits, digitsOnly } from '../lib/utils';
|
||||
|
||||
// تبدیل تاریخ میلادی ISO (YYYY-MM-DD) به شمسی Y/m/d برای استعلام api.ir
|
||||
function toJalali(iso: string): string {
|
||||
@@ -17,13 +18,6 @@ function toJalali(iso: string): string {
|
||||
return y && m && d ? `${y}/${m}/${d}` : '';
|
||||
}
|
||||
|
||||
// ارقام فارسی/عربی → لاتین (کیبورد انگلیسی؛ ورودی چسباندهشده هم نرمال شود)
|
||||
function toLatinDigits(s: string): string {
|
||||
return s.replace(/[۰-۹٠-٩]/g, (d) =>
|
||||
String('۰۱۲۳۴۵۶۷۸۹٠١٢٣٤٥٦٧٨٩'.indexOf(d) % 10),
|
||||
);
|
||||
}
|
||||
|
||||
// اعتبارسنجی کد ملی ایران (طول ۱۰ + رقم کنترلی)
|
||||
function isValidIranNationalCode(code: string): boolean {
|
||||
if (!/^\d{10}$/.test(code)) return false;
|
||||
@@ -37,7 +31,7 @@ function isValidIranNationalCode(code: string): boolean {
|
||||
|
||||
// اعتبارسنجی شبای ایران: IR + ۲۴ رقم + کنترل mod-97
|
||||
function isValidIranIban(raw: string): boolean {
|
||||
const iban = toLatinDigits(raw).replace(/\s/g, '').toUpperCase();
|
||||
const iban = toEnglishDigits(raw).replace(/\s/g, '').toUpperCase();
|
||||
if (!/^IR\d{24}$/.test(iban)) return false;
|
||||
const rearranged = iban.slice(4) + iban.slice(0, 4);
|
||||
const numeric = rearranged.replace(/[A-Z]/g, (c) => String(c.charCodeAt(0) - 55));
|
||||
@@ -115,13 +109,13 @@ export default function RepresentationProfilePage() {
|
||||
});
|
||||
|
||||
const submitNationalCode = () => {
|
||||
const code = toLatinDigits(nationalCode).replace(/\D/g, '');
|
||||
const code = digitsOnly(nationalCode);
|
||||
if (!isValidIranNationalCode(code)) { toast.error('کد ملی نامعتبر است'); return; }
|
||||
verifyMut.mutate(code);
|
||||
};
|
||||
|
||||
const submitIban = () => {
|
||||
const clean = toLatinDigits(iban).replace(/\s/g, '').toUpperCase();
|
||||
const clean = toEnglishDigits(iban).replace(/\s/g, '').toUpperCase();
|
||||
if (!isValidIranIban(clean)) { toast.error('شماره شبا نامعتبر است (IR + ۲۴ رقم)'); return; }
|
||||
const jalali = toJalali(birthDate);
|
||||
if (!jalali) { toast.error('تاریخ تولد را انتخاب کنید'); return; }
|
||||
@@ -157,7 +151,7 @@ export default function RepresentationProfilePage() {
|
||||
<input
|
||||
type="text" inputMode="numeric" dir="ltr" maxLength={10} value={nationalCode}
|
||||
placeholder="کد ملی ۱۰ رقمی"
|
||||
onChange={(e) => setNationalCode(toLatinDigits(e.target.value).replace(/\D/g, ''))}
|
||||
onChange={(e) => setNationalCode(digitsOnly(e.target.value, 10))}
|
||||
style={{ width: 220, height: 38, padding: '0 12px', borderRadius: 'var(--r-sm)', border: '1px solid var(--border)', background: 'var(--surface)', color: 'var(--text)', fontSize: 13.5, boxSizing: 'border-box', textAlign: 'center' }}
|
||||
/>
|
||||
<button className="btn primary" onClick={submitNationalCode} disabled={verifyMut.isPending}>
|
||||
@@ -210,7 +204,7 @@ export default function RepresentationProfilePage() {
|
||||
<input
|
||||
type="text" inputMode="numeric" dir="ltr" maxLength={26} value={iban}
|
||||
placeholder="IR000000000000000000000000"
|
||||
onChange={(e) => setIban(toLatinDigits(e.target.value).toUpperCase().replace(/[^IR0-9]/g, ''))}
|
||||
onChange={(e) => setIban(toEnglishDigits(e.target.value).toUpperCase().replace(/[^IR0-9]/g, ''))}
|
||||
style={{ width: 320, height: 38, padding: '0 12px', borderRadius: 'var(--r-sm)', border: '1px solid var(--border)', background: 'var(--surface)', color: 'var(--text)', fontSize: 13, boxSizing: 'border-box', fontFamily: 'monospace' }}
|
||||
/>
|
||||
<PersianDatePicker
|
||||
|
||||
Reference in New Issue
Block a user