diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4228e9fceb..7e92edac15 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -310,6 +310,7 @@ jobs:
- fields__collections__Upload
- live-preview
- localization
+ - locked-documents
- i18n
- plugin-cloud-storage
- plugin-form-builder
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 6a90755195..43bdde6cb7 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -118,6 +118,13 @@
"request": "launch",
"type": "node-terminal"
},
+ {
+ "command": "node --no-deprecation test/dev.js locked-documents",
+ "cwd": "${workspaceFolder}",
+ "name": "Run Dev Locked Documents",
+ "request": "launch",
+ "type": "node-terminal"
+ },
{
"command": "node --no-deprecation test/dev.js uploads",
"cwd": "${workspaceFolder}",
diff --git a/docs/admin/locked-documents.mdx b/docs/admin/locked-documents.mdx
new file mode 100644
index 0000000000..eddb22f414
--- /dev/null
+++ b/docs/admin/locked-documents.mdx
@@ -0,0 +1,60 @@
+---
+title: Document Locking
+label: Document Locking
+order: 90
+desc: Ensure your documents are locked while being edited, preventing concurrent edits from multiple users and preserving data integrity.
+keywords: locking, document locking, edit locking, document, concurrency, Payload, headless, Content Management System, cms, javascript, react, node, nextjs
+---
+
+Document locking in Payload ensures that only one user at a time can edit a document, preventing data conflicts and accidental overwrites. When a document is locked, other users are prevented from making changes until the lock is released, ensuring data integrity in collaborative environments.
+
+The lock is automatically triggered when a user begins editing a document within the Admin Panel and remains in place until the user exits the editing view or the lock expires due to inactivity.
+
+## How it works
+
+When a user starts editing a document, Payload locks the document for that user. If another user tries to access the same document, they will be notified that it is currently being edited and can choose one of the following options:
+
+- View in Read-Only Mode: View the document without making any changes.
+- Take Over Editing: Take over editing from the current user, which locks the document for the new editor and notifies the original user.
+- Return to Dashboard: Navigate away from the locked document and continue with other tasks.
+
+The lock will automatically expire after a set period of inactivity, configurable using the duration property in the lockDocuments configuration, after which others can resume editing.
+
+Note: If your application does not require document locking, you can disable this feature for any collection by setting the lockDocuments property to false.
+
+### Config Options
+
+The lockDocuments property exists on both the Collection Config and the Global Config. By default, document locking is enabled for all collections and globals, but you can customize the lock duration or disable the feature entirely.
+
+Here’s an example configuration for document locking:
+
+```ts
+import { CollectionConfig } from 'payload'
+
+export const Posts: CollectionConfig = {
+ slug: 'posts',
+ fields: [
+ {
+ name: 'title',
+ type: 'text',
+ },
+ // other fields...
+ ],
+ lockDocuments: {
+ duration: 600, // Duration in seconds
+ },
+}
+```
+
+#### Locking Options
+
+| Option | Description |
+| ------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| **`lockDocuments`** | Enables or disables document locking for the collection or global. By default, document locking is enabled. Set to an object to configure, or set to false to disable locking. |
+| **`duration`** | Specifies the duration (in seconds) for how long a document remains locked without user interaction. The default is 300 seconds (5 minutes). |
+
+### Impact on APIs
+
+Document locking affects both the Local API and the REST API, ensuring that if a document is locked, concurrent users will not be able to perform updates or deletes on that document (including globals). If a user attempts to update or delete a locked document, they will receive an error.
+
+Once the document is unlocked or the lock duration has expired, other users can proceed with updates or deletes as normal.
diff --git a/docs/configuration/collections.mdx b/docs/configuration/collections.mdx
index fc86672106..e1180ff8b1 100644
--- a/docs/configuration/collections.mdx
+++ b/docs/configuration/collections.mdx
@@ -57,25 +57,26 @@ export const Posts: CollectionConfig = {
The following options are available:
-| Option | Description |
-|------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| **`admin`** | The configuration options for the Admin Panel. [More details](../admin/collections). |
-| **`access`** | Provide Access Control functions to define exactly who should be able to do what with Documents in this Collection. [More details](../access-control/collections). |
-| **`auth`** | Specify options if you would like this Collection to feature authentication. [More details](../authentication/overview). |
-| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
-| **`disableDuplicate`** | When true, do not show the "Duplicate" button while editing documents within this Collection and prevent `duplicate` from all APIs. |
-| **`defaultSort`** | Pass a top-level field to sort by default in the Collection List View. Prefix the name of the field with a minus symbol ("-") to sort in descending order. |
-| **`dbName`** | Custom table or Collection name depending on the Database Adapter. Auto-generated from slug if not defined. |
-| **`endpoints`** | Add custom routes to the REST API. Set to `false` to disable routes. [More details](../rest-api/overview#custom-endpoints). |
-| **`fields`** \* | Array of field types that will determine the structure and functionality of the data stored within this Collection. [More details](../fields/overview). |
-| **`graphQL`** | An object with `singularName` and `pluralName` strings used in schema generation. Auto-generated from slug if not defined. Set to `false` to disable GraphQL. |
-| **`hooks`** | Entry point for Hooks. [More details](../hooks/overview#collection-hooks). |
-| **`labels`** | Singular and plural labels for use in identifying this Collection throughout Payload. Auto-generated from slug if not defined. |
-| **`slug`** \* | Unique, URL-friendly string that will act as an identifier for this Collection. |
-| **`timestamps`** | Set to false to disable documents' automatically generated `createdAt` and `updatedAt` timestamps. |
-| **`typescript`** | An object with property `interface` as the text used in schema generation. Auto-generated from slug if not defined. |
-| **`upload`** | Specify options if you would like this Collection to support file uploads. For more, consult the [Uploads](../upload/overview) documentation. |
-| **`versions`** | Set to true to enable default options, or configure with object properties. [More details](../versions/overview#collection-config). |
+| Option | Description |
+|------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **`admin`** | The configuration options for the Admin Panel. [More details](../admin/collections). |
+| **`access`** | Provide Access Control functions to define exactly who should be able to do what with Documents in this Collection. [More details](../access-control/collections). |
+| **`auth`** | Specify options if you would like this Collection to feature authentication. [More details](../authentication/overview). |
+| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
+| **`disableDuplicate`** | When true, do not show the "Duplicate" button while editing documents within this Collection and prevent `duplicate` from all APIs. |
+| **`defaultSort`** | Pass a top-level field to sort by default in the Collection List View. Prefix the name of the field with a minus symbol ("-") to sort in descending order. |
+| **`dbName`** | Custom table or Collection name depending on the Database Adapter. Auto-generated from slug if not defined. |
+| **`endpoints`** | Add custom routes to the REST API. Set to `false` to disable routes. [More details](../rest-api/overview#custom-endpoints). |
+| **`fields`** \* | Array of field types that will determine the structure and functionality of the data stored within this Collection. [More details](../fields/overview). |
+| **`graphQL`** | An object with `singularName` and `pluralName` strings used in schema generation. Auto-generated from slug if not defined. Set to `false` to disable GraphQL. |
+| **`hooks`** | Entry point for Hooks. [More details](../hooks/overview#collection-hooks). |
+| **`labels`** | Singular and plural labels for use in identifying this Collection throughout Payload. Auto-generated from slug if not defined. |
+| **`lockDocuments`** | Enables or disables document locking. By default, document locking is enabled. Set to an object to configure, or set to `false` to disable locking. [More details](../admin/locked-documents). |
+| **`slug`** \* | Unique, URL-friendly string that will act as an identifier for this Collection. |
+| **`timestamps`** | Set to false to disable documents' automatically generated `createdAt` and `updatedAt` timestamps. |
+| **`typescript`** | An object with property `interface` as the text used in schema generation. Auto-generated from slug if not defined. |
+| **`upload`** | Specify options if you would like this Collection to support file uploads. For more, consult the [Uploads](../upload/overview) documentation. |
+| **`versions`** | Set to true to enable default options, or configure with object properties. [More details](../versions/overview#collection-config). |
_\* An asterisk denotes that a property is required._
diff --git a/docs/configuration/globals.mdx b/docs/configuration/globals.mdx
index 8b95b47721..766430e818 100644
--- a/docs/configuration/globals.mdx
+++ b/docs/configuration/globals.mdx
@@ -65,21 +65,22 @@ export const Nav: GlobalConfig = {
The following options are available:
-| Option | Description |
-| ------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **`access`** | Provide Access Control functions to define exactly who should be able to do what with this Global. [More details](../access-control/globals). |
-| **`admin`** | The configuration options for the Admin Panel. [More details](../admin/globals). |
-| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
-| **`dbName`** | Custom table or collection name for this Global depending on the Database Adapter. Auto-generated from slug if not defined. |
-| **`description`** | Text or React component to display below the Global header to give editors more information. |
-| **`endpoints`** | Add custom routes to the REST API. [More details](../rest-api/overview#custom-endpoints). |
-| **`fields`** \* | Array of field types that will determine the structure and functionality of the data stored within this Global. [More details](../fields/overview). |
-| **`graphQL.name`** | Text used in schema generation. Auto-generated from slug if not defined. |
-| **`hooks`** | Entry point for Hooks. [More details](../hooks/overview#global-hooks). |
-| **`label`** | Text for the name in the Admin Panel or an object with keys for each language. Auto-generated from slug if not defined. |
-| **`slug`** \* | Unique, URL-friendly string that will act as an identifier for this Global. |
-| **`typescript`** | An object with property `interface` as the text used in schema generation. Auto-generated from slug if not defined. |
-| **`versions`** | Set to true to enable default options, or configure with object properties. [More details](../versions/overview#globals-config). |
+| Option | Description |
+| ------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **`access`** | Provide Access Control functions to define exactly who should be able to do what with this Global. [More details](../access-control/globals). |
+| **`admin`** | The configuration options for the Admin Panel. [More details](../admin/globals). |
+| **`custom`** | Extension point for adding custom data (e.g. for plugins) |
+| **`dbName`** | Custom table or collection name for this Global depending on the Database Adapter. Auto-generated from slug if not defined. |
+| **`description`** | Text or React component to display below the Global header to give editors more information. |
+| **`endpoints`** | Add custom routes to the REST API. [More details](../rest-api/overview#custom-endpoints). |
+| **`fields`** \* | Array of field types that will determine the structure and functionality of the data stored within this Global. [More details](../fields/overview). |
+| **`graphQL.name`** | Text used in schema generation. Auto-generated from slug if not defined. |
+| **`hooks`** | Entry point for Hooks. [More details](../hooks/overview#global-hooks). |
+| **`label`** | Text for the name in the Admin Panel or an object with keys for each language. Auto-generated from slug if not defined. |
+| **`lockDocuments`** | Enables or disables document locking. By default, document locking is enabled. Set to an object to configure, or set to `false` to disable locking. [More details](../admin/locked-documents). |
+| **`slug`** \* | Unique, URL-friendly string that will act as an identifier for this Global. |
+| **`typescript`** | An object with property `interface` as the text used in schema generation. Auto-generated from slug if not defined. |
+| **`versions`** | Set to true to enable default options, or configure with object properties. [More details](../versions/overview#globals-config). |
_\* An asterisk denotes that a property is required._
diff --git a/examples/custom-components/src/app/(payload)/admin/importMap.js b/examples/custom-components/src/app/(payload)/admin/importMap.js
index 714f16c62a..f8ca17e969 100644
--- a/examples/custom-components/src/app/(payload)/admin/importMap.js
+++ b/examples/custom-components/src/app/(payload)/admin/importMap.js
@@ -55,59 +55,108 @@ import { CustomDefaultRootView as CustomDefaultRootView_53 } from '@/components/
import { CustomMinimalRootView as CustomMinimalRootView_54 } from '@/components/views/CustomMinimalRootView'
export const importMap = {
- "@/collections/Fields/array/components/server/Label#CustomArrayFieldLabelServer": CustomArrayFieldLabelServer_0,
- "@/collections/Fields/array/components/server/Field#CustomArrayFieldServer": CustomArrayFieldServer_1,
- "@/collections/Fields/array/components/client/Label#CustomArrayFieldLabelClient": CustomArrayFieldLabelClient_2,
- "@/collections/Fields/array/components/client/Field#CustomArrayFieldClient": CustomArrayFieldClient_3,
- "@/collections/Fields/blocks/components/server/Field#CustomBlocksFieldServer": CustomBlocksFieldServer_4,
- "@/collections/Fields/blocks/components/client/Field#CustomBlocksFieldClient": CustomBlocksFieldClient_5,
- "@/collections/Fields/checkbox/components/server/Label#CustomCheckboxFieldLabelServer": CustomCheckboxFieldLabelServer_6,
- "@/collections/Fields/checkbox/components/server/Field#CustomCheckboxFieldServer": CustomCheckboxFieldServer_7,
- "@/collections/Fields/checkbox/components/client/Label#CustomCheckboxFieldLabelClient": CustomCheckboxFieldLabelClient_8,
- "@/collections/Fields/checkbox/components/client/Field#CustomCheckboxFieldClient": CustomCheckboxFieldClient_9,
- "@/collections/Fields/date/components/server/Label#CustomDateFieldLabelServer": CustomDateFieldLabelServer_10,
- "@/collections/Fields/date/components/server/Field#CustomDateFieldServer": CustomDateFieldServer_11,
- "@/collections/Fields/date/components/client/Label#CustomDateFieldLabelClient": CustomDateFieldLabelClient_12,
- "@/collections/Fields/date/components/client/Field#CustomDateFieldClient": CustomDateFieldClient_13,
- "@/collections/Fields/email/components/server/Label#CustomEmailFieldLabelServer": CustomEmailFieldLabelServer_14,
- "@/collections/Fields/email/components/server/Field#CustomEmailFieldServer": CustomEmailFieldServer_15,
- "@/collections/Fields/email/components/client/Label#CustomEmailFieldLabelClient": CustomEmailFieldLabelClient_16,
- "@/collections/Fields/email/components/client/Field#CustomEmailFieldClient": CustomEmailFieldClient_17,
- "@/collections/Fields/number/components/server/Label#CustomNumberFieldLabelServer": CustomNumberFieldLabelServer_18,
- "@/collections/Fields/number/components/server/Field#CustomNumberFieldServer": CustomNumberFieldServer_19,
- "@/collections/Fields/number/components/client/Label#CustomNumberFieldLabelClient": CustomNumberFieldLabelClient_20,
- "@/collections/Fields/number/components/client/Field#CustomNumberFieldClient": CustomNumberFieldClient_21,
- "@/collections/Fields/point/components/server/Label#CustomPointFieldLabelServer": CustomPointFieldLabelServer_22,
- "@/collections/Fields/point/components/server/Field#CustomPointFieldServer": CustomPointFieldServer_23,
- "@/collections/Fields/point/components/client/Label#CustomPointFieldLabelClient": CustomPointFieldLabelClient_24,
- "@/collections/Fields/point/components/client/Field#CustomPointFieldClient": CustomPointFieldClient_25,
- "@/collections/Fields/radio/components/server/Label#CustomRadioFieldLabelServer": CustomRadioFieldLabelServer_26,
- "@/collections/Fields/radio/components/server/Field#CustomRadioFieldServer": CustomRadioFieldServer_27,
- "@/collections/Fields/radio/components/client/Label#CustomRadioFieldLabelClient": CustomRadioFieldLabelClient_28,
- "@/collections/Fields/radio/components/client/Field#CustomRadioFieldClient": CustomRadioFieldClient_29,
- "@/collections/Fields/relationship/components/server/Label#CustomRelationshipFieldLabelServer": CustomRelationshipFieldLabelServer_30,
- "@/collections/Fields/relationship/components/server/Field#CustomRelationshipFieldServer": CustomRelationshipFieldServer_31,
- "@/collections/Fields/relationship/components/client/Label#CustomRelationshipFieldLabelClient": CustomRelationshipFieldLabelClient_32,
- "@/collections/Fields/relationship/components/client/Field#CustomRelationshipFieldClient": CustomRelationshipFieldClient_33,
- "@/collections/Fields/select/components/server/Label#CustomSelectFieldLabelServer": CustomSelectFieldLabelServer_34,
- "@/collections/Fields/select/components/server/Field#CustomSelectFieldServer": CustomSelectFieldServer_35,
- "@/collections/Fields/select/components/client/Label#CustomSelectFieldLabelClient": CustomSelectFieldLabelClient_36,
- "@/collections/Fields/select/components/client/Field#CustomSelectFieldClient": CustomSelectFieldClient_37,
- "@/collections/Fields/text/components/server/Label#CustomTextFieldLabelServer": CustomTextFieldLabelServer_38,
- "@/collections/Fields/text/components/server/Field#CustomTextFieldServer": CustomTextFieldServer_39,
- "@/collections/Fields/text/components/client/Label#CustomTextFieldLabelClient": CustomTextFieldLabelClient_40,
- "@/collections/Fields/text/components/client/Field#CustomTextFieldClient": CustomTextFieldClient_41,
- "@/collections/Fields/textarea/components/server/Label#CustomTextareaFieldLabelServer": CustomTextareaFieldLabelServer_42,
- "@/collections/Fields/textarea/components/server/Field#CustomTextareaFieldServer": CustomTextareaFieldServer_43,
- "@/collections/Fields/textarea/components/client/Label#CustomTextareaFieldLabelClient": CustomTextareaFieldLabelClient_44,
- "@/collections/Fields/textarea/components/client/Field#CustomTextareaFieldClient": CustomTextareaFieldClient_45,
- "@/collections/Views/components/CustomTabEditView#CustomTabEditView": CustomTabEditView_46,
- "@/collections/Views/components/CustomDefaultEditView#CustomDefaultEditView": CustomDefaultEditView_47,
- "@/collections/RootViews/components/CustomRootEditView#CustomRootEditView": CustomRootEditView_48,
- "@/components/afterNavLinks/LinkToCustomView#LinkToCustomView": LinkToCustomView_49,
- "@/components/afterNavLinks/LinkToCustomMinimalView#LinkToCustomMinimalView": LinkToCustomMinimalView_50,
- "@/components/afterNavLinks/LinkToCustomDefaultView#LinkToCustomDefaultView": LinkToCustomDefaultView_51,
- "@/components/views/CustomRootView#CustomRootView": CustomRootView_52,
- "@/components/views/CustomDefaultRootView#CustomDefaultRootView": CustomDefaultRootView_53,
- "@/components/views/CustomMinimalRootView#CustomMinimalRootView": CustomMinimalRootView_54
+ '@/collections/Fields/array/components/server/Label#CustomArrayFieldLabelServer':
+ CustomArrayFieldLabelServer_0,
+ '@/collections/Fields/array/components/server/Field#CustomArrayFieldServer':
+ CustomArrayFieldServer_1,
+ '@/collections/Fields/array/components/client/Label#CustomArrayFieldLabelClient':
+ CustomArrayFieldLabelClient_2,
+ '@/collections/Fields/array/components/client/Field#CustomArrayFieldClient':
+ CustomArrayFieldClient_3,
+ '@/collections/Fields/blocks/components/server/Field#CustomBlocksFieldServer':
+ CustomBlocksFieldServer_4,
+ '@/collections/Fields/blocks/components/client/Field#CustomBlocksFieldClient':
+ CustomBlocksFieldClient_5,
+ '@/collections/Fields/checkbox/components/server/Label#CustomCheckboxFieldLabelServer':
+ CustomCheckboxFieldLabelServer_6,
+ '@/collections/Fields/checkbox/components/server/Field#CustomCheckboxFieldServer':
+ CustomCheckboxFieldServer_7,
+ '@/collections/Fields/checkbox/components/client/Label#CustomCheckboxFieldLabelClient':
+ CustomCheckboxFieldLabelClient_8,
+ '@/collections/Fields/checkbox/components/client/Field#CustomCheckboxFieldClient':
+ CustomCheckboxFieldClient_9,
+ '@/collections/Fields/date/components/server/Label#CustomDateFieldLabelServer':
+ CustomDateFieldLabelServer_10,
+ '@/collections/Fields/date/components/server/Field#CustomDateFieldServer':
+ CustomDateFieldServer_11,
+ '@/collections/Fields/date/components/client/Label#CustomDateFieldLabelClient':
+ CustomDateFieldLabelClient_12,
+ '@/collections/Fields/date/components/client/Field#CustomDateFieldClient':
+ CustomDateFieldClient_13,
+ '@/collections/Fields/email/components/server/Label#CustomEmailFieldLabelServer':
+ CustomEmailFieldLabelServer_14,
+ '@/collections/Fields/email/components/server/Field#CustomEmailFieldServer':
+ CustomEmailFieldServer_15,
+ '@/collections/Fields/email/components/client/Label#CustomEmailFieldLabelClient':
+ CustomEmailFieldLabelClient_16,
+ '@/collections/Fields/email/components/client/Field#CustomEmailFieldClient':
+ CustomEmailFieldClient_17,
+ '@/collections/Fields/number/components/server/Label#CustomNumberFieldLabelServer':
+ CustomNumberFieldLabelServer_18,
+ '@/collections/Fields/number/components/server/Field#CustomNumberFieldServer':
+ CustomNumberFieldServer_19,
+ '@/collections/Fields/number/components/client/Label#CustomNumberFieldLabelClient':
+ CustomNumberFieldLabelClient_20,
+ '@/collections/Fields/number/components/client/Field#CustomNumberFieldClient':
+ CustomNumberFieldClient_21,
+ '@/collections/Fields/point/components/server/Label#CustomPointFieldLabelServer':
+ CustomPointFieldLabelServer_22,
+ '@/collections/Fields/point/components/server/Field#CustomPointFieldServer':
+ CustomPointFieldServer_23,
+ '@/collections/Fields/point/components/client/Label#CustomPointFieldLabelClient':
+ CustomPointFieldLabelClient_24,
+ '@/collections/Fields/point/components/client/Field#CustomPointFieldClient':
+ CustomPointFieldClient_25,
+ '@/collections/Fields/radio/components/server/Label#CustomRadioFieldLabelServer':
+ CustomRadioFieldLabelServer_26,
+ '@/collections/Fields/radio/components/server/Field#CustomRadioFieldServer':
+ CustomRadioFieldServer_27,
+ '@/collections/Fields/radio/components/client/Label#CustomRadioFieldLabelClient':
+ CustomRadioFieldLabelClient_28,
+ '@/collections/Fields/radio/components/client/Field#CustomRadioFieldClient':
+ CustomRadioFieldClient_29,
+ '@/collections/Fields/relationship/components/server/Label#CustomRelationshipFieldLabelServer':
+ CustomRelationshipFieldLabelServer_30,
+ '@/collections/Fields/relationship/components/server/Field#CustomRelationshipFieldServer':
+ CustomRelationshipFieldServer_31,
+ '@/collections/Fields/relationship/components/client/Label#CustomRelationshipFieldLabelClient':
+ CustomRelationshipFieldLabelClient_32,
+ '@/collections/Fields/relationship/components/client/Field#CustomRelationshipFieldClient':
+ CustomRelationshipFieldClient_33,
+ '@/collections/Fields/select/components/server/Label#CustomSelectFieldLabelServer':
+ CustomSelectFieldLabelServer_34,
+ '@/collections/Fields/select/components/server/Field#CustomSelectFieldServer':
+ CustomSelectFieldServer_35,
+ '@/collections/Fields/select/components/client/Label#CustomSelectFieldLabelClient':
+ CustomSelectFieldLabelClient_36,
+ '@/collections/Fields/select/components/client/Field#CustomSelectFieldClient':
+ CustomSelectFieldClient_37,
+ '@/collections/Fields/text/components/server/Label#CustomTextFieldLabelServer':
+ CustomTextFieldLabelServer_38,
+ '@/collections/Fields/text/components/server/Field#CustomTextFieldServer':
+ CustomTextFieldServer_39,
+ '@/collections/Fields/text/components/client/Label#CustomTextFieldLabelClient':
+ CustomTextFieldLabelClient_40,
+ '@/collections/Fields/text/components/client/Field#CustomTextFieldClient':
+ CustomTextFieldClient_41,
+ '@/collections/Fields/textarea/components/server/Label#CustomTextareaFieldLabelServer':
+ CustomTextareaFieldLabelServer_42,
+ '@/collections/Fields/textarea/components/server/Field#CustomTextareaFieldServer':
+ CustomTextareaFieldServer_43,
+ '@/collections/Fields/textarea/components/client/Label#CustomTextareaFieldLabelClient':
+ CustomTextareaFieldLabelClient_44,
+ '@/collections/Fields/textarea/components/client/Field#CustomTextareaFieldClient':
+ CustomTextareaFieldClient_45,
+ '@/collections/Views/components/CustomTabEditView#CustomTabEditView': CustomTabEditView_46,
+ '@/collections/Views/components/CustomDefaultEditView#CustomDefaultEditView':
+ CustomDefaultEditView_47,
+ '@/collections/RootViews/components/CustomRootEditView#CustomRootEditView': CustomRootEditView_48,
+ '@/components/afterNavLinks/LinkToCustomView#LinkToCustomView': LinkToCustomView_49,
+ '@/components/afterNavLinks/LinkToCustomMinimalView#LinkToCustomMinimalView':
+ LinkToCustomMinimalView_50,
+ '@/components/afterNavLinks/LinkToCustomDefaultView#LinkToCustomDefaultView':
+ LinkToCustomDefaultView_51,
+ '@/components/views/CustomRootView#CustomRootView': CustomRootView_52,
+ '@/components/views/CustomDefaultRootView#CustomDefaultRootView': CustomDefaultRootView_53,
+ '@/components/views/CustomMinimalRootView#CustomMinimalRootView': CustomMinimalRootView_54,
}
diff --git a/packages/graphql/src/schema/buildObjectType.ts b/packages/graphql/src/schema/buildObjectType.ts
index 97682a688d..b77748b0d3 100644
--- a/packages/graphql/src/schema/buildObjectType.ts
+++ b/packages/graphql/src/schema/buildObjectType.ts
@@ -261,21 +261,34 @@ export function buildObjectType({
let type
let relationToType = null
+ const graphQLCollections = config.collections.filter(
+ (collectionConfig) => collectionConfig.graphQL !== false,
+ )
+
if (Array.isArray(relationTo)) {
relationToType = new GraphQLEnumType({
name: `${relationshipName}_RelationTo`,
- values: relationTo.reduce(
- (relations, relation) => ({
- ...relations,
- [formatName(relation)]: {
- value: relation,
- },
- }),
- {},
- ),
+ values: relationTo
+ .filter((relation) =>
+ graphQLCollections.some((collection) => collection.slug === relation),
+ )
+ .reduce(
+ (relations, relation) => ({
+ ...relations,
+ [formatName(relation)]: {
+ value: relation,
+ },
+ }),
+ {},
+ ),
})
- const types = relationTo.map((relation) => graphqlResult.collections[relation].graphQL.type)
+ // Only pass collections that are GraphQL enabled
+ const types = relationTo
+ .filter((relation) =>
+ graphQLCollections.some((collection) => collection.slug === relation),
+ )
+ .map((relation) => graphqlResult.collections[relation]?.graphQL.type)
type = new GraphQLObjectType({
name: `${relationshipName}_Relationship`,
@@ -314,9 +327,9 @@ export function buildObjectType({
where?: unknown
} = {}
- const relationsUseDrafts = (Array.isArray(relationTo) ? relationTo : [relationTo]).some(
- (relation) => graphqlResult.collections[relation].config.versions?.drafts,
- )
+ const relationsUseDrafts = (Array.isArray(relationTo) ? relationTo : [relationTo])
+ .filter((relation) => graphQLCollections.some((collection) => collection.slug === relation))
+ .some((relation) => graphqlResult.collections[relation].config.versions?.drafts)
if (relationsUseDrafts) {
relationshipArgs.draft = {
@@ -357,37 +370,39 @@ export function buildObjectType({
let id = relatedDoc
let collectionSlug = field.relationTo
- if (isRelatedToManyCollections) {
- collectionSlug = relatedDoc.relationTo
- id = relatedDoc.value
- }
-
- const result = await context.req.payloadDataLoader.load(
- createDataloaderCacheKey({
- collectionSlug: collectionSlug as string,
- currentDepth: 0,
- depth: 0,
- docID: id,
- draft,
- fallbackLocale,
- locale,
- overrideAccess: false,
- showHiddenFields: false,
- transactionID: context.req.transactionID,
- }),
- )
-
- if (result) {
+ if (graphQLCollections.some((collection) => collection.slug === collectionSlug)) {
if (isRelatedToManyCollections) {
- results[i] = {
- relationTo: collectionSlug,
- value: {
- ...result,
- collection: collectionSlug,
- },
+ collectionSlug = relatedDoc.relationTo
+ id = relatedDoc.value
+ }
+
+ const result = await context.req.payloadDataLoader.load(
+ createDataloaderCacheKey({
+ collectionSlug: collectionSlug as string,
+ currentDepth: 0,
+ depth: 0,
+ docID: id,
+ draft,
+ fallbackLocale,
+ locale,
+ overrideAccess: false,
+ showHiddenFields: false,
+ transactionID: context.req.transactionID,
+ }),
+ )
+
+ if (result) {
+ if (isRelatedToManyCollections) {
+ results[i] = {
+ relationTo: collectionSlug,
+ value: {
+ ...result,
+ collection: collectionSlug,
+ },
+ }
+ } else {
+ results[i] = result
}
- } else {
- results[i] = result
}
}
}
@@ -409,33 +424,37 @@ export function buildObjectType({
}
if (id) {
- const relatedDocument = await context.req.payloadDataLoader.load(
- createDataloaderCacheKey({
- collectionSlug: relatedCollectionSlug as string,
- currentDepth: 0,
- depth: 0,
- docID: id,
- draft,
- fallbackLocale,
- locale,
- overrideAccess: false,
- showHiddenFields: false,
- transactionID: context.req.transactionID,
- }),
- )
+ if (
+ graphQLCollections.some((collection) => collection.slug === relatedCollectionSlug)
+ ) {
+ const relatedDocument = await context.req.payloadDataLoader.load(
+ createDataloaderCacheKey({
+ collectionSlug: relatedCollectionSlug as string,
+ currentDepth: 0,
+ depth: 0,
+ docID: id,
+ draft,
+ fallbackLocale,
+ locale,
+ overrideAccess: false,
+ showHiddenFields: false,
+ transactionID: context.req.transactionID,
+ }),
+ )
- if (relatedDocument) {
- if (isRelatedToManyCollections) {
- return {
- relationTo: relatedCollectionSlug,
- value: {
- ...relatedDocument,
- collection: relatedCollectionSlug,
- },
+ if (relatedDocument) {
+ if (isRelatedToManyCollections) {
+ return {
+ relationTo: relatedCollectionSlug,
+ value: {
+ ...relatedDocument,
+ collection: relatedCollectionSlug,
+ },
+ }
}
- }
- return relatedDocument
+ return relatedDocument
+ }
}
return null
diff --git a/packages/next/src/elements/DocumentLocked/index.scss b/packages/next/src/elements/DocumentLocked/index.scss
new file mode 100644
index 0000000000..d2e6d392dd
--- /dev/null
+++ b/packages/next/src/elements/DocumentLocked/index.scss
@@ -0,0 +1,37 @@
+@import '../../scss/styles.scss';
+
+.document-locked {
+ @include blur-bg;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ height: 100%;
+
+ &__wrapper {
+ z-index: 1;
+ position: relative;
+ display: flex;
+ flex-direction: column;
+ gap: var(--base);
+ padding: base(2);
+ }
+
+ &__content {
+ display: flex;
+ flex-direction: column;
+ gap: var(--base);
+
+ > * {
+ margin: 0;
+ }
+ }
+
+ &__controls {
+ display: flex;
+ gap: var(--base);
+
+ .btn {
+ margin: 0;
+ }
+ }
+}
diff --git a/packages/next/src/elements/DocumentLocked/index.tsx b/packages/next/src/elements/DocumentLocked/index.tsx
new file mode 100644
index 0000000000..d839fda573
--- /dev/null
+++ b/packages/next/src/elements/DocumentLocked/index.tsx
@@ -0,0 +1,93 @@
+'use client'
+import type { ClientUser } from 'payload'
+
+import { Button, Modal, useModal, useTranslation } from '@payloadcms/ui'
+import React, { useEffect } from 'react'
+
+import './index.scss'
+
+const modalSlug = 'document-locked'
+
+const baseClass = 'document-locked'
+
+const formatDate = (date) => {
+ if (!date) {
+ return ''
+ }
+ return new Intl.DateTimeFormat('en-US', {
+ day: 'numeric',
+ hour: 'numeric',
+ hour12: true,
+ minute: 'numeric',
+ month: 'short',
+ year: 'numeric',
+ }).format(date)
+}
+
+export const DocumentLocked: React.FC<{
+ editedAt?: null | number
+ handleGoBack: () => void
+ isActive: boolean
+ onReadOnly: () => void
+ onTakeOver: () => void
+ user?: ClientUser
+}> = ({ editedAt, handleGoBack, isActive, onReadOnly, onTakeOver, user }) => {
+ const { closeModal, openModal } = useModal()
+ const { t } = useTranslation()
+
+ useEffect(() => {
+ if (isActive) {
+ openModal(modalSlug)
+ } else {
+ closeModal(modalSlug)
+ }
+ }, [isActive, openModal, closeModal])
+
+ return (
+
+