payload 1.6.32 → 1.7.0

package/dist/utilities/flattenWhereConstraints.js

@@ -1,18 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const flattenWhereConstraints = (query) => {
-    if (!query.where && !query.and && !query.or) {
-        return Object.keys(query).map((key) => query[key]);
+// Take a where query and flatten it to all top-level operators
+const flattenWhereConstraints = (query) => Object.entries(query).reduce((flattenedConstraints, [key, val]) => {
+    if ((key === 'and' || key === 'or') && Array.isArray(val)) {
+        return [
+            ...flattenedConstraints,
+            ...val.map((subVal) => flattenWhereConstraints(subVal)),
+        ];
     }
-    if (query.where) {
-        const whereResult = flattenWhereConstraints(query.where);
-        return Object.keys(whereResult).map((key) => whereResult[key]);
-    }
-    const nested = [...query.or || [], ...query.and || []];
-    if (nested.length > 0) {
-        return nested.flatMap((nest) => flattenWhereConstraints(nest));
-    }
-    return query;
-};
+    return [
+        ...flattenedConstraints,
+        val,
+    ];
+}, []);
 exports.default = flattenWhereConstraints;
 //# sourceMappingURL=flattenWhereConstraints.js.map

package/dist/utilities/flattenWhereConstraints.js.map

@@ -1 +1 @@
-{"version":3,"file":"flattenWhereConstraints.js","sourceRoot":"","sources":["../../src/utilities/flattenWhereConstraints.ts"],"names":[],"mappings":";;AAEA,MAAM,uBAAuB,GAAG,CAAC,KAAK,EAAgB,EAAE;IACtD,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE;QAC3C,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;KACpD;IACD,IAAI,KAAK,CAAC,KAAK,EAAE;QACf,MAAM,WAAW,GAAG,uBAAuB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACzD,OAAO,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;KAChE;IACD,MAAM,MAAM,GAAG,CAAC,GAAG,KAAK,CAAC,EAAE,IAAI,EAAE,EAAE,GAAG,KAAK,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;IACvD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QACrB,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC,CAAC;KAChE;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,kBAAe,uBAAuB,CAAC"}
+{"version":3,"file":"flattenWhereConstraints.js","sourceRoot":"","sources":["../../src/utilities/flattenWhereConstraints.ts"],"names":[],"mappings":";;AAEA,+DAA+D;AAC/D,MAAM,uBAAuB,GAAG,CAAC,KAAY,EAAgB,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,oBAAoB,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE;IAChI,IAAI,CAAC,GAAG,KAAK,KAAK,IAAI,GAAG,KAAK,IAAI,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACzD,OAAO;YACL,GAAG,oBAAoB;YACvB,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;SACxD,CAAC;KACH;IAED,OAAO;QACL,GAAG,oBAAoB;QACvB,GAAG;KACJ,CAAC;AACJ,CAAC,EAAE,EAAE,CAAC,CAAC;AAEP,kBAAe,uBAAuB,CAAC"}

package/dist/utilities/getEntityPolicies.d.ts

@@ -1,19 +1,15 @@
 import { AllOperations } from '../types';
-import type { CollectionConfig } from '../collections/config/types';
-import type { GlobalConfig } from '../globals/config/types';
+import type { SanitizedCollectionConfig } from '../collections/config/types';
+import type { SanitizedGlobalConfig } from '../globals/config/types';
 import type { PayloadRequest } from '../express/types';
 import type { CollectionPermission, GlobalPermission } from '../auth/types';
-type Args = ({
+type Args = {
     req: PayloadRequest;
     operations: AllOperations[];
     id?: string;
-} & ({
-    type: 'collection';
-    entity: CollectionConfig;
-} | {
-    type: 'global';
-    entity: GlobalConfig;
-}));
+    type: 'collection' | 'global';
+    entity: SanitizedCollectionConfig | SanitizedGlobalConfig;
+};
 type ReturnType<T extends Args> = T['type'] extends 'global' ? [GlobalPermission, Promise<void>[]] : [CollectionPermission, Promise<void>[]];
 export declare function getEntityPolicies<T extends Args>(args: T): ReturnType<T>;
 export {};

package/dist/utilities/getEntityPolicies.js

@@ -71,9 +71,10 @@ function getEntityPolicies(args) {
             };
         }
     };
