fix: validation consistency within admin

payloadcms · Mar 24, 2021 · 50b9937 · 50b9937
1 parent 5f9a5c8
commit 50b9937
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/src/admin/components/forms/Form/buildStateFromSchema.ts b/src/admin/components/forms/Form/buildStateFromSchema.ts
@@ -25,6 +25,7 @@ const buildStateFromSchema = async (fieldSchema: FieldSchema[], fullData: Data =
         value,
         initialValue: value,
         valid: true,
+        validate: field.validate,
       };
 
       validationPromises.push(buildValidationPromise(fieldState, field));

diff --git a/src/admin/components/forms/field-types/Text/index.tsx b/src/admin/components/forms/field-types/Text/index.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback } from 'react';
+import React from 'react';
 import useFieldType from '../../useFieldType';
 import withCondition from '../../withCondition';
 import Label from '../../Label';
@@ -21,20 +21,13 @@ const Text: React.FC<Props> = (props) => {
       style,
       width,
     } = {},
-    minLength,
-    maxLength,
   } = props;
 
   const path = pathFromProps || name;
 
-  const memoizedValidate = useCallback((value) => {
-    const validationResult = validate(value, { minLength, maxLength, required });
-    return validationResult;
-  }, [validate, maxLength, minLength, required]);
-
   const fieldType = useFieldType<string>({
     path,
-    validate: memoizedValidate,
+    validate,
     enableDebouncedValue: true,
   });
 

diff --git a/src/fields/config/sanitize.ts b/src/fields/config/sanitize.ts
@@ -20,8 +20,7 @@ const sanitizeFields = (fields, validRelationships) => {
 
     if (typeof field.validate === 'undefined') {
       const defaultValidate = validations[field.type];
-      const noValidate = () => true;
-      field.validate = defaultValidate || noValidate;
+      field.validate = (val) => defaultValidate(val, field);
     }
 
     if (!field.hooks) field.hooks = {};