payload 0.15.12 → 0.16.1

package/.eslintrc.js

@@ -55,13 +55,14 @@ module.exports = {
     },
   ],
   rules: {
-    'no-sparse-arrays': 'off',
     'import/no-extraneous-dependencies': ['error', { packageDir: './' }],
     'react/jsx-filename-extension': [2, { extensions: ['.js', '.jsx', '.ts', '.tsx'] }],
     'import/prefer-default-export': 'off',
     'react/prop-types': 'off',
     'react/require-default-props': 'off',
     'react/no-unused-prop-types': 'off',
+    'no-console': 'warn',
+    'no-sparse-arrays': 'off',
     'no-underscore-dangle': 'off',
     'no-use-before-define': 'off',
     'arrow-body-style': 0,

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+## [0.16.1](https://github.com/payloadcms/payload/compare/v0.16.0...v0.16.1) (2022-04-29)
+
+
+### Features
+
+* exposes payload within server-side validation args ([e46b942](https://github.com/payloadcms/payload/commit/e46b94225957bba7758a0a2c22776c44a2d2d633))
+
+# [0.16.0](https://github.com/payloadcms/payload/compare/v0.15.13...v0.16.0) (2022-04-29)
+
+
+### Bug Fixes
+
+* file upload safely handles missing mimeTypes ([#540](https://github.com/payloadcms/payload/issues/540)) ([bf48fdf](https://github.com/payloadcms/payload/commit/bf48fdf18961a2e57bcc5aae73de4c569e97e42b))
+
+
+### Features
+
+* allow subfield readOnly to override parent readOnly ([#546](https://github.com/payloadcms/payload/issues/546)) ([834f4c2](https://github.com/payloadcms/payload/commit/834f4c270020bf32852c00a3abbb908853689006))
+* allows defaultValue to accept async function to calculate defaultValue ([#547](https://github.com/payloadcms/payload/issues/547)) ([e297eb9](https://github.com/payloadcms/payload/commit/e297eb90907d933524d220255d5f8dc4276358c5))
+
+## [0.15.13](https://github.com/payloadcms/payload/compare/v0.15.12...v0.15.13) (2022-04-26)
+
 ## [0.15.12](https://github.com/payloadcms/payload/compare/v0.15.11...v0.15.12) (2022-04-26)
 
 

package/dist/admin/components/elements/ReactSelect/types.d.ts

@@ -2,7 +2,7 @@ import { OptionsType, GroupedOptionsType } from 'react-select';
 export declare type Options = OptionsType<Value> | GroupedOptionsType<Value>;
 export declare type Value = {
     label: string;
-    value: string;
+    value: string | null;
     options?: Options;
 };
 export declare type Props = {

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

@@ -0,0 +1,18 @@
+import { User } from '../../../../../auth';
+import { NonPresentationalField } from '../../../../../fields/config/types';
+import { Fields, Data } from '../types';
+declare type Args = {
+    field: NonPresentationalField;
+    locale: string;
+    user: User;
+    state: Fields;
+    path: string;
+    passesCondition: boolean;
+    fieldPromises: Promise<void>[];
+    id: string | number;
+    operation: 'create' | 'update';
+    data: Data;
+    fullData: Data;
+};
+export declare const addFieldStatePromise: ({ field, locale, user, state, path, passesCondition, fullData, data, fieldPromises, id, operation, }: Args) => Promise<void>;
+export {};

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

@@ -0,0 +1,158 @@
+/* eslint-disable no-param-reassign */
+import ObjectID from 'bson-objectid';
+import { fieldAffectsData, fieldHasSubFields } from '../../../../../fields/config/types';
+import getValueWithDefault from '../../../../../fields/getDefaultValue';
+import { iterateFields } from './iterateFields';
+export const addFieldStatePromise = async ({ field, locale, user, state, path, passesCondition, fullData, data, fieldPromises, id, operation, }) => {
+    var _a;
+    if (fieldAffectsData(field)) {
+        const fieldState = {
+            valid: true,
+            value: undefined,
+            initialValue: undefined,
+            validate: field.validate,
+            condition: (_a = field.admin) === null || _a === void 0 ? void 0 : _a.condition,
+            passesCondition,
+        };
+        const valueWithDefault = await getValueWithDefault({ value: data[field.name], defaultValue: field.defaultValue, locale, user });
+        data[field.name] = valueWithDefault;
+        let validationResult = true;
+        if (typeof fieldState.validate === 'function') {
+            validationResult = await fieldState.validate(data[field.name], {
+                ...field,
+                data: fullData,
+                user,
+                siblingData: data,
+                id,
+                operation,
+            });
+        }
+        if (typeof validationResult === 'string') {
+            fieldState.errorMessage = validationResult;
+            fieldState.valid = false;
+        }
+        else {
+            fieldState.valid = true;
+        }
+        switch (field.type) {
+            case 'array': {
+                const arrayValue = Array.isArray(valueWithDefault) ? valueWithDefault : [];
+                arrayValue.forEach((row, i) => {
+                    const rowPath = `${path}${field.name}.${i}.`;
+                    state[`${rowPath}id`] = {
+                        value: row.id,
+                        initialValue: row.id || new ObjectID().toHexString(),
+                        valid: true,
+                    };
+                    iterateFields({
+                        state,
+                        fields: field.fields,
+                        data: row,
+                        parentPassesCondition: passesCondition,
+                        path: rowPath,
+                        user,
+                        fieldPromises,
+                        fullData,
+                        id,
+                        locale,
+                        operation,
+                    });
+                });
+                // Add values to field state
+                fieldState.value = arrayValue.length;
+                fieldState.initialValue = arrayValue.length;
+                if (arrayValue.length > 0) {
+                    fieldState.disableFormData = true;
+                }
+                // Add field to state
+                state[`${path}${field.name}`] = fieldState;
+                break;
+            }
+            case 'blocks': {
+                const blocksValue = Array.isArray(valueWithDefault) ? valueWithDefault : [];
+                blocksValue.forEach((row, i) => {
+                    const block = field.blocks.find((blockType) => blockType.slug === row.blockType);
+                    const rowPath = `${path}${field.name}.${i}.`;
+                    if (block) {
+                        state[`${rowPath}id`] = {
+                            value: row.id,
+                            initialValue: row.id || new ObjectID().toHexString(),
+                            valid: true,
+                        };
+                        state[`${rowPath}blockType`] = {
+                            value: row.blockType,
+                            initialValue: row.blockType,
+                            valid: true,
+                        };
+                        state[`${rowPath}blockName`] = {
+                            value: row.blockName,
+                            initialValue: row.blockName,
+                            valid: true,
+                        };
+                        iterateFields({
+                            state,
+                            fields: block.fields,
+                            data: row,
+                            fullData,
+                            parentPassesCondition: passesCondition,
+                            path: rowPath,
+                            user,
+                            locale,
+                            operation,
+                            fieldPromises,
+                            id,
+                        });
+                    }
+                });
+                // Add values to field state
+                fieldState.value = blocksValue.length;
+                fieldState.initialValue = blocksValue.length;
+                if (blocksValue.length > 0) {
+                    fieldState.disableFormData = true;
+                }
+                // Add field to state
+                state[`${path}${field.name}`] = fieldState;
+                break;
+            }
+            case 'group': {
+                iterateFields({
+                    state,
+                    id,
+                    operation,
+                    fieldPromises,
+                    fields: field.fields,
+                    data: data === null || data === void 0 ? void 0 : data[field.name],
+                    fullData,
+                    parentPassesCondition: passesCondition,
+                    path: `${path}${field.name}.`,
+                    locale,
+                    user,
+                });
+                break;
+            }
+            default: {
+                fieldState.value = valueWithDefault;
+                fieldState.initialValue = valueWithDefault;
+                // Add field to state
+                state[`${path}${field.name}`] = fieldState;
+                break;
+            }
+        }
+    }
+    else if (fieldHasSubFields(field)) {
+        // Handle field types that do not use names (row, etc)
+        iterateFields({
+            state,
+            fields: field.fields,
+            data,
+            parentPassesCondition: passesCondition,
+            path,
+            user,
+            fieldPromises,
+            fullData,
+            id,
+            locale,
+            operation,
+        });
+    }
+};

package/dist/admin/components/forms/Form/{buildStateFromSchema.d.ts → buildStateFromSchema/index.d.ts}

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

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

@@ -0,0 +1,25 @@
+import { iterateFields } from './iterateFields';
+const buildStateFromSchema = async (args) => {
+    const { fieldSchema, data: fullData = {}, user, id, operation, locale, } = args;
+    if (fieldSchema) {
+        const fieldPromises = [];
+        const state = {};
+        iterateFields({
+            state,
+            fields: fieldSchema,
+            id,
+            locale,
+            operation,
+            path: '',
+            user,
+            fieldPromises,
+            data: fullData,
+            fullData,
+            parentPassesCondition: true,
+        });
+        await Promise.all(fieldPromises);
+        return state;
+    }
+    return {};
+};
+export default buildStateFromSchema;

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

@@ -0,0 +1,18 @@
+import { User } from '../../../../../auth';
+import { Field as FieldSchema } from '../../../../../fields/config/types';
+import { Fields, Data } from '../types';
+declare type Args = {
+    state: Fields;
+    fields: FieldSchema[];
+    data: Data;
+    fullData: Data;
+    parentPassesCondition: boolean;
+    path: string;
+    user: User;
+    locale: string;
+    fieldPromises: Promise<void>[];
+    id: string | number;
+    operation: 'create' | 'update';
+};
+export declare const iterateFields: ({ fields, data, parentPassesCondition, path, fullData, user, locale, operation, fieldPromises, id, state, }: Args) => void;
+export {};

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

@@ -0,0 +1,24 @@
+import { fieldIsPresentationalOnly, } from '../../../../../fields/config/types';
+import { addFieldStatePromise } from './addFieldStatePromise';
+export const iterateFields = ({ fields, data, parentPassesCondition, path = '', fullData, user, locale, operation, fieldPromises, id, state, }) => {
+    fields.forEach((field) => {
+        var _a, _b;
+        const initialData = data;
+        if (!fieldIsPresentationalOnly(field) && !((_a = field === null || field === void 0 ? void 0 : field.admin) === null || _a === void 0 ? void 0 : _a.disabled)) {
+            const passesCondition = Boolean((((_b = field === null || field === void 0 ? void 0 : field.admin) === null || _b === void 0 ? void 0 : _b.condition) ? field.admin.condition(fullData || {}, initialData || {}) : true) && parentPassesCondition);
+            fieldPromises.push(addFieldStatePromise({
+                fullData,
+                id,
+                locale,
+                operation,
+                path,
+                state,
+                user,
+                fieldPromises,
+                field,
+                passesCondition,
+                data,
+            }));
+        }
+    });
+};

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

@@ -247,10 +247,10 @@ const Form = (props) => {
         return formData;
     }, [contextRef]);
     const reset = useCallback(async (fieldSchema, data) => {
-        const state = await buildStateFromSchema({ fieldSchema, data, user, id, operation });
+        const state = await buildStateFromSchema({ fieldSchema, data, user, id, operation, locale });
         contextRef.current = { ...initContextState };
         dispatchFields({ type: 'REPLACE_STATE', state });
-    }, [id, user, operation]);
+    }, [id, user, operation, locale]);
     contextRef.current.dispatchFields = dispatchFields;
     contextRef.current.submit = submit;
     contextRef.current.getFields = getFields;
@@ -295,10 +295,6 @@ const Form = (props) => {
         className,
         baseClass,
     ].filter(Boolean).join(' ');
-    if (log) {
-        // eslint-disable-next-line no-console
-        console.log(fields);
-    }
     return (React.createElement("form", { noValidate: true, onSubmit: (e) => contextRef.current.submit({}, e), method: method, action: action, className: classes, ref: formRef },
         React.createElement(FormContext.Provider, { value: contextRef.current },
             React.createElement(FormWatchContext.Provider, { value: {

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

@@ -41,7 +41,7 @@ const RenderFields = (props) => {
                     const isFieldAffectingData = fieldAffectsData(field);
                     const fieldPermissions = isFieldAffectingData ? permissions === null || permissions === void 0 ? void 0 : permissions[field.name] : permissions;
                     let { admin: { readOnly } = {} } = field;
-                    if (readOnlyOverride)
+                    if (readOnlyOverride && readOnly !== false)
                         readOnly = true;
                     if ((isFieldAffectingData && ((_d = (_c = permissions === null || permissions === void 0 ? void 0 : permissions[field === null || field === void 0 ? void 0 : field.name]) === null || _c === void 0 ? void 0 : _c.read) === null || _d === void 0 ? void 0 : _d.permission) !== false) || !isFieldAffectingData) {
                         if (isFieldAffectingData && ((_f = (_e = permissions === null || permissions === void 0 ? void 0 : permissions[field === null || field === void 0 ? void 0 : field.name]) === null || _e === void 0 ? void 0 : _e[operation]) === null || _f === void 0 ? void 0 : _f.permission) === false) {

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

@@ -8,6 +8,7 @@ import reducer from '../rowReducer';
 import { useForm } from '../../Form/context';
 import buildStateFromSchema from '../../Form/buildStateFromSchema';
 import useField from '../../useField';
+import { useLocale } from '../../../utilities/Locale';
 import Error from '../../Error';
 import { array } from '../../../../../fields/validations';
 import Banner from '../../../elements/Banner';
@@ -34,6 +35,7 @@ const ArrayFieldType = (props) => {
     const formContext = useForm();
     const { user } = useAuth();
     const { id } = useDocumentInfo();
+    const locale = useLocale();
     const operation = useOperation();
     const { dispatchFields } = formContext;
     const path = pathFromProps || name;
@@ -48,15 +50,16 @@ const ArrayFieldType = (props) => {
         condition,
     });
     const addRow = useCallback(async (rowIndex) => {
-        const subFieldState = await buildStateFromSchema({ fieldSchema: fields, operation, id, user });
+        const subFieldState = await buildStateFromSchema({ fieldSchema: fields, operation, id, user, locale });
         dispatchFields({ type: 'ADD_ROW', rowIndex, subFieldState, path });
         dispatchRows({ type: 'ADD', rowIndex });
         setValue(value + 1);
-    }, [dispatchRows, dispatchFields, fields, path, setValue, value, operation, id, user]);
+    }, [dispatchRows, dispatchFields, fields, path, setValue, value, operation, id, user, locale]);
     const removeRow = useCallback((rowIndex) => {
         dispatchRows({ type: 'REMOVE', rowIndex });
         dispatchFields({ type: 'REMOVE_ROW', rowIndex, path });
-    }, [dispatchRows, dispatchFields, path]);
+        setValue(value - 1);
+    }, [dispatchRows, dispatchFields, path, value, setValue]);
     const moveRow = useCallback((moveFromIndex, moveToIndex) => {
         dispatchRows({ type: 'MOVE', moveFromIndex, moveToIndex });
         dispatchFields({ type: 'MOVE_ROW', moveFromIndex, moveToIndex, path });

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

@@ -2,6 +2,7 @@ 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 { useLocale } from '../../../utilities/Locale';
 import withCondition from '../../withCondition';
 import Button from '../../../elements/Button';
 import reducer from '../rowReducer';
@@ -32,6 +33,7 @@ const Blocks = (props) => {
     const formContext = useForm();
     const { user } = useAuth();
     const { id } = useDocumentInfo();
+    const locale = useLocale();
     const operation = useOperation();
     const { dispatchFields } = formContext;
     const memoizedValidate = useCallback((value, options) => {
@@ -46,11 +48,11 @@ const Blocks = (props) => {
     });
     const addRow = useCallback(async (rowIndex, blockType) => {
         const block = blocks.find((potentialBlock) => potentialBlock.slug === blockType);
-        const subFieldState = await buildStateFromSchema({ fieldSchema: block.fields, operation, id, user });
+        const subFieldState = await buildStateFromSchema({ fieldSchema: block.fields, operation, id, user, locale });
         dispatchFields({ type: 'ADD_ROW', rowIndex, subFieldState, path, blockType });
         dispatchRows({ type: 'ADD', rowIndex, blockType });
         setValue(value + 1);
-    }, [path, setValue, value, blocks, dispatchFields, operation, id, user]);
+    }, [path, setValue, value, blocks, dispatchFields, operation, id, user, locale]);
     const removeRow = useCallback((rowIndex) => {
         dispatchRows({ type: 'REMOVE', rowIndex });
         dispatchFields({ type: 'REMOVE_ROW', rowIndex, path });

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

@@ -26,7 +26,7 @@ const Relationship = (props) => {
     const { getData, getSiblingData } = useWatchForm();
     const formProcessing = useFormProcessing();
     const hasMultipleRelations = Array.isArray(relationTo);
-    const [options, dispatchOptions] = useReducer(optionsReducer, required || hasMany ? [] : [{ value: 'null', label: 'None' }]);
+    const [options, dispatchOptions] = useReducer(optionsReducer, required || hasMany ? [] : [{ value: null, label: 'None' }]);
     const [lastFullyLoadedRelation, setLastFullyLoadedRelation] = useState(-1);
     const [lastLoadedPage, setLastLoadedPage] = useState(1);
     const [errorLoading, setErrorLoading] = useState('');
@@ -228,6 +228,8 @@ const Relationship = (props) => {
         readOnly && `${baseClass}--read-only`,
     ].filter(Boolean).join(' ');
     const valueToRender = (findOptionsByValue() || value);
+    if ((valueToRender === null || valueToRender === void 0 ? void 0 : valueToRender.value) === 'null')
+        valueToRender.value = null;
     return (React.createElement("div", { className: classes, style: {
             ...style,
             width,

package/dist/admin/components/forms/field-types/RichText/elements/upload/Element/EditModal/index.js

@@ -12,11 +12,13 @@ import Form from '../../../../../../Form';
 import reduceFieldsToValues from '../../../../../../Form/reduceFieldsToValues';
 import Submit from '../../../../../../Submit';
 import './index.scss';
+import { useLocale } from '../../../../../../../utilities/Locale';
 const baseClass = 'edit-upload-modal';
 export const EditModal = ({ slug, closeModal, relatedCollectionConfig, fieldSchema, element }) => {
     const editor = useSlateStatic();
     const [initialState, setInitialState] = useState({});
     const { user } = useAuth();
+    const locale = useLocale();
     const handleUpdateEditData = useCallback((fields) => {
         const newNode = {
             fields: reduceFieldsToValues(fields, true),
@@ -27,11 +29,11 @@ export const EditModal = ({ slug, closeModal, relatedCollectionConfig, fieldSche
     }, [closeModal, editor, element]);
     useEffect(() => {
         const awaitInitialState = async () => {
-            const state = await buildStateFromSchema({ fieldSchema, data: element === null || element === void 0 ? void 0 : element.fields, user, operation: 'update' });
+            const state = await buildStateFromSchema({ fieldSchema, data: element === null || element === void 0 ? void 0 : element.fields, user, operation: 'update', locale });
             setInitialState(state);
         };
         awaitInitialState();
-    }, [fieldSchema, element.fields, user]);
+    }, [fieldSchema, element.fields, user, locale]);
     return (React.createElement(Modal, { slug: slug, className: baseClass },
         React.createElement(MinimalTemplate, { width: "normal" },
             React.createElement("header", { className: `${baseClass}__header` },

package/dist/admin/components/views/Account/index.js

@@ -38,11 +38,11 @@ const AccountView = () => {
     }, [setStepNav]);
     useEffect(() => {
         const awaitInitialState = async () => {
-            const state = await buildStateFromSchema({ fieldSchema: fields, data: dataToRender, operation: 'update', id, user });
+            const state = await buildStateFromSchema({ fieldSchema: fields, data: dataToRender, operation: 'update', id, user, locale });
             setInitialState(state);
         };
         awaitInitialState();
-    }, [dataToRender, fields, id, user]);
+    }, [dataToRender, fields, id, user, locale]);
     return (React.createElement(NegativeFieldGutterProvider, { allow: true },
         React.createElement(RenderCustomComponent, { DefaultComponent: DefaultAccount, CustomComponent: CustomAccount, componentProps: {
                 action,

package/dist/admin/components/views/Global/index.js

@@ -22,9 +22,9 @@ const GlobalView = (props) => {
     const { slug, label, fields, admin: { components: { views: { Edit: CustomEdit, } = {}, } = {}, } = {}, } = global;
     const onSave = useCallback(async (json) => {
         getVersions();
-        const state = await buildStateFromSchema({ fieldSchema: fields, data: json.result, operation: 'update', user });
+        const state = await buildStateFromSchema({ fieldSchema: fields, data: json.result, operation: 'update', user, locale });
         setInitialState(state);
-    }, [getVersions, fields, user]);
+    }, [getVersions, fields, user, locale]);
     const [{ data, isLoading }] = usePayloadAPI(`${serverURL}${api}/globals/${slug}`, { initialParams: { 'fallback-locale': 'null', depth: 0, draft: 'true' } });
     const dataToRender = (locationState === null || locationState === void 0 ? void 0 : locationState.data) || data;
     useEffect(() => {
@@ -35,11 +35,11 @@ const GlobalView = (props) => {
     }, [setStepNav, label]);
     useEffect(() => {
         const awaitInitialState = async () => {
-            const state = await buildStateFromSchema({ fieldSchema: fields, data: dataToRender, user, operation: 'update' });
+            const state = await buildStateFromSchema({ fieldSchema: fields, data: dataToRender, user, operation: 'update', locale });
             setInitialState(state);
         };
         awaitInitialState();
-    }, [dataToRender, fields, user]);
+    }, [dataToRender, fields, user, locale]);
     const globalPermissions = (_a = permissions === null || permissions === void 0 ? void 0 : permissions.globals) === null || _a === void 0 ? void 0 : _a[slug];
     return (React.createElement(NegativeFieldGutterProvider, { allow: true },
         React.createElement(RenderCustomComponent, { DefaultComponent: DefaultGlobal, CustomComponent: CustomEdit, componentProps: {

package/dist/admin/components/views/collections/Edit/index.js

@@ -32,10 +32,10 @@ const EditView = (props) => {
             history.push(`${admin}/collections/${collection.slug}/${(_a = json === null || json === void 0 ? void 0 : json.doc) === null || _a === void 0 ? void 0 : _a.id}`);
         }
         else {
-            const state = await buildStateFromSchema({ fieldSchema: collection.fields, data: json.doc, user, id, operation: 'update' });
+            const state = await buildStateFromSchema({ fieldSchema: collection.fields, data: json.doc, user, id, operation: 'update', locale });
             setInitialState(state);
         }
-    }, [admin, collection, history, isEditing, getVersions, user, id]);
+    }, [admin, collection, history, isEditing, getVersions, user, id, locale]);
     const [{ data, isLoading, isError }] = usePayloadAPI((isEditing ? `${serverURL}${api}/${slug}/${id}` : null), { initialParams: { 'fallback-locale': 'null', depth: 0, draft: 'true' } });
     const dataToRender = (locationState === null || locationState === void 0 ? void 0 : locationState.data) || data;
     useEffect(() => {
@@ -70,12 +70,15 @@ const EditView = (props) => {
         setStepNav(nav);
     }, [setStepNav, isEditing, pluralLabel, dataToRender, slug, useAsTitle, admin]);
     useEffect(() => {
+        if (isLoading) {
+            return;
+        }
         const awaitInitialState = async () => {
-            const state = await buildStateFromSchema({ fieldSchema: fields, data: dataToRender, user, operation: isEditing ? 'update' : 'create', id });
+            const state = await buildStateFromSchema({ fieldSchema: fields, data: dataToRender, user, operation: isEditing ? 'update' : 'create', id, locale });
             setInitialState(state);
         };
         awaitInitialState();
-    }, [dataToRender, fields, isEditing, id, user]);
+    }, [dataToRender, fields, isEditing, id, user, locale, isLoading]);
     if (isError) {
         return (React.createElement(Redirect, { to: `${admin}/not-found` }));
     }

package/dist/collections/tests/defaultValue.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/collections/tests/defaultValue.spec.js

@@ -0,0 +1,95 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const load_1 = __importDefault(require("../../config/load"));
+const testCredentials_1 = require("../../mongoose/testCredentials");
+require('isomorphic-fetch');
+const { serverURL: url } = (0, load_1.default)();
+let token = null;
+let headers = null;
+describe('DefaultValue - REST', () => {
+    beforeAll(async (done) => {
+        const response = await fetch(`${url}/api/admins/login`, {
+            body: JSON.stringify({
+                email: testCredentials_1.email,
+                password: testCredentials_1.password,
+            }),
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            method: 'post',
+        });
+        const data = await response.json();
+        ({ token } = data);
+        headers = {
+            Authorization: `JWT ${token}`,
+            'Content-Type': 'application/json',
+        };
+        done();
+    });
+    describe('DefaultValues', () => {
+        let document;
+        beforeAll(async (done) => {
+            const result = await fetch(`${url}/api/default-values`, {
+                body: JSON.stringify({}),
+                headers,
+                method: 'post',
+            });
+            const data = await result.json();
+            document = data.doc;
+            done();
+        });
+        it('should create with defaultValues saved', async () => {
+            expect(document.id).toBeDefined();
+            expect(document.function).toStrictEqual('function');
+            expect(document.asyncText).toStrictEqual('asyncFunction');
+            expect(document.array[0].arrayText1).toStrictEqual('Get out');
+            expect(document.group.nestedText1).toStrictEqual('this should take priority');
+            expect(document.group.nestedText2).toStrictEqual('nested default text 2');
+            expect(document.group.nestedText3).toStrictEqual('neat');
+        });
+        it('should not overwrite other locales when updating', async () => {
+            const slug = 'updated';
+            const esSlug = 'spanish';
+            const createResult = await fetch(`${url}/api/default-values`, {
+                body: JSON.stringify({
+                    text: 'unique',
+                    slug: 'unique',
+                }),
+                headers,
+                method: 'post',
+            });
+            const createData = await createResult.json();
+            const { id } = createData.doc;
+            const enResult = await fetch(`${url}/api/default-values/${id}?locale=en`, {
+                body: JSON.stringify({
+                    slug,
+                }),
+                headers,
+                method: 'put',
+            });
+            const enData = await enResult.json();
+            const esResult = await fetch(`${url}/api/default-values/${id}?locale=es`, {
+                body: JSON.stringify({
+                    slug: esSlug,
+                }),
+                headers,
+                method: 'put',
+            });
+            const esData = await esResult.json();
+            const allResult = await fetch(`${url}/api/default-values/${id}?locale=all`, {
+                headers,
+                method: 'get',
+            });
+            const allData = await allResult.json();
+            expect(createData.doc.slug).toStrictEqual('unique');
+            expect(enData.doc.slug).toStrictEqual(slug);
+            expect(esData.doc.slug).toStrictEqual(esSlug);
+            expect(allData.slug.en).toStrictEqual(slug);
+            expect(allData.slug.es).toStrictEqual(esSlug);
+        });
+    });
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmYXVsdFZhbHVlLnNwZWMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvY29sbGVjdGlvbnMvdGVzdHMvZGVmYXVsdFZhbHVlLnNwZWMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSw2REFBMEM7QUFDMUMsb0VBQWlFO0FBRWpFLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDO0FBRTVCLE1BQU0sRUFBRSxTQUFTLEVBQUUsR0FBRyxFQUFFLEdBQUcsSUFBQSxjQUFTLEdBQUUsQ0FBQztBQUV2QyxJQUFJLEtBQUssR0FBRyxJQUFJLENBQUM7QUFDakIsSUFBSSxPQUFPLEdBQUcsSUFBSSxDQUFDO0FBRW5CLFFBQVEsQ0FBQyxxQkFBcUIsRUFBRSxHQUFHLEVBQUU7SUFDbkMsU0FBUyxDQUFDLEtBQUssRUFBRSxJQUFJLEVBQUUsRUFBRTtRQUN2QixNQUFNLFFBQVEsR0FBRyxNQUFNLEtBQUssQ0FBQyxHQUFHLEdBQUcsbUJBQW1CLEVBQUU7WUFDdEQsSUFBSSxFQUFFLElBQUksQ0FBQyxTQUFTLENBQUM7Z0JBQ25CLEtBQUssRUFBTCx1QkFBSztnQkFDTCxRQUFRLEVBQVIsMEJBQVE7YUFDVCxDQUFDO1lBQ0YsT0FBTyxFQUFFO2dCQUNQLGNBQWMsRUFBRSxrQkFBa0I7YUFDbkM7WUFDRCxNQUFNLEVBQUUsTUFBTTtTQUNmLENBQUMsQ0FBQztRQUVILE1BQU0sSUFBSSxHQUFHLE1BQU0sUUFBUSxDQUFDLElBQUksRUFBRSxDQUFDO1FBRW5DLENBQUMsRUFBRSxLQUFLLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQztRQUNuQixPQUFPLEdBQUc7WUFDUixhQUFhLEVBQUUsT0FBTyxLQUFLLEVBQUU7WUFDN0IsY0FBYyxFQUFFLGtCQUFrQjtTQUNuQyxDQUFDO1FBRUYsSUFBSSxFQUFFLENBQUM7SUFDVCxDQUFDLENBQUMsQ0FBQztJQUVILFFBQVEsQ0FBQyxlQUFlLEVBQUUsR0FBRyxFQUFFO1FBQzdCLElB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