payload 0.15.3 → 0.15.4

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+## [0.15.4](https://github.com/payloadcms/payload/compare/v0.15.3...v0.15.4) (2022-04-05)
+
+
+### Bug Fixes
+
+* [#495](https://github.com/payloadcms/payload/issues/495), avoids appending version to id queries ([ab432a4](https://github.com/payloadcms/payload/commit/ab432a43dc568da0b7e65e275aed335d729600fa))
+* default point validation allows not required and some edge cases ([29405bb](https://github.com/payloadcms/payload/commit/29405bbc0e3a5c3c1f3dadb2386a68e1fe159c42))
+* maintains field validation internally for speed ([b99f6b1](https://github.com/payloadcms/payload/commit/b99f6b16af1573185bb8de07c6e54ac02caf6de8))
+
+
+### Features
+
+* allows like to search by many words, adds contain to match exact strings ([ec91757](https://github.com/payloadcms/payload/commit/ec91757257ed062c7743fca3d07d1b6af21cacb4))
+* extended validation function arguments ([#494](https://github.com/payloadcms/payload/issues/494)) ([1b4b570](https://github.com/payloadcms/payload/commit/1b4b5707bfa731bedc5d9ca49ac9f425932b999c)), closes [#495](https://github.com/payloadcms/payload/issues/495)
+* filter relationship options in admin ui using filterOptions ([485991b](https://github.com/payloadcms/payload/commit/485991bd48c3512acca8dd94b3ab6c160bf1f153))
+* **logging:** allow pino logger options to be passed into init ([6620a4f](https://github.com/payloadcms/payload/commit/6620a4f682f0a3169218dd83e1de315f95726287))
+* support className config for row, block and array fields ([#504](https://github.com/payloadcms/payload/issues/504)) ([0461c21](https://github.com/payloadcms/payload/commit/0461c2109bea76742f94ae6f830c655ec67d1428))
+* upload field implements filterOptions ([1482fde](https://github.com/payloadcms/payload/commit/1482fded9a2e700416e7d0b0c753a05f56f4aee1))
+* WIP extended validation function arguments ([647cac3](https://github.com/payloadcms/payload/commit/647cac3612c02dc164254e050ef589a88077b55f))
+* working PoC for reusing relationship filters in validate ([df934df](https://github.com/payloadcms/payload/commit/df934dfeff8b12857d133b2da9f441bc0285dee4))
+
 ## [0.15.3](https://github.com/payloadcms/payload/compare/v0.15.2...v0.15.3) (2022-04-04)
 
 

package/dist/admin/components/elements/WhereBuilder/field-types.d.ts

@@ -20,14 +20,14 @@ declare const fieldTypeConditions: {
             value: string;
         }[];
     };
-    wysiwyg: {
+    code: {
         component: string;
         operators: {
             label: string;
             value: string;
         }[];
     };
-    code: {
+    richText: {
         component: string;
         operators: {
             label: string;

package/dist/admin/components/elements/WhereBuilder/field-types.js

@@ -57,26 +57,30 @@ const like = {
     label: 'is like',
     value: 'like',
 };
+const contains = {
+    label: 'contains',
+    value: 'contains',
+};
 const fieldTypeConditions = {
     text: {
         component: 'Text',
-        operators: [...base, like],
+        operators: [...base, like, contains],
     },
     email: {
         component: 'Text',
-        operators: [...base, like],
+        operators: [...base, contains],
     },
     textarea: {
         component: 'Text',
-        operators: [...base, like],
+        operators: [...base, like, contains],
     },
-    wysiwyg: {
+    code: {
         component: 'Text',
-        operators: [...base, like],
+        operators: [...base, like, contains],
     },
-    code: {
+    richText: {
         component: 'Text',
-        operators: [...base, like],
+        operators: [...base, like, contains],
     },
     number: {
         component: 'Number',

package/dist/admin/components/forms/DraggableSection/index.js

@@ -7,7 +7,7 @@ import PositionPanel from './PositionPanel';
 import Button from '../../elements/Button';
 import { NegativeFieldGutterProvider } from '../FieldTypeGutter/context';
 import FieldTypeGutter from '../FieldTypeGutter';
-import RenderFields, { useRenderedFields } from '../RenderFields';
+import RenderFields from '../RenderFields';
 import HiddenInput from '../field-types/HiddenInput';
 import './index.scss';
 import { fieldAffectsData } from '../../../../fields/config/types';
@@ -15,7 +15,6 @@ const baseClass = 'draggable-section';
 const DraggableSection = (props) => {
     const { moveRow, addRow, removeRow, rowIndex, rowCount, parentPath, fieldSchema, label, blockType, fieldTypes, id, setRowCollapse, isCollapsed, permissions, readOnly, hasMaxRows, } = props;
     const [isHovered, setIsHovered] = useState(false);
-    const { operation } = useRenderedFields();
     const classes = [
         baseClass,
         isCollapsed ? 'is-collapsed' : 'is-open',
@@ -32,7 +31,7 @@ const DraggableSection = (props) => {
                     React.createElement(Button, { icon: "chevron", onClick: () => setRowCollapse(id, !isCollapsed), buttonStyle: "icon-label", className: `toggle-collapse toggle-collapse--is-${isCollapsed ? 'collapsed' : 'open'}`, round: true }))),
                 React.createElement(AnimateHeight, { height: isCollapsed ? 0 : 'auto', duration: 200 },
                     React.createElement(NegativeFieldGutterProvider, { allow: false },
-                        React.createElement(RenderFields, { operation: operation, readOnly: readOnly, fieldTypes: fieldTypes, key: rowIndex, permissions: permissions === null || permissions === void 0 ? void 0 : permissions.fields, fieldSchema: fieldSchema.map((field) => ({
+                        React.createElement(RenderFields, { readOnly: readOnly, fieldTypes: fieldTypes, key: rowIndex, permissions: permissions === null || permissions === void 0 ? void 0 : permissions.fields, fieldSchema: fieldSchema.map((field) => ({
                                 ...field,
                                 path: `${parentPath}.${rowIndex}${fieldAffectsData(field) ? `.${field.name}` : ''}`,
                             })) })))),

package/dist/admin/components/forms/Form/buildStateFromSchema.d.ts

@@ -1,4 +1,13 @@
+import { User } from '../../../../auth';
 import { Field as FieldSchema } from '../../../../fields/config/types';
 import { Fields, Data } from './types';
-declare const buildStateFromSchema: (fieldSchema: FieldSchema[], fullData?: Data) => Promise<Fields>;
+declare type Args = {
+    fieldSchema: FieldSchema[];
+    data?: Data;
+    siblingData?: Data;
+    user?: User;
+    id?: string | number;
+    operation?: 'create' | 'update';
+};
+declare const buildStateFromSchema: (args: Args) => Promise<Fields>;
 export default buildStateFromSchema;

package/dist/admin/components/forms/Form/buildStateFromSchema.js

@@ -1,10 +1,10 @@
 import ObjectID from 'bson-objectid';
-import { fieldAffectsData, fieldIsPresentationalOnly } from '../../../../fields/config/types';
-const buildValidationPromise = async (fieldState, field) => {
+import { fieldAffectsData, fieldIsPresentationalOnly, } from '../../../../fields/config/types';
+const buildValidationPromise = async (fieldState, options) => {
     const validatedFieldState = fieldState;
     let validationResult = true;
-    if (typeof field.validate === 'function') {
-        validationResult = await field.validate(fieldState.value, field);
+    if (typeof fieldState.validate === 'function') {
+        validationResult = await fieldState.validate(fieldState.value, options);
     }
     if (typeof validationResult === 'string') {
         validatedFieldState.errorMessage = validationResult;
@@ -14,7 +14,8 @@ const buildValidationPromise = async (fieldState, field) => {
         validatedFieldState.valid = true;
     }
 };
-const buildStateFromSchema = async (fieldSchema, fullData = {}) => {
+const buildStateFromSchema = async (args) => {
+    const { fieldSchema, data: fullData = {}, user, id, operation, } = args;
     if (fieldSchema) {
         const validationPromises = [];
         const structureFieldState = (field, passesCondition, data = {}) => {
@@ -28,7 +29,14 @@ const buildStateFromSchema = async (fieldSchema, fullData = {}) => {
                 condition: (_a = field.admin) === null || _a === void 0 ? void 0 : _a.condition,
                 passesCondition,
             };
-            validationPromises.push(buildValidationPromise(fieldState, field));
+            validationPromises.push(buildValidationPromise(fieldState, {
+                ...field,
+                fullData,
+                user,
+                siblingData: data,
+                id,
+                operation,
+            }));
             return fieldState;
         };
         const iterateFields = (fields, data, parentPassesCondition, path = '') => fields.reduce((state, field) => {

package/dist/admin/components/forms/Form/getDataByPath.js

@@ -1,19 +1,14 @@
 import { unflatten } from 'flatley';
-import reduceFieldsToValues from './reduceFieldsToValues';
 const getDataByPath = (fields, path) => {
     const pathPrefixToRemove = path.substring(0, path.lastIndexOf('.') + 1);
     const name = path.split('.').pop();
-    const data = Object.keys(fields).reduce((matchedData, key) => {
-        if (key.indexOf(`${path}.`) === 0 || key === path) {
-            return {
-                ...matchedData,
-                [key.replace(pathPrefixToRemove, '')]: fields[key],
-            };
+    const data = {};
+    Object.keys(fields).forEach((key) => {
+        if (!fields[key].disableFormData && (key.indexOf(`${path}.`) === 0 || key === path)) {
+            data[key.replace(pathPrefixToRemove, '')] = fields[key].value;
         }
-        return matchedData;
-    }, {});
-    const values = reduceFieldsToValues(data, true);
-    const unflattenedData = unflatten(values);
+    });
+    const unflattenedData = unflatten(data);
     return unflattenedData === null || unflattenedData === void 0 ? void 0 : unflattenedData[name];
 };
 export default getDataByPath;

package/dist/admin/components/forms/Form/getSiblingData.js

@@ -1,20 +1,18 @@
+import { unflatten } from 'flatley';
 import reduceFieldsToValues from './reduceFieldsToValues';
 const getSiblingData = (fields, path) => {
-    let siblingFields = fields;
+    if (path.indexOf('.') === -1) {
+        return reduceFieldsToValues(fields, true);
+    }
+    const siblingFields = {};
     // If this field is nested
     // We can provide a list of sibling fields
-    if (path.indexOf('.') > 0) {
-        const parentFieldPath = path.substring(0, path.lastIndexOf('.') + 1);
-        siblingFields = Object.keys(fields).reduce((siblings, fieldKey) => {
-            if (fieldKey.indexOf(parentFieldPath) === 0) {
-                return {
-                    ...siblings,
-                    [fieldKey.replace(parentFieldPath, '')]: fields[fieldKey],
-                };
-            }
-            return siblings;
-        }, {});
-    }
-    return reduceFieldsToValues(siblingFields, true);
+    const parentFieldPath = path.substring(0, path.lastIndexOf('.') + 1);
+    Object.keys(fields).forEach((fieldKey) => {
+        if (!fields[fieldKey].disableFormData && fieldKey.indexOf(parentFieldPath) === 0) {
+            siblingFields[fieldKey.replace(parentFieldPath, '')] = fields[fieldKey].value;
+        }
+    });
+    return unflatten(siblingFields, { safe: true });
 };
 export default getSiblingData;

package/dist/admin/components/forms/Form/index.js

@@ -1,10 +1,12 @@
 /* eslint-disable jsx-a11y/no-noninteractive-element-interactions */
 import React, { useReducer, useEffect, useRef, useState, useCallback, } from 'react';
+import isDeepEqual from 'deep-equal';
 import { serialize } from 'object-to-formdata';
 import { useHistory } from 'react-router-dom';
 import { toast } from 'react-toastify';
 import { useAuth } from '@payloadcms/config-provider';
 import { useLocale } from '../../utilities/Locale';
+import { useDocumentInfo } from '../../utilities/DocumentInfo';
 import { requests } from '../../../api';
 import useThrottledEffect from '../../../hooks/useThrottledEffect';
 import fieldReducer from './fieldReducer';
@@ -17,6 +19,7 @@ import buildInitialState from './buildInitialState';
 import errorMessages from './errorMessages';
 import { SubmittedContext, ProcessingContext, ModifiedContext, FormContext, FormWatchContext } from './context';
 import buildStateFromSchema from './buildStateFromSchema';
+import { useOperation } from '../../utilities/OperationProvider';
 const baseClass = 'form';
 const Form = (props) => {
     const { disabled, onSubmit, method, action, handleResponse, onSuccess, children, className, redirect, disableSuccessStatus, initialState, // fully formed initial field state
@@ -24,7 +27,9 @@ const Form = (props) => {
     waitForAutocomplete, log, } = props;
     const history = useHistory();
     const locale = useLocale();
-    const { refreshCookie } = useAuth();
+    const { refreshCookie, user } = useAuth();
+    const { id } = useDocumentInfo();
+    const operation = useOperation();
     const [modified, setModified] = useState(false);
     const [processing, setProcessing] = useState(false);
     const [submitted, setSubmitted] = useState(false);
@@ -43,6 +48,7 @@ const Form = (props) => {
     const validateForm = useCallback(async () => {
         const validatedFieldState = {};
         let isValid = true;
+        const data = contextRef.current.getData();
         const validationPromises = Object.entries(contextRef.current.fields).map(async ([path, field]) => {
             const validatedField = {
                 ...field,
@@ -51,7 +57,13 @@ const Form = (props) => {
             if (field.passesCondition !== false) {
                 let validationResult = true;
                 if (typeof field.validate === 'function') {
-                    validationResult = await field.validate(field.value);
+                    validationResult = await field.validate(field.value, {
+                        data,
+                        siblingData: contextRef.current.getSiblingData(path),
+                        user,
+                        id,
+                        operation,
+                    });
                 }
                 if (typeof validationResult === 'string') {
                     validatedField.errorMessage = validationResult;
@@ -62,9 +74,11 @@ const Form = (props) => {
             validatedFieldState[path] = validatedField;
         });
         await Promise.all(validationPromises);
-        dispatchFields({ type: 'REPLACE_STATE', state: validatedFieldState });
+        if (!isDeepEqual(contextRef.current.fields, validatedFieldState)) {
+            dispatchFields({ type: 'REPLACE_STATE', state: validatedFieldState });
+        }
         return isValid;
-    }, [contextRef]);
+    }, [contextRef, id, user, operation]);
     const submit = useCallback(async (options = {}, e) => {
         const { overrides = {}, action: actionToUse = action, method: methodToUse = method, skipValidation, } = options;
         if (disabled) {
@@ -233,10 +247,10 @@ const Form = (props) => {
         return formData;
     }, [contextRef]);
     const reset = useCallback(async (fieldSchema, data) => {
-        const state = await buildStateFromSchema(fieldSchema, data);
+        const state = await buildStateFromSchema({ fieldSchema, data, user, id, operation });
         contextRef.current = { ...initContextState };
         dispatchFields({ type: 'REPLACE_STATE', state });
-    }, []);
+    }, [id, user, operation]);
     contextRef.current.dispatchFields = dispatchFields;
     contextRef.current.submit = submit;
     contextRef.current.getFields = getFields;
@@ -270,6 +284,9 @@ const Form = (props) => {
     useThrottledEffect(() => {
         refreshCookie();
     }, 15000, [fields]);
+    useThrottledEffect(() => {
+        validateForm();
+    }, 1000, [validateForm, fields]);
     useEffect(() => {
         contextRef.current = { ...contextRef.current }; // triggers rerender of all components that subscribe to form
         setModified(false);

package/dist/admin/components/forms/Form/reduceFieldsToValues.d.ts

@@ -1,3 +1,3 @@
-import { Fields, Data } from './types';
+import { Data, Fields } from './types';
 declare const reduceFieldsToValues: (fields: Fields, unflatten?: boolean) => Data;
 export default reduceFieldsToValues;

package/dist/admin/components/forms/Form/reduceFieldsToValues.js

@@ -7,8 +7,7 @@ const reduceFieldsToValues = (fields, unflatten) => {
         }
     });
     if (unflatten) {
-        const unflattened = flatleyUnflatten(data, { safe: true });
-        return unflattened;
+        return flatleyUnflatten(data, { safe: true });
     }
     return data;
 };

package/dist/admin/components/forms/Form/types.d.ts

@@ -1,11 +1,11 @@
 /// <reference types="react" />
-import { Field as FieldConfig, Condition } from '../../../../fields/config/types';
+import { Field as FieldConfig, Condition, Validate } from '../../../../fields/config/types';
 export declare type Field = {
     value: unknown;
     initialValue: unknown;
     errorMessage?: string;
     valid: boolean;
-    validate?: (val: unknown) => Promise<boolean | string> | boolean | string;
+    validate?: Validate;
     disableFormData?: boolean;
     ignoreWhileFlattening?: boolean;
     condition?: Condition;
@@ -34,6 +34,7 @@ export declare type Props = {
     initialData?: Data;
     waitForAutocomplete?: boolean;
     log?: boolean;
+    validationOperation?: 'create' | 'update';
 };
 export declare type SubmitOptions = {
     action?: string;

package/dist/admin/components/forms/RenderFields/index.d.ts

@@ -1,5 +1,4 @@
 import React from 'react';
-import { Props, Context } from './types';
-export declare const useRenderedFields: () => Context;
+import { Props } from './types';
 declare const RenderFields: React.FC<Props>;
 export default RenderFields;

package/dist/admin/components/forms/RenderFields/index.js

@@ -1,31 +1,21 @@
-import React, { createContext, useEffect, useContext, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import RenderCustomComponent from '../../utilities/RenderCustomComponent';
 import useIntersect from '../../../hooks/useIntersect';
 import { fieldAffectsData, fieldIsPresentationalOnly } from '../../../../fields/config/types';
+import { useOperation } from '../../utilities/OperationProvider';
 const baseClass = 'render-fields';
 const intersectionObserverOptions = {
     rootMargin: '1000px',
 };
-const RenderedFieldContext = createContext({});
-export const useRenderedFields = () => useContext(RenderedFieldContext);
 const RenderFields = (props) => {
     var _a;
-    const { fieldSchema, fieldTypes, filter, permissions, readOnly: readOnlyOverride, operation: operationFromProps, className, } = props;
+    const { fieldSchema, fieldTypes, filter, permissions, readOnly: readOnlyOverride, className, } = props;
     const [hasRendered, setHasRendered] = useState(false);
     const [intersectionRef, entry] = useIntersect(intersectionObserverOptions);
+    const operation = useOperation();
     const isIntersecting = Boolean(entry === null || entry === void 0 ? void 0 : entry.isIntersecting);
     const isAboveViewport = ((_a = entry === null || entry === void 0 ? void 0 : entry.boundingClientRect) === null || _a === void 0 ? void 0 : _a.top) < 0;
     const shouldRender = isIntersecting || isAboveViewport;
-    const { operation: operationFromContext } = useRenderedFields();
-    const operation = operationFromProps || operationFromContext;
-    const [contextValue, setContextValue] = useState({
-        operation,
-    });
-    useEffect(() => {
-        setContextValue({
-            operation,
-        });
-    }, [operation]);
     useEffect(() => {
         if (shouldRender && !hasRendered) {
             setHasRendered(true);
@@ -36,7 +26,7 @@ const RenderFields = (props) => {
         className,
     ].filter(Boolean).join(' ');
     if (fieldSchema) {
-        return (React.createElement("div", { ref: intersectionRef, className: classes }, hasRendered && (React.createElement(RenderedFieldContext.Provider, { value: contextValue }, fieldSchema.map((field, i) => {
+        return (React.createElement("div", { ref: intersectionRef, className: classes }, hasRendered && (fieldSchema.map((field, i) => {
             var _a, _b, _c, _d, _e, _f, _g, _h;
             const fieldIsPresentational = fieldIsPresentationalOnly(field);
             let FieldComponent = fieldTypes[field.type];
@@ -80,7 +70,7 @@ const RenderFields = (props) => {
                 return null;
             }
             return null;
-        })))));
+        }))));
     }
     return null;
 };

package/dist/admin/components/forms/RenderFields/types.d.ts

@@ -1,13 +1,8 @@
 import { FieldPermissions } from '../../../../auth/types';
 import { FieldWithPath, Field } from '../../../../fields/config/types';
 import { FieldTypes } from '../field-types';
-export declare type Operation = 'create' | 'update';
-export declare type Context = {
-    operation: Operation;
-};
 export declare type Props = {
     className?: string;
-    operation?: Operation;
     readOnly?: boolean;
     permissions?: {
         [field: string]: FieldPermissions;

package/dist/admin/components/forms/field-types/Array/Array.js

@@ -1,5 +1,6 @@
-import React, { useEffect, useReducer, useCallback, useState } from 'react';
+import React, { useCallback, useEffect, useReducer, useState } from 'react';
 import { DragDropContext, Droppable } from 'react-beautiful-dnd';
+import { useAuth } from '@payloadcms/config-provider';
 import withCondition from '../../withCondition';
 import Button from '../../../elements/Button';
 import DraggableSection from '../../DraggableSection';
@@ -11,11 +12,13 @@ import Error from '../../Error';
 import { array } from '../../../../../fields/validations';
 import Banner from '../../../elements/Banner';
 import FieldDescription from '../../FieldDescription';
+import { useDocumentInfo } from '../../../utilities/DocumentInfo';
+import { useOperation } from '../../../utilities/OperationProvider';
 import './index.scss';
 const baseClass = 'field-type array';
 const ArrayFieldType = (props) => {
     var _a, _b;
-    const { name, path: pathFromProps, fields, fieldTypes, validate = array, required, maxRows, minRows, permissions, admin: { readOnly, description, condition, }, } = props;
+    const { name, path: pathFromProps, fields, fieldTypes, validate = array, required, maxRows, minRows, permissions, admin: { readOnly, description, condition, className, }, } = props;
     // Handle labeling for Arrays, Global Arrays, and Blocks
     const getLabels = (p) => {
         if (p === null || p === void 0 ? void 0 : p.labels)
@@ -29,12 +32,14 @@ const ArrayFieldType = (props) => {
     const label = (_a = props === null || props === void 0 ? void 0 : props.label) !== null && _a !== void 0 ? _a : (_b = props === null || props === void 0 ? void 0 : props.labels) === null || _b === void 0 ? void 0 : _b.singular;
     const [rows, dispatchRows] = useReducer(reducer, []);
     const formContext = useForm();
+    const { user } = useAuth();
+    const { id } = useDocumentInfo();
+    const operation = useOperation();
     const { dispatchFields } = formContext;
     const path = pathFromProps || name;
-    const memoizedValidate = useCallback((value) => {
-        const validationResult = validate(value, { minRows, maxRows, required });
-        return validationResult;
-    }, [validate, maxRows, minRows, required]);
+    const memoizedValidate = useCallback((value, options) => {
+        return validate(value, { ...options, minRows, maxRows, required });
+    }, [maxRows, minRows, required, validate]);
     const [disableFormData, setDisableFormData] = useState(false);
     const { showError, errorMessage, value, setValue, } = useField({
         path,
@@ -44,11 +49,11 @@ const ArrayFieldType = (props) => {
         condition,
     });
     const addRow = useCallback(async (rowIndex) => {
-        const subFieldState = await buildStateFromSchema(fields);
+        const subFieldState = await buildStateFromSchema({ fieldSchema: fields, operation, id, user });
         dispatchFields({ type: 'ADD_ROW', rowIndex, subFieldState, path });
         dispatchRows({ type: 'ADD', rowIndex });
         setValue(value + 1);
-    }, [dispatchRows, dispatchFields, fields, path, setValue, value]);
+    }, [dispatchRows, dispatchFields, fields, path, setValue, value, operation, id, user]);
     const removeRow = useCallback((rowIndex) => {
         dispatchRows({ type: 'REMOVE', rowIndex });
         dispatchFields({ type: 'REMOVE_ROW', rowIndex, path });
@@ -78,8 +83,12 @@ const ArrayFieldType = (props) => {
         }
     }, [rows, setValue]);
     const hasMaxRows = maxRows && rows.length >= maxRows;
+    const classes = [
+        baseClass,
+        className,
+    ].filter(Boolean).join(' ');
     return (React.createElement(DragDropContext, { onDragEnd: onDragEnd },
-        React.createElement("div", { className: baseClass },
+        React.createElement("div", { className: classes },
             React.createElement("div", { className: `${baseClass}__error-wrap` },
                 React.createElement(Error, { showError: showError, message: errorMessage })),
             React.createElement("header", { className: `${baseClass}__header` },

package/dist/admin/components/forms/field-types/Blocks/Blocks.js

@@ -1,5 +1,6 @@
-import React, { useEffect, useReducer, useCallback, useState, } from 'react';
+import React, { useCallback, useEffect, useReducer, useState } from 'react';
 import { DragDropContext, Droppable } from 'react-beautiful-dnd';
+import { useAuth } from '@payloadcms/config-provider';
 import { usePreferences } from '../../../utilities/Preferences';
 import withCondition from '../../withCondition';
 import Button from '../../../elements/Button';
@@ -15,6 +16,7 @@ import BlockSelector from './BlockSelector';
 import { blocks as blocksValidator } from '../../../../../fields/validations';
 import Banner from '../../../elements/Banner';
 import FieldDescription from '../../FieldDescription';
+import { useOperation } from '../../../utilities/OperationProvider';
 import './index.scss';
 const baseClass = 'field-type blocks';
 const labelDefaults = {
@@ -22,19 +24,19 @@ const labelDefaults = {
     plural: 'Blocks',
 };
 const Blocks = (props) => {
-    const { label, name, path: pathFromProps, blocks, labels = labelDefaults, fieldTypes, maxRows, minRows, required, validate = blocksValidator, permissions, admin: { readOnly, description, condition, }, } = props;
+    const { label, name, path: pathFromProps, blocks, labels = labelDefaults, fieldTypes, maxRows, minRows, required, validate = blocksValidator, permissions, admin: { readOnly, description, condition, className, }, } = props;
     const path = pathFromProps || name;
     const { preferencesKey } = useDocumentInfo();
     const { getPreference, setPreference } = usePreferences();
     const [rows, dispatchRows] = useReducer(reducer, []);
     const formContext = useForm();
+    const { user } = useAuth();
+    const { id } = useDocumentInfo();
+    const operation = useOperation();
     const { dispatchFields } = formContext;
-    const memoizedValidate = useCallback((value) => {
-        const validationResult = validate(value, {
-            minRows, maxRows, labels, blocks, required,
-        });
-        return validationResult;
-    }, [validate, maxRows, minRows, labels, blocks, required]);
+    const memoizedValidate = useCallback((value, options) => {
+        return validate(value, { ...options, minRows, maxRows, required });
+    }, [maxRows, minRows, required, validate]);
     const [disableFormData, setDisableFormData] = useState(false);
     const { showError, errorMessage, value, setValue, } = useField({
         path,
@@ -45,11 +47,11 @@ const Blocks = (props) => {
     });
     const addRow = useCallback(async (rowIndex, blockType) => {
         const block = blocks.find((potentialBlock) => potentialBlock.slug === blockType);
-        const subFieldState = await buildStateFromSchema(block.fields);
+        const subFieldState = await buildStateFromSchema({ fieldSchema: block.fields, operation, id, user });
         dispatchFields({ type: 'ADD_ROW', rowIndex, subFieldState, path, blockType });
         dispatchRows({ type: 'ADD', rowIndex, blockType });
         setValue(value + 1);
-    }, [path, setValue, value, blocks, dispatchFields]);
+    }, [path, setValue, value, blocks, dispatchFields, operation, id, user]);
     const removeRow = useCallback((rowIndex) => {
         dispatchRows({ type: 'REMOVE', rowIndex });
         dispatchFields({ type: 'REMOVE_ROW', rowIndex, path });
@@ -59,19 +61,19 @@ const Blocks = (props) => {
         dispatchRows({ type: 'MOVE', moveFromIndex, moveToIndex });
         dispatchFields({ type: 'MOVE_ROW', moveFromIndex, moveToIndex, path });
     }, [dispatchRows, dispatchFields, path]);
-    const setCollapse = useCallback(async (id, collapsed) => {
+    const setCollapse = useCallback(async (rowID, collapsed) => {
         var _a, _b, _c;
-        dispatchRows({ type: 'SET_COLLAPSE', id, collapsed });
+        dispatchRows({ type: 'SET_COLLAPSE', rowID, collapsed });
         if (preferencesKey) {
             const preferences = await getPreference(preferencesKey);
             const preferencesToSet = preferences || { fields: {} };
             let newCollapsedState = ((_b = (_a = preferencesToSet === null || preferencesToSet === void 0 ? void 0 : preferencesToSet.fields) === null || _a === void 0 ? void 0 : _a[path]) === null || _b === void 0 ? void 0 : _b.collapsed.filter((filterID) => (rows.find((row) => row.id === filterID))))
                 || [];
             if (!collapsed) {
-                newCollapsedState = newCollapsedState.filter((existingID) => existingID !== id);
+                newCollapsedState = newCollapsedState.filter((existingID) => existingID !== rowID);
             }
             else {
-                newCollapsedState.push(id);
+                newCollapsedState.push(rowID);
             }
             setPreference(preferencesKey, {
                 ...preferencesToSet,
@@ -118,8 +120,12 @@ const Blocks = (props) => {
         }
     }, [rows, setValue]);
     const hasMaxRows = maxRows && rows.length >= maxRows;
+    const classes = [
+        baseClass,
+        className,
+    ].filter(Boolean).join(' ');
     return (React.createElement(DragDropContext, { onDragEnd: onDragEnd },
-        React.createElement("div", { className: baseClass },
+        React.createElement("div", { className: classes },
             React.createElement("div", { className: `${baseClass}__error-wrap` },
                 React.createElement(Error, { showError: showError, message: errorMessage })),
             React.createElement("header", { className: `${baseClass}__header` },

package/dist/admin/components/forms/field-types/Checkbox/index.js

@@ -8,11 +8,10 @@ import FieldDescription from '../../FieldDescription';
 import './index.scss';
 const baseClass = 'checkbox';
 const Checkbox = (props) => {
-    const { name, path: pathFromProps, required, validate = checkbox, label, onChange, disableFormData, admin: { readOnly, style, className, width, description, condition, } = {}, } = props;
+    const { name, path: pathFromProps, validate = checkbox, label, onChange, disableFormData, required, admin: { readOnly, style, className, width, description, condition, } = {}, } = props;
     const path = pathFromProps || name;
-    const memoizedValidate = useCallback((value) => {
-        const validationResult = validate(value, { required });
-        return validationResult;
+    const memoizedValidate = useCallback((value, options) => {
+        return validate(value, { ...options, required });
     }, [validate, required]);
     const { value, showError, errorMessage, setValue, } = useField({
         path,

package/dist/admin/components/forms/field-types/Code/Code.js

@@ -11,7 +11,7 @@ import FieldDescription from '../../FieldDescription';
 import { code } from '../../../../../fields/validations';
 import './index.scss';
 const Code = (props) => {
-    const { path: pathFromProps, name, required, validate = code, admin: { readOnly, style, className, width, language, description, condition, } = {}, label, minLength, maxLength, } = props;
+    const { path: pathFromProps, name, required, validate = code, admin: { readOnly, style, className, width, language, description, condition, } = {}, label, } = props;
     const [highlighter] = useState(() => {
         if (languages[language]) {
             return (content) => highlight(content, languages[language]);
@@ -19,10 +19,9 @@ const Code = (props) => {
         return (content) => content;
     });
     const path = pathFromProps || name;
-    const memoizedValidate = useCallback((value) => {
-        const validationResult = validate(value, { minLength, maxLength, required });
-        return validationResult;
-    }, [validate, maxLength, minLength, required]);
+    const memoizedValidate = useCallback((value, options) => {
+        return validate(value, { ...options, required });
+    }, [validate, required]);
     const { value, showError, setValue, errorMessage, } = useField({
         path,
         validate: memoizedValidate,