@dcrackel/hematournamentui 1.0.708 → 1.0.709

package/src/stories/Util/Validations/PersonManagementValidations.js

@@ -1,29 +1,45 @@
-export function validateField(field, value) {
-  const rules = {
-    DisplayName: [
-      { check: v => !v || v.trim().length === 0, message: 'Must have a name.' },
-      { check: v => v.trim().length < 3, message: 'Must be at least 3 characters.' }
-    ],
-    LegalName: [
-      { check: v => !v || v.trim().length === 0, message: 'Must have a name.' },
-      { check: v => v.trim().length < 4, message: 'Must be at least 4 characters.' }
-    ],
-    EmailAddress: [
-      { check: v => v && !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(v), message: 'Must be a valid email address.' }
-    ],
-    SelectedClub: [
-      {
-        check: v =>
-          !v ||
-          (typeof v === 'string' && v.trim().length === 0) ||
-          (typeof v === 'object' && (!v.text || v.text.trim().length === 0)),
-        message: 'Please select a Club.'
-      }
-    ]
-  };
-
-  const ruleSet = rules[field] || [];
-  const failedRule = ruleSet.find(rule => rule.check(value));
-
-  return failedRule ? { invalid: true, message: failedRule.message } : { invalid: false, message: '' };
-}
+function isBlankHemaRatingsId(value) {
+  return value === undefined || value === null || (typeof value === 'string' && value.trim() === '');
+}
+
+function isPositiveIntegerId(value) {
+  if (!['string', 'number'].includes(typeof value)) return false;
+  if (typeof value === 'string' && !/^\d+$/.test(value.trim())) return false;
+  return Number.isSafeInteger(Number(value)) && Number(value) > 0;
+}
+
+function isInvalidHemaRatingsId(value) {
+  if (isBlankHemaRatingsId(value)) return false;
+  return !isPositiveIntegerId(value);
+}
+
+export function validateField(field, value) {
+  const rules = {
+    DisplayName: [
+      { check: v => !v || v.trim().length === 0, message: 'Must have a name.' },
+      { check: v => v.trim().length < 3, message: 'Must be at least 3 characters.' }
+    ],
+    LegalName: [
+      { check: v => !v || v.trim().length === 0, message: 'Must have a name.' },
+      { check: v => v.trim().length < 4, message: 'Must be at least 4 characters.' }
+    ],
+    EmailAddress: [
+      { check: v => v && !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(v), message: 'Must be a valid email address.' }
+    ],
+    HemaRatingsId: [{ check: isInvalidHemaRatingsId, message: 'Enter a positive whole-number ID, or leave it blank.' }],
+    SelectedClub: [
+      {
+        check: v =>
+          !v ||
+          (typeof v === 'string' && v.trim().length === 0) ||
+          (typeof v === 'object' && (!v.text || v.text.trim().length === 0)),
+        message: 'Please select a Club.'
+      }
+    ]
+  };
+
+  const ruleSet = rules[field] || [];
+  const failedRule = ruleSet.find(rule => rule.check(value));
+
+  return failedRule ? { invalid: true, message: failedRule.message } : { invalid: false, message: '' };
+}