-    const executeFieldPolicies = ({ policiesObj = {}, fields, operation, }) => {
-        const mutablePolicies = policiesObj;
-        fields.forEach((field) => {
+    const executeFieldPolicies = async ({ policiesObj, fields, operation, entityAccessPromise, }) => {
+        const mutablePolicies = policiesObj.fields;
+        fields.forEach(async (field) => {
+            var _a;
             if (field.name) {
                 if (!mutablePolicies[field.name])
                     mutablePolicies[field.name] = {};
@@ -87,25 +88,29 @@ function getEntityPolicies(args) {
                     }));
                 }
                 else {
+                    if (entityAccessPromise)
+                        await entityAccessPromise;
                     mutablePolicies[field.name][operation] = {
-                        permission: isLoggedIn,
+                        permission: (_a = policiesObj[operation]) === null || _a === void 0 ? void 0 : _a.permission,
                     };
                 }
                 if (field.fields) {
                     if (!mutablePolicies[field.name].fields)
                         mutablePolicies[field.name].fields = {};
                     executeFieldPolicies({
-                        policiesObj: mutablePolicies[field.name].fields,
+                        policiesObj: mutablePolicies[field.name],
                         fields: field.fields,
                         operation,
+                        entityAccessPromise,
                     });
                 }
             }
             else if (field.fields) {
                 executeFieldPolicies({
-                    policiesObj: mutablePolicies,
+                    policiesObj,
                     fields: field.fields,
                     operation,
+                    entityAccessPromise,
                 });
             }
             else if (field.type === 'tabs') {
@@ -114,16 +119,18 @@ function getEntityPolicies(args) {
                         if (!mutablePolicies[tab.name])
                             mutablePolicies[tab.name] = { fields: {} };
                         executeFieldPolicies({
-                            policiesObj: mutablePolicies[tab.name].fields,
+                            policiesObj: mutablePolicies[tab.name],
                             fields: tab.fields,
                             operation,
+                            entityAccessPromise,
                         });
                     }
                     else {
                         executeFieldPolicies({
-                            policiesObj: mutablePolicies,
+                            policiesObj,
                             fields: tab.fields,
                             operation,
+                            entityAccessPromise,
                         });
                     }
                 });
@@ -131,24 +138,27 @@ function getEntityPolicies(args) {
         });
     };
     operations.forEach((operation) => {
-        executeFieldPolicies({
-            policiesObj: policies.fields,
-            fields: entity.fields,
-            operation,
-        });
+        let entityAccessPromise;
         if (typeof entity.access[operation] === 'function') {
-            promises.push(createAccessPromise({
+            entityAccessPromise = createAccessPromise({
                 policiesObj: policies,
                 access: entity.access[operation],
                 operation,
                 accessLevel: 'entity',
-            }));
+            });
+            promises.push(entityAccessPromise);
         }
         else {
             policies[operation] = {
                 permission: isLoggedIn,
             };
         }
+        executeFieldPolicies({
+            policiesObj: policies,
+            fields: entity.fields,
+            operation,
+            entityAccessPromise,
+        });
     });
     return [policies, promises];
 }

package/dist/utilities/getEntityPolicies.js.map

