FIX Handle extra empty values

silverstripe · Nov 26, 2023 · c862349 · c862349
1 parent 1bbb401
commit c862349
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/lib/Validator.js b/client/src/lib/Validator.js
@@ -35,9 +35,9 @@ class Validator {
     return value;
   }
 
-  validateValue(value, rule, config) {
+  validateValue(value, emptyValues, rule, config) {
     // Empty values suppress error unless rule is required
-    if (value === '') {
+    if (emptyValues.includes(value)) {
       return rule !== 'required';
     }
     switch (rule) {
@@ -120,8 +120,13 @@ class Validator {
 
     const value = this.getFieldValue(name);
 
-    // no required rule given and no value, so skip all other validation
-    if (value === '' && rules.required) {
+    let emptyValues = [''];
+    if (rules.required && typeof rules.required === 'object' && rules.required.hasOwnProperty('extraEmptyValues')) {
+      emptyValues = emptyValues.concat(rules.required.extraEmptyValues);
+    }
+
+    // required rule given and empty value, so skip all other validation
+    if (rules.required && emptyValues.includes(value)) {
       const config = Object.assign(
         { title: (title !== '') ? title : name },
         rules.required
@@ -142,7 +147,7 @@ class Validator {
         return;
       }
 
-      const valid = this.validateValue(value, rule, config);
+      const valid = this.validateValue(value, emptyValues, rule, config);
       if (!valid) {
         const message = this.getMessage(rule, config);
         response.valid = false;

diff --git a/client/src/lib/tests/Validator-test.js b/client/src/lib/tests/Validator-test.js
@@ -61,16 +61,16 @@ describe('Validator', () => {
   describe('validateValue()', () => {
     it('should throw an error', () => {
       validator = new Validator({});
-      validator.validateValue('one', 'ruledoesnotexist');
+      validator.validateValue('one', [''], 'ruledoesnotexist');
       // eslint-disable-next-line no-console
       expect(console.warn).toBeCalled();
     });
 
     it('should not error when empty and not required', () => {
       validator = new Validator({});
-      const result1 = validator.validateValue('', 'date');
+      const result1 = validator.validateValue('', [''], 'date');
       expect(result1).toBe(true);
-      const result2 = validator.validateValue('', 'required');
+      const result2 = validator.validateValue('', [''], 'required');
       expect(result2).toBe(false);
     });
   });
@@ -100,10 +100,10 @@ describe('Validator', () => {
 
     beforeEach(() => {
       validator = new Validator({});
-      validator.validateValue = (value, rule) => {
+      validator.validateValue = (value, emptyValues, rule) => {
         switch (rule) {
           case 'required': {
-            return value !== '';
+            return !emptyValues.includes(value);
           }
           case 'numeric': {
             return !isNaN(value);