repair validationIssue calls

ibi-group · Feb 1, 2024 · 089b3a2 · 089b3a2
1 parent 8006c79
commit 089b3a2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/lib/editor/util/validation/common.js b/lib/editor/util/validation/common.js
@@ -4,8 +4,8 @@
  * Construct an EditorValidationIssue for the field name and reason (defaults to
  * empty field message).
  */
-export function validationIssue (reason: string, field: ?string) {
-  return {field: field || '', invalid: true, reason}
+export function validationIssue (reason: string, field: string) {
+  return {field, invalid: true, reason}
 }
 
 export type EditorValidationIssue = {

diff --git a/lib/editor/util/validation/validation.js b/lib/editor/util/validation/validation.js
@@ -76,14 +76,14 @@ export function validate (
     // make sure value is parseable to a number
     if (isNaN(num)) {
       return {
-        result: validationIssue(messages('mustBeValidNumber'))
+        result: validationIssue(messages('mustBeValidNumber'), field.name)
       }
     }
 
     // make sure value is positive
     if (num < 0) {
       return {
-        result: validationIssue(messages('mustBePositiveNumber'))
+        result: validationIssue(messages('mustBePositiveNumber'), field.name)
       }
     }
 
@@ -110,7 +110,7 @@ export function validate (
     )
     if (!isValid) {
       return {
-        result: validationIssue(messages('invalidRouteType'))
+        result: validationIssue(messages('invalidRouteType'), field.name)
       }
     }
 
@@ -156,12 +156,12 @@ export function validate (
         idList.length > 1 &&
         valueDoesNotExist
       ) {
-        return validationIssue(messages('idRequired'))
+        return validationIssue(messages('idRequired'), field.name)
       }
       if (isRequiredButEmpty) {
         return emptyFieldValidationIssue()
       } else if (isNotUnique) {
-        return validationIssue(messages('idMustBeUnique'))
+        return validationIssue(messages('idMustBeUnique'), field.name)
       } else {
         return false
       }
@@ -172,7 +172,7 @@ export function validate (
         locationType !== null &&
         (typeof locationType === 'number' && locationType <= 2)
       ) {
-        return validationIssue(messages('stopNameRequired'))
+        return validationIssue(messages('stopNameRequired'), field.name)
       }
       if (name === 'route_short_name' && !value && entity && entity.route_long_name) {
         return false
@@ -216,7 +216,7 @@ export function validate (
       if (isRequiredButEmpty) {
         return emptyFieldValidationIssue()
       } else if (isNotUrl) {
-        return validationIssue(messages('invalidUrl'))
+        return validationIssue(messages('invalidUrl'), field.name)
       } else {
         return false
       }
@@ -225,7 +225,7 @@ export function validate (
       if (isRequiredButEmpty) {
         return emptyFieldValidationIssue()
       } else if (isNotEmail) {
-        return validationIssue(messages('invalidEmail'))
+        return validationIssue(messages('invalidEmail'), field.name)
       } else {
         return false
       }
@@ -250,19 +250,19 @@ export function validate (
     case 'LATITUDE':
       const isNotLat = value > 90 || value < -90
       if (isNotLat) {
-        return validationIssue(messages('invalidLatitude'))
+        return validationIssue(messages('invalidLatitude'), field.name)
       }
       if (isOptionalAndEmpty && locationType !== null && (typeof locationType === 'number' && locationType <= 2)) {
-        return validationIssue(messages('latLonRequired'))
+        return validationIssue(messages('latLonRequired'), field.name)
       }
       return false
     case 'LONGITUDE':
       const isNotLng = value > 180 || value < -180
       if (isNotLng) {
-        return validationIssue(messages('invalidLongitude'))
+        return validationIssue(messages('invalidLongitude'), field.name)
       }
       if (isOptionalAndEmpty && typeof locationType === 'number' && locationType <= 2) {
-        return validationIssue(messages('latLonRequired'))
+        return validationIssue(messages('latLonRequired'), field.name)
       }
       return false
     case 'TIME':
@@ -282,7 +282,7 @@ export function validate (
       if (isRequiredButEmpty) {
         return emptyFieldValidationIssue()
       } else if (isNotANumber) {
-        return validationIssue(messages('mustBeValidNumber'))
+        return validationIssue(messages('mustBeValidNumber'), field.name)
       } else {
         return false
       }
@@ -304,7 +304,7 @@ export function validate (
       }
       if (!hasService && name === 'monday') {
         // only add validation issue for one day of week (monday)
-        return validationIssue(messages('serviceRequired'))
+        return validationIssue(messages('serviceRequired'), field.name)
       }
       return false
     case 'DROPDOWN':
@@ -323,7 +323,7 @@ export function validate (
         agencies.length > 1
       ) {
         if (valueDoesNotExist) {
-          return validationIssue(messages('agencyRequired'))
+          return validationIssue(messages('agencyRequired'), field.name)
         }
       }
       return false
@@ -412,7 +412,7 @@ export function validate (
           )
         )
       ) {
-        return validationIssue(messages('mustBePositiveInteger'))
+        return validationIssue(messages('mustBePositiveInteger'), field.name)
       }
       return false
     case 'POSITIVE_NUM':