@@ -1 +1 @@
-{"version":3,"file":"getEntityPolicies.js","sourceRoot":"","sources":["../../src/utilities/getEntityPolicies.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getEntityPolicies.js","sourceRoot":"","sources":["../../src/utilities/getEntityPolicies.ts"],"names":[],"mappings":"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"}

package/dist/versions/drafts/queryDrafts.d.ts

@@ -1,16 +1,17 @@
 import { PaginateOptions } from 'mongoose';
 import { AccessResult } from '../../config/types';
-import { Where } from '../../types';
+import { PayloadRequest, Where } from '../../types';
 import { Payload } from '../../payload';
 import { PaginatedDocs } from '../../mongoose/types';
 import { Collection, TypeWithID } from '../../collections/config/types';
 type Args = {
     accessResult: AccessResult;
     collection: Collection;
-    locale: string;
+    req: PayloadRequest;
+    overrideAccess: boolean;
     paginationOptions?: PaginateOptions;
     payload: Payload;
     where: Where;
 };
-export declare const queryDrafts: <T extends TypeWithID>({ accessResult, collection, locale, payload, paginationOptions, where: incomingWhere, }: Args) => Promise<PaginatedDocs<T>>;
+export declare const queryDrafts: <T extends TypeWithID>({ accessResult, collection, req, overrideAccess, payload, paginationOptions, where: incomingWhere, }: Args) => Promise<PaginatedDocs<T>>;
 export {};

package/dist/versions/drafts/queryDrafts.js

@@ -3,23 +3,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.queryDrafts = void 0;
 const auth_1 = require("../../auth");
 const appendVersionToQueryKey_1 = require("./appendVersionToQueryKey");
-const queryDrafts = async ({ accessResult, collection, locale, payload, paginationOptions, where: incomingWhere, }) => {
+const queryDrafts = async ({ accessResult, collection, req, overrideAccess, payload, paginationOptions, where: incomingWhere, }) => {
     var _a;
     const VersionModel = payload.versions[collection.config.slug];
     const where = (0, appendVersionToQueryKey_1.appendVersionToQueryKey)(incomingWhere || {});
     const versionQueryToBuild = {
-        where: {
-            ...where,
-            and: [
-                ...(where === null || where === void 0 ? void 0 : where.and) || [],
-            ],
-        },
+        ...where,
+        and: [
+            ...(where === null || where === void 0 ? void 0 : where.and) || [],
+        ],
     };
     if ((0, auth_1.hasWhereAccessResult)(accessResult)) {
         const versionAccessResult = (0, appendVersionToQueryKey_1.appendVersionToQueryKey)(accessResult);
-        versionQueryToBuild.where.and.push(versionAccessResult);
+        versionQueryToBuild.and.push(versionAccessResult);
     }
-    const versionQuery = await VersionModel.buildQuery(versionQueryToBuild, locale);
+    const versionQuery = await VersionModel.buildQuery({
+        where: versionQueryToBuild,
+        req,
+        overrideAccess,
+    });
     const aggregate = VersionModel.aggregate([
         // Sort so that newest are first
         { $sort: { updatedAt: -1 } },

package/dist/versions/drafts/queryDrafts.js.map

@@ -1 +1 @@
-{"version":3,"file":"queryDrafts.js","sourceRoot":"","sources":["../../../src/versions/drafts/queryDrafts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"queryDrafts.js","sourceRoot":"","sources":["../../../src/versions/drafts/queryDrafts.ts"],"names":[],"mappings":"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"}

package/dist/versions/drafts/replaceWithDraftIfAvailable.d.ts

@@ -1,4 +1,5 @@
 import { Payload } from '../../payload';
+import { PayloadRequest } from '../../types';
 import { AccessResult } from '../../config/types';
 import { SanitizedCollectionConfig, TypeWithID } from '../../collections/config/types';
 import { SanitizedGlobalConfig } from '../../globals/config/types';
@@ -7,8 +8,9 @@ type Arguments<T> = {
     entity: SanitizedCollectionConfig | SanitizedGlobalConfig;
     entityType: 'collection' | 'global';
     doc: T;
-    locale: string;
+    req: PayloadRequest;
+    overrideAccess: boolean;
     accessResult: AccessResult;
 };
-declare const replaceWithDraftIfAvailable: <T extends TypeWithID>({ payload, entity, entityType, doc, locale, accessResult, }: Arguments<T>) => Promise<T>;
+declare const replaceWithDraftIfAvailable: <T extends TypeWithID>({ payload, entity, entityType, doc, req, overrideAccess, accessResult, }: Arguments<T>) => Promise<T>;
 export default replaceWithDraftIfAvailable;

package/dist/versions/drafts/replaceWithDraftIfAvailable.js

@@ -7,28 +7,26 @@ const types_1 = require("../../types");
 const auth_1 = require("../../auth");
 const sanitizeInternalFields_1 = __importDefault(require("../../utilities/sanitizeInternalFields"));
 const appendVersionToQueryKey_1 = require("./appendVersionToQueryKey");
-const replaceWithDraftIfAvailable = async ({ payload, entity, entityType, doc, locale, accessResult, }) => {
+const replaceWithDraftIfAvailable = async ({ payload, entity, entityType, doc, req, overrideAccess, accessResult, }) => {
     const VersionModel = payload.versions[entity.slug];
     const queryToBuild = {
-        where: {
-            and: [
-                {
-                    'version._status': {
-                        equals: 'draft',
-                    },
+        and: [
+            {
+                'version._status': {
+                    equals: 'draft',
                 },
-            ],
-        },
+            },
+        ],
     };
     if (entityType === 'collection') {
-        queryToBuild.where.and.push({
+        queryToBuild.and.push({
             parent: {
                 equals: doc.id,
             },
         });
     }
     if ((0, types_1.docHasTimestamps)(doc)) {
-        queryToBuild.where.and.push({
+        queryToBuild.and.push({
             updatedAt: {
                 greater_than: doc.updatedAt,
             },
@@ -36,9 +34,14 @@ const replaceWithDraftIfAvailable = async ({ payload, entity, entityType, doc, l
     }
     if ((0, auth_1.hasWhereAccessResult)(accessResult)) {
         const versionAccessResult = (0, appendVersionToQueryKey_1.appendVersionToQueryKey)(accessResult);
-        queryToBuild.where.and.push(versionAccessResult);
+        queryToBuild.and.push(versionAccessResult);
     }
-    const query = await VersionModel.buildQuery(queryToBuild, locale);
+    const query = await VersionModel.buildQuery({
+        where: queryToBuild,
+        req,
+        overrideAccess,
+        globalSlug: entityType === 'global' ? entity.slug : undefined,
+    });
     let draft = await VersionModel.findOne(query, {}, {
         lean: true,
         sort: { updatedAt: 'desc' },

package/dist/versions/drafts/replaceWithDraftIfAvailable.js.map

@@ -1 +1 @@
-{"version":3,"file":"replaceWithDraftIfAvailable.js","sourceRoot":"","sources":["../../../src/versions/drafts/replaceWithDraftIfAvailable.ts"],"names":[],"mappings":";;;;;AACA,uCAAsD;AACtD,qCAAkD;AAGlD,oGAA4E;AAC5E,uEAAoE;AAYpE,MAAM,2BAA2B,GAAG,KAAK,EAAwB,EAC/D,OAAO,EACP,MAAM,EACN,UAAU,EACV,GAAG,EACH,MAAM,EACN,YAAY,GACC,EAAc,EAAE;IAC7B,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAoB,CAAC;IAEtE,MAAM,YAAY,GAAqB;QACrC,KAAK,EAAE;YACL,GAAG,EAAE;gBACH;oBACE,iBAAiB,EAAE;wBACjB,MAAM,EAAE,OAAO;qBAChB;iBACF;aACF;SACF;KACF,CAAC;IAEF,IAAI,UAAU,KAAK,YAAY,EAAE;QAC/B,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC;YAC1B,MAAM,EAAE;gBACN,MAAM,EAAE,GAAG,CAAC,EAAE;aACf;SACF,CAAC,CAAC;KACJ;IAED,IAAI,IAAA,wBAAgB,EAAC,GAAG,CAAC,EAAE;QACzB,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC;YAC1B,SAAS,EAAE;gBACT,YAAY,EAAE,GAAG,CAAC,SAAS;aAC5B;SACF,CAAC,CAAC;KACJ;IAED,IAAI,IAAA,2BAAoB,EAAC,YAAY,CAAC,EAAE;QACtC,MAAM,mBAAmB,GAAG,IAAA,iDAAuB,EAAC,YAAY,CAAC,CAAC;QAClE,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;KAClD;IAED,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,UAAU,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IAElE,IAAI,KAAK,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE;QAChD,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE;KAC5B,CAAC,CAAC;IAEH,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,GAAG,CAAC;KACZ;IAED,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IAC1C,KAAK,GAAG,IAAA,gCAAsB,EAAC,KAAK,CAAC,CAAC;IAEtC,mDAAmD;IACnD,yCAAyC;IACzC,4CAA4C;IAC5C,OAAO;QACL,EAAE,EAAE,GAAG,CAAC,EAAE;QACV,GAAG,KAAK,CAAC,OAAO;QAChB,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,2BAA2B,CAAC"}
+{"version":3,"file":"replaceWithDraftIfAvailable.js","sourceRoot":"","sources":["../../../src/versions/drafts/replaceWithDraftIfAvailable.ts"],"names":[],"mappings":";;;;;AACA,uCAAsE;AACtE,qCAAkD;AAGlD,oGAA4E;AAC5E,uEAAoE;AAapE,MAAM,2BAA2B,GAAG,KAAK,EAAwB,EAC/D,OAAO,EACP,MAAM,EACN,UAAU,EACV,GAAG,EACH,GAAG,EACH,cAAc,EACd,YAAY,GACC,EAAc,EAAE;IAC7B,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAoB,CAAC;IAEtE,MAAM,YAAY,GAAU;QAC1B,GAAG,EAAE;YACH;gBACE,iBAAiB,EAAE;oBACjB,MAAM,EAAE,OAAO;iBAChB;aACF;SACF;KACF,CAAC;IAEF,IAAI,UAAU,KAAK,YAAY,EAAE;QAC/B,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC;YACpB,MAAM,EAAE;gBACN,MAAM,EAAE,GAAG,CAAC,EAAE;aACf;SACF,CAAC,CAAC;KACJ;IAED,IAAI,IAAA,wBAAgB,EAAC,GAAG,CAAC,EAAE;QACzB,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC;YACpB,SAAS,EAAE;gBACT,YAAY,EAAE,GAAG,CAAC,SAAS;aAC5B;SACF,CAAC,CAAC;KACJ;IAED,IAAI,IAAA,2BAAoB,EAAC,YAAY,CAAC,EAAE;QACtC,MAAM,mBAAmB,GAAG,IAAA,iDAAuB,EAAC,YAAY,CAAC,CAAC;QAClE,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;KAC5C;IAED,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,UAAU,CAAC;QAC1C,KAAK,EAAE,YAAY;QACnB,GAAG;QACH,cAAc;QACd,UAAU,EAAE,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;KAC9D,CAAC,CAAC;IAEH,IAAI,KAAK,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE;QAChD,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE;KAC5B,CAAC,CAAC;IAEH,IAAI,CAAC,KAAK,EAAE;QACV,OAAO,GAAG,CAAC;KACZ;IAED,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC;IAC1C,KAAK,GAAG,IAAA,gCAAsB,EAAC,KAAK,CAAC,CAAC;IAEtC,mDAAmD;IACnD,yCAAyC;IACzC,4CAA4C;IAC5C,OAAO;QACL,EAAE,EAAE,GAAG,CAAC,EAAE;QACV,GAAG,KAAK,CAAC,OAAO;QAChB,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,2BAA2B,CAAC"}

package/docs/access-control/collections.mdx

@@ -43,7 +43,7 @@ const Posts: CollectionConfig = {
   // highlight-end
 };
 
-export default Categories;
+export default Posts;
 ```
 
 ### Create

package/docs/admin/hooks.mdx

@@ -166,7 +166,6 @@ The `useDocumentInfo` hook provides lots of information about the document curre
 |---------------------------|--------------------------------------------------------------------------------------------------------------------|                                |
 | **`collection`**          | If the doc is a collection, its collection config will be returned                                                 |
 | **`global`**              | If the doc is a global, its global config will be returned                                                         |
-| **`type`**                | The type of document being edited (collection or global)                                                           |
 | **`id`**                  | If the doc is a collection, its ID will be returned                                                                |
 | **`preferencesKey`**      | The `preferences` key to use when interacting with document-level user preferences                                 |
 | **`versions`**            | Versions of the current doc                                                                                        |

package/docs/configuration/collections.mdx

@@ -63,18 +63,19 @@ You can find an assortment of [example collection configs](https://github.com/pa
 
 You can customize the way that the Admin panel behaves on a collection-by-collection basis by defining the `admin` property on a collection's config.
 
-| Option                      | Description  |
-| --------------------------- | -------------|
-| `group`                     | Text used as a label for grouping collection links together in the navigation. |
-| `hooks`                     | Admin-specific hooks for this collection. [More](#admin-hooks) |
-| `useAsTitle`                | Specify a top-level field to use for a document title throughout the Admin panel. If no field is defined, the ID of the document is used as the title. |
-| `description`               | Text or React component to display below the Collection label in the List view to give editors more information. |
-| `defaultColumns`            | Array of field names that correspond to which columns to show by default in this collection's List view. |
-| `disableDuplicate `         | Disables the "Duplicate" button while editing documents within this collection. |
+| Option                       | Description                                                                                                                                                                                           |
+|------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `group`                      | Text used as a label for grouping collection links together in the navigation.                                                                                                                        |
+| `hidden`                     | Set to true or a function, called with the current user, returning true to exclude this collection from navigation and admin routing.                                                                 |
+| `hooks`                      | Admin-specific hooks for this collection. [More](#admin-hooks)                                                                                                                                        |
+| `useAsTitle`                 | Specify a top-level field to use for a document title throughout the Admin panel. If no field is defined, the ID of the document is used as the title.                                                |
+| `description`                | Text or React component to display below the Collection label in the List view to give editors more information.                                                                                      |
+| `defaultColumns`             | Array of field names that correspond to which columns to show by default in this collection's List view.                                                                                              |
+| `disableDuplicate `          | Disables the "Duplicate" button while editing documents within this collection.                                                                                                                       |
 | `enableRichTextRelationship` | The [Rich Text](/docs/fields/rich-text) field features a `Relationship` element which allows for users to automatically reference related documents within their rich text. Set to `true` by default. |
-| `preview`                   | Function to generate preview URLS within the Admin panel that can point to your app. [More](#preview). |
-| `components`                | Swap in your own React components to be used within this collection. [More](/docs/admin/components#collections) |
-| `listSearchableFields`      | Specify which fields should be searched in the List search view. [More](#list-searchable-fields) |
+| `preview`                    | Function to generate preview URLS within the Admin panel that can point to your app. [More](#preview).                                                                                                |
+| `components`                 | Swap in your own React components to be used within this collection. [More](/docs/admin/components#collections)                                                                                       |
+| `listSearchableFields`       | Specify which fields should be searched in the List search view. [More](#list-searchable-fields)                                                                                                      |
 
 ### Preview
 

package/docs/configuration/express.mdx

@@ -8,6 +8,40 @@ keywords: config, configuration, documentation, Content Management System, cms,
 
 Payload utilizes a few Express-specific middleware packages within its own routers. You can customize how they work by passing in configuration options to the main Payload config's `express` property.
 
+### Custom Middleware
+
+Payload allows you to pass in custom Express middleware to be used on all of the routes it opens. This is useful for adding logging or any other custom functionality to your endpoints.
+
+There are 2 exposed properties. Each property is an array of middleware functions.
+
+- `preMiddleware` - runs before any of the Payload middleware
+- `postMiddleware` - runs after all of the Payload middleware
+
+```ts
+{
+  express: {
+    preMiddleware: [
+      (req, res, next) => {
+        // do something
+        next()
+      }
+    ],
+    postMiddleware: [
+      (req, res, next) => {
+        // do something
+        next()
+      }
+    ]
+  }
+}
+
+// Example logging middleware function
+const requestLoggerMiddleware = (req, res, next) => {
+  req.payload.logger.info(`request: ${req.method} ${req.url}`)
+  next()
+}
+```
+
 ### JSON
 
 `express.json()` is used to parse JSON body content into JavaScript objects accessible on the Express `req`. Payload allows you to customize all of the `json` method's options. Common examples of customization use-cases are increasing the max allowed JSON body size which defaults to `2MB`.

package/docs/configuration/globals.mdx

@@ -64,10 +64,11 @@ You can find an [example Global config](https://github.com/payloadcms/public-dem
 
 You can customize the way that the Admin panel behaves on a Global-by-Global basis by defining the `admin` property on a Global's config.
 
-| Option       | Description                                                                                                             |
-| ------------ | ----------------------------------------------------------------------------------------------------------------------- |
-| `components` | Swap in your own React components to be used within this Global. [More](/docs/admin/components#globals)                 |
-| `preview`    | Function to generate a preview URL within the Admin panel for this global that can point to your app. [More](#preview). |
+| Option       | Description                                                                                                                       |
+|--------------|-----------------------------------------------------------------------------------------------------------------------------------|
+| `hidden`     | Set to true or a function, called with the current user, returning true to exclude this global from navigation and admin routing. |
+| `components` | Swap in your own React components to be used within this Global. [More](/docs/admin/components#globals)                           |
+| `preview`    | Function to generate a preview URL within the Admin panel for this global that can point to your app. [More](#preview).           |
 
 ### Preview
 

package/docs/configuration/localization.mdx

@@ -72,6 +72,15 @@ All field types with a `name` property support the `localized` property—even t
   Enabling localization for field types that support nested fields will automatically create localized "sets" of all fields contained within the field. For example, if you have a page layout using a blocks field type, you have the choice of either localizing the full layout, by enabling localization on the top-level blocks field, or only certain fields within the layout.
 </Banner>
 
+<Banner type="warning">
+  <strong>Important:</strong>
+  <br />
+  When converting an existing field to or from `localized: true` the data
+  structure in the document will change for this field and so existing data for
+  this field will be lost. Before changing the localization setting on fields
+  with existing data, you may need to consider a field migration strategy.
+</Banner>
+
 ### Retrieving localized docs
 
 When retrieving documents, you can specify which locale you'd like to receive as well as which fallback locale should be used.

package/docs/fields/date.mdx

@@ -18,7 +18,7 @@ This field uses [`react-datepicker`](https://www.npmjs.com/package/react-datepic
 | Option             | Description                                                                                                                                                                                         |
 | ------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | **`name`** \*      | To be used as the property name when stored and retrieved from the database. [More](/docs/fields/overview#field-names)                                                                              |
-| **`label`**        | Text used as a field label in the Admin panel or an object with keys for each language.                                                                                                                    |
+| **`label`**        | Text used as a field label in the Admin panel or an object with keys for each language.                                                                                                             |
 | **`index`**        | Build a [MongoDB index](https://docs.mongodb.com/manual/indexes/) for this field to produce faster queries. Set this field to `true` if your users will perform queries on this field's data often. |
 | **`validate`**     | Provide a custom validation function that will be executed on both the Admin panel and the backend. [More](/docs/fields/overview#validation)                                                        |
 | **`saveToJWT`**    | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/config), include its data in the user JWT.                                                       |
@@ -28,7 +28,7 @@ This field uses [`react-datepicker`](https://www.npmjs.com/package/react-datepic
 | **`defaultValue`** | Provide data to be used for this field's default value. [More](/docs/fields/overview#default-values)                                                                                                |
 | **`localized`**    | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config.                                                                     |
 | **`required`**     | Require this field to have a value.                                                                                                                                                                 |
-| **`admin`**        | Admin-specific configuration. See below for [more detail](#admin-config).                                                                                                                                  |
+| **`admin`**        | Admin-specific configuration. See below for [more detail](#admin-config).                                                                                                                           |
 
 _\* An asterisk denotes that a property is required._
 
@@ -36,19 +36,19 @@ _\* An asterisk denotes that a property is required._
 
 In addition to the default [field admin config](/docs/fields/overview#admin-config), you can customize the following fields that will adjust how the component displays in the admin panel via the `date` property.
 
-| Property               |  Option                    | Description                                                                                                                             |
-| ---------------------- | -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- |
-| **`placeholder`**      |                            | Placeholder text for the field.                                                                                                         |
-| **`date`**             |                            | Pass options to customize date field appearance.                                                                                        |
-|                        | **`displayFormat`**        | Format date to be shown in field **cell**.                 |
-|                        | **`pickerAppearance`** \*  | Determines the appearance of the datepicker: `dayAndTime` `timeOnly` `dayOnly` `monthOnly`.                                             |
-|                        | **`monthsToShow`**     \*  | Number of months to display max is 2. Defaults to 1.                                                                                    |
-|                        | **`minDate`**          \*  | Min date value to allow.                               |
-|                        | **`maxDate`**          \*  | Max date value to allow.                               |
-|                        | **`minTime`**          \*  | Min time value to allow.                               |
-|                        | **`maxTime`**          \*  | Max date value to allow.                               |
-|                        | **`timeIntervals`**    \*  | Time intervals to display. Defaults to 30 minutes.     |
-|                        | **`timeFormat`**       \*  | Determines time format. Defaults to `'h:mm aa'`.       |
+| Property                       | Description                                                                                 |
+| ------------------------------ | ------------------------------------------------------------------------------------------- |
+| **`placeholder`**              | Placeholder text for the field.                                                             |
+| **`date`**                     | Pass options to customize date field appearance.                                            |
+| **`date.displayFormat`**       | Format date to be shown in field **cell**.                                                  |
+| **`date.pickerAppearance`** \* | Determines the appearance of the datepicker: `dayAndTime` `timeOnly` `dayOnly` `monthOnly`. |
+| **`date.monthsToShow`** \*     | Number of months to display max is 2. Defaults to 1.                                        |
+| **`date.minDate`** \*          | Min date value to allow.                                                                    |
+| **`date.maxDate`** \*          | Max date value to allow.                                                                    |
+| **`date.minTime`** \*          | Min time value to allow.                                                                    |
+| **`date.maxTime`** \*          | Max date value to allow.                                                                    |
+| **`date.timeIntervals`** \*    | Time intervals to display. Defaults to 30 minutes.                                          |
+| **`date.timeFormat`** \*       | Determines time format. Defaults to `'h:mm aa'`.                                            |
 
 _\* This property is passed directly to [react-datepicker](https://github.com/Hacker0x01/react-datepicker/blob/master/docs/datepicker.md). ._
 
@@ -60,48 +60,48 @@ These properties only affect how the date is displayed in the UI. The full date
 
 `pickerAppearance` sets the appearance of the **react datepicker**, the options available are `dayAndTime`, `dayOnly`, `timeOnly`, and `monthOnly`. By default, the datepicker will display `dayOnly`.
 
-When only `pickerAppearance`, an equivalent format will be rendered in the date field cell. To overwrite this format, set `displayFormat`.
+When only `pickerAppearance` is set, an equivalent format will be rendered in the date field cell. To overwrite this format, set `displayFormat`.
 
 ### Example
 
 `collections/ExampleCollection.ts`
 
 ```ts
-import { CollectionConfig } from 'payload/types';
+import { CollectionConfig } from "payload/types";
 
 const ExampleCollection: CollectionConfig = {
-  slug: 'example-collection',
+  slug: "example-collection",
   fields: [
-      {
-      name: 'dateOnly',
-      type: 'date',
+    {
+      name: "dateOnly",
+      type: "date",
       admin: {
         date: {
-          pickerAppearance: 'dayOnly',
-          displayFormat: 'd MMM yyy',
+          pickerAppearance: "dayOnly",
+          displayFormat: "d MMM yyy",
         },
       },
     },
     {
-      name: 'timeOnly',
-      type: 'date',
+      name: "timeOnly",
+      type: "date",
       admin: {
         date: {
-          pickerAppearance: 'timeOnly',
-          displayFormat: 'h:mm:ss a',
+          pickerAppearance: "timeOnly",
+          displayFormat: "h:mm:ss a",
         },
       },
     },
     {
-      name: 'monthOnly',
-      type: 'date',
+      name: "monthOnly",
+      type: "date",
       admin: {
         date: {
-          pickerAppearance: 'monthOnly',
-          displayFormat: 'MMMM yyyy',
+          pickerAppearance: "monthOnly",
+          displayFormat: "MMMM yyyy",
         },
       },
     },
-  ]
+  ],
 };
 ```

package/docs/fields/textarea.mdx

@@ -25,7 +25,7 @@ keywords: textarea, fields, config, configuration, documentation, Content Manage
 | **`hooks`**          | Provide field-based hooks to control logic for this field. [More](/docs/fields/overview#field-level-hooks) |
 | **`access`**         | Provide field-based access control to denote what users can see and do with this field's data. [More](/docs/fields/overview#field-level-access-control) |
 | **`hidden`**         | Restrict this field's visibility from all APIs entirely. Will still be saved to the database, but will not appear in any API or the Admin panel. |
-| **`defaultValue`**   | Provide data to be used for this field's default value. [More](/docs/fields/overview#default-values) [More](/docs/fields/overview#default-values) |
+| **`defaultValue`**   | Provide data to be used for this field's default value. [More](/docs/fields/overview#default-values)|
 | **`localized`**      | Enable localization for this field. Requires [localization to be enabled](/docs/configuration/localization) in the Base config. |
 | **`required`**       | Require this field to have a value. |
 | **`admin`**          | Admin-specific configuration. See below for [more detail](#admin-config). |