chore(release): v3.0.0-beta.125 [skip ci]

feat: add join field config where property (#8973 )
### What? Makes it possible to filter join documents using a `where` added directly in the config. ### Why? It makes the join field more powerful for adding contextual meaning to the documents being returned. For example, maybe you have a `requiresAction` field that you set and you can have a join that automatically filters the documents to those that need attention. ### How? In the database adapter, we merge the requested `where` to the `where` defined on the field. On the frontend the results are filtered using the `filterOptions` property in the component. Fixes https://github.com/payloadcms/payload/discussions/8936 https://github.com/payloadcms/payload/discussions/8937 --------- Co-authored-by: Sasha <64744993+r1tsuu@users.noreply.github.com>
2024-11-06 10:24:31 -05:00 · 2024-11-06 10:06:25 -05:00 · 2024-11-06 10:02:29 -05:00 · 2024-11-05 23:03:27 -05:00 · 2024-11-05 22:58:33 -05:00 · 2024-11-05 23:14:34 +02:00
171 changed files with 61384 additions and 381 deletions
--- a/.github/actions/triage/action.yml
+++ b/.github/actions/triage/action.yml
@@ -17,9 +17,9 @@ inputs:
  reproduction-link-section:
    description: 'A regular expression string with "(.*)" matching a valid URL in the issue body. The result is trimmed. Example: "### Link to reproduction(.*)### To reproduce"'
    default: '### Link to reproduction(.*)### To reproduce'
-  tag-only:
-    description: Log and tag only. Do not perform closing or commenting actions.
-    default: false
+  actions-to-perform:
+    description: 'Comma-separated list of actions to perform on the issue. Example: "tag,comment,close"'
+    default: 'tag,comment,close'

 runs:
  using: 'composite'
@@ -37,4 +37,4 @@ runs:
        'INPUT_REPRODUCTION_INVALID_LABEL': ${{inputs.reproduction-invalid-label}}
        'INPUT_REPRODUCTION_ISSUE_LABELS': ${{inputs.reproduction-issue-labels}}
        'INPUT_REPRODUCTION_LINK_SECTION': ${{inputs.reproduction-link-section}}
-        'INPUT_TAG_ONLY': ${{inputs.tag-only}}
+        'INPUT_ACTIONS_TO_PERFORM': ${{inputs.actions-to-perform}}
--- a/.github/actions/triage/dist/index.js
+++ b/.github/actions/triage/dist/index.js
--- a/.github/actions/triage/src/index.ts
+++ b/.github/actions/triage/src/index.ts
@@ -8,6 +8,9 @@ import { join } from 'node:path'
 if (!process.env.GITHUB_TOKEN) throw new TypeError('No GITHUB_TOKEN provided')
 if (!process.env.GITHUB_WORKSPACE) throw new TypeError('Not a GitHub workspace')

+const validActionsToPerform = ['tag', 'comment', 'close'] as const
+type ActionsToPerform = (typeof validActionsToPerform)[number]
+
 // Define the configuration object
 interface Config {
  invalidLink: {
@@ -17,7 +20,7 @@ interface Config {
    label: string
    linkSection: string
  }
-  tagOnly: boolean
+  actionsToPerform: ActionsToPerform[]
  token: string
  workspace: string
 }
@@ -33,7 +36,16 @@ const config: Config = {
    linkSection:
      getInput('reproduction_link_section') || '### Link to reproduction(.*)### To reproduce',
  },
-  tagOnly: getBooleanOrUndefined('tag_only') || false,
+  actionsToPerform: (getInput('actions_to_perform') || validActionsToPerform.join(','))
+    .split(',')
+    .map((a) => {
+      const action = a.trim().toLowerCase() as ActionsToPerform
+      if (validActionsToPerform.includes(action)) {
+        return action
+      }
+
+      throw new TypeError(`Invalid action: ${action}`)
+    }),
  token: process.env.GITHUB_TOKEN,
  workspace: process.env.GITHUB_WORKSPACE,
 }
@@ -104,23 +116,31 @@ async function checkValidReproduction(): Promise<void> {
  await Promise.all(
    labelsToRemove.map((label) => client.issues.removeLabel({ ...common, name: label })),
  )
-  info(`Issue #${issue.number} - validate label removed`)
-  await client.issues.addLabels({ ...common, labels: [config.invalidLink.label] })
-  info(`Issue #${issue.number} - labeled`)

-  // If tagOnly, do not close or comment
-  if (config.tagOnly) {
-    info('Tag-only enabled, no closing/commenting actions taken')
-    return
+  // Tag
+  if (config.actionsToPerform.includes('tag')) {
+    info(`Added label: ${config.invalidLink.label}`)
+    await client.issues.addLabels({ ...common, labels: [config.invalidLink.label] })
+  } else {
+    info('Tag - skipped, not provided in actions to perform')
  }

-  // Perform closing and commenting actions
-  await client.issues.update({ ...common, state: 'closed' })
-  info(`Issue #${issue.number} - closed`)
+  // Comment
+  if (config.actionsToPerform.includes('comment')) {
+    const comment = join(config.workspace, config.invalidLink.comment)
+    await client.issues.createComment({ ...common, body: await getCommentBody(comment) })
+    info(`Commented with invalid reproduction message`)
+  } else {
+    info('Comment - skipped, not provided in actions to perform')
+  }

-  const comment = join(config.workspace, config.invalidLink.comment)
-  await client.issues.createComment({ ...common, body: await getCommentBody(comment) })
-  info(`Issue #${issue.number} - commented`)
+  // Close
+  if (config.actionsToPerform.includes('close')) {
+    await client.issues.update({ ...common, state: 'closed' })
+    info(`Closed issue #${issue.number}`)
+  } else {
+    info('Close - skipped, not provided in actions to perform')
+  }
 }

 /**
--- a/.github/comments/invalid-reproduction.md
+++ b/.github/comments/invalid-reproduction.md
@@ -1,4 +1,6 @@
-We cannot recreate the issue with the provided information. **Please add a reproduction in order for us to be able to investigate.**
+**Please add a reproduction in order for us to be able to investigate.**
+
+Depending on the quality of reproduction steps, this issue may be closed if no reproduction is provided.

 ### Why was this issue marked with the `invalid-reproduction` label?

--- a/.github/workflows/triage.yml
+++ b/.github/workflows/triage.yml
@@ -99,4 +99,4 @@ jobs:
          reproduction-comment: '.github/comments/invalid-reproduction.md'
          reproduction-link-section: '### Link to the code that reproduces this issue(.*)### Reproduction Steps'
          reproduction-issue-labels: 'validate-reproduction'
-          tag-only: 'true'
+          actions-to-perform: 'tag,comment'
--- a/app/(payload)/api/graphql/route.ts
+++ b/app/(payload)/api/graphql/route.ts
@@ -1,6 +1,8 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import config from '@payload-config'
-import { GRAPHQL_POST } from '@payloadcms/next/routes'
+import { GRAPHQL_POST, REST_OPTIONS } from '@payloadcms/next/routes'

 export const POST = GRAPHQL_POST(config)
+
+export const OPTIONS = REST_OPTIONS(config)
--- a/docs/admin/locked-documents.mdx
+++ b/docs/admin/locked-documents.mdx
@@ -2,7 +2,7 @@
 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.
+desc: Ensure your documents are locked during editing to prevent concurrent changes from multiple users and maintain data integrity.
 keywords: locking, document locking, edit locking, document, concurrency, Payload, headless, Content Management System, cms, javascript, react, node, nextjs
 ---

@@ -12,19 +12,19 @@ The lock is automatically triggered when a user begins editing a document within

 ## 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:
+When a user starts editing a document, Payload locks it for that user. If another user attempts to access the same document, they will be notified that it is currently being edited. They can then 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.
+- View in Read-Only: View the document without the ability to make any changes.
+- Take Over: 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.
+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.

-<Banner type="info"> <strong>Note:</strong> If your application does not require document locking, you can disable this feature for any collection by setting the <code>lockDocuments</code> property to <code>false</code>. </Banner>
+<Banner type="info"> <strong>Note:</strong> If your application does not require document locking, you can disable this feature for any collection or global by setting the <code>lockDocuments</code> property to <code>false</code>. </Banner>

 ### 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.
+The `lockDocuments` property exists on both the Collection Config and the Global Config. Document locking is enabled by default, but you can customize the lock duration or turn off the feature for any collection or global.

 Here’s an example configuration for document locking:

@@ -55,13 +55,13 @@ export const Posts: CollectionConfig = {

 ### 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.
+Document locking affects both the Local and REST APIs, 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.

 #### Overriding Locks

-For operations like update and delete, Payload includes an `overrideLock` option. This boolean flag, when set to `false`, enforces document locks, ensuring that the operation will not proceed if another user currently holds the lock.
+For operations like `update` and `delete`, Payload includes an `overrideLock` option. This boolean flag, when set to `false`, enforces document locks, ensuring that the operation will not proceed if another user currently holds the lock.

 By default, `overrideLock` is set to `true`, which means that document locks are ignored, and the operation will proceed even if the document is locked. To enforce locks and prevent updates or deletes on locked documents, set `overrideLock: false`.

--- a/docs/fields/join.mdx
+++ b/docs/fields/join.mdx
@@ -126,12 +126,13 @@ powerful Admin UI.
 | **`name`** \*          | To be used as the property name when retrieved from the database. [More](/docs/fields/overview#field-names)                                                                                    |
 | **`collection`** \*    | The `slug`s having the relationship field.                                                                                                                                                     |
 | **`on`** \*            | The name of the relationship or upload field that relates to the collection document. Use dot notation for nested paths, like 'myGroup.relationName'.                                          |
+| **`where`** \*         | A `Where` query to hide related documents from appearing. Will be merged with any `where` specified in the request.                                                                            |
 | **`maxDepth`**         | Default is 1, Sets a maximum population depth for this field, regardless of the remaining depth when this field is reached. [Max Depth](/docs/getting-started/concepts#field-level-max-depth). |
 | **`label`**            | Text used as a field label in the Admin Panel or an object with keys for each language.                                                                                                        |
 | **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                                          |
 | **`access`**           | Provide Field Access Control to denote what users can see and do with this field's data. [More details](../access-control/fields).                                                             |
-| **`defaultLimit`**     | The number of documents to return. Set to 0 to return all related documents.                                                                |
-| **`defaultSort`**      | The field name used to specify the order the joined documents are returned.                                                                                                                                                            |
+| **`defaultLimit`**     | The number of documents to return. Set to 0 to return all related documents.                                                                                                                   |
+| **`defaultSort`**      | The field name used to specify the order the joined documents are returned.                                                                                                                    |
 | **`admin`**            | Admin-specific configuration. [More details](#admin-config-options).                                                                                                                           |
 | **`custom`**           | Extension point for adding custom data (e.g. for plugins).                                                                                                                                     |
 | **`typescriptSchema`** | Override field type generation with providing a JSON schema.                                                                                                                                   |
@@ -182,11 +183,11 @@ returning. This is useful for performance reasons when you don't need the relate

 The following query options are supported:

-| Property    | Description                                                  |
-|-------------|--------------------------------------------------------------|
-| **`limit`** | The maximum related documents to be returned, default is 10. |
-| **`where`** | An optional `Where` query to filter joined documents.        |
-| **`sort`**  | A string used to order related results                       |
+| Property    | Description                                                                                         |
+|-------------|-----------------------------------------------------------------------------------------------------|
+| **`limit`** | The maximum related documents to be returned, default is 10.                                        |
+| **`where`** | An optional `Where` query to filter joined documents. Will be merged with the field `where` object. |
+| **`sort`**  | A string used to order related results                                                              |

 These can be applied to the local API, GraphQL, and REST API.

--- a/docs/fields/upload.mdx
+++ b/docs/fields/upload.mdx
@@ -48,6 +48,9 @@ export const MyUploadField: Field = {
 | **`name`** \*          | To be used as the property name when stored and retrieved from the database. [More](/docs/fields/overview#field-names)                                                      |
 | **`relationTo`** \*    | Provide a single collection `slug` to allow this field to accept a relation to. <strong>Note: the related collection must be configured to support Uploads.</strong>        |
 | **`filterOptions`**    | A query to filter which options appear in the UI and validate against. [More](#filtering-upload-options).                                                                   |
+| **`hasMany`**          | Boolean which, if set to true, allows this field to have many relations instead of only one.                                                                                |
+| **`minRows`**          | A number for the fewest allowed items during validation when a value is present. Used with hasMany.                                                                         |
+| **`maxRows`**          | A number for the most allowed items during validation when a value is present. Used with hasMany.                                                                           |
 | **`maxDepth`**         | Sets a number limit on iterations of related documents to populate when queried. [Depth](../queries/depth)                                                                  |
 | **`label`**            | Text used as a field label in the Admin Panel or an object with keys for each language.                                                                                     |
 | **`unique`**           | Enforce that each entry in the Collection has a unique value for this field.                                                                                                |
--- a/docs/jobs-queue/overview.mdx
+++ b/docs/jobs-queue/overview.mdx
@@ -1,16 +1,34 @@
 ---
 title: Jobs Queue
-label: Jobs Queue
+label: Overview
 order: 10
 desc: Payload provides all you need to run job queues, which are helpful to offload long-running processes into separate workers.
 keywords: jobs queue, application framework, typescript, node, react, nextjs
 ---

-## Defining tasks
+Payload's Jobs Queue gives you a simple, yet powerful way to offload large or future tasks to separate compute resources.

-A task is a simple function that can be executed directly or within a workflow. The difference between tasks and functions is that tasks can be run in the background, and can be retried if they fail.
+For example, when building applications with Payload, you might run into a case where you need to perform some complex logic in a Payload [Hook](/docs/hooks/overview) but you don't want that hook to "block" or slow down the response returned from the Payload API.

-Tasks can either be defined within the `jobs.tasks` array in your payload config, or they can be run inline within a workflow.
+Instead of running long or expensive logic in a Hook, you can instead create a Job and add it to a Queue. It can then be picked up by a separate worker which periodically checks the queue for new jobs, and then executes each job accordingly. This way, your Payload API responses can remain as fast as possible, and you can still perform logic as necessary without blocking or affecting your users' experience.
+
+Jobs are also handy for delegating certain actions to take place in the future, such as scheduling a post to be published at a later date. In this example, you could create a Job that will automatically publish a post at a certain time.
+
+#### How it works
+
+There are a few concepts that you should become familiarized with before using Payload's Jobs Queue - [Tasks](#tasks), [Workflows](#workflows), [Jobs](#jobs), and finally [Queues](#queues).
+
+## Tasks
+
+<Banner type="default">
+  A <strong>"Task"<strong> is a function definition that performs business logic and whose input and output are both strongly typed.
+</Banner>
+
+You can register Tasks on the Payload config, and then create Jobs or Workflows that use them. Think of Tasks like tidy, isolated "functions that do one specific thing".
+
+Payload Tasks can be configured to automatically retried if they fail, which makes them valuable for "durable" workflows like AI applications where LLMs can return non-deterministic results, and might need to be retried.
+
+Tasks can either be defined within the `jobs.tasks` array in your payload config, or they can be defined inline within a workflow.

 ### Defining tasks in the config

@@ -28,7 +46,9 @@ Simply add a task to the `jobs.tasks` array in your Payload config. A task consi
 | `onSuccess` | Function to be executed if the task fails. |
 | `retries` | Specify the number of times that this step should be retried if it fails. |

-The handler is the function, or a path to the function, that will run once the job picks up this task. The handler function should return an object with an `output` key, which should contain the output of the task.
+The logic for the Task is defined in the `handler` - which can be defined as a function, or a path to a function. The `handler` will run once a worker picks picks up a Job that includes this task. 
+
+It should return an object with an `output` key, which should contain the output of the task as you've defined.

 Example:

@@ -38,8 +58,15 @@ export default buildConfig({
  jobs: {
    tasks: [
      {
+        // Configure this task to automatically retry
+        // up to two times
        retries: 2,
+
+        // This is a unique identifier for the task
+
        slug: 'createPost',
+
+        // These are the arguments that your Task will accept
        inputSchema: [
          {
            name: 'title',
@@ -47,6 +74,8 @@ export default buildConfig({
            required: true,
          },
        ],
+
+        // These are the properties that the function should output
        outputSchema: [
          {
            name: 'postID',
@@ -54,6 +83,8 @@ export default buildConfig({
            required: true,
          },
        ],
+
+        // This is the function that is run when the task is invoked
        handler: async ({ input, job, req }) => {
          const newPost = await req.payload.create({
            collection: 'post',
@@ -74,9 +105,11 @@ export default buildConfig({
 })
 ```

-### Example: defining external tasks
+In addition to defining handlers as functions directly provided to your Payload config, you can also pass an _absolute path_ to where the handler is defined. If your task has large dependencies, and you are planning on executing your jobs in a separate process that has access to the filesystem, this could be a handy way to make sure that your Payload + Next.js app remains quick to compile and has minimal dependencies. 

-payload.config.ts:
+In general, this is an advanced use case. Here's how this would look:
+
+`payload.config.ts:`

 ```ts
 import { fileURLToPath } from 'node:url'
@@ -86,26 +119,11 @@ const filename = fileURLToPath(import.meta.url)
 const dirname = path.dirname(filename)

 export default buildConfig({
-  // ...
  jobs: {
    tasks: [
      {
-        retries: 2,
-        slug: 'createPost',
-        inputSchema: [
-          {
-            name: 'title',
-            type: 'text',
-            required: true,
-          },
-        ],
-        outputSchema: [
-          {
-            name: 'postID',
-            type: 'text',
-            required: true,
-          },
-        ],
+        // ...
+        // The #createPostHandler is a named export within the `createPost.ts` file
        handler: path.resolve(dirname, 'src/tasks/createPost.ts') + '#createPostHandler',
      }
    ]
@@ -113,7 +131,9 @@ export default buildConfig({
 })
 ```

-src/tasks/createPost.ts:
+Then, the `createPost` file itself:
+
+`src/tasks/createPost.ts:`

 ```ts
 import type { TaskHandler } from 'payload'
@@ -134,18 +154,23 @@ export const createPostHandler: TaskHandler<'createPost'> = async ({ input, job,
 }
 ```

+## Workflows

-## Defining workflows
+<Banner type="default">
+  A <strong>"Workflow"<strong> is an optional way to <em>combine multiple tasks together</em> in a way that can be gracefully retried from the point of failure.
+</Banner>

-There are two types of workflows - JS-based workflows and JSON-based workflows.
+They're most helpful when you have multiple tasks in a row, and you want to configure each task to be able to be retried if they fail.

-### Defining JS-based workflows
+If a task within a workflow fails, the Workflow will automatically "pick back up" on the task where it failed and **not re-execute any prior tasks that have already been executed**.

-A JS-based function is a function in which you decide yourself when the tasks should run, by simply calling the `runTask` function. If the job, or any task within the job, fails, the entire function will re-run.
+#### Defining a workflow

-Tasks that have successfully been completed will simply re-return the cached output without running again, and failed tasks will be re-run.
+The most important aspect of a Workflow is the `handler`, where you can declare when and how the tasks should run by simply calling the `runTask` function. If any task within the workflow, fails, the entire `handler` function will re-run.

-Simply add a workflow to the `jobs.wokflows` array in your Payload config. A wokflow consists of the following fields:
+However, importantly, tasks that have successfully been completed will simply re-return the cached and saved output without running again. The Workflow will pick back up where it failed and only task from the failure point onward will be re-executed.
+
+To define a JS-based workflow, simply add a workflow to the `jobs.wokflows` array in your Payload config. A workflow consists of the following fields:

 | Option                      | Description                                                                      |
 | --------------------------- | -------------------------------------------------------------------------------- |
@@ -168,6 +193,8 @@ export default buildConfig({
    workflows: [
      {
        slug: 'createPostAndUpdate',
+
+        // The arguments that the workflow will accept
        inputSchema: [
          {
            name: 'title',
@@ -175,15 +202,26 @@ export default buildConfig({
            required: true,
          },
        ],
+
+        // The handler that defines the "control flow" of the workflow
+        // Notice how it calls `runTask` to execute tasks
        handler: async ({ job, runTask }) => {
+
+          // This workflow first runs a task called `createPost`
          const output = await runTask({
            task: 'createPost',
+
+            // You need to define a unique ID for this task invocation
+            // that will always be the same if this workflow fails
+            // and is re-executed in the future
            id: '1',
            input: {
              title: job.input.title,
            },
          })

+          // Once the prior task completes, it will run a task 
+          // called `updatePost`
          await runTask({
            task: 'updatePost',
            id: '2',
@@ -201,9 +239,11 @@ export default buildConfig({

 #### Running tasks inline

-In order to run tasks inline without predefining them, you can use the `runTaskInline` function.
+In the above example, our workflow was executing tasks that we already had defined in our Payload config. But, you can also run tasks without predefining them.

-The drawbacks of this approach are that tasks cannot be re-used as easily, and the **task data stored in the job** will not be typed. In the following example, the inline task data will be stored on the job under `job.taskStatus.inline['2']` but completely untyped, as types for dynamic tasks like these cannot be generated beforehand.
+To do this, you can use the `runTaskInline` function.
+
+The drawbacks of this approach are that tasks cannot be re-used across workflows as easily, and the **task data stored in the job** will not be typed. In the following example, the inline task data will be stored on the job under `job.taskStatus.inline['2']` but completely untyped, as types for dynamic tasks like these cannot be generated beforehand.

 Example:

@@ -225,6 +265,9 @@ export default buildConfig({
          },
        ],
        handler: async ({ job, runTask }) => {
+          // Here, we run a predefined task.
+          // The `createPost` handler arguments and return type
+          // are both strongly typed
          const output = await runTask({
            task: 'createPost',
            id: '1',
@@ -233,11 +276,15 @@ export default buildConfig({
            },
          })

+
+          // Here, this task is not defined in the Payload config
+          // and is "inline". Its output will be stored on the Job in the database
+          // however its arguments will be untyped.
          const { newPost } = await runTaskInline({
            task: async ({ req }) => {
              const newPost = await req.payload.update({
                collection: 'post',
-                id: output.postID,
+                id: '2',
                req,
                retries: 3,
                data: {
@@ -259,28 +306,37 @@ export default buildConfig({
 })
 ```

-### Defining JSON-based workflows
+## Jobs

-JSON-based workflows are a way to define the tasks the workflow should run in an array. The relationships between the tasks, their run order and their conditions are defined in the JSON object, which allows payload to statically analyze the workflow and will generate more helpful graphs.
+Now that we have covered Tasks and Workflows, we can tie them together with a concept called a Job.

-This functionality is not available yet, but it will be available in the future.
+<Banner type="default">
+  Whereas you define Workflows and Tasks, which control your business logic, a <strong>Job</strong> is an individual instance of either a Task or a Workflow which contains many tasks. 
+</Banner>

-## Queueing workflows and tasks
+For example, let's say we have a Workflow or Task that describes the logic to sync information from Payload to a third-party system. This is how you'd declare how to sync that info, but it wouldn't do anything on its own. In order to run that task or workflow, you'd create a Job that references the corresponding Task or Workflow.

-In order to queue a workflow or a task (= create them and add them to the queue), you can use the `payload.jobs.queue` function.
+Jobs are stored in the Payload database in the `payload-jobs` collection, and you can decide to keep a running list of all jobs, or configure Payload to delete the job when it has been successfully executed.

-Example: queueing workflows:
+#### Queuing a new job
+
+In order to queue a job, you can use the `payload.jobs.queue` function.
+
+Here's how you'd queue a new Job, which will run a `createPostAndUpdate` workflow:

 ```ts
 const createdJob = await payload.jobs.queue({
-  workflows: 'createPostAndUpdate',
+  // Pass the name of the workflow
+  workflow: 'createPostAndUpdate',
+  // The input type will be automatically typed
+  // according to the input you've defined for this workflow
  input: {
    title: 'my title',
  },
 })
 ```

-Example: queueing tasks:
+In addition to being able to queue new Jobs based on Workflows, you can also queue a job for a single Task:

 ```ts
 const createdJob = await payload.jobs.queue({
@@ -291,55 +347,51 @@ const createdJob = await payload.jobs.queue({
 })
 ```

-## Running workflows and tasks
+## Queues

-Workflows and tasks added to the queue will not run unless a worker picks it up and runs it. This can be done in two ways:
+Now let's talk about how to _run these jobs_. Right now, all we've covered is how to queue up jobs to run, but so far, we aren't actually running any jobs. This is the final piece of the puzzle.

-### Endpoint
+<Banner type="default">
+  A <strong>Queue</strong> is a list of jobs that should be executed in order of when they were added.
+</Banner>

-Make a fetch request to the `api/payload-jobs/run` endpoint:
+When you go to run jobs, Payload will query for any jobs that are added to the queue and then run them. By default, all queued jobs are added to the `default` queue. 
+
+**But, imagine if you wanted to have some jobs that run nightly, and other jobs which should run every five minutes.**
+
+By specifying the `queue` name when you queue a new job using `payload.jobs.queue()`, you can queue certain jobs with `queue: 'nightly'`, and other jobs can be left as the default queue.
+
+Then, you could configure two different runner strategies:
+
+1. A `cron` that runs nightly, querying for jobs added to the `nightly` queue
+2. Another that runs any jobs that were added to the `default` queue every ~5 minutes or so
+
+## Executing jobs
+
+As mentioned above, you can queue jobs, but the jobs won't run unless a worker picks up your jobs and runs them. This can be done in two ways:
+
+#### Endpoint
+
+You can execute jobs by making a fetch request to the `/api/payload-jobs/run` endpoint:

 ```ts
-await fetch('/api/payload-jobs/run', {
+// Here, we're saying we want to run only 100 jobs for this invocation
+// and we want to pull jobs from the `nightly` queue:
+await fetch('/api/payload-jobs/run?limit=100&queue=nightly', {
  method: 'GET',
  headers: {
-    'Authorization': `JWT ${token}`,
+    'Authorization': `Bearer ${token}`,
  },
 });
 ```

-### Local API
+This endpoint is automatically mounted for you and is helpful in conjunction with serverless platforms like Vercel, where you might want to use Vercel Cron to invoke a serverless function that executes your jobs.

-Run the payload.jobs.run function:
+**Vercel Cron Example**

-```ts
-const results = await payload.jobs.run()
+If you're deploying on Vercel, you can add a `vercel.json` file in the root of your project that configures Vercel Cron to invoke the `run` endpoint on a cron schedule.

-// You can customize the queue name by passing it as an argument
-await payload.jobs.run({ queue: 'posts' })
-```
-
-### Script
-
-You can run the jobs:run script from the command line:
-
-```sh
-npx payload jobs:run --queue default --limit 10
-```
-
-#### Triggering jobs as cronjob
-
-You can pass the --cron flag to the jobs:run script to run the jobs in a cronjob:
-
-```sh
-npx payload jobs:run --cron "*/5 * * * *"
-```
-
-### Vercel Cron
-
-Vercel Cron allows scheduled tasks to be executed automatically by triggering specific endpoints. Below is a step-by-step guide to configuring Vercel Cron for running queued jobs on apps hosted on Vercel:
-
-1. Add Vercel Cron Configuration: Place a vercel.json file at the root of your project with the following content:
+Here's an example of what this file will look like:

 ```json
 {
@@ -352,13 +404,13 @@ Vercel Cron allows scheduled tasks to be executed automatically by triggering sp
 }
 ```

-This configuration schedules the endpoint `/api/payload-jobs/run` to be triggered every 5 minutes. This endpoint is added automatically by payload and is responsible for running the queued jobs.
+The configuration above schedules the endpoint `/api/payload-jobs/run` to be invoked every 5 minutes.

-2. Environment Variable Setup: By default, the endpoint may require a JWT token for authorization. However, Vercel Cron jobs cannot pass JWT tokens. Instead, you can use an environment variable to secure the endpoint:
+The last step will be to secure your `run` endpoint so that only the proper users can invoke the runner. 

-Add a new environment variable named `CRON_SECRET` to your Vercel project settings. This should be a random string, ideally 16 characters or longer.
+To do this, you can set an environment variable on your Vercel project called `CRON_SECRET`, which should be a random string—ideally 16 characters or longer.

-3. Modify Authentication for Job Running: Adjust the job running authorization logic in your project to accept the `CRON_SECRET` as a valid token. Modify your `payload.config.ts` file as follows:
+Then, you can modify the `access` function for running jobs by ensuring that only Vercel can invoke your runner. 

 ```ts
 export default buildConfig({
@@ -366,6 +418,12 @@ export default buildConfig({
  jobs: {
    access: {
      run: ({ req }: { req: PayloadRequest }): boolean => {
+        // Allow logged in users to execute this endpoint (default)
+        if (req.user) return true
+
+        // If there is no logged in user, then check 
+        // for the Vercel Cron secret to be present as an
+        // Authorization header:
        const authHeader = req.headers.get('authorization');
        return authHeader === `Bearer ${process.env.CRON_SECRET}`;
      },
@@ -375,8 +433,31 @@ export default buildConfig({
 })
 ```

-This code snippet ensures that the jobs can only be triggered if the correct `CRON_SECRET` is provided in the authorization header.
-
-Vercel will automatically make the `CRON_SECRET` environment variable available to the endpoint when triggered by the Vercel Cron, ensuring that the jobs can be run securely.
+This works because Vercel automatically makes the `CRON_SECRET` environment variable available to the endpoint as the `Authorization` header when triggered by the Vercel Cron, ensuring that the jobs can be run securely.

 After the project is deployed to Vercel, the Vercel Cron job will automatically trigger the `/api/payload-jobs/run` endpoint in the specified schedule, running the queued jobs in the background.
+
+#### Local API
+
+If you want to process jobs programmatically from your server-side code, you can use the Local API:
+
+```ts
+const results = await payload.jobs.run()
+
+// You can customize the queue name and limit by passing them as arguments:
+await payload.jobs.run({ queue: 'nightly', limit: 100 })
+```
+
+#### Bin script
+
+Finally, you can process jobs via the bin script that comes with Payload out of the box. 
+
+```sh
+npx payload jobs:run --queue default --limit 10
+```
+
+In addition, the bin script allows you to pass a `--cron` flag to the `jobs:run` command to run the jobs on a scheduled, cron basis:
+
+```sh
+npx payload jobs:run --cron "*/5 * * * *"
+```
--- a/examples/auth/payload/src/app/(payload)/api/graphql/route.ts
+++ b/examples/auth/payload/src/app/(payload)/api/graphql/route.ts
@@ -1,6 +1,8 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import config from '@payload-config'
-import { GRAPHQL_POST } from '@payloadcms/next/routes'
+import { GRAPHQL_POST, REST_OPTIONS } from '@payloadcms/next/routes'

 export const POST = GRAPHQL_POST(config)
+
+export const OPTIONS = REST_OPTIONS(config)
--- a/examples/custom-components/src/app/(payload)/api/graphql/route.ts
+++ b/examples/custom-components/src/app/(payload)/api/graphql/route.ts
@@ -1,6 +1,8 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import config from '@payload-config'
-import { GRAPHQL_POST } from '@payloadcms/next/routes'
+import { GRAPHQL_POST, REST_OPTIONS } from '@payloadcms/next/routes'

 export const POST = GRAPHQL_POST(config)
+
+export const OPTIONS = REST_OPTIONS(config)
--- a/examples/form-builder/payload/src/app/(payload)/api/graphql/route.ts
+++ b/examples/form-builder/payload/src/app/(payload)/api/graphql/route.ts
@@ -1,6 +1,8 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import config from '@payload-config'
-import { GRAPHQL_POST } from '@payloadcms/next/routes'
+import { GRAPHQL_POST, REST_OPTIONS } from '@payloadcms/next/routes'

 export const POST = GRAPHQL_POST(config)
+
+export const OPTIONS = REST_OPTIONS(config)
--- a/examples/hierarchy/src/app/(payload)/api/graphql/route.ts
+++ b/examples/hierarchy/src/app/(payload)/api/graphql/route.ts
@@ -1,6 +1,8 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import config from '@payload-config'
-import { GRAPHQL_POST } from '@payloadcms/next/routes'
+import { GRAPHQL_POST, REST_OPTIONS } from '@payloadcms/next/routes'

 export const POST = GRAPHQL_POST(config)
+
+export const OPTIONS = REST_OPTIONS(config)
--- a/examples/live-preview/payload/src/app/(payload)/api/graphql/route.ts
+++ b/examples/live-preview/payload/src/app/(payload)/api/graphql/route.ts
@@ -1,6 +1,8 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import config from '@payload-config'
-import { GRAPHQL_POST } from '@payloadcms/next/routes'
+import { GRAPHQL_POST, REST_OPTIONS } from '@payloadcms/next/routes'

 export const POST = GRAPHQL_POST(config)
+
+export const OPTIONS = REST_OPTIONS(config)
--- a/examples/multi-tenant/src/app/(payload)/api/graphql/route.ts
+++ b/examples/multi-tenant/src/app/(payload)/api/graphql/route.ts
@@ -1,6 +1,8 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import config from '@payload-config'
-import { GRAPHQL_POST } from '@payloadcms/next/routes'
+import { GRAPHQL_POST, REST_OPTIONS } from '@payloadcms/next/routes'

 export const POST = GRAPHQL_POST(config)
+
+export const OPTIONS = REST_OPTIONS(config)
--- a/examples/tailwind-shadcn-ui/src/app/(payload)/api/graphql/route.ts
+++ b/examples/tailwind-shadcn-ui/src/app/(payload)/api/graphql/route.ts
@@ -1,6 +1,8 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import config from '@payload-config'
-import { GRAPHQL_POST } from '@payloadcms/next/routes'
+import { GRAPHQL_POST, REST_OPTIONS } from '@payloadcms/next/routes'

 export const POST = GRAPHQL_POST(config)
+
+export const OPTIONS = REST_OPTIONS(config)
--- a/examples/virtual-fields/src/app/(payload)/api/graphql/route.ts
+++ b/examples/virtual-fields/src/app/(payload)/api/graphql/route.ts
@@ -1,6 +1,8 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import config from '@payload-config'
-import { GRAPHQL_POST } from '@payloadcms/next/routes'
+import { GRAPHQL_POST, REST_OPTIONS } from '@payloadcms/next/routes'

 export const POST = GRAPHQL_POST(config)
+
+export const OPTIONS = REST_OPTIONS(config)
--- a/examples/whitelabel/src/app/(payload)/api/graphql/route.ts
+++ b/examples/whitelabel/src/app/(payload)/api/graphql/route.ts
@@ -1,6 +1,8 @@
 /* THIS FILE WAS GENERATED AUTOMATICALLY BY PAYLOAD. */
 /* DO NOT MODIFY IT BECAUSE IT COULD BE REWRITTEN AT ANY TIME. */
 import config from '@payload-config'
-import { GRAPHQL_POST } from '@payloadcms/next/routes'
+import { GRAPHQL_POST, REST_OPTIONS } from '@payloadcms/next/routes'

 export const POST = GRAPHQL_POST(config)
+
+export const OPTIONS = REST_OPTIONS(config)
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "payload-monorepo",
-  "version": "3.0.0-beta.123",
+  "version": "3.0.0-beta.125",
  "private": true,
  "type": "module",
  "scripts": {
--- a/packages/create-payload-app/package.json
+++ b/packages/create-payload-app/package.json
@@ -1,6 +1,6 @@
 {
  "name": "create-payload-app",
-  "version": "3.0.0-beta.123",
+  "version": "3.0.0-beta.125",
  "homepage": "https://payloadcms.com",
  "repository": {
    "type": "git",
--- a/packages/create-payload-app/src/lib/create-project.ts
+++ b/packages/create-payload-app/src/lib/create-project.ts
@@ -101,7 +101,7 @@ export async function createProject(args: {
  })

  // Remove yarn.lock file. This is only desired in Payload Cloud.
-  const lockPath = path.resolve(projectDir, 'yarn.lock')
+  const lockPath = path.resolve(projectDir, 'pnpm-lock.yaml')
  if (fse.existsSync(lockPath)) {
    await fse.remove(lockPath)
  }
--- a/packages/db-mongodb/package.json
+++ b/packages/db-mongodb/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/db-mongodb",
-  "version": "3.0.0-beta.123",
+  "version": "3.0.0-beta.125",
  "description": "The officially supported MongoDB database adapter for Payload",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/db-mongodb/src/utilities/buildJoinAggregation.ts
+++ b/packages/db-mongodb/src/utilities/buildJoinAggregation.ts
@@ -1,6 +1,8 @@
 import type { PipelineStage } from 'mongoose'
 import type { CollectionSlug, JoinQuery, SanitizedCollectionConfig, Where } from 'payload'

+import { combineQueries } from 'payload'
+
 import type { MongooseAdapter } from '../index.js'

 import { buildSortParam } from '../queries/buildSortParam.js'
@@ -62,6 +64,10 @@ export const buildJoinAggregation = async ({
        continue
      }

+      if (joins?.[join.schemaPath] === false) {
+        continue
+      }
+
      const {
        limit: limitJoin = join.field.defaultLimit ?? 10,
        sort: sortJoin = join.field.defaultSort || collectionConfig.defaultSort,
--- a/packages/db-postgres/package.json
+++ b/packages/db-postgres/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/db-postgres",
-  "version": "3.0.0-beta.123",
+  "version": "3.0.0-beta.125",
  "description": "The officially supported Postgres database adapter for Payload",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/db-sqlite/package.json
+++ b/packages/db-sqlite/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/db-sqlite",
-  "version": "3.0.0-beta.123",
+  "version": "3.0.0-beta.125",
  "description": "The officially supported SQLite database adapter for Payload",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/db-vercel-postgres/package.json
+++ b/packages/db-vercel-postgres/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/db-vercel-postgres",
-  "version": "3.0.0-beta.123",
+  "version": "3.0.0-beta.125",
  "description": "Vercel Postgres adapter for Payload",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/drizzle/package.json
+++ b/packages/drizzle/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/drizzle",
-  "version": "3.0.0-beta.123",
+  "version": "3.0.0-beta.125",
  "description": "A library of shared functions used by different payload database adapters",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/drizzle/src/find/traverseFields.ts
+++ b/packages/drizzle/src/find/traverseFields.ts
@@ -2,6 +2,7 @@ import type { LibSQLDatabase } from 'drizzle-orm/libsql'
 import type { Field, JoinQuery, SelectMode, SelectType, TabAsField } from 'payload'

 import { and, eq, sql } from 'drizzle-orm'
+import { combineQueries } from 'payload'
 import { fieldAffectsData, fieldIsVirtual, tabHasName } from 'payload/shared'
 import toSnakeCase from 'to-snake-case'

@@ -402,11 +403,17 @@ export const traverseFields = ({
            break
          }

+          const joinSchemaPath = `${path.replaceAll('_', '.')}${field.name}`
+
+          if (joinQuery[joinSchemaPath] === false) {
+            break
+          }
+
          const {
            limit: limitArg = field.defaultLimit ?? 10,
            sort = field.defaultSort,
            where,
-          } = joinQuery[`${path.replaceAll('_', '.')}${field.name}`] || {}
+          } = joinQuery[joinSchemaPath] || {}
          let limit = limitArg

          if (limit !== 0) {
--- a/packages/email-nodemailer/package.json
+++ b/packages/email-nodemailer/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/email-nodemailer",
-  "version": "3.0.0-beta.123",
+  "version": "3.0.0-beta.125",
  "description": "Payload Nodemailer Email Adapter",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/email-resend/package.json
+++ b/packages/email-resend/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/email-resend",
-  "version": "3.0.0-beta.123",
+  "version": "3.0.0-beta.125",
  "description": "Payload Resend Email Adapter",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/graphql/package.json
+++ b/packages/graphql/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/graphql",
-  "version": "3.0.0-beta.123",
+  "version": "3.0.0-beta.125",
  "homepage": "https://payloadcms.com",
  "repository": {
    "type": "git",
--- a/packages/live-preview-react/package.json
+++ b/packages/live-preview-react/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/live-preview-react",
-  "version": "3.0.0-beta.123",
+  "version": "3.0.0-beta.125",
  "description": "The official React SDK for Payload Live Preview",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/live-preview-vue/package.json
+++ b/packages/live-preview-vue/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/live-preview-vue",
-  "version": "3.0.0-beta.123",
+  "version": "3.0.0-beta.125",
  "description": "The official Vue SDK for Payload Live Preview",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/live-preview/package.json
+++ b/packages/live-preview/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/live-preview",
-  "version": "3.0.0-beta.123",
+  "version": "3.0.0-beta.125",
  "description": "The official live preview JavaScript SDK for Payload",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/next",
-  "version": "3.0.0-beta.123",
+  "version": "3.0.0-beta.125",
  "homepage": "https://payloadcms.com",
  "repository": {
    "type": "git",
--- a/packages/next/src/elements/DocumentHeader/Tabs/Tab/TabLink.tsx
+++ b/packages/next/src/elements/DocumentHeader/Tabs/Tab/TabLink.tsx
@@ -67,6 +67,7 @@ export const DocumentTabLink: React.FC<{
      <Link
        className={`${baseClass}__link`}
        href={!isActive || href !== pathname ? hrefWithLocale : ''}
+        prefetch={false}
        {...(newTab && { rel: 'noopener noreferrer', target: '_blank' })}
        tabIndex={isActive ? -1 : 0}
      >
--- a/packages/next/src/elements/Nav/index.client.tsx
+++ b/packages/next/src/elements/Nav/index.client.tsx
@@ -98,6 +98,7 @@ export const DefaultNavClient: React.FC = () => {
                  href={href}
                  id={id}
                  key={i}
+                  prefetch={Link ? false : undefined}
                  tabIndex={!navOpen ? -1 : undefined}
                >
                  {activeCollection && <div className={`${baseClass}__link-indicator`} />}
--- a/packages/next/src/exports/routes.ts
+++ b/packages/next/src/exports/routes.ts
@@ -6,4 +6,5 @@ export {
  OPTIONS as REST_OPTIONS,
  PATCH as REST_PATCH,
  POST as REST_POST,
+  PUT as REST_PUT,
 } from '../routes/rest/index.js'
--- a/packages/next/src/routes/rest/index.ts
+++ b/packages/next/src/routes/rest/index.ts
@@ -821,3 +821,87 @@ export const PATCH =
      })
    }
  }
+
+export const PUT =
+  (config: Promise<SanitizedConfig> | SanitizedConfig) =>
+  async (request: Request, { params: paramsPromise }: { params: Promise<{ slug: string[] }> }) => {
+    const { slug } = await paramsPromise
+    const [slug1] = slug
+    let req: PayloadRequest
+    let res: Response
+    let collection: Collection
+
+    try {
+      req = await createPayloadRequest({
+        config,
+        request,
+      })
+      collection = req.payload.collections?.[slug1]
+
+      const disableEndpoints = endpointsAreDisabled({
+        endpoints: req.payload.config.endpoints,
+        request,
+      })
+      if (disableEndpoints) {
+        return disableEndpoints
+      }
+
+      if (collection) {
+        req.routeParams.collection = slug1
+
+        const disableEndpoints = endpointsAreDisabled({
+          endpoints: collection.config.endpoints,
+          request,
+        })
+        if (disableEndpoints) {
+          return disableEndpoints
+        }
+
+        const customEndpointResponse = await handleCustomEndpoints({
+          endpoints: collection.config.endpoints,
+          entitySlug: slug1,
+          req,
+        })
+
+        if (customEndpointResponse) {
+          return customEndpointResponse
+        }
+      }
+
+      if (res instanceof Response) {
+        if (req.responseHeaders) {
+          const mergedResponse = new Response(res.body, {
+            headers: mergeHeaders(req.responseHeaders, res.headers),
+            status: res.status,
+            statusText: res.statusText,
+          })
+
+          return mergedResponse
+        }
+
+        return res
+      }
+
+      // root routes
+      const customEndpointResponse = await handleCustomEndpoints({
+        endpoints: req.payload.config.endpoints,
+        req,
+      })
+
+      if (customEndpointResponse) {
+        return customEndpointResponse
+      }
+
+      return RouteNotFoundResponse({
+        slug,
+        req,
+      })
+    } catch (error) {
+      return routeError({
+        collection,
+        config,
+        err: error,
+        req: req || request,
+      })
+    }
+  }
--- a/packages/next/src/routes/rest/utilities/sanitizeJoinParams.ts
+++ b/packages/next/src/routes/rest/utilities/sanitizeJoinParams.ts
@@ -9,21 +9,27 @@ import { isNumber } from 'payload/shared'
 export const sanitizeJoinParams = (
  joins:
    | {
-        [schemaPath: string]: {
-          limit?: unknown
-          sort?: string
-          where?: unknown
-        }
+        [schemaPath: string]:
+          | {
+              limit?: unknown
+              sort?: string
+              where?: unknown
+            }
+          | false
      }
    | false = {},
 ): JoinQuery => {
  const joinQuery = {}

  Object.keys(joins).forEach((schemaPath) => {
-    joinQuery[schemaPath] = {
-      limit: isNumber(joins[schemaPath]?.limit) ? Number(joins[schemaPath].limit) : undefined,
-      sort: joins[schemaPath]?.sort ? joins[schemaPath].sort : undefined,
-      where: joins[schemaPath]?.where ? joins[schemaPath].where : undefined,
+    if (joins[schemaPath] === 'false' || joins[schemaPath] === false) {
+      joinQuery[schemaPath] = false
+    } else {
+      joinQuery[schemaPath] = {
+        limit: isNumber(joins[schemaPath]?.limit) ? Number(joins[schemaPath].limit) : undefined,
+        sort: joins[schemaPath]?.sort ? joins[schemaPath].sort : undefined,
+        where: joins[schemaPath]?.where ? joins[schemaPath].where : undefined,
+      }
    }
  })

--- a/packages/next/src/views/ForgotPassword/index.tsx
+++ b/packages/next/src/views/ForgotPassword/index.tsx
@@ -42,6 +42,7 @@ export const ForgotPasswordView: React.FC<AdminViewProps> = ({ initPageResult })
                      adminRoute,
                      path: accountRoute,
                    })}
+                    prefetch={false}
                  >
                    {children}
                  </Link>
@@ -68,6 +69,7 @@ export const ForgotPasswordView: React.FC<AdminViewProps> = ({ initPageResult })
          adminRoute,
          path: loginRoute,
        })}
+        prefetch={false}
      >
        {i18n.t('authentication:backToLogin')}
      </Link>
--- a/packages/next/src/views/Login/LoginForm/index.tsx
+++ b/packages/next/src/views/Login/LoginForm/index.tsx
@@ -105,6 +105,7 @@ export const LoginForm: React.FC<{
          adminRoute,
          path: forgotRoute,
        })}
+        prefetch={false}
      >
        {t('authentication:forgotPasswordQuestion')}
      </Link>
--- a/packages/next/src/views/ResetPassword/index.tsx
+++ b/packages/next/src/views/ResetPassword/index.tsx
@@ -48,6 +48,7 @@ export const ResetPassword: React.FC<AdminViewProps> = ({ initPageResult, params
                      adminRoute,
                      path: accountRoute,
                    })}
+                    prefetch={false}
                  >
                    {children}
                  </Link>
@@ -75,6 +76,7 @@ export const ResetPassword: React.FC<AdminViewProps> = ({ initPageResult, params
          adminRoute,
          path: loginRoute,
        })}
+        prefetch={false}
      >
        {i18n.t('authentication:backToLogin')}
      </Link>
--- a/packages/next/src/views/Versions/cells/CreatedAt/index.tsx
+++ b/packages/next/src/views/Versions/cells/CreatedAt/index.tsx
@@ -47,7 +47,7 @@ export const CreatedAtCell: React.FC<CreatedAtCellProps> = ({
  }

  return (
-    <Link href={to}>
+    <Link href={to} prefetch={false}>
      {cellData &&
        formatDate({ date: cellData as Date | number | string, i18n, pattern: dateFormat })}
    </Link>
--- a/packages/next/src/withPayload.js
+++ b/packages/next/src/withPayload.js
@@ -13,6 +13,11 @@ export const withPayload = (nextConfig = {}) => {
    env.NEXT_PUBLIC_ENABLE_ROUTER_CACHE_REFRESH = 'true'
  }

+  const poweredByHeader = {
+    key: 'X-Powered-By',
+    value: 'Next.js, Payload',
+  }
+
  /**
   * @type {import('next').NextConfig}
   */
@@ -41,6 +46,8 @@ export const withPayload = (nextConfig = {}) => {
        },
      },
    },
+    // We disable the poweredByHeader here because we add it manually in the headers function below
+    ...(nextConfig?.poweredByHeader !== false ? { poweredByHeader: false } : {}),
    headers: async () => {
      const headersFromConfig = 'headers' in nextConfig ? await nextConfig.headers() : []

@@ -61,6 +68,7 @@ export const withPayload = (nextConfig = {}) => {
              key: 'Critical-CH',
              value: 'Sec-CH-Prefers-Color-Scheme',
            },
+            ...(nextConfig?.poweredByHeader !== false ? [poweredByHeader] : []),
          ],
        },
      ]
--- a/packages/payload-cloud/package.json
+++ b/packages/payload-cloud/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/payload-cloud",
-  "version": "3.0.0-beta.123",
+  "version": "3.0.0-beta.125",
  "description": "The official Payload Cloud plugin",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/payload/package.json
+++ b/packages/payload/package.json
@@ -1,6 +1,6 @@
 {
  "name": "payload",
-  "version": "3.0.0-beta.123",
+  "version": "3.0.0-beta.125",
  "description": "Node, React, Headless CMS and Application Framework built on Next.js",
  "keywords": [
    "admin panel",
--- a/packages/payload/src/admin/RichText.ts
+++ b/packages/payload/src/admin/RichText.ts
@@ -12,7 +12,8 @@ import type {
  Validate,
 } from '../fields/config/types.js'
 import type { SanitizedGlobalConfig } from '../globals/config/types.js'
-import type { JsonObject, Payload, PayloadRequest, RequestContext } from '../types/index.js'
+import type { RequestContext } from '../index.js'
+import type { JsonObject, Payload, PayloadRequest } from '../types/index.js'
 import type { RichTextFieldClientProps } from './fields/RichText.js'
 import type { CreateMappedComponent } from './types.js'

--- a/packages/payload/src/collections/config/types.ts
+++ b/packages/payload/src/collections/config/types.ts
@@ -35,13 +35,13 @@ import type { Field, JoinField, RelationshipField, UploadField } from '../../fie
 import type {
  CollectionSlug,
  JsonObject,
+  RequestContext,
  TypedAuthOperations,
  TypedCollection,
  TypedCollectionSelect,
 } from '../../index.js'
 import type {
  PayloadRequest,
-  RequestContext,
  SelectType,
  Sort,
  TransformCollectionWithSelect,
--- a/packages/payload/src/collections/operations/find.ts
+++ b/packages/payload/src/collections/operations/find.ts
@@ -17,6 +17,7 @@ import type {
 import executeAccess from '../../auth/executeAccess.js'
 import { combineQueries } from '../../database/combineQueries.js'
 import { validateQueryPaths } from '../../database/queryValidation/validateQueryPaths.js'
+import { sanitizeJoinQuery } from '../../database/sanitizeJoinQuery.js'
 import { afterRead } from '../../fields/hooks/afterRead/index.js'
 import { killTransaction } from '../../utilities/killTransaction.js'
 import { buildVersionCollectionFields } from '../../versions/buildCollectionFields.js'
@@ -129,6 +130,13 @@ export const findOperation = async <

    let fullWhere = combineQueries(where, accessResult)

+    const sanitizedJoins = await sanitizeJoinQuery({
+      collectionConfig,
+      joins,
+      overrideAccess,
+      req,
+    })
+
    if (collectionConfig.versions?.drafts && draftsEnabled) {
      fullWhere = appendVersionToQueryKey(fullWhere)

@@ -142,7 +150,7 @@ export const findOperation = async <

      result = await payload.db.queryDrafts<DataFromCollectionSlug<TSlug>>({
        collection: collectionConfig.slug,
-        joins: req.payloadAPI === 'GraphQL' ? false : joins,
+        joins: req.payloadAPI === 'GraphQL' ? false : sanitizedJoins,
        limit: sanitizedLimit,
        locale,
        page: sanitizedPage,
@@ -162,7 +170,7 @@ export const findOperation = async <

      result = await payload.db.find<DataFromCollectionSlug<TSlug>>({
        collection: collectionConfig.slug,
-        joins: req.payloadAPI === 'GraphQL' ? false : joins,
+        joins: req.payloadAPI === 'GraphQL' ? false : sanitizedJoins,
        limit: sanitizedLimit,
        locale,
        page: sanitizedPage,
--- a/packages/payload/src/collections/operations/findByID.ts
+++ b/packages/payload/src/collections/operations/findByID.ts
@@ -14,8 +14,10 @@ import type {

 import executeAccess from '../../auth/executeAccess.js'
 import { combineQueries } from '../../database/combineQueries.js'
+import { sanitizeJoinQuery } from '../../database/sanitizeJoinQuery.js'
 import { NotFound } from '../../errors/index.js'
 import { afterRead } from '../../fields/hooks/afterRead/index.js'
+import { validateQueryPaths } from '../../index.js'
 import { killTransaction } from '../../utilities/killTransaction.js'
 import replaceWithDraftIfAvailable from '../../versions/drafts/replaceWithDraftIfAvailable.js'
 import { buildAfterOperation } from './utils.js'
@@ -91,17 +93,33 @@ export const findByIDOperation = async <
      return null
    }

+    const where = combineQueries({ id: { equals: id } }, accessResult)
+
+    const sanitizedJoins = await sanitizeJoinQuery({
+      collectionConfig,
+      joins,
+      overrideAccess,
+      req,
+    })
+
    const findOneArgs: FindOneArgs = {
      collection: collectionConfig.slug,
-      joins: req.payloadAPI === 'GraphQL' ? false : joins,
+      joins: req.payloadAPI === 'GraphQL' ? false : sanitizedJoins,
      locale,
      req: {
        transactionID: req.transactionID,
      } as PayloadRequest,
      select,
-      where: combineQueries({ id: { equals: id } }, accessResult),
+      where,
    }

+    await validateQueryPaths({
+      collectionConfig,
+      overrideAccess,
+      req,
+      where,
+    })
+
    // /////////////////////////////////////
    // Find by ID
    // /////////////////////////////////////
--- a/packages/payload/src/collections/operations/local/count.ts
+++ b/packages/payload/src/collections/operations/local/count.ts
@@ -1,5 +1,5 @@
-import type { CollectionSlug, Payload, TypedLocale } from '../../../index.js'
-import type { Document, PayloadRequest, RequestContext, Where } from '../../../types/index.js'
+import type { CollectionSlug, Payload, RequestContext, TypedLocale } from '../../../index.js'
+import type { Document, PayloadRequest, Where } from '../../../types/index.js'

 import { APIError } from '../../../errors/index.js'
 import { createLocalReq } from '../../../utilities/createLocalReq.js'
--- a/packages/payload/src/collections/operations/local/create.ts
+++ b/packages/payload/src/collections/operations/local/create.ts
@@ -1,8 +1,7 @@
-import type { CollectionSlug, Payload, TypedLocale } from '../../../index.js'
+import type { CollectionSlug, Payload, RequestContext, TypedLocale } from '../../../index.js'
 import type {
  Document,
  PayloadRequest,
-  RequestContext,
  SelectType,
  TransformCollectionWithSelect,
 } from '../../../types/index.js'
--- a/packages/payload/src/collections/operations/local/delete.ts
+++ b/packages/payload/src/collections/operations/local/delete.ts
@@ -1,8 +1,7 @@
-import type { CollectionSlug, Payload, TypedLocale } from '../../../index.js'
+import type { CollectionSlug, Payload, RequestContext, TypedLocale } from '../../../index.js'
 import type {
  Document,
  PayloadRequest,
-  RequestContext,
  SelectType,
  TransformCollectionWithSelect,
  Where,
--- a/packages/payload/src/collections/operations/local/duplicate.ts
+++ b/packages/payload/src/collections/operations/local/duplicate.ts
@@ -1,13 +1,12 @@
 import type { CollectionSlug, TypedLocale } from '../../..//index.js'
-import type { Payload } from '../../../index.js'
+import type { Payload, RequestContext } from '../../../index.js'
 import type {
  Document,
  PayloadRequest,
-  RequestContext,
  SelectType,
  TransformCollectionWithSelect,
 } from '../../../types/index.js'
-import type { DataFromCollectionSlug, SelectFromCollectionSlug } from '../../config/types.js'
+import type { SelectFromCollectionSlug } from '../../config/types.js'

 import { APIError } from '../../../errors/index.js'
 import { createLocalReq } from '../../../utilities/createLocalReq.js'
--- a/packages/payload/src/collections/operations/local/find.ts
+++ b/packages/payload/src/collections/operations/local/find.ts
@@ -1,9 +1,14 @@
 import type { PaginatedDocs } from '../../../database/types.js'
-import type { CollectionSlug, JoinQuery, Payload, TypedLocale } from '../../../index.js'
+import type {
+  CollectionSlug,
+  JoinQuery,
+  Payload,
+  RequestContext,
+  TypedLocale,
+} from '../../../index.js'
 import type {
  Document,
  PayloadRequest,
-  RequestContext,
  SelectType,
  Sort,
  TransformCollectionWithSelect,
--- a/packages/payload/src/collections/operations/local/findByID.ts
+++ b/packages/payload/src/collections/operations/local/findByID.ts
@@ -1,10 +1,16 @@
 /* eslint-disable no-restricted-exports */
-import type { CollectionSlug, JoinQuery, Payload, SelectType, TypedLocale } from '../../../index.js'
+import type {
+  CollectionSlug,
+  JoinQuery,
+  Payload,
+  RequestContext,
+  SelectType,
+  TypedLocale,
+} from '../../../index.js'
 import type {
  ApplyDisableErrors,
  Document,
  PayloadRequest,
-  RequestContext,
  TransformCollectionWithSelect,
 } from '../../../types/index.js'
 import type { SelectFromCollectionSlug } from '../../config/types.js'
--- a/packages/payload/src/collections/operations/local/findVersionByID.ts
+++ b/packages/payload/src/collections/operations/local/findVersionByID.ts
@@ -1,5 +1,5 @@
-import type { CollectionSlug, Payload, TypedLocale } from '../../../index.js'
-import type { Document, PayloadRequest, RequestContext, SelectType } from '../../../types/index.js'
+import type { CollectionSlug, Payload, RequestContext, TypedLocale } from '../../../index.js'
+import type { Document, PayloadRequest, SelectType } from '../../../types/index.js'
 import type { TypeWithVersion } from '../../../versions/types.js'
 import type { DataFromCollectionSlug } from '../../config/types.js'

--- a/packages/payload/src/collections/operations/local/findVersions.ts
+++ b/packages/payload/src/collections/operations/local/findVersions.ts
@@ -1,13 +1,6 @@
 import type { PaginatedDocs } from '../../../database/types.js'
-import type { CollectionSlug, Payload, TypedLocale } from '../../../index.js'
-import type {
-  Document,
-  PayloadRequest,
-  RequestContext,
-  SelectType,
-  Sort,
-  Where,
-} from '../../../types/index.js'
+import type { CollectionSlug, Payload, RequestContext, TypedLocale } from '../../../index.js'
+import type { Document, PayloadRequest, SelectType, Sort, Where } from '../../../types/index.js'
 import type { TypeWithVersion } from '../../../versions/types.js'
 import type { DataFromCollectionSlug } from '../../config/types.js'

--- a/packages/payload/src/collections/operations/local/restoreVersion.ts
+++ b/packages/payload/src/collections/operations/local/restoreVersion.ts
@@ -1,5 +1,5 @@
-import type { CollectionSlug, Payload, TypedLocale } from '../../../index.js'
-import type { Document, PayloadRequest, RequestContext, SelectType } from '../../../types/index.js'
+import type { CollectionSlug, Payload, RequestContext, TypedLocale } from '../../../index.js'
+import type { Document, PayloadRequest, SelectType } from '../../../types/index.js'
 import type { DataFromCollectionSlug } from '../../config/types.js'

 import { APIError } from '../../../errors/index.js'
--- a/packages/payload/src/collections/operations/local/update.ts
+++ b/packages/payload/src/collections/operations/local/update.ts
@@ -1,10 +1,9 @@
 import type { DeepPartial } from 'ts-essentials'

-import type { CollectionSlug, Payload, TypedLocale } from '../../../index.js'
+import type { CollectionSlug, Payload, RequestContext, TypedLocale } from '../../../index.js'
 import type {
  Document,
  PayloadRequest,
-  RequestContext,
  SelectType,
  TransformCollectionWithSelect,
  Where,
--- a/packages/payload/src/database/queryValidation/validateSearchParams.ts
+++ b/packages/payload/src/database/queryValidation/validateSearchParams.ts
@@ -73,6 +73,19 @@ export async function validateSearchParam({
    })
  }
  const promises = []
+
+  // Sanitize relation.otherRelation.id to relation.otherRelation
+  if (paths.at(-1)?.path === 'id') {
+    const previousField = paths.at(-2)?.field
+    if (
+      previousField &&
+      (previousField.type === 'relationship' || previousField.type === 'upload') &&
+      typeof previousField.relationTo === 'string'
+    ) {
+      paths.pop()
+    }
+  }
+
  promises.push(
    ...paths.map(async ({ collectionSlug, field, invalid, path }, i) => {
      if (invalid) {
@@ -115,6 +128,7 @@ export async function validateSearchParam({
        ) {
          fieldPath = fieldPath.replace('.value', '')
        }
+
        const entityType: 'collections' | 'globals' = globalConfig ? 'globals' : 'collections'
        const entitySlug = collectionSlug || globalConfig.slug
        const segments = fieldPath.split('.')
--- a/packages/payload/src/database/sanitizeJoinQuery.ts
+++ b/packages/payload/src/database/sanitizeJoinQuery.ts
@@ -0,0 +1,92 @@
+import type { SanitizedCollectionConfig } from '../collections/config/types.js'
+import type { JoinQuery, PayloadRequest } from '../types/index.js'
+
+import executeAccess from '../auth/executeAccess.js'
+import { QueryError } from '../errors/QueryError.js'
+import { combineQueries } from './combineQueries.js'
+import { validateQueryPaths } from './queryValidation/validateQueryPaths.js'
+
+type Args = {
+  collectionConfig: SanitizedCollectionConfig
+  joins?: JoinQuery
+  overrideAccess: boolean
+  req: PayloadRequest
+}
+
+/**
+ * * Validates `where` for each join
+ * * Combines the access result for joined collection
+ * * Combines the default join's `where`
+ */
+export const sanitizeJoinQuery = async ({
+  collectionConfig,
+  joins: joinsQuery,
+  overrideAccess,
+  req,
+}: Args) => {
+  if (joinsQuery === false) {
+    return false
+  }
+
+  if (!joinsQuery) {
+    joinsQuery = {}
+  }
+
+  const errors: { path: string }[] = []
+  const promises: Promise<void>[] = []
+
+  for (const collectionSlug in collectionConfig.joins) {
+    for (const { field, schemaPath } of collectionConfig.joins[collectionSlug]) {
+      if (joinsQuery[schemaPath] === false) {
+        continue
+      }
+
+      const joinCollectionConfig = req.payload.collections[collectionSlug].config
+
+      const accessResult = !overrideAccess
+        ? await executeAccess({ disableErrors: true, req }, joinCollectionConfig.access.read)
+        : true
+
+      if (accessResult === false) {
+        joinsQuery[schemaPath] = false
+        continue
+      }
+
+      if (!joinsQuery[schemaPath]) {
+        joinsQuery[schemaPath] = {}
+      }
+
+      const joinQuery = joinsQuery[schemaPath]
+
+      if (!joinQuery.where) {
+        joinQuery.where = {}
+      }
+
+      if (field.where) {
+        joinQuery.where = combineQueries(joinQuery.where, field.where)
+      }
+
+      if (typeof accessResult === 'object') {
+        joinQuery.where = combineQueries(joinQuery.where, accessResult)
+      }
+
+      promises.push(
+        validateQueryPaths({
+          collectionConfig: joinCollectionConfig,
+          errors,
+          overrideAccess,
+          req,
+          where: joinQuery.where,
+        }),
+      )
+    }
+  }
+
+  await Promise.all(promises)
+
+  if (errors.length > 0) {
+    throw new QueryError(errors)
+  }
+
+  return joinsQuery
+}
--- a/packages/payload/src/fields/config/types.ts
+++ b/packages/payload/src/fields/config/types.ts
@@ -121,11 +121,12 @@ import type {
  JSONFieldValidation,
  PointFieldValidation,
  RadioFieldValidation,
+  RequestContext,
  Sort,
  TextareaFieldValidation,
 } from '../../index.js'
 import type { DocumentPreferences } from '../../preferences/types.js'
-import type { Operation, PayloadRequest, RequestContext, Where } from '../../types/index.js'
+import type { Operation, PayloadRequest, Where } from '../../types/index.js'
 import type {
  NumberFieldManyValidation,
  NumberFieldSingleValidation,
@@ -1011,6 +1012,7 @@ export type JSONField = {
      Label?: CustomComponent<JSONFieldLabelClientComponent | JSONFieldLabelServerComponent>
    } & Admin['components']
    editorOptions?: EditorProps['options']
+    maxHeight?: number
  } & Admin

  jsonSchema?: {
@@ -1030,6 +1032,7 @@ export type JSONFieldClient = {
      Error?: MappedComponent
      Label?: MappedComponent
    } & AdminClient['components']
+    maxHeight?: number
  } & AdminClient &
    Pick<JSONField['admin'], 'editorOptions'>
 } & Omit<FieldBaseClient, 'admin'> &
@@ -1474,6 +1477,7 @@ export type JoinField = {
  on: string
  type: 'join'
  validate?: never
+  where?: Where
 } & FieldBase

 export type JoinFieldClient = {
@@ -1485,7 +1489,7 @@ export type JoinFieldClient = {
  } & AdminClient &
    Pick<JoinField['admin'], 'disableBulkEdit' | 'readOnly'>
 } & FieldBaseClient &
-  Pick<JoinField, 'collection' | 'index' | 'maxDepth' | 'on' | 'type'>
+  Pick<JoinField, 'collection' | 'index' | 'maxDepth' | 'on' | 'type' | 'where'>

 export type Field =
  | ArrayField
--- a/packages/payload/src/fields/hooks/afterChange/index.ts
+++ b/packages/payload/src/fields/hooks/afterChange/index.ts
@@ -1,6 +1,7 @@
 import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
 import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'
-import type { JsonObject, PayloadRequest, RequestContext } from '../../../types/index.js'
+import type { RequestContext } from '../../../index.js'
+import type { JsonObject, PayloadRequest } from '../../../types/index.js'

 import { deepCopyObjectSimple } from '../../../utilities/deepCopyObject.js'
 import { traverseFields } from './traverseFields.js'
--- a/packages/payload/src/fields/hooks/afterChange/promise.ts
+++ b/packages/payload/src/fields/hooks/afterChange/promise.ts
@@ -1,7 +1,8 @@
 import type { RichTextAdapter } from '../../../admin/RichText.js'
 import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
 import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'
-import type { JsonObject, PayloadRequest, RequestContext } from '../../../types/index.js'
+import type { RequestContext } from '../../../index.js'
+import type { JsonObject, PayloadRequest } from '../../../types/index.js'
 import type { Field, TabAsField } from '../../config/types.js'

 import { MissingEditorProp } from '../../../errors/index.js'
--- a/packages/payload/src/fields/hooks/afterChange/traverseFields.ts
+++ b/packages/payload/src/fields/hooks/afterChange/traverseFields.ts
@@ -1,6 +1,7 @@
 import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
 import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'
-import type { JsonObject, PayloadRequest, RequestContext } from '../../../types/index.js'
+import type { RequestContext } from '../../../index.js'
+import type { JsonObject, PayloadRequest } from '../../../types/index.js'
 import type { Field, TabAsField } from '../../config/types.js'

 import { promise } from './promise.js'
--- a/packages/payload/src/fields/hooks/afterRead/index.ts
+++ b/packages/payload/src/fields/hooks/afterRead/index.ts
@@ -1,11 +1,7 @@
 import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
 import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'
-import type {
-  JsonObject,
-  PayloadRequest,
-  RequestContext,
-  SelectType,
-} from '../../../types/index.js'
+import type { RequestContext } from '../../../index.js'
+import type { JsonObject, PayloadRequest, SelectType } from '../../../types/index.js'

 import { deepCopyObjectSimple } from '../../../utilities/deepCopyObject.js'
 import { getSelectMode } from '../../../utilities/getSelectMode.js'
--- a/packages/payload/src/fields/hooks/afterRead/promise.ts
+++ b/packages/payload/src/fields/hooks/afterRead/promise.ts
@@ -1,13 +1,8 @@
 import type { RichTextAdapter } from '../../../admin/RichText.js'
 import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
 import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'
-import type {
-  JsonObject,
-  PayloadRequest,
-  RequestContext,
-  SelectMode,
-  SelectType,
-} from '../../../types/index.js'
+import type { RequestContext } from '../../../index.js'
+import type { JsonObject, PayloadRequest, SelectMode, SelectType } from '../../../types/index.js'
 import type { Field, TabAsField } from '../../config/types.js'

 import { MissingEditorProp } from '../../../errors/index.js'
--- a/packages/payload/src/fields/hooks/afterRead/traverseFields.ts
+++ b/packages/payload/src/fields/hooks/afterRead/traverseFields.ts
@@ -1,12 +1,7 @@
 import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
 import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'
-import type {
-  JsonObject,
-  PayloadRequest,
-  RequestContext,
-  SelectMode,
-  SelectType,
-} from '../../../types/index.js'
+import type { RequestContext } from '../../../index.js'
+import type { JsonObject, PayloadRequest, SelectMode, SelectType } from '../../../types/index.js'
 import type { Field, TabAsField } from '../../config/types.js'

 import { promise } from './promise.js'
--- a/packages/payload/src/fields/hooks/beforeChange/index.ts
+++ b/packages/payload/src/fields/hooks/beforeChange/index.ts
@@ -1,6 +1,7 @@
 import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
 import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'
-import type { JsonObject, Operation, PayloadRequest, RequestContext } from '../../../types/index.js'
+import type { RequestContext } from '../../../index.js'
+import type { JsonObject, Operation, PayloadRequest } from '../../../types/index.js'

 import { ValidationError } from '../../../errors/index.js'
 import { deepCopyObjectSimple } from '../../../utilities/deepCopyObject.js'
--- a/packages/payload/src/fields/hooks/beforeChange/promise.ts
+++ b/packages/payload/src/fields/hooks/beforeChange/promise.ts
@@ -1,7 +1,8 @@
 import type { RichTextAdapter } from '../../../admin/RichText.js'
 import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
 import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'
-import type { JsonObject, Operation, PayloadRequest, RequestContext } from '../../../types/index.js'
+import type { RequestContext } from '../../../index.js'
+import type { JsonObject, Operation, PayloadRequest } from '../../../types/index.js'
 import type { Field, FieldHookArgs, TabAsField, ValidateOptions } from '../../config/types.js'

 import { MissingEditorProp } from '../../../errors/index.js'
--- a/packages/payload/src/fields/hooks/beforeChange/traverseFields.ts
+++ b/packages/payload/src/fields/hooks/beforeChange/traverseFields.ts
@@ -1,6 +1,7 @@
 import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
 import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'
-import type { JsonObject, Operation, PayloadRequest, RequestContext } from '../../../types/index.js'
+import type { RequestContext } from '../../../index.js'
+import type { JsonObject, Operation, PayloadRequest } from '../../../types/index.js'
 import type { Field, TabAsField } from '../../config/types.js'

 import { promise } from './promise.js'
--- a/packages/payload/src/fields/hooks/beforeDuplicate/index.ts
+++ b/packages/payload/src/fields/hooks/beforeDuplicate/index.ts
@@ -1,5 +1,6 @@
 import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
-import type { JsonObject, PayloadRequest, RequestContext } from '../../../types/index.js'
+import type { RequestContext } from '../../../index.js'
+import type { JsonObject, PayloadRequest } from '../../../types/index.js'

 import { deepCopyObjectSimple } from '../../../utilities/deepCopyObject.js'
 import { traverseFields } from './traverseFields.js'
--- a/packages/payload/src/fields/hooks/beforeDuplicate/promise.ts
+++ b/packages/payload/src/fields/hooks/beforeDuplicate/promise.ts
@@ -1,5 +1,6 @@
 import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
-import type { JsonObject, PayloadRequest, RequestContext } from '../../../types/index.js'
+import type { RequestContext } from '../../../index.js'
+import type { JsonObject, PayloadRequest } from '../../../types/index.js'
 import type { Field, FieldHookArgs, TabAsField } from '../../config/types.js'

 import { fieldAffectsData, tabHasName } from '../../config/types.js'
--- a/packages/payload/src/fields/hooks/beforeDuplicate/traverseFields.ts
+++ b/packages/payload/src/fields/hooks/beforeDuplicate/traverseFields.ts
@@ -1,5 +1,6 @@
 import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
-import type { JsonObject, PayloadRequest, RequestContext } from '../../../types/index.js'
+import type { RequestContext } from '../../../index.js'
+import type { JsonObject, PayloadRequest } from '../../../types/index.js'
 import type { Field, TabAsField } from '../../config/types.js'

 import { promise } from './promise.js'
--- a/packages/payload/src/fields/hooks/beforeValidate/index.ts
+++ b/packages/payload/src/fields/hooks/beforeValidate/index.ts
@@ -1,6 +1,7 @@
 import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
 import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'
-import type { JsonObject, PayloadRequest, RequestContext } from '../../../types/index.js'
+import type { RequestContext } from '../../../index.js'
+import type { JsonObject, PayloadRequest } from '../../../types/index.js'

 import { deepCopyObjectSimple } from '../../../utilities/deepCopyObject.js'
 import { traverseFields } from './traverseFields.js'
--- a/packages/payload/src/fields/hooks/beforeValidate/promise.ts
+++ b/packages/payload/src/fields/hooks/beforeValidate/promise.ts
@@ -1,7 +1,8 @@
 import type { RichTextAdapter } from '../../../admin/RichText.js'
 import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
 import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'
-import type { JsonObject, JsonValue, PayloadRequest, RequestContext } from '../../../types/index.js'
+import type { RequestContext } from '../../../index.js'
+import type { JsonObject, JsonValue, PayloadRequest } from '../../../types/index.js'
 import type { Field, TabAsField } from '../../config/types.js'

 import { MissingEditorProp } from '../../../errors/index.js'
--- a/packages/payload/src/fields/hooks/beforeValidate/traverseFields.ts
+++ b/packages/payload/src/fields/hooks/beforeValidate/traverseFields.ts
@@ -1,6 +1,7 @@
 import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
 import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'
-import type { JsonObject, PayloadRequest, RequestContext } from '../../../types/index.js'
+import type { RequestContext } from '../../../index.js'
+import type { JsonObject, PayloadRequest } from '../../../types/index.js'
 import type { Field, TabAsField } from '../../config/types.js'

 import { promise } from './promise.js'
--- a/packages/payload/src/globals/config/types.ts
+++ b/packages/payload/src/globals/config/types.ts
@@ -19,8 +19,8 @@ import type {
 } from '../../config/types.js'
 import type { DBIdentifierName } from '../../database/types.js'
 import type { Field } from '../../fields/config/types.js'
-import type { GlobalSlug, TypedGlobal, TypedGlobalSelect } from '../../index.js'
-import type { PayloadRequest, RequestContext, Where } from '../../types/index.js'
+import type { GlobalSlug, RequestContext, TypedGlobal, TypedGlobalSelect } from '../../index.js'
+import type { PayloadRequest, Where } from '../../types/index.js'
 import type { IncomingGlobalVersions, SanitizedGlobalVersions } from '../../versions/types.js'

 export type DataFromGlobalSlug<TSlug extends GlobalSlug> = TypedGlobal[TSlug]
--- a/packages/payload/src/types/index.ts
+++ b/packages/payload/src/types/index.ts
@@ -12,6 +12,7 @@ import type {
  CollectionSlug,
  DataFromGlobalSlug,
  GlobalSlug,
+  RequestContext,
  TypedLocale,
  TypedUser,
 } from '../index.js'
@@ -94,10 +95,6 @@ export type PayloadRequest = CustomPayloadRequestProperties &
  PayloadRequestData &
  Required<Pick<Request, 'headers'>>

-export interface RequestContext {
-  [key: string]: unknown
-}
-
 export type Operator = (typeof validOperators)[number]

 // Makes it so things like passing new Date() will error
@@ -127,11 +124,13 @@ export type Sort = Array<string> | string
 */
 export type JoinQuery =
  | {
-      [schemaPath: string]: {
-        limit?: number
-        sort?: string
-        where?: Where
-      }
+      [schemaPath: string]:
+        | {
+            limit?: number
+            sort?: string
+            where?: Where
+          }
+        | false
    }
  | false

--- a/packages/payload/src/utilities/addSelectGenericsToGeneratedTyoes.spec.ts
+++ b/packages/payload/src/utilities/addSelectGenericsToGeneratedTyoes.spec.ts
@@ -22,7 +22,7 @@ export interface Config {
    'payload-preferences': PayloadPreference;
    'payload-migrations': PayloadMigration;
  };
-  collectionsSelect?: {
+  collectionsSelect: {
    posts: PostsSelect;
    users: UsersSelect;
    'payload-locked-documents': PayloadLockedDocumentsSelect;
@@ -33,7 +33,7 @@ export interface Config {
    defaultIDType: string;
  };
  globals: {};
-  globalsSelect?: {};
+  globalsSelect: {};
  locale: null;
  user: User & {
    collection: 'users';
@@ -295,7 +295,7 @@ export interface Config {
    'payload-preferences': PayloadPreference;
    'payload-migrations': PayloadMigration;
  };
-  collectionsSelect?: {
+  collectionsSelect: {
    posts: PostsSelect<false> | PostsSelect<true>;
    users: UsersSelect<false> | UsersSelect<true>;
    'payload-locked-documents': PayloadLockedDocumentsSelect<false> | PayloadLockedDocumentsSelect<true>;
@@ -306,7 +306,7 @@ export interface Config {
    defaultIDType: string;
  };
  globals: {};
-  globalsSelect?: {};
+  globalsSelect: {};
  locale: null;
  user: User & {
    collection: 'users';
--- a/packages/payload/src/utilities/addSelectGenericsToGeneretedTypes.ts
+++ b/packages/payload/src/utilities/addSelectGenericsToGeneretedTypes.ts
@@ -10,7 +10,7 @@ export const addSelectGenericsToGeneratedTypes = ({

  for (const line of compiledGeneratedTypes.split('\n')) {
    let newLine = line
-    if (line === `  collectionsSelect?: {` || line === `  globalsSelect?: {`) {
+    if (line === `  collectionsSelect: {` || line === `  globalsSelect: {`) {
      isCollectionsSelectToken = true
    }

--- a/packages/payload/src/utilities/configToJSONSchema.ts
+++ b/packages/payload/src/utilities/configToJSONSchema.ts
@@ -996,7 +996,16 @@ export function configToJSONSchema(
      locale: generateLocaleEntitySchemas(config.localization),
      user: generateAuthEntitySchemas(config.collections),
    },
-    required: ['user', 'locale', 'collections', 'globals', 'auth', 'db'],
+    required: [
+      'user',
+      'locale',
+      'collections',
+      'collectionsSelect',
+      'globalsSelect',
+      'globals',
+      'auth',
+      'db',
+    ],
    title: 'Config',
  }
  if (jobsSchemas.definitions?.size) {
--- a/packages/payload/src/utilities/telemetry/index.ts
+++ b/packages/payload/src/utilities/telemetry/index.ts
@@ -26,6 +26,7 @@ export type BaseEvent = {
  nodeVersion: string
  payloadVersion: string
  projectID: string
+  projectIDSource: 'cwd' | 'git' | 'packageJSON' | 'serverURL'
  uploadAdapters: string[]
 }

@@ -49,6 +50,7 @@ export const sendEvent = async ({ event, payload }: Args): Promise<void> => {

    // Only generate the base event once
    if (!baseEvent) {
+      const { projectID, source: projectIDSource } = getProjectID(payload, packageJSON)
      baseEvent = {
        ciName: ciInfo.isCI ? ciInfo.name : null,
        envID: getEnvID(),
@@ -56,7 +58,8 @@ export const sendEvent = async ({ event, payload }: Args): Promise<void> => {
        nodeEnv: process.env.NODE_ENV || 'development',
        nodeVersion: process.version,
        payloadVersion: getPayloadVersion(packageJSON),
-        projectID: getProjectID(payload, packageJSON),
+        projectID,
+        projectIDSource,
        ...getLocalizationInfo(payload),
        dbAdapter: payload.db.name,
        emailAdapter: payload.email?.name || null,
@@ -104,13 +107,27 @@ const getEnvID = (): string => {
  return generated
 }

-const getProjectID = (payload: Payload, packageJSON: PackageJSON): string => {
-  const projectID =
-    getGitID(payload) ||
-    getPackageJSONID(payload, packageJSON) ||
-    payload.config.serverURL ||
-    process.cwd()
-  return oneWayHash(projectID, payload.secret)
+const getProjectID = (
+  payload: Payload,
+  packageJSON: PackageJSON,
+): { projectID: string; source: BaseEvent['projectIDSource'] } => {
+  const gitID = getGitID(payload)
+  if (gitID) {
+    return { projectID: oneWayHash(gitID, payload.secret), source: 'git' }
+  }
+
+  const packageJSONID = getPackageJSONID(payload, packageJSON)
+  if (packageJSONID) {
+    return { projectID: oneWayHash(packageJSONID, payload.secret), source: 'packageJSON' }
+  }
+
+  const serverURL = payload.config.serverURL
+  if (serverURL) {
+    return { projectID: oneWayHash(serverURL, payload.secret), source: 'serverURL' }
+  }
+
+  const cwd = process.cwd()
+  return { projectID: oneWayHash(cwd, payload.secret), source: 'cwd' }
 }

 const getGitID = (payload: Payload) => {
--- a/packages/plugin-cloud-storage/package.json
+++ b/packages/plugin-cloud-storage/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/plugin-cloud-storage",
-  "version": "3.0.0-beta.123",
+  "version": "3.0.0-beta.125",
  "description": "The official cloud storage plugin for Payload CMS",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/plugin-form-builder/package.json
+++ b/packages/plugin-form-builder/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/plugin-form-builder",
-  "version": "3.0.0-beta.123",
+  "version": "3.0.0-beta.125",
  "description": "Form builder plugin for Payload CMS",
  "keywords": [
    "payload",
--- a/packages/plugin-nested-docs/package.json
+++ b/packages/plugin-nested-docs/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/plugin-nested-docs",
-  "version": "3.0.0-beta.123",
+  "version": "3.0.0-beta.125",
  "description": "The official Nested Docs plugin for Payload",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/plugin-redirects/package.json
+++ b/packages/plugin-redirects/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/plugin-redirects",
-  "version": "3.0.0-beta.123",
+  "version": "3.0.0-beta.125",
  "description": "Redirects plugin for Payload",
  "keywords": [
    "payload",
--- a/packages/plugin-search/package.json
+++ b/packages/plugin-search/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/plugin-search",
-  "version": "3.0.0-beta.123",
+  "version": "3.0.0-beta.125",
  "description": "Search plugin for Payload",
  "keywords": [
    "payload",
--- a/packages/plugin-sentry/package.json
+++ b/packages/plugin-sentry/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/plugin-sentry",
-  "version": "3.0.0-beta.123",
+  "version": "3.0.0-beta.125",
  "description": "Sentry plugin for Payload",
  "keywords": [
    "payload",
--- a/packages/plugin-seo/package.json
+++ b/packages/plugin-seo/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/plugin-seo",
-  "version": "3.0.0-beta.123",
+  "version": "3.0.0-beta.125",
  "description": "SEO plugin for Payload",
  "keywords": [
    "payload",
--- a/packages/plugin-seo/src/translations/cs.ts
+++ b/packages/plugin-seo/src/translations/cs.ts
@@ -0,0 +1,28 @@
+import type { GenericTranslationsObject } from '@payloadcms/translations'
+
+export const cs: GenericTranslationsObject = {
+  $schema: './translation-schema.json',
+  'plugin-seo': {
+    almostThere: 'Skoro hotovo',
+    autoGenerate: 'Generovat automaticky',
+    bestPractices: 'osvědčené postupy',
+    characterCount: '{{current}}/{{minLength}}-{{maxLength}} znaků, ',
+    charactersLeftOver: '{{characters}} zbývá',
+    charactersToGo: '{{characters}} zbývá',
+    charactersTooMany: '{{characters}} navíc',
+    checksPassing: '{{current}}/{{max}} kontrol úspěšně splněno',
+    good: 'Dobré',
+    imageAutoGenerationTip: 'Automatická generace načte vybraný hero obrázek.',
+    lengthTipDescription:
+      'Toto by mělo mít mezi {{minLength}} a {{maxLength}} znaky. Pomoc při psaní kvalitních meta popisů navštivte ',
+    lengthTipTitle:
+      'Toto by mělo mít mezi {{minLength}} a {{maxLength}} znaky. Pomoc při psaní kvalitních meta titulů navštivte ',
+    missing: 'Chybí',
+    noImage: 'Bez obrázku',
+    preview: 'Náhled',
+    previewDescription:
+      'Přesný výsledek se může lišit v závislosti na obsahu a relevanci vyhledávání.',
+    tooLong: 'Příliš dlouhé',
+    tooShort: 'Příliš krátké',
+  },
+}
--- a/packages/plugin-seo/src/translations/index.ts
+++ b/packages/plugin-seo/src/translations/index.ts
@@ -1,5 +1,6 @@
 import type { GenericTranslationsObject, NestedKeysStripped } from '@payloadcms/translations'

+import { cs } from './cs.js'
 import { de } from './de.js'
 import { en } from './en.js'
 import { es } from './es.js'
@@ -9,9 +10,12 @@ import { it } from './it.js'
 import { nb } from './nb.js'
 import { pl } from './pl.js'
 import { ru } from './ru.js'
+import { sv } from './sv.js'
+import { tr } from './tr.js'
 import { uk } from './uk.js'

 export const translations = {
+  cs,
  de,
  en,
  es,
@@ -21,6 +25,8 @@ export const translations = {
  nb,
  pl,
  ru,
+  sv,
+  tr,
  uk,
 }

--- a/packages/plugin-seo/src/translations/sv.ts
+++ b/packages/plugin-seo/src/translations/sv.ts
@@ -0,0 +1,28 @@
+import type { GenericTranslationsObject } from '@payloadcms/translations'
+
+export const sv: GenericTranslationsObject = {
+  $schema: './translation-schema.json',
+  'plugin-seo': {
+    almostThere: 'Nästan klar',
+    autoGenerate: 'Skapa automatiskt',
+    bestPractices: 'bästa praxis',
+    characterCount: '{{current}}/{{minLength}}-{{maxLength}} tecken, ',
+    charactersLeftOver: '{{characters}} tecken blir över',
+    charactersToGo: '{{characters}} tecken kvar',
+    charactersTooMany: '{{characters}} tecken för mycket',
+    checksPassing: '{{current}}/{{max}} kontroller är godkända',
+    good: 'Bra',
+    imageAutoGenerationTip: 'Den automatiska processen kommer att välja en hero-bild.',
+    lengthTipDescription:
+      'Bör vara mellan {{minLength}} och {{maxLength}} tecken. För hjälp med att skriva bra metabeskrivningar, se ',
+    lengthTipTitle:
+      'Bör vara mellan {{minLength}} och {{maxLength}} tecken. För hjälp med att skriva bra metatitlar, se ',
+    missing: 'Saknas',
+    noImage: 'Ingen bild',
+    preview: 'Förhandsgranska',
+    previewDescription:
+      'Exakta resultatlistningar kan variera baserat på innehåll och sökrelevans.',
+    tooLong: 'För lång',
+    tooShort: 'För kort',
+  },
+}
--- a/packages/plugin-seo/src/translations/tr.ts
+++ b/packages/plugin-seo/src/translations/tr.ts
@@ -0,0 +1,27 @@
+import type { GenericTranslationsObject } from '@payloadcms/translations'
+
+export const tr: GenericTranslationsObject = {
+  $schema: './translation-schema.json',
+  'plugin-seo': {
+    almostThere: 'Neredeyse tamam',
+    autoGenerate: 'Otomatik oluştur',
+    bestPractices: 'en iyi uygulamalar',
+    characterCount: '{{current}}/{{minLength}}-{{maxLength}} karakter, ',
+    charactersLeftOver: '{{characters}} karakter kaldı',
+    charactersToGo: '{{characters}} karakter kaldı',
+    charactersTooMany: '{{characters}} karakter fazla',
+    checksPassing: '{{current}}/{{max}} kontrol başarılı',
+    good: 'İyi',
+    imageAutoGenerationTip: 'Otomatik oluşturma, seçilen ana görseli alacaktır.',
+    lengthTipDescription:
+      '{{minLength}} ile {{maxLength}} karakter arasında olmalıdır. Kaliteli meta açıklamaları yazmak için yardım almak için bkz. ',
+    lengthTipTitle:
+      '{{minLength}} ile {{maxLength}} karakter arasında olmalıdır. Kaliteli meta başlıkları yazmak için yardım almak için bkz. ',
+    missing: 'Eksik',
+    noImage: 'Görsel yok',
+    preview: 'Önizleme',
+    previewDescription: 'Kesin sonuç listeleri içeriğe ve arama alâkasına göre değişebilir.',
+    tooLong: 'Çok uzun',
+    tooShort: 'Çok kısa',
+  },
+}
--- a/packages/plugin-stripe/package.json
+++ b/packages/plugin-stripe/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/plugin-stripe",
-  "version": "3.0.0-beta.123",
+  "version": "3.0.0-beta.125",
  "description": "Stripe plugin for Payload",
  "keywords": [
    "payload",
--- a/packages/richtext-lexical/package.json
+++ b/packages/richtext-lexical/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/richtext-lexical",
-  "version": "3.0.0-beta.123",
+  "version": "3.0.0-beta.125",
  "description": "The officially supported Lexical richtext adapter for Payload",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/packages/richtext-slate/package.json
+++ b/packages/richtext-slate/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@payloadcms/richtext-slate",
-  "version": "3.0.0-beta.123",
+  "version": "3.0.0-beta.125",
  "description": "The officially supported Slate richtext adapter for Payload",
  "homepage": "https://payloadcms.com",
  "repository": {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Elliot DeNolf	8a5f6f044d	chore(release): v3.0.0-beta.125 [skip ci]	2024-11-06 10:24:31 -05:00
Dan Ribbens	93a55d1075	feat: add join field config `where` property (#8973 ) ### What? Makes it possible to filter join documents using a `where` added directly in the config. ### Why? It makes the join field more powerful for adding contextual meaning to the documents being returned. For example, maybe you have a `requiresAction` field that you set and you can have a join that automatically filters the documents to those that need attention. ### How? In the database adapter, we merge the requested `where` to the `where` defined on the field. On the frontend the results are filtered using the `filterOptions` property in the component. Fixes https://github.com/payloadcms/payload/discussions/8936 https://github.com/payloadcms/payload/discussions/8937 --------- Co-authored-by: Sasha <64744993+r1tsuu@users.noreply.github.com>	2024-11-06 10:06:25 -05:00
Elliot DeNolf	cdcefa88f2	fix(cpa): remove lock file on project creation	2024-11-06 10:02:29 -05:00
Elliot DeNolf	5c049f7c9c	ci(triage): adjust tag condition	2024-11-05 23:03:27 -05:00
Elliot DeNolf	ae6fb4dd1b	ci(triage): add granularity in actions to be performed, enable comments	2024-11-05 22:58:33 -05:00
Sasha	9ce2ba6a3f	fix: custom endpoints with `method: 'put'` (#9037 ) ### What? Fixes support for custom endpoints with `method: 'put'`. Previously, this didn't work: ```ts export default buildConfigWithDefaults({ collections: [ ], endpoints: [ { method: 'put', handler: () => new Response(), path: '/put', }, ], }) ``` ### Why? We supported this in 2.0 and docs are saying that we can use `'put'` as `method` https://payloadcms.com/docs/beta/rest-api/overview#custom-endpoints ### How? Implements the `REST_PUT` export for `@payloadcms/next/routes`, updates all templates. Additionally, adds tests to ensure root/collection level custom endpoints with all necessary methods execute properly. Fixes https://github.com/payloadcms/payload/issues/8807 -->	2024-11-05 23:14:34 +02:00
Sasha	f52b7c45c0	fix: type augmentation of `RequestContext` (#9035 ) ### What? Makes this to actually work ```ts import type { RequestContext as OriginalRequestContext } from 'payload' declare module 'payload' { // Create a new interface that merges your additional fields with the original one export interface RequestContext extends OriginalRequestContext { myObject?: string // ... } } ``` <img width="502" alt="image" src="https://github.com/user-attachments/assets/38570d3c-e8a8-48aa-a57d-6d11e79394f5"> ### Why? This is described in our docs https://payloadcms.com/docs/beta/hooks/context#typescript therefore it should work. ### How? In order to get the declaration work, we need to reuse the type from the root file `payload/src/index.js`. Additionally, removes `RequestContext` type duplication in both `payload/src/types/index.js` and `payload/src/index.js`. Fixes https://github.com/payloadcms/payload/issues/8851	2024-11-05 23:14:04 +02:00
Elliot DeNolf	2eeed4a8ae	chore(templates): add lock file to with-payload-cloud	2024-11-05 15:55:57 -05:00
Elliot DeNolf	c0335aa49e	chore(templates): add lock files	2024-11-05 15:27:27 -05:00
Paul	3ca203e08c	fix(ui): json fields can now take a maxHeight in admin props and there's a mininum height of 3 lines (#9018 ) JSON fields are now 3 lines minimum in height like so: ![image](https://github.com/user-attachments/assets/0b2ad47e-6929-4836-ac9d-022ffcdc6f27) This helps fix an issue where long content is wrapped: ![image](https://github.com/user-attachments/assets/40fc2426-11d7-4ca5-a716-3347bb0d5a4b) Previously it would show like this: ![image](https://github.com/user-attachments/assets/7f321220-ffa2-40ff-bc4b-2b26d21d4911)	2024-11-05 13:43:51 -06:00
James Mikrut	50f3ca93ee	docs: improves jobs queue (#9038 ) improves docs for jobs queue	2024-11-05 19:25:14 +00:00
Friggo	4652e8d56e	feat(plugin-seo): add czech translation (#8998 ) Adds Czech translation to SEO plugin.	2024-11-05 18:28:12 +00:00
Patrik	2175e5cdfb	fix(ui): ensure upload field updates reflect in edit popup changes (#9034 ) ### What? Any changes inside edit popup for the field with type `upload` and the `relationTo` collection does nothing in context of the field, it has affect only to collection. I.e. when you make an edit to an uploads field in the edit drawer - after saving and existing the drawer, your new changes are not present until a refresh of the page. ### Why? Previously, we were not performing a reload of the document fetch upon saving of the doc in the edit drawer. ### How? Now, we perform a reload (fetch) for updated docs on save within the edit drawer. Fixes #8837	2024-11-05 13:03:12 -05:00
Paul	201d68663e	feat(templates): website template now has configured image sizes, updated readme and simplified env vars for setting up (#9036 )	2024-11-05 17:59:29 +00:00
Patrik	ebd3c025b7	fix(ui): `updatedAt` field in locked-docs collection able to be updated by non-owner (#9026 ) ### What? If you have a custom field that sets the value of the field using the `useField` hook on entry into a document - the `updatedAt` field would be updated even when a non-owner tries to enter a locked document. ### Why? When a field is updated in the edit view - we perform an update in `form-state` to keep the doc in `payload-locked-documents` up to date with the current editing status. The above scenario would hit this update operation even on non-owner users because it was previously only checking for `updateLastEdited` (which would get hit by the `setValue` in the `useField` hook) so we also need to check to make sure the current user entering a locked doc is also the owner of the document. ### How? When performing an update to `payload-locked-documents` in `buildFormState` - only perform the update if the current user is also the owner of the locked document otherwise skip the `update` operation. Fixes #8781	2024-11-05 12:39:48 -05:00
Paul	ddc9d9731a	feat: adds x-powered-by Payload header in next config (#9027 ) Adds the `x-powered-by` header to include Payload alongside Next.js End result looks like this ``` x-powered-by: Next.js, Payload ``` It also respects the nextConfig `poweredBy: false` to completely disable it	2024-11-04 18:11:51 -06:00
Jesper We	3e31b7aec9	feat(plugin-seo): add Swedish translations (#9007 ) ### What? Swedish text translations ### Why? There was no Swedish before	2024-11-04 21:25:08 +00:00
Elliot DeNolf	e390835711	chore(release): v3.0.0-beta.124 [skip ci]	2024-11-04 14:47:38 -05:00
James Mikrut	35b107a103	fix: prefetch causing stale data (#9020 ) Potentially fixes #9012 by disabling prefetch for all Next.js `Link` component usage. With prefetch left as the default and _on_, there were cases where the prefetch could fetch stale data for Edit routes. Then, when navigating to the Edit route, the data could be stale. In addition, I think there is some strangeness happening on the Next.js side where prefetched data might still come from the router cache even though router cache is disabled. This fix should be done regardless, but I suspect it will solve for a lot of stale data issues.	2024-11-04 19:24:28 +00:00
Paul	6b9f178fcb	fix: graphql missing options route resulting in failed cors preflight checks in production (#8987 ) GraphQL currently doesn't pass CORS checks as we don't expose an OPTIONS endpoint which is used for browser preflights. Should also fix situations like this https://github.com/payloadcms/payload/issues/8974	2024-11-04 14:20:09 -05:00
vahacreative	cca6746e1e	feat(plugin-seo): add Turkish translation v3 (#8993 )	2024-11-04 11:54:57 -06:00
Sasha	4349b78a2b	fix: invalid `select` type with `strictNullChecks: true` (#8991 ) ### What? Fixes type for the `select` property when having `strictNullChecks: true` or `strict: true` in tsconfig. ### Why? `select` should provide autocompletion for users, at this point it doesn't work with this condtiion ### How? Makes `collectionsSelect` and `globalsSelect` properties required in `configToJSONSchema.ts`. Fixes https://github.com/payloadcms/payload/pull/8550#issuecomment-2452669237	2024-11-04 19:16:37 +02:00
Sasha	5b97ac1a67	fix: querying relationships by `id` path with REST (#9013 ) ### What? Fixes the issue with querying by `id` from REST / `overrideAccess: false`. For example, this didn't work: `/api/loans?where[book.bibliography.id][equals]=67224d74257b3f2acddc75f4` ``` QueryError: The following path cannot be queried: id ``` ### Why? We support this syntax within the Local API. ### How? Now, for simplicity we sanitize everything like `relation.otherRelation.id` to `relation.otherRelation` Fixes https://github.com/payloadcms/payload/issues/9008	2024-11-04 17:57:41 +02:00
Patrik	f10a160462	docs: improves clarity for better readability of document-locking docs (#9010 )	2024-11-04 09:26:08 -05:00
Elliot DeNolf	59ff8c18f5	chore: add project id source (#8983 ) Add `projectIDSource` to analytics event.	2024-11-01 09:46:44 -04:00
Elliot DeNolf	10d5a8f9ae	ci: force add triage action	2024-11-01 09:00:05 -04:00
Said Akhrarov	48d2ac1fce	docs: include hasMany in upload field config options (#8978 ) ### What? Includes `hasMany`, `minRows`, and `maxRows` in Upload field config options table. ### Why? To be inline with the type definitions. ### How? Changes to `docs/fields/upload.mdx`	2024-11-01 05:40:04 -04:00