From 3c9ee5d3b497eb33179ac5366c092ea74cf36b8d Mon Sep 17 00:00:00 2001
From: Dan Ribbens <DanRibbens@users.noreply.github.com>
Date: Mon, 5 May 2025 09:11:10 -0400
Subject: [PATCH 01/46] fix(db-*): migration batch not incrementing past 1
 (#12215)

When `payload migrate` is run and a record with name "dev" is returned
having `batch: -1`, then the `batch` is not incrementing as expected as
it is stuck at 1. This change makes it so the batch is incremented from
the correct latest batch, ignoring the `name: "dev"` migration.
---
 packages/drizzle/src/migrate.ts | 47 ++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/packages/drizzle/src/migrate.ts b/packages/drizzle/src/migrate.ts
index 0256031ac6..fa422f42c6 100644
--- a/packages/drizzle/src/migrate.ts
+++ b/packages/drizzle/src/migrate.ts
@@ -42,33 +42,36 @@ export const migrate: DrizzleAdapter['migrate'] = async function migrate(
       limit: 0,
       sort: '-name',
     }))
+
+    if (migrationsInDB.find((m) => m.batch === -1)) {
+      const { confirm: runMigrations } = await prompts(
+        {
+          name: 'confirm',
+          type: 'confirm',
+          initial: false,
+          message:
+            "It looks like you've run Payload in dev mode, meaning you've dynamically pushed changes to your database.\n\n" +
+            "If you'd like to run migrations, data loss will occur. Would you like to proceed?",
+        },
+        {
+          onCancel: () => {
+            process.exit(0)
+          },
+        },
+      )
+
+      if (!runMigrations) {
+        process.exit(0)
+      }
+      // ignore the dev migration so that the latest batch number increments correctly
+      migrationsInDB = migrationsInDB.filter((m) => m.batch !== -1)
+    }
+
     if (Number(migrationsInDB?.[0]?.batch) > 0) {
       latestBatch = Number(migrationsInDB[0]?.batch)
     }
   }
 
-  if (migrationsInDB.find((m) => m.batch === -1)) {
-    const { confirm: runMigrations } = await prompts(
-      {
-        name: 'confirm',
-        type: 'confirm',
-        initial: false,
-        message:
-          "It looks like you've run Payload in dev mode, meaning you've dynamically pushed changes to your database.\n\n" +
-          "If you'd like to run migrations, data loss will occur. Would you like to proceed?",
-      },
-      {
-        onCancel: () => {
-          process.exit(0)
-        },
-      },
-    )
-
-    if (!runMigrations) {
-      process.exit(0)
-    }
-  }
-
   const newBatch = latestBatch + 1
 
   // Execute 'up' function for each migration sequentially

From 3fb81ef43bca83ecbba9bb0a6f54825d648485e3 Mon Sep 17 00:00:00 2001
From: Sasha <64744993+r1tsuu@users.noreply.github.com>
Date: Mon, 5 May 2025 16:12:44 +0300
Subject: [PATCH 02/46] fix(graphql):  `nextPage` and `prevPage` are non
 nullable even though they can be `null` sometimes (#12201)

This PR introduced https://github.com/payloadcms/payload/pull/11952
improvement for graphql schema with making fields of the `Paginated<T>`
interface non-nullable.

However, there are a few special ones - `nextPage` and `prevPage`. They
can be `null` when:
The result returned 0 docs.
The result returned `x` docs, but in the DB we don't have `x+1` doc.
Thus, `nextPage` will be `null`. The result will have `nextPage: null`.
Finally, when we query 1st page, `prevPage` is `null` as well.

<img width="873" alt="image"
src="https://github.com/user-attachments/assets/04d04b13-ac26-4fc1-b421-b5f86efc9b65"
/>
---
 .../src/schema/buildPaginatedListType.ts      |  4 +-
 test/graphql/int.spec.ts                      | 45 +++++++++++++++++++
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/packages/graphql/src/schema/buildPaginatedListType.ts b/packages/graphql/src/schema/buildPaginatedListType.ts
index 343fd28cba..2a8a64c5d1 100644
--- a/packages/graphql/src/schema/buildPaginatedListType.ts
+++ b/packages/graphql/src/schema/buildPaginatedListType.ts
@@ -10,11 +10,11 @@ export const buildPaginatedListType = (name, docType) =>
       hasNextPage: { type: new GraphQLNonNull(GraphQLBoolean) },
       hasPrevPage: { type: new GraphQLNonNull(GraphQLBoolean) },
       limit: { type: new GraphQLNonNull(GraphQLInt) },
-      nextPage: { type: new GraphQLNonNull(GraphQLInt) },
+      nextPage: { type: GraphQLInt },
       offset: { type: GraphQLInt },
       page: { type: new GraphQLNonNull(GraphQLInt) },
       pagingCounter: { type: new GraphQLNonNull(GraphQLInt) },
-      prevPage: { type: new GraphQLNonNull(GraphQLInt) },
+      prevPage: { type: GraphQLInt },
       totalDocs: { type: new GraphQLNonNull(GraphQLInt) },
       totalPages: { type: new GraphQLNonNull(GraphQLInt) },
     },
diff --git a/test/graphql/int.spec.ts b/test/graphql/int.spec.ts
index ab4cfbdd69..6006887fb7 100644
--- a/test/graphql/int.spec.ts
+++ b/test/graphql/int.spec.ts
@@ -104,5 +104,50 @@ describe('graphql', () => {
 
       expect(res.hyphenated_name).toStrictEqual('example-hyphenated-name')
     })
+
+    it('should not error because of non nullable fields', async () => {
+      await payload.delete({ collection: 'posts', where: {} })
+
+      // this is an array if any errors
+      const res_1 = await restClient
+        .GRAPHQL_POST({
+          body: JSON.stringify({
+            query: `
+query {
+  Posts {
+    docs {
+      title
+    }
+    prevPage
+  }
+}
+        `,
+          }),
+        })
+        .then((res) => res.json())
+      expect(res_1.errors).toBeFalsy()
+
+      await payload.create({
+        collection: 'posts',
+        data: { title: 'any-title' },
+      })
+
+      const res_2 = await restClient
+        .GRAPHQL_POST({
+          body: JSON.stringify({
+            query: `
+query {
+  Posts(limit: 1) {
+    docs {
+      title
+    }
+  }
+}
+        `,
+          }),
+        })
+        .then((res) => res.json())
+      expect(res_2.errors).toBeFalsy()
+    })
   })
 })

From 2628b43639f9bf6efd499a8fe2cb62fc049fda95 Mon Sep 17 00:00:00 2001
From: Sasha <64744993+r1tsuu@users.noreply.github.com>
Date: Mon, 5 May 2025 16:20:30 +0300
Subject: [PATCH 03/46] fix(db-postgres): start transaction in v2-v3 migration
 only after drizzle prompts to avoid timeout (#12302)

When running the v2-v3 migration you might receive prompts for renaming
columns. Since we start a transaction before, you might end up with a
fail if you don't answer within your transaction session period timeout.
This moves the `getTransaction` call after prompts were answered, since
we don't have a reason to start it earlier.
---
 .../drizzle/src/postgres/predefinedMigrations/v2-v3/index.ts   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/drizzle/src/postgres/predefinedMigrations/v2-v3/index.ts b/packages/drizzle/src/postgres/predefinedMigrations/v2-v3/index.ts
index 06fc16a9ba..63fd4111fd 100644
--- a/packages/drizzle/src/postgres/predefinedMigrations/v2-v3/index.ts
+++ b/packages/drizzle/src/postgres/predefinedMigrations/v2-v3/index.ts
@@ -36,7 +36,6 @@ type Args = {
  */
 export const migratePostgresV2toV3 = async ({ debug, payload, req }: Args) => {
   const adapter = payload.db as unknown as BasePostgresAdapter
-  const db = await getTransaction(adapter, req)
   const dir = payload.db.migrationDir
 
   // get the drizzle migrateUpSQL from drizzle using the last schema
@@ -89,6 +88,8 @@ export const migratePostgresV2toV3 = async ({ debug, payload, req }: Args) => {
     payload.logger.info(addColumnsStatement)
   }
 
+  const db = await getTransaction(adapter, req)
+
   await db.execute(sql.raw(addColumnsStatement))
 
   for (const collection of payload.config.collections) {

From 292b462f34549a00b0d8f7a0142b3627c79d890b Mon Sep 17 00:00:00 2001
From: Tobias Odendahl <tak@medicuja.com>
Date: Mon, 5 May 2025 16:09:26 +0200
Subject: [PATCH 04/46] feat(ui): add document link to drawer (#12036)

### What?
Adds an option to open the current document in a new tab when opened in
a drawer.

### Why?
There is currently no direct way to open a document when opened in a
drawer. However, sometimes editors want to edit one or multiple
documents from relationships independently of the current edit view and
need an easy option to open these separately.

### How?
Converts the document id to a link if in drawer context.


![image](https://github.com/user-attachments/assets/e448328f-f685-49b8-95c5-bd5d6aa60e35)

---------

Co-authored-by: Jacob Fletcher <jacobsfletch@gmail.com>
---
 packages/ui/src/elements/IDLabel/index.tsx | 35 ++++++++++---
 test/admin/e2e/document-view/e2e.spec.ts   | 59 ++++++++++++++++++++++
 tsconfig.base.json                         |  2 +-
 3 files changed, 88 insertions(+), 8 deletions(-)

diff --git a/packages/ui/src/elements/IDLabel/index.tsx b/packages/ui/src/elements/IDLabel/index.tsx
index c224c39203..4315c06e0e 100644
--- a/packages/ui/src/elements/IDLabel/index.tsx
+++ b/packages/ui/src/elements/IDLabel/index.tsx
@@ -2,7 +2,12 @@
 import React from 'react'
 
 import './index.scss'
+import { Link } from '../../elements/Link/index.js'
+import { useConfig } from '../../providers/Config/index.js'
+import { useDocumentInfo } from '../../providers/DocumentInfo/index.js'
+import { formatAdminURL } from '../../utilities/formatAdminURL.js'
 import { sanitizeID } from '../../utilities/sanitizeID.js'
+import { useDrawerDepth } from '../Drawer/index.js'
 
 const baseClass = 'id-label'
 
@@ -10,10 +15,26 @@ export const IDLabel: React.FC<{ className?: string; id: string; prefix?: string
   id,
   className,
   prefix = 'ID:',
-}) => (
-  <div className={[baseClass, className].filter(Boolean).join(' ')} title={id}>
-    {prefix}
-    &nbsp;
-    {sanitizeID(id)}
-  </div>
-)
+}) => {
+  const {
+    config: {
+      routes: { admin: adminRoute },
+    },
+  } = useConfig()
+
+  const { collectionSlug, globalSlug } = useDocumentInfo()
+  const drawerDepth = useDrawerDepth()
+
+  const docPath = formatAdminURL({
+    adminRoute,
+    path: `/${collectionSlug ? `collections/${collectionSlug}` : `globals/${globalSlug}`}/${id}`,
+  })
+
+  return (
+    <div className={[baseClass, className].filter(Boolean).join(' ')} title={id}>
+      {prefix}
+      &nbsp;
+      {drawerDepth > 1 ? <Link href={docPath}>{sanitizeID(id)}</Link> : sanitizeID(id)}
+    </div>
+  )
+}
diff --git a/test/admin/e2e/document-view/e2e.spec.ts b/test/admin/e2e/document-view/e2e.spec.ts
index d3830b255d..7b5d617198 100644
--- a/test/admin/e2e/document-view/e2e.spec.ts
+++ b/test/admin/e2e/document-view/e2e.spec.ts
@@ -360,6 +360,65 @@ describe('Document View', () => {
 
       await expect.poll(() => drawer2Left > drawerLeft).toBe(true)
     })
+
+    test('document drawer displays a link to document', async () => {
+      await navigateToDoc(page, postsUrl)
+
+      // change the relationship to a document which is a different one than the current one
+      await page.locator('#field-relationship').click()
+      await page.locator('#field-relationship .rs__option').nth(2).click()
+      await saveDocAndAssert(page)
+
+      // open relationship drawer
+      await page
+        .locator('.field-type.relationship .relationship--single-value__drawer-toggler')
+        .click()
+
+      const drawer1Content = page.locator('[id^=doc-drawer_posts_1_] .drawer__content')
+      await expect(drawer1Content).toBeVisible()
+
+      // modify the title to trigger the leave page modal
+      await page.locator('.drawer__content #field-title').fill('New Title')
+
+      // Open link in a new tab by holding down the Meta or Control key
+      const documentLink = page.locator('.id-label a')
+      const documentId = String(await documentLink.textContent())
+      await documentLink.click()
+
+      const leavePageModal = page.locator('#leave-without-saving #confirm-action').last()
+      await expect(leavePageModal).toBeVisible()
+
+      await leavePageModal.click()
+      await page.waitForURL(postsUrl.edit(documentId))
+    })
+
+    test('document can be opened in a new tab from within the drawer', async () => {
+      await navigateToDoc(page, postsUrl)
+      await page
+        .locator('.field-type.relationship .relationship--single-value__drawer-toggler')
+        .click()
+      await wait(500)
+      const drawer1Content = page.locator('[id^=doc-drawer_posts_1_] .drawer__content')
+      await expect(drawer1Content).toBeVisible()
+
+      const currentUrl = page.url()
+
+      // Open link in a new tab by holding down the Meta or Control key
+      const documentLink = page.locator('.id-label a')
+      const documentId = String(await documentLink.textContent())
+      const [newPage] = await Promise.all([
+        page.context().waitForEvent('page'),
+        documentLink.click({ modifiers: ['ControlOrMeta'] }),
+      ])
+
+      // Wait for navigation to complete in the new tab and ensure correct URL
+      await expect(newPage.locator('.doc-header')).toBeVisible()
+      // using contain here, because after load the lists view will add query params like "?limit=10"
+      expect(newPage.url()).toContain(postsUrl.edit(documentId))
+
+      // Ensure the original page did not change
+      expect(page.url()).toBe(currentUrl)
+    })
   })
 
   describe('descriptions', () => {
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 93d171a6a7..c9793d25c6 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -31,7 +31,7 @@
       }
     ],
     "paths": {
-      "@payload-config": ["./test/fields/config.ts"],
+      "@payload-config": ["./test/_community/config.ts"],
       "@payloadcms/admin-bar": ["./packages/admin-bar/src"],
       "@payloadcms/live-preview": ["./packages/live-preview/src"],
       "@payloadcms/live-preview-react": ["./packages/live-preview-react/src/index.ts"],

From 446938b9cb8745fd09d7ac16446a00aae9c6290c Mon Sep 17 00:00:00 2001
From: Ruslan <rri@medicuja.com>
Date: Mon, 5 May 2025 16:14:27 +0200
Subject: [PATCH 05/46] feat(ui): update RelationshipFilter if only
 filterOptions are changed (#11985)

### What?
Extends trigger of a reload of the fields for RelationshipFilter to
include `filterOptions`.

### Why?
If you have two or more relationship fields that have a relation to the
same collection, the options of the filter will not update.

### How
By extending dependencies of `useEffect`

### Code setup:
```
{
    name: 'media',
    type: 'relationship',
    relationTo: 'media',
    filterOptions: () => {
      return {
        id: { in: ['67efaee24648d01dffceecf9'] },
      }
    }
  },
  {
    name: 'media2',
    type: 'relationship',
    relationTo: 'media',
    filterOptions: () => {
      return {
        id: { in: ['67efafb04648d01dffceed75'] },
      }
    }
  },
  ```

  ### Before:

https://github.com/user-attachments/assets/bdc5135b-3afa-48df-98fe-6a9153dd7710




 ### After:

https://github.com/user-attachments/assets/d71a7558-6413-4c97-9b0b-678cf3b011d0




-->
---
 .../src/elements/WhereBuilder/Condition/Relationship/index.tsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ui/src/elements/WhereBuilder/Condition/Relationship/index.tsx b/packages/ui/src/elements/WhereBuilder/Condition/Relationship/index.tsx
index 825e0144db..c1808359b5 100644
--- a/packages/ui/src/elements/WhereBuilder/Condition/Relationship/index.tsx
+++ b/packages/ui/src/elements/WhereBuilder/Condition/Relationship/index.tsx
@@ -324,7 +324,7 @@ export const RelationshipFilter: React.FC<Props> = (props) => {
         }
       })
     }
-  }, [i18n, relationTo, debouncedSearch])
+  }, [i18n, relationTo, debouncedSearch, filterOptions])
 
   /**
    * Load any other options that might exist in the value that were not loaded already

From dcd4e37ccc9f5968b26918e0b44437fb4fdcba37 Mon Sep 17 00:00:00 2001
From: James Mikrut <james@payloadcms.com>
Date: Mon, 5 May 2025 10:23:01 -0400
Subject: [PATCH 06/46] feat: exports additional login helper utils (#12309)

Exports a few utilities that are used internally to the login operation,
but could be helpful for others building plugins.

Specifically:

- `isUserLocked` - a check to ensure that a given user is not locked due
to too many invalid attempts
- `checkLoginPermissions` - checks to see that the user is not locked as
well as that it is properly verified, if applicable
- `jwtSign` - Payload's internal JWT signing approach
- `getFieldsToSign` - reduce down a document's fields for JWT creation
based on collection config settings
- `incrementLoginAttempts` / `resetLoginAttempts` - utilities to handle
both failed and successful login attempts
- `UnverifiedEmail` - an error that could be thrown if attempting to log
in to an account without prior successful email verification
---
 packages/payload/src/auth/isLocked.ts         |  7 ---
 packages/payload/src/auth/isUserLocked.ts     |  6 +++
 packages/payload/src/auth/operations/login.ts | 46 ++++++++++++++-----
 packages/payload/src/index.ts                 | 12 +++--
 4 files changed, 49 insertions(+), 22 deletions(-)
 delete mode 100644 packages/payload/src/auth/isLocked.ts
 create mode 100644 packages/payload/src/auth/isUserLocked.ts

diff --git a/packages/payload/src/auth/isLocked.ts b/packages/payload/src/auth/isLocked.ts
deleted file mode 100644
index 95efbea80f..0000000000
--- a/packages/payload/src/auth/isLocked.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-const isLocked = (date: number): boolean => {
-  if (!date) {
-    return false
-  }
-  return date > Date.now()
-}
-export default isLocked
diff --git a/packages/payload/src/auth/isUserLocked.ts b/packages/payload/src/auth/isUserLocked.ts
new file mode 100644
index 0000000000..a1ea9c2bf7
--- /dev/null
+++ b/packages/payload/src/auth/isUserLocked.ts
@@ -0,0 +1,6 @@
+export const isUserLocked = (date: number): boolean => {
+  if (!date) {
+    return false
+  }
+  return date > Date.now()
+}
diff --git a/packages/payload/src/auth/operations/login.ts b/packages/payload/src/auth/operations/login.ts
index d133ad0e18..5bd02efd2f 100644
--- a/packages/payload/src/auth/operations/login.ts
+++ b/packages/payload/src/auth/operations/login.ts
@@ -3,6 +3,7 @@ import type {
   AuthOperationsFromCollectionSlug,
   Collection,
   DataFromCollectionSlug,
+  SanitizedCollectionConfig,
 } from '../../collections/config/types.js'
 import type { CollectionSlug } from '../../index.js'
 import type { PayloadRequest, Where } from '../../types/index.js'
@@ -21,7 +22,7 @@ import { killTransaction } from '../../utilities/killTransaction.js'
 import sanitizeInternalFields from '../../utilities/sanitizeInternalFields.js'
 import { getFieldsToSign } from '../getFieldsToSign.js'
 import { getLoginOptions } from '../getLoginOptions.js'
-import isLocked from '../isLocked.js'
+import { isUserLocked } from '../isUserLocked.js'
 import { jwtSign } from '../jwt.js'
 import { authenticateLocalStrategy } from '../strategies/local/authenticate.js'
 import { incrementLoginAttempts } from '../strategies/local/incrementLoginAttempts.js'
@@ -42,6 +43,32 @@ export type Arguments<TSlug extends CollectionSlug> = {
   showHiddenFields?: boolean
 }
 
+type CheckLoginPermissionArgs = {
+  collection: SanitizedCollectionConfig
+  loggingInWithUsername?: boolean
+  req: PayloadRequest
+  user: any
+}
+
+export const checkLoginPermission = ({
+  collection,
+  loggingInWithUsername,
+  req,
+  user,
+}: CheckLoginPermissionArgs) => {
+  if (!user) {
+    throw new AuthenticationError(req.t, Boolean(loggingInWithUsername))
+  }
+
+  if (collection.auth.verify && user._verified === false) {
+    throw new UnverifiedEmail({ t: req.t })
+  }
+
+  if (isUserLocked(new Date(user.lockUntil).getTime())) {
+    throw new LockedAuth(req.t)
+  }
+}
+
 export const loginOperation = async <TSlug extends CollectionSlug>(
   incomingArgs: Arguments<TSlug>,
 ): Promise<{ user: DataFromCollectionSlug<TSlug> } & Result> => {
@@ -184,21 +211,16 @@ export const loginOperation = async <TSlug extends CollectionSlug>(
       where: whereConstraint,
     })
 
-    if (!user) {
-      throw new AuthenticationError(req.t, Boolean(canLoginWithUsername && sanitizedUsername))
-    }
-
-    if (args.collection.config.auth.verify && user._verified === false) {
-      throw new UnverifiedEmail({ t: req.t })
-    }
+    checkLoginPermission({
+      collection: collectionConfig,
+      loggingInWithUsername: Boolean(canLoginWithUsername && sanitizedUsername),
+      req,
+      user,
+    })
 
     user.collection = collectionConfig.slug
     user._strategy = 'local-jwt'
 
-    if (isLocked(new Date(user.lockUntil).getTime())) {
-      throw new LockedAuth(req.t)
-    }
-
     const authResult = await authenticateLocalStrategy({ doc: user, password })
 
     user = sanitizeInternalFields(user)
diff --git a/packages/payload/src/index.ts b/packages/payload/src/index.ts
index 2c720cc681..f4d876f806 100644
--- a/packages/payload/src/index.ts
+++ b/packages/payload/src/index.ts
@@ -89,6 +89,10 @@ import { traverseFields } from './utilities/traverseFields.js'
 
 export { default as executeAccess } from './auth/executeAccess.js'
 export { executeAuthStrategies } from './auth/executeAuthStrategies.js'
+export { extractAccessFromPermission } from './auth/extractAccessFromPermission.js'
+export { getAccessResults } from './auth/getAccessResults.js'
+export { getFieldsToSign } from './auth/getFieldsToSign.js'
+export { getLoginOptions } from './auth/getLoginOptions.js'
 
 export interface GeneratedTypes {
   authUntyped: {
@@ -977,13 +981,12 @@ interface RequestContext {
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type
 export interface DatabaseAdapter extends BaseDatabaseAdapter {}
 export type { Payload, RequestContext }
-export { extractAccessFromPermission } from './auth/extractAccessFromPermission.js'
-export { getAccessResults } from './auth/getAccessResults.js'
-export { getFieldsToSign } from './auth/getFieldsToSign.js'
 export * from './auth/index.js'
+export { jwtSign } from './auth/jwt.js'
 export { accessOperation } from './auth/operations/access.js'
 export { forgotPasswordOperation } from './auth/operations/forgotPassword.js'
 export { initOperation } from './auth/operations/init.js'
+export { checkLoginPermission } from './auth/operations/login.js'
 export { loginOperation } from './auth/operations/login.js'
 export { logoutOperation } from './auth/operations/logout.js'
 export type { MeOperationResult } from './auth/operations/me.js'
@@ -994,6 +997,8 @@ export { resetPasswordOperation } from './auth/operations/resetPassword.js'
 export { unlockOperation } from './auth/operations/unlock.js'
 export { verifyEmailOperation } from './auth/operations/verifyEmail.js'
 export { JWTAuthentication } from './auth/strategies/jwt.js'
+export { incrementLoginAttempts } from './auth/strategies/local/incrementLoginAttempts.js'
+export { resetLoginAttempts } from './auth/strategies/local/resetLoginAttempts.js'
 export type {
   AuthStrategyFunction,
   AuthStrategyFunctionArgs,
@@ -1201,6 +1206,7 @@ export {
   MissingFile,
   NotFound,
   QueryError,
+  UnverifiedEmail,
   ValidationError,
   ValidationErrorName,
 } from './errors/index.js'

From 0d10f436cc4a219dc433260e8f8ca1cadfef29e6 Mon Sep 17 00:00:00 2001
From: Florian Beeres <yuuki@protonmail.com>
Date: Mon, 5 May 2025 16:24:08 +0200
Subject: [PATCH 07/46] fix(plugin-cloud-storage): missing 'prefix' in cloud
 storage plugin (#11970)

## Fix
We were able to narrow it down to this call
https://github.com/payloadcms/payload/blob/816fb28f552dfefc11704c7b379ca7fb31abd687/packages/plugin-cloud-storage/src/utilities/getFilePrefix.ts#L26-L41

Adding `draft: true` fixes the issue. It seems that the `prefix` can
only be found in a draft, and without `draft: true` those drafts aren't
searched.

### Issue reproduction

In the community folder, enable versioning for the media collection and
install the `s3storage` plugin (see Git patch). I use `minio` to have a
local S3 compatible backend and then I run the app with:
`AWS_ACCESS_KEY_ID=minioadmin AWS_SECRET_ACCESS_KEY=minioadmin
START_MEMORY_DB=true pnpm dev _community`.

Next, open the media collection and create a new entry. Then open that
entry, remove the file it currently has, and upload a new file. Save as
draft.

Now the media can no longer be accessed and the thumbnails are broken.

If you make an edit but save it by publishing the issue goes away. I
also couldn't reproduce this by adding a text field, changing that, and
saving the document as draft.

```diff
diff --git test/_community/collections/Media/index.ts test/_community/collections/Media/index.ts
index bb5edd0349..689423053c 100644
--- test/_community/collections/Media/index.ts
+++ test/_community/collections/Media/index.ts
@@ -9,6 +9,9 @@ export const MediaCollection: CollectionConfig = {
     read: () => true,
   },
   fields: [],
+  versions: {
+    drafts: true,
+  },
   upload: {
     crop: true,
     focalPoint: true,
diff --git test/_community/config.ts test/_community/config.ts
index ee1aee6e46..c81ec5f933 100644
--- test/_community/config.ts
+++ test/_community/config.ts
@@ -7,6 +7,7 @@ import { devUser } from '../credentials.js'
 import { MediaCollection } from './collections/Media/index.js'
 import { PostsCollection, postsSlug } from './collections/Posts/index.js'
 import { MenuGlobal } from './globals/Menu/index.js'
+import { s3Storage } from '@payloadcms/storage-s3'

 const filename = fileURLToPath(import.meta.url)
 const dirname = path.dirname(filename)
@@ -24,6 +25,21 @@ export default buildConfigWithDefaults({
     // ...add more globals here
     MenuGlobal,
   ],
+  plugins: [
+    s3Storage({
+      enabled: true,
+      bucket: 'amboss',
+      config: {
+        region: 'eu-west-1',
+        endpoint: 'http://localhost:9000',
+      },
+      collections: {
+        media: {
+          prefix: 'media',
+        },
+      },
+    }),
+  ],
   onInit: async (payload) => {
     await payload.create({
       collection: 'users',

```

## Screen recording

https://github.com/user-attachments/assets/b13be4a3-e858-427a-8bfa-6592b87748ee
---
 packages/plugin-cloud-storage/src/utilities/getFilePrefix.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/plugin-cloud-storage/src/utilities/getFilePrefix.ts b/packages/plugin-cloud-storage/src/utilities/getFilePrefix.ts
index 6e2771f51d..e823a6d861 100644
--- a/packages/plugin-cloud-storage/src/utilities/getFilePrefix.ts
+++ b/packages/plugin-cloud-storage/src/utilities/getFilePrefix.ts
@@ -26,6 +26,7 @@ export async function getFilePrefix({
   const files = await req.payload.find({
     collection: collection.slug,
     depth: 0,
+    draft: true,
     limit: 1,
     pagination: false,
     where: {

From a6d76d6058aa6d07429f97eb4c0745d1dbc8406b Mon Sep 17 00:00:00 2001
From: Anyu Jiang <189434904+anyuj@users.noreply.github.com>
Date: Mon, 5 May 2025 10:01:55 -0700
Subject: [PATCH 08/46] fix(plugin-multi-tenant): make tenant selector respect
 order if orderable enabled for tenant collection (#12314)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

### What?
Tenant Selector doesn’t honor the custom order when ‘orderable’ is
enabled for Tenant collection
### Why?
Currently, it uses "useAsTitle" to sort. In some use cases, for example,
when a user manages multiple tenants that have an inherent priority
(such as usage frequency), sorting purely by the useAsTitle isn’t very
practical.
### How?
Get "orderable" config from the tenant collection's config, if it has
"orderable" set as true, it will use _order to sort. If not, it will use
"useAsTitle" to sort as default.

Fixes #12246


![image](https://github.com/user-attachments/assets/b5c4ad5e-3503-4789-91f6-a7aafb326e32)
---
 packages/plugin-multi-tenant/src/queries/findTenantOptions.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/plugin-multi-tenant/src/queries/findTenantOptions.ts b/packages/plugin-multi-tenant/src/queries/findTenantOptions.ts
index 3d41343cc8..ae98cbe6a3 100644
--- a/packages/plugin-multi-tenant/src/queries/findTenantOptions.ts
+++ b/packages/plugin-multi-tenant/src/queries/findTenantOptions.ts
@@ -14,6 +14,7 @@ export const findTenantOptions = async ({
   useAsTitle,
   user,
 }: Args): Promise<PaginatedDocs> => {
+  const isOrderable = payload.collections[tenantsCollectionSlug]?.config?.orderable || false
   return payload.find({
     collection: tenantsCollectionSlug,
     depth: 0,
@@ -21,8 +22,9 @@ export const findTenantOptions = async ({
     overrideAccess: false,
     select: {
       [useAsTitle]: true,
+      ...(isOrderable ? { _order: true } : {}),
     },
-    sort: useAsTitle,
+    sort: isOrderable ? '_order' : useAsTitle,
     user,
   })
 }

From 38186346f7c206e07f4d942ba2b5871ea0916850 Mon Sep 17 00:00:00 2001
From: Ruslan <rri@medicuja.com>
Date: Mon, 5 May 2025 19:09:26 +0200
Subject: [PATCH 09/46] fix(ui): unable to search for nested fields in
 WhereBuilder field selection (#11986)

### What?
Extract text from the React node label in WhereBuilder

### Why?
If you have a nested field in filter options, the label would show
correctly, but the search will not work

### How
By adding an `extractTextFromReactNode` function that gets text out of
React.node label

### Code setup:
```
{
      type: "collapsible",
      label: "Meta",
      fields: [
        {
          name: 'media',
          type: 'relationship',
          relationTo: 'media',
          label: 'Ferrari',
          filterOptions: () => {
            return {
              id: { in: ['67efdbc872ca925bc2868933'] },
            }
          }
        },
        {
          name: 'media2',
          type: 'relationship',
          relationTo: 'media',
          label: 'Williams',
          filterOptions: () => {
            return {
              id: { in: ['67efdbc272ca925bc286891c'] },
            }
          }
        },
      ],
    },

 ```

### Before:

https://github.com/user-attachments/assets/25d4b3a2-6ac0-476b-973e-575238e916c4


 ### After:

https://github.com/user-attachments/assets/92346a6c-b2d1-4e08-b1e4-9ac1484f9ef3

---------

Co-authored-by: Jacob Fletcher <jacobsfletch@gmail.com>
---
 .../elements/WhereBuilder/Condition/index.tsx |  5 +++
 .../elements/WhereBuilder/reduceFields.tsx    | 32 +++++++++++++++++++
 .../ui/src/elements/WhereBuilder/types.ts     |  1 +
 test/admin/e2e/list-view/e2e.spec.ts          | 18 +++++++++++
 tsconfig.base.json                            |  2 +-
 5 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/packages/ui/src/elements/WhereBuilder/Condition/index.tsx b/packages/ui/src/elements/WhereBuilder/Condition/index.tsx
index c57eab59fe..23c849bf21 100644
--- a/packages/ui/src/elements/WhereBuilder/Condition/index.tsx
+++ b/packages/ui/src/elements/WhereBuilder/Condition/index.tsx
@@ -141,6 +141,11 @@ export const Condition: React.FC<Props> = (props) => {
           <div className={`${baseClass}__field`}>
             <ReactSelect
               disabled={disabled}
+              filterOption={(option, inputValue) =>
+                ((option?.data?.plainTextLabel as string) || option.label)
+                  .toLowerCase()
+                  .includes(inputValue.toLowerCase())
+              }
               isClearable={false}
               onChange={handleFieldChange}
               options={reducedFields.filter((field) => !field.field.admin.disableListFilter)}
diff --git a/packages/ui/src/elements/WhereBuilder/reduceFields.tsx b/packages/ui/src/elements/WhereBuilder/reduceFields.tsx
index de2b079569..76728b1c72 100644
--- a/packages/ui/src/elements/WhereBuilder/reduceFields.tsx
+++ b/packages/ui/src/elements/WhereBuilder/reduceFields.tsx
@@ -4,6 +4,7 @@ import type { ClientField } from 'payload'
 
 import { getTranslation } from '@payloadcms/translations'
 import { fieldIsHiddenOrDisabled, fieldIsID, tabHasName } from 'payload/shared'
+import { renderToStaticMarkup } from 'react-dom/server'
 
 import type { ReducedField } from './types.js'
 
@@ -152,10 +153,15 @@ export const reduceFields = ({
           })
         : localizedLabel
 
+      // React elements in filter options are not searchable in React Select
+      // Extract plain text to make them filterable in dropdowns
+      const textFromLabel = extractTextFromReactNode(formattedLabel)
+
       const fieldPath = pathPrefix ? createNestedClientFieldPath(pathPrefix, field) : field.name
 
       const formattedField: ReducedField = {
         label: formattedLabel,
+        plainTextLabel: textFromLabel,
         value: fieldPath,
         ...fieldTypes[field.type],
         field,
@@ -168,3 +174,29 @@ export const reduceFields = ({
     return reduced
   }, [])
 }
+
+/**
+ * Extracts plain text content from a React node by removing HTML tags.
+ * Used to make React elements searchable in filter dropdowns.
+ */
+const extractTextFromReactNode = (reactNode: React.ReactNode): string => {
+  if (!reactNode) {
+    return ''
+  }
+  if (typeof reactNode === 'string') {
+    return reactNode
+  }
+
+  const html = renderToStaticMarkup(reactNode)
+
+  // Handle different environments (server vs browser)
+  if (typeof document !== 'undefined') {
+    // Browser environment - use actual DOM
+    const div = document.createElement('div')
+    div.innerHTML = html
+    return div.textContent || ''
+  } else {
+    // Server environment - use regex to strip HTML tags
+    return html.replace(/<[^>]*>/g, '')
+  }
+}
diff --git a/packages/ui/src/elements/WhereBuilder/types.ts b/packages/ui/src/elements/WhereBuilder/types.ts
index 0914c5acee..1e5eee1847 100644
--- a/packages/ui/src/elements/WhereBuilder/types.ts
+++ b/packages/ui/src/elements/WhereBuilder/types.ts
@@ -23,6 +23,7 @@ export type ReducedField = {
     label: string
     value: Operator
   }[]
+  plainTextLabel?: string
   value: Value
 }
 
diff --git a/test/admin/e2e/list-view/e2e.spec.ts b/test/admin/e2e/list-view/e2e.spec.ts
index d9bf0c149e..881aa670b0 100644
--- a/test/admin/e2e/list-view/e2e.spec.ts
+++ b/test/admin/e2e/list-view/e2e.spec.ts
@@ -393,6 +393,24 @@ describe('List View', () => {
       await expect(page.locator(tableRowLocator)).toHaveCount(2)
     })
 
+    test('should search for nested fields in field dropdown', async () => {
+      await page.goto(postsUrl.list)
+
+      await openListFilters(page, {})
+
+      const whereBuilder = page.locator('.where-builder')
+      await whereBuilder.locator('.where-builder__add-first-filter').click()
+      const conditionField = whereBuilder.locator('.condition__field')
+      await conditionField.click()
+      await conditionField.locator('input.rs__input').fill('Tab 1 > Title')
+
+      await expect(
+        conditionField.locator('.rs__menu-list').locator('div', {
+          hasText: exactText('Tab 1 > Title'),
+        }),
+      ).toBeVisible()
+    })
+
     test('should allow to filter in array field', async () => {
       await createArray()
 
diff --git a/tsconfig.base.json b/tsconfig.base.json
index c9793d25c6..02de03b79e 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -31,7 +31,7 @@
       }
     ],
     "paths": {
-      "@payload-config": ["./test/_community/config.ts"],
+      "@payload-config": ["./test/admin/config.ts"],
       "@payloadcms/admin-bar": ["./packages/admin-bar/src"],
       "@payloadcms/live-preview": ["./packages/live-preview/src"],
       "@payloadcms/live-preview-react": ["./packages/live-preview-react/src/index.ts"],

From 9a6bb44e50a5f3914a799b8a95c2f66ffb6e4df0 Mon Sep 17 00:00:00 2001
From: Elliot DeNolf <denolfe@gmail.com>
Date: Mon, 5 May 2025 15:12:34 -0400
Subject: [PATCH 10/46] chore(release): v3.37.0 [skip ci]

---
 package.json                               | 2 +-
 packages/admin-bar/package.json            | 2 +-
 packages/create-payload-app/package.json   | 2 +-
 packages/db-mongodb/package.json           | 2 +-
 packages/db-postgres/package.json          | 2 +-
 packages/db-sqlite/package.json            | 2 +-
 packages/db-vercel-postgres/package.json   | 2 +-
 packages/drizzle/package.json              | 2 +-
 packages/email-nodemailer/package.json     | 2 +-
 packages/email-resend/package.json         | 2 +-
 packages/graphql/package.json              | 2 +-
 packages/live-preview-react/package.json   | 2 +-
 packages/live-preview-vue/package.json     | 2 +-
 packages/live-preview/package.json         | 2 +-
 packages/next/package.json                 | 2 +-
 packages/payload-cloud/package.json        | 2 +-
 packages/payload/package.json              | 2 +-
 packages/plugin-cloud-storage/package.json | 2 +-
 packages/plugin-form-builder/package.json  | 2 +-
 packages/plugin-import-export/package.json | 2 +-
 packages/plugin-multi-tenant/package.json  | 2 +-
 packages/plugin-nested-docs/package.json   | 2 +-
 packages/plugin-redirects/package.json     | 2 +-
 packages/plugin-search/package.json        | 2 +-
 packages/plugin-sentry/package.json        | 2 +-
 packages/plugin-seo/package.json           | 2 +-
 packages/plugin-stripe/package.json        | 2 +-
 packages/richtext-lexical/package.json     | 2 +-
 packages/richtext-slate/package.json       | 2 +-
 packages/storage-azure/package.json        | 2 +-
 packages/storage-gcs/package.json          | 2 +-
 packages/storage-s3/package.json           | 2 +-
 packages/storage-uploadthing/package.json  | 2 +-
 packages/storage-vercel-blob/package.json  | 2 +-
 packages/translations/package.json         | 2 +-
 packages/ui/package.json                   | 2 +-
 36 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/package.json b/package.json
index a25e17adc3..79930f4428 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "payload-monorepo",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/packages/admin-bar/package.json b/packages/admin-bar/package.json
index c4a3947edf..e763beb870 100644
--- a/packages/admin-bar/package.json
+++ b/packages/admin-bar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/admin-bar",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "description": "An admin bar for React apps using Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/create-payload-app/package.json b/packages/create-payload-app/package.json
index cec49d40be..10daccb29c 100644
--- a/packages/create-payload-app/package.json
+++ b/packages/create-payload-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-payload-app",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",
diff --git a/packages/db-mongodb/package.json b/packages/db-mongodb/package.json
index bba9c0dd54..0fb0510d8b 100644
--- a/packages/db-mongodb/package.json
+++ b/packages/db-mongodb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-mongodb",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "description": "The officially supported MongoDB database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/db-postgres/package.json b/packages/db-postgres/package.json
index 51a933ad4c..3784dabc2a 100644
--- a/packages/db-postgres/package.json
+++ b/packages/db-postgres/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-postgres",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "description": "The officially supported Postgres database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/db-sqlite/package.json b/packages/db-sqlite/package.json
index 87db6a8f0e..d10d787b88 100644
--- a/packages/db-sqlite/package.json
+++ b/packages/db-sqlite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-sqlite",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "description": "The officially supported SQLite database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/db-vercel-postgres/package.json b/packages/db-vercel-postgres/package.json
index 1268e2c95c..3bd14d72f3 100644
--- 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.36.1",
+  "version": "3.37.0",
   "description": "Vercel Postgres adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/drizzle/package.json b/packages/drizzle/package.json
index 254394b989..11fb484bbf 100644
--- a/packages/drizzle/package.json
+++ b/packages/drizzle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/drizzle",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "description": "A library of shared functions used by different payload database adapters",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/email-nodemailer/package.json b/packages/email-nodemailer/package.json
index 0d36ea0b00..f3641b8c2a 100644
--- a/packages/email-nodemailer/package.json
+++ b/packages/email-nodemailer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/email-nodemailer",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "description": "Payload Nodemailer Email Adapter",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/email-resend/package.json b/packages/email-resend/package.json
index c986fa70d4..bef586ee5b 100644
--- a/packages/email-resend/package.json
+++ b/packages/email-resend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/email-resend",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "description": "Payload Resend Email Adapter",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/graphql/package.json b/packages/graphql/package.json
index 10f27f1383..add54873c0 100644
--- a/packages/graphql/package.json
+++ b/packages/graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/graphql",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",
diff --git a/packages/live-preview-react/package.json b/packages/live-preview-react/package.json
index 70fb80fcb7..617df63dce 100644
--- 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.36.1",
+  "version": "3.37.0",
   "description": "The official React SDK for Payload Live Preview",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/live-preview-vue/package.json b/packages/live-preview-vue/package.json
index 219c04d332..0e801fc27d 100644
--- 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.36.1",
+  "version": "3.37.0",
   "description": "The official Vue SDK for Payload Live Preview",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/live-preview/package.json b/packages/live-preview/package.json
index 8caac4e6aa..eb7b207519 100644
--- a/packages/live-preview/package.json
+++ b/packages/live-preview/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/live-preview",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "description": "The official live preview JavaScript SDK for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/next/package.json b/packages/next/package.json
index 9102fc40ca..8358c0b498 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/next",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",
diff --git a/packages/payload-cloud/package.json b/packages/payload-cloud/package.json
index 9e7ce8217e..6b3da32074 100644
--- a/packages/payload-cloud/package.json
+++ b/packages/payload-cloud/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/payload-cloud",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "description": "The official Payload Cloud plugin",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/payload/package.json b/packages/payload/package.json
index 0b62938b55..5e4eef830c 100644
--- a/packages/payload/package.json
+++ b/packages/payload/package.json
@@ -1,6 +1,6 @@
 {
   "name": "payload",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "description": "Node, React, Headless CMS and Application Framework built on Next.js",
   "keywords": [
     "admin panel",
diff --git a/packages/plugin-cloud-storage/package.json b/packages/plugin-cloud-storage/package.json
index 8b5d9020f9..58347227bc 100644
--- 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.36.1",
+  "version": "3.37.0",
   "description": "The official cloud storage plugin for Payload CMS",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/plugin-form-builder/package.json b/packages/plugin-form-builder/package.json
index bf5de206ac..be94aebd41 100644
--- 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.36.1",
+  "version": "3.37.0",
   "description": "Form builder plugin for Payload CMS",
   "keywords": [
     "payload",
diff --git a/packages/plugin-import-export/package.json b/packages/plugin-import-export/package.json
index 0317874ffc..6720f615ad 100644
--- a/packages/plugin-import-export/package.json
+++ b/packages/plugin-import-export/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-import-export",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "description": "Import-Export plugin for Payload",
   "keywords": [
     "payload",
diff --git a/packages/plugin-multi-tenant/package.json b/packages/plugin-multi-tenant/package.json
index 077b46d5b1..573c98b489 100644
--- a/packages/plugin-multi-tenant/package.json
+++ b/packages/plugin-multi-tenant/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-multi-tenant",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "description": "Multi Tenant plugin for Payload",
   "keywords": [
     "payload",
diff --git a/packages/plugin-nested-docs/package.json b/packages/plugin-nested-docs/package.json
index daf8954e84..87bfc03e28 100644
--- 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.36.1",
+  "version": "3.37.0",
   "description": "The official Nested Docs plugin for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/plugin-redirects/package.json b/packages/plugin-redirects/package.json
index 2aa329ad26..c348c222d6 100644
--- a/packages/plugin-redirects/package.json
+++ b/packages/plugin-redirects/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-redirects",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "description": "Redirects plugin for Payload",
   "keywords": [
     "payload",
diff --git a/packages/plugin-search/package.json b/packages/plugin-search/package.json
index 430bef0eb2..869c7915bb 100644
--- a/packages/plugin-search/package.json
+++ b/packages/plugin-search/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-search",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "description": "Search plugin for Payload",
   "keywords": [
     "payload",
diff --git a/packages/plugin-sentry/package.json b/packages/plugin-sentry/package.json
index 02bc00753d..4a4f637972 100644
--- a/packages/plugin-sentry/package.json
+++ b/packages/plugin-sentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-sentry",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "description": "Sentry plugin for Payload",
   "keywords": [
     "payload",
diff --git a/packages/plugin-seo/package.json b/packages/plugin-seo/package.json
index 769554c198..113ae4add7 100644
--- a/packages/plugin-seo/package.json
+++ b/packages/plugin-seo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-seo",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "description": "SEO plugin for Payload",
   "keywords": [
     "payload",
diff --git a/packages/plugin-stripe/package.json b/packages/plugin-stripe/package.json
index c75b99fd7f..f808e3d67a 100644
--- a/packages/plugin-stripe/package.json
+++ b/packages/plugin-stripe/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-stripe",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "description": "Stripe plugin for Payload",
   "keywords": [
     "payload",
diff --git a/packages/richtext-lexical/package.json b/packages/richtext-lexical/package.json
index 466ec7f03e..1766ada144 100644
--- a/packages/richtext-lexical/package.json
+++ b/packages/richtext-lexical/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/richtext-lexical",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "description": "The officially supported Lexical richtext adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/richtext-slate/package.json b/packages/richtext-slate/package.json
index fd720101e9..ae8481e76f 100644
--- a/packages/richtext-slate/package.json
+++ b/packages/richtext-slate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/richtext-slate",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "description": "The officially supported Slate richtext adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/storage-azure/package.json b/packages/storage-azure/package.json
index 52ca8d300d..5200a09b91 100644
--- a/packages/storage-azure/package.json
+++ b/packages/storage-azure/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/storage-azure",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "description": "Payload storage adapter for Azure Blob Storage",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/storage-gcs/package.json b/packages/storage-gcs/package.json
index 22f2efbcc4..6fe94f1293 100644
--- a/packages/storage-gcs/package.json
+++ b/packages/storage-gcs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/storage-gcs",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "description": "Payload storage adapter for Google Cloud Storage",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/storage-s3/package.json b/packages/storage-s3/package.json
index 3c274d09cf..bacb9301e6 100644
--- a/packages/storage-s3/package.json
+++ b/packages/storage-s3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/storage-s3",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "description": "Payload storage adapter for Amazon S3",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/storage-uploadthing/package.json b/packages/storage-uploadthing/package.json
index 828a00d6ed..675b8c9d13 100644
--- a/packages/storage-uploadthing/package.json
+++ b/packages/storage-uploadthing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/storage-uploadthing",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "description": "Payload storage adapter for uploadthing",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/storage-vercel-blob/package.json b/packages/storage-vercel-blob/package.json
index 3d7ae0b645..60ab37e7f1 100644
--- a/packages/storage-vercel-blob/package.json
+++ b/packages/storage-vercel-blob/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/storage-vercel-blob",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "description": "Payload storage adapter for Vercel Blob Storage",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/translations/package.json b/packages/translations/package.json
index 7c4c9d9747..ae1b93bcad 100644
--- a/packages/translations/package.json
+++ b/packages/translations/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/translations",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 1e41fd10f9..e0c0f4c340 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/ui",
-  "version": "3.36.1",
+  "version": "3.37.0",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",

From 800c424777e5281b9a2ddc6e2701cc445b1d6300 Mon Sep 17 00:00:00 2001
From: Sasha <64744993+r1tsuu@users.noreply.github.com>
Date: Mon, 5 May 2025 23:16:14 +0300
Subject: [PATCH 11/46] feat(storage-s3): presigned URLs for file downloads
 (#12307)

Adds pre-signed URLs support file downloads with the S3 adapter. Can be
enabled per-collection:
```ts
s3Storage({
  collections: {
    media: { signedDownloads: true }, // or { signedDownloads: { expiresIn: 3600 }} for custom expiresIn (default 7200)
  },
  bucket: process.env.S3_BUCKET,
  config: {
    credentials: {
      accessKeyId: process.env.S3_ACCESS_KEY_ID,
      secretAccessKey: process.env.S3_SECRET_ACCESS_KEY,
    },
    endpoint: process.env.S3_ENDPOINT,
    forcePathStyle: process.env.S3_FORCE_PATH_STYLE === 'true',
    region: process.env.S3_REGION,
  },
}),
```

The main use case is when you care about the Payload access control (so
you don't want to use `disablePayloadAccessControl: true` but you don't
want your files to be served through Payload (which can affect
performance with large videos for example).
This feature instead generates a signed URL (after verifying the access
control) and redirects you directly to the S3 provider.

This is an addition to https://github.com/payloadcms/payload/pull/11382
which added pre-signed URLs for file uploads.
---
 docs/upload/storage-adapters.mdx              |  1 +
 packages/storage-s3/src/index.ts              | 45 +++++++++++++++++--
 packages/storage-s3/src/staticHandler.ts      | 28 +++++++++++-
 .../collections/MediaWithSignedDownloads.ts   |  9 ++++
 test/storage-s3/config.ts                     |  8 +++-
 test/storage-s3/int.spec.ts                   | 41 ++++++++++++++---
 test/storage-s3/payload-types.ts              | 41 +++++++++++++++++
 test/storage-s3/shared.ts                     |  2 +
 8 files changed, 162 insertions(+), 13 deletions(-)
 create mode 100644 test/storage-s3/collections/MediaWithSignedDownloads.ts

diff --git a/docs/upload/storage-adapters.mdx b/docs/upload/storage-adapters.mdx
index 35c29d9d64..3d4f3639a2 100644
--- a/docs/upload/storage-adapters.mdx
+++ b/docs/upload/storage-adapters.mdx
@@ -84,6 +84,7 @@ pnpm add @payloadcms/storage-s3
 - The `config` object can be any [`S3ClientConfig`](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/client/s3) object (from [`@aws-sdk/client-s3`](https://github.com/aws/aws-sdk-js-v3)). _This is highly dependent on your AWS setup_. Check the AWS documentation for more information.
 - When enabled, this package will automatically set `disableLocalStorage` to `true` for each collection.
 - When deploying to Vercel, server uploads are limited with 4.5MB. Set `clientUploads` to `true` to do uploads directly on the client. You must allow CORS PUT method for the bucket to your website.
+- Configure `signedDownloads` (either globally of per-collection in `collections`) to use [presigned URLs](https://docs.aws.amazon.com/AmazonS3/latest/userguide/using-presigned-url.html) for files downloading. This can improve performance for large files (like videos) while still respecting your access control.
 
 ```ts
 import { s3Storage } from '@payloadcms/storage-s3'
diff --git a/packages/storage-s3/src/index.ts b/packages/storage-s3/src/index.ts
index b45b881f49..b9a0b850a6 100644
--- a/packages/storage-s3/src/index.ts
+++ b/packages/storage-s3/src/index.ts
@@ -12,6 +12,8 @@ import * as AWS from '@aws-sdk/client-s3'
 import { cloudStoragePlugin } from '@payloadcms/plugin-cloud-storage'
 import { initClientUploads } from '@payloadcms/plugin-cloud-storage/utilities'
 
+import type { SignedDownloadsConfig } from './staticHandler.js'
+
 import { getGenerateSignedURLHandler } from './generateSignedURL.js'
 import { getGenerateURL } from './generateURL.js'
 import { getHandleDelete } from './handleDelete.js'
@@ -24,6 +26,7 @@ export type S3StorageOptions = {
    */
 
   acl?: 'private' | 'public-read'
+
   /**
    * Bucket name to upload files to.
    *
@@ -39,8 +42,15 @@ export type S3StorageOptions = {
   /**
    * Collection options to apply the S3 adapter to.
    */
-  collections: Partial<Record<UploadCollectionSlug, Omit<CollectionOptions, 'adapter'> | true>>
-
+  collections: Partial<
+    Record<
+      UploadCollectionSlug,
+      | ({
+          signedDownloads?: SignedDownloadsConfig
+        } & Omit<CollectionOptions, 'adapter'>)
+      | true
+    >
+  >
   /**
    * AWS S3 client configuration. Highly dependent on your AWS setup.
    *
@@ -61,6 +71,10 @@ export type S3StorageOptions = {
    * Default: true
    */
   enabled?: boolean
+  /**
+   * Use pre-signed URLs for files downloading. Can be overriden per-collection.
+   */
+  signedDownloads?: SignedDownloadsConfig
 }
 
 type S3StoragePlugin = (storageS3Args: S3StorageOptions) => Plugin
@@ -158,9 +172,27 @@ export const s3Storage: S3StoragePlugin =
 
 function s3StorageInternal(
   getStorageClient: () => AWS.S3,
-  { acl, bucket, clientUploads, config = {} }: S3StorageOptions,
+  {
+    acl,
+    bucket,
+    clientUploads,
+    collections,
+    config = {},
+    signedDownloads: topLevelSignedDownloads,
+  }: S3StorageOptions,
 ): Adapter {
   return ({ collection, prefix }): GeneratedAdapter => {
+    const collectionStorageConfig = collections[collection.slug]
+
+    let signedDownloads: null | SignedDownloadsConfig =
+      typeof collectionStorageConfig === 'object'
+        ? (collectionStorageConfig.signedDownloads ?? false)
+        : null
+
+    if (signedDownloads === null) {
+      signedDownloads = topLevelSignedDownloads ?? null
+    }
+
     return {
       name: 's3',
       clientUploads,
@@ -173,7 +205,12 @@ function s3StorageInternal(
         getStorageClient,
         prefix,
       }),
-      staticHandler: getHandler({ bucket, collection, getStorageClient }),
+      staticHandler: getHandler({
+        bucket,
+        collection,
+        getStorageClient,
+        signedDownloads: signedDownloads ?? false,
+      }),
     }
   }
 }
diff --git a/packages/storage-s3/src/staticHandler.ts b/packages/storage-s3/src/staticHandler.ts
index 0c01319c14..7f328c1072 100644
--- a/packages/storage-s3/src/staticHandler.ts
+++ b/packages/storage-s3/src/staticHandler.ts
@@ -3,13 +3,23 @@ import type { StaticHandler } from '@payloadcms/plugin-cloud-storage/types'
 import type { CollectionConfig } from 'payload'
 import type { Readable } from 'stream'
 
+import { GetObjectCommand } from '@aws-sdk/client-s3'
+import { getSignedUrl } from '@aws-sdk/s3-request-presigner'
 import { getFilePrefix } from '@payloadcms/plugin-cloud-storage/utilities'
 import path from 'path'
 
+export type SignedDownloadsConfig =
+  | {
+      /** @default 7200 */
+      expiresIn?: number
+    }
+  | boolean
+
 interface Args {
   bucket: string
   collection: CollectionConfig
   getStorageClient: () => AWS.S3
+  signedDownloads?: SignedDownloadsConfig
 }
 
 // Type guard for NodeJS.Readable streams
@@ -40,7 +50,12 @@ const streamToBuffer = async (readableStream: any) => {
   return Buffer.concat(chunks)
 }
 
-export const getHandler = ({ bucket, collection, getStorageClient }: Args): StaticHandler => {
+export const getHandler = ({
+  bucket,
+  collection,
+  getStorageClient,
+  signedDownloads,
+}: Args): StaticHandler => {
   return async (req, { params: { clientUploadContext, filename } }) => {
     let object: AWS.GetObjectOutput | undefined = undefined
     try {
@@ -48,6 +63,17 @@ export const getHandler = ({ bucket, collection, getStorageClient }: Args): Stat
 
       const key = path.posix.join(prefix, filename)
 
+      if (signedDownloads && !clientUploadContext) {
+        const command = new GetObjectCommand({ Bucket: bucket, Key: key })
+        const signedUrl = await getSignedUrl(
+          // @ts-expect-error mismatch versions
+          getStorageClient(),
+          command,
+          typeof signedDownloads === 'object' ? signedDownloads : { expiresIn: 7200 },
+        )
+        return Response.redirect(signedUrl)
+      }
+
       object = await getStorageClient().getObject({
         Bucket: bucket,
         Key: key,
diff --git a/test/storage-s3/collections/MediaWithSignedDownloads.ts b/test/storage-s3/collections/MediaWithSignedDownloads.ts
new file mode 100644
index 0000000000..d4318caea1
--- /dev/null
+++ b/test/storage-s3/collections/MediaWithSignedDownloads.ts
@@ -0,0 +1,9 @@
+import type { CollectionConfig } from 'payload'
+
+import { mediaWithSignedDownloadsSlug } from '../shared.js'
+
+export const MediaWithSignedDownloads: CollectionConfig = {
+  slug: mediaWithSignedDownloadsSlug,
+  upload: true,
+  fields: [],
+}
diff --git a/test/storage-s3/config.ts b/test/storage-s3/config.ts
index 8bef0ea42b..59327fda9f 100644
--- a/test/storage-s3/config.ts
+++ b/test/storage-s3/config.ts
@@ -7,8 +7,9 @@ import { buildConfigWithDefaults } from '../buildConfigWithDefaults.js'
 import { devUser } from '../credentials.js'
 import { Media } from './collections/Media.js'
 import { MediaWithPrefix } from './collections/MediaWithPrefix.js'
+import { MediaWithSignedDownloads } from './collections/MediaWithSignedDownloads.js'
 import { Users } from './collections/Users.js'
-import { mediaSlug, mediaWithPrefixSlug, prefix } from './shared.js'
+import { mediaSlug, mediaWithPrefixSlug, mediaWithSignedDownloadsSlug, prefix } from './shared.js'
 const filename = fileURLToPath(import.meta.url)
 const dirname = path.dirname(filename)
 
@@ -25,7 +26,7 @@ export default buildConfigWithDefaults({
       baseDir: path.resolve(dirname),
     },
   },
-  collections: [Media, MediaWithPrefix, Users],
+  collections: [Media, MediaWithPrefix, MediaWithSignedDownloads, Users],
   onInit: async (payload) => {
     await payload.create({
       collection: 'users',
@@ -42,6 +43,9 @@ export default buildConfigWithDefaults({
         [mediaWithPrefixSlug]: {
           prefix,
         },
+        [mediaWithSignedDownloadsSlug]: {
+          signedDownloads: true,
+        },
       },
       bucket: process.env.S3_BUCKET,
       config: {
diff --git a/test/storage-s3/int.spec.ts b/test/storage-s3/int.spec.ts
index ed898fac60..91b533ef97 100644
--- a/test/storage-s3/int.spec.ts
+++ b/test/storage-s3/int.spec.ts
@@ -4,12 +4,16 @@ import * as AWS from '@aws-sdk/client-s3'
 import path from 'path'
 import { fileURLToPath } from 'url'
 
+import type { NextRESTClient } from '../helpers/NextRESTClient.js'
+
 import { initPayloadInt } from '../helpers/initPayloadInt.js'
-import { mediaSlug, mediaWithPrefixSlug, prefix } from './shared.js'
+import { mediaSlug, mediaWithPrefixSlug, mediaWithSignedDownloadsSlug, prefix } from './shared.js'
 
 const filename = fileURLToPath(import.meta.url)
 const dirname = path.dirname(filename)
 
+let restClient: NextRESTClient
+
 let payload: Payload
 
 describe('@payloadcms/storage-s3', () => {
@@ -17,7 +21,7 @@ describe('@payloadcms/storage-s3', () => {
   let client: AWS.S3Client
 
   beforeAll(async () => {
-    ;({ payload } = await initPayloadInt(dirname))
+    ;({ payload, restClient } = await initPayloadInt(dirname))
     TEST_BUCKET = process.env.S3_BUCKET
 
     client = new AWS.S3({
@@ -77,15 +81,38 @@ describe('@payloadcms/storage-s3', () => {
     expect(upload.url).toEqual(`/api/${mediaWithPrefixSlug}/file/${String(upload.filename)}`)
   })
 
+  it('can download with signed downloads', async () => {
+    await payload.create({
+      collection: mediaWithSignedDownloadsSlug,
+      data: {},
+      filePath: path.resolve(dirname, '../uploads/image.png'),
+    })
+
+    const response = await restClient.GET(`/${mediaWithSignedDownloadsSlug}/file/image.png`)
+    expect(response.status).toBe(302)
+    const url = response.headers.get('Location')
+    expect(url).toBeDefined()
+    expect(url!).toContain(`/${TEST_BUCKET}/image.png`)
+    expect(new URLSearchParams(url!).get('x-id')).toBe('GetObject')
+    const file = await fetch(url!)
+    expect(file.headers.get('Content-Type')).toBe('image/png')
+  })
+
   describe('R2', () => {
     it.todo('can upload')
   })
 
   async function createTestBucket() {
-    const makeBucketRes = await client.send(new AWS.CreateBucketCommand({ Bucket: TEST_BUCKET }))
+    try {
+      const makeBucketRes = await client.send(new AWS.CreateBucketCommand({ Bucket: TEST_BUCKET }))
 
-    if (makeBucketRes.$metadata.httpStatusCode !== 200) {
-      throw new Error(`Failed to create bucket. ${makeBucketRes.$metadata.httpStatusCode}`)
+      if (makeBucketRes.$metadata.httpStatusCode !== 200) {
+        throw new Error(`Failed to create bucket. ${makeBucketRes.$metadata.httpStatusCode}`)
+      }
+    } catch (e) {
+      if (e instanceof AWS.BucketAlreadyOwnedByYou) {
+        console.log('Bucket already exists')
+      }
     }
   }
 
@@ -96,7 +123,9 @@ describe('@payloadcms/storage-s3', () => {
       }),
     )
 
-    if (!listedObjects?.Contents?.length) return
+    if (!listedObjects?.Contents?.length) {
+      return
+    }
 
     const deleteParams = {
       Bucket: TEST_BUCKET,
diff --git a/test/storage-s3/payload-types.ts b/test/storage-s3/payload-types.ts
index 7311e4ebb9..0f7d9fb900 100644
--- a/test/storage-s3/payload-types.ts
+++ b/test/storage-s3/payload-types.ts
@@ -69,6 +69,7 @@ export interface Config {
   collections: {
     media: Media;
     'media-with-prefix': MediaWithPrefix;
+    'media-with-signed-downloads': MediaWithSignedDownload;
     users: User;
     'payload-locked-documents': PayloadLockedDocument;
     'payload-preferences': PayloadPreference;
@@ -78,6 +79,7 @@ export interface Config {
   collectionsSelect: {
     media: MediaSelect<false> | MediaSelect<true>;
     'media-with-prefix': MediaWithPrefixSelect<false> | MediaWithPrefixSelect<true>;
+    'media-with-signed-downloads': MediaWithSignedDownloadsSelect<false> | MediaWithSignedDownloadsSelect<true>;
     users: UsersSelect<false> | UsersSelect<true>;
     'payload-locked-documents': PayloadLockedDocumentsSelect<false> | PayloadLockedDocumentsSelect<true>;
     'payload-preferences': PayloadPreferencesSelect<false> | PayloadPreferencesSelect<true>;
@@ -171,6 +173,24 @@ export interface MediaWithPrefix {
   focalX?: number | null;
   focalY?: number | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "media-with-signed-downloads".
+ */
+export interface MediaWithSignedDownload {
+  id: string;
+  updatedAt: string;
+  createdAt: string;
+  url?: string | null;
+  thumbnailURL?: string | null;
+  filename?: string | null;
+  mimeType?: string | null;
+  filesize?: number | null;
+  width?: number | null;
+  height?: number | null;
+  focalX?: number | null;
+  focalY?: number | null;
+}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "users".
@@ -203,6 +223,10 @@ export interface PayloadLockedDocument {
         relationTo: 'media-with-prefix';
         value: string | MediaWithPrefix;
       } | null)
+    | ({
+        relationTo: 'media-with-signed-downloads';
+        value: string | MediaWithSignedDownload;
+      } | null)
     | ({
         relationTo: 'users';
         value: string | User;
@@ -309,6 +333,23 @@ export interface MediaWithPrefixSelect<T extends boolean = true> {
   focalX?: T;
   focalY?: T;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "media-with-signed-downloads_select".
+ */
+export interface MediaWithSignedDownloadsSelect<T extends boolean = true> {
+  updatedAt?: T;
+  createdAt?: T;
+  url?: T;
+  thumbnailURL?: T;
+  filename?: T;
+  mimeType?: T;
+  filesize?: T;
+  width?: T;
+  height?: T;
+  focalX?: T;
+  focalY?: T;
+}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "users_select".
diff --git a/test/storage-s3/shared.ts b/test/storage-s3/shared.ts
index 7d74b323ae..27653dab7d 100644
--- a/test/storage-s3/shared.ts
+++ b/test/storage-s3/shared.ts
@@ -1,3 +1,5 @@
 export const mediaSlug = 'media'
 export const mediaWithPrefixSlug = 'media-with-prefix'
 export const prefix = 'test-prefix'
+
+export const mediaWithSignedDownloadsSlug = 'media-with-signed-downloads'

From 05ae957cd5d5a3cd2dba709d3e437d9e47c39ff9 Mon Sep 17 00:00:00 2001
From: Paul <paul@payloadcms.com>
Date: Mon, 5 May 2025 13:17:04 -0700
Subject: [PATCH 12/46] docs:  add pagination and limit: 0 information in
 pagination for API docs (#12243)

Fixes https://github.com/payloadcms/payload/issues/12140
---
 docs/queries/pagination.mdx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/queries/pagination.mdx b/docs/queries/pagination.mdx
index e3549d5f3a..a9f39137db 100644
--- a/docs/queries/pagination.mdx
+++ b/docs/queries/pagination.mdx
@@ -55,10 +55,11 @@ All collection `find` queries are paginated automatically. Responses are returne
 
 All Payload APIs support the pagination controls below. With them, you can create paginated lists of documents within your application:
 
-| Control | Description                             |
-| ------- | --------------------------------------- |
-| `limit` | Limits the number of documents returned |
-| `page`  | Get a specific page number              |
+| Control      | Default | Description                                                                                                                                                            |
+| ------------ | ------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `limit`      | `10`    | Limits the number of documents returned per page - set to `0` to show all documents, we automatically disabled pagination for you when `limit` is `0` for optimisation |
+| `pagination` | `true`  | Set to `false` to disable pagination and return all documents                                                                                                          |
+| `page`       | `1`     | Get a specific page number                                                                                                                                             |
 
 ### Disabling pagination within Local API
 

From b3cac753d67993d3657eaa5c38583e48ea01b761 Mon Sep 17 00:00:00 2001
From: Tobias Odendahl <tak@medicuja.com>
Date: Wed, 7 May 2025 02:27:05 +0200
Subject: [PATCH 13/46] feat(ui): display the actual error message on unpublish
 if available (#11898)

### What?
If an error occurs while unpublishing a document in the edit view UI,
the toast which shows the error message now displays the actual message
which is sent from the server, if available.

### Why?
Only a generic error message was shown if an unpublish operation failed.
Some errors might be solvable by the user, so that there is value in
showing the actual, actionable error message instead of a generic one.

### How?
The server response is parsed for error message if an unpublish
operation fails and displayed in the toast, instead of the generic error
message.


![image](https://github.com/user-attachments/assets/774d68c6-b36b-4447-93a0-b437845694a9)
---
 packages/ui/src/elements/Status/index.tsx     | 15 ++++++++-
 test/versions/collections/ErrorOnUnpublish.ts | 33 +++++++++++++++++++
 test/versions/config.ts                       |  2 ++
 test/versions/e2e.spec.ts                     | 19 +++++++++++
 test/versions/payload-types.ts                | 27 +++++++++++++++
 test/versions/slugs.ts                        |  1 +
 6 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 test/versions/collections/ErrorOnUnpublish.ts

diff --git a/packages/ui/src/elements/Status/index.tsx b/packages/ui/src/elements/Status/index.tsx
index 0ae4211962..6e473e8fc5 100644
--- a/packages/ui/src/elements/Status/index.tsx
+++ b/packages/ui/src/elements/Status/index.tsx
@@ -117,7 +117,19 @@ export const Status: React.FC = () => {
           setUnpublishedVersionCount(0)
         }
       } else {
-        toast.error(t('error:unPublishingDocument'))
+        try {
+          const json = await res.json()
+          if (json.errors?.[0]?.message) {
+            toast.error(json.errors[0].message)
+          } else if (json.error) {
+            toast.error(json.error)
+          } else {
+            toast.error(t('error:unPublishingDocument'))
+          }
+          // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        } catch (err) {
+          toast.error(t('error:unPublishingDocument'))
+        }
       }
     },
     [
@@ -154,6 +166,7 @@ export const Status: React.FC = () => {
               <Button
                 buttonStyle="none"
                 className={`${baseClass}__action`}
+                id={`action-unpublish`}
                 onClick={() => toggleModal(unPublishModalSlug)}
               >
                 {t('version:unpublish')}
diff --git a/test/versions/collections/ErrorOnUnpublish.ts b/test/versions/collections/ErrorOnUnpublish.ts
new file mode 100644
index 0000000000..c357f7d0d1
--- /dev/null
+++ b/test/versions/collections/ErrorOnUnpublish.ts
@@ -0,0 +1,33 @@
+import type { CollectionConfig } from 'payload'
+
+import { APIError } from 'payload'
+
+import { errorOnUnpublishSlug } from '../slugs.js'
+
+const ErrorOnUnpublish: CollectionConfig = {
+  slug: errorOnUnpublishSlug,
+  admin: {
+    useAsTitle: 'title',
+  },
+  fields: [
+    {
+      name: 'title',
+      type: 'text',
+      required: true,
+    },
+  ],
+  versions: {
+    drafts: true,
+  },
+  hooks: {
+    beforeValidate: [
+      ({ data, originalDoc }) => {
+        if (data?._status === 'draft' && originalDoc?._status === 'published') {
+          throw new APIError('Custom error on unpublish', 400, {}, true)
+        }
+      },
+    ],
+  },
+}
+
+export default ErrorOnUnpublish
diff --git a/test/versions/config.ts b/test/versions/config.ts
index 36fdb76728..64a227f2bb 100644
--- a/test/versions/config.ts
+++ b/test/versions/config.ts
@@ -12,6 +12,7 @@ import DisablePublish from './collections/DisablePublish.js'
 import DraftPosts from './collections/Drafts.js'
 import DraftWithMax from './collections/DraftsWithMax.js'
 import DraftsWithValidate from './collections/DraftsWithValidate.js'
+import ErrorOnUnpublish from './collections/ErrorOnUnpublish.js'
 import LocalizedPosts from './collections/Localized.js'
 import { Media } from './collections/Media.js'
 import Posts from './collections/Posts.js'
@@ -42,6 +43,7 @@ export default buildConfigWithDefaults({
     DraftPosts,
     DraftWithMax,
     DraftsWithValidate,
+    ErrorOnUnpublish,
     LocalizedPosts,
     VersionPosts,
     CustomIDs,
diff --git a/test/versions/e2e.spec.ts b/test/versions/e2e.spec.ts
index f22e7fd5e1..26c0cbc4c9 100644
--- a/test/versions/e2e.spec.ts
+++ b/test/versions/e2e.spec.ts
@@ -60,6 +60,7 @@ import {
   draftWithMaxCollectionSlug,
   draftWithMaxGlobalSlug,
   draftWithValidateCollectionSlug,
+  errorOnUnpublishSlug,
   localizedCollectionSlug,
   localizedGlobalSlug,
   postCollectionSlug,
@@ -86,6 +87,7 @@ describe('Versions', () => {
   let disablePublishURL: AdminUrlUtil
   let customIDURL: AdminUrlUtil
   let postURL: AdminUrlUtil
+  let errorOnUnpublishURL: AdminUrlUtil
   let id: string
 
   beforeAll(async ({ browser }, testInfo) => {
@@ -124,6 +126,7 @@ describe('Versions', () => {
       disablePublishURL = new AdminUrlUtil(serverURL, disablePublishSlug)
       customIDURL = new AdminUrlUtil(serverURL, customIDSlug)
       postURL = new AdminUrlUtil(serverURL, postCollectionSlug)
+      errorOnUnpublishURL = new AdminUrlUtil(serverURL, errorOnUnpublishSlug)
     })
 
     test('collection — has versions tab', async () => {
@@ -579,6 +582,22 @@ describe('Versions', () => {
       await expect(page.locator('#action-save')).not.toBeAttached()
     })
 
+    test('collections — should show custom error message when unpublishing fails', async () => {
+      const publishedDoc = await payload.create({
+        collection: errorOnUnpublishSlug,
+        data: {
+          _status: 'published',
+          title: 'title',
+        },
+      })
+      await page.goto(errorOnUnpublishURL.edit(String(publishedDoc.id)))
+      await page.locator('#action-unpublish').click()
+      await page.locator('[id^="confirm-un-publish-"] #confirm-action').click()
+      await expect(
+        page.locator('.payload-toast-item:has-text("Custom error on unpublish")'),
+      ).toBeVisible()
+    })
+
     test('should show documents title in relationship even if draft document', async () => {
       await payload.create({
         collection: autosaveCollectionSlug,
diff --git a/test/versions/payload-types.ts b/test/versions/payload-types.ts
index c016d16822..4cb7db427c 100644
--- a/test/versions/payload-types.ts
+++ b/test/versions/payload-types.ts
@@ -75,6 +75,7 @@ export interface Config {
     'draft-posts': DraftPost;
     'draft-with-max-posts': DraftWithMaxPost;
     'draft-with-validate-posts': DraftWithValidatePost;
+    'error-on-unpublish': ErrorOnUnpublish;
     'localized-posts': LocalizedPost;
     'version-posts': VersionPost;
     'custom-ids': CustomId;
@@ -97,6 +98,7 @@ export interface Config {
     'draft-posts': DraftPostsSelect<false> | DraftPostsSelect<true>;
     'draft-with-max-posts': DraftWithMaxPostsSelect<false> | DraftWithMaxPostsSelect<true>;
     'draft-with-validate-posts': DraftWithValidatePostsSelect<false> | DraftWithValidatePostsSelect<true>;
+    'error-on-unpublish': ErrorOnUnpublishSelect<false> | ErrorOnUnpublishSelect<true>;
     'localized-posts': LocalizedPostsSelect<false> | LocalizedPostsSelect<true>;
     'version-posts': VersionPostsSelect<false> | VersionPostsSelect<true>;
     'custom-ids': CustomIdsSelect<false> | CustomIdsSelect<true>;
@@ -289,6 +291,17 @@ export interface DraftWithValidatePost {
   createdAt: string;
   _status?: ('draft' | 'published') | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "error-on-unpublish".
+ */
+export interface ErrorOnUnpublish {
+  id: string;
+  title: string;
+  updatedAt: string;
+  createdAt: string;
+  _status?: ('draft' | 'published') | null;
+}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "localized-posts".
@@ -589,6 +602,10 @@ export interface PayloadLockedDocument {
         relationTo: 'draft-with-validate-posts';
         value: string | DraftWithValidatePost;
       } | null)
+    | ({
+        relationTo: 'error-on-unpublish';
+        value: string | ErrorOnUnpublish;
+      } | null)
     | ({
         relationTo: 'localized-posts';
         value: string | LocalizedPost;
@@ -778,6 +795,16 @@ export interface DraftWithValidatePostsSelect<T extends boolean = true> {
   createdAt?: T;
   _status?: T;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "error-on-unpublish_select".
+ */
+export interface ErrorOnUnpublishSelect<T extends boolean = true> {
+  title?: T;
+  updatedAt?: T;
+  createdAt?: T;
+  _status?: T;
+}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "localized-posts_select".
diff --git a/test/versions/slugs.ts b/test/versions/slugs.ts
index 5807c381b5..b930df7060 100644
--- a/test/versions/slugs.ts
+++ b/test/versions/slugs.ts
@@ -19,6 +19,7 @@ export const mediaCollectionSlug = 'media'
 export const versionCollectionSlug = 'version-posts'
 
 export const disablePublishSlug = 'disable-publish'
+export const errorOnUnpublishSlug = 'error-on-unpublish'
 
 export const disablePublishGlobalSlug = 'disable-publish-global'
 

From 18693775e43e70e01e99b8581a48e699fa75fdc5 Mon Sep 17 00:00:00 2001
From: Rot4tion <56016610+Rot4tion@users.noreply.github.com>
Date: Thu, 8 May 2025 05:45:12 +0700
Subject: [PATCH 14/46] templates: fix Media component failing when setting a
 custom serverURL (#12214)

### What?
Fixes #12171

### Why?
Previously, the ImageMedia component was not properly handling URL
formatting when a serverURL was configured in Payload. This caused
images to fail to load when using a custom serverURL. By extracting the
URL handling logic into a separate utility function, we ensure
consistent URL processing across both image and video components.

### How?
1. Created a new utility function getMediaUrl in
`src/utilities/getMediaUrl.ts` that:
   - Properly checks for HTTP/HTTPS protocols
   - Handles null or undefined URL values
   - Supports cache tags to prevent caching issues
   - Uses `getClientSideURL()` for relative paths
2. Updated the ImageMedia component to use this utility function instead
of inline URL processing logic
3. Updated the VideoMedia component to also use the same utility
function for consistency
---
 .../src/components/Media/ImageMedia/index.tsx |  4 ++--
 .../src/components/Media/VideoMedia/index.tsx |  4 ++--
 .../website/src/utilities/getMediaUrl.ts      | 20 +++++++++++++++++++
 .../src/components/Media/ImageMedia/index.tsx |  3 ++-
 .../src/components/Media/VideoMedia/index.tsx |  5 ++---
 .../src/utilities/getMediaUrl.ts              | 20 +++++++++++++++++++
 6 files changed, 48 insertions(+), 8 deletions(-)
 create mode 100644 templates/website/src/utilities/getMediaUrl.ts
 create mode 100644 templates/with-vercel-website/src/utilities/getMediaUrl.ts

diff --git a/templates/website/src/components/Media/ImageMedia/index.tsx b/templates/website/src/components/Media/ImageMedia/index.tsx
index c472254da6..8a1dc10647 100644
--- a/templates/website/src/components/Media/ImageMedia/index.tsx
+++ b/templates/website/src/components/Media/ImageMedia/index.tsx
@@ -9,7 +9,7 @@ import React from 'react'
 import type { Props as MediaProps } from '../types'
 
 import { cssVariables } from '@/cssVariables'
-import { getClientSideURL } from '@/utilities/getURL'
+import { getMediaUrl } from '@/utilities/getMediaUrl'
 
 const { breakpoints } = cssVariables
 
@@ -44,7 +44,7 @@ export const ImageMedia: React.FC<MediaProps> = (props) => {
 
     const cacheTag = resource.updatedAt
 
-    src = `${getClientSideURL()}${url}?${cacheTag}`
+    src = getMediaUrl(url, cacheTag)
   }
 
   const loading = loadingFromProps || (!priority ? 'lazy' : undefined)
diff --git a/templates/website/src/components/Media/VideoMedia/index.tsx b/templates/website/src/components/Media/VideoMedia/index.tsx
index 873eaacda5..ccff66e177 100644
--- a/templates/website/src/components/Media/VideoMedia/index.tsx
+++ b/templates/website/src/components/Media/VideoMedia/index.tsx
@@ -5,7 +5,7 @@ import React, { useEffect, useRef } from 'react'
 
 import type { Props as MediaProps } from '../types'
 
-import { getClientSideURL } from '@/utilities/getURL'
+import { getMediaUrl } from '@/utilities/getMediaUrl'
 
 export const VideoMedia: React.FC<MediaProps> = (props) => {
   const { onClick, resource, videoClassName } = props
@@ -37,7 +37,7 @@ export const VideoMedia: React.FC<MediaProps> = (props) => {
         playsInline
         ref={videoRef}
       >
-        <source src={`${getClientSideURL()}/media/${filename}`} />
+        <source src={getMediaUrl(`/media/${filename}`)} />
       </video>
     )
   }
diff --git a/templates/website/src/utilities/getMediaUrl.ts b/templates/website/src/utilities/getMediaUrl.ts
new file mode 100644
index 0000000000..7840c770ca
--- /dev/null
+++ b/templates/website/src/utilities/getMediaUrl.ts
@@ -0,0 +1,20 @@
+import { getClientSideURL } from '@/utilities/getURL'
+
+/**
+ * Processes media resource URL to ensure proper formatting
+ * @param url The original URL from the resource
+ * @param cacheTag Optional cache tag to append to the URL
+ * @returns Properly formatted URL with cache tag if provided
+ */
+export const getMediaUrl = (url: string | null | undefined, cacheTag?: string | null): string => {
+  if (!url) return ''
+
+  // Check if URL already has http/https protocol
+  if (url.startsWith('http://') || url.startsWith('https://')) {
+    return cacheTag ? `${url}?${cacheTag}` : url
+  }
+
+  // Otherwise prepend client-side URL
+  const baseUrl = getClientSideURL()
+  return cacheTag ? `${baseUrl}${url}?${cacheTag}` : `${baseUrl}${url}`
+}
diff --git a/templates/with-vercel-website/src/components/Media/ImageMedia/index.tsx b/templates/with-vercel-website/src/components/Media/ImageMedia/index.tsx
index c472254da6..9b1d0a06e4 100644
--- a/templates/with-vercel-website/src/components/Media/ImageMedia/index.tsx
+++ b/templates/with-vercel-website/src/components/Media/ImageMedia/index.tsx
@@ -10,6 +10,7 @@ import type { Props as MediaProps } from '../types'
 
 import { cssVariables } from '@/cssVariables'
 import { getClientSideURL } from '@/utilities/getURL'
+import { getMediaUrl } from '@/utilities/getMediaUrl'
 
 const { breakpoints } = cssVariables
 
@@ -44,7 +45,7 @@ export const ImageMedia: React.FC<MediaProps> = (props) => {
 
     const cacheTag = resource.updatedAt
 
-    src = `${getClientSideURL()}${url}?${cacheTag}`
+    src = getMediaUrl(url, cacheTag)
   }
 
   const loading = loadingFromProps || (!priority ? 'lazy' : undefined)
diff --git a/templates/with-vercel-website/src/components/Media/VideoMedia/index.tsx b/templates/with-vercel-website/src/components/Media/VideoMedia/index.tsx
index 873eaacda5..a2b7b647ec 100644
--- a/templates/with-vercel-website/src/components/Media/VideoMedia/index.tsx
+++ b/templates/with-vercel-website/src/components/Media/VideoMedia/index.tsx
@@ -4,8 +4,7 @@ import { cn } from '@/utilities/ui'
 import React, { useEffect, useRef } from 'react'
 
 import type { Props as MediaProps } from '../types'
-
-import { getClientSideURL } from '@/utilities/getURL'
+import { getMediaUrl } from '@/utilities/getMediaUrl'
 
 export const VideoMedia: React.FC<MediaProps> = (props) => {
   const { onClick, resource, videoClassName } = props
@@ -37,7 +36,7 @@ export const VideoMedia: React.FC<MediaProps> = (props) => {
         playsInline
         ref={videoRef}
       >
-        <source src={`${getClientSideURL()}/media/${filename}`} />
+        <source src={getMediaUrl(`/media/${filename}`)} />
       </video>
     )
   }
diff --git a/templates/with-vercel-website/src/utilities/getMediaUrl.ts b/templates/with-vercel-website/src/utilities/getMediaUrl.ts
new file mode 100644
index 0000000000..7840c770ca
--- /dev/null
+++ b/templates/with-vercel-website/src/utilities/getMediaUrl.ts
@@ -0,0 +1,20 @@
+import { getClientSideURL } from '@/utilities/getURL'
+
+/**
+ * Processes media resource URL to ensure proper formatting
+ * @param url The original URL from the resource
+ * @param cacheTag Optional cache tag to append to the URL
+ * @returns Properly formatted URL with cache tag if provided
+ */
+export const getMediaUrl = (url: string | null | undefined, cacheTag?: string | null): string => {
+  if (!url) return ''
+
+  // Check if URL already has http/https protocol
+  if (url.startsWith('http://') || url.startsWith('https://')) {
+    return cacheTag ? `${url}?${cacheTag}` : url
+  }
+
+  // Otherwise prepend client-side URL
+  const baseUrl = getClientSideURL()
+  return cacheTag ? `${baseUrl}${url}?${cacheTag}` : `${baseUrl}${url}`
+}

From 72662257a845c4d6bcb9a93e7162cfb0aa8396a8 Mon Sep 17 00:00:00 2001
From: jeepman32 <19439131+jeepman32@users.noreply.github.com>
Date: Fri, 9 May 2025 00:48:13 +1000
Subject: [PATCH 15/46] fix(drizzle): improve db push schema comparison
 (#12193)

### What?
Swaps out `deepAssertEqual` for `dequal` package. Further details and
motivation in [this
discussion](https://github.com/payloadcms/payload/discussions/12192).

### Why?
Dequal is about 100x faster in limited local testing. Dequal package
shows 3-5x speed over `deepAssertEqual` in benchmarks. Memory usage is
within acceptable levels.

### How?
Move the result of dequal to a `const` for readability. Replace the `try
{ ... } catch { ... }` with `if { ... } else { ... }` for minimum impact
and change.
---
 packages/drizzle/package.json                 |  1 +
 .../drizzle/src/utilities/pushDevSchema.ts    | 14 +++----
 pnpm-lock.yaml                                | 41 +++++++++++--------
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/packages/drizzle/package.json b/packages/drizzle/package.json
index 11fb484bbf..7a35ef4978 100644
--- a/packages/drizzle/package.json
+++ b/packages/drizzle/package.json
@@ -53,6 +53,7 @@
   },
   "dependencies": {
     "console-table-printer": "2.12.1",
+    "dequal": "2.0.3",
     "drizzle-orm": "0.36.1",
     "prompts": "2.4.2",
     "to-snake-case": "1.0.0",
diff --git a/packages/drizzle/src/utilities/pushDevSchema.ts b/packages/drizzle/src/utilities/pushDevSchema.ts
index 46f2495aa0..0406846e23 100644
--- a/packages/drizzle/src/utilities/pushDevSchema.ts
+++ b/packages/drizzle/src/utilities/pushDevSchema.ts
@@ -1,4 +1,4 @@
-import { deepStrictEqual } from 'assert'
+import { dequal } from 'dequal'
 import prompts from 'prompts'
 
 import type { BasePostgresAdapter } from '../postgres/types.js'
@@ -23,18 +23,18 @@ export const pushDevSchema = async (adapter: DrizzleAdapter) => {
     const localeCodes =
       adapter.payload.config.localization && adapter.payload.config.localization.localeCodes
 
-    try {
-      deepStrictEqual(previousSchema, {
-        localeCodes,
-        rawTables: adapter.rawTables,
-      })
+    const equal = dequal(previousSchema, {
+      localeCodes,
+      rawTables: adapter.rawTables,
+    })
 
+    if (equal) {
       if (adapter.logger) {
         adapter.payload.logger.info('No changes detected in schema, skipping schema push.')
       }
 
       return
-    } catch {
+    } else {
       previousSchema.localeCodes = localeCodes
       previousSchema.rawTables = adapter.rawTables
     }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ea9f7df22a..0cb2a8f4b4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -45,7 +45,7 @@ importers:
         version: 1.50.0
       '@sentry/nextjs':
         specifier: ^8.33.1
-        version: 8.37.1(@opentelemetry/core@1.27.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.27.0(@opentelemetry/api@1.9.0))(next@15.3.0(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-e993439-20250405)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4))(react@19.1.0)(webpack@5.96.1(@swc/core@1.10.12(@swc/helpers@0.5.15)))
+        version: 8.37.1(@opentelemetry/core@1.27.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.27.0(@opentelemetry/api@1.9.0))(next@15.3.0(@babel/core@7.26.7)(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-e993439-20250405)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4))(react@19.1.0)(webpack@5.96.1(@swc/core@1.10.12(@swc/helpers@0.5.15))(esbuild@0.19.12))
       '@sentry/node':
         specifier: ^8.33.1
         version: 8.37.1
@@ -135,7 +135,7 @@ importers:
         version: 10.1.3(@aws-sdk/credential-providers@3.687.0(@aws-sdk/client-sso-oidc@3.687.0(@aws-sdk/client-sts@3.687.0)))(socks@2.8.3)
       next:
         specifier: 15.3.0
-        version: 15.3.0(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-e993439-20250405)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4)
+        version: 15.3.0(@babel/core@7.26.7)(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-e993439-20250405)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4)
       open:
         specifier: ^10.1.0
         version: 10.1.0
@@ -448,6 +448,9 @@ importers:
       console-table-printer:
         specifier: 2.12.1
         version: 2.12.1
+      dequal:
+        specifier: 2.0.3
+        version: 2.0.3
       drizzle-orm:
         specifier: 0.36.1
         version: 0.36.1(@libsql/client@0.14.0(bufferutil@4.0.8)(utf-8-validate@6.0.5))(@neondatabase/serverless@0.9.5)(@opentelemetry/api@1.9.0)(@types/pg@8.10.2)(@types/react@19.1.0)(@vercel/postgres@0.9.0)(pg@8.11.3)(react@19.1.0)
@@ -1141,7 +1144,7 @@ importers:
     dependencies:
       '@sentry/nextjs':
         specifier: ^8.33.1
-        version: 8.37.1(@opentelemetry/core@1.27.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.27.0(@opentelemetry/api@1.9.0))(next@15.3.0(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-e993439-20250405)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4))(react@19.1.0)(webpack@5.96.1(@swc/core@1.10.12(@swc/helpers@0.5.15)))
+        version: 8.37.1(@opentelemetry/core@1.27.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.27.0(@opentelemetry/api@1.9.0))(next@15.3.0(@babel/core@7.26.7)(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-e993439-20250405)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4))(react@19.1.0)(webpack@5.96.1(@swc/core@1.10.12(@swc/helpers@0.5.15))(esbuild@0.19.12))
       '@sentry/types':
         specifier: ^8.33.1
         version: 8.37.1
@@ -1500,7 +1503,7 @@ importers:
         version: link:../plugin-cloud-storage
       uploadthing:
         specifier: 7.3.0
-        version: 7.3.0(next@15.3.0(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4))
+        version: 7.3.0(next@15.3.0(@babel/core@7.26.7)(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4))
     devDependencies:
       payload:
         specifier: workspace:*
@@ -1786,7 +1789,7 @@ importers:
         version: link:../packages/ui
       '@sentry/nextjs':
         specifier: ^8.33.1
-        version: 8.37.1(@opentelemetry/core@1.27.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.27.0(@opentelemetry/api@1.9.0))(next@15.3.0(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-e993439-20250405)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4))(react@19.1.0)(webpack@5.96.1(@swc/core@1.10.12(@swc/helpers@0.5.15)))
+        version: 8.37.1(@opentelemetry/core@1.27.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.27.0(@opentelemetry/api@1.9.0))(next@15.3.0(@babel/core@7.26.7)(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-e993439-20250405)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4))(react@19.1.0)(webpack@5.96.1(@swc/core@1.10.12(@swc/helpers@0.5.15))(esbuild@0.19.12))
       '@sentry/react':
         specifier: ^7.77.0
         version: 7.119.2(react@19.1.0)
@@ -1843,7 +1846,7 @@ importers:
         version: 8.9.5(@aws-sdk/credential-providers@3.687.0(@aws-sdk/client-sso-oidc@3.687.0(@aws-sdk/client-sts@3.687.0)))(socks@2.8.3)
       next:
         specifier: 15.3.0
-        version: 15.3.0(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-e993439-20250405)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4)
+        version: 15.3.0(@babel/core@7.26.7)(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-e993439-20250405)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4)
       nodemailer:
         specifier: 6.9.16
         version: 6.9.16
@@ -8114,6 +8117,7 @@ packages:
 
   libsql@0.4.7:
     resolution: {integrity: sha512-T9eIRCs6b0J1SHKYIvD8+KCJMcWZ900iZyxdnSCdqxN12Z1ijzT+jY5nrk72Jw4B0HGzms2NgpryArlJqvc3Lw==}
+    cpu: [x64, arm64, wasm32]
     os: [darwin, linux, win32]
 
   license-checker@25.0.1:
@@ -14022,7 +14026,7 @@ snapshots:
       '@sentry/utils': 7.119.2
       localforage: 1.10.0
 
-  '@sentry/nextjs@8.37.1(@opentelemetry/core@1.27.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.27.0(@opentelemetry/api@1.9.0))(next@15.3.0(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-e993439-20250405)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4))(react@19.1.0)(webpack@5.96.1(@swc/core@1.10.12(@swc/helpers@0.5.15)))':
+  '@sentry/nextjs@8.37.1(@opentelemetry/core@1.27.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.27.0(@opentelemetry/api@1.9.0))(next@15.3.0(@babel/core@7.26.7)(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-e993439-20250405)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4))(react@19.1.0)(webpack@5.96.1(@swc/core@1.10.12(@swc/helpers@0.5.15))(esbuild@0.19.12))':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/instrumentation-http': 0.53.0(@opentelemetry/api@1.9.0)
@@ -14036,9 +14040,9 @@ snapshots:
       '@sentry/types': 8.37.1
       '@sentry/utils': 8.37.1
       '@sentry/vercel-edge': 8.37.1
-      '@sentry/webpack-plugin': 2.22.6(webpack@5.96.1(@swc/core@1.10.12(@swc/helpers@0.5.15)))
+      '@sentry/webpack-plugin': 2.22.6(webpack@5.96.1(@swc/core@1.10.12(@swc/helpers@0.5.15))(esbuild@0.19.12))
       chalk: 3.0.0
-      next: 15.3.0(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-e993439-20250405)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4)
+      next: 15.3.0(@babel/core@7.26.7)(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-e993439-20250405)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4)
       resolve: 1.22.8
       rollup: 3.29.5
       stacktrace-parser: 0.1.10
@@ -14146,12 +14150,12 @@ snapshots:
       '@sentry/types': 8.37.1
       '@sentry/utils': 8.37.1
 
-  '@sentry/webpack-plugin@2.22.6(webpack@5.96.1(@swc/core@1.10.12(@swc/helpers@0.5.15)))':
+  '@sentry/webpack-plugin@2.22.6(webpack@5.96.1(@swc/core@1.10.12(@swc/helpers@0.5.15))(esbuild@0.19.12))':
     dependencies:
       '@sentry/bundler-plugin-core': 2.22.6
       unplugin: 1.0.1
       uuid: 9.0.0
-      webpack: 5.96.1(@swc/core@1.10.12(@swc/helpers@0.5.15))
+      webpack: 5.96.1(@swc/core@1.10.12(@swc/helpers@0.5.15))(esbuild@0.19.12)
     transitivePeerDependencies:
       - encoding
       - supports-color
@@ -18733,7 +18737,7 @@ snapshots:
       - '@babel/core'
       - babel-plugin-macros
 
-  next@15.3.0(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-e993439-20250405)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4):
+  next@15.3.0(@babel/core@7.26.7)(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-e993439-20250405)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4):
     dependencies:
       '@next/env': 15.3.0
       '@swc/counter': 0.1.3
@@ -20245,16 +20249,17 @@ snapshots:
       ansi-escapes: 4.3.2
       supports-hyperlinks: 2.3.0
 
-  terser-webpack-plugin@5.3.10(@swc/core@1.10.12(@swc/helpers@0.5.15))(webpack@5.96.1(@swc/core@1.10.12(@swc/helpers@0.5.15))):
+  terser-webpack-plugin@5.3.10(@swc/core@1.10.12(@swc/helpers@0.5.15))(esbuild@0.19.12)(webpack@5.96.1(@swc/core@1.10.12(@swc/helpers@0.5.15))(esbuild@0.19.12)):
     dependencies:
       '@jridgewell/trace-mapping': 0.3.25
       jest-worker: 27.5.1
       schema-utils: 3.3.0
       serialize-javascript: 6.0.2
       terser: 5.36.0
-      webpack: 5.96.1(@swc/core@1.10.12(@swc/helpers@0.5.15))
+      webpack: 5.96.1(@swc/core@1.10.12(@swc/helpers@0.5.15))(esbuild@0.19.12)
     optionalDependencies:
       '@swc/core': 1.10.12(@swc/helpers@0.5.15)
+      esbuild: 0.19.12
 
   terser@5.36.0:
     dependencies:
@@ -20533,14 +20538,14 @@ snapshots:
       escalade: 3.2.0
       picocolors: 1.1.1
 
-  uploadthing@7.3.0(next@15.3.0(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4)):
+  uploadthing@7.3.0(next@15.3.0(@babel/core@7.26.7)(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4)):
     dependencies:
       '@effect/platform': 0.69.8(effect@3.10.3)
       '@uploadthing/mime-types': 0.3.2
       '@uploadthing/shared': 7.1.1
       effect: 3.10.3
     optionalDependencies:
-      next: 15.3.0(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-e993439-20250405)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4)
+      next: 15.3.0(@babel/core@7.26.7)(@opentelemetry/api@1.9.0)(@playwright/test@1.50.0)(babel-plugin-macros@3.1.0)(babel-plugin-react-compiler@19.0.0-beta-e993439-20250405)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(sass@1.77.4)
 
   uri-js@4.4.1:
     dependencies:
@@ -20645,7 +20650,7 @@ snapshots:
 
   webpack-virtual-modules@0.5.0: {}
 
-  webpack@5.96.1(@swc/core@1.10.12(@swc/helpers@0.5.15)):
+  webpack@5.96.1(@swc/core@1.10.12(@swc/helpers@0.5.15))(esbuild@0.19.12):
     dependencies:
       '@types/eslint-scope': 3.7.7
       '@types/estree': 1.0.6
@@ -20667,7 +20672,7 @@ snapshots:
       neo-async: 2.6.2
       schema-utils: 3.3.0
       tapable: 2.2.1
-      terser-webpack-plugin: 5.3.10(@swc/core@1.10.12(@swc/helpers@0.5.15))(webpack@5.96.1(@swc/core@1.10.12(@swc/helpers@0.5.15)))
+      terser-webpack-plugin: 5.3.10(@swc/core@1.10.12(@swc/helpers@0.5.15))(esbuild@0.19.12)(webpack@5.96.1(@swc/core@1.10.12(@swc/helpers@0.5.15))(esbuild@0.19.12))
       watchpack: 2.4.2
       webpack-sources: 3.2.3
     transitivePeerDependencies:

From 09f15ff8749ecc9e169742fb0598c7e648e5a561 Mon Sep 17 00:00:00 2001
From: Rot4tion <56016610+Rot4tion@users.noreply.github.com>
Date: Fri, 9 May 2025 01:06:33 +0700
Subject: [PATCH 16/46] templates: add eslint ignore rule for '.next/' (#12332)

### What?
Standardizes ESLint configurations across all template projects like
website template to ensure consistent code quality enforcement.

### Why?
Previously, there were inconsistencies in the ESLint configurations
between different template projects. Some templates were missing the
.next/ ignore pattern, which could lead to unnecessary linting of build
files. By standardizing these configurations, we ensure consistent code
quality standards and developer experience across all template projects.

### How?
Added the missing ignores: ['.next/'] configuration to templates that
were missing it
---
 templates/blank/eslint.config.mjs                | 3 +++
 templates/with-payload-cloud/eslint.config.mjs   | 3 +++
 templates/with-postgres/eslint.config.mjs        | 3 +++
 templates/with-vercel-mongodb/eslint.config.mjs  | 3 +++
 templates/with-vercel-postgres/eslint.config.mjs | 3 +++
 5 files changed, 15 insertions(+)

diff --git a/templates/blank/eslint.config.mjs b/templates/blank/eslint.config.mjs
index 37d29ea57d..7acd77dd1b 100644
--- a/templates/blank/eslint.config.mjs
+++ b/templates/blank/eslint.config.mjs
@@ -30,6 +30,9 @@ const eslintConfig = [
       ],
     },
   },
+  {
+    ignores: ['.next/'],
+  },
 ]
 
 export default eslintConfig
diff --git a/templates/with-payload-cloud/eslint.config.mjs b/templates/with-payload-cloud/eslint.config.mjs
index 37d29ea57d..7acd77dd1b 100644
--- a/templates/with-payload-cloud/eslint.config.mjs
+++ b/templates/with-payload-cloud/eslint.config.mjs
@@ -30,6 +30,9 @@ const eslintConfig = [
       ],
     },
   },
+  {
+    ignores: ['.next/'],
+  },
 ]
 
 export default eslintConfig
diff --git a/templates/with-postgres/eslint.config.mjs b/templates/with-postgres/eslint.config.mjs
index 37d29ea57d..7acd77dd1b 100644
--- a/templates/with-postgres/eslint.config.mjs
+++ b/templates/with-postgres/eslint.config.mjs
@@ -30,6 +30,9 @@ const eslintConfig = [
       ],
     },
   },
+  {
+    ignores: ['.next/'],
+  },
 ]
 
 export default eslintConfig
diff --git a/templates/with-vercel-mongodb/eslint.config.mjs b/templates/with-vercel-mongodb/eslint.config.mjs
index 37d29ea57d..7acd77dd1b 100644
--- a/templates/with-vercel-mongodb/eslint.config.mjs
+++ b/templates/with-vercel-mongodb/eslint.config.mjs
@@ -30,6 +30,9 @@ const eslintConfig = [
       ],
     },
   },
+  {
+    ignores: ['.next/'],
+  },
 ]
 
 export default eslintConfig
diff --git a/templates/with-vercel-postgres/eslint.config.mjs b/templates/with-vercel-postgres/eslint.config.mjs
index 37d29ea57d..7acd77dd1b 100644
--- a/templates/with-vercel-postgres/eslint.config.mjs
+++ b/templates/with-vercel-postgres/eslint.config.mjs
@@ -30,6 +30,9 @@ const eslintConfig = [
       ],
     },
   },
+  {
+    ignores: ['.next/'],
+  },
 ]
 
 export default eslintConfig

From 3701de5056d7b19c860bced6cc14c963cce7a5ae Mon Sep 17 00:00:00 2001
From: Sasha <64744993+r1tsuu@users.noreply.github.com>
Date: Fri, 9 May 2025 13:24:48 +0300
Subject: [PATCH 17/46] templates: fix categories search sync (#12359)

Fixes https://github.com/payloadcms/payload/issues/9449

Previously, search sync with categories didn't work and additionally
caused problems with Postgres. Additionally, ensures that when doing
synchronization, all the categories are populated, since we don't always
have populated data inside hooks.
---
 .../localization/src/search/beforeSync.ts     | 48 ++++++++++++-------
 .../localization/src/search/fieldOverrides.ts |  2 +-
 templates/website/src/payload-types.ts        |  9 +++-
 templates/website/src/search/beforeSync.ts    | 46 ++++++++++++------
 .../website/src/search/fieldOverrides.ts      |  2 +-
 .../with-vercel-website/src/payload-types.ts  |  6 ++-
 .../src/search/beforeSync.ts                  | 46 ++++++++++++------
 .../src/search/fieldOverrides.ts              |  2 +-
 8 files changed, 108 insertions(+), 53 deletions(-)

diff --git a/examples/localization/src/search/beforeSync.ts b/examples/localization/src/search/beforeSync.ts
index d0c03c83c1..2d9c7be7ef 100644
--- a/examples/localization/src/search/beforeSync.ts
+++ b/examples/localization/src/search/beforeSync.ts
@@ -1,11 +1,11 @@
 import { BeforeSync, DocToSync } from '@payloadcms/plugin-search/types'
 
-export const beforeSyncWithSearch: BeforeSync = async ({ originalDoc, searchDoc, payload }) => {
+export const beforeSyncWithSearch: BeforeSync = async ({ req, originalDoc, searchDoc }) => {
   const {
     doc: { relationTo: collection },
   } = searchDoc
 
-  const { slug, id, categories, title, meta, excerpt } = originalDoc
+  const { slug, id, categories, title, meta } = originalDoc
 
   const modifiedDoc: DocToSync = {
     ...searchDoc,
@@ -20,24 +20,40 @@ export const beforeSyncWithSearch: BeforeSync = async ({ originalDoc, searchDoc,
   }
 
   if (categories && Array.isArray(categories) && categories.length > 0) {
-    // get full categories and keep a flattened copy of their most important properties
-    try {
-      const mappedCategories = categories.map((category) => {
-        const { id, title } = category
+    const populatedCategories: { id: string | number; title: string }[] = []
+    for (const category of categories) {
+      if (!category) {
+        continue
+      }
 
-        return {
-          relationTo: 'categories',
-          id,
-          title,
-        }
+      if (typeof category === 'object') {
+        populatedCategories.push(category)
+        continue
+      }
+
+      const doc = await req.payload.findByID({
+        collection: 'categories',
+        id: category,
+        disableErrors: true,
+        depth: 0,
+        select: { title: true },
+        req,
       })
 
-      modifiedDoc.categories = mappedCategories
-    } catch (err) {
-      console.error(
-        `Failed. Category not found when syncing collection '${collection}' with id: '${id}' to search.`,
-      )
+      if (doc !== null) {
+        populatedCategories.push(doc)
+      } else {
+        console.error(
+          `Failed. Category not found when syncing collection '${collection}' with id: '${id}' to search.`,
+        )
+      }
     }
+
+    modifiedDoc.categories = populatedCategories.map((each) => ({
+      relationTo: 'categories',
+      categoryID: String(each.id),
+      title: each.title,
+    }))
   }
 
   return modifiedDoc
diff --git a/examples/localization/src/search/fieldOverrides.ts b/examples/localization/src/search/fieldOverrides.ts
index d5c1e98ee0..fb9b7a2ad4 100644
--- a/examples/localization/src/search/fieldOverrides.ts
+++ b/examples/localization/src/search/fieldOverrides.ts
@@ -52,7 +52,7 @@ export const searchFields: Field[] = [
         type: 'text',
       },
       {
-        name: 'id',
+        name: 'categoryID',
         type: 'text',
       },
       {
diff --git a/templates/website/src/payload-types.ts b/templates/website/src/payload-types.ts
index 1dfe387bcb..5978fa225e 100644
--- a/templates/website/src/payload-types.ts
+++ b/templates/website/src/payload-types.ts
@@ -54,6 +54,7 @@ export type SupportedTimezones =
   | 'Asia/Singapore'
   | 'Asia/Tokyo'
   | 'Asia/Seoul'
+  | 'Australia/Brisbane'
   | 'Australia/Sydney'
   | 'Pacific/Guam'
   | 'Pacific/Noumea'
@@ -624,6 +625,7 @@ export interface Form {
             label?: string | null;
             width?: number | null;
             defaultValue?: string | null;
+            placeholder?: string | null;
             options?:
               | {
                   label: string;
@@ -791,8 +793,9 @@ export interface Search {
   categories?:
     | {
         relationTo?: string | null;
-        id?: string | null;
+        categoryID?: string | null;
         title?: string | null;
+        id?: string | null;
       }[]
     | null;
   updatedAt: string;
@@ -1355,6 +1358,7 @@ export interface FormsSelect<T extends boolean = true> {
               label?: T;
               width?: T;
               defaultValue?: T;
+              placeholder?: T;
               options?:
                 | T
                 | {
@@ -1458,8 +1462,9 @@ export interface SearchSelect<T extends boolean = true> {
     | T
     | {
         relationTo?: T;
-        id?: T;
+        categoryID?: T;
         title?: T;
+        id?: T;
       };
   updatedAt?: T;
   createdAt?: T;
diff --git a/templates/website/src/search/beforeSync.ts b/templates/website/src/search/beforeSync.ts
index 5fc5f128ec..2d9c7be7ef 100644
--- a/templates/website/src/search/beforeSync.ts
+++ b/templates/website/src/search/beforeSync.ts
@@ -1,6 +1,6 @@
 import { BeforeSync, DocToSync } from '@payloadcms/plugin-search/types'
 
-export const beforeSyncWithSearch: BeforeSync = async ({ originalDoc, searchDoc }) => {
+export const beforeSyncWithSearch: BeforeSync = async ({ req, originalDoc, searchDoc }) => {
   const {
     doc: { relationTo: collection },
   } = searchDoc
@@ -20,24 +20,40 @@ export const beforeSyncWithSearch: BeforeSync = async ({ originalDoc, searchDoc
   }
 
   if (categories && Array.isArray(categories) && categories.length > 0) {
-    // get full categories and keep a flattened copy of their most important properties
-    try {
-      const mappedCategories = categories.map((category) => {
-        const { id, title } = category
+    const populatedCategories: { id: string | number; title: string }[] = []
+    for (const category of categories) {
+      if (!category) {
+        continue
+      }
 
-        return {
-          relationTo: 'categories',
-          id,
-          title,
-        }
+      if (typeof category === 'object') {
+        populatedCategories.push(category)
+        continue
+      }
+
+      const doc = await req.payload.findByID({
+        collection: 'categories',
+        id: category,
+        disableErrors: true,
+        depth: 0,
+        select: { title: true },
+        req,
       })
 
-      modifiedDoc.categories = mappedCategories
-    } catch (_err) {
-      console.error(
-        `Failed. Category not found when syncing collection '${collection}' with id: '${id}' to search.`,
-      )
+      if (doc !== null) {
+        populatedCategories.push(doc)
+      } else {
+        console.error(
+          `Failed. Category not found when syncing collection '${collection}' with id: '${id}' to search.`,
+        )
+      }
     }
+
+    modifiedDoc.categories = populatedCategories.map((each) => ({
+      relationTo: 'categories',
+      categoryID: String(each.id),
+      title: each.title,
+    }))
   }
 
   return modifiedDoc
diff --git a/templates/website/src/search/fieldOverrides.ts b/templates/website/src/search/fieldOverrides.ts
index 6d086cb95f..14f81fd61b 100644
--- a/templates/website/src/search/fieldOverrides.ts
+++ b/templates/website/src/search/fieldOverrides.ts
@@ -49,7 +49,7 @@ export const searchFields: Field[] = [
         type: 'text',
       },
       {
-        name: 'id',
+        name: 'categoryID',
         type: 'text',
       },
       {
diff --git a/templates/with-vercel-website/src/payload-types.ts b/templates/with-vercel-website/src/payload-types.ts
index 4f797274c2..7ac31f6edf 100644
--- a/templates/with-vercel-website/src/payload-types.ts
+++ b/templates/with-vercel-website/src/payload-types.ts
@@ -793,8 +793,9 @@ export interface Search {
   categories?:
     | {
         relationTo?: string | null;
-        id?: string | null;
+        categoryID?: string | null;
         title?: string | null;
+        id?: string | null;
       }[]
     | null;
   updatedAt: string;
@@ -1461,8 +1462,9 @@ export interface SearchSelect<T extends boolean = true> {
     | T
     | {
         relationTo?: T;
-        id?: T;
+        categoryID?: T;
         title?: T;
+        id?: T;
       };
   updatedAt?: T;
   createdAt?: T;
diff --git a/templates/with-vercel-website/src/search/beforeSync.ts b/templates/with-vercel-website/src/search/beforeSync.ts
index 5fc5f128ec..2d9c7be7ef 100644
--- a/templates/with-vercel-website/src/search/beforeSync.ts
+++ b/templates/with-vercel-website/src/search/beforeSync.ts
@@ -1,6 +1,6 @@
 import { BeforeSync, DocToSync } from '@payloadcms/plugin-search/types'
 
-export const beforeSyncWithSearch: BeforeSync = async ({ originalDoc, searchDoc }) => {
+export const beforeSyncWithSearch: BeforeSync = async ({ req, originalDoc, searchDoc }) => {
   const {
     doc: { relationTo: collection },
   } = searchDoc
@@ -20,24 +20,40 @@ export const beforeSyncWithSearch: BeforeSync = async ({ originalDoc, searchDoc
   }
 
   if (categories && Array.isArray(categories) && categories.length > 0) {
-    // get full categories and keep a flattened copy of their most important properties
-    try {
-      const mappedCategories = categories.map((category) => {
-        const { id, title } = category
+    const populatedCategories: { id: string | number; title: string }[] = []
+    for (const category of categories) {
+      if (!category) {
+        continue
+      }
 
-        return {
-          relationTo: 'categories',
-          id,
-          title,
-        }
+      if (typeof category === 'object') {
+        populatedCategories.push(category)
+        continue
+      }
+
+      const doc = await req.payload.findByID({
+        collection: 'categories',
+        id: category,
+        disableErrors: true,
+        depth: 0,
+        select: { title: true },
+        req,
       })
 
-      modifiedDoc.categories = mappedCategories
-    } catch (_err) {
-      console.error(
-        `Failed. Category not found when syncing collection '${collection}' with id: '${id}' to search.`,
-      )
+      if (doc !== null) {
+        populatedCategories.push(doc)
+      } else {
+        console.error(
+          `Failed. Category not found when syncing collection '${collection}' with id: '${id}' to search.`,
+        )
+      }
     }
+
+    modifiedDoc.categories = populatedCategories.map((each) => ({
+      relationTo: 'categories',
+      categoryID: String(each.id),
+      title: each.title,
+    }))
   }
 
   return modifiedDoc
diff --git a/templates/with-vercel-website/src/search/fieldOverrides.ts b/templates/with-vercel-website/src/search/fieldOverrides.ts
index 6d086cb95f..14f81fd61b 100644
--- a/templates/with-vercel-website/src/search/fieldOverrides.ts
+++ b/templates/with-vercel-website/src/search/fieldOverrides.ts
@@ -49,7 +49,7 @@ export const searchFields: Field[] = [
         type: 'text',
       },
       {
-        name: 'id',
+        name: 'categoryID',
         type: 'text',
       },
       {

From c43891b2ba50fdee02d1138a4a45ac1da402a3c4 Mon Sep 17 00:00:00 2001
From: Paul <paul@payloadcms.com>
Date: Sat, 10 May 2025 17:15:15 -0700
Subject: [PATCH 18/46] fix(db-mongodb): localized dates being returned as date
 objects instead of strings (#12354)

Fixes https://github.com/payloadcms/payload/issues/12334

We weren't passing locale through to the Date transformer function so
localized dates were being read as objects instead of strings.
---
 .../db-mongodb/src/utilities/transform.ts     |  1 +
 .../collections/LocalizedDateFields/index.ts  | 21 ++++++++++++++
 test/localization/config.ts                   | 11 +++++++
 test/localization/int.spec.ts                 | 27 +++++++++++++++++
 test/localization/payload-types.ts            | 29 +++++++++++++++++++
 test/localization/shared.ts                   |  1 +
 6 files changed, 90 insertions(+)
 create mode 100644 test/localization/collections/LocalizedDateFields/index.ts

diff --git a/packages/db-mongodb/src/utilities/transform.ts b/packages/db-mongodb/src/utilities/transform.ts
index 7f1dae84a7..e5633f1acf 100644
--- a/packages/db-mongodb/src/utilities/transform.ts
+++ b/packages/db-mongodb/src/utilities/transform.ts
@@ -425,6 +425,7 @@ export const transform = ({
         for (const locale of config.localization.localeCodes) {
           sanitizeDate({
             field,
+            locale,
             ref: fieldRef,
             value: fieldRef[locale],
           })
diff --git a/test/localization/collections/LocalizedDateFields/index.ts b/test/localization/collections/LocalizedDateFields/index.ts
new file mode 100644
index 0000000000..3fefa1fbb7
--- /dev/null
+++ b/test/localization/collections/LocalizedDateFields/index.ts
@@ -0,0 +1,21 @@
+import type { CollectionConfig } from 'payload'
+
+import { localizedDateFieldsSlug } from '../../shared.js'
+
+export const LocalizedDateFields: CollectionConfig = {
+  slug: localizedDateFieldsSlug,
+  versions: {
+    drafts: true,
+  },
+  fields: [
+    {
+      type: 'date',
+      name: 'localizedDate',
+      localized: true,
+    },
+    {
+      type: 'date',
+      name: 'date',
+    },
+  ],
+}
diff --git a/test/localization/config.ts b/test/localization/config.ts
index fea76d5e60..912dd5610e 100644
--- a/test/localization/config.ts
+++ b/test/localization/config.ts
@@ -11,6 +11,7 @@ import { devUser } from '../credentials.js'
 import { ArrayCollection } from './collections/Array/index.js'
 import { BlocksCollection } from './collections/Blocks/index.js'
 import { Group } from './collections/Group/index.js'
+import { LocalizedDateFields } from './collections/LocalizedDateFields/index.js'
 import { LocalizedDrafts } from './collections/LocalizedDrafts/index.js'
 import { LocalizedWithinLocalized } from './collections/LocalizedWithinLocalized/index.js'
 import { NestedArray } from './collections/NestedArray/index.js'
@@ -25,6 +26,7 @@ import {
   defaultLocale,
   englishTitle,
   hungarianLocale,
+  localizedDateFieldsSlug,
   localizedPostsSlug,
   localizedSortSlug,
   portugueseLocale,
@@ -64,6 +66,7 @@ export default buildConfigWithDefaults({
     NestedArray,
     NestedFields,
     LocalizedDrafts,
+    LocalizedDateFields,
     {
       admin: {
         listSearchableFields: 'name',
@@ -478,6 +481,14 @@ export default buildConfigWithDefaults({
       },
     })
 
+    await payload.create({
+      collection: localizedDateFieldsSlug,
+      data: {
+        localizedDate: new Date().toISOString(),
+        date: new Date().toISOString(),
+      },
+    })
+
     console.log('SEED 1')
 
     await payload.create({
diff --git a/test/localization/int.spec.ts b/test/localization/int.spec.ts
index b134bf586f..8a184a9f0e 100644
--- a/test/localization/int.spec.ts
+++ b/test/localization/int.spec.ts
@@ -27,6 +27,7 @@ import {
   defaultLocale as englishLocale,
   englishTitle,
   hungarianLocale,
+  localizedDateFieldsSlug,
   localizedPostsSlug,
   localizedSortSlug,
   portugueseLocale,
@@ -431,6 +432,32 @@ describe('Localization', () => {
       })
     })
 
+    describe('Localized date', () => {
+      it('can create a localized date', async () => {
+        const document = await payload.create({
+          collection: localizedDateFieldsSlug,
+          data: {
+            localizedDate: new Date().toISOString(),
+            date: new Date().toISOString(),
+          },
+        })
+        expect(document.localizedDate).toBeTruthy()
+      })
+
+      it('data is typed as string', async () => {
+        const document = await payload.create({
+          collection: localizedDateFieldsSlug,
+          data: {
+            localizedDate: new Date().toISOString(),
+            date: new Date().toISOString(),
+          },
+        })
+
+        expect(typeof document.localizedDate).toBe('string')
+        expect(typeof document.date).toBe('string')
+      })
+    })
+
     describe('Localized Sort Count', () => {
       const expectedTotalDocs = 5
       const posts: LocalizedSort[] = []
diff --git a/test/localization/payload-types.ts b/test/localization/payload-types.ts
index eaa842d809..4eba191eec 100644
--- a/test/localization/payload-types.ts
+++ b/test/localization/payload-types.ts
@@ -72,6 +72,7 @@ export interface Config {
     'nested-arrays': NestedArray;
     'nested-field-tables': NestedFieldTable;
     'localized-drafts': LocalizedDraft;
+    'localized-date-fields': LocalizedDateField;
     users: User;
     'localized-posts': LocalizedPost;
     'no-localized-fields': NoLocalizedField;
@@ -97,6 +98,7 @@ export interface Config {
     'nested-arrays': NestedArraysSelect<false> | NestedArraysSelect<true>;
     'nested-field-tables': NestedFieldTablesSelect<false> | NestedFieldTablesSelect<true>;
     'localized-drafts': LocalizedDraftsSelect<false> | LocalizedDraftsSelect<true>;
+    'localized-date-fields': LocalizedDateFieldsSelect<false> | LocalizedDateFieldsSelect<true>;
     users: UsersSelect<false> | UsersSelect<true>;
     'localized-posts': LocalizedPostsSelect<false> | LocalizedPostsSelect<true>;
     'no-localized-fields': NoLocalizedFieldsSelect<false> | NoLocalizedFieldsSelect<true>;
@@ -330,6 +332,18 @@ export interface LocalizedDraft {
   createdAt: string;
   _status?: ('draft' | 'published') | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "localized-date-fields".
+ */
+export interface LocalizedDateField {
+  id: string;
+  localizedDate?: string | null;
+  date?: string | null;
+  updatedAt: string;
+  createdAt: string;
+  _status?: ('draft' | 'published') | null;
+}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "users".
@@ -713,6 +727,10 @@ export interface PayloadLockedDocument {
         relationTo: 'localized-drafts';
         value: string | LocalizedDraft;
       } | null)
+    | ({
+        relationTo: 'localized-date-fields';
+        value: string | LocalizedDateField;
+      } | null)
     | ({
         relationTo: 'users';
         value: string | User;
@@ -952,6 +970,17 @@ export interface LocalizedDraftsSelect<T extends boolean = true> {
   createdAt?: T;
   _status?: T;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "localized-date-fields_select".
+ */
+export interface LocalizedDateFieldsSelect<T extends boolean = true> {
+  localizedDate?: T;
+  date?: T;
+  updatedAt?: T;
+  createdAt?: T;
+  _status?: T;
+}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "users_select".
diff --git a/test/localization/shared.ts b/test/localization/shared.ts
index 747d755b18..fd5c54ab29 100644
--- a/test/localization/shared.ts
+++ b/test/localization/shared.ts
@@ -12,6 +12,7 @@ export const hungarianLocale = 'hu'
 
 // Slugs
 export const localizedPostsSlug = 'localized-posts'
+export const localizedDateFieldsSlug = 'localized-date-fields'
 export const withLocalizedRelSlug = 'with-localized-relationship'
 export const relationshipLocalizedSlug = 'relationship-localized'
 export const withRequiredLocalizedFields = 'localized-required'

From edeb381fb478549a13faad3e369d05fe7520613d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Germ=C3=A1n=20Jablo=C3=B1ski?=
 <43938777+GermanJablo@users.noreply.github.com>
Date: Mon, 12 May 2025 10:02:03 -0300
Subject: [PATCH 19/46] chore(plugin-stripe): enable TypeScript strict (#12303)

---
 .../plugin-stripe/src/hooks/createNewInStripe.ts   |  2 +-
 .../plugin-stripe/src/hooks/deleteFromStripe.ts    |  2 +-
 .../src/hooks/syncExistingWithStripe.ts            |  2 +-
 packages/plugin-stripe/src/index.ts                |  2 +-
 packages/plugin-stripe/src/routes/rest.ts          | 14 +++-----------
 packages/plugin-stripe/src/routes/webhooks.ts      |  8 ++++----
 packages/plugin-stripe/tsconfig.json               |  4 ----
 7 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/packages/plugin-stripe/src/hooks/createNewInStripe.ts b/packages/plugin-stripe/src/hooks/createNewInStripe.ts
index 4aaa12849c..8fdf628f4d 100644
--- a/packages/plugin-stripe/src/hooks/createNewInStripe.ts
+++ b/packages/plugin-stripe/src/hooks/createNewInStripe.ts
@@ -61,7 +61,7 @@ export const createNewInStripe: CollectionBeforeValidateHookWithArgs = async (ar
         syncedFields = deepen(syncedFields)
 
         // api version can only be the latest, stripe recommends ts ignoring it
-        const stripe = new Stripe(pluginConfig.stripeSecretKey || '', { apiVersion: '2022-08-01' })
+        const stripe = new Stripe(pluginConfig?.stripeSecretKey || '', { apiVersion: '2022-08-01' })
 
         if (operation === 'update') {
           if (logs) {
diff --git a/packages/plugin-stripe/src/hooks/deleteFromStripe.ts b/packages/plugin-stripe/src/hooks/deleteFromStripe.ts
index c61b34a71b..8ab021a64b 100644
--- a/packages/plugin-stripe/src/hooks/deleteFromStripe.ts
+++ b/packages/plugin-stripe/src/hooks/deleteFromStripe.ts
@@ -40,7 +40,7 @@ export const deleteFromStripe: CollectionAfterDeleteHookWithArgs = async (args)
     if (syncConfig) {
       try {
         // api version can only be the latest, stripe recommends ts ignoring it
-        const stripe = new Stripe(pluginConfig.stripeSecretKey || '', { apiVersion: '2022-08-01' })
+        const stripe = new Stripe(pluginConfig?.stripeSecretKey || '', { apiVersion: '2022-08-01' })
 
         const found = await stripe?.[syncConfig.stripeResourceType]?.retrieve(doc.stripeID)
 
diff --git a/packages/plugin-stripe/src/hooks/syncExistingWithStripe.ts b/packages/plugin-stripe/src/hooks/syncExistingWithStripe.ts
index 9718270ecf..719f17a9cb 100644
--- a/packages/plugin-stripe/src/hooks/syncExistingWithStripe.ts
+++ b/packages/plugin-stripe/src/hooks/syncExistingWithStripe.ts
@@ -63,7 +63,7 @@ export const syncExistingWithStripe: CollectionBeforeChangeHookWithArgs = async
 
           try {
             // api version can only be the latest, stripe recommends ts ignoring it
-            const stripe = new Stripe(pluginConfig.stripeSecretKey || '', {
+            const stripe = new Stripe(pluginConfig?.stripeSecretKey || '', {
               apiVersion: '2022-08-01',
             })
 
diff --git a/packages/plugin-stripe/src/index.ts b/packages/plugin-stripe/src/index.ts
index 2d1e311f21..3390b2b693 100644
--- a/packages/plugin-stripe/src/index.ts
+++ b/packages/plugin-stripe/src/index.ts
@@ -59,7 +59,7 @@ export const stripePlugin =
       })
     }
 
-    for (const collection of collections) {
+    for (const collection of collections!) {
       const { hooks: existingHooks } = collection
 
       const syncConfig = pluginConfig.sync?.find((sync) => sync.collection === collection.slug)
diff --git a/packages/plugin-stripe/src/routes/rest.ts b/packages/plugin-stripe/src/routes/rest.ts
index da25ebe399..2b57fd7d0d 100644
--- a/packages/plugin-stripe/src/routes/rest.ts
+++ b/packages/plugin-stripe/src/routes/rest.ts
@@ -18,15 +18,7 @@ export const stripeREST = async (args: {
   await addDataAndFileToRequest(req)
 
   const requestWithData = req
-
-  const {
-    data: {
-      stripeArgs, // example: ['cus_MGgt3Tuj3D66f2'] or [{ limit: 100 }, { stripeAccount: 'acct_1J9Z4pKZ4Z4Z4Z4Z' }]
-      stripeMethod, // example: 'subscriptions.list',
-    },
-    payload,
-    user,
-  } = requestWithData
+  const { data, payload, user } = requestWithData
 
   const { stripeSecretKey } = pluginConfig
 
@@ -37,8 +29,8 @@ export const stripeREST = async (args: {
     }
 
     responseJSON = await stripeProxy({
-      stripeArgs,
-      stripeMethod,
+      stripeArgs: data?.stripeArgs, // example: ['cus_MGgt3Tuj3D66f2'] or [{ limit: 100 }, { stripeAccount: 'acct_1J9Z4pKZ4Z4Z4Z4Z' }]
+      stripeMethod: data?.stripeMethod, // example: 'subscriptions.list',
       stripeSecretKey,
     })
 
diff --git a/packages/plugin-stripe/src/routes/webhooks.ts b/packages/plugin-stripe/src/routes/webhooks.ts
index 3373b9da32..dc60841fd0 100644
--- a/packages/plugin-stripe/src/routes/webhooks.ts
+++ b/packages/plugin-stripe/src/routes/webhooks.ts
@@ -26,7 +26,7 @@ export const stripeWebhooks = async (args: {
       },
     })
 
-    const body = await req.text()
+    const body = await req.text!()
     const stripeSignature = req.headers.get('stripe-signature')
 
     if (stripeSignature) {
@@ -41,7 +41,7 @@ export const stripeWebhooks = async (args: {
       }
 
       if (event) {
-        handleWebhooks({
+        void handleWebhooks({
           config,
           event,
           payload: req.payload,
@@ -52,7 +52,7 @@ export const stripeWebhooks = async (args: {
 
         // Fire external webhook handlers if they exist
         if (typeof webhooks === 'function') {
-          webhooks({
+          void webhooks({
             config,
             event,
             payload: req.payload,
@@ -65,7 +65,7 @@ export const stripeWebhooks = async (args: {
         if (typeof webhooks === 'object') {
           const webhookEventHandler = webhooks[event.type]
           if (typeof webhookEventHandler === 'function') {
-            webhookEventHandler({
+            void webhookEventHandler({
               config,
               event,
               payload: req.payload,
diff --git a/packages/plugin-stripe/tsconfig.json b/packages/plugin-stripe/tsconfig.json
index 1d4d43b8fc..fb21182864 100644
--- a/packages/plugin-stripe/tsconfig.json
+++ b/packages/plugin-stripe/tsconfig.json
@@ -1,8 +1,4 @@
 {
   "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    /* TODO: remove the following lines */
-    "strict": false,
-  },
   "references": [{ "path": "../payload" }, { "path": "../ui" }, { "path": "../next" }]
 }

From 021932cc8b85bf1adaa0e11394cfc66a35e56bcc Mon Sep 17 00:00:00 2001
From: Paul <paul@payloadcms.com>
Date: Mon, 12 May 2025 06:41:18 -0700
Subject: [PATCH 20/46] chore: bump node version in monorepo and add new flag
 for node 23.6+ (#12328)

This PR does two things:
- Adds a new ` --no-experimental-strip-types` flag to the playwright
test env
- This is needed since 23.6.0 automatically enables this flag by default
and it breaks e2e tests
- Bumps the tooling config files to use node 23.11.0
---
 .github/actions/setup/action.yml             | 2 +-
 .github/workflows/main.yml                   | 2 +-
 .github/workflows/post-release-templates.yml | 2 +-
 .github/workflows/post-release.yml           | 2 +-
 .github/workflows/publish-prerelease.yml     | 2 +-
 .node-version                                | 2 +-
 .nvmrc                                       | 2 +-
 .tool-versions                               | 2 +-
 test/helpers/snapshot.ts                     | 1 -
 test/test.env                                | 2 +-
 10 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index eb2c6103f5..197ee65ac7 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -6,7 +6,7 @@ inputs:
   node-version:
     description: Node.js version
     required: true
-    default: 22.6.0
+    default: 23.11.0
   pnpm-version:
     description: Pnpm version
     required: true
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 223fa6808c..72294e764e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,7 +16,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  NODE_VERSION: 22.6.0
+  NODE_VERSION: 23.11.0
   PNPM_VERSION: 9.7.1
   DO_NOT_TRACK: 1 # Disable Turbopack telemetry
   NEXT_TELEMETRY_DISABLED: 1 # Disable Next telemetry
diff --git a/.github/workflows/post-release-templates.yml b/.github/workflows/post-release-templates.yml
index e322f0ed9b..f371e8dab7 100644
--- a/.github/workflows/post-release-templates.yml
+++ b/.github/workflows/post-release-templates.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  NODE_VERSION: 22.6.0
+  NODE_VERSION: 23.11.0
   PNPM_VERSION: 9.7.1
   DO_NOT_TRACK: 1 # Disable Turbopack telemetry
   NEXT_TELEMETRY_DISABLED: 1 # Disable Next telemetry
diff --git a/.github/workflows/post-release.yml b/.github/workflows/post-release.yml
index 80477e7a42..f455ad2da2 100644
--- a/.github/workflows/post-release.yml
+++ b/.github/workflows/post-release.yml
@@ -12,7 +12,7 @@ on:
         default: ''
 
 env:
-  NODE_VERSION: 22.6.0
+  NODE_VERSION: 23.11.0
   PNPM_VERSION: 9.7.1
   DO_NOT_TRACK: 1 # Disable Turbopack telemetry
   NEXT_TELEMETRY_DISABLED: 1 # Disable Next telemetry
diff --git a/.github/workflows/publish-prerelease.yml b/.github/workflows/publish-prerelease.yml
index b8575800fb..cdc43c7142 100644
--- a/.github/workflows/publish-prerelease.yml
+++ b/.github/workflows/publish-prerelease.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  NODE_VERSION: 22.6.0
+  NODE_VERSION: 23.11.0
   PNPM_VERSION: 9.7.1
   DO_NOT_TRACK: 1 # Disable Turbopack telemetry
   NEXT_TELEMETRY_DISABLED: 1 # Disable Next telemetry
diff --git a/.node-version b/.node-version
index 535e1cca76..5afafd98f8 100644
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-v22.6.0
+v23.11.0
diff --git a/.nvmrc b/.nvmrc
index 535e1cca76..5afafd98f8 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-v22.6.0
+v23.11.0
diff --git a/.tool-versions b/.tool-versions
index 4e644f8f56..51d91bdccc 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
 pnpm 9.7.1
-nodejs 22.6.0
+nodejs 23.11.0
diff --git a/test/helpers/snapshot.ts b/test/helpers/snapshot.ts
index eb5fb86ba3..84273b8179 100644
--- a/test/helpers/snapshot.ts
+++ b/test/helpers/snapshot.ts
@@ -4,7 +4,6 @@ import type { PgTable } from 'drizzle-orm/pg-core'
 import type { SQLiteTable } from 'drizzle-orm/sqlite-core'
 import type { Payload } from 'payload'
 
-import { GenericTable } from '@payloadcms/drizzle/types'
 import { sql } from 'drizzle-orm'
 
 import { isMongoose } from './isMongoose.js'
diff --git a/test/test.env b/test/test.env
index 4176ad8698..fcc9f8eda2 100644
--- a/test/test.env
+++ b/test/test.env
@@ -1 +1 @@
-NODE_OPTIONS="--no-deprecation"
+NODE_OPTIONS="--no-deprecation --no-experimental-strip-types"

From 8219c046de2f8c02abffd0306c07295ff054079e Mon Sep 17 00:00:00 2001
From: Sasha <64744993+r1tsuu@users.noreply.github.com>
Date: Mon, 12 May 2025 22:34:15 +0300
Subject: [PATCH 21/46] fix(db-postgres): selectDistinct might remove expected
 rows when querying with nested fields or relations (#12365)

Fixes https://github.com/payloadcms/payload/issues/12263
This was caused by passing not needed columns to the `SELECT DISTINCT`
query, which we execute in case if we have a filter / sort by a nested
field / relationship. Since the only columns that we need to pass to the
`SELECT DISTINCT` query are: ID and field(s) specified in `sort`, we now
filter the `selectFields` variable.
---
 packages/drizzle/src/find/findMany.ts | 21 +++++++++++
 test/fields/collections/Date/index.ts | 10 ++++++
 test/fields/int.spec.ts               | 50 +++++++++++++++++++++++++++
 test/fields/payload-types.ts          | 26 +++++++++++---
 4 files changed, 103 insertions(+), 4 deletions(-)

diff --git a/packages/drizzle/src/find/findMany.ts b/packages/drizzle/src/find/findMany.ts
index 6b429f38ca..d1374f42a6 100644
--- a/packages/drizzle/src/find/findMany.ts
+++ b/packages/drizzle/src/find/findMany.ts
@@ -7,6 +7,7 @@ import type { DrizzleAdapter } from '../types.js'
 import buildQuery from '../queries/buildQuery.js'
 import { selectDistinct } from '../queries/selectDistinct.js'
 import { transform } from '../transform/read/index.js'
+import { getNameFromDrizzleTable } from '../utilities/getNameFromDrizzleTable.js'
 import { getTransaction } from '../utilities/getTransaction.js'
 import { buildFindManyArgs } from './buildFindManyArgs.js'
 
@@ -75,6 +76,26 @@ export const findMany = async function find({
     tableName,
     versions,
   })
+
+  if (orderBy) {
+    for (const key in selectFields) {
+      const column = selectFields[key]
+      if (column.primary) {
+        continue
+      }
+
+      if (
+        !orderBy.some(
+          (col) =>
+            col.column.name === column.name &&
+            getNameFromDrizzleTable(col.column.table) === getNameFromDrizzleTable(column.table),
+        )
+      ) {
+        delete selectFields[key]
+      }
+    }
+  }
+
   const selectDistinctResult = await selectDistinct({
     adapter,
     db,
diff --git a/test/fields/collections/Date/index.ts b/test/fields/collections/Date/index.ts
index b6755fb3b6..4e4b21a546 100644
--- a/test/fields/collections/Date/index.ts
+++ b/test/fields/collections/Date/index.ts
@@ -115,6 +115,16 @@ const DateFields: CollectionConfig = {
         },
       ],
     },
+    {
+      type: 'array',
+      name: 'array',
+      fields: [
+        {
+          name: 'date',
+          type: 'date',
+        },
+      ],
+    },
   ],
 }
 
diff --git a/test/fields/int.spec.ts b/test/fields/int.spec.ts
index 6796bbb745..5ab7350323 100644
--- a/test/fields/int.spec.ts
+++ b/test/fields/int.spec.ts
@@ -600,6 +600,56 @@ describe('Fields', () => {
 
       expect(result.docs[0].id).toEqual(doc.id)
     })
+
+    // Function to generate random date between start and end dates
+    function getRandomDate(start: Date, end: Date): string {
+      const date = new Date(start.getTime() + Math.random() * (end.getTime() - start.getTime()))
+      return date.toISOString()
+    }
+
+    // Generate sample data
+    const dataSample = Array.from({ length: 100 }, (_, index) => {
+      const startDate = new Date('2024-01-01')
+      const endDate = new Date('2025-12-31')
+
+      return {
+        array: Array.from({ length: 5 }, (_, listIndex) => {
+          return {
+            date: getRandomDate(startDate, endDate),
+          }
+        }),
+        ...dateDoc,
+      }
+    })
+
+    it('should query a date field inside an array field', async () => {
+      await payload.delete({ collection: 'date-fields', where: {} })
+      for (const doc of dataSample) {
+        await payload.create({
+          collection: 'date-fields',
+          data: doc,
+        })
+      }
+
+      const res = await payload.find({
+        collection: 'date-fields',
+        where: { 'array.date': { greater_than: new Date('2025-06-01').toISOString() } },
+      })
+
+      const filter = (doc: any) =>
+        doc.array.some((item) => new Date(item.date).getTime() > new Date('2025-06-01').getTime())
+
+      expect(res.docs.every(filter)).toBe(true)
+      expect(dataSample.filter(filter)).toHaveLength(res.totalDocs)
+      // eslint-disable-next-line jest/no-conditional-in-test
+      if (res.totalDocs > 10) {
+        // This is where postgres might fail! selectDistinct actually removed some rows here, because it distincts by:
+        // not only ID, but also created_at, updated_at, items_date
+        expect(res.docs).toHaveLength(10)
+      } else {
+        expect(res.docs.length).toBeLessThanOrEqual(res.totalDocs)
+      }
+    })
   })
 
   describe('select', () => {
diff --git a/test/fields/payload-types.ts b/test/fields/payload-types.ts
index 8b1ce2ad53..c303ea6b4c 100644
--- a/test/fields/payload-types.ts
+++ b/test/fields/payload-types.ts
@@ -929,6 +929,12 @@ export interface DateField {
         id?: string | null;
       }[]
     | null;
+  array?:
+    | {
+        date?: string | null;
+        id?: string | null;
+      }[]
+    | null;
   updatedAt: string;
   createdAt: string;
 }
@@ -1326,10 +1332,16 @@ export interface RelationshipField {
       } | null);
   relationshipDrawerHasMany?: (string | TextField)[] | null;
   relationshipDrawerHasManyPolymorphic?:
-    | {
-        relationTo: 'text-fields';
-        value: string | TextField;
-      }[]
+    | (
+        | {
+            relationTo: 'text-fields';
+            value: string | TextField;
+          }
+        | {
+            relationTo: 'array-fields';
+            value: string | ArrayField;
+          }
+      )[]
     | null;
   relationshipDrawerWithAllowCreateFalse?: (string | null) | TextField;
   relationshipDrawerWithFilterOptions?: {
@@ -2492,6 +2504,12 @@ export interface DateFieldsSelect<T extends boolean = true> {
         dayAndTime_tz?: T;
         id?: T;
       };
+  array?:
+    | T
+    | {
+        date?: T;
+        id?: T;
+      };
   updatedAt?: T;
   createdAt?: T;
 }

From fd67d461ace2a7c6135cc5e7f269ec5483527418 Mon Sep 17 00:00:00 2001
From: Sasha <64744993+r1tsuu@users.noreply.github.com>
Date: Mon, 12 May 2025 22:35:16 +0300
Subject: [PATCH 22/46] fix(db-mongodb): sort by fields in relationships with
 `draft: true` (#12387)

Fixes sorting by fields in relationships, e.g `sort: "author.name"` when
using `draft: true`. The existing test that includes check with `draft:
true` was accidentally passing because it used to sort by the
relationship field itself.
---
 .../db-mongodb/src/queries/buildSortParam.ts  | 14 +++++------
 packages/db-mongodb/src/queryDrafts.ts        |  1 +
 test/relationships/int.spec.ts                | 24 +++++++++----------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/packages/db-mongodb/src/queries/buildSortParam.ts b/packages/db-mongodb/src/queries/buildSortParam.ts
index e629b0b42e..7b78068777 100644
--- a/packages/db-mongodb/src/queries/buildSortParam.ts
+++ b/packages/db-mongodb/src/queries/buildSortParam.ts
@@ -57,12 +57,8 @@ const relationshipSort = ({
     return false
   }
 
-  for (const [i, segment] of segments.entries()) {
-    if (versions && i === 0 && segment === 'version') {
-      segments.shift()
-      continue
-    }
-
+  for (let i = 0; i < segments.length; i++) {
+    const segment = segments[i]
     const field = currentFields.find((each) => each.name === segment)
 
     if (!field) {
@@ -71,6 +67,10 @@ const relationshipSort = ({
 
     if ('fields' in field) {
       currentFields = field.flattenedFields
+      if (field.name === 'version' && versions && i === 0) {
+        segments.shift()
+        i--
+      }
     } else if (
       (field.type === 'relationship' || field.type === 'upload') &&
       i !== segments.length - 1
@@ -106,7 +106,7 @@ const relationshipSort = ({
             as: `__${path}`,
             foreignField: '_id',
             from: foreignCollection.Model.collection.name,
-            localField: relationshipPath,
+            localField: versions ? `version.${relationshipPath}` : relationshipPath,
             pipeline: [
               {
                 $project: {
diff --git a/packages/db-mongodb/src/queryDrafts.ts b/packages/db-mongodb/src/queryDrafts.ts
index 685bfa1ddb..c43e0c52f4 100644
--- a/packages/db-mongodb/src/queryDrafts.ts
+++ b/packages/db-mongodb/src/queryDrafts.ts
@@ -151,6 +151,7 @@ export const queryDrafts: QueryDrafts = async function queryDrafts(
       query: versionQuery,
       session: paginationOptions.options?.session ?? undefined,
       sort: paginationOptions.sort as object,
+      sortAggregation,
       useEstimatedCount: paginationOptions.useEstimatedCount,
     })
   } else {
diff --git a/test/relationships/int.spec.ts b/test/relationships/int.spec.ts
index 3694df14f5..0473db152e 100644
--- a/test/relationships/int.spec.ts
+++ b/test/relationships/int.spec.ts
@@ -670,18 +670,6 @@ describe('Relationships', () => {
           await payload.delete({ collection: 'directors', where: {} })
           await payload.delete({ collection: 'movies', where: {} })
 
-          const director_1 = await payload.create({
-            collection: 'directors',
-            data: { name: 'Dan', localized: 'Dan' },
-          })
-
-          await payload.update({
-            collection: 'directors',
-            id: director_1.id,
-            locale: 'de',
-            data: { localized: 'Mr. Dan' },
-          })
-
           const director_2 = await payload.create({
             collection: 'directors',
             data: { name: 'Mr. Dan', localized: 'Mr. Dan' },
@@ -694,6 +682,18 @@ describe('Relationships', () => {
             data: { localized: 'Dan' },
           })
 
+          const director_1 = await payload.create({
+            collection: 'directors',
+            data: { name: 'Dan', localized: 'Dan' },
+          })
+
+          await payload.update({
+            collection: 'directors',
+            id: director_1.id,
+            locale: 'de',
+            data: { localized: 'Mr. Dan' },
+          })
+
           const movie_1 = await payload.create({
             collection: 'movies',
             depth: 0,

From a9cc7470384851531d073a944a4a5b0a8ca6b0d7 Mon Sep 17 00:00:00 2001
From: Jacob Fletcher <jacobsfletch@gmail.com>
Date: Mon, 12 May 2025 17:06:37 -0400
Subject: [PATCH 23/46] docs: add local api instructions for vercel content
 link (#12385)

The docs for Vercel Content Link only included instructions on how to
enable content source maps for the REST API. The Local API, although
supported, was lacking documentation.
---
 docs/integrations/vercel-content-link.mdx | 41 ++++++++++++++++++++---
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/docs/integrations/vercel-content-link.mdx b/docs/integrations/vercel-content-link.mdx
index fb33a876ca..24d077a616 100644
--- a/docs/integrations/vercel-content-link.mdx
+++ b/docs/integrations/vercel-content-link.mdx
@@ -63,19 +63,50 @@ const config = buildConfig({
 export default config
 ```
 
-Now in your Next.js app, include the `?encodeSourceMaps=true` parameter in any of your API requests. For performance reasons, this should only be done when in draft mode or on preview deployments.
+## Enabling Content Source Maps
+
+Now in your Next.js app, you need to add the `encodeSourceMaps` query parameter to your API requests. This will tell Payload to include the Content Source Maps in the API response.
+
+<Banner type="warning">
+  **Note:** For performance reasons, this should only be done when in draft mode
+  or on preview deployments.
+</Banner>
+
+#### REST API
+
+If you're using the REST API, include the `?encodeSourceMaps=true` search parameter.
 
 ```ts
 if (isDraftMode || process.env.VERCEL_ENV === 'preview') {
   const res = await fetch(
-    `${process.env.NEXT_PUBLIC_PAYLOAD_CMS_URL}/api/pages?where[slug][equals]=${slug}&encodeSourceMaps=true`,
+    `${process.env.NEXT_PUBLIC_PAYLOAD_CMS_URL}/api/pages?encodeSourceMaps=true&where[slug][equals]=${slug}`,
   )
 }
 ```
 
+#### Local API
+
+If you're using the Local API, include the `encodeSourceMaps` via the `context` property.
+
+```ts
+if (isDraftMode || process.env.VERCEL_ENV === 'preview') {
+  const res = await payload.find({
+    collection: 'pages',
+    where: {
+      slug: {
+        equals: slug,
+      },
+    },
+    context: {
+      encodeSourceMaps: true,
+    },
+  })
+}
+```
+
 And that's it! You are now ready to enter Edit Mode and begin visually editing your content.
 
-#### Edit Mode
+## Edit Mode
 
 To see Content Link on your site, you first need to visit any preview deployment on Vercel and login using the Vercel Toolbar. When Content Source Maps are detected on the page, a pencil icon will appear in the toolbar. Clicking this icon will enable Edit Mode, highlighting all editable fields on the page in blue.
 
@@ -94,7 +125,9 @@ const { cleaned, encoded } = vercelStegaSplit(text)
 
 ### Blocks and array fields
 
-All `blocks` and `array` fields by definition do not have plain text strings to encode. For this reason, they are given an additional `_encodedSourceMap` property, which you can use to enable Content Link on entire _sections_ of your site. You can then specify the editing container by adding the `data-vercel-edit-target` HTML attribute to any top-level element of your block.
+All `blocks` and `array` fields by definition do not have plain text strings to encode. For this reason, they are automatically given an additional `_encodedSourceMap` property, which you can use to enable Content Link on entire _sections_ of your site.
+
+You can then specify the editing container by adding the `data-vercel-edit-target` HTML attribute to any top-level element of your block.
 
 ```ts
 <div data-vercel-edit-target>

From d9c0c43154ba6e2bbeb55ec63a896dc6c49b4d75 Mon Sep 17 00:00:00 2001
From: Jessica Rynkar <67977755+jessrynkar@users.noreply.github.com>
Date: Tue, 13 May 2025 11:13:23 +0100
Subject: [PATCH 24/46] fix(ui): passes value to server component args (#12352)

### What?
Allows the field value (if defined) to be accessed from `args` with
custom server components.

### Why?
Documentation states that the user can access `args.value` to get the
value of the field at time of render (if a value is defined) when using
a custom server component - however this isn't currently setup.

<img width="469" alt="Screenshot 2025-05-08 at 4 51 30 PM"
src="https://github.com/user-attachments/assets/9c167f80-5c5e-4fea-a31c-166281d9f7db"
/>

Link to docs
[here](https://payloadcms.com/docs/fields/overview#default-props).

### How?
Passes the value from `data` if it exists (does not exist for all field
types) and adds `value` to the server component types as an optional
property.

Fixes #10389
---
 packages/payload/src/admin/forms/Field.ts                     | 1 +
 packages/ui/src/forms/fieldSchemasToFormState/renderField.tsx | 1 +
 2 files changed, 2 insertions(+)

diff --git a/packages/payload/src/admin/forms/Field.ts b/packages/payload/src/admin/forms/Field.ts
index d6fd4d626a..13debab2b5 100644
--- a/packages/payload/src/admin/forms/Field.ts
+++ b/packages/payload/src/admin/forms/Field.ts
@@ -91,6 +91,7 @@ export type ServerComponentProps = {
   req: PayloadRequest
   siblingData: Data
   user: User
+  value?: unknown
 }
 
 export type ClientFieldBase<
diff --git a/packages/ui/src/forms/fieldSchemasToFormState/renderField.tsx b/packages/ui/src/forms/fieldSchemasToFormState/renderField.tsx
index 2658d70036..24e6b159f4 100644
--- a/packages/ui/src/forms/fieldSchemasToFormState/renderField.tsx
+++ b/packages/ui/src/forms/fieldSchemasToFormState/renderField.tsx
@@ -100,6 +100,7 @@ export const renderField: RenderFieldMethod = ({
     req,
     siblingData,
     user: req.user,
+    value: 'name' in fieldConfig && data?.[fieldConfig.name],
   }
 
   switch (fieldConfig.type) {

From 735d6998041f88aeb53e2fac6b4139a76310810c Mon Sep 17 00:00:00 2001
From: Paul <paul@payloadcms.com>
Date: Tue, 13 May 2025 07:15:38 -0700
Subject: [PATCH 25/46] chore: add no-frozen-lockfile flag for templates script
 (#12394)

---
 tools/scripts/src/generate-template-variations.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/scripts/src/generate-template-variations.ts b/tools/scripts/src/generate-template-variations.ts
index ada860ff11..7a6054df9b 100644
--- a/tools/scripts/src/generate-template-variations.ts
+++ b/tools/scripts/src/generate-template-variations.ts
@@ -152,6 +152,7 @@ async function main() {
       generateLockfile: true,
       sharp: true,
       skipConfig: true, // Do not copy the payload.config.ts file from the base template
+      skipReadme: true, // Do not copy the README.md file from the base template
       storage: 'localDisk',
       // The blank template is used as a base for create-payload-app functionality,
       // so we do not configure the payload.config.ts file, which leaves the placeholder comments.
@@ -262,10 +263,10 @@ async function main() {
 
     if (generateLockfile) {
       log('Generating pnpm-lock.yaml')
-      execSyncSafe(`pnpm install --ignore-workspace`, { cwd: destDir })
+      execSyncSafe(`pnpm install --ignore-workspace --no-frozen-lockfile`, { cwd: destDir })
     } else {
       log('Installing dependencies without generating lockfile')
-      execSyncSafe(`pnpm install --ignore-workspace`, { cwd: destDir })
+      execSyncSafe(`pnpm install --ignore-workspace --no-frozen-lockfile`, { cwd: destDir })
       await fs.rm(`${destDir}/pnpm-lock.yaml`, { force: true })
     }
 

From cd455741e59199704e36a671d2adeeec542e6284 Mon Sep 17 00:00:00 2001
From: Paul <paul@payloadcms.com>
Date: Tue, 13 May 2025 10:20:46 -0700
Subject: [PATCH 26/46] docs: remove link to outdated ecommerce template from
 stripe plugin docs (#12353)

Closes https://github.com/payloadcms/payload/issues/12347

We previously linked to a non existent ecommerce template and example
from the stripe plugin docs.
---
 docs/plugins/stripe.mdx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/plugins/stripe.mdx b/docs/plugins/stripe.mdx
index bb7a4141a8..214267f0a2 100644
--- a/docs/plugins/stripe.mdx
+++ b/docs/plugins/stripe.mdx
@@ -309,7 +309,3 @@ import {
   ...
 } from '@payloadcms/plugin-stripe/types';
 ```
-
-## Examples
-
-The [Templates Directory](https://github.com/payloadcms/payload/tree/main/templates) contains an official [E-commerce Template](https://github.com/payloadcms/payload/tree/main/templates/ecommerce) which demonstrates exactly how to configure this plugin in Payload and implement it on your front-end. You can also check out [How to Build An E-Commerce Site With Next.js](https://payloadcms.com/blog/how-to-build-an-e-commerce-site-with-nextjs) post for a bit more context around this template.

From e93d0baf8957342a0cfb499de382c185fb330487 Mon Sep 17 00:00:00 2001
From: Paul <paul@payloadcms.com>
Date: Tue, 13 May 2025 10:31:06 -0700
Subject: [PATCH 27/46] chore: add NODE_OPTIONS to vscode settings by default
 in the repo for playwright extension (#12390)

The official playwright extension when using the debug button to run
tests in debug mode doesn't pick up the `tests/test.env` file as
expected.

I've added the same `NODE_OPTIONS` to the vscode settings JSON for this
extension which fixes an error when running e2e tests in debug mode.
---
 .vscode/settings.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index b1311e3825..7d4c0086bf 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -24,5 +24,8 @@
     "runtimeArgs": ["--no-deprecation"]
   },
   // Essentially disables bun test buttons
-  "bun.test.filePattern": "bun.test.ts"
+  "bun.test.filePattern": "bun.test.ts",
+  "playwright.env": {
+    "NODE_OPTIONS": "--no-deprecation --no-experimental-strip-types"
+  }
 }

From 98283ca18c1e68c44249ee7c64367b61d98d49db Mon Sep 17 00:00:00 2001
From: Anyu Jiang <189434904+anyuj@users.noreply.github.com>
Date: Wed, 14 May 2025 02:23:27 +0800
Subject: [PATCH 28/46] fix(db-postgres): ensure module augmentation for
 generated schema is picked up correctly in turborepo (#12312)

### What?
Turborepo fails to compile due to type error in the generated drizzle
schema.
### Why?
TypeScript may not include the module augmentation for
@payloadcms/db-postgres, especially in monorepo or isolated module
builds. This causes type errors during the compilation process of
turborepo project. Adding the type-only import guarantees that
TypeScript loads the relevant type definitions and augmentations,
resolving these errors.
### How?
This PR adds a type-only import statement to ensure TypeScript
recognizes the module augmentation for @payloadcms/db-postgres in the
generated drizzle schema from payload, and there is no runtime effect.

Fixes #12311

-->

![image](https://github.com/user-attachments/assets/cdec275c-c062-4eb7-9e6a-c3bc3871dd65)
---
 packages/drizzle/src/utilities/createSchemaGenerator.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/drizzle/src/utilities/createSchemaGenerator.ts b/packages/drizzle/src/utilities/createSchemaGenerator.ts
index 25bf2f5dac..b979460b26 100644
--- a/packages/drizzle/src/utilities/createSchemaGenerator.ts
+++ b/packages/drizzle/src/utilities/createSchemaGenerator.ts
@@ -267,8 +267,11 @@ declare module '${this.packageName}' {
  */
 `
 
+    const importTypes = `import type {} from '${this.packageName}'`
+
     let code = [
       warning,
+      importTypes,
       ...importDeclarationsSanitized,
       schemaDeclaration,
       ...enumDeclarations,

From faa7794cc723ad9acbd9df5862ad1dce167782a2 Mon Sep 17 00:00:00 2001
From: Jarrod Flesch <30633324+JarrodMFlesch@users.noreply.github.com>
Date: Wed, 14 May 2025 09:45:00 -0400
Subject: [PATCH 29/46] feat(plugin-multi-tenant): prompt the user to confirm
 the change of tenant before actually updating (#12382)

---
 eslint.config.js                              |  1 +
 packages/plugin-multi-tenant/package.json     | 20 ++++
 .../src/components/TenantSelector/index.tsx   | 96 +++++++++++++++++--
 .../WatchTenantCollection/index.tsx           | 35 +++++++
 .../plugin-multi-tenant/src/exports/client.ts |  1 +
 packages/plugin-multi-tenant/src/index.ts     | 39 ++++++++
 .../TenantSelectionProvider/index.client.tsx  | 31 +++++-
 .../src/translations/index.ts                 | 91 ++++++++++++++++++
 .../src/translations/languages/ar.ts          | 14 +++
 .../src/translations/languages/az.ts          | 14 +++
 .../src/translations/languages/bg.ts          | 14 +++
 .../src/translations/languages/ca.ts          | 14 +++
 .../src/translations/languages/cs.ts          | 14 +++
 .../src/translations/languages/da.ts          | 14 +++
 .../src/translations/languages/de.ts          | 14 +++
 .../src/translations/languages/en.ts          | 14 +++
 .../src/translations/languages/es.ts          | 14 +++
 .../src/translations/languages/et.ts          | 14 +++
 .../src/translations/languages/fa.ts          | 14 +++
 .../src/translations/languages/fr.ts          | 14 +++
 .../src/translations/languages/he.ts          | 14 +++
 .../src/translations/languages/hr.ts          | 14 +++
 .../src/translations/languages/hu.ts          | 14 +++
 .../src/translations/languages/hy.ts          | 14 +++
 .../src/translations/languages/it.ts          | 14 +++
 .../src/translations/languages/ja.ts          | 14 +++
 .../src/translations/languages/ko.ts          | 14 +++
 .../src/translations/languages/lt.ts          | 14 +++
 .../src/translations/languages/my.ts          | 14 +++
 .../src/translations/languages/nb.ts          | 14 +++
 .../src/translations/languages/nl.ts          | 14 +++
 .../src/translations/languages/pl.ts          | 14 +++
 .../src/translations/languages/pt.ts          | 14 +++
 .../src/translations/languages/rn.sh          |  3 +
 .../src/translations/languages/ro.ts          | 14 +++
 .../src/translations/languages/rs.ts          | 14 +++
 .../src/translations/languages/rsLatin.ts     | 14 +++
 .../src/translations/languages/ru.ts          | 14 +++
 .../src/translations/languages/sk.ts          | 14 +++
 .../src/translations/languages/sl.ts          | 14 +++
 .../src/translations/languages/sv.ts          | 14 +++
 .../src/translations/languages/th.ts          | 14 +++
 .../src/translations/languages/tr.ts          | 14 +++
 .../src/translations/languages/uk.ts          | 14 +++
 .../src/translations/languages/vi.ts          | 14 +++
 .../src/translations/languages/zh.ts          | 13 +++
 .../src/translations/languages/zhTw.ts        | 14 +++
 .../src/translations/types.ts                 | 12 +++
 packages/richtext-lexical/package.json        |  3 +-
 packages/translations/.env.example            |  1 -
 packages/translations/package.json            |  3 +-
 .../scripts/translateNewKeys/run.ts           | 32 -------
 pnpm-lock.yaml                                | 13 +++
 test/plugin-multi-tenant/config.ts            |  2 +-
 tools/.env.example                            |  1 +
 tools/scripts/package.json                    | 12 ++-
 .../scripts/src/generateTranslations/core.ts  | 31 ++++++
 .../plugin-multi-tenant.ts                    | 39 ++++++++
 .../generateTranslations/richtext-lexical.ts  | 39 ++++----
 .../utils}/applyEslintFixes.ts                |  0
 .../utils}/findMissingKeys.ts                 |  4 +-
 .../utils}/generateTsObjectLiteral.ts         |  6 +-
 .../src/generateTranslations/utils}/index.ts  | 50 ++++++----
 .../generateTranslations/utils}/sortKeys.ts   |  0
 .../utils}/translateText.ts                   |  2 +-
 tools/scripts/src/index.ts                    |  0
 tools/scripts/tsconfig.build.json             | 12 +++
 tools/scripts/tsconfig.json                   |  3 +-
 tsconfig.base.json                            |  8 +-
 69 files changed, 1028 insertions(+), 93 deletions(-)
 create mode 100644 packages/plugin-multi-tenant/src/components/WatchTenantCollection/index.tsx
 create mode 100644 packages/plugin-multi-tenant/src/translations/index.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/ar.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/az.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/bg.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/ca.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/cs.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/da.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/de.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/en.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/es.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/et.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/fa.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/fr.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/he.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/hr.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/hu.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/hy.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/it.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/ja.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/ko.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/lt.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/my.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/nb.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/nl.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/pl.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/pt.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/rn.sh
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/ro.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/rs.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/rsLatin.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/ru.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/sk.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/sl.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/sv.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/th.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/tr.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/uk.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/vi.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/zh.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/languages/zhTw.ts
 create mode 100644 packages/plugin-multi-tenant/src/translations/types.ts
 delete mode 100644 packages/translations/.env.example
 delete mode 100644 packages/translations/scripts/translateNewKeys/run.ts
 create mode 100644 tools/.env.example
 create mode 100644 tools/scripts/src/generateTranslations/core.ts
 create mode 100644 tools/scripts/src/generateTranslations/plugin-multi-tenant.ts
 rename packages/richtext-lexical/scripts/translateNewKeys.ts => tools/scripts/src/generateTranslations/richtext-lexical.ts (56%)
 rename {packages/translations/scripts/translateNewKeys => tools/scripts/src/generateTranslations/utils}/applyEslintFixes.ts (100%)
 rename {packages/translations/scripts/translateNewKeys => tools/scripts/src/generateTranslations/utils}/findMissingKeys.ts (86%)
 rename {packages/translations/scripts/translateNewKeys => tools/scripts/src/generateTranslations/utils}/generateTsObjectLiteral.ts (73%)
 rename {packages/translations/scripts/translateNewKeys => tools/scripts/src/generateTranslations/utils}/index.ts (84%)
 rename {packages/translations/scripts/translateNewKeys => tools/scripts/src/generateTranslations/utils}/sortKeys.ts (100%)
 rename {packages/translations/scripts/translateNewKeys => tools/scripts/src/generateTranslations/utils}/translateText.ts (95%)
 delete mode 100644 tools/scripts/src/index.ts
 create mode 100644 tools/scripts/tsconfig.build.json

diff --git a/eslint.config.js b/eslint.config.js
index b63fa17cc4..f808f18b4d 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -74,6 +74,7 @@ export const rootEslintConfig = [
       'no-console': 'off',
       'perfectionist/sort-object-types': 'off',
       'perfectionist/sort-objects': 'off',
+      'payload/no-relative-monorepo-imports': 'off',
     },
   },
 ]
diff --git a/packages/plugin-multi-tenant/package.json b/packages/plugin-multi-tenant/package.json
index 573c98b489..fb4d6e804d 100644
--- a/packages/plugin-multi-tenant/package.json
+++ b/packages/plugin-multi-tenant/package.json
@@ -56,6 +56,16 @@
       "import": "./src/exports/utilities.ts",
       "types": "./src/exports/utilities.ts",
       "default": "./src/exports/utilities.ts"
+    },
+    "./translations/languages/all": {
+      "import": "./src/translations/index.ts",
+      "types": "./src/translations/index.ts",
+      "default": "./src/translations/index.ts"
+    },
+    "./translations/languages/*": {
+      "import": "./src/translations/languages/*.ts",
+      "types": "./src/translations/languages/*.ts",
+      "default": "./src/translations/languages/*.ts"
     }
   },
   "main": "./src/index.ts",
@@ -118,6 +128,16 @@
         "import": "./dist/exports/utilities.js",
         "types": "./dist/exports/utilities.d.ts",
         "default": "./dist/exports/utilities.js"
+      },
+      "./translations/languages/all": {
+        "import": "./dist/translations/index.js",
+        "types": "./dist/translations/index.d.ts",
+        "default": "./dist/translations/index.js"
+      },
+      "./translations/languages/*": {
+        "import": "./dist/translations/languages/*.js",
+        "types": "./dist/translations/languages/*.d.ts",
+        "default": "./dist/translations/languages/*.js"
       }
     },
     "main": "./dist/index.js",
diff --git a/packages/plugin-multi-tenant/src/components/TenantSelector/index.tsx b/packages/plugin-multi-tenant/src/components/TenantSelector/index.tsx
index 38d11df84a..16cba01693 100644
--- a/packages/plugin-multi-tenant/src/components/TenantSelector/index.tsx
+++ b/packages/plugin-multi-tenant/src/components/TenantSelector/index.tsx
@@ -3,18 +3,52 @@ import type { ReactSelectOption } from '@payloadcms/ui'
 import type { ViewTypes } from 'payload'
 
 import { getTranslation } from '@payloadcms/translations'
-import { SelectInput, useTranslation } from '@payloadcms/ui'
+import {
+  ConfirmationModal,
+  SelectInput,
+  Translation,
+  useModal,
+  useTranslation,
+} from '@payloadcms/ui'
 import React from 'react'
 
+import type {
+  PluginMultiTenantTranslationKeys,
+  PluginMultiTenantTranslations,
+} from '../../translations/index.js'
+
 import { useTenantSelection } from '../../providers/TenantSelectionProvider/index.client.js'
 import './index.scss'
 
-export const TenantSelector = ({ label, viewType }: { label: string; viewType?: ViewTypes }) => {
-  const { options, selectedTenantID, setTenant } = useTenantSelection()
-  const { i18n } = useTranslation()
+const confirmSwitchTenantSlug = 'confirmSwitchTenant'
 
-  const handleChange = React.useCallback(
-    (option: ReactSelectOption | ReactSelectOption[]) => {
+export const TenantSelector = ({ label, viewType }: { label: string; viewType?: ViewTypes }) => {
+  const { options, preventRefreshOnChange, selectedTenantID, setTenant } = useTenantSelection()
+  const { openModal } = useModal()
+  const { i18n, t } = useTranslation<
+    PluginMultiTenantTranslations,
+    PluginMultiTenantTranslationKeys
+  >()
+  const [tenantSelection, setTenantSelection] = React.useState<
+    ReactSelectOption | ReactSelectOption[]
+  >()
+
+  const selectedValue = React.useMemo(() => {
+    if (selectedTenantID) {
+      return options.find((option) => option.value === selectedTenantID)
+    }
+    return undefined
+  }, [options, selectedTenantID])
+
+  const newSelectedValue = React.useMemo(() => {
+    if (tenantSelection && 'value' in tenantSelection) {
+      return options.find((option) => option.value === tenantSelection.value)
+    }
+    return undefined
+  }, [options, tenantSelection])
+
+  const switchTenant = React.useCallback(
+    (option: ReactSelectOption | ReactSelectOption[] | undefined) => {
       if (option && 'value' in option) {
         setTenant({ id: option.value as string, refresh: true })
       } else {
@@ -24,6 +58,19 @@ export const TenantSelector = ({ label, viewType }: { label: string; viewType?:
     [setTenant],
   )
 
+  const onChange = React.useCallback(
+    (option: ReactSelectOption | ReactSelectOption[]) => {
+      if (!preventRefreshOnChange) {
+        switchTenant(option)
+        return
+      } else {
+        setTenantSelection(option)
+        openModal(confirmSwitchTenantSlug)
+      }
+    },
+    [openModal, preventRefreshOnChange, switchTenant],
+  )
+
   if (options.length <= 1) {
     return null
   }
@@ -34,11 +81,46 @@ export const TenantSelector = ({ label, viewType }: { label: string; viewType?:
         isClearable={viewType === 'list'}
         label={getTranslation(label, i18n)}
         name="setTenant"
-        onChange={handleChange}
+        onChange={onChange}
         options={options}
         path="setTenant"
         value={selectedTenantID as string | undefined}
       />
+
+      <ConfirmationModal
+        body={
+          <Translation
+            elements={{
+              0: ({ children }) => {
+                return <b>{children}</b>
+              },
+            }}
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-expect-error
+            i18nKey="plugin-multi-tenant:confirm-tenant-switch--body"
+            t={t}
+            variables={{
+              fromTenant: selectedValue?.label,
+              toTenant: newSelectedValue?.label,
+            }}
+          />
+        }
+        heading={
+          <Translation
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-expect-error
+            i18nKey="plugin-multi-tenant:confirm-tenant-switch--heading"
+            t={t}
+            variables={{
+              tenantLabel: label.toLowerCase(),
+            }}
+          />
+        }
+        modalSlug={confirmSwitchTenantSlug}
+        onConfirm={() => {
+          switchTenant(tenantSelection)
+        }}
+      />
     </div>
   )
 }
diff --git a/packages/plugin-multi-tenant/src/components/WatchTenantCollection/index.tsx b/packages/plugin-multi-tenant/src/components/WatchTenantCollection/index.tsx
new file mode 100644
index 0000000000..b20a559b31
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/components/WatchTenantCollection/index.tsx
@@ -0,0 +1,35 @@
+'use client'
+
+import type { ClientCollectionConfig } from 'payload'
+
+import { useConfig, useDocumentInfo, useEffectEvent, useFormFields } from '@payloadcms/ui'
+import React from 'react'
+
+import { useTenantSelection } from '../../providers/TenantSelectionProvider/index.client.js'
+
+export const WatchTenantCollection = () => {
+  const { id, collectionSlug, title } = useDocumentInfo()
+  const { getEntityConfig } = useConfig()
+  const [useAsTitleName] = React.useState(
+    () => (getEntityConfig({ collectionSlug }) as ClientCollectionConfig).admin.useAsTitle,
+  )
+  const titleField = useFormFields(([fields]) => fields[useAsTitleName])
+
+  const { updateTenants } = useTenantSelection()
+
+  const syncTenantTitle = useEffectEvent(() => {
+    if (id) {
+      updateTenants({ id, label: title })
+    }
+  })
+
+  React.useEffect(() => {
+    // only update the tenant selector when the document saves
+    // → aka when initial value changes
+    if (id && titleField?.initialValue) {
+      syncTenantTitle()
+    }
+  }, [id, titleField?.initialValue])
+
+  return null
+}
diff --git a/packages/plugin-multi-tenant/src/exports/client.ts b/packages/plugin-multi-tenant/src/exports/client.ts
index cd6fb65b94..d14df7a70c 100644
--- a/packages/plugin-multi-tenant/src/exports/client.ts
+++ b/packages/plugin-multi-tenant/src/exports/client.ts
@@ -1,3 +1,4 @@
 export { TenantField } from '../components/TenantField/index.client.js'
 export { TenantSelector } from '../components/TenantSelector/index.js'
+export { WatchTenantCollection } from '../components/WatchTenantCollection/index.js'
 export { useTenantSelection } from '../providers/TenantSelectionProvider/index.client.js'
diff --git a/packages/plugin-multi-tenant/src/index.ts b/packages/plugin-multi-tenant/src/index.ts
index 6d5bf30859..4b47f24594 100644
--- a/packages/plugin-multi-tenant/src/index.ts
+++ b/packages/plugin-multi-tenant/src/index.ts
@@ -1,6 +1,9 @@
 import type { AcceptedLanguages } from '@payloadcms/translations'
 import type { CollectionConfig, Config } from 'payload'
 
+import { deepMergeSimple } from 'payload'
+
+import type { PluginDefaultTranslationsObject } from './translations/types.js'
 import type { MultiTenantPluginConfig } from './types.js'
 
 import { defaults } from './defaults.js'
@@ -10,6 +13,7 @@ import { addTenantCleanup } from './hooks/afterTenantDelete.js'
 import { filterDocumentsBySelectedTenant } from './list-filters/filterDocumentsBySelectedTenant.js'
 import { filterTenantsBySelectedTenant } from './list-filters/filterTenantsBySelectedTenant.js'
 import { filterUsersBySelectedTenant } from './list-filters/filterUsersBySelectedTenant.js'
+import { translations } from './translations/index.js'
 import { addCollectionAccess } from './utilities/addCollectionAccess.js'
 import { addFilterOptionsToFields } from './utilities/addFilterOptionsToFields.js'
 import { combineListFilters } from './utilities/combineListFilters.js'
@@ -229,6 +233,21 @@ export const multiTenantPlugin =
             usersTenantsArrayTenantFieldName: tenantsArrayTenantFieldName,
           })
         }
+
+        /**
+         * Add custom tenant field that watches and dispatches updates to the selector
+         */
+        collection.fields.push({
+          name: '_watchTenant',
+          type: 'ui',
+          admin: {
+            components: {
+              Field: {
+                path: '@payloadcms/plugin-multi-tenant/client#WatchTenantCollection',
+              },
+            },
+          },
+        })
       } else if (pluginConfig.collections?.[collection.slug]) {
         const isGlobal = Boolean(pluginConfig.collections[collection.slug]?.isGlobal)
 
@@ -340,5 +359,25 @@ export const multiTenantPlugin =
       path: '@payloadcms/plugin-multi-tenant/client#TenantSelector',
     })
 
+    /**
+     * Merge plugin translations
+     */
+
+    const simplifiedTranslations = Object.entries(translations).reduce(
+      (acc, [key, value]) => {
+        acc[key] = value.translations
+        return acc
+      },
+      {} as Record<string, PluginDefaultTranslationsObject>,
+    )
+
+    incomingConfig.i18n = {
+      ...incomingConfig.i18n,
+      translations: deepMergeSimple(
+        simplifiedTranslations,
+        incomingConfig.i18n?.translations ?? {},
+      ),
+    }
+
     return incomingConfig
   }
diff --git a/packages/plugin-multi-tenant/src/providers/TenantSelectionProvider/index.client.tsx b/packages/plugin-multi-tenant/src/providers/TenantSelectionProvider/index.client.tsx
index 4aad06e231..be7828e36b 100644
--- a/packages/plugin-multi-tenant/src/providers/TenantSelectionProvider/index.client.tsx
+++ b/packages/plugin-multi-tenant/src/providers/TenantSelectionProvider/index.client.tsx
@@ -11,6 +11,7 @@ type ContextType = {
    * Array of options to select from
    */
   options: OptionObject[]
+  preventRefreshOnChange: boolean
   /**
    * The currently selected tenant ID
    */
@@ -28,20 +29,26 @@ type ContextType = {
    * @param args.refresh - Whether to refresh the page after changing the tenant
    */
   setTenant: (args: { id: number | string | undefined; refresh?: boolean }) => void
+  /**
+   *
+   */
+  updateTenants: (args: { id: number | string; label: string }) => void
 }
 
 const Context = createContext<ContextType>({
   options: [],
+  preventRefreshOnChange: false,
   selectedTenantID: undefined,
   setPreventRefreshOnChange: () => null,
   setTenant: () => null,
+  updateTenants: () => null,
 })
 
 export const TenantSelectionProviderClient = ({
   children,
   initialValue,
   tenantCookie,
-  tenantOptions,
+  tenantOptions: tenantOptionsFromProps,
 }: {
   children: React.ReactNode
   initialValue?: number | string
@@ -54,6 +61,9 @@ export const TenantSelectionProviderClient = ({
   const [preventRefreshOnChange, setPreventRefreshOnChange] = React.useState(false)
   const { user } = useAuth()
   const userID = React.useMemo(() => user?.id, [user?.id])
+  const [tenantOptions, setTenantOptions] = React.useState<OptionObject[]>(
+    () => tenantOptionsFromProps,
+  )
   const selectedTenantLabel = React.useMemo(
     () => tenantOptions.find((option) => option.value === selectedTenantID)?.label,
     [selectedTenantID, tenantOptions],
@@ -91,6 +101,20 @@ export const TenantSelectionProviderClient = ({
     [deleteCookie, preventRefreshOnChange, router, setCookie, setSelectedTenantID, tenantOptions],
   )
 
+  const updateTenants = React.useCallback<ContextType['updateTenants']>(({ id, label }) => {
+    setTenantOptions((prev) => {
+      return prev.map((currentTenant) => {
+        if (id === currentTenant.value) {
+          return {
+            label,
+            value: id,
+          }
+        }
+        return currentTenant
+      })
+    })
+  }, [])
+
   React.useEffect(() => {
     if (selectedTenantID && !tenantOptions.find((option) => option.value === selectedTenantID)) {
       if (tenantOptions?.[0]?.value) {
@@ -105,13 +129,14 @@ export const TenantSelectionProviderClient = ({
     if (userID && !tenantCookie) {
       // User is logged in, but does not have a tenant cookie, set it
       setSelectedTenantID(initialValue)
+      setTenantOptions(tenantOptionsFromProps)
       if (initialValue) {
         setCookie(String(initialValue))
       } else {
         deleteCookie()
       }
     }
-  }, [userID, tenantCookie, initialValue, setCookie, deleteCookie, router])
+  }, [userID, tenantCookie, initialValue, setCookie, deleteCookie, router, tenantOptionsFromProps])
 
   React.useEffect(() => {
     if (!userID && tenantCookie) {
@@ -132,9 +157,11 @@ export const TenantSelectionProviderClient = ({
       <Context
         value={{
           options: tenantOptions,
+          preventRefreshOnChange,
           selectedTenantID,
           setPreventRefreshOnChange,
           setTenant,
+          updateTenants,
         }}
       >
         {children}
diff --git a/packages/plugin-multi-tenant/src/translations/index.ts b/packages/plugin-multi-tenant/src/translations/index.ts
new file mode 100644
index 0000000000..f8e7816818
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/index.ts
@@ -0,0 +1,91 @@
+import type {
+  GenericTranslationsObject,
+  NestedKeysStripped,
+  SupportedLanguages,
+} from '@payloadcms/translations'
+
+import type { PluginDefaultTranslationsObject } from './types.js'
+
+import { ar } from './languages/ar.js'
+import { az } from './languages/az.js'
+import { bg } from './languages/bg.js'
+import { ca } from './languages/ca.js'
+import { cs } from './languages/cs.js'
+import { da } from './languages/da.js'
+import { de } from './languages/de.js'
+import { en } from './languages/en.js'
+import { es } from './languages/es.js'
+import { et } from './languages/et.js'
+import { fa } from './languages/fa.js'
+import { fr } from './languages/fr.js'
+import { he } from './languages/he.js'
+import { hr } from './languages/hr.js'
+import { hu } from './languages/hu.js'
+import { hy } from './languages/hy.js'
+import { it } from './languages/it.js'
+import { ja } from './languages/ja.js'
+import { ko } from './languages/ko.js'
+import { lt } from './languages/lt.js'
+import { my } from './languages/my.js'
+import { nb } from './languages/nb.js'
+import { nl } from './languages/nl.js'
+import { pl } from './languages/pl.js'
+import { pt } from './languages/pt.js'
+import { ro } from './languages/ro.js'
+import { rs } from './languages/rs.js'
+import { rsLatin } from './languages/rsLatin.js'
+import { ru } from './languages/ru.js'
+import { sk } from './languages/sk.js'
+import { sl } from './languages/sl.js'
+import { sv } from './languages/sv.js'
+import { th } from './languages/th.js'
+import { tr } from './languages/tr.js'
+import { uk } from './languages/uk.js'
+import { vi } from './languages/vi.js'
+import { zh } from './languages/zh.js'
+import { zhTw } from './languages/zhTw.js'
+
+export const translations = {
+  ar,
+  az,
+  bg,
+  ca,
+  cs,
+  da,
+  de,
+  en,
+  es,
+  et,
+  fa,
+  fr,
+  he,
+  hr,
+  hu,
+  hy,
+  it,
+  ja,
+  ko,
+  lt,
+  my,
+  nb,
+  nl,
+  pl,
+  pt,
+  ro,
+  rs,
+  'rs-latin': rsLatin,
+  ru,
+  sk,
+  sl,
+  sv,
+  th,
+  tr,
+  uk,
+  vi,
+  zh,
+  'zh-TW': zhTw,
+} as SupportedLanguages<PluginDefaultTranslationsObject>
+
+export type PluginMultiTenantTranslations = GenericTranslationsObject
+
+export type PluginMultiTenantTranslationKeys = NestedKeysStripped<PluginMultiTenantTranslations>
diff --git a/packages/plugin-multi-tenant/src/translations/languages/ar.ts b/packages/plugin-multi-tenant/src/translations/languages/ar.ts
new file mode 100644
index 0000000000..ff50feeb56
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/ar.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const arTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'أنت على وشك تغيير الملكية من <0>{{fromTenant}}</0> إلى <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': 'تأكيد تغيير {{tenantLabel}}',
+  },
+}
+
+export const ar: PluginLanguage = {
+  dateFNSKey: 'ar',
+  translations: arTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/az.ts b/packages/plugin-multi-tenant/src/translations/languages/az.ts
new file mode 100644
index 0000000000..3c7ace19b4
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/az.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const azTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'Siz <0>{{fromTenant}}</0> mülkiyyətini <0>{{toTenant}}</0> mülkiyyətinə dəyişdirəcəksiniz.',
+    'confirm-tenant-switch--heading': '{{tenantLabel}} dəyişikliyini təsdiqləyin',
+  },
+}
+
+export const az: PluginLanguage = {
+  dateFNSKey: 'az',
+  translations: azTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/bg.ts b/packages/plugin-multi-tenant/src/translations/languages/bg.ts
new file mode 100644
index 0000000000..488b0b9b1a
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/bg.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const bgTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'Предстои да промените собствеността от <0>{{fromTenant}}</0> на <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': 'Потвърдете промяната на {{tenantLabel}}',
+  },
+}
+
+export const bg: PluginLanguage = {
+  dateFNSKey: 'bg',
+  translations: bgTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/ca.ts b/packages/plugin-multi-tenant/src/translations/languages/ca.ts
new file mode 100644
index 0000000000..0de5a291cf
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/ca.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const caTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'Estàs a punt de canviar la propietat de <0>{{fromTenant}}</0> a <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': 'Confirmeu el canvi de {{tenantLabel}}',
+  },
+}
+
+export const ca: PluginLanguage = {
+  dateFNSKey: 'ca',
+  translations: caTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/cs.ts b/packages/plugin-multi-tenant/src/translations/languages/cs.ts
new file mode 100644
index 0000000000..30d024ad51
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/cs.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const csTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'Chystáte se změnit vlastnictví z <0>{{fromTenant}}</0> na <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': 'Potvrďte změnu {{tenantLabel}}',
+  },
+}
+
+export const cs: PluginLanguage = {
+  dateFNSKey: 'cs',
+  translations: csTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/da.ts b/packages/plugin-multi-tenant/src/translations/languages/da.ts
new file mode 100644
index 0000000000..a7c3898058
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/da.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const daTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'Du er ved at ændre ejerskab fra <0>{{fromTenant}}</0> til <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': 'Bekræft {{tenantLabel}} ændring',
+  },
+}
+
+export const da: PluginLanguage = {
+  dateFNSKey: 'da',
+  translations: daTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/de.ts b/packages/plugin-multi-tenant/src/translations/languages/de.ts
new file mode 100644
index 0000000000..d36e28346a
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/de.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const deTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'Sie sind dabei, den Besitz von <0>{{fromTenant}}</0> auf <0>{{toTenant}}</0> zu übertragen.',
+    'confirm-tenant-switch--heading': 'Bestätigen Sie die Änderung von {{tenantLabel}}.',
+  },
+}
+
+export const de: PluginLanguage = {
+  dateFNSKey: 'de',
+  translations: deTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/en.ts b/packages/plugin-multi-tenant/src/translations/languages/en.ts
new file mode 100644
index 0000000000..4e790e89d8
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/en.ts
@@ -0,0 +1,14 @@
+import type { PluginLanguage } from '../types.js'
+
+export const enTranslations = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'You are about to change ownership from <0>{{fromTenant}}</0> to <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': 'Confirm {{tenantLabel}} change',
+  },
+}
+
+export const en: PluginLanguage = {
+  dateFNSKey: 'en-US',
+  translations: enTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/es.ts b/packages/plugin-multi-tenant/src/translations/languages/es.ts
new file mode 100644
index 0000000000..4e72ff9d0b
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/es.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const esTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'Está a punto de cambiar la propiedad de <0>{{fromTenant}}</0> a <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': 'Confirme el cambio de {{tenantLabel}}',
+  },
+}
+
+export const es: PluginLanguage = {
+  dateFNSKey: 'es',
+  translations: esTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/et.ts b/packages/plugin-multi-tenant/src/translations/languages/et.ts
new file mode 100644
index 0000000000..1b86bf72a5
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/et.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const etTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'Te olete tegemas omandiõiguse muudatust <0>{{fromTenant}}</0>lt <0>{{toTenant}}</0>le.',
+    'confirm-tenant-switch--heading': 'Kinnita {{tenantLabel}} muutus',
+  },
+}
+
+export const et: PluginLanguage = {
+  dateFNSKey: 'et',
+  translations: etTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/fa.ts b/packages/plugin-multi-tenant/src/translations/languages/fa.ts
new file mode 100644
index 0000000000..d64610a729
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/fa.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const faTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'شما در حال تغییر مالکیت از <0>{{fromTenant}}</0> به <0>{{toTenant}}</0> هستید',
+    'confirm-tenant-switch--heading': 'تایید تغییر {{tenantLabel}}',
+  },
+}
+
+export const fa: PluginLanguage = {
+  dateFNSKey: 'fa-IR',
+  translations: faTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/fr.ts b/packages/plugin-multi-tenant/src/translations/languages/fr.ts
new file mode 100644
index 0000000000..720cb3d797
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/fr.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const frTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'Vous êtes sur le point de changer la propriété de <0>{{fromTenant}}</0> à <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': 'Confirmer le changement de {{tenantLabel}}',
+  },
+}
+
+export const fr: PluginLanguage = {
+  dateFNSKey: 'fr',
+  translations: frTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/he.ts b/packages/plugin-multi-tenant/src/translations/languages/he.ts
new file mode 100644
index 0000000000..1a522ec86f
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/he.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const heTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'אתה עומד לשנות בעלות מ- <0>{{fromTenant}}</0> ל- <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': 'אשר שינוי {{tenantLabel}}',
+  },
+}
+
+export const he: PluginLanguage = {
+  dateFNSKey: 'he',
+  translations: heTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/hr.ts b/packages/plugin-multi-tenant/src/translations/languages/hr.ts
new file mode 100644
index 0000000000..292ec35218
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/hr.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const hrTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'Upravo ćete promijeniti vlasništvo sa <0>{{fromTenant}}</0> na <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': 'Potvrdi promjenu {{tenantLabel}}',
+  },
+}
+
+export const hr: PluginLanguage = {
+  dateFNSKey: 'hr',
+  translations: hrTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/hu.ts b/packages/plugin-multi-tenant/src/translations/languages/hu.ts
new file mode 100644
index 0000000000..5e7a03bf2e
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/hu.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const huTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'Ön azon van, hogy megváltoztassa a tulajdonjogot <0>{{fromTenant}}</0>-ről <0>{{toTenant}}</0>-re.',
+    'confirm-tenant-switch--heading': 'Erősítse meg a(z) {{tenantLabel}} változtatást',
+  },
+}
+
+export const hu: PluginLanguage = {
+  dateFNSKey: 'hu',
+  translations: huTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/hy.ts b/packages/plugin-multi-tenant/src/translations/languages/hy.ts
new file mode 100644
index 0000000000..e46f11ac5f
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/hy.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const hyTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'Դուք պատրաստ եք փոխել գերեցդիմատնին ընկերությունը <0>{{fromTenant}}</0>-ից <0>{{toTenant}}</0>-ին',
+    'confirm-tenant-switch--heading': 'Հաստատեք {{tenantLabel}} փոփոխությունը',
+  },
+}
+
+export const hy: PluginLanguage = {
+  dateFNSKey: 'hy-AM',
+  translations: hyTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/it.ts b/packages/plugin-multi-tenant/src/translations/languages/it.ts
new file mode 100644
index 0000000000..af0ce98a75
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/it.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const itTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'Stai per cambiare proprietà da <0>{{fromTenant}}</0> a <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': 'Conferma il cambiamento di {{tenantLabel}}',
+  },
+}
+
+export const it: PluginLanguage = {
+  dateFNSKey: 'it',
+  translations: itTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/ja.ts b/packages/plugin-multi-tenant/src/translations/languages/ja.ts
new file mode 100644
index 0000000000..23adbe4131
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/ja.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const jaTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'あなたは所有権を<0>{{fromTenant}}</0>から<0>{{toTenant}}</0>へ変更しようとしています',
+    'confirm-tenant-switch--heading': '{{tenantLabel}}の変更を確認してください',
+  },
+}
+
+export const ja: PluginLanguage = {
+  dateFNSKey: 'ja',
+  translations: jaTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/ko.ts b/packages/plugin-multi-tenant/src/translations/languages/ko.ts
new file mode 100644
index 0000000000..7836ab8f9e
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/ko.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const koTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      '<0>{{fromTenant}}</0>에서 <0>{{toTenant}}</0>으로 소유권을 변경하려고 합니다.',
+    'confirm-tenant-switch--heading': '{{tenantLabel}} 변경을 확인하세요',
+  },
+}
+
+export const ko: PluginLanguage = {
+  dateFNSKey: 'ko',
+  translations: koTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/lt.ts b/packages/plugin-multi-tenant/src/translations/languages/lt.ts
new file mode 100644
index 0000000000..396855ada9
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/lt.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const ltTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'Jūs ketinate pakeisti nuosavybės teisę iš <0>{{fromTenant}}</0> į <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': 'Patvirtinkite {{tenantLabel}} pakeitimą',
+  },
+}
+
+export const lt: PluginLanguage = {
+  dateFNSKey: 'lt',
+  translations: ltTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/my.ts b/packages/plugin-multi-tenant/src/translations/languages/my.ts
new file mode 100644
index 0000000000..ae1a6349b6
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/my.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const myTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'Anda akan mengubah pemilikan dari <0>{{fromTenant}}</0> ke <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': 'Sahkan perubahan {{tenantLabel}}',
+  },
+}
+
+export const my: PluginLanguage = {
+  dateFNSKey: 'en-US',
+  translations: myTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/nb.ts b/packages/plugin-multi-tenant/src/translations/languages/nb.ts
new file mode 100644
index 0000000000..c7f85e270d
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/nb.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const nbTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'Du er i ferd med å endre eierskap fra <0>{{fromTenant}}</0> til <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': 'Bekreft {{tenantLabel}} endring',
+  },
+}
+
+export const nb: PluginLanguage = {
+  dateFNSKey: 'nb',
+  translations: nbTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/nl.ts b/packages/plugin-multi-tenant/src/translations/languages/nl.ts
new file mode 100644
index 0000000000..21ee10b6d0
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/nl.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const nlTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'U staat op het punt het eigendom te wijzigen van <0>{{fromTenant}}</0> naar <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': 'Bevestig wijziging van {{tenantLabel}}',
+  },
+}
+
+export const nl: PluginLanguage = {
+  dateFNSKey: 'nl',
+  translations: nlTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/pl.ts b/packages/plugin-multi-tenant/src/translations/languages/pl.ts
new file mode 100644
index 0000000000..4f1a732246
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/pl.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const plTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'Za chwilę nastąpi zmiana właściciela z <0>{{fromTenant}}</0> na <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': 'Potwierdź zmianę {{tenantLabel}}',
+  },
+}
+
+export const pl: PluginLanguage = {
+  dateFNSKey: 'pl',
+  translations: plTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/pt.ts b/packages/plugin-multi-tenant/src/translations/languages/pt.ts
new file mode 100644
index 0000000000..1e52af5ec7
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/pt.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const ptTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'Você está prestes a alterar a propriedade de <0>{{fromTenant}}</0> para <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': 'Confirme a alteração de {{tenantLabel}}',
+  },
+}
+
+export const pt: PluginLanguage = {
+  dateFNSKey: 'pt',
+  translations: ptTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/rn.sh b/packages/plugin-multi-tenant/src/translations/languages/rn.sh
new file mode 100644
index 0000000000..ef6b3ed6c4
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/rn.sh
@@ -0,0 +1,3 @@
+for file in *.js; do
+    mv -- "$file" "${file%.js}.ts"
+done
diff --git a/packages/plugin-multi-tenant/src/translations/languages/ro.ts b/packages/plugin-multi-tenant/src/translations/languages/ro.ts
new file mode 100644
index 0000000000..b6a40cd36f
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/ro.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const roTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'Sunteți pe punctul de a schimba proprietatea de la <0>{{fromTenant}}</0> la <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': 'Confirmați schimbarea {{tenantLabel}}',
+  },
+}
+
+export const ro: PluginLanguage = {
+  dateFNSKey: 'ro',
+  translations: roTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/rs.ts b/packages/plugin-multi-tenant/src/translations/languages/rs.ts
new file mode 100644
index 0000000000..19c63dc59e
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/rs.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const rsTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'Upravo ćete promeniti vlasništvo sa <0>{{fromTenant}}</0> na <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': 'Potvrdi promena {{tenantLabel}}',
+  },
+}
+
+export const rs: PluginLanguage = {
+  dateFNSKey: 'rs',
+  translations: rsTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/rsLatin.ts b/packages/plugin-multi-tenant/src/translations/languages/rsLatin.ts
new file mode 100644
index 0000000000..c4f56096f0
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/rsLatin.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const rsLatinTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'Uskoro ćete promeniti vlasništvo sa <0>{{fromTenant}}</0> na <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': 'Potvrdite promenu {{tenantLabel}}',
+  },
+}
+
+export const rsLatin: PluginLanguage = {
+  dateFNSKey: 'rs-Latin',
+  translations: rsLatinTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/ru.ts b/packages/plugin-multi-tenant/src/translations/languages/ru.ts
new file mode 100644
index 0000000000..66bfaa76cb
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/ru.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const ruTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'Вы собираетесь изменить владельца с <0>{{fromTenant}}</0> на <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': 'Подтвердите изменение {{tenantLabel}}',
+  },
+}
+
+export const ru: PluginLanguage = {
+  dateFNSKey: 'ru',
+  translations: ruTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/sk.ts b/packages/plugin-multi-tenant/src/translations/languages/sk.ts
new file mode 100644
index 0000000000..22148c870f
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/sk.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const skTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'Chystáte sa zmeniť vlastníctvo z <0>{{fromTenant}}</0> na <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': 'Potvrďte zmenu {{tenantLabel}}',
+  },
+}
+
+export const sk: PluginLanguage = {
+  dateFNSKey: 'sk',
+  translations: skTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/sl.ts b/packages/plugin-multi-tenant/src/translations/languages/sl.ts
new file mode 100644
index 0000000000..c2f6bb2bf6
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/sl.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const slTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'Ravno ste pred spremembo lastništva iz <0>{{fromTenant}}</0> na <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': 'Potrdi spremembo {{tenantLabel}}',
+  },
+}
+
+export const sl: PluginLanguage = {
+  dateFNSKey: 'sl-SI',
+  translations: slTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/sv.ts b/packages/plugin-multi-tenant/src/translations/languages/sv.ts
new file mode 100644
index 0000000000..fcf4972ff5
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/sv.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const svTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'Du är på väg att ändra ägare från <0>{{fromTenant}}</0> till <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': 'Bekräfta ändring av {{tenantLabel}}',
+  },
+}
+
+export const sv: PluginLanguage = {
+  dateFNSKey: 'sv',
+  translations: svTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/th.ts b/packages/plugin-multi-tenant/src/translations/languages/th.ts
new file mode 100644
index 0000000000..cdfdc45c9a
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/th.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const thTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'คุณกำลังจะเปลี่ยนความเป็นเจ้าของจาก <0>{{fromTenant}}</0> เป็น <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': 'ยืนยันการเปลี่ยนแปลง {{tenantLabel}}',
+  },
+}
+
+export const th: PluginLanguage = {
+  dateFNSKey: 'th',
+  translations: thTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/tr.ts b/packages/plugin-multi-tenant/src/translations/languages/tr.ts
new file mode 100644
index 0000000000..2f969402e2
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/tr.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const trTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      "Sahipliği <0>{{fromTenant}}</0>'den <0>{{toTenant}}</0>'e değiştirmek üzeresiniz.",
+    'confirm-tenant-switch--heading': '{{tenantLabel}} değişikliğini onayla',
+  },
+}
+
+export const tr: PluginLanguage = {
+  dateFNSKey: 'tr',
+  translations: trTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/uk.ts b/packages/plugin-multi-tenant/src/translations/languages/uk.ts
new file mode 100644
index 0000000000..8e0fa89233
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/uk.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const ukTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'Ви збираєтесь змінити власність з <0>{{fromTenant}}</0> на <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': 'Підтвердіть зміну {{tenantLabel}}',
+  },
+}
+
+export const uk: PluginLanguage = {
+  dateFNSKey: 'uk',
+  translations: ukTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/vi.ts b/packages/plugin-multi-tenant/src/translations/languages/vi.ts
new file mode 100644
index 0000000000..e017d9a05e
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/vi.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const viTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      'Bạn đang chuẩn bị chuyển quyền sở hữu từ <0>{{fromTenant}}</0> sang <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': 'Xác nhận thay đổi {{tenantLabel}}',
+  },
+}
+
+export const vi: PluginLanguage = {
+  dateFNSKey: 'vi',
+  translations: viTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/zh.ts b/packages/plugin-multi-tenant/src/translations/languages/zh.ts
new file mode 100644
index 0000000000..047847258c
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/zh.ts
@@ -0,0 +1,13 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const zhTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body': '您即将将所有权从<0>{{fromTenant}}</0>更改为<0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': '确认更改{{tenantLabel}}',
+  },
+}
+
+export const zh: PluginLanguage = {
+  dateFNSKey: 'zh-CN',
+  translations: zhTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/languages/zhTw.ts b/packages/plugin-multi-tenant/src/translations/languages/zhTw.ts
new file mode 100644
index 0000000000..4950b18cb4
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/languages/zhTw.ts
@@ -0,0 +1,14 @@
+import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'
+
+export const zhTwTranslations: PluginDefaultTranslationsObject = {
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body':
+      '您即將將所有權從 <0>{{fromTenant}}</0> 轉移至 <0>{{toTenant}}</0>',
+    'confirm-tenant-switch--heading': '確認{{tenantLabel}}更改',
+  },
+}
+
+export const zhTw: PluginLanguage = {
+  dateFNSKey: 'zh-TW',
+  translations: zhTwTranslations,
+}
diff --git a/packages/plugin-multi-tenant/src/translations/types.ts b/packages/plugin-multi-tenant/src/translations/types.ts
new file mode 100644
index 0000000000..d1750a2c80
--- /dev/null
+++ b/packages/plugin-multi-tenant/src/translations/types.ts
@@ -0,0 +1,12 @@
+import type { Language } from '@payloadcms/translations'
+
+import type { enTranslations } from './languages/en.js'
+
+export type PluginLanguage = Language<{
+  'plugin-multi-tenant': {
+    'confirm-tenant-switch--body': string
+    'confirm-tenant-switch--heading': string
+  }
+}>
+
+export type PluginDefaultTranslationsObject = typeof enTranslations
diff --git a/packages/richtext-lexical/package.json b/packages/richtext-lexical/package.json
index 1766ada144..acd088e2d9 100644
--- a/packages/richtext-lexical/package.json
+++ b/packages/richtext-lexical/package.json
@@ -344,8 +344,7 @@
     "copyfiles": "copyfiles -u 1 \"src/**/*.{html,css,ttf,woff,woff2,eot,svg,jpg,png,json}\" dist/",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "prepublishOnly": "pnpm clean && pnpm turbo build",
-    "translateNewKeys": "node --no-deprecation --import @swc-node/register/esm-register scripts/translateNewKeys.ts"
+    "prepublishOnly": "pnpm clean && pnpm turbo build"
   },
   "lint-staged": {
     "**/package.json": "sort-package-json",
diff --git a/packages/translations/.env.example b/packages/translations/.env.example
deleted file mode 100644
index 22d74139b5..0000000000
--- a/packages/translations/.env.example
+++ /dev/null
@@ -1 +0,0 @@
-OPENAI_KEY=sk-
diff --git a/packages/translations/package.json b/packages/translations/package.json
index ae1b93bcad..384e79efb4 100644
--- a/packages/translations/package.json
+++ b/packages/translations/package.json
@@ -51,8 +51,7 @@
     "clean": "rimraf -g {dist,*.tsbuildinfo}",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "prepublishOnly": "pnpm clean && pnpm turbo build",
-    "translateNewKeys": "node --no-deprecation --import @swc-node/register/esm-register scripts/translateNewKeys/run.ts"
+    "prepublishOnly": "pnpm clean && pnpm turbo build"
   },
   "dependencies": {
     "date-fns": "4.1.0"
diff --git a/packages/translations/scripts/translateNewKeys/run.ts b/packages/translations/scripts/translateNewKeys/run.ts
deleted file mode 100644
index e903614f3d..0000000000
--- a/packages/translations/scripts/translateNewKeys/run.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import path from 'path'
-import { fileURLToPath } from 'url'
-
-import type { AcceptedLanguages, GenericTranslationsObject } from '../../src/types.js'
-
-import { translations } from '../../src/exports/all.js'
-import { enTranslations } from '../../src/languages/en.js'
-import { translateObject } from './index.js'
-
-const filename = fileURLToPath(import.meta.url)
-const dirname = path.dirname(filename)
-
-const allTranslations: {
-  [key in AcceptedLanguages]?: {
-    dateFNSKey: string
-    translations: GenericTranslationsObject
-  }
-} = {}
-
-for (const key of Object.keys(translations)) {
-  allTranslations[key] = {
-    dateFNSKey: translations[key].dateFNSKey,
-    translations: translations[key].translations,
-  }
-}
-
-void translateObject({
-  allTranslationsObject: allTranslations,
-  fromTranslationsObject: enTranslations,
-  //languages: ['de'],
-  targetFolder: path.resolve(dirname, '../../src/languages'),
-})
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0cb2a8f4b4..1c111b1db6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1958,6 +1958,19 @@ importers:
       open:
         specifier: ^10.1.0
         version: 10.1.0
+      payload:
+        specifier: workspace:*
+        version: link:../../packages/payload
+    devDependencies:
+      '@payloadcms/plugin-multi-tenant':
+        specifier: workspace:*
+        version: link:../../packages/plugin-multi-tenant
+      '@payloadcms/richtext-lexical':
+        specifier: workspace:*
+        version: link:../../packages/richtext-lexical
+      '@payloadcms/translations':
+        specifier: workspace:*
+        version: link:../../packages/translations
 
 packages:
 
diff --git a/test/plugin-multi-tenant/config.ts b/test/plugin-multi-tenant/config.ts
index 999de7acbf..1a4bb8b309 100644
--- a/test/plugin-multi-tenant/config.ts
+++ b/test/plugin-multi-tenant/config.ts
@@ -41,7 +41,7 @@ export default buildConfigWithDefaults({
           isGlobal: true,
         },
       },
-      tenantSelectorLabel: 'Sites',
+      tenantSelectorLabel: 'Site',
     }),
   ],
   typescript: {
diff --git a/tools/.env.example b/tools/.env.example
new file mode 100644
index 0000000000..ea5cc2a08b
--- /dev/null
+++ b/tools/.env.example
@@ -0,0 +1 @@
+OPENAI_KEY=sk-your-key-here
\ No newline at end of file
diff --git a/tools/scripts/package.json b/tools/scripts/package.json
index 0b944c34a5..2f949551b5 100644
--- a/tools/scripts/package.json
+++ b/tools/scripts/package.json
@@ -13,9 +13,11 @@
   },
   "main": "src/index.ts",
   "scripts": {
-    "build": "tsc",
+    "build": "tsc --project tsconfig.build.json",
     "build-template-with-local-pkgs": "pnpm runts src/build-template-with-local-pkgs.ts",
     "gen-templates": "pnpm runts src/generate-template-variations.ts",
+    "generateTranslations:core": "node --no-deprecation --import @swc-node/register/esm-register src/generateTranslations/core.ts",
+    "generateTranslations:plugin-multi-tenant": "node --no-deprecation --import @swc-node/register/esm-register src/generateTranslations/plugin-multi-tenant.ts",
     "license-check": "pnpm runts src/license-check.ts",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
@@ -32,6 +34,12 @@
     "create-payload-app": "workspace:*",
     "csv-stringify": "^6.5.2",
     "license-checker": "25.0.1",
-    "open": "^10.1.0"
+    "open": "^10.1.0",
+    "payload": "workspace:*"
+  },
+  "devDependencies": {
+    "@payloadcms/plugin-multi-tenant": "workspace:*",
+    "@payloadcms/richtext-lexical": "workspace:*",
+    "@payloadcms/translations": "workspace:*"
   }
 }
diff --git a/tools/scripts/src/generateTranslations/core.ts b/tools/scripts/src/generateTranslations/core.ts
new file mode 100644
index 0000000000..b4c31cc108
--- /dev/null
+++ b/tools/scripts/src/generateTranslations/core.ts
@@ -0,0 +1,31 @@
+import type { AcceptedLanguages, GenericTranslationsObject } from '@payloadcms/translations'
+
+import { translations } from '@payloadcms/translations/all'
+import { enTranslations } from '@payloadcms/translations/languages/en'
+import path from 'path'
+import { fileURLToPath } from 'url'
+
+import { translateObject } from './utils/index.js'
+
+const filename = fileURLToPath(import.meta.url)
+const dirname = path.dirname(filename)
+
+const allTranslations: {
+  [key in AcceptedLanguages]?: {
+    dateFNSKey: string
+    translations: GenericTranslationsObject
+  }
+} = {}
+
+for (const key of Object.keys(translations) as AcceptedLanguages[]) {
+  allTranslations[key] = {
+    dateFNSKey: translations[key]?.dateFNSKey || 'unknown-date-fns-key',
+    translations: translations[key]?.translations || {},
+  }
+}
+
+void translateObject({
+  allTranslationsObject: allTranslations,
+  fromTranslationsObject: enTranslations,
+  targetFolder: path.resolve(dirname, '../../../../packages/translations/src/languages'),
+})
diff --git a/tools/scripts/src/generateTranslations/plugin-multi-tenant.ts b/tools/scripts/src/generateTranslations/plugin-multi-tenant.ts
new file mode 100644
index 0000000000..91b94c58b7
--- /dev/null
+++ b/tools/scripts/src/generateTranslations/plugin-multi-tenant.ts
@@ -0,0 +1,39 @@
+import type { AcceptedLanguages, GenericTranslationsObject } from '@payloadcms/translations'
+
+import { translations } from '@payloadcms/plugin-multi-tenant/translations/languages/all'
+import { enTranslations } from '@payloadcms/plugin-multi-tenant/translations/languages/en'
+import path from 'path'
+import { fileURLToPath } from 'url'
+
+import { translateObject } from './utils/index.js'
+
+const filename = fileURLToPath(import.meta.url)
+const dirname = path.dirname(filename)
+
+const allTranslations: {
+  [key in AcceptedLanguages]?: {
+    dateFNSKey: string
+    translations: GenericTranslationsObject
+  }
+} = {}
+
+for (const key of Object.keys(translations)) {
+  allTranslations[key as AcceptedLanguages] = {
+    dateFNSKey: translations[key as AcceptedLanguages]?.dateFNSKey ?? 'unknown-date-fns-key',
+    translations: translations[key as AcceptedLanguages]?.translations ?? {},
+  }
+}
+
+void translateObject({
+  allTranslationsObject: allTranslations,
+  fromTranslationsObject: enTranslations,
+  targetFolder: path.resolve(
+    dirname,
+    '../../../../packages/plugin-multi-tenant/src/translations/languages',
+  ),
+  tsFilePrefix: `import type { PluginDefaultTranslationsObject, PluginLanguage } from '../types.js'\n\nexport const {{locale}}Translations: PluginDefaultTranslationsObject = `,
+  tsFileSuffix: `\n\nexport const {{locale}}: PluginLanguage = {
+    dateFNSKey: {{dateFNSKey}},
+    translations: {{locale}}Translations,
+  }  `,
+})
diff --git a/packages/richtext-lexical/scripts/translateNewKeys.ts b/tools/scripts/src/generateTranslations/richtext-lexical.ts
similarity index 56%
rename from packages/richtext-lexical/scripts/translateNewKeys.ts
rename to tools/scripts/src/generateTranslations/richtext-lexical.ts
index 31c27f7803..457ff649a1 100644
--- a/packages/richtext-lexical/scripts/translateNewKeys.ts
+++ b/tools/scripts/src/generateTranslations/richtext-lexical.ts
@@ -8,13 +8,13 @@ import * as fs from 'node:fs'
 import path from 'path'
 import { fileURLToPath } from 'url'
 
-import { translateObject } from '../../translations/scripts/translateNewKeys/index.js'
+import { translateObject } from './utils/index.js'
 const filename = fileURLToPath(import.meta.url)
 const dirname = path.dirname(filename)
 
 // Function to get all files with a specific name recursively in all subdirectories
-function findFilesRecursively(startPath, filter) {
-  let results = []
+function findFilesRecursively(startPath: string, filter: string): string[] {
+  let results: string[] = []
 
   const entries = fs.readdirSync(startPath, { withFileTypes: true })
 
@@ -33,7 +33,10 @@ function findFilesRecursively(startPath, filter) {
   return results
 }
 
-const i18nFilePaths = findFilesRecursively(path.resolve(dirname, '../src'), 'i18n.ts')
+const i18nFilePaths = findFilesRecursively(
+  path.resolve(dirname, '../../../../packages/richtext-lexical/src'),
+  'i18n.ts',
+)
 
 async function translate() {
   for (const i18nFilePath of i18nFilePaths) {
@@ -46,22 +49,26 @@ async function translate() {
       }
     } = {}
     for (const lang in translationsObject) {
-      allTranslations[lang] = {
+      allTranslations[lang as AcceptedLanguages] = {
         dateFNSKey: 'en',
-        translations: translationsObject[lang],
+        translations: translationsObject?.[lang as keyof GenericLanguages] || {},
       }
     }
 
-    console.log('Translating', i18nFilePath)
-    await translateObject({
-      allTranslationsObject: allTranslations,
-      fromTranslationsObject: translationsObject.en,
-      inlineFile: i18nFilePath,
-      tsFilePrefix: `import { GenericLanguages } from '@payloadcms/translations'
-
-export const i18n: Partial<GenericLanguages> = `,
-      tsFileSuffix: ``,
-    })
+    if (translationsObject.en) {
+      console.log('Translating', i18nFilePath)
+      await translateObject({
+        allTranslationsObject: allTranslations,
+        fromTranslationsObject: translationsObject.en,
+        inlineFile: i18nFilePath,
+        tsFilePrefix: `import { GenericLanguages } from '@payloadcms/translations'
+  
+  export const i18n: Partial<GenericLanguages> = `,
+        tsFileSuffix: ``,
+      })
+    } else {
+      console.error(`No English translations found in ${i18nFilePath}`)
+    }
   }
 }
 
diff --git a/packages/translations/scripts/translateNewKeys/applyEslintFixes.ts b/tools/scripts/src/generateTranslations/utils/applyEslintFixes.ts
similarity index 100%
rename from packages/translations/scripts/translateNewKeys/applyEslintFixes.ts
rename to tools/scripts/src/generateTranslations/utils/applyEslintFixes.ts
diff --git a/packages/translations/scripts/translateNewKeys/findMissingKeys.ts b/tools/scripts/src/generateTranslations/utils/findMissingKeys.ts
similarity index 86%
rename from packages/translations/scripts/translateNewKeys/findMissingKeys.ts
rename to tools/scripts/src/generateTranslations/utils/findMissingKeys.ts
index b37bcab103..4e40650695 100644
--- a/packages/translations/scripts/translateNewKeys/findMissingKeys.ts
+++ b/tools/scripts/src/generateTranslations/utils/findMissingKeys.ts
@@ -1,4 +1,4 @@
-import type { GenericTranslationsObject } from '../../src/types.js'
+import type { GenericTranslationsObject } from '@payloadcms/translations'
 
 /**
  * Returns keys which are present in baseObj but not in targetObj
@@ -8,7 +8,7 @@ export function findMissingKeys(
   targetObj: GenericTranslationsObject,
   prefix = '',
 ): string[] {
-  let missingKeys = []
+  let missingKeys: string[] = []
 
   for (const key in baseObj) {
     const baseValue = baseObj[key]
diff --git a/packages/translations/scripts/translateNewKeys/generateTsObjectLiteral.ts b/tools/scripts/src/generateTranslations/utils/generateTsObjectLiteral.ts
similarity index 73%
rename from packages/translations/scripts/translateNewKeys/generateTsObjectLiteral.ts
rename to tools/scripts/src/generateTranslations/utils/generateTsObjectLiteral.ts
index 52fe51a714..4bf3b494db 100644
--- a/packages/translations/scripts/translateNewKeys/generateTsObjectLiteral.ts
+++ b/tools/scripts/src/generateTranslations/utils/generateTsObjectLiteral.ts
@@ -1,5 +1,7 @@
-export function generateTsObjectLiteral(obj: any): string {
-  const lines = []
+import type { JsonObject } from 'payload'
+
+export function generateTsObjectLiteral(obj: JsonObject): string {
+  const lines: string[] = []
   const entries = Object.entries(obj)
   for (const [key, value] of entries) {
     const safeKey = /^[\w$]+$/.test(key) ? key : JSON.stringify(key)
diff --git a/packages/translations/scripts/translateNewKeys/index.ts b/tools/scripts/src/generateTranslations/utils/index.ts
similarity index 84%
rename from packages/translations/scripts/translateNewKeys/index.ts
rename to tools/scripts/src/generateTranslations/utils/index.ts
index 1cdc2ae4f2..b3cb8e8177 100644
--- a/packages/translations/scripts/translateNewKeys/index.ts
+++ b/tools/scripts/src/generateTranslations/utils/index.ts
@@ -1,17 +1,17 @@
 /* eslint no-console: 0 */
 
-import fs from 'fs'
-import path from 'path'
-import { format } from 'prettier'
-
 import type {
   AcceptedLanguages,
   GenericLanguages,
   GenericTranslationsObject,
-} from '../../src/types.js'
+} from '@payloadcms/translations'
+
+import { acceptedLanguages } from '@payloadcms/translations'
+import fs from 'fs'
+import path from 'path'
+import { deepMergeSimple } from 'payload/shared'
+import { format } from 'prettier'
 
-import { deepMergeSimple } from '../../src/utilities/deepMergeSimple.js'
-import { acceptedLanguages } from '../../src/utilities/languages.js'
 import { applyEslintFixes } from './applyEslintFixes.js'
 import { findMissingKeys } from './findMissingKeys.js'
 import { generateTsObjectLiteral } from './generateTsObjectLiteral.js'
@@ -104,16 +104,16 @@ export async function translateObject(props: {
      */
     for (const key of keysWhichDoNotExistInFromlang) {
       // Delete those keys in the target language object obj[lang]
-      const keys = key.split('.')
+      const keys: string[] = key.split('.')
       let targetObj = allTranslatedTranslationsObject?.[targetLang].translations
       for (let i = 0; i < keys.length - 1; i += 1) {
-        const nextObj = targetObj[keys[i]]
+        const nextObj = targetObj[keys[i] as string]
         if (typeof nextObj !== 'object') {
           throw new Error(`Key ${keys[i]} is not an object in ${targetLang} (1)`)
         }
         targetObj = nextObj
       }
-      delete targetObj[keys[keys.length - 1]]
+      delete targetObj[keys[keys.length - 1] as string]
     }
 
     if (!allTranslatedTranslationsObject?.[targetLang].translations) {
@@ -128,7 +128,10 @@ export async function translateObject(props: {
 
     for (const missingKey of missingKeys) {
       const keys: string[] = missingKey.split('.')
-      const sourceText = keys.reduce((acc, key) => acc[key], fromTranslationsObject)
+      const sourceText = keys.reduce(
+        (acc, key) => acc[key] as GenericTranslationsObject,
+        fromTranslationsObject,
+      )
       if (!sourceText || typeof sourceText !== 'string') {
         throw new Error(
           `Missing key ${missingKey} or key not "leaf" in fromTranslationsObject for lang ${targetLang}. (2)`,
@@ -147,20 +150,20 @@ export async function translateObject(props: {
           }
           let targetObj = allOnlyNewTranslatedTranslationsObject?.[targetLang]
           for (let i = 0; i < keys.length - 1; i += 1) {
-            if (!targetObj[keys[i]]) {
-              targetObj[keys[i]] = {}
+            if (!targetObj[keys[i] as string]) {
+              targetObj[keys[i] as string] = {}
             }
-            const nextObj = targetObj[keys[i]]
+            const nextObj = targetObj[keys[i] as string]
             if (typeof nextObj !== 'object') {
               throw new Error(`Key ${keys[i]} is not an object in ${targetLang} (3)`)
             }
             targetObj = nextObj
           }
-          targetObj[keys[keys.length - 1]] = translated
+          targetObj[keys[keys.length - 1] as string] = translated
 
-          allTranslatedTranslationsObject[targetLang].translations = sortKeys(
+          allTranslatedTranslationsObject[targetLang]!.translations = sortKeys(
             deepMergeSimple(
-              allTranslatedTranslationsObject[targetLang].translations,
+              allTranslatedTranslationsObject[targetLang]!.translations,
               allOnlyNewTranslatedTranslationsObject[targetLang],
             ),
           )
@@ -180,9 +183,14 @@ export async function translateObject(props: {
   console.log('New translations:', allOnlyNewTranslatedTranslationsObject)
 
   if (inlineFile?.length) {
-    const simpleTranslationsObject = {}
+    const simpleTranslationsObject: GenericTranslationsObject = {}
     for (const lang in allTranslatedTranslationsObject) {
-      simpleTranslationsObject[lang] = allTranslatedTranslationsObject[lang].translations
+      if (lang in allTranslatedTranslationsObject) {
+        simpleTranslationsObject[lang as keyof typeof allTranslatedTranslationsObject] =
+          allTranslatedTranslationsObject[
+            lang as keyof typeof allTranslatedTranslationsObject
+          ]!.translations
+      }
     }
 
     // write allTranslatedTranslationsObject
@@ -218,10 +226,10 @@ export async function translateObject(props: {
       const filePath = path.resolve(targetFolder, `${sanitizedKey}.ts`)
 
       // prefix & translations
-      let fileContent: string = `${tsFilePrefix.replace('{{locale}}', sanitizedKey)}${generateTsObjectLiteral(allTranslatedTranslationsObject[key].translations)}\n`
+      let fileContent: string = `${tsFilePrefix.replace('{{locale}}', sanitizedKey)}${generateTsObjectLiteral(allTranslatedTranslationsObject[key]?.translations || {})}\n`
 
       // suffix
-      fileContent += `${tsFileSuffix.replaceAll('{{locale}}', sanitizedKey).replaceAll('{{dateFNSKey}}', `'${allTranslatedTranslationsObject[key].dateFNSKey}'`)}\n`
+      fileContent += `${tsFileSuffix.replaceAll('{{locale}}', sanitizedKey).replaceAll('{{dateFNSKey}}', `'${allTranslatedTranslationsObject[key]?.dateFNSKey}'`)}\n`
 
       // eslint
       fileContent = await applyEslintFixes(fileContent, filePath)
diff --git a/packages/translations/scripts/translateNewKeys/sortKeys.ts b/tools/scripts/src/generateTranslations/utils/sortKeys.ts
similarity index 100%
rename from packages/translations/scripts/translateNewKeys/sortKeys.ts
rename to tools/scripts/src/generateTranslations/utils/sortKeys.ts
diff --git a/packages/translations/scripts/translateNewKeys/translateText.ts b/tools/scripts/src/generateTranslations/utils/translateText.ts
similarity index 95%
rename from packages/translations/scripts/translateNewKeys/translateText.ts
rename to tools/scripts/src/generateTranslations/utils/translateText.ts
index e53d3d31d4..d7999e88b4 100644
--- a/packages/translations/scripts/translateNewKeys/translateText.ts
+++ b/tools/scripts/src/generateTranslations/utils/translateText.ts
@@ -4,7 +4,7 @@ import path from 'path'
 const filename = fileURLToPath(import.meta.url)
 const dirname = path.dirname(filename)
 
-dotenv.config({ path: path.resolve(dirname, '../../', '.env') })
+dotenv.config({ path: path.resolve(dirname, '../../../../', '.env') })
 
 export async function translateText(text: string, targetLang: string) {
   const response = await fetch('https://api.openai.com/v1/chat/completions', {
diff --git a/tools/scripts/src/index.ts b/tools/scripts/src/index.ts
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/tools/scripts/tsconfig.build.json b/tools/scripts/tsconfig.build.json
new file mode 100644
index 0000000000..bc25916d0a
--- /dev/null
+++ b/tools/scripts/tsconfig.build.json
@@ -0,0 +1,12 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "strict": true
+  },
+  "references": [
+    { "path": "../../packages/translations" },
+    { "path": "../../packages/richtext-lexical" },
+    { "path": "../../packages/plugin-multi-tenant" }
+  ],
+  "exclude": ["./src/generateTranslations"]
+}
diff --git a/tools/scripts/tsconfig.json b/tools/scripts/tsconfig.json
index f9f8fe292b..e14725842a 100644
--- a/tools/scripts/tsconfig.json
+++ b/tools/scripts/tsconfig.json
@@ -2,5 +2,6 @@
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "strict": true,
-  }
+  },
+  "references": [{ "path": "../../packages/translations" }, { "path": "../../packages/richtext-lexical"}, { "path": "../../packages/plugin-multi-tenant"}]
 }
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 02de03b79e..b2e5e043e1 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -31,7 +31,7 @@
       }
     ],
     "paths": {
-      "@payload-config": ["./test/admin/config.ts"],
+      "@payload-config": ["./test/plugin-multi-tenant/config.ts"],
       "@payloadcms/admin-bar": ["./packages/admin-bar/src"],
       "@payloadcms/live-preview": ["./packages/live-preview/src"],
       "@payloadcms/live-preview-react": ["./packages/live-preview-react/src/index.ts"],
@@ -70,6 +70,12 @@
         "./packages/plugin-multi-tenant/src/exports/client.ts"
       ],
       "@payloadcms/plugin-multi-tenant": ["./packages/plugin-multi-tenant/src/index.ts"],
+      "@payloadcms/plugin-multi-tenant/translations/languages/all": [
+        "./packages/plugin-multi-tenant/src/translations/index.ts"
+      ],
+      "@payloadcms/plugin-multi-tenant/translations/languages/*": [
+        "./packages/plugin-multi-tenant/src/translations/languages/*.ts"
+      ],
       "@payloadcms/next": ["./packages/next/src/exports/*"],
       "@payloadcms/storage-s3/client": ["./packages/storage-s3/src/exports/client.ts"],
       "@payloadcms/storage-vercel-blob/client": [

From 1d5d96d2c374f7b896336b1df0b3f77505dca5cd Mon Sep 17 00:00:00 2001
From: Philipp Schneider <47689073+philipp-tailor@users.noreply.github.com>
Date: Wed, 14 May 2025 18:14:29 +0200
Subject: [PATCH 30/46] perf: actually debounce rich text editor field value
 updates to only process latest state (#12086)

Follow-up work to #12046, which was misnamed. It improved UI
responsiveness of the rich text field on CPU-limited clients, but didn't
actually reduce work by debouncing. It only improved scheduling.

Using `requestIdleCallback` lead to better scheduling of change event
handling in the rich text editor, but on CPU-starved clients, this leads
to a large backlog of unprocessed idle callbacks. Since idle callbacks
are called by the browser in submission order, the latest callback will
be processed last, potentially leading to large time delays between a
user typing, and the form state having been updated. An example: When a
user types "I", and the change events for the character "I" is scheduled
to happen in the next browser idle time, but then the user goes on to
type "love Payload", there will be 12 more callbacks scheduled. On a
slow system it's preferable if the browser right away only processes the
event that has the full editor state "I love Payload", instead of only
processing that after 11 other idle callbacks.

So this code change keeps track when requesting an idle callback and
cancels the previous one when a new change event with an updated editor
state occurs.
---
 packages/richtext-lexical/src/field/Field.tsx | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/packages/richtext-lexical/src/field/Field.tsx b/packages/richtext-lexical/src/field/Field.tsx
index 1f5bc28257..c738920761 100644
--- a/packages/richtext-lexical/src/field/Field.tsx
+++ b/packages/richtext-lexical/src/field/Field.tsx
@@ -12,7 +12,7 @@ import {
   useField,
 } from '@payloadcms/ui'
 import { mergeFieldStyles } from '@payloadcms/ui/shared'
-import React, { useCallback, useEffect, useMemo, useState } from 'react'
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { ErrorBoundary } from 'react-error-boundary'
 
 import type { SanitizedClientEditorConfig } from '../lexical/config/types.js'
@@ -116,16 +116,30 @@ const RichTextComponent: React.FC<
 
   const pathWithEditDepth = `${path}.${editDepth}`
 
-  const updateFieldValue = (editorState: EditorState) => {
-    const newState = editorState.toJSON()
-    prevValueRef.current = newState
-    setValue(newState)
-  }
+  const dispatchFieldUpdateTask = useRef<number>(undefined)
 
   const handleChange = useCallback(
     (editorState: EditorState) => {
+      const updateFieldValue = (editorState: EditorState) => {
+        const newState = editorState.toJSON()
+        prevValueRef.current = newState
+        setValue(newState)
+      }
+
       if (typeof window.requestIdleCallback === 'function') {
-        requestIdleCallback(() => updateFieldValue(editorState))
+        // Cancel earlier scheduled value updates,
+        // so that a CPU-limited event loop isn't flooded with n callbacks for n keystrokes into the rich text field,
+        // but that there's only ever the latest one state update
+        // dispatch task, to be executed with the next idle time,
+        // or the deadline of 500ms.
+        if (typeof window.cancelIdleCallback === 'function' && dispatchFieldUpdateTask.current) {
+          cancelIdleCallback(dispatchFieldUpdateTask.current)
+        }
+        // Schedule the state update to happen the next time the browser has sufficient resources,
+        // or the latest after 500ms.
+        dispatchFieldUpdateTask.current = requestIdleCallback(() => updateFieldValue(editorState), {
+          timeout: 500,
+        })
       } else {
         updateFieldValue(editorState)
       }

From 7130834152d76fe13289df2ca0ae120db2c2adf1 Mon Sep 17 00:00:00 2001
From: Jacob Fletcher <jacobsfletch@gmail.com>
Date: Wed, 14 May 2025 14:10:46 -0400
Subject: [PATCH 31/46] feat: thread overrideAccess through field validations
 (#12399)

Threads the `overrideAccess` property through the field-level
validations. This way custom `validate` functions can be aware of its
value and adjust their logic accordingly.

See #12322 for an example use case.
---
 packages/payload/src/admin/RichText.ts                |  3 +++
 packages/payload/src/collections/operations/create.ts |  4 +---
 packages/payload/src/collections/operations/delete.ts |  1 -
 .../payload/src/collections/operations/deleteByID.ts  |  2 +-
 .../src/collections/operations/local/create.ts        |  1 +
 .../src/collections/operations/local/duplicate.ts     |  1 +
 .../src/collections/operations/utilities/update.ts    |  1 +
 packages/payload/src/fields/config/types.ts           |  5 ++++-
 .../payload/src/fields/hooks/beforeChange/index.ts    |  4 ++++
 .../payload/src/fields/hooks/beforeChange/promise.ts  | 11 +++++++++++
 .../src/fields/hooks/beforeChange/traverseFields.ts   |  3 +++
 packages/richtext-lexical/src/index.ts                |  5 ++++-
 tsconfig.base.json                                    |  2 +-
 13 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/packages/payload/src/admin/RichText.ts b/packages/payload/src/admin/RichText.ts
index 0e2d0501c5..375cff4b90 100644
--- a/packages/payload/src/admin/RichText.ts
+++ b/packages/payload/src/admin/RichText.ts
@@ -65,6 +65,7 @@ export type AfterChangeRichTextHookArgs<
   /** The previous value of the field, before changes */
   previousValue?: TValue
 }
+
 export type BeforeValidateRichTextHookArgs<
   TData extends TypeWithID = any,
   TValue = any,
@@ -102,6 +103,7 @@ export type BeforeChangeRichTextHookArgs<
   mergeLocaleActions?: (() => Promise<void> | void)[]
   /** A string relating to which operation the field type is currently executing within. */
   operation?: 'create' | 'delete' | 'read' | 'update'
+  overrideAccess: boolean
   /** The sibling data of the document before changes being applied. */
   previousSiblingDoc?: TData
   /** The previous value of the field, before changes */
@@ -190,6 +192,7 @@ export type RichTextHooks = {
   beforeChange?: BeforeChangeRichTextHook[]
   beforeValidate?: BeforeValidateRichTextHook[]
 }
+
 type RichTextAdapterBase<
   Value extends object = object,
   AdapterProps = any,
diff --git a/packages/payload/src/collections/operations/create.ts b/packages/payload/src/collections/operations/create.ts
index 9f3e7f5028..95b0e0ac6c 100644
--- a/packages/payload/src/collections/operations/create.ts
+++ b/packages/payload/src/collections/operations/create.ts
@@ -9,9 +9,6 @@ import type {
   TransformCollectionWithSelect,
 } from '../../types/index.js'
 import type {
-  AfterChangeHook,
-  BeforeOperationHook,
-  BeforeValidateHook,
   Collection,
   DataFromCollectionSlug,
   RequiredDataFromCollectionSlug,
@@ -225,6 +222,7 @@ export const createOperation = async <
       docWithLocales: duplicatedFromDocWithLocales,
       global: null,
       operation: 'create',
+      overrideAccess,
       req,
       skipValidation:
         shouldSaveDraft &&
diff --git a/packages/payload/src/collections/operations/delete.ts b/packages/payload/src/collections/operations/delete.ts
index 68a9fecbc3..15d60afbd6 100644
--- a/packages/payload/src/collections/operations/delete.ts
+++ b/packages/payload/src/collections/operations/delete.ts
@@ -5,7 +5,6 @@ import type { AccessResult } from '../../config/types.js'
 import type { CollectionSlug } from '../../index.js'
 import type { PayloadRequest, PopulateType, SelectType, Where } from '../../types/index.js'
 import type {
-  BeforeOperationHook,
   BulkOperationResult,
   Collection,
   DataFromCollectionSlug,
diff --git a/packages/payload/src/collections/operations/deleteByID.ts b/packages/payload/src/collections/operations/deleteByID.ts
index add2bd8445..be3cfe5416 100644
--- a/packages/payload/src/collections/operations/deleteByID.ts
+++ b/packages/payload/src/collections/operations/deleteByID.ts
@@ -6,7 +6,7 @@ import type {
   SelectType,
   TransformCollectionWithSelect,
 } from '../../types/index.js'
-import type { BeforeOperationHook, Collection, DataFromCollectionSlug } from '../config/types.js'
+import type { Collection, DataFromCollectionSlug } from '../config/types.js'
 
 import executeAccess from '../../auth/executeAccess.js'
 import { hasWhereAccessResult } from '../../auth/types.js'
diff --git a/packages/payload/src/collections/operations/local/create.ts b/packages/payload/src/collections/operations/local/create.ts
index 5e66f07638..ba7cb94953 100644
--- a/packages/payload/src/collections/operations/local/create.ts
+++ b/packages/payload/src/collections/operations/local/create.ts
@@ -139,6 +139,7 @@ export default async function createLocal<
     select,
     showHiddenFields,
   } = options
+
   const collection = payload.collections[collectionSlug]
 
   if (!collection) {
diff --git a/packages/payload/src/collections/operations/local/duplicate.ts b/packages/payload/src/collections/operations/local/duplicate.ts
index 7ae8637244..82a9459d3f 100644
--- a/packages/payload/src/collections/operations/local/duplicate.ts
+++ b/packages/payload/src/collections/operations/local/duplicate.ts
@@ -109,6 +109,7 @@ export async function duplicate<
     select,
     showHiddenFields,
   } = options
+
   const collection = payload.collections[collectionSlug]
 
   if (!collection) {
diff --git a/packages/payload/src/collections/operations/utilities/update.ts b/packages/payload/src/collections/operations/utilities/update.ts
index acf6880868..b77948e6cb 100644
--- a/packages/payload/src/collections/operations/utilities/update.ts
+++ b/packages/payload/src/collections/operations/utilities/update.ts
@@ -234,6 +234,7 @@ export const updateDocument = async <
     docWithLocales: undefined,
     global: null,
     operation: 'update',
+    overrideAccess,
     req,
     skipValidation:
       shouldSaveDraft &&
diff --git a/packages/payload/src/fields/config/types.ts b/packages/payload/src/fields/config/types.ts
index a8aec98c94..159d9657b7 100644
--- a/packages/payload/src/fields/config/types.ts
+++ b/packages/payload/src/fields/config/types.ts
@@ -404,7 +404,6 @@ export type LabelsClient = {
 }
 
 export type BaseValidateOptions<TData, TSiblingData, TValue> = {
-  /**
   /**
    * The data of the nearest parent block. If the field is not within a block, `blockData` will be equal to `undefined`.
    */
@@ -414,6 +413,10 @@ export type BaseValidateOptions<TData, TSiblingData, TValue> = {
   event?: 'onChange' | 'submit'
   id?: number | string
   operation?: Operation
+  /**
+   * The `overrideAccess` flag that was attached to the request. This is used to bypass access control checks for fields.
+   */
+  overrideAccess?: boolean
   /**
    * The path of the field, e.g. ["group", "myArray", 1, "textField"]. The path is the schemaPath but with indexes and would be used in the context of field data, not field schemas.
    */
diff --git a/packages/payload/src/fields/hooks/beforeChange/index.ts b/packages/payload/src/fields/hooks/beforeChange/index.ts
index 3df18dbc56..9b7604f841 100644
--- a/packages/payload/src/fields/hooks/beforeChange/index.ts
+++ b/packages/payload/src/fields/hooks/beforeChange/index.ts
@@ -8,6 +8,7 @@ import type { JsonObject, Operation, PayloadRequest } from '../../../types/index
 import { ValidationError } from '../../../errors/index.js'
 import { deepCopyObjectSimple } from '../../../utilities/deepCopyObject.js'
 import { traverseFields } from './traverseFields.js'
+
 export type Args<T extends JsonObject> = {
   collection: null | SanitizedCollectionConfig
   context: RequestContext
@@ -17,6 +18,7 @@ export type Args<T extends JsonObject> = {
   global: null | SanitizedGlobalConfig
   id?: number | string
   operation: Operation
+  overrideAccess?: boolean
   req: PayloadRequest
   skipValidation?: boolean
 }
@@ -39,6 +41,7 @@ export const beforeChange = async <T extends JsonObject>({
   docWithLocales,
   global,
   operation,
+  overrideAccess,
   req,
   skipValidation,
 }: Args<T>): Promise<T> => {
@@ -59,6 +62,7 @@ export const beforeChange = async <T extends JsonObject>({
     global,
     mergeLocaleActions,
     operation,
+    overrideAccess,
     parentIndexPath: '',
     parentIsLocalized: false,
     parentPath: '',
diff --git a/packages/payload/src/fields/hooks/beforeChange/promise.ts b/packages/payload/src/fields/hooks/beforeChange/promise.ts
index 87a323a852..89dee90827 100644
--- a/packages/payload/src/fields/hooks/beforeChange/promise.ts
+++ b/packages/payload/src/fields/hooks/beforeChange/promise.ts
@@ -45,6 +45,7 @@ type Args = {
   id?: number | string
   mergeLocaleActions: (() => Promise<void> | void)[]
   operation: Operation
+  overrideAccess: boolean
   parentIndexPath: string
   parentIsLocalized: boolean
   parentPath: string
@@ -80,6 +81,7 @@ export const promise = async ({
   global,
   mergeLocaleActions,
   operation,
+  overrideAccess,
   parentIndexPath,
   parentIsLocalized,
   parentPath,
@@ -176,6 +178,7 @@ export const promise = async ({
         object,
         object
       >
+
       const validationResult = await validateFn(valueToValidate as never, {
         ...field,
         id,
@@ -186,6 +189,7 @@ export const promise = async ({
         // @ts-expect-error
         jsonError,
         operation,
+        overrideAccess,
         path: pathSegments,
         preferences: { fields: {} },
         previousValue: siblingDoc[field.name],
@@ -261,6 +265,7 @@ export const promise = async ({
               global,
               mergeLocaleActions,
               operation,
+              overrideAccess,
               parentIndexPath: '',
               parentIsLocalized: parentIsLocalized || field.localized,
               parentPath: path + '.' + rowIndex,
@@ -326,6 +331,7 @@ export const promise = async ({
                 global,
                 mergeLocaleActions,
                 operation,
+                overrideAccess,
                 parentIndexPath: '',
                 parentIsLocalized: parentIsLocalized || field.localized,
                 parentPath: path + '.' + rowIndex,
@@ -368,6 +374,7 @@ export const promise = async ({
         global,
         mergeLocaleActions,
         operation,
+        overrideAccess,
         parentIndexPath: indexPath,
         parentIsLocalized,
         parentPath,
@@ -415,6 +422,7 @@ export const promise = async ({
         global,
         mergeLocaleActions,
         operation,
+        overrideAccess,
         parentIndexPath: '',
         parentIsLocalized: parentIsLocalized || field.localized,
         parentPath: path,
@@ -480,6 +488,7 @@ export const promise = async ({
             mergeLocaleActions,
             operation,
             originalDoc: doc,
+            overrideAccess,
             parentIsLocalized,
             path: pathSegments,
             previousSiblingDoc: siblingDoc,
@@ -546,6 +555,7 @@ export const promise = async ({
         global,
         mergeLocaleActions,
         operation,
+        overrideAccess,
         parentIndexPath: isNamedTab ? '' : indexPath,
         parentIsLocalized: parentIsLocalized || field.localized,
         parentPath: isNamedTab ? path : parentPath,
@@ -578,6 +588,7 @@ export const promise = async ({
         global,
         mergeLocaleActions,
         operation,
+        overrideAccess,
         parentIndexPath: indexPath,
         parentIsLocalized,
         parentPath: path,
diff --git a/packages/payload/src/fields/hooks/beforeChange/traverseFields.ts b/packages/payload/src/fields/hooks/beforeChange/traverseFields.ts
index e5f3ac316c..e784355802 100644
--- a/packages/payload/src/fields/hooks/beforeChange/traverseFields.ts
+++ b/packages/payload/src/fields/hooks/beforeChange/traverseFields.ts
@@ -36,6 +36,7 @@ type Args = {
   id?: number | string
   mergeLocaleActions: (() => Promise<void> | void)[]
   operation: Operation
+  overrideAccess: boolean
   parentIndexPath: string
   /**
    * @todo make required in v4.0
@@ -78,6 +79,7 @@ export const traverseFields = async ({
   global,
   mergeLocaleActions,
   operation,
+  overrideAccess,
   parentIndexPath,
   parentIsLocalized,
   parentPath,
@@ -107,6 +109,7 @@ export const traverseFields = async ({
         global,
         mergeLocaleActions,
         operation,
+        overrideAccess,
         parentIndexPath,
         parentIsLocalized,
         parentPath,
diff --git a/packages/richtext-lexical/src/index.ts b/packages/richtext-lexical/src/index.ts
index 4e0fd0083d..31a937a439 100644
--- a/packages/richtext-lexical/src/index.ts
+++ b/packages/richtext-lexical/src/index.ts
@@ -434,6 +434,7 @@ export function lexicalEditor(args?: LexicalEditorProps): LexicalRichTextAdapter
               mergeLocaleActions,
               operation,
               originalDoc,
+              overrideAccess,
               parentIsLocalized,
               path,
               previousValue,
@@ -476,9 +477,11 @@ export function lexicalEditor(args?: LexicalEditorProps): LexicalRichTextAdapter
             if (!originalNodeIDMap || !Object.keys(originalNodeIDMap).length || !value) {
               return value
             }
+
             const previousNodeIDMap: {
               [key: string]: SerializedLexicalNode
             } = {}
+
             const originalNodeWithLocalesIDMap: {
               [key: string]: SerializedLexicalNode
             } = {}
@@ -528,7 +531,6 @@ export function lexicalEditor(args?: LexicalEditorProps): LexicalRichTextAdapter
                     originalNodeWithLocales: originalNodeWithLocalesIDMap[id],
                     parentRichTextFieldPath: path,
                     parentRichTextFieldSchemaPath: schemaPath,
-
                     previousNode: previousNodeIDMap[id]!,
                     req,
                     skipValidation: skipValidation!,
@@ -567,6 +569,7 @@ export function lexicalEditor(args?: LexicalEditorProps): LexicalRichTextAdapter
                     global,
                     mergeLocaleActions: mergeLocaleActions!,
                     operation: operation!,
+                    overrideAccess,
                     parentIndexPath: indexPath.join('-'),
                     parentIsLocalized: parentIsLocalized || field.localized || false,
                     parentPath: path.join('.'),
diff --git a/tsconfig.base.json b/tsconfig.base.json
index b2e5e043e1..12877b1be6 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -31,7 +31,7 @@
       }
     ],
     "paths": {
-      "@payload-config": ["./test/plugin-multi-tenant/config.ts"],
+      "@payload-config": ["./test/_community/config.ts"],
       "@payloadcms/admin-bar": ["./packages/admin-bar/src"],
       "@payloadcms/live-preview": ["./packages/live-preview/src"],
       "@payloadcms/live-preview-react": ["./packages/live-preview-react/src/index.ts"],

From b7b2b390fc9edaf2d5205733789362a5ab94e8af Mon Sep 17 00:00:00 2001
From: Ruslan <rri@medicuja.com>
Date: Wed, 14 May 2025 21:25:02 +0200
Subject: [PATCH 32/46] feat(ui): fixed toolbar group customization (#12108)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

### What

This PR introduces a comprehensive customization system for toolbar
groups in the Lexical Rich Text Editor. It allows developers to override
not just the order, but virtually any aspect of toolbar components (such
as format, align, indent) through the `FixedToolbarFeature`
configuration. Customizable properties include order, icons, group type,
and more.

### Why

Previously, toolbar group configurations were hardcoded in their
respective components with no way to modify them without changing the
source code. This made it difficult for developers to:

1. Reorder toolbar components to match specific UX requirements
2. Replace icons with custom ones to maintain design consistency
3. Transform dropdown groups into button groups or vice versa
4. Apply other customizations needed for specific projects

This enhancement provides full flexibility for tailoring the rich text
editor interface while maintaining a clean and maintainable codebase.

### How

The implementation consists of three key parts:

1. **Enhanced the FixedToolbarFeature API**:
- Added a new `customGroups` property to `FixedToolbarFeatureProps` that
accepts a record mapping group keys to partial `ToolbarGroup` objects
- These partial objects can override any property of the default toolbar
group configuration

2. **Leveraged existing deep merge utility**:
- Used Payload's existing `deepMerge` utility to properly combine
default configurations with custom overrides
- This ensures that only specified properties are overridden while
preserving all other default behaviors
3. **Applied customizations in the sanitization process**:
- Updated the `sanitizeClientFeatures` function to identify and apply
custom group configurations
- Applied deep merging before the sorting process to ensure proper
ordering with customized configurations
- Maintained backward compatibility for users who don't need
customization

### Usage Example

```typescript
import { FixedToolbarFeature } from '@payloadcms/richtext-lexical'
import { CustomIcon } from './icons/CustomIcon'

{
  name: 'content',
  type: 'richText',
  admin: {
    features: [
      // Other features...
      FixedToolbarFeature({
        customGroups: {
            'text': {
              order: 10,
              ChildComponent: CustomIcon,
            },
            'format': {
              order: 15,
            },
            'add': {
              type: 'buttons',
              order: 20,
            },
        }
      })
    ]
  }
}
```

### Demo


https://github.com/user-attachments/assets/c3a59b60-b6c2-4721-bbc0-4954bdf52625

---------

Co-authored-by: Germán Jabloñski <43938777+GermanJablo@users.noreply.github.com>
---
 .../features/toolbars/fixed/server/index.ts   | 12 +++++++++
 .../src/features/toolbars/types.ts            |  6 +++++
 .../src/lexical/config/client/sanitize.ts     | 25 +++++++++++++++++++
 3 files changed, 43 insertions(+)

diff --git a/packages/richtext-lexical/src/features/toolbars/fixed/server/index.ts b/packages/richtext-lexical/src/features/toolbars/fixed/server/index.ts
index c87f33829b..b79b716bf5 100644
--- a/packages/richtext-lexical/src/features/toolbars/fixed/server/index.ts
+++ b/packages/richtext-lexical/src/features/toolbars/fixed/server/index.ts
@@ -1,3 +1,5 @@
+import type { CustomGroups } from '../../types.js'
+
 import { createServerFeature } from '../../../../utilities/createServerFeature.js'
 
 export type FixedToolbarFeatureProps = {
@@ -9,6 +11,15 @@ export type FixedToolbarFeatureProps = {
    * This means that if the editor has a child-editor, and the child-editor is focused, the toolbar will apply to the child-editor, not the parent editor with this feature added.
    */
   applyToFocusedEditor?: boolean
+  /**
+   * Custom configurations for toolbar groups
+   * Key is the group key (e.g. 'format', 'indent', 'align')
+   * Value is a partial ToolbarGroup object that will be merged with the default configuration
+   *
+   * @note Props passed via customGroups must be serializable. Avoid using functions or dynamic components.
+   * ChildComponent, if provided, must be a serializable server component.
+   */
+  customGroups?: CustomGroups
   /**
    * @default false
    *
@@ -26,6 +37,7 @@ export const FixedToolbarFeature = createServerFeature<
     const sanitizedProps: FixedToolbarFeatureProps = {
       applyToFocusedEditor:
         props?.applyToFocusedEditor === undefined ? false : props.applyToFocusedEditor,
+      customGroups: props?.customGroups,
       disableIfParentHasFixedToolbar:
         props?.disableIfParentHasFixedToolbar === undefined
           ? false
diff --git a/packages/richtext-lexical/src/features/toolbars/types.ts b/packages/richtext-lexical/src/features/toolbars/types.ts
index 600049ee62..afed211e20 100644
--- a/packages/richtext-lexical/src/features/toolbars/types.ts
+++ b/packages/richtext-lexical/src/features/toolbars/types.ts
@@ -115,3 +115,9 @@ export type ToolbarGroupItem = {
   onSelect?: ({ editor, isActive }: { editor: LexicalEditor; isActive: boolean }) => void
   order?: number
 }
+
+export type CustomGroups = Record<
+  string,
+  | Partial<Omit<ToolbarButtonsGroup, 'items' | 'key'>>
+  | Partial<Omit<ToolbarDropdownGroup, 'isEnabled' | 'items' | 'key'>>
+>
diff --git a/packages/richtext-lexical/src/lexical/config/client/sanitize.ts b/packages/richtext-lexical/src/lexical/config/client/sanitize.ts
index 294683cd3b..41ae552eaf 100644
--- a/packages/richtext-lexical/src/lexical/config/client/sanitize.ts
+++ b/packages/richtext-lexical/src/lexical/config/client/sanitize.ts
@@ -2,6 +2,9 @@
 
 import type { EditorConfig as LexicalEditorConfig } from 'lexical'
 
+import { deepMerge } from 'payload/shared'
+
+import type { ToolbarGroup } from '../../../features/toolbars/types.js'
 import type {
   ResolvedClientFeatureMap,
   SanitizedClientFeatures,
@@ -31,6 +34,17 @@ export const sanitizeClientFeatures = (
     },
   }
 
+  // Allow customization of groups for toolbarFixed
+  let customGroups: Record<string, Partial<ToolbarGroup>> = {}
+  features.forEach((feature) => {
+    if (feature.key === 'toolbarFixed' && feature.sanitizedClientFeatureProps?.customGroups) {
+      customGroups = {
+        ...customGroups,
+        ...feature.sanitizedClientFeatureProps.customGroups,
+      }
+    }
+  })
+
   if (!features?.size) {
     return sanitized
   }
@@ -158,6 +172,17 @@ export const sanitizeClientFeatures = (
     sanitized.enabledFeatures.push(feature.key)
   })
 
+  // Apply custom group configurations to toolbarFixed groups
+  if (Object.keys(customGroups).length > 0) {
+    sanitized.toolbarFixed.groups = sanitized.toolbarFixed.groups.map((group) => {
+      const customConfig = customGroups[group.key]
+      if (customConfig) {
+        return deepMerge(group, customConfig)
+      }
+      return group
+    })
+  }
+
   // Sort sanitized.toolbarInline.groups by order property
   sanitized.toolbarInline.groups.sort((a, b) => {
     if (a.order && b.order) {

From 9779cf7f7dfc4267ff0d0814b5291ef6e3a288a6 Mon Sep 17 00:00:00 2001
From: Jacob Fletcher <jacobsfletch@gmail.com>
Date: Wed, 14 May 2025 15:25:32 -0400
Subject: [PATCH 33/46] feat: prevent query preset lockout (#12322)

Prevents an accidental lockout of query preset documents. An "accidental
lockout" occurs when the user sets access control on a preset and
excludes themselves. This can happen in a variety of scenarios,
including:

 - You select `specificUsers` without specifying yourself
- You select `specificRoles` without specifying a role that you are a
part of
 - Etc.

#### How it works

To make this happen, we use a custom validation function that executes
access against the user's proposed changes. If those changes happen to
remove access for them, we throw a validation error and prevent that
change from ever taking place. This means that only a user with proper
access can remove another user from the preset. You cannot remove
yourself.

To do this, we create a temporary record in the database that we can
query against. We use transactions to ensure that the temporary record
is not persisted once our work is completed. Since not all Payload
projects have transactions enabled, we flag these temporary records with
the `isTemp` field.

Once created, we query the temp document to determine its permissions.
If any of the operations throw an error, this means the user can no
longer act on them, and we throw a validation error.

#### Alternative Approach

A previous approach that was explored was to add an `owner` field to the
presets collection. This way, the "owner" of the preset would be able to
completely bypass all access control, effectively eliminating the
possibility of a lockout event.

But this doesn't work for other users who may have update access. E.g.
they could still accidentally remove themselves from the read or update
operation, preventing them from accessing that preset after submitting
the form. We need a solution that works for all users, not just the
owner.
---
 .vscode/launch.json                           |   7 +
 packages/payload/src/admin/RichText.ts        |   1 -
 .../collections/operations/local/create.ts    |   1 +
 packages/payload/src/query-presets/config.ts  |  10 +
 .../payload/src/query-presets/constraints.ts  |   2 +
 .../src/query-presets/preventLockout.ts       |  92 ++++++++
 .../src/utilities/getEntityPolicies.ts        |   3 +
 .../elements/ListControls/useQueryPresets.tsx |   3 +
 .../QueryPresets/fields/WhereField/index.tsx  |   2 +-
 test/query-presets/collections/Pages/index.ts |   3 -
 test/query-presets/collections/Posts/index.ts |   3 -
 test/query-presets/config.ts                  |   8 +-
 test/query-presets/e2e.spec.ts                |  78 ++++---
 test/query-presets/fields/roles.ts            |   8 +-
 test/query-presets/int.spec.ts                | 212 +++++++++++++-----
 test/query-presets/payload-types.ts           |  65 +++---
 test/query-presets/seed.ts                    |  51 ++---
 tsconfig.base.json                            |   2 +-
 18 files changed, 390 insertions(+), 161 deletions(-)
 create mode 100644 packages/payload/src/query-presets/preventLockout.ts

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 2bf9d41eb1..c8b6d1051c 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -63,6 +63,13 @@
       "request": "launch",
       "type": "node-terminal"
     },
+    {
+      "command": "pnpm tsx --no-deprecation test/dev.ts query-presets",
+      "cwd": "${workspaceFolder}",
+      "name": "Run Dev Query Presets",
+      "request": "launch",
+      "type": "node-terminal"
+    },
     {
       "command": "pnpm tsx --no-deprecation test/dev.ts login-with-username",
       "cwd": "${workspaceFolder}",
diff --git a/packages/payload/src/admin/RichText.ts b/packages/payload/src/admin/RichText.ts
index 375cff4b90..5c9e89d72a 100644
--- a/packages/payload/src/admin/RichText.ts
+++ b/packages/payload/src/admin/RichText.ts
@@ -108,7 +108,6 @@ export type BeforeChangeRichTextHookArgs<
   previousSiblingDoc?: TData
   /** The previous value of the field, before changes */
   previousValue?: TValue
-
   /**
    * The original siblingData with locales (not modified by any hooks).
    */
diff --git a/packages/payload/src/collections/operations/local/create.ts b/packages/payload/src/collections/operations/local/create.ts
index ba7cb94953..a9c558dcc4 100644
--- a/packages/payload/src/collections/operations/local/create.ts
+++ b/packages/payload/src/collections/operations/local/create.ts
@@ -149,6 +149,7 @@ export default async function createLocal<
   }
 
   const req = await createLocalReq(options, payload)
+
   req.file = file ?? (await getFileByPath(filePath))
 
   return createOperation<TSlug, TSelect>({
diff --git a/packages/payload/src/query-presets/config.ts b/packages/payload/src/query-presets/config.ts
index ba2d3ee6ff..9fd822909e 100644
--- a/packages/payload/src/query-presets/config.ts
+++ b/packages/payload/src/query-presets/config.ts
@@ -113,6 +113,16 @@ export const getQueryPresetsConfig = (config: Config): CollectionConfig => ({
         : [],
       required: true,
     },
+    {
+      name: 'isTemp',
+      type: 'checkbox',
+      admin: {
+        description:
+          "This is a tempoary field used to determine if updating the preset would remove the user's access to it. When `true`, this record will be deleted after running the preset's `validate` function.",
+        disabled: true,
+        hidden: true,
+      },
+    },
   ],
   hooks: {
     beforeValidate: [
diff --git a/packages/payload/src/query-presets/constraints.ts b/packages/payload/src/query-presets/constraints.ts
index 33603d2f1d..921749ec12 100644
--- a/packages/payload/src/query-presets/constraints.ts
+++ b/packages/payload/src/query-presets/constraints.ts
@@ -5,6 +5,7 @@ import type { Field } from '../fields/config/types.js'
 
 import { fieldAffectsData } from '../fields/config/types.js'
 import { toWords } from '../utilities/formatLabels.js'
+import { preventLockout } from './preventLockout.js'
 import { operations, type QueryPresetConstraint } from './types.js'
 
 export const getConstraints = (config: Config): Field => ({
@@ -101,4 +102,5 @@ export const getConstraints = (config: Config): Field => ({
     label: () => toWords(operation),
   })),
   label: 'Sharing settings',
+  validate: preventLockout,
 })
diff --git a/packages/payload/src/query-presets/preventLockout.ts b/packages/payload/src/query-presets/preventLockout.ts
new file mode 100644
index 0000000000..4f285e1d08
--- /dev/null
+++ b/packages/payload/src/query-presets/preventLockout.ts
@@ -0,0 +1,92 @@
+import type { Validate } from '../fields/config/types.js'
+
+import { APIError } from '../errors/APIError.js'
+import { createLocalReq } from '../utilities/createLocalReq.js'
+import { initTransaction } from '../utilities/initTransaction.js'
+import { killTransaction } from '../utilities/killTransaction.js'
+import { queryPresetsCollectionSlug } from './config.js'
+
+/**
+ * Prevents "accidental lockouts" where a user makes an update that removes their own access to the preset.
+ * This is effectively an access control function proxied through a `validate` function.
+ * How it works:
+ *   1. Creates a temporary record with the incoming data
+ *   2. Attempts to read and update that record with the incoming user
+ *   3. If either of those fail, throws an error to the user
+ *   4. Once finished, prevents the temp record from persisting to the database
+ */
+export const preventLockout: Validate = async (
+  value,
+  { data, overrideAccess, req: incomingReq },
+) => {
+  // Use context to ensure an infinite loop doesn't occur
+  if (!incomingReq.context._preventLockout && !overrideAccess) {
+    const req = await createLocalReq(
+      {
+        context: {
+          _preventLockout: true,
+        },
+        req: {
+          user: incomingReq.user,
+        },
+      },
+      incomingReq.payload,
+    )
+
+    // Might be `null` if no transactions are enabled
+    const transaction = await initTransaction(req)
+
+    // create a temp record to validate the constraints, using the req
+    const tempPreset = await req.payload.create({
+      collection: queryPresetsCollectionSlug,
+      data: {
+        ...data,
+        isTemp: true,
+      },
+      req,
+    })
+
+    let canUpdate = false
+    let canRead = false
+
+    try {
+      await req.payload.findByID({
+        id: tempPreset.id,
+        collection: queryPresetsCollectionSlug,
+        overrideAccess: false,
+        req,
+        user: req.user,
+      })
+
+      canRead = true
+
+      await req.payload.update({
+        id: tempPreset.id,
+        collection: queryPresetsCollectionSlug,
+        data: tempPreset,
+        overrideAccess: false,
+        req,
+        user: req.user,
+      })
+
+      canUpdate = true
+    } catch (_err) {
+      if (!canRead || !canUpdate) {
+        throw new APIError('Cannot remove yourself from this preset.', 403, {}, true)
+      }
+    } finally {
+      if (transaction) {
+        await killTransaction(req)
+      } else {
+        // delete the temp record
+        await req.payload.delete({
+          id: tempPreset.id,
+          collection: queryPresetsCollectionSlug,
+          req,
+        })
+      }
+    }
+  }
+
+  return true as unknown as true
+}
diff --git a/packages/payload/src/utilities/getEntityPolicies.ts b/packages/payload/src/utilities/getEntityPolicies.ts
index 104a6ead84..0ec0538b6e 100644
--- a/packages/payload/src/utilities/getEntityPolicies.ts
+++ b/packages/payload/src/utilities/getEntityPolicies.ts
@@ -78,6 +78,7 @@ export async function getEntityPolicies<T extends Args>(args: T): Promise<Return
           overrideAccess: true,
           req,
         }
+
         if (operation === 'readVersions') {
           const paginatedRes = await payload.findVersions({
             ...options,
@@ -91,6 +92,7 @@ export async function getEntityPolicies<T extends Args>(args: T): Promise<Return
           pagination: false,
           where: combineQueries(where, { id: { equals: id } }),
         })
+
         return paginatedRes?.docs?.[0] || undefined
       }
 
@@ -119,6 +121,7 @@ export async function getEntityPolicies<T extends Args>(args: T): Promise<Return
         docBeingAccessed = doc
       })
     }
+
     // awaiting the promise to ensure docBeingAccessed is assigned before it is used
     await docBeingAccessed
 
diff --git a/packages/ui/src/elements/ListControls/useQueryPresets.tsx b/packages/ui/src/elements/ListControls/useQueryPresets.tsx
index c6ec9ca53d..2da24c2b35 100644
--- a/packages/ui/src/elements/ListControls/useQueryPresets.tsx
+++ b/packages/ui/src/elements/ListControls/useQueryPresets.tsx
@@ -68,6 +68,9 @@ export const useQueryPresets = ({
   const filterOptions = useMemo(
     () => ({
       'payload-query-presets': {
+        isTemp: {
+          not_equals: true,
+        },
         relatedCollection: {
           equals: collectionSlug,
         },
diff --git a/packages/ui/src/elements/QueryPresets/fields/WhereField/index.tsx b/packages/ui/src/elements/QueryPresets/fields/WhereField/index.tsx
index a44fd868bb..9220c0dccf 100644
--- a/packages/ui/src/elements/QueryPresets/fields/WhereField/index.tsx
+++ b/packages/ui/src/elements/QueryPresets/fields/WhereField/index.tsx
@@ -104,7 +104,7 @@ export const QueryPresetsWhereField: JSONFieldClientComponent = ({
         {value
           ? transformWhereToNaturalLanguage(
               value as Where,
-              getTranslation(collectionConfig.labels.plural, i18n),
+              getTranslation(collectionConfig?.labels?.plural, i18n),
             )
           : 'No where query'}
       </div>
diff --git a/test/query-presets/collections/Pages/index.ts b/test/query-presets/collections/Pages/index.ts
index 7bd8a3659a..f470d7c64e 100644
--- a/test/query-presets/collections/Pages/index.ts
+++ b/test/query-presets/collections/Pages/index.ts
@@ -15,7 +15,4 @@ export const Pages: CollectionConfig = {
       type: 'text',
     },
   ],
-  versions: {
-    drafts: true,
-  },
 }
diff --git a/test/query-presets/collections/Posts/index.ts b/test/query-presets/collections/Posts/index.ts
index 84aec17300..2cfd03122d 100644
--- a/test/query-presets/collections/Posts/index.ts
+++ b/test/query-presets/collections/Posts/index.ts
@@ -15,7 +15,4 @@ export const Posts: CollectionConfig = {
       type: 'text',
     },
   ],
-  versions: {
-    drafts: true,
-  },
 }
diff --git a/test/query-presets/config.ts b/test/query-presets/config.ts
index ebf5dd1119..294549b952 100644
--- a/test/query-presets/config.ts
+++ b/test/query-presets/config.ts
@@ -23,10 +23,8 @@ export default buildConfigWithDefaults({
     //   plural: 'Reports',
     // },
     access: {
-      read: ({ req: { user } }) =>
-        user ? user && !user?.roles?.some((role) => role === 'anonymous') : false,
-      update: ({ req: { user } }) =>
-        user ? user && !user?.roles?.some((role) => role === 'anonymous') : false,
+      read: ({ req: { user } }) => Boolean(user?.roles?.length && !user?.roles?.includes('user')),
+      update: ({ req: { user } }) => Boolean(user?.roles?.length && !user?.roles?.includes('user')),
     },
     constraints: {
       read: [
@@ -60,7 +58,7 @@ export default buildConfigWithDefaults({
       ],
     },
   },
-  collections: [Pages, Users, Posts],
+  collections: [Pages, Posts, Users],
   onInit: async (payload) => {
     if (process.env.SEED_IN_CONFIG_ONINIT !== 'false') {
       await seed(payload)
diff --git a/test/query-presets/e2e.spec.ts b/test/query-presets/e2e.spec.ts
index 6f2cc43805..866ddee039 100644
--- a/test/query-presets/e2e.spec.ts
+++ b/test/query-presets/e2e.spec.ts
@@ -8,7 +8,7 @@ import * as path from 'path'
 import { fileURLToPath } from 'url'
 
 import type { PayloadTestSDK } from '../helpers/sdk/index.js'
-import type { Config } from './payload-types.js'
+import type { Config, PayloadQueryPreset } from './payload-types.js'
 
 import {
   ensureCompilationIsDone,
@@ -39,6 +39,13 @@ let serverURL: string
 let everyoneID: string | undefined
 let context: BrowserContext
 let user: any
+let ownerUser: any
+
+let seededData: {
+  everyone: PayloadQueryPreset
+  onlyMe: PayloadQueryPreset
+  specificUsers: PayloadQueryPreset
+}
 
 describe('Query Presets', () => {
   beforeAll(async ({ browser }, testInfo) => {
@@ -60,6 +67,19 @@ describe('Query Presets', () => {
       })
       ?.then((res) => res.user) // TODO: this type is wrong
 
+    ownerUser = await payload
+      .find({
+        collection: 'users',
+        where: {
+          name: {
+            equals: 'Owner',
+          },
+        },
+        limit: 1,
+        depth: 0,
+      })
+      ?.then((res) => res.docs[0])
+
     initPageConsoleErrorCatch(page)
 
     await ensureCompilationIsDone({ page, serverURL })
@@ -83,7 +103,7 @@ describe('Query Presets', () => {
         },
       })
 
-      const [, everyone] = await Promise.all([
+      const [, everyone, onlyMe, specificUsers] = await Promise.all([
         payload.delete({
           collection: 'payload-preferences',
           where: {
@@ -106,18 +126,24 @@ describe('Query Presets', () => {
         }),
         payload.create({
           collection: 'payload-query-presets',
-          data: seedData.everyone,
+          data: seedData.everyone({ ownerUserID: ownerUser?.id || '' }),
         }),
         payload.create({
           collection: 'payload-query-presets',
-          data: seedData.onlyMe,
+          data: seedData.onlyMe({ ownerUserID: ownerUser?.id || '' }),
         }),
         payload.create({
           collection: 'payload-query-presets',
-          data: seedData.specificUsers({ userID: user?.id || '' }),
+          data: seedData.specificUsers({ ownerUserID: ownerUser?.id || '', adminUserID: user.id }),
         }),
       ])
 
+      seededData = {
+        everyone,
+        onlyMe,
+        specificUsers,
+      }
+
       everyoneID = everyone.id
     } catch (error) {
       console.error('Error in beforeEach:', error)
@@ -126,12 +152,12 @@ describe('Query Presets', () => {
 
   test('should select preset and apply filters', async () => {
     await page.goto(pagesUrl.list)
-    await selectPreset({ page, presetTitle: seedData.everyone.title })
+    await selectPreset({ page, presetTitle: seededData.everyone.title })
 
     await assertURLParams({
       page,
-      columns: seedData.everyone.columns,
-      where: seedData.everyone.where,
+      columns: seededData.everyone.columns,
+      where: seededData.everyone.where,
       presetID: everyoneID,
     })
 
@@ -140,14 +166,14 @@ describe('Query Presets', () => {
 
   test('should clear selected preset and reset filters', async () => {
     await page.goto(pagesUrl.list)
-    await selectPreset({ page, presetTitle: seedData.everyone.title })
+    await selectPreset({ page, presetTitle: seededData.everyone.title })
     await clearSelectedPreset({ page })
     expect(true).toBe(true)
   })
 
   test('should delete a preset, clear selection, and reset changes', async () => {
     await page.goto(pagesUrl.list)
-    await selectPreset({ page, presetTitle: seedData.everyone.title })
+    await selectPreset({ page, presetTitle: seededData.everyone.title })
     await openListMenu({ page })
 
     await clickListMenuItem({ page, menuItemLabel: 'Delete' })
@@ -172,21 +198,21 @@ describe('Query Presets', () => {
 
     await expect(
       modal.locator('tbody tr td button', {
-        hasText: exactText(seedData.everyone.title),
+        hasText: exactText(seededData.everyone.title),
       }),
     ).toBeHidden()
   })
 
   test('should save last used preset to preferences and load on initial render', async () => {
     await page.goto(pagesUrl.list)
-    await selectPreset({ page, presetTitle: seedData.everyone.title })
+    await selectPreset({ page, presetTitle: seededData.everyone.title })
 
     await page.reload()
 
     await assertURLParams({
       page,
-      columns: seedData.everyone.columns,
-      where: seedData.everyone.where,
+      columns: seededData.everyone.columns,
+      where: seededData.everyone.where,
       // presetID: everyoneID,
     })
 
@@ -209,7 +235,7 @@ describe('Query Presets', () => {
       }),
     ).toBeHidden()
 
-    await selectPreset({ page, presetTitle: seedData.everyone.title })
+    await selectPreset({ page, presetTitle: seededData.everyone.title })
 
     await openListMenu({ page })
 
@@ -249,7 +275,7 @@ describe('Query Presets', () => {
       }),
     ).toBeHidden()
 
-    await selectPreset({ page, presetTitle: seedData.onlyMe.title })
+    await selectPreset({ page, presetTitle: seededData.onlyMe.title })
 
     await toggleColumn(page, { columnLabel: 'ID' })
 
@@ -271,7 +297,7 @@ describe('Query Presets', () => {
   test('should conditionally render "update for everyone" label based on if preset is shared', async () => {
     await page.goto(pagesUrl.list)
 
-    await selectPreset({ page, presetTitle: seedData.onlyMe.title })
+    await selectPreset({ page, presetTitle: seededData.onlyMe.title })
 
     await toggleColumn(page, { columnLabel: 'ID' })
 
@@ -284,7 +310,7 @@ describe('Query Presets', () => {
       }),
     ).toBeVisible()
 
-    await selectPreset({ page, presetTitle: seedData.everyone.title })
+    await selectPreset({ page, presetTitle: seededData.everyone.title })
 
     await toggleColumn(page, { columnLabel: 'ID' })
 
@@ -300,7 +326,7 @@ describe('Query Presets', () => {
 
   test('should reset active changes', async () => {
     await page.goto(pagesUrl.list)
-    await selectPreset({ page, presetTitle: seedData.everyone.title })
+    await selectPreset({ page, presetTitle: seededData.everyone.title })
 
     const { columnContainer } = await toggleColumn(page, { columnLabel: 'ID' })
 
@@ -318,7 +344,7 @@ describe('Query Presets', () => {
   test('should only enter modified state when changes are made to an active preset', async () => {
     await page.goto(pagesUrl.list)
     await expect(page.locator('.list-controls__modified')).toBeHidden()
-    await selectPreset({ page, presetTitle: seedData.everyone.title })
+    await selectPreset({ page, presetTitle: seededData.everyone.title })
     await expect(page.locator('.list-controls__modified')).toBeHidden()
     await toggleColumn(page, { columnLabel: 'ID' })
     await expect(page.locator('.list-controls__modified')).toBeVisible()
@@ -337,14 +363,14 @@ describe('Query Presets', () => {
 
     await page.goto(pagesUrl.list)
 
-    await selectPreset({ page, presetTitle: seedData.everyone.title })
+    await selectPreset({ page, presetTitle: seededData.everyone.title })
     await clickListMenuItem({ page, menuItemLabel: 'Edit' })
 
     const drawer = page.locator('[id^=doc-drawer_payload-query-presets_0_]')
     const titleValue = drawer.locator('input[name="title"]')
-    await expect(titleValue).toHaveValue(seedData.everyone.title)
+    await expect(titleValue).toHaveValue(seededData.everyone.title)
 
-    const newTitle = `${seedData.everyone.title} (Updated)`
+    const newTitle = `${seededData.everyone.title} (Updated)`
     await drawer.locator('input[name="title"]').fill(newTitle)
 
     await saveDocAndAssert(page)
@@ -391,9 +417,9 @@ describe('Query Presets', () => {
   })
 
   test('only shows query presets related to the underlying collection', async () => {
-    // no results on `users` collection
-    const postsUrl = new AdminUrlUtil(serverURL, 'posts')
-    await page.goto(postsUrl.list)
+    // no results on `posts` collection
+    const postsURL = new AdminUrlUtil(serverURL, 'posts')
+    await page.goto(postsURL.list)
     const drawer = await openQueryPresetDrawer({ page })
     await expect(drawer.locator('.table table > tbody > tr')).toHaveCount(0)
     await expect(drawer.locator('.collection-list__no-results')).toBeVisible()
diff --git a/test/query-presets/fields/roles.ts b/test/query-presets/fields/roles.ts
index ad5ff3a66c..9304cb2afc 100644
--- a/test/query-presets/fields/roles.ts
+++ b/test/query-presets/fields/roles.ts
@@ -9,13 +9,13 @@ export const roles: Field = {
       label: 'Admin',
       value: 'admin',
     },
+    {
+      label: 'Editor',
+      value: 'editor',
+    },
     {
       label: 'User',
       value: 'user',
     },
-    {
-      label: 'Anonymous',
-      value: 'anonymous',
-    },
   ],
 }
diff --git a/test/query-presets/int.spec.ts b/test/query-presets/int.spec.ts
index 42bd771ac1..6fdc915e52 100644
--- a/test/query-presets/int.spec.ts
+++ b/test/query-presets/int.spec.ts
@@ -1,4 +1,3 @@
-import type { NextRESTClient } from 'helpers/NextRESTClient.js'
 import type { Payload, User } from 'payload'
 
 import path from 'path'
@@ -10,10 +9,9 @@ import { initPayloadInt } from '../helpers/initPayloadInt.js'
 const queryPresetsCollectionSlug = 'payload-query-presets'
 
 let payload: Payload
-let restClient: NextRESTClient
-let user: User
-let user2: User
-let anonymousUser: User
+let adminUser: User
+let editorUser: User
+let publicUser: User
 
 const filename = fileURLToPath(import.meta.url)
 const dirname = path.dirname(filename)
@@ -21,9 +19,9 @@ const dirname = path.dirname(filename)
 describe('Query Presets', () => {
   beforeAll(async () => {
     // @ts-expect-error: initPayloadInt does not have a proper type definition
-    ;({ payload, restClient } = await initPayloadInt(dirname))
+    ;({ payload } = await initPayloadInt(dirname))
 
-    user = await payload
+    adminUser = await payload
       .login({
         collection: 'users',
         data: {
@@ -33,7 +31,7 @@ describe('Query Presets', () => {
       })
       ?.then((result) => result.user)
 
-    user2 = await payload
+    editorUser = await payload
       .login({
         collection: 'users',
         data: {
@@ -43,11 +41,11 @@ describe('Query Presets', () => {
       })
       ?.then((result) => result.user)
 
-    anonymousUser = await payload
+    publicUser = await payload
       .login({
         collection: 'users',
         data: {
-          email: 'anonymous@email.com',
+          email: 'public@email.com',
           password: regularUser.password,
         },
       })
@@ -155,7 +153,8 @@ describe('Query Presets', () => {
     it('should respect access when set to "specificUsers"', async () => {
       const presetForSpecificUsers = await payload.create({
         collection: queryPresetsCollectionSlug,
-        user,
+        user: adminUser,
+        overrideAccess: false,
         data: {
           title: 'Specific Users',
           where: {
@@ -166,11 +165,11 @@ describe('Query Presets', () => {
           access: {
             read: {
               constraint: 'specificUsers',
-              users: [user.id],
+              users: [adminUser.id],
             },
             update: {
               constraint: 'specificUsers',
-              users: [user.id],
+              users: [adminUser.id],
             },
           },
           relatedCollection: 'pages',
@@ -180,7 +179,7 @@ describe('Query Presets', () => {
       const foundPresetWithUser1 = await payload.findByID({
         collection: queryPresetsCollectionSlug,
         depth: 0,
-        user,
+        user: adminUser,
         overrideAccess: false,
         id: presetForSpecificUsers.id,
       })
@@ -188,53 +187,53 @@ describe('Query Presets', () => {
       expect(foundPresetWithUser1.id).toBe(presetForSpecificUsers.id)
 
       try {
-        const foundPresetWithUser2 = await payload.findByID({
+        const foundPresetWithEditorUser = await payload.findByID({
           collection: queryPresetsCollectionSlug,
           depth: 0,
-          user: user2,
+          user: editorUser,
           overrideAccess: false,
           id: presetForSpecificUsers.id,
         })
 
-        expect(foundPresetWithUser2).toBeFalsy()
+        expect(foundPresetWithEditorUser).toBeFalsy()
       } catch (error: unknown) {
         expect((error as Error).message).toBe('Not Found')
       }
 
-      const presetUpdatedByUser1 = await payload.update({
+      const presetUpdatedByAdminUser = await payload.update({
         collection: queryPresetsCollectionSlug,
         id: presetForSpecificUsers.id,
-        user,
+        user: adminUser,
         overrideAccess: false,
         data: {
           title: 'Specific Users (Updated)',
         },
       })
 
-      expect(presetUpdatedByUser1.title).toBe('Specific Users (Updated)')
+      expect(presetUpdatedByAdminUser.title).toBe('Specific Users (Updated)')
 
       try {
-        const presetUpdatedByUser2 = await payload.update({
+        const presetUpdatedByEditorUser = await payload.update({
           collection: queryPresetsCollectionSlug,
           id: presetForSpecificUsers.id,
-          user: user2,
+          user: editorUser,
           overrideAccess: false,
           data: {
             title: 'Specific Users (Updated)',
           },
         })
 
-        expect(presetUpdatedByUser2).toBeFalsy()
+        expect(presetUpdatedByEditorUser).toBeFalsy()
       } catch (error: unknown) {
         expect((error as Error).message).toBe('You are not allowed to perform this action.')
       }
     })
 
     it('should respect access when set to "onlyMe"', async () => {
-      // create a new doc so that the creating user is the owner
       const presetForOnlyMe = await payload.create({
         collection: queryPresetsCollectionSlug,
-        user,
+        overrideAccess: false,
+        user: adminUser,
         data: {
           title: 'Only Me',
           where: {
@@ -257,7 +256,7 @@ describe('Query Presets', () => {
       const foundPresetWithUser1 = await payload.findByID({
         collection: queryPresetsCollectionSlug,
         depth: 0,
-        user,
+        user: adminUser,
         overrideAccess: false,
         id: presetForOnlyMe.id,
       })
@@ -265,15 +264,15 @@ describe('Query Presets', () => {
       expect(foundPresetWithUser1.id).toBe(presetForOnlyMe.id)
 
       try {
-        const foundPresetWithUser2 = await payload.findByID({
+        const foundPresetWithEditorUser = await payload.findByID({
           collection: queryPresetsCollectionSlug,
           depth: 0,
-          user: user2,
+          user: editorUser,
           overrideAccess: false,
           id: presetForOnlyMe.id,
         })
 
-        expect(foundPresetWithUser2).toBeFalsy()
+        expect(foundPresetWithEditorUser).toBeFalsy()
       } catch (error: unknown) {
         expect((error as Error).message).toBe('Not Found')
       }
@@ -281,7 +280,7 @@ describe('Query Presets', () => {
       const presetUpdatedByUser1 = await payload.update({
         collection: queryPresetsCollectionSlug,
         id: presetForOnlyMe.id,
-        user,
+        user: adminUser,
         overrideAccess: false,
         data: {
           title: 'Only Me (Updated)',
@@ -291,17 +290,17 @@ describe('Query Presets', () => {
       expect(presetUpdatedByUser1.title).toBe('Only Me (Updated)')
 
       try {
-        const presetUpdatedByUser2 = await payload.update({
+        const presetUpdatedByEditorUser = await payload.update({
           collection: queryPresetsCollectionSlug,
           id: presetForOnlyMe.id,
-          user: user2,
+          user: editorUser,
           overrideAccess: false,
           data: {
             title: 'Only Me (Updated)',
           },
         })
 
-        expect(presetUpdatedByUser2).toBeFalsy()
+        expect(presetUpdatedByEditorUser).toBeFalsy()
       } catch (error: unknown) {
         expect((error as Error).message).toBe('You are not allowed to perform this action.')
       }
@@ -310,7 +309,8 @@ describe('Query Presets', () => {
     it('should respect access when set to "everyone"', async () => {
       const presetForEveryone = await payload.create({
         collection: queryPresetsCollectionSlug,
-        user,
+        overrideAccess: false,
+        user: adminUser,
         data: {
           title: 'Everyone',
           where: {
@@ -336,27 +336,27 @@ describe('Query Presets', () => {
       const foundPresetWithUser1 = await payload.findByID({
         collection: queryPresetsCollectionSlug,
         depth: 0,
-        user,
+        user: adminUser,
         overrideAccess: false,
         id: presetForEveryone.id,
       })
 
       expect(foundPresetWithUser1.id).toBe(presetForEveryone.id)
 
-      const foundPresetWithUser2 = await payload.findByID({
+      const foundPresetWithEditorUser = await payload.findByID({
         collection: queryPresetsCollectionSlug,
         depth: 0,
-        user: user2,
+        user: editorUser,
         overrideAccess: false,
         id: presetForEveryone.id,
       })
 
-      expect(foundPresetWithUser2.id).toBe(presetForEveryone.id)
+      expect(foundPresetWithEditorUser.id).toBe(presetForEveryone.id)
 
       const presetUpdatedByUser1 = await payload.update({
         collection: queryPresetsCollectionSlug,
         id: presetForEveryone.id,
-        user,
+        user: adminUser,
         overrideAccess: false,
         data: {
           title: 'Everyone (Update 1)',
@@ -365,17 +365,105 @@ describe('Query Presets', () => {
 
       expect(presetUpdatedByUser1.title).toBe('Everyone (Update 1)')
 
-      const presetUpdatedByUser2 = await payload.update({
+      const presetUpdatedByEditorUser = await payload.update({
         collection: queryPresetsCollectionSlug,
         id: presetForEveryone.id,
-        user: user2,
+        user: editorUser,
         overrideAccess: false,
         data: {
           title: 'Everyone (Update 2)',
         },
       })
 
-      expect(presetUpdatedByUser2.title).toBe('Everyone (Update 2)')
+      expect(presetUpdatedByEditorUser.title).toBe('Everyone (Update 2)')
+    })
+
+    it('should prevent accidental lockout', async () => {
+      // attempt to create a preset without access to read or update
+      try {
+        const presetWithoutAccess = await payload.create({
+          collection: queryPresetsCollectionSlug,
+          user: adminUser,
+          overrideAccess: false,
+          data: {
+            title: 'Prevent Lockout',
+            relatedCollection: 'pages',
+            access: {
+              read: {
+                constraint: 'specificUsers',
+                users: [],
+              },
+              update: {
+                constraint: 'specificUsers',
+                users: [],
+              },
+              delete: {
+                constraint: 'specificUsers',
+                users: [],
+              },
+            },
+          },
+        })
+
+        expect(presetWithoutAccess).toBeFalsy()
+      } catch (error: unknown) {
+        expect((error as Error).message).toBe('Cannot remove yourself from this preset.')
+      }
+
+      const presetWithUser1 = await payload.create({
+        collection: queryPresetsCollectionSlug,
+        user: adminUser,
+        overrideAccess: false,
+        data: {
+          title: 'Prevent Lockout',
+          relatedCollection: 'pages',
+          access: {
+            read: {
+              constraint: 'specificUsers',
+              users: [adminUser.id],
+            },
+            update: {
+              constraint: 'specificUsers',
+              users: [adminUser.id],
+            },
+            delete: {
+              constraint: 'specificUsers',
+              users: [adminUser.id],
+            },
+          },
+        },
+      })
+
+      // attempt to update the preset to lock the user out of access
+      try {
+        const presetUpdatedByUser1 = await payload.update({
+          collection: queryPresetsCollectionSlug,
+          id: presetWithUser1.id,
+          user: adminUser,
+          overrideAccess: false,
+          data: {
+            title: 'Prevent Lockout (Updated)',
+            access: {
+              read: {
+                constraint: 'specificUsers',
+                users: [],
+              },
+              update: {
+                constraint: 'specificUsers',
+                users: [],
+              },
+              delete: {
+                constraint: 'specificUsers',
+                users: [],
+              },
+            },
+          },
+        })
+
+        expect(presetUpdatedByUser1).toBeFalsy()
+      } catch (error: unknown) {
+        expect((error as Error).message).toBe('Cannot remove yourself from this preset.')
+      }
     })
   })
 
@@ -383,7 +471,8 @@ describe('Query Presets', () => {
     it('should respect top-level access control overrides', async () => {
       const preset = await payload.create({
         collection: queryPresetsCollectionSlug,
-        user,
+        user: adminUser,
+        overrideAccess: false,
         data: {
           title: 'Top-Level Access Control Override',
           relatedCollection: 'pages',
@@ -404,7 +493,7 @@ describe('Query Presets', () => {
       const foundPresetWithUser1 = await payload.findByID({
         collection: queryPresetsCollectionSlug,
         depth: 0,
-        user,
+        user: adminUser,
         overrideAccess: false,
         id: preset.id,
       })
@@ -412,15 +501,15 @@ describe('Query Presets', () => {
       expect(foundPresetWithUser1.id).toBe(preset.id)
 
       try {
-        const foundPresetWithAnonymousUser = await payload.findByID({
+        const foundPresetWithPublicUser = await payload.findByID({
           collection: queryPresetsCollectionSlug,
           depth: 0,
-          user: anonymousUser,
+          user: publicUser,
           overrideAccess: false,
           id: preset.id,
         })
 
-        expect(foundPresetWithAnonymousUser).toBeFalsy()
+        expect(foundPresetWithPublicUser).toBeFalsy()
       } catch (error: unknown) {
         expect((error as Error).message).toBe('You are not allowed to perform this action.')
       }
@@ -429,7 +518,8 @@ describe('Query Presets', () => {
     it('should respect access when set to "specificRoles"', async () => {
       const presetForSpecificRoles = await payload.create({
         collection: queryPresetsCollectionSlug,
-        user,
+        user: adminUser,
+        overrideAccess: false,
         data: {
           title: 'Specific Roles',
           where: {
@@ -454,7 +544,7 @@ describe('Query Presets', () => {
       const foundPresetWithUser1 = await payload.findByID({
         collection: queryPresetsCollectionSlug,
         depth: 0,
-        user,
+        user: adminUser,
         overrideAccess: false,
         id: presetForSpecificRoles.id,
       })
@@ -462,15 +552,15 @@ describe('Query Presets', () => {
       expect(foundPresetWithUser1.id).toBe(presetForSpecificRoles.id)
 
       try {
-        const foundPresetWithUser2 = await payload.findByID({
+        const foundPresetWithEditorUser = await payload.findByID({
           collection: queryPresetsCollectionSlug,
           depth: 0,
-          user: user2,
+          user: editorUser,
           overrideAccess: false,
           id: presetForSpecificRoles.id,
         })
 
-        expect(foundPresetWithUser2).toBeFalsy()
+        expect(foundPresetWithEditorUser).toBeFalsy()
       } catch (error: unknown) {
         expect((error as Error).message).toBe('Not Found')
       }
@@ -478,7 +568,7 @@ describe('Query Presets', () => {
       const presetUpdatedByUser1 = await payload.update({
         collection: queryPresetsCollectionSlug,
         id: presetForSpecificRoles.id,
-        user,
+        user: adminUser,
         overrideAccess: false,
         data: {
           title: 'Specific Roles (Updated)',
@@ -488,17 +578,17 @@ describe('Query Presets', () => {
       expect(presetUpdatedByUser1.title).toBe('Specific Roles (Updated)')
 
       try {
-        const presetUpdatedByUser2 = await payload.update({
+        const presetUpdatedByEditorUser = await payload.update({
           collection: queryPresetsCollectionSlug,
           id: presetForSpecificRoles.id,
-          user: user2,
+          user: editorUser,
           overrideAccess: false,
           data: {
             title: 'Specific Roles (Updated)',
           },
         })
 
-        expect(presetUpdatedByUser2).toBeFalsy()
+        expect(presetUpdatedByEditorUser).toBeFalsy()
       } catch (error: unknown) {
         expect((error as Error).message).toBe('You are not allowed to perform this action.')
       }
@@ -508,7 +598,7 @@ describe('Query Presets', () => {
       // create a preset with the read constraint set to "noone"
       const presetForNoone = await payload.create({
         collection: queryPresetsCollectionSlug,
-        user,
+        user: adminUser,
         data: {
           relatedCollection: 'pages',
           title: 'Noone',
@@ -529,7 +619,7 @@ describe('Query Presets', () => {
         const foundPresetWithUser1 = await payload.findByID({
           collection: queryPresetsCollectionSlug,
           depth: 0,
-          user,
+          user: adminUser,
           overrideAccess: false,
           id: presetForNoone.id,
         })
@@ -545,7 +635,8 @@ describe('Query Presets', () => {
     try {
       const result = await payload.create({
         collection: 'payload-query-presets',
-        user,
+        user: adminUser,
+        overrideAccess: false,
         data: {
           title: 'Disabled Query Presets',
           relatedCollection: 'pages',
@@ -563,7 +654,8 @@ describe('Query Presets', () => {
     it('transforms "where" query objects into the "and" / "or" format', async () => {
       const result = await payload.create({
         collection: queryPresetsCollectionSlug,
-        user,
+        user: adminUser,
+        overrideAccess: false,
         data: {
           title: 'Where Object Formatting',
           where: {
diff --git a/test/query-presets/payload-types.ts b/test/query-presets/payload-types.ts
index 3918740441..61c9398cac 100644
--- a/test/query-presets/payload-types.ts
+++ b/test/query-presets/payload-types.ts
@@ -68,8 +68,8 @@ export interface Config {
   blocks: {};
   collections: {
     pages: Page;
-    users: User;
     posts: Post;
+    users: User;
     'payload-locked-documents': PayloadLockedDocument;
     'payload-preferences': PayloadPreference;
     'payload-migrations': PayloadMigration;
@@ -78,8 +78,8 @@ export interface Config {
   collectionsJoins: {};
   collectionsSelect: {
     pages: PagesSelect<false> | PagesSelect<true>;
-    users: UsersSelect<false> | UsersSelect<true>;
     posts: PostsSelect<false> | PostsSelect<true>;
+    users: UsersSelect<false> | UsersSelect<true>;
     'payload-locked-documents': PayloadLockedDocumentsSelect<false> | PayloadLockedDocumentsSelect<true>;
     'payload-preferences': PayloadPreferencesSelect<false> | PayloadPreferencesSelect<true>;
     'payload-migrations': PayloadMigrationsSelect<false> | PayloadMigrationsSelect<true>;
@@ -126,7 +126,16 @@ export interface Page {
   text?: string | null;
   updatedAt: string;
   createdAt: string;
-  _status?: ('draft' | 'published') | null;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "posts".
+ */
+export interface Post {
+  id: string;
+  text?: string | null;
+  updatedAt: string;
+  createdAt: string;
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
@@ -135,7 +144,7 @@ export interface Page {
 export interface User {
   id: string;
   name?: string | null;
-  roles?: ('admin' | 'user' | 'anonymous')[] | null;
+  roles?: ('admin' | 'editor' | 'user')[] | null;
   updatedAt: string;
   createdAt: string;
   email: string;
@@ -147,17 +156,6 @@ export interface User {
   lockUntil?: string | null;
   password?: string | null;
 }
-/**
- * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "posts".
- */
-export interface Post {
-  id: string;
-  text?: string | null;
-  updatedAt: string;
-  createdAt: string;
-  _status?: ('draft' | 'published') | null;
-}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "payload-locked-documents".
@@ -169,13 +167,13 @@ export interface PayloadLockedDocument {
         relationTo: 'pages';
         value: string | Page;
       } | null)
-    | ({
-        relationTo: 'users';
-        value: string | User;
-      } | null)
     | ({
         relationTo: 'posts';
         value: string | Post;
+      } | null)
+    | ({
+        relationTo: 'users';
+        value: string | User;
       } | null);
   globalSlug?: string | null;
   user: {
@@ -231,12 +229,12 @@ export interface PayloadQueryPreset {
     read?: {
       constraint?: ('everyone' | 'onlyMe' | 'specificUsers' | 'specificRoles' | 'noone') | null;
       users?: (string | User)[] | null;
-      roles?: ('admin' | 'user' | 'anonymous')[] | null;
+      roles?: ('admin' | 'editor' | 'user')[] | null;
     };
     update?: {
       constraint?: ('everyone' | 'onlyMe' | 'specificUsers' | 'specificRoles') | null;
       users?: (string | User)[] | null;
-      roles?: ('admin' | 'user' | 'anonymous')[] | null;
+      roles?: ('admin' | 'editor' | 'user')[] | null;
     };
     delete?: {
       constraint?: ('everyone' | 'onlyMe' | 'specificUsers') | null;
@@ -262,6 +260,10 @@ export interface PayloadQueryPreset {
     | boolean
     | null;
   relatedCollection: 'pages' | 'posts';
+  /**
+   * This is a tempoary field used to determine if updating the preset would remove the user's access to it. When `true`, this record will be deleted after running the preset's `validate` function.
+   */
+  isTemp?: boolean | null;
   updatedAt: string;
   createdAt: string;
 }
@@ -273,7 +275,15 @@ export interface PagesSelect<T extends boolean = true> {
   text?: T;
   updatedAt?: T;
   createdAt?: T;
-  _status?: T;
+}
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "posts_select".
+ */
+export interface PostsSelect<T extends boolean = true> {
+  text?: T;
+  updatedAt?: T;
+  createdAt?: T;
 }
 /**
  * This interface was referenced by `Config`'s JSON-Schema
@@ -292,16 +302,6 @@ export interface UsersSelect<T extends boolean = true> {
   loginAttempts?: T;
   lockUntil?: T;
 }
-/**
- * This interface was referenced by `Config`'s JSON-Schema
- * via the `definition` "posts_select".
- */
-export interface PostsSelect<T extends boolean = true> {
-  text?: T;
-  updatedAt?: T;
-  createdAt?: T;
-  _status?: T;
-}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "payload-locked-documents_select".
@@ -368,6 +368,7 @@ export interface PayloadQueryPresetsSelect<T extends boolean = true> {
   where?: T;
   columns?: T;
   relatedCollection?: T;
+  isTemp?: T;
   updatedAt?: T;
   createdAt?: T;
 }
diff --git a/test/query-presets/seed.ts b/test/query-presets/seed.ts
index 029c283919..1027fa22e3 100644
--- a/test/query-presets/seed.ts
+++ b/test/query-presets/seed.ts
@@ -10,11 +10,11 @@ type SeededQueryPreset = {
 } & Omit<QueryPreset, 'id' | 'relatedCollection'>
 
 export const seedData: {
-  everyone: SeededQueryPreset
-  onlyMe: SeededQueryPreset
-  specificUsers: (args: { userID: string }) => SeededQueryPreset
+  everyone: () => SeededQueryPreset
+  onlyMe: () => SeededQueryPreset
+  specificUsers: (args: { adminUserID: string }) => SeededQueryPreset
 } = {
-  onlyMe: {
+  onlyMe: () => ({
     relatedCollection: pagesSlug,
     isShared: false,
     title: 'Only Me',
@@ -40,8 +40,8 @@ export const seedData: {
         equals: 'example page',
       },
     },
-  },
-  everyone: {
+  }),
+  everyone: () => ({
     relatedCollection: pagesSlug,
     isShared: true,
     title: 'Everyone',
@@ -67,8 +67,8 @@ export const seedData: {
         equals: 'example page',
       },
     },
-  },
-  specificUsers: ({ userID }: { userID: string }) => ({
+  }),
+  specificUsers: ({ adminUserID }: { adminUserID: string }) => ({
     title: 'Specific Users',
     isShared: true,
     where: {
@@ -79,15 +79,15 @@ export const seedData: {
     access: {
       read: {
         constraint: 'specificUsers',
-        users: [userID],
+        users: [adminUserID],
       },
       update: {
         constraint: 'specificUsers',
-        users: [userID],
+        users: [adminUserID],
       },
       delete: {
         constraint: 'specificUsers',
-        users: [userID],
+        users: [adminUserID],
       },
     },
     columns: [
@@ -101,7 +101,7 @@ export const seedData: {
 }
 
 export const seed = async (_payload: Payload) => {
-  const [devUser] = await executePromises(
+  const [adminUser] = await executePromises(
     [
       () =>
         _payload.create({
@@ -119,18 +119,18 @@ export const seed = async (_payload: Payload) => {
           data: {
             email: regularCredentials.email,
             password: regularCredentials.password,
-            name: 'User',
-            roles: ['user'],
+            name: 'Editor',
+            roles: ['editor'],
           },
         }),
       () =>
         _payload.create({
           collection: usersSlug,
           data: {
-            email: 'anonymous@email.com',
+            email: 'public@email.com',
             password: regularCredentials.password,
-            name: 'User',
-            roles: ['anonymous'],
+            name: 'Public User',
+            roles: ['user'],
           },
         }),
     ],
@@ -149,29 +149,30 @@ export const seed = async (_payload: Payload) => {
       () =>
         _payload.create({
           collection: 'payload-query-presets',
-          user: devUser,
+          user: adminUser,
           overrideAccess: false,
-          data: seedData.specificUsers({ userID: devUser?.id || '' }),
+          data: seedData.specificUsers({
+            adminUserID: adminUser?.id || '',
+          }),
         }),
       () =>
         _payload.create({
           collection: 'payload-query-presets',
-          user: devUser,
+          user: adminUser,
           overrideAccess: false,
-          data: seedData.everyone,
+          data: seedData.everyone(),
         }),
       () =>
         _payload.create({
           collection: 'payload-query-presets',
-          user: devUser,
+          user: adminUser,
           overrideAccess: false,
-          data: seedData.onlyMe,
+          data: seedData.onlyMe(),
         }),
       () =>
         _payload.create({
           collection: 'payload-query-presets',
-          user: devUser,
-          overrideAccess: false,
+          user: adminUser,
           data: {
             relatedCollection: 'pages',
             title: 'Noone',
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 12877b1be6..b7c0ef5d5c 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -31,7 +31,7 @@
       }
     ],
     "paths": {
-      "@payload-config": ["./test/_community/config.ts"],
+      "@payload-config": ["./test/query-presets/config.ts"],
       "@payloadcms/admin-bar": ["./packages/admin-bar/src"],
       "@payloadcms/live-preview": ["./packages/live-preview/src"],
       "@payloadcms/live-preview-react": ["./packages/live-preview-react/src/index.ts"],

From 93d79b9c62d47b43e5cbbcb90cb901ae98e0bb39 Mon Sep 17 00:00:00 2001
From: Jacob Fletcher <jacobsfletch@gmail.com>
Date: Wed, 14 May 2025 15:25:44 -0400
Subject: [PATCH 34/46] perf: remove duplicative deep loops during field
 sanitization (#12402)

Optimizes the field sanitization process by removing duplicative deep
loops over the config. We were previously iterating over all fields of
each collection potentially multiple times in order validate field
configs, check reserved field names, etc. Now, we perform all necessary
sanitization within a single loop.
---
 .../collections/config/reservedFieldNames.ts  | 151 ------------------
 .../src/collections/config/sanitize.ts        |  16 +-
 .../src/collections/config/useAsTitle.ts      |   2 +-
 packages/payload/src/config/sanitize.ts       |   2 +
 .../config/reservedFieldNames.spec.ts         |   7 +-
 .../src/fields/config/reservedFieldNames.ts   |  48 ++++++
 .../src/fields/config/sanitize.spec.ts        |  60 ++++++-
 .../payload/src/fields/config/sanitize.ts     |  80 ++++++++--
 8 files changed, 187 insertions(+), 179 deletions(-)
 delete mode 100644 packages/payload/src/collections/config/reservedFieldNames.ts
 rename packages/payload/src/{collections => fields}/config/reservedFieldNames.spec.ts (97%)
 create mode 100644 packages/payload/src/fields/config/reservedFieldNames.ts

diff --git a/packages/payload/src/collections/config/reservedFieldNames.ts b/packages/payload/src/collections/config/reservedFieldNames.ts
deleted file mode 100644
index 199571dae1..0000000000
--- a/packages/payload/src/collections/config/reservedFieldNames.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-// @ts-strict-ignore
-import type { Field } from '../../fields/config/types.js'
-import type { CollectionConfig } from '../../index.js'
-
-import { ReservedFieldName } from '../../errors/ReservedFieldName.js'
-import { fieldAffectsData } from '../../fields/config/types.js'
-
-// Note for future reference: We've slimmed down the reserved field names but left them in here for reference in case it's needed in the future.
-
-/**
- * Reserved field names for collections with auth config enabled
- */
-const reservedBaseAuthFieldNames = [
-  /* 'email',
-  'resetPasswordToken',
-  'resetPasswordExpiration', */
-  'salt',
-  'hash',
-]
-/**
- * Reserved field names for auth collections with verify: true
- */
-const reservedVerifyFieldNames = [
-  /* '_verified', '_verificationToken' */
-]
-/**
- * Reserved field names for auth collections with useApiKey: true
- */
-const reservedAPIKeyFieldNames = [
-  /* 'enableAPIKey', 'apiKeyIndex', 'apiKey' */
-]
-
-/**
- * Reserved field names for collections with upload config enabled
- */
-const reservedBaseUploadFieldNames = [
-  'file',
-  /* 'mimeType',
-  'thumbnailURL',
-  'width',
-  'height',
-  'filesize',
-  'filename',
-  'url',
-  'focalX',
-  'focalY',
-  'sizes', */
-]
-
-/**
- * Reserved field names for collections with versions enabled
- */
-const reservedVersionsFieldNames = [
-  /* '__v', '_status' */
-]
-
-/**
- * Sanitize fields for collections with auth config enabled.
- *
- * Should run on top level fields only.
- */
-export const sanitizeAuthFields = (fields: Field[], config: CollectionConfig) => {
-  for (let i = 0; i < fields.length; i++) {
-    const field = fields[i]
-
-    if (fieldAffectsData(field) && field.name) {
-      if (config.auth && typeof config.auth === 'object' && !config.auth.disableLocalStrategy) {
-        const auth = config.auth
-
-        if (reservedBaseAuthFieldNames.includes(field.name)) {
-          throw new ReservedFieldName(field, field.name)
-        }
-
-        if (auth.verify) {
-          if (reservedAPIKeyFieldNames.includes(field.name)) {
-            throw new ReservedFieldName(field, field.name)
-          }
-        }
-
-        /* if (auth.maxLoginAttempts) {
-          if (field.name === 'loginAttempts' || field.name === 'lockUntil') {
-            throw new ReservedFieldName(field, field.name)
-          }
-        } */
-
-        /* if (auth.loginWithUsername) {
-          if (field.name === 'username') {
-            throw new ReservedFieldName(field, field.name)
-          }
-        } */
-
-        if (auth.verify) {
-          if (reservedVerifyFieldNames.includes(field.name)) {
-            throw new ReservedFieldName(field, field.name)
-          }
-        }
-      }
-    }
-
-    // Handle tabs without a name
-    if (field.type === 'tabs') {
-      for (let j = 0; j < field.tabs.length; j++) {
-        const tab = field.tabs[j]
-
-        if (!('name' in tab)) {
-          sanitizeAuthFields(tab.fields, config)
-        }
-      }
-    }
-
-    // Handle presentational fields like rows and collapsibles
-    if (!fieldAffectsData(field) && 'fields' in field && field.fields) {
-      sanitizeAuthFields(field.fields, config)
-    }
-  }
-}
-
-/**
- * Sanitize fields for collections with upload config enabled.
- *
- * Should run on top level fields only.
- */
-export const sanitizeUploadFields = (fields: Field[], config: CollectionConfig) => {
-  if (config.upload && typeof config.upload === 'object') {
-    for (let i = 0; i < fields.length; i++) {
-      const field = fields[i]
-
-      if (fieldAffectsData(field) && field.name) {
-        if (reservedBaseUploadFieldNames.includes(field.name)) {
-          throw new ReservedFieldName(field, field.name)
-        }
-      }
-
-      // Handle tabs without a name
-      if (field.type === 'tabs') {
-        for (let j = 0; j < field.tabs.length; j++) {
-          const tab = field.tabs[j]
-
-          if (!('name' in tab)) {
-            sanitizeUploadFields(tab.fields, config)
-          }
-        }
-      }
-
-      // Handle presentational fields like rows and collapsibles
-      if (!fieldAffectsData(field) && 'fields' in field && field.fields) {
-        sanitizeUploadFields(field.fields, config)
-      }
-    }
-  }
-}
diff --git a/packages/payload/src/collections/config/sanitize.ts b/packages/payload/src/collections/config/sanitize.ts
index 31198bc80d..fd29217f2b 100644
--- a/packages/payload/src/collections/config/sanitize.ts
+++ b/packages/payload/src/collections/config/sanitize.ts
@@ -26,7 +26,6 @@ import {
   addDefaultsToCollectionConfig,
   addDefaultsToLoginWithUsernameConfig,
 } from './defaults.js'
-import { sanitizeAuthFields, sanitizeUploadFields } from './reservedFieldNames.js'
 import { sanitizeCompoundIndexes } from './sanitizeCompoundIndexes.js'
 import { validateUseAsTitle } from './useAsTitle.js'
 
@@ -43,7 +42,9 @@ export const sanitizeCollection = async (
   if (collection._sanitized) {
     return collection as SanitizedCollectionConfig
   }
+
   collection._sanitized = true
+
   // /////////////////////////////////
   // Make copy of collection config
   // /////////////////////////////////
@@ -57,7 +58,9 @@ export const sanitizeCollection = async (
   const validRelationships = _validRelationships ?? config.collections.map((c) => c.slug) ?? []
 
   const joins: SanitizedJoins = {}
+
   const polymorphicJoins: SanitizedJoin[] = []
+
   sanitized.fields = await sanitizeFields({
     collectionConfig: sanitized,
     config,
@@ -96,17 +99,21 @@ export const sanitizeCollection = async (
     // add default timestamps fields only as needed
     let hasUpdatedAt: boolean | null = null
     let hasCreatedAt: boolean | null = null
+
     sanitized.fields.some((field) => {
       if (fieldAffectsData(field)) {
         if (field.name === 'updatedAt') {
           hasUpdatedAt = true
         }
+
         if (field.name === 'createdAt') {
           hasCreatedAt = true
         }
       }
+
       return hasCreatedAt && hasUpdatedAt
     })
+
     if (!hasUpdatedAt) {
       sanitized.fields.push({
         name: 'updatedAt',
@@ -119,6 +126,7 @@ export const sanitizeCollection = async (
         label: ({ t }) => t('general:updatedAt'),
       })
     }
+
     if (!hasCreatedAt) {
       sanitized.fields.push({
         name: 'createdAt',
@@ -175,9 +183,6 @@ export const sanitizeCollection = async (
       sanitized.upload = {}
     }
 
-    // sanitize fields for reserved names
-    sanitizeUploadFields(sanitized.fields, sanitized)
-
     sanitized.upload.cacheTags = sanitized.upload?.cacheTags ?? true
     sanitized.upload.bulkUpload = sanitized.upload?.bulkUpload ?? true
     sanitized.upload.staticDir = sanitized.upload.staticDir || sanitized.slug
@@ -195,9 +200,6 @@ export const sanitizeCollection = async (
   }
 
   if (sanitized.auth) {
-    // sanitize fields for reserved names
-    sanitizeAuthFields(sanitized.fields, sanitized)
-
     sanitized.auth = addDefaultsToAuthConfig(
       typeof sanitized.auth === 'boolean' ? {} : sanitized.auth,
     )
diff --git a/packages/payload/src/collections/config/useAsTitle.ts b/packages/payload/src/collections/config/useAsTitle.ts
index c4633f94f7..9dfb804d25 100644
--- a/packages/payload/src/collections/config/useAsTitle.ts
+++ b/packages/payload/src/collections/config/useAsTitle.ts
@@ -1,7 +1,7 @@
 import type { CollectionConfig } from '../../index.js'
 
 import { InvalidConfiguration } from '../../errors/InvalidConfiguration.js'
-import { fieldAffectsData, fieldIsVirtual } from '../../fields/config/types.js'
+import { fieldAffectsData } from '../../fields/config/types.js'
 import flattenFields from '../../utilities/flattenTopLevelFields.js'
 
 /**
diff --git a/packages/payload/src/config/sanitize.ts b/packages/payload/src/config/sanitize.ts
index 2d6346a301..8bcf6b76fc 100644
--- a/packages/payload/src/config/sanitize.ts
+++ b/packages/payload/src/config/sanitize.ts
@@ -58,6 +58,7 @@ const sanitizeAdminConfig = (configToSanitize: Config): Partial<SanitizedConfig>
   // add default user collection if none provided
   if (!sanitizedConfig?.admin?.user) {
     const firstCollectionWithAuth = sanitizedConfig.collections.find(({ auth }) => Boolean(auth))
+
     if (firstCollectionWithAuth) {
       sanitizedConfig.admin.user = firstCollectionWithAuth.slug
     } else {
@@ -69,6 +70,7 @@ const sanitizeAdminConfig = (configToSanitize: Config): Partial<SanitizedConfig>
   const userCollection = sanitizedConfig.collections.find(
     ({ slug }) => slug === sanitizedConfig.admin.user,
   )
+
   if (!userCollection || !userCollection.auth) {
     throw new InvalidConfiguration(
       `${sanitizedConfig.admin.user} is not a valid admin user collection`,
diff --git a/packages/payload/src/collections/config/reservedFieldNames.spec.ts b/packages/payload/src/fields/config/reservedFieldNames.spec.ts
similarity index 97%
rename from packages/payload/src/collections/config/reservedFieldNames.spec.ts
rename to packages/payload/src/fields/config/reservedFieldNames.spec.ts
index 5254b9d256..cfaaeb1f31 100644
--- a/packages/payload/src/collections/config/reservedFieldNames.spec.ts
+++ b/packages/payload/src/fields/config/reservedFieldNames.spec.ts
@@ -2,7 +2,7 @@ import type { Config } from '../../config/types.js'
 import type { CollectionConfig, Field } from '../../index.js'
 
 import { ReservedFieldName } from '../../errors/index.js'
-import { sanitizeCollection } from './sanitize.js'
+import { sanitizeCollection } from '../../collections/config/sanitize.js'
 
 describe('reservedFieldNames - collections -', () => {
   const config = {
@@ -25,6 +25,7 @@ describe('reservedFieldNames - collections -', () => {
           label: 'some-collection',
         },
       ]
+
       await expect(async () => {
         await sanitizeCollection(
           // @ts-expect-error
@@ -53,6 +54,7 @@ describe('reservedFieldNames - collections -', () => {
           label: 'some-collection',
         },
       ]
+
       await expect(async () => {
         await sanitizeCollection(
           // @ts-expect-error
@@ -93,6 +95,7 @@ describe('reservedFieldNames - collections -', () => {
           label: 'some-collection',
         },
       ]
+
       await expect(async () => {
         await sanitizeCollection(
           // @ts-expect-error
@@ -121,6 +124,7 @@ describe('reservedFieldNames - collections -', () => {
           label: 'some-collection',
         },
       ]
+
       await expect(async () => {
         await sanitizeCollection(
           // @ts-expect-error
@@ -149,6 +153,7 @@ describe('reservedFieldNames - collections -', () => {
           label: 'some-collection',
         },
       ]
+
       await expect(async () => {
         await sanitizeCollection(
           // @ts-expect-error
diff --git a/packages/payload/src/fields/config/reservedFieldNames.ts b/packages/payload/src/fields/config/reservedFieldNames.ts
new file mode 100644
index 0000000000..394ac10bba
--- /dev/null
+++ b/packages/payload/src/fields/config/reservedFieldNames.ts
@@ -0,0 +1,48 @@
+/**
+ * Reserved field names for collections with auth config enabled
+ */
+export const reservedBaseAuthFieldNames = [
+  /* 'email',
+    'resetPasswordToken',
+    'resetPasswordExpiration', */
+  'salt',
+  'hash',
+]
+
+/**
+ * Reserved field names for auth collections with verify: true
+ */
+export const reservedVerifyFieldNames = [
+  /* '_verified', '_verificationToken' */
+]
+
+/**
+ * Reserved field names for auth collections with useApiKey: true
+ */
+export const reservedAPIKeyFieldNames = [
+  /* 'enableAPIKey', 'apiKeyIndex', 'apiKey' */
+]
+
+/**
+ * Reserved field names for collections with upload config enabled
+ */
+export const reservedBaseUploadFieldNames = [
+  'file',
+  /* 'mimeType',
+    'thumbnailURL',
+    'width',
+    'height',
+    'filesize',
+    'filename',
+    'url',
+    'focalX',
+    'focalY',
+    'sizes', */
+]
+
+/**
+ * Reserved field names for collections with versions enabled
+ */
+export const reservedVersionsFieldNames = [
+  /* '__v', '_status' */
+]
diff --git a/packages/payload/src/fields/config/sanitize.spec.ts b/packages/payload/src/fields/config/sanitize.spec.ts
index 3da7508577..3ebad93b3b 100644
--- a/packages/payload/src/fields/config/sanitize.spec.ts
+++ b/packages/payload/src/fields/config/sanitize.spec.ts
@@ -11,9 +11,12 @@ import type {
 
 import { InvalidFieldName, InvalidFieldRelationship, MissingFieldType } from '../../errors/index.js'
 import { sanitizeFields } from './sanitize.js'
+import { CollectionConfig } from '../../index.js'
 
 describe('sanitizeFields', () => {
   const config = {} as Config
+  const collectionConfig = {} as CollectionConfig
+
   it('should throw on missing type field', async () => {
     const fields: Field[] = [
       // @ts-expect-error
@@ -22,14 +25,17 @@ describe('sanitizeFields', () => {
         label: 'some-collection',
       },
     ]
+
     await expect(async () => {
       await sanitizeFields({
         config,
+        collectionConfig,
         fields,
         validRelationships: [],
       })
     }).rejects.toThrow(MissingFieldType)
   })
+
   it('should throw on invalid field name', async () => {
     const fields: Field[] = [
       {
@@ -38,9 +44,11 @@ describe('sanitizeFields', () => {
         label: 'some.collection',
       },
     ]
+
     await expect(async () => {
       await sanitizeFields({
         config,
+        collectionConfig,
         fields,
         validRelationships: [],
       })
@@ -55,17 +63,21 @@ describe('sanitizeFields', () => {
           type: 'text',
         },
       ]
+
       const sanitizedField = (
         await sanitizeFields({
           config,
+          collectionConfig,
           fields,
           validRelationships: [],
         })
       )[0] as TextField
+
       expect(sanitizedField.name).toStrictEqual('someField')
       expect(sanitizedField.label).toStrictEqual('Some Field')
       expect(sanitizedField.type).toStrictEqual('text')
     })
+
     it('should allow auto-label override', async () => {
       const fields: Field[] = [
         {
@@ -74,13 +86,16 @@ describe('sanitizeFields', () => {
           label: 'Do not label',
         },
       ]
+
       const sanitizedField = (
         await sanitizeFields({
           config,
+          collectionConfig,
           fields,
           validRelationships: [],
         })
       )[0] as TextField
+
       expect(sanitizedField.name).toStrictEqual('someField')
       expect(sanitizedField.label).toStrictEqual('Do not label')
       expect(sanitizedField.type).toStrictEqual('text')
@@ -95,13 +110,16 @@ describe('sanitizeFields', () => {
             label: false,
           },
         ]
+
         const sanitizedField = (
           await sanitizeFields({
             config,
+            collectionConfig,
             fields,
             validRelationships: [],
           })
         )[0] as TextField
+
         expect(sanitizedField.name).toStrictEqual('someField')
         expect(sanitizedField.label).toStrictEqual(false)
         expect(sanitizedField.type).toStrictEqual('text')
@@ -119,18 +137,22 @@ describe('sanitizeFields', () => {
           ],
           label: false,
         }
+
         const sanitizedField = (
           await sanitizeFields({
             config,
+            collectionConfig,
             fields: [arrayField],
             validRelationships: [],
           })
         )[0] as ArrayField
+
         expect(sanitizedField.name).toStrictEqual('items')
         expect(sanitizedField.label).toStrictEqual(false)
         expect(sanitizedField.type).toStrictEqual('array')
         expect(sanitizedField.labels).toBeUndefined()
       })
+
       it('should allow label opt-out for blocks', async () => {
         const fields: Field[] = [
           {
@@ -150,13 +172,16 @@ describe('sanitizeFields', () => {
             label: false,
           },
         ]
+
         const sanitizedField = (
           await sanitizeFields({
             config,
+            collectionConfig,
             fields,
             validRelationships: [],
           })
         )[0] as BlocksField
+
         expect(sanitizedField.name).toStrictEqual('noLabelBlock')
         expect(sanitizedField.label).toStrictEqual(false)
         expect(sanitizedField.type).toStrictEqual('blocks')
@@ -177,13 +202,16 @@ describe('sanitizeFields', () => {
           ],
         },
       ]
+
       const sanitizedField = (
         await sanitizeFields({
           config,
+          collectionConfig,
           fields,
           validRelationships: [],
         })
       )[0] as ArrayField
+
       expect(sanitizedField.name).toStrictEqual('items')
       expect(sanitizedField.label).toStrictEqual('Items')
       expect(sanitizedField.type).toStrictEqual('array')
@@ -203,13 +231,16 @@ describe('sanitizeFields', () => {
           ],
         },
       ]
+
       const sanitizedField = (
         await sanitizeFields({
           config,
+          collectionConfig,
           fields,
           validRelationships: [],
         })
       )[0] as BlocksField
+
       expect(sanitizedField.name).toStrictEqual('specialBlock')
       expect(sanitizedField.label).toStrictEqual('Special Block')
       expect(sanitizedField.type).toStrictEqual('blocks')
@@ -217,6 +248,7 @@ describe('sanitizeFields', () => {
         plural: 'Special Blocks',
         singular: 'Special Block',
       })
+
       expect((sanitizedField.blocks[0].fields[0] as NumberField).label).toStrictEqual('Test Number')
     })
   })
@@ -232,8 +264,9 @@ describe('sanitizeFields', () => {
           relationTo: 'some-collection',
         },
       ]
+
       await expect(async () => {
-        await sanitizeFields({ config, fields, validRelationships })
+        await sanitizeFields({ config, collectionConfig, fields, validRelationships })
       }).not.toThrow()
     })
 
@@ -247,8 +280,9 @@ describe('sanitizeFields', () => {
           relationTo: ['some-collection', 'another-collection'],
         },
       ]
+
       await expect(async () => {
-        await sanitizeFields({ config, fields, validRelationships })
+        await sanitizeFields({ config, collectionConfig, fields, validRelationships })
       }).not.toThrow()
     })
 
@@ -265,6 +299,7 @@ describe('sanitizeFields', () => {
           },
         ],
       }
+
       const fields: Field[] = [
         {
           name: 'layout',
@@ -273,8 +308,9 @@ describe('sanitizeFields', () => {
           label: 'Layout Blocks',
         },
       ]
+
       await expect(async () => {
-        await sanitizeFields({ config, fields, validRelationships })
+        await sanitizeFields({ config, collectionConfig, fields, validRelationships })
       }).not.toThrow()
     })
 
@@ -288,8 +324,9 @@ describe('sanitizeFields', () => {
           relationTo: 'not-valid',
         },
       ]
+
       await expect(async () => {
-        await sanitizeFields({ config, fields, validRelationships })
+        await sanitizeFields({ config, collectionConfig, fields, validRelationships })
       }).rejects.toThrow(InvalidFieldRelationship)
     })
 
@@ -303,8 +340,9 @@ describe('sanitizeFields', () => {
           relationTo: ['some-collection', 'not-valid'],
         },
       ]
+
       await expect(async () => {
-        await sanitizeFields({ config, fields, validRelationships })
+        await sanitizeFields({ config, collectionConfig, fields, validRelationships })
       }).rejects.toThrow(InvalidFieldRelationship)
     })
 
@@ -321,6 +359,7 @@ describe('sanitizeFields', () => {
           },
         ],
       }
+
       const fields: Field[] = [
         {
           name: 'layout',
@@ -329,8 +368,9 @@ describe('sanitizeFields', () => {
           label: 'Layout Blocks',
         },
       ]
+
       await expect(async () => {
-        await sanitizeFields({ config, fields, validRelationships })
+        await sanitizeFields({ config, collectionConfig, fields, validRelationships })
       }).rejects.toThrow(InvalidFieldRelationship)
     })
 
@@ -346,19 +386,23 @@ describe('sanitizeFields', () => {
       const sanitizedField = (
         await sanitizeFields({
           config,
+          collectionConfig,
           fields,
           validRelationships: [],
         })
       )[0] as CheckboxField
+
       expect(sanitizedField.defaultValue).toStrictEqual(false)
     })
 
     it('should return empty field array if no fields', async () => {
       const sanitizedFields = await sanitizeFields({
         config,
+        collectionConfig,
         fields: [],
         validRelationships: [],
       })
+
       expect(sanitizedFields).toStrictEqual([])
     })
   })
@@ -385,9 +429,11 @@ describe('sanitizeFields', () => {
           label: false,
         },
       ]
+
       const sanitizedField = (
         await sanitizeFields({
           config,
+          collectionConfig,
           fields,
           validRelationships: [],
         })
@@ -416,9 +462,11 @@ describe('sanitizeFields', () => {
           label: false,
         },
       ]
+
       const sanitizedField = (
         await sanitizeFields({
           config,
+          collectionConfig,
           fields,
           validRelationships: [],
         })
diff --git a/packages/payload/src/fields/config/sanitize.ts b/packages/payload/src/fields/config/sanitize.ts
index 9495f3773c..34deb9718e 100644
--- a/packages/payload/src/fields/config/sanitize.ts
+++ b/packages/payload/src/fields/config/sanitize.ts
@@ -17,6 +17,7 @@ import {
   MissingEditorProp,
   MissingFieldType,
 } from '../../errors/index.js'
+import { ReservedFieldName } from '../../errors/ReservedFieldName.js'
 import { formatLabels, toWords } from '../../utilities/formatLabels.js'
 import { baseBlockFields } from '../baseFields/baseBlockFields.js'
 import { baseIDField } from '../baseFields/baseIDField.js'
@@ -24,14 +25,24 @@ import { baseTimezoneField } from '../baseFields/timezone/baseField.js'
 import { defaultTimezones } from '../baseFields/timezone/defaultTimezones.js'
 import { setDefaultBeforeDuplicate } from '../setDefaultBeforeDuplicate.js'
 import { validations } from '../validations.js'
+import {
+  reservedAPIKeyFieldNames,
+  reservedBaseAuthFieldNames,
+  reservedBaseUploadFieldNames,
+  reservedVerifyFieldNames,
+} from './reservedFieldNames.js'
 import { sanitizeJoinField } from './sanitizeJoinField.js'
-import { fieldAffectsData, fieldIsLocalized, tabHasName } from './types.js'
+import { fieldAffectsData as _fieldAffectsData, fieldIsLocalized, tabHasName } from './types.js'
 
 type Args = {
   collectionConfig?: CollectionConfig
   config: Config
   existingFieldNames?: Set<string>
   fields: Field[]
+  /**
+   * Used to prevent unnecessary sanitization of fields that are not top-level.
+   */
+  isTopLevelField?: boolean
   joinPath?: string
   /**
    * When not passed in, assume that join are not supported (globals, arrays, blocks)
@@ -39,7 +50,6 @@ type Args = {
   joins?: SanitizedJoins
   parentIsLocalized: boolean
   polymorphicJoins?: SanitizedJoin[]
-
   /**
    * If true, a richText field will require an editor property to be set, as the sanitizeFields function will not add it from the payload config if not present.
    *
@@ -59,9 +69,11 @@ type Args = {
 }
 
 export const sanitizeFields = async ({
+  collectionConfig,
   config,
   existingFieldNames = new Set(),
   fields,
+  isTopLevelField = true,
   joinPath = '',
   joins,
   parentIsLocalized,
@@ -80,6 +92,7 @@ export const sanitizeFields = async ({
     if ('_sanitized' in field && field._sanitized === true) {
       continue
     }
+
     if ('_sanitized' in field) {
       field._sanitized = true
     }
@@ -88,8 +101,39 @@ export const sanitizeFields = async ({
       throw new MissingFieldType(field)
     }
 
+    const fieldAffectsData = _fieldAffectsData(field)
+
+    if (isTopLevelField && fieldAffectsData && field.name) {
+      if (collectionConfig && collectionConfig.upload) {
+        if (reservedBaseUploadFieldNames.includes(field.name)) {
+          throw new ReservedFieldName(field, field.name)
+        }
+      }
+
+      if (
+        collectionConfig &&
+        collectionConfig.auth &&
+        typeof collectionConfig.auth === 'object' &&
+        !collectionConfig.auth.disableLocalStrategy
+      ) {
+        if (reservedBaseAuthFieldNames.includes(field.name)) {
+          throw new ReservedFieldName(field, field.name)
+        }
+
+        if (collectionConfig.auth.verify) {
+          if (reservedAPIKeyFieldNames.includes(field.name)) {
+            throw new ReservedFieldName(field, field.name)
+          }
+
+          if (reservedVerifyFieldNames.includes(field.name)) {
+            throw new ReservedFieldName(field, field.name)
+          }
+        }
+      }
+    }
+
     // assert that field names do not contain forbidden characters
-    if (fieldAffectsData(field) && field.name.includes('.')) {
+    if (fieldAffectsData && field.name.includes('.')) {
       throw new InvalidFieldName(field, field.name)
     }
 
@@ -122,6 +166,7 @@ export const sanitizeFields = async ({
         const relationships = Array.isArray(field.relationTo)
           ? field.relationTo
           : [field.relationTo]
+
         relationships.forEach((relationship: string) => {
           if (!validRelationships.includes(relationship)) {
             throw new InvalidFieldRelationship(field, relationship)
@@ -135,6 +180,7 @@ export const sanitizeFields = async ({
         )
         field.minRows = field.min
       }
+
       if (field.max && !field.maxRows) {
         console.warn(
           `(payload): The "max" property is deprecated for the Relationship field "${field.name}" and will be removed in a future version. Please use "maxRows" instead.`,
@@ -160,7 +206,7 @@ export const sanitizeFields = async ({
       field.labels = field.labels || formatLabels(field.name)
     }
 
-    if (fieldAffectsData(field)) {
+    if (fieldAffectsData) {
       if (existingFieldNames.has(field.name)) {
         throw new DuplicateFieldName(field.name)
       } else if (!['blockName', 'id'].includes(field.name)) {
@@ -254,9 +300,11 @@ export const sanitizeFields = async ({
         block.fields = block.fields.concat(baseBlockFields)
         block.labels = !block.labels ? formatLabels(block.slug) : block.labels
         block.fields = await sanitizeFields({
+          collectionConfig,
           config,
           existingFieldNames: new Set(),
           fields: block.fields,
+          isTopLevelField: false,
           parentIsLocalized: parentIsLocalized || field.localized,
           requireFieldLevelRichTextEditor,
           richTextSanitizationPromises,
@@ -267,12 +315,12 @@ export const sanitizeFields = async ({
 
     if ('fields' in field && field.fields) {
       field.fields = await sanitizeFields({
+        collectionConfig,
         config,
-        existingFieldNames: fieldAffectsData(field) ? new Set() : existingFieldNames,
+        existingFieldNames: fieldAffectsData ? new Set() : existingFieldNames,
         fields: field.fields,
-        joinPath: fieldAffectsData(field)
-          ? `${joinPath ? joinPath + '.' : ''}${field.name}`
-          : joinPath,
+        isTopLevelField: isTopLevelField && !fieldAffectsData,
+        joinPath: fieldAffectsData ? `${joinPath ? joinPath + '.' : ''}${field.name}` : joinPath,
         joins,
         parentIsLocalized: parentIsLocalized || fieldIsLocalized(field),
         polymorphicJoins,
@@ -285,7 +333,10 @@ export const sanitizeFields = async ({
     if (field.type === 'tabs') {
       for (let j = 0; j < field.tabs.length; j++) {
         const tab = field.tabs[j]
-        if (tabHasName(tab) && typeof tab.label === 'undefined') {
+
+        const isNamedTab = tabHasName(tab)
+
+        if (isNamedTab && typeof tab.label === 'undefined') {
           tab.label = toWords(tab.name)
         }
 
@@ -296,21 +347,24 @@ export const sanitizeFields = async ({
           !tab.id
         ) {
           // Always attach a UUID to tabs with a condition so there's no conflicts even if there are duplicate nested names
-          tab.id = tabHasName(tab) ? `${tab.name}_${uuid()}` : uuid()
+          tab.id = isNamedTab ? `${tab.name}_${uuid()}` : uuid()
         }
 
         tab.fields = await sanitizeFields({
+          collectionConfig,
           config,
-          existingFieldNames: tabHasName(tab) ? new Set() : existingFieldNames,
+          existingFieldNames: isNamedTab ? new Set() : existingFieldNames,
           fields: tab.fields,
-          joinPath: tabHasName(tab) ? `${joinPath ? joinPath + '.' : ''}${tab.name}` : joinPath,
+          isTopLevelField: isTopLevelField && !isNamedTab,
+          joinPath: isNamedTab ? `${joinPath ? joinPath + '.' : ''}${tab.name}` : joinPath,
           joins,
-          parentIsLocalized: parentIsLocalized || (tabHasName(tab) && tab.localized),
+          parentIsLocalized: parentIsLocalized || (isNamedTab && tab.localized),
           polymorphicJoins,
           requireFieldLevelRichTextEditor,
           richTextSanitizationPromises,
           validRelationships,
         })
+
         field.tabs[j] = tab
       }
     }

From d63c8baea50189c8b47b2362c41b74dfe3bb7f92 Mon Sep 17 00:00:00 2001
From: Alessio Gravili <alessio@gravili.de>
Date: Wed, 14 May 2025 14:58:25 -0700
Subject: [PATCH 35/46] fix(plugin-cloud): ensure scheduled publishing works if
 no custom jobs are defined (#12410)

Previously, plugin-cloud would only set up job auto-running if a job configuration was present in the custom config at initialization time.

However, some jobs - such as the scheduled publish job which is added during sanitization - are added after plugin-cloud has initialized. This means relying solely on the initial state of the job config is insufficient for determining whether to enable auto-running.

This PR removes that check and ensures auto-running is always initialized, allowing later-added jobs to run as expected.

## Weakening type

This PR also weakens to `config.jobs.tasks` type and makes that property optional. It's totally permissible to only have workflows that define inline tasks, and to not have any static tasks defined in `config.jobs.tasks`. Thus it makes no sense to make that property required.
---
 packages/payload-cloud/src/plugin.ts          | 27 +++++++++----------
 .../queues/config/generateJobsJSONSchemas.ts  |  4 +--
 packages/payload/src/queues/config/index.ts   |  1 -
 .../payload/src/queues/config/types/index.ts  |  2 +-
 .../runJobs/runJob/getRunTaskFunction.ts      |  4 ++-
 .../payload/src/queues/restEndpointRun.ts     |  7 +++--
 .../src/queues/utilities/getJobTaskStatus.ts  |  2 --
 7 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/packages/payload-cloud/src/plugin.ts b/packages/payload-cloud/src/plugin.ts
index ace1336907..c72236ddaa 100644
--- a/packages/payload-cloud/src/plugin.ts
+++ b/packages/payload-cloud/src/plugin.ts
@@ -16,6 +16,14 @@ export const generateRandomString = (): string => {
   return Array.from({ length: 24 }, () => chars[Math.floor(Math.random() * chars.length)]).join('')
 }
 
+const DEFAULT_CRON = '* * * * *'
+const DEFAULT_LIMIT = 10
+const DEFAULT_CRON_JOB = {
+  cron: DEFAULT_CRON,
+  limit: DEFAULT_LIMIT,
+  queue: 'default',
+}
+
 export const payloadCloudPlugin =
   (pluginOptions?: PluginOptions) =>
   async (incomingConfig: Config): Promise<Config> => {
@@ -100,15 +108,6 @@ export const payloadCloudPlugin =
     }
 
     // We make sure to only run cronjobs on one instance using a instance identifier stored in a global.
-
-    const DEFAULT_CRON = '* * * * *'
-    const DEFAULT_LIMIT = 10
-    const DEFAULT_CRON_JOB = {
-      cron: DEFAULT_CRON,
-      limit: DEFAULT_LIMIT,
-      queue: 'default',
-    }
-
     config.globals = [
       ...(config.globals || []),
       {
@@ -126,13 +125,13 @@ export const payloadCloudPlugin =
       },
     ]
 
-    if (pluginOptions?.enableAutoRun === false || !config.jobs) {
+    if (pluginOptions?.enableAutoRun === false) {
       return config
     }
 
-    const oldAutoRunCopy = config.jobs.autoRun ?? []
+    const oldAutoRunCopy = config.jobs?.autoRun ?? []
 
-    const hasExistingAutorun = Boolean(config.jobs.autoRun)
+    const hasExistingAutorun = Boolean(config.jobs?.autoRun)
 
     const newShouldAutoRun = async (payload: Payload) => {
       if (process.env.PAYLOAD_CLOUD_JOBS_INSTANCE) {
@@ -150,8 +149,8 @@ export const payloadCloudPlugin =
       return false
     }
 
-    if (!config.jobs.shouldAutoRun) {
-      config.jobs.shouldAutoRun = newShouldAutoRun
+    if (!config.jobs?.shouldAutoRun) {
+      ;(config.jobs ??= {}).shouldAutoRun = newShouldAutoRun
     }
 
     const newAutoRun = async (payload: Payload) => {
diff --git a/packages/payload/src/queues/config/generateJobsJSONSchemas.ts b/packages/payload/src/queues/config/generateJobsJSONSchemas.ts
index b61ab05401..bcee9c5b6d 100644
--- a/packages/payload/src/queues/config/generateJobsJSONSchemas.ts
+++ b/packages/payload/src/queues/config/generateJobsJSONSchemas.ts
@@ -88,7 +88,7 @@ export function generateJobsJSONSchemas(
       additionalProperties: false,
       properties: {
         ...Object.fromEntries(
-          jobsConfig.tasks.map((task) => {
+          (jobsConfig.tasks ?? []).map((task) => {
             const normalizedTaskSlug = task.slug[0].toUpperCase() + task.slug.slice(1)
 
             const toReturn: JSONSchema4 = {
@@ -110,7 +110,7 @@ export function generateJobsJSONSchemas(
           required: ['input', 'output'],
         },
       },
-      required: [...jobsConfig.tasks.map((task) => task.slug), 'inline'],
+      required: [...(jobsConfig.tasks ?? []).map((task) => task.slug), 'inline'],
     }
   }
 
diff --git a/packages/payload/src/queues/config/index.ts b/packages/payload/src/queues/config/index.ts
index f4cb07924d..8e04064fac 100644
--- a/packages/payload/src/queues/config/index.ts
+++ b/packages/payload/src/queues/config/index.ts
@@ -240,7 +240,6 @@ export const getDefaultJobsCollection: (config: Config) => CollectionConfig | nu
 export function jobAfterRead({ config, doc }: { config: SanitizedConfig; doc: BaseJob }): BaseJob {
   doc.taskStatus = getJobTaskStatus({
     jobLog: doc.log || [],
-    tasksConfig: config.jobs.tasks,
   })
   return doc
 }
diff --git a/packages/payload/src/queues/config/types/index.ts b/packages/payload/src/queues/config/types/index.ts
index 916724fd8f..8082be5266 100644
--- a/packages/payload/src/queues/config/types/index.ts
+++ b/packages/payload/src/queues/config/types/index.ts
@@ -116,7 +116,7 @@ export type JobsConfig = {
   /**
    * Define all possible tasks here
    */
-  tasks: TaskConfig<any>[]
+  tasks?: TaskConfig<any>[]
   /**
    * Define all the workflows here. Workflows orchestrate the flow of multiple tasks.
    */
diff --git a/packages/payload/src/queues/operations/runJobs/runJob/getRunTaskFunction.ts b/packages/payload/src/queues/operations/runJobs/runJob/getRunTaskFunction.ts
index d5ff4d7c70..c0f22990b7 100644
--- a/packages/payload/src/queues/operations/runJobs/runJob/getRunTaskFunction.ts
+++ b/packages/payload/src/queues/operations/runJobs/runJob/getRunTaskFunction.ts
@@ -193,7 +193,9 @@ export const getRunTaskFunction = <TIsInline extends boolean>(
 
       let taskConfig: TaskConfig<string>
       if (!isInline) {
-        taskConfig = req.payload.config.jobs.tasks.find((t) => t.slug === taskSlug)
+        taskConfig =
+          req.payload.config.jobs.tasks?.length &&
+          req.payload.config.jobs.tasks.find((t) => t.slug === taskSlug)
 
         if (!taskConfig) {
           throw new Error(`Task ${taskSlug} not found in workflow ${job.workflowSlug}`)
diff --git a/packages/payload/src/queues/restEndpointRun.ts b/packages/payload/src/queues/restEndpointRun.ts
index edadcfc46e..888e161c34 100644
--- a/packages/payload/src/queues/restEndpointRun.ts
+++ b/packages/payload/src/queues/restEndpointRun.ts
@@ -1,4 +1,3 @@
-// @ts-strict-ignore
 import type { Endpoint, SanitizedConfig } from '../config/types.js'
 
 import { runJobs, type RunJobsArgs } from './operations/runJobs/index.js'
@@ -8,10 +7,10 @@ const configHasJobs = (config: SanitizedConfig): boolean => {
     return false
   }
 
-  if (config.jobs.tasks.length > 0) {
+  if (config.jobs.tasks?.length > 0) {
     return true
   }
-  if (Array.isArray(config.jobs.workflows) && config.jobs.workflows.length > 0) {
+  if (config.jobs.workflows?.length > 0) {
     return true
   }
 
@@ -61,7 +60,7 @@ export const runJobsEndpoint: Endpoint = {
     let remainingJobsFromQueried = 0
     try {
       const result = await runJobs(runJobsArgs)
-      noJobsRemaining = result.noJobsRemaining
+      noJobsRemaining = !!result.noJobsRemaining
       remainingJobsFromQueried = result.remainingJobsFromQueried
     } catch (err) {
       req.payload.logger.error({
diff --git a/packages/payload/src/queues/utilities/getJobTaskStatus.ts b/packages/payload/src/queues/utilities/getJobTaskStatus.ts
index d911c42e53..44c49e2b81 100644
--- a/packages/payload/src/queues/utilities/getJobTaskStatus.ts
+++ b/packages/payload/src/queues/utilities/getJobTaskStatus.ts
@@ -1,10 +1,8 @@
 // @ts-strict-ignore
-import type { TaskConfig, TaskType } from '../config/types/taskTypes.js'
 import type { BaseJob, JobTaskStatus } from '../config/types/workflowTypes.js'
 
 type Args = {
   jobLog: BaseJob['log']
-  tasksConfig: TaskConfig<TaskType>[]
 }
 
 export const getJobTaskStatus = ({ jobLog }: Args): JobTaskStatus => {

From e258cd73efc9dc2d91249944950c6186731e7f66 Mon Sep 17 00:00:00 2001
From: Paul <paul@payloadcms.com>
Date: Wed, 14 May 2025 16:45:34 -0700
Subject: [PATCH 36/46] feat: allow group fields to have an optional name
 (#12318)

Adds the ability to completely omit `name` from group fields now so that
they're entirely presentational.

New config:
```ts
import type { CollectionConfig } from 'payload'

export const ExampleCollection: CollectionConfig = {
  slug: 'posts',
  fields: [
    {
      label: 'Page header',
      type: 'group', // required
      fields: [
        {
          name: 'title',
          type: 'text',
          required: true,
        },
      ],
    },
  ],
}
```

will create
<img width="332" alt="image"
src="https://github.com/user-attachments/assets/10b4315e-92d6-439e-82dd-7c815a844035"
/>


but the data response will still be

```
{
    "createdAt": "2025-05-05T13:42:20.326Z",
    "updatedAt": "2025-05-05T13:42:20.326Z",
    "title": "example post",
    "id": "6818c03ce92b7f92be1540f0"

}
```

Checklist:
- [x] Added int tests
- [x] Modify mongo, drizzle and graphql packages
- [x] Add type tests
- [x] Add e2e tests
---
 docs/fields/group.mdx                         |  41 +++++-
 packages/db-mongodb/src/models/buildSchema.ts |  77 +++++++----
 .../src/queries/sanitizeQueryValue.ts         |   1 +
 .../utilities/buildProjectionFromSelect.ts    |   1 -
 .../src/schema/buildMutationInputType.ts      |  48 ++++---
 .../graphql/src/schema/fieldToSchemaMap.ts    |  78 ++++++-----
 packages/payload/src/auth/getFieldsToSign.ts  |  46 ++++---
 packages/payload/src/fields/config/types.ts   |  52 ++++++--
 .../src/fields/hooks/afterChange/promise.ts   |  60 ++++++---
 .../src/fields/hooks/afterRead/promise.ts     | 107 +++++++++------
 .../src/fields/hooks/beforeChange/promise.ts  |  58 ++++++---
 .../fields/hooks/beforeDuplicate/promise.ts   |   3 +-
 .../fields/hooks/beforeValidate/promise.ts    |  31 +++--
 packages/payload/src/index.ts                 |   4 +
 .../src/utilities/configToJSONSchema.ts       |  60 ++++++---
 .../src/utilities/fieldSchemaToJSON.ts        |  17 ++-
 .../payload/src/utilities/flattenAllFields.ts |  10 +-
 .../payload/src/utilities/traverseFields.ts   |  50 ++++---
 .../elements/WhereBuilder/reduceFields.tsx    |  43 +++++-
 packages/ui/src/fields/Group/index.tsx        |  34 +++--
 packages/ui/src/fields/Join/index.tsx         |   4 +-
 .../addFieldStatePromise.ts                   |   2 +-
 .../calculateDefaultValues/promise.ts         |  50 ++++---
 .../traverseFields.ts                         |  35 ++++-
 .../buildFieldSchemaMap/traverseFields.ts     |  27 +++-
 .../ui/src/utilities/copyDataFromLocale.ts    |   8 +-
 test/fields/collections/Group/e2e.spec.ts     | 123 ++++++++++++++++++
 test/fields/collections/Group/index.ts        |  48 +++++++
 test/fields/collections/Group/shared.ts       |   6 +-
 test/fields/int.spec.ts                       |  53 +++++++-
 test/fields/payload-types.ts                  |  10 ++
 test/fields/seed.ts                           |   4 +-
 test/types/config.ts                          |  20 +++
 test/types/payload-types.ts                   |  10 ++
 test/types/types.spec.ts                      |  13 ++
 .../src/generateTranslations/utils/index.ts   |   2 +-
 tsconfig.base.json                            |   2 +-
 37 files changed, 955 insertions(+), 283 deletions(-)
 create mode 100644 test/fields/collections/Group/e2e.spec.ts

diff --git a/docs/fields/group.mdx b/docs/fields/group.mdx
index 9062dc6f5d..7865e0fc75 100644
--- a/docs/fields/group.mdx
+++ b/docs/fields/group.mdx
@@ -35,9 +35,9 @@ export const MyGroupField: Field = {
 
 | Option                 | Description                                                                                                                                                                                                                                                                        |
 | ---------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **`name`** \*          | To be used as the property name when stored and retrieved from the database. [More](/docs/fields/overview#field-names)                                                                                                                                                             |
+| **`name`**             | To be used as the property name when stored and retrieved from the database. [More](/docs/fields/overview#field-names)                                                                                                                                                             |
 | **`fields`** \*        | Array of field types to nest within this Group.                                                                                                                                                                                                                                    |
-| **`label`**            | Used as a heading in the Admin Panel and to name the generated GraphQL type.                                                                                                                                                                                                       |
+| **`label`**            | Used as a heading in the Admin Panel and to name the generated GraphQL type. Required when name is undefined, defaults to name converted to words.                                                                                                                                 |
 | **`validate`**         | Provide a custom validation function that will be executed on both the Admin Panel and the backend. [More](/docs/fields/overview#validation)                                                                                                                                       |
 | **`saveToJWT`**        | If this field is top-level and nested in a config supporting [Authentication](/docs/authentication/overview), include its data in the user JWT.                                                                                                                                    |
 | **`hooks`**            | Provide Field Hooks to control logic for this field. [More details](../hooks/fields).                                                                                                                                                                                              |
@@ -86,7 +86,7 @@ export const ExampleCollection: CollectionConfig = {
   slug: 'example-collection',
   fields: [
     {
-      name: 'pageMeta', // required
+      name: 'pageMeta',
       type: 'group', // required
       interfaceName: 'Meta', // optional
       fields: [
@@ -110,3 +110,38 @@ export const ExampleCollection: CollectionConfig = {
   ],
 }
 ```
+
+## Presentational group fields
+
+You can also use the Group field to create a presentational group of fields. This is useful when you want to group fields together visually without affecting the data structure.
+The label will be required when a `name` is not provided.
+
+```ts
+import type { CollectionConfig } from 'payload'
+
+export const ExampleCollection: CollectionConfig = {
+  slug: 'example-collection',
+  fields: [
+    {
+      label: 'Page meta',
+      type: 'group', // required
+      fields: [
+        {
+          name: 'title',
+          type: 'text',
+          required: true,
+          minLength: 20,
+          maxLength: 100,
+        },
+        {
+          name: 'description',
+          type: 'textarea',
+          required: true,
+          minLength: 40,
+          maxLength: 160,
+        },
+      ],
+    },
+  ],
+}
+```
diff --git a/packages/db-mongodb/src/models/buildSchema.ts b/packages/db-mongodb/src/models/buildSchema.ts
index 4cd833ccec..56e2cf1130 100644
--- a/packages/db-mongodb/src/models/buildSchema.ts
+++ b/packages/db-mongodb/src/models/buildSchema.ts
@@ -372,36 +372,61 @@ const group: FieldSchemaGenerator<GroupField> = (
   buildSchemaOptions,
   parentIsLocalized,
 ): void => {
-  const formattedBaseSchema = formatBaseSchema({ buildSchemaOptions, field, parentIsLocalized })
+  if (fieldAffectsData(field)) {
+    const formattedBaseSchema = formatBaseSchema({ buildSchemaOptions, field, parentIsLocalized })
 
-  // carry indexSortableFields through to versions if drafts enabled
-  const indexSortableFields =
-    buildSchemaOptions.indexSortableFields &&
-    field.name === 'version' &&
-    buildSchemaOptions.draftsEnabled
+    // carry indexSortableFields through to versions if drafts enabled
+    const indexSortableFields =
+      buildSchemaOptions.indexSortableFields &&
+      field.name === 'version' &&
+      buildSchemaOptions.draftsEnabled
 
-  const baseSchema: SchemaTypeOptions<any> = {
-    ...formattedBaseSchema,
-    type: buildSchema({
-      buildSchemaOptions: {
-        disableUnique: buildSchemaOptions.disableUnique,
-        draftsEnabled: buildSchemaOptions.draftsEnabled,
-        indexSortableFields,
-        options: {
-          _id: false,
-          id: false,
-          minimize: false,
+    const baseSchema: SchemaTypeOptions<any> = {
+      ...formattedBaseSchema,
+      type: buildSchema({
+        buildSchemaOptions: {
+          disableUnique: buildSchemaOptions.disableUnique,
+          draftsEnabled: buildSchemaOptions.draftsEnabled,
+          indexSortableFields,
+          options: {
+            _id: false,
+            id: false,
+            minimize: false,
+          },
         },
-      },
-      configFields: field.fields,
-      parentIsLocalized: parentIsLocalized || field.localized,
-      payload,
-    }),
-  }
+        configFields: field.fields,
+        parentIsLocalized: parentIsLocalized || field.localized,
+        payload,
+      }),
+    }
 
-  schema.add({
-    [field.name]: localizeSchema(field, baseSchema, payload.config.localization, parentIsLocalized),
-  })
+    schema.add({
+      [field.name]: localizeSchema(
+        field,
+        baseSchema,
+        payload.config.localization,
+        parentIsLocalized,
+      ),
+    })
+  } else {
+    field.fields.forEach((subField) => {
+      if (fieldIsVirtual(subField)) {
+        return
+      }
+
+      const addFieldSchema = getSchemaGenerator(subField.type)
+
+      if (addFieldSchema) {
+        addFieldSchema(
+          subField,
+          schema,
+          payload,
+          buildSchemaOptions,
+          (parentIsLocalized || field.localized) ?? false,
+        )
+      }
+    })
+  }
 }
 
 const json: FieldSchemaGenerator<JSONField> = (
diff --git a/packages/db-mongodb/src/queries/sanitizeQueryValue.ts b/packages/db-mongodb/src/queries/sanitizeQueryValue.ts
index c17c239b73..3de2aa6cba 100644
--- a/packages/db-mongodb/src/queries/sanitizeQueryValue.ts
+++ b/packages/db-mongodb/src/queries/sanitizeQueryValue.ts
@@ -105,6 +105,7 @@ export const sanitizeQueryValue = ({
   | undefined => {
   let formattedValue = val
   let formattedOperator = operator
+
   if (['array', 'blocks', 'group', 'tab'].includes(field.type) && path.includes('.')) {
     const segments = path.split('.')
     segments.shift()
diff --git a/packages/db-mongodb/src/utilities/buildProjectionFromSelect.ts b/packages/db-mongodb/src/utilities/buildProjectionFromSelect.ts
index 98a659643c..bd80cc99d7 100644
--- a/packages/db-mongodb/src/utilities/buildProjectionFromSelect.ts
+++ b/packages/db-mongodb/src/utilities/buildProjectionFromSelect.ts
@@ -128,7 +128,6 @@ const traverseFields = ({
 
         break
       }
-
       case 'blocks': {
         const blocksSelect = select[field.name] as SelectType
 
diff --git a/packages/graphql/src/schema/buildMutationInputType.ts b/packages/graphql/src/schema/buildMutationInputType.ts
index 44e627b8ab..448ac80570 100644
--- a/packages/graphql/src/schema/buildMutationInputType.ts
+++ b/packages/graphql/src/schema/buildMutationInputType.ts
@@ -145,27 +145,37 @@ export function buildMutationInputType({
       },
     }),
     group: (inputObjectTypeConfig: InputObjectTypeConfig, field: GroupField) => {
-      const requiresAtLeastOneField = groupOrTabHasRequiredSubfield(field)
-      const fullName = combineParentName(parentName, toWords(field.name, true))
-      let type: GraphQLType = buildMutationInputType({
-        name: fullName,
-        config,
-        fields: field.fields,
-        graphqlResult,
-        parentIsLocalized: parentIsLocalized || field.localized,
-        parentName: fullName,
-      })
+      if (fieldAffectsData(field)) {
+        const requiresAtLeastOneField = groupOrTabHasRequiredSubfield(field)
+        const fullName = combineParentName(parentName, toWords(field.name, true))
+        let type: GraphQLType = buildMutationInputType({
+          name: fullName,
+          config,
+          fields: field.fields,
+          graphqlResult,
+          parentIsLocalized: parentIsLocalized || field.localized,
+          parentName: fullName,
+        })
 
-      if (!type) {
-        return inputObjectTypeConfig
-      }
+        if (!type) {
+          return inputObjectTypeConfig
+        }
 
-      if (requiresAtLeastOneField) {
-        type = new GraphQLNonNull(type)
-      }
-      return {
-        ...inputObjectTypeConfig,
-        [formatName(field.name)]: { type },
+        if (requiresAtLeastOneField) {
+          type = new GraphQLNonNull(type)
+        }
+        return {
+          ...inputObjectTypeConfig,
+          [formatName(field.name)]: { type },
+        }
+      } else {
+        return field.fields.reduce((acc, subField: CollapsibleField) => {
+          const addSubField = fieldToSchemaMap[subField.type]
+          if (addSubField) {
+            return addSubField(acc, subField)
+          }
+          return acc
+        }, inputObjectTypeConfig)
       }
     },
     json: (inputObjectTypeConfig: InputObjectTypeConfig, field: JSONField) => ({
diff --git a/packages/graphql/src/schema/fieldToSchemaMap.ts b/packages/graphql/src/schema/fieldToSchemaMap.ts
index fc5750add9..571bc61585 100644
--- a/packages/graphql/src/schema/fieldToSchemaMap.ts
+++ b/packages/graphql/src/schema/fieldToSchemaMap.ts
@@ -41,7 +41,7 @@ import {
 } from 'graphql'
 import { DateTimeResolver, EmailAddressResolver } from 'graphql-scalars'
 import { combineQueries, createDataloaderCacheKey, MissingEditorProp, toWords } from 'payload'
-import { tabHasName } from 'payload/shared'
+import { fieldAffectsData, tabHasName } from 'payload/shared'
 
 import type { Context } from '../resolvers/types.js'
 
@@ -302,44 +302,64 @@ export const fieldToSchemaMap: FieldToSchemaMap = {
     field,
     forceNullable,
     graphqlResult,
+    newlyCreatedBlockType,
     objectTypeConfig,
     parentIsLocalized,
     parentName,
   }) => {
-    const interfaceName =
-      field?.interfaceName || combineParentName(parentName, toWords(field.name, true))
+    if (fieldAffectsData(field)) {
+      const interfaceName =
+        field?.interfaceName || combineParentName(parentName, toWords(field.name, true))
 
-    if (!graphqlResult.types.groupTypes[interfaceName]) {
-      const objectType = buildObjectType({
-        name: interfaceName,
-        config,
-        fields: field.fields,
-        forceNullable: isFieldNullable({ field, forceNullable, parentIsLocalized }),
-        graphqlResult,
-        parentIsLocalized: field.localized || parentIsLocalized,
-        parentName: interfaceName,
-      })
+      if (!graphqlResult.types.groupTypes[interfaceName]) {
+        const objectType = buildObjectType({
+          name: interfaceName,
+          config,
+          fields: field.fields,
+          forceNullable: isFieldNullable({ field, forceNullable, parentIsLocalized }),
+          graphqlResult,
+          parentIsLocalized: field.localized || parentIsLocalized,
+          parentName: interfaceName,
+        })
 
-      if (Object.keys(objectType.getFields()).length) {
-        graphqlResult.types.groupTypes[interfaceName] = objectType
+        if (Object.keys(objectType.getFields()).length) {
+          graphqlResult.types.groupTypes[interfaceName] = objectType
+        }
       }
-    }
 
-    if (!graphqlResult.types.groupTypes[interfaceName]) {
-      return objectTypeConfig
-    }
+      if (!graphqlResult.types.groupTypes[interfaceName]) {
+        return objectTypeConfig
+      }
 
-    return {
-      ...objectTypeConfig,
-      [formatName(field.name)]: {
-        type: graphqlResult.types.groupTypes[interfaceName],
-        resolve: (parent, args, context: Context) => {
-          return {
-            ...parent[field.name],
-            _id: parent._id ?? parent.id,
-          }
+      return {
+        ...objectTypeConfig,
+        [formatName(field.name)]: {
+          type: graphqlResult.types.groupTypes[interfaceName],
+          resolve: (parent, args, context: Context) => {
+            return {
+              ...parent[field.name],
+              _id: parent._id ?? parent.id,
+            }
+          },
         },
-      },
+      }
+    } else {
+      return field.fields.reduce((objectTypeConfigWithCollapsibleFields, subField) => {
+        const addSubField: GenericFieldToSchemaMap = fieldToSchemaMap[subField.type]
+        if (addSubField) {
+          return addSubField({
+            config,
+            field: subField,
+            forceNullable,
+            graphqlResult,
+            newlyCreatedBlockType,
+            objectTypeConfig: objectTypeConfigWithCollapsibleFields,
+            parentIsLocalized,
+            parentName,
+          })
+        }
+        return objectTypeConfigWithCollapsibleFields
+      }, objectTypeConfig)
     }
   },
   join: ({ collectionSlug, field, graphqlResult, objectTypeConfig, parentName }) => {
diff --git a/packages/payload/src/auth/getFieldsToSign.ts b/packages/payload/src/auth/getFieldsToSign.ts
index f6a2b774f9..c66bf40ca3 100644
--- a/packages/payload/src/auth/getFieldsToSign.ts
+++ b/packages/payload/src/auth/getFieldsToSign.ts
@@ -28,25 +28,35 @@ const traverseFields = ({
         break
       }
       case 'group': {
-        let targetResult
-        if (typeof field.saveToJWT === 'string') {
-          targetResult = field.saveToJWT
-          result[field.saveToJWT] = data[field.name]
-        } else if (field.saveToJWT) {
-          targetResult = field.name
-          result[field.name] = data[field.name]
+        if (fieldAffectsData(field)) {
+          let targetResult
+          if (typeof field.saveToJWT === 'string') {
+            targetResult = field.saveToJWT
+            result[field.saveToJWT] = data[field.name]
+          } else if (field.saveToJWT) {
+            targetResult = field.name
+            result[field.name] = data[field.name]
+          }
+          const groupData: Record<string, unknown> = data[field.name] as Record<string, unknown>
+          const groupResult = (targetResult ? result[targetResult] : result) as Record<
+            string,
+            unknown
+          >
+          traverseFields({
+            data: groupData,
+            fields: field.fields,
+            result: groupResult,
+          })
+          break
+        } else {
+          traverseFields({
+            data,
+            fields: field.fields,
+            result,
+          })
+
+          break
         }
-        const groupData: Record<string, unknown> = data[field.name] as Record<string, unknown>
-        const groupResult = (targetResult ? result[targetResult] : result) as Record<
-          string,
-          unknown
-        >
-        traverseFields({
-          data: groupData,
-          fields: field.fields,
-          result: groupResult,
-        })
-        break
       }
       case 'tab': {
         if (tabHasName(field)) {
diff --git a/packages/payload/src/fields/config/types.ts b/packages/payload/src/fields/config/types.ts
index 159d9657b7..65fc86105c 100644
--- a/packages/payload/src/fields/config/types.ts
+++ b/packages/payload/src/fields/config/types.ts
@@ -719,7 +719,7 @@ export type DateFieldClient = {
 } & FieldBaseClient &
   Pick<DateField, 'timezone' | 'type'>
 
-export type GroupField = {
+export type GroupBase = {
   admin?: {
     components?: {
       afterInput?: CustomComponent[]
@@ -729,6 +729,11 @@ export type GroupField = {
     hideGutter?: boolean
   } & Admin
   fields: Field[]
+  type: 'group'
+  validate?: Validate<unknown, unknown, unknown, GroupField>
+} & Omit<FieldBase, 'validate'>
+
+export type NamedGroupField = {
   /** Customize generated GraphQL and Typescript schema names.
    * By default, it is bound to the collection.
    *
@@ -736,15 +741,39 @@ export type GroupField = {
    * **Note**: Top level types can collide, ensure they are unique amongst collections, arrays, groups, blocks, tabs.
    */
   interfaceName?: string
-  type: 'group'
-  validate?: Validate<unknown, unknown, unknown, GroupField>
-} & Omit<FieldBase, 'required' | 'validate'>
+} & GroupBase
 
-export type GroupFieldClient = {
-  admin?: AdminClient & Pick<GroupField['admin'], 'hideGutter'>
+export type UnnamedGroupField = {
+  interfaceName?: never
+  /**
+   * Can be either:
+   * - A string, which will be used as the tab's label.
+   * - An object, where the key is the language code and the value is the label.
+   */
+  label:
+    | {
+        [selectedLanguage: string]: string
+      }
+    | LabelFunction
+    | string
+  localized?: never
+} & Omit<GroupBase, 'name' | 'virtual'>
+
+export type GroupField = NamedGroupField | UnnamedGroupField
+
+export type NamedGroupFieldClient = {
+  admin?: AdminClient & Pick<NamedGroupField['admin'], 'hideGutter'>
   fields: ClientField[]
 } & Omit<FieldBaseClient, 'required'> &
-  Pick<GroupField, 'interfaceName' | 'type'>
+  Pick<NamedGroupField, 'interfaceName' | 'type'>
+
+export type UnnamedGroupFieldClient = {
+  admin?: AdminClient & Pick<UnnamedGroupField['admin'], 'hideGutter'>
+  fields: ClientField[]
+} & Omit<FieldBaseClient, 'required'> &
+  Pick<UnnamedGroupField, 'label' | 'type'>
+
+export type GroupFieldClient = NamedGroupFieldClient | UnnamedGroupFieldClient
 
 export type RowField = {
   admin?: Omit<Admin, 'description'>
@@ -1611,6 +1640,7 @@ export type FlattenedBlocksField = {
 
 export type FlattenedGroupField = {
   flattenedFields: FlattenedField[]
+  name: string
 } & GroupField
 
 export type FlattenedArrayField = {
@@ -1728,9 +1758,9 @@ export type FieldAffectingData =
   | CodeField
   | DateField
   | EmailField
-  | GroupField
   | JoinField
   | JSONField
+  | NamedGroupField
   | NumberField
   | PointField
   | RadioField
@@ -1749,9 +1779,9 @@ export type FieldAffectingDataClient =
   | CodeFieldClient
   | DateFieldClient
   | EmailFieldClient
-  | GroupFieldClient
   | JoinFieldClient
   | JSONFieldClient
+  | NamedGroupFieldClient
   | NumberFieldClient
   | PointFieldClient
   | RadioFieldClient
@@ -1771,8 +1801,8 @@ export type NonPresentationalField =
   | CollapsibleField
   | DateField
   | EmailField
-  | GroupField
   | JSONField
+  | NamedGroupField
   | NumberField
   | PointField
   | RadioField
@@ -1793,8 +1823,8 @@ export type NonPresentationalFieldClient =
   | CollapsibleFieldClient
   | DateFieldClient
   | EmailFieldClient
-  | GroupFieldClient
   | JSONFieldClient
+  | NamedGroupFieldClient
   | NumberFieldClient
   | PointFieldClient
   | RadioFieldClient
diff --git a/packages/payload/src/fields/hooks/afterChange/promise.ts b/packages/payload/src/fields/hooks/afterChange/promise.ts
index dc18f307d0..8d348fe209 100644
--- a/packages/payload/src/fields/hooks/afterChange/promise.ts
+++ b/packages/payload/src/fields/hooks/afterChange/promise.ts
@@ -212,25 +212,47 @@ export const promise = async ({
     }
 
     case 'group': {
-      await traverseFields({
-        blockData,
-        collection,
-        context,
-        data,
-        doc,
-        fields: field.fields,
-        global,
-        operation,
-        parentIndexPath: '',
-        parentIsLocalized: parentIsLocalized || field.localized,
-        parentPath: path,
-        parentSchemaPath: schemaPath,
-        previousDoc,
-        previousSiblingDoc: previousDoc[field.name] as JsonObject,
-        req,
-        siblingData: (siblingData?.[field.name] as JsonObject) || {},
-        siblingDoc: siblingDoc[field.name] as JsonObject,
-      })
+      if (fieldAffectsData(field)) {
+        await traverseFields({
+          blockData,
+          collection,
+          context,
+          data,
+          doc,
+          fields: field.fields,
+          global,
+          operation,
+          parentIndexPath: '',
+          parentIsLocalized: parentIsLocalized || field.localized,
+          parentPath: path,
+          parentSchemaPath: schemaPath,
+          previousDoc,
+          previousSiblingDoc: previousDoc[field.name] as JsonObject,
+          req,
+          siblingData: (siblingData?.[field.name] as JsonObject) || {},
+          siblingDoc: siblingDoc[field.name] as JsonObject,
+        })
+      } else {
+        await traverseFields({
+          blockData,
+          collection,
+          context,
+          data,
+          doc,
+          fields: field.fields,
+          global,
+          operation,
+          parentIndexPath: indexPath,
+          parentIsLocalized,
+          parentPath,
+          parentSchemaPath: schemaPath,
+          previousDoc,
+          previousSiblingDoc: { ...previousSiblingDoc },
+          req,
+          siblingData: siblingData || {},
+          siblingDoc: { ...siblingDoc },
+        })
+      }
 
       break
     }
diff --git a/packages/payload/src/fields/hooks/afterRead/promise.ts b/packages/payload/src/fields/hooks/afterRead/promise.ts
index 20612d465c..a06c7ab706 100644
--- a/packages/payload/src/fields/hooks/afterRead/promise.ts
+++ b/packages/payload/src/fields/hooks/afterRead/promise.ts
@@ -186,7 +186,7 @@ export const promise = async ({
     case 'group': {
       // Fill groups with empty objects so fields with hooks within groups can populate
       // themselves virtually as necessary
-      if (typeof siblingDoc[field.name] === 'undefined') {
+      if (fieldAffectsData(field) && typeof siblingDoc[field.name] === 'undefined') {
         siblingDoc[field.name] = {}
       }
 
@@ -609,45 +609,78 @@ export const promise = async ({
     }
 
     case 'group': {
-      let groupDoc = siblingDoc[field.name] as JsonObject
+      if (fieldAffectsData(field)) {
+        let groupDoc = siblingDoc[field.name] as JsonObject
 
-      if (typeof siblingDoc[field.name] !== 'object') {
-        groupDoc = {}
+        if (typeof siblingDoc[field.name] !== 'object') {
+          groupDoc = {}
+        }
+
+        const groupSelect = select?.[field.name]
+
+        traverseFields({
+          blockData,
+          collection,
+          context,
+          currentDepth,
+          depth,
+          doc,
+          draft,
+          fallbackLocale,
+          fieldPromises,
+          fields: field.fields,
+          findMany,
+          flattenLocales,
+          global,
+          locale,
+          overrideAccess,
+          parentIndexPath: '',
+          parentIsLocalized: parentIsLocalized || field.localized,
+          parentPath: path,
+          parentSchemaPath: schemaPath,
+          populate,
+          populationPromises,
+          req,
+          select: typeof groupSelect === 'object' ? groupSelect : undefined,
+          selectMode,
+          showHiddenFields,
+          siblingDoc: groupDoc,
+          triggerAccessControl,
+          triggerHooks,
+        })
+      } else {
+        traverseFields({
+          blockData,
+          collection,
+          context,
+          currentDepth,
+          depth,
+          doc,
+          draft,
+          fallbackLocale,
+          fieldPromises,
+          fields: field.fields,
+          findMany,
+          flattenLocales,
+          global,
+          locale,
+          overrideAccess,
+          parentIndexPath: indexPath,
+          parentIsLocalized,
+          parentPath,
+          parentSchemaPath: schemaPath,
+          populate,
+          populationPromises,
+          req,
+          select,
+          selectMode,
+          showHiddenFields,
+          siblingDoc,
+          triggerAccessControl,
+          triggerHooks,
+        })
       }
 
-      const groupSelect = select?.[field.name]
-
-      traverseFields({
-        blockData,
-        collection,
-        context,
-        currentDepth,
-        depth,
-        doc,
-        draft,
-        fallbackLocale,
-        fieldPromises,
-        fields: field.fields,
-        findMany,
-        flattenLocales,
-        global,
-        locale,
-        overrideAccess,
-        parentIndexPath: '',
-        parentIsLocalized: parentIsLocalized || field.localized,
-        parentPath: path,
-        parentSchemaPath: schemaPath,
-        populate,
-        populationPromises,
-        req,
-        select: typeof groupSelect === 'object' ? groupSelect : undefined,
-        selectMode,
-        showHiddenFields,
-        siblingDoc: groupDoc,
-        triggerAccessControl,
-        triggerHooks,
-      })
-
       break
     }
 
diff --git a/packages/payload/src/fields/hooks/beforeChange/promise.ts b/packages/payload/src/fields/hooks/beforeChange/promise.ts
index 89dee90827..27b5978c48 100644
--- a/packages/payload/src/fields/hooks/beforeChange/promise.ts
+++ b/packages/payload/src/fields/hooks/beforeChange/promise.ts
@@ -390,17 +390,42 @@ export const promise = async ({
     }
 
     case 'group': {
-      if (typeof siblingData[field.name] !== 'object') {
-        siblingData[field.name] = {}
+      let groupSiblingData = siblingData
+      let groupSiblingDoc = siblingDoc
+      let groupSiblingDocWithLocales = siblingDocWithLocales
+
+      const isNamedGroup = fieldAffectsData(field)
+
+      if (isNamedGroup) {
+        if (typeof siblingData[field.name] !== 'object') {
+          siblingData[field.name] = {}
+        }
+
+        if (typeof siblingDoc[field.name] !== 'object') {
+          siblingDoc[field.name] = {}
+        }
+
+        if (typeof siblingDocWithLocales[field.name] !== 'object') {
+          siblingDocWithLocales[field.name] = {}
+        }
+        if (typeof siblingData[field.name] !== 'object') {
+          siblingData[field.name] = {}
+        }
+
+        if (typeof siblingDoc[field.name] !== 'object') {
+          siblingDoc[field.name] = {}
+        }
+
+        if (typeof siblingDocWithLocales[field.name] !== 'object') {
+          siblingDocWithLocales[field.name] = {}
+        }
+
+        groupSiblingData = siblingData[field.name] as JsonObject
+        groupSiblingDoc = siblingDoc[field.name] as JsonObject
+        groupSiblingDocWithLocales = siblingDocWithLocales[field.name] as JsonObject
       }
 
-      if (typeof siblingDoc[field.name] !== 'object') {
-        siblingDoc[field.name] = {}
-      }
-
-      if (typeof siblingDocWithLocales[field.name] !== 'object') {
-        siblingDocWithLocales[field.name] = {}
-      }
+      const fallbackLabel = field?.label || (isNamedGroup ? field.name : field?.type)
 
       await traverseFields({
         id,
@@ -414,23 +439,20 @@ export const promise = async ({
         fieldLabelPath:
           field?.label === false
             ? fieldLabelPath
-            : buildFieldLabel(
-                fieldLabelPath,
-                getTranslatedLabel(field?.label || field?.name, req.i18n),
-              ),
+            : buildFieldLabel(fieldLabelPath, getTranslatedLabel(fallbackLabel, req.i18n)),
         fields: field.fields,
         global,
         mergeLocaleActions,
         operation,
         overrideAccess,
-        parentIndexPath: '',
+        parentIndexPath: isNamedGroup ? '' : indexPath,
         parentIsLocalized: parentIsLocalized || field.localized,
-        parentPath: path,
+        parentPath: isNamedGroup ? path : parentPath,
         parentSchemaPath: schemaPath,
         req,
-        siblingData: siblingData[field.name] as JsonObject,
-        siblingDoc: siblingDoc[field.name] as JsonObject,
-        siblingDocWithLocales: siblingDocWithLocales[field.name] as JsonObject,
+        siblingData: groupSiblingData,
+        siblingDoc: groupSiblingDoc,
+        siblingDocWithLocales: groupSiblingDocWithLocales,
         skipValidation: skipValidationFromHere,
       })
 
diff --git a/packages/payload/src/fields/hooks/beforeDuplicate/promise.ts b/packages/payload/src/fields/hooks/beforeDuplicate/promise.ts
index 2daa2a91b4..81e3e4481d 100644
--- a/packages/payload/src/fields/hooks/beforeDuplicate/promise.ts
+++ b/packages/payload/src/fields/hooks/beforeDuplicate/promise.ts
@@ -375,9 +375,10 @@ export const promise = async <T>({
       }
     }
   } else {
-    // Finally, we traverse fields which do not affect data here
+    // Finally, we traverse fields which do not affect data here - collapsibles, rows, unnamed groups
     switch (field.type) {
       case 'collapsible':
+      case 'group':
       case 'row': {
         await traverseFields({
           id,
diff --git a/packages/payload/src/fields/hooks/beforeValidate/promise.ts b/packages/payload/src/fields/hooks/beforeValidate/promise.ts
index 2cda4e9b38..f07dbbe759 100644
--- a/packages/payload/src/fields/hooks/beforeValidate/promise.ts
+++ b/packages/payload/src/fields/hooks/beforeValidate/promise.ts
@@ -447,16 +447,23 @@ export const promise = async <T>({
     }
 
     case 'group': {
-      if (typeof siblingData[field.name] !== 'object') {
-        siblingData[field.name] = {}
-      }
+      let groupSiblingData = siblingData
+      let groupSiblingDoc = siblingDoc
 
-      if (typeof siblingDoc[field.name] !== 'object') {
-        siblingDoc[field.name] = {}
-      }
+      const isNamedGroup = fieldAffectsData(field)
 
-      const groupData = siblingData[field.name] as Record<string, unknown>
-      const groupDoc = siblingDoc[field.name] as Record<string, unknown>
+      if (isNamedGroup) {
+        if (typeof siblingData[field.name] !== 'object') {
+          siblingData[field.name] = {}
+        }
+
+        if (typeof siblingDoc[field.name] !== 'object') {
+          siblingDoc[field.name] = {}
+        }
+
+        groupSiblingData = siblingData[field.name] as Record<string, unknown>
+        groupSiblingDoc = siblingDoc[field.name] as Record<string, unknown>
+      }
 
       await traverseFields({
         id,
@@ -469,13 +476,13 @@ export const promise = async <T>({
         global,
         operation,
         overrideAccess,
-        parentIndexPath: '',
+        parentIndexPath: isNamedGroup ? '' : indexPath,
         parentIsLocalized: parentIsLocalized || field.localized,
-        parentPath: path,
+        parentPath: isNamedGroup ? path : parentPath,
         parentSchemaPath: schemaPath,
         req,
-        siblingData: groupData as JsonObject,
-        siblingDoc: groupDoc as JsonObject,
+        siblingData: groupSiblingData,
+        siblingDoc: groupSiblingDoc,
       })
 
       break
diff --git a/packages/payload/src/index.ts b/packages/payload/src/index.ts
index f4d876f806..291d50e632 100644
--- a/packages/payload/src/index.ts
+++ b/packages/payload/src/index.ts
@@ -1282,6 +1282,8 @@ export type {
   JSONFieldClient,
   Labels,
   LabelsClient,
+  NamedGroupField,
+  NamedGroupFieldClient,
   NamedTab,
   NonPresentationalField,
   NonPresentationalFieldClient,
@@ -1318,6 +1320,8 @@ export type {
   TextFieldClient,
   UIField,
   UIFieldClient,
+  UnnamedGroupField,
+  UnnamedGroupFieldClient,
   UnnamedTab,
   UploadField,
   UploadFieldClient,
diff --git a/packages/payload/src/utilities/configToJSONSchema.ts b/packages/payload/src/utilities/configToJSONSchema.ts
index c00c95cbe6..daee3a0060 100644
--- a/packages/payload/src/utilities/configToJSONSchema.ts
+++ b/packages/payload/src/utilities/configToJSONSchema.ts
@@ -367,25 +367,26 @@ export function fieldsToJSONSchema(
             break
           }
 
-          case 'group':
-          case 'tab': {
-            fieldSchema = {
-              ...baseFieldSchema,
-              type: 'object',
-              additionalProperties: false,
-              ...fieldsToJSONSchema(
-                collectionIDFieldTypes,
-                field.flattenedFields,
-                interfaceNameDefinitions,
-                config,
-                i18n,
-              ),
-            }
+          case 'group': {
+            if (fieldAffectsData(field)) {
+              fieldSchema = {
+                ...baseFieldSchema,
+                type: 'object',
+                additionalProperties: false,
+                ...fieldsToJSONSchema(
+                  collectionIDFieldTypes,
+                  field.flattenedFields,
+                  interfaceNameDefinitions,
+                  config,
+                  i18n,
+                ),
+              }
 
-            if (field.interfaceName) {
-              interfaceNameDefinitions.set(field.interfaceName, fieldSchema)
+              if (field.interfaceName) {
+                interfaceNameDefinitions.set(field.interfaceName, fieldSchema)
 
-              fieldSchema = { $ref: `#/definitions/${field.interfaceName}` }
+                fieldSchema = { $ref: `#/definitions/${field.interfaceName}` }
+              }
             }
             break
           }
@@ -486,6 +487,7 @@ export function fieldsToJSONSchema(
             }
             break
           }
+
           case 'radio': {
             fieldSchema = {
               ...baseFieldSchema,
@@ -503,7 +505,6 @@ export function fieldsToJSONSchema(
 
             break
           }
-
           case 'relationship':
           case 'upload': {
             if (Array.isArray(field.relationTo)) {
@@ -595,7 +596,6 @@ export function fieldsToJSONSchema(
 
             break
           }
-
           case 'richText': {
             if (!field?.editor) {
               throw new MissingEditorProp(field) // while we allow disabling editor functionality, you should not have any richText fields defined if you do not have an editor
@@ -628,6 +628,7 @@ export function fieldsToJSONSchema(
 
             break
           }
+
           case 'select': {
             const optionEnums = buildOptionEnums(field.options)
             // We get the previous field to check for a date in the case of a timezone select
@@ -675,6 +676,27 @@ export function fieldsToJSONSchema(
 
             break
           }
+          case 'tab': {
+            fieldSchema = {
+              ...baseFieldSchema,
+              type: 'object',
+              additionalProperties: false,
+              ...fieldsToJSONSchema(
+                collectionIDFieldTypes,
+                field.flattenedFields,
+                interfaceNameDefinitions,
+                config,
+                i18n,
+              ),
+            }
+
+            if (field.interfaceName) {
+              interfaceNameDefinitions.set(field.interfaceName, fieldSchema)
+
+              fieldSchema = { $ref: `#/definitions/${field.interfaceName}` }
+            }
+            break
+          }
 
           case 'text':
             if (field.hasMany === true) {
diff --git a/packages/payload/src/utilities/fieldSchemaToJSON.ts b/packages/payload/src/utilities/fieldSchemaToJSON.ts
index 0b94e9f1eb..2f0e285197 100644
--- a/packages/payload/src/utilities/fieldSchemaToJSON.ts
+++ b/packages/payload/src/utilities/fieldSchemaToJSON.ts
@@ -1,7 +1,8 @@
 import type { ClientConfig } from '../config/client.js'
 // @ts-strict-ignore
 import type { ClientField } from '../fields/config/client.js'
-import type { FieldTypes } from '../fields/config/types.js'
+
+import { fieldAffectsData, type FieldTypes } from '../fields/config/types.js'
 
 export type FieldSchemaJSON = {
   blocks?: FieldSchemaJSON // TODO: conditionally add based on `type`
@@ -67,11 +68,15 @@ export const fieldSchemaToJSON = (fields: ClientField[], config: ClientConfig):
         break
 
       case 'group':
-        acc.push({
-          name: field.name,
-          type: field.type,
-          fields: fieldSchemaToJSON(field.fields, config),
-        })
+        if (fieldAffectsData(field)) {
+          acc.push({
+            name: field.name,
+            type: field.type,
+            fields: fieldSchemaToJSON(field.fields, config),
+          })
+        } else {
+          result = result.concat(fieldSchemaToJSON(field.fields, config))
+        }
 
         break
 
diff --git a/packages/payload/src/utilities/flattenAllFields.ts b/packages/payload/src/utilities/flattenAllFields.ts
index 97fa0b5dd3..9173e0885a 100644
--- a/packages/payload/src/utilities/flattenAllFields.ts
+++ b/packages/payload/src/utilities/flattenAllFields.ts
@@ -7,7 +7,7 @@ import type {
   FlattenedJoinField,
 } from '../fields/config/types.js'
 
-import { tabHasName } from '../fields/config/types.js'
+import { fieldAffectsData, tabHasName } from '../fields/config/types.js'
 
 export const flattenBlock = ({ block }: { block: Block }): FlattenedBlock => {
   return {
@@ -44,7 +44,13 @@ export const flattenAllFields = ({
     switch (field.type) {
       case 'array':
       case 'group': {
-        result.push({ ...field, flattenedFields: flattenAllFields({ fields: field.fields }) })
+        if (fieldAffectsData(field)) {
+          result.push({ ...field, flattenedFields: flattenAllFields({ fields: field.fields }) })
+        } else {
+          for (const nestedField of flattenAllFields({ fields: field.fields })) {
+            result.push(nestedField)
+          }
+        }
         break
       }
 
diff --git a/packages/payload/src/utilities/traverseFields.ts b/packages/payload/src/utilities/traverseFields.ts
index 63c01f7a55..7768b03eab 100644
--- a/packages/payload/src/utilities/traverseFields.ts
+++ b/packages/payload/src/utilities/traverseFields.ts
@@ -2,7 +2,11 @@
 import type { Config, SanitizedConfig } from '../config/types.js'
 import type { ArrayField, Block, BlocksField, Field, TabAsField } from '../fields/config/types.js'
 
-import { fieldHasSubFields, fieldShouldBeLocalized } from '../fields/config/types.js'
+import {
+  fieldAffectsData,
+  fieldHasSubFields,
+  fieldShouldBeLocalized,
+} from '../fields/config/types.js'
 
 const traverseArrayOrBlocksField = ({
   callback,
@@ -329,22 +333,38 @@ export const traverseFields = ({
         currentRef &&
         typeof currentRef === 'object'
       ) {
-        for (const key in currentRef as Record<string, unknown>) {
-          if (currentRef[key]) {
-            traverseFields({
-              callback,
-              callbackStack,
-              config,
-              fields: field.fields,
-              fillEmpty,
-              isTopLevel: false,
-              leavesFirst,
-              parentIsLocalized: true,
-              parentRef: currentParentRef,
-              ref: currentRef[key],
-            })
+        if (fieldAffectsData(field)) {
+          for (const key in currentRef as Record<string, unknown>) {
+            if (currentRef[key]) {
+              traverseFields({
+                callback,
+                callbackStack,
+                config,
+                fields: field.fields,
+                fillEmpty,
+                isTopLevel: false,
+                leavesFirst,
+                parentIsLocalized: true,
+                parentRef: currentParentRef,
+                ref: currentRef[key],
+              })
+            }
           }
+        } else {
+          traverseFields({
+            callback,
+            callbackStack,
+            config,
+            fields: field.fields,
+            fillEmpty,
+            isTopLevel: false,
+            leavesFirst,
+            parentIsLocalized,
+            parentRef: currentParentRef,
+            ref: currentRef,
+          })
         }
+
         return
       }
 
diff --git a/packages/ui/src/elements/WhereBuilder/reduceFields.tsx b/packages/ui/src/elements/WhereBuilder/reduceFields.tsx
index 76728b1c72..dadcba7c85 100644
--- a/packages/ui/src/elements/WhereBuilder/reduceFields.tsx
+++ b/packages/ui/src/elements/WhereBuilder/reduceFields.tsx
@@ -3,7 +3,7 @@ import type { ClientTranslationKeys, I18nClient } from '@payloadcms/translations
 import type { ClientField } from 'payload'
 
 import { getTranslation } from '@payloadcms/translations'
-import { fieldIsHiddenOrDisabled, fieldIsID, tabHasName } from 'payload/shared'
+import { fieldAffectsData, fieldIsHiddenOrDisabled, fieldIsID, tabHasName } from 'payload/shared'
 import { renderToStaticMarkup } from 'react-dom/server'
 
 import type { ReducedField } from './types.js'
@@ -100,7 +100,46 @@ export const reduceFields = ({
       return reduced
     }
 
-    if ((field.type === 'group' || field.type === 'array') && 'fields' in field) {
+    if (field.type === 'group' && 'fields' in field) {
+      const translatedLabel = getTranslation(field.label || '', i18n)
+
+      const labelWithPrefix = labelPrefix
+        ? translatedLabel
+          ? labelPrefix + ' > ' + translatedLabel
+          : labelPrefix
+        : translatedLabel
+
+      if (fieldAffectsData(field)) {
+        // Make sure we handle deeply nested groups
+        const pathWithPrefix = field.name
+          ? pathPrefix
+            ? pathPrefix + '.' + field.name
+            : field.name
+          : pathPrefix
+
+        reduced.push(
+          ...reduceFields({
+            fields: field.fields,
+            i18n,
+            labelPrefix: labelWithPrefix,
+            pathPrefix: pathWithPrefix,
+          }),
+        )
+      } else {
+        reduced.push(
+          ...reduceFields({
+            fields: field.fields,
+            i18n,
+            labelPrefix: labelWithPrefix,
+            pathPrefix,
+          }),
+        )
+      }
+
+      return reduced
+    }
+
+    if (field.type === 'array' && 'fields' in field) {
       const translatedLabel = getTranslation(field.label || '', i18n)
 
       const labelWithPrefix = labelPrefix
diff --git a/packages/ui/src/fields/Group/index.tsx b/packages/ui/src/fields/Group/index.tsx
index d46c53d876..e11df20098 100644
--- a/packages/ui/src/fields/Group/index.tsx
+++ b/packages/ui/src/fields/Group/index.tsx
@@ -28,6 +28,9 @@ export const GroupFieldComponent: GroupFieldClientComponent = (props) => {
   const {
     field,
     field: { name, admin: { className, description, hideGutter } = {}, fields, label },
+    indexPath,
+    parentPath,
+    parentSchemaPath,
     path,
     permissions,
     readOnly,
@@ -102,15 +105,28 @@ export const GroupFieldComponent: GroupFieldClientComponent = (props) => {
             </div>
           )}
           {BeforeInput}
-          <RenderFields
-            fields={fields}
-            margins="small"
-            parentIndexPath=""
-            parentPath={path}
-            parentSchemaPath={schemaPath}
-            permissions={permissions === true ? permissions : permissions?.fields}
-            readOnly={readOnly}
-          />
+          {/* Render an unnamed group differently */}
+          {name ? (
+            <RenderFields
+              fields={fields}
+              margins="small"
+              parentIndexPath=""
+              parentPath={path}
+              parentSchemaPath={schemaPath}
+              permissions={permissions === true ? permissions : permissions?.fields}
+              readOnly={readOnly}
+            />
+          ) : (
+            <RenderFields
+              fields={fields}
+              margins="small"
+              parentIndexPath={indexPath}
+              parentPath={parentPath}
+              parentSchemaPath={parentSchemaPath}
+              permissions={permissions === true ? permissions : permissions?.fields}
+              readOnly={readOnly}
+            />
+          )}
         </div>
       </GroupProvider>
       {AfterInput}
diff --git a/packages/ui/src/fields/Join/index.tsx b/packages/ui/src/fields/Join/index.tsx
index 43610cb406..334f8f506f 100644
--- a/packages/ui/src/fields/Join/index.tsx
+++ b/packages/ui/src/fields/Join/index.tsx
@@ -10,7 +10,7 @@ import type {
 } from 'payload'
 
 import ObjectIdImport from 'bson-objectid'
-import { flattenTopLevelFields } from 'payload/shared'
+import { fieldAffectsData, flattenTopLevelFields } from 'payload/shared'
 import React, { useMemo } from 'react'
 
 import { RelationshipTable } from '../../elements/RelationshipTable/index.js'
@@ -68,7 +68,7 @@ const getInitialDrawerData = ({
 
   const nextSegments = segments.slice(1, segments.length)
 
-  if (field.type === 'tab' || field.type === 'group') {
+  if (field.type === 'tab' || (field.type === 'group' && fieldAffectsData(field))) {
     return {
       [field.name]: getInitialDrawerData({
         collectionSlug,
diff --git a/packages/ui/src/forms/fieldSchemasToFormState/addFieldStatePromise.ts b/packages/ui/src/forms/fieldSchemasToFormState/addFieldStatePromise.ts
index 56035e4d1e..7032e2869c 100644
--- a/packages/ui/src/forms/fieldSchemasToFormState/addFieldStatePromise.ts
+++ b/packages/ui/src/forms/fieldSchemasToFormState/addFieldStatePromise.ts
@@ -734,7 +734,7 @@ export const addFieldStatePromise = async (args: AddFieldStatePromiseArgs): Prom
       }
     }
   } else if (fieldHasSubFields(field) && !fieldAffectsData(field)) {
-    // Handle field types that do not use names (row, collapsible, etc)
+    // Handle field types that do not use names (row, collapsible, unnamed group etc)
 
     if (!filter || filter(args)) {
       state[path] = {
diff --git a/packages/ui/src/forms/fieldSchemasToFormState/calculateDefaultValues/promise.ts b/packages/ui/src/forms/fieldSchemasToFormState/calculateDefaultValues/promise.ts
index 25b37c6b3d..70a8dff242 100644
--- a/packages/ui/src/forms/fieldSchemasToFormState/calculateDefaultValues/promise.ts
+++ b/packages/ui/src/forms/fieldSchemasToFormState/calculateDefaultValues/promise.ts
@@ -163,26 +163,40 @@ export const defaultValuePromise = async <T>({
       break
     }
     case 'group': {
-      if (typeof siblingData[field.name] !== 'object') {
-        siblingData[field.name] = {}
+      if (fieldAffectsData(field)) {
+        if (typeof siblingData[field.name] !== 'object') {
+          siblingData[field.name] = {}
+        }
+
+        const groupData = siblingData[field.name] as Record<string, unknown>
+
+        const groupSelect = select?.[field.name]
+
+        await iterateFields({
+          id,
+          data,
+          fields: field.fields,
+          locale,
+          req,
+          select: typeof groupSelect === 'object' ? groupSelect : undefined,
+          selectMode,
+          siblingData: groupData,
+          user,
+        })
+      } else {
+        await iterateFields({
+          id,
+          data,
+          fields: field.fields,
+          locale,
+          req,
+          select,
+          selectMode,
+          siblingData,
+          user,
+        })
       }
 
-      const groupData = siblingData[field.name] as Record<string, unknown>
-
-      const groupSelect = select?.[field.name]
-
-      await iterateFields({
-        id,
-        data,
-        fields: field.fields,
-        locale,
-        req,
-        select: typeof groupSelect === 'object' ? groupSelect : undefined,
-        selectMode,
-        siblingData: groupData,
-        user,
-      })
-
       break
     }
 
diff --git a/packages/ui/src/utilities/buildClientFieldSchemaMap/traverseFields.ts b/packages/ui/src/utilities/buildClientFieldSchemaMap/traverseFields.ts
index f52a686def..a77c98756a 100644
--- a/packages/ui/src/utilities/buildClientFieldSchemaMap/traverseFields.ts
+++ b/packages/ui/src/utilities/buildClientFieldSchemaMap/traverseFields.ts
@@ -1,7 +1,6 @@
 import type { I18n } from '@payloadcms/translations'
 
 import {
-  type ClientBlock,
   type ClientConfig,
   type ClientField,
   type ClientFieldSchemaMap,
@@ -10,7 +9,7 @@ import {
   type FieldSchemaMap,
   type Payload,
 } from 'payload'
-import { getFieldPaths, tabHasName } from 'payload/shared'
+import { fieldAffectsData, getFieldPaths, tabHasName } from 'payload/shared'
 
 type Args = {
   clientSchemaMap: ClientFieldSchemaMap
@@ -45,8 +44,7 @@ export const traverseFields = ({
     clientSchemaMap.set(schemaPath, field)
 
     switch (field.type) {
-      case 'array':
-      case 'group':
+      case 'array': {
         traverseFields({
           clientSchemaMap,
           config,
@@ -59,6 +57,7 @@ export const traverseFields = ({
         })
 
         break
+      }
 
       case 'blocks':
         ;(field.blockReferences ?? field.blocks).map((_block) => {
@@ -85,6 +84,7 @@ export const traverseFields = ({
         })
 
         break
+
       case 'collapsible':
       case 'row':
         traverseFields({
@@ -99,6 +99,33 @@ export const traverseFields = ({
         })
         break
 
+      case 'group': {
+        if (fieldAffectsData(field)) {
+          traverseFields({
+            clientSchemaMap,
+            config,
+            fields: field.fields,
+            i18n,
+            parentIndexPath: '',
+            parentSchemaPath: schemaPath,
+            payload,
+            schemaMap,
+          })
+        } else {
+          traverseFields({
+            clientSchemaMap,
+            config,
+            fields: field.fields,
+            i18n,
+            parentIndexPath: indexPath,
+            parentSchemaPath,
+            payload,
+            schemaMap,
+          })
+        }
+        break
+      }
+
       case 'richText': {
         // richText sub-fields are not part of the ClientConfig or the Config.
         // They only exist in the field schema map.
diff --git a/packages/ui/src/utilities/buildFieldSchemaMap/traverseFields.ts b/packages/ui/src/utilities/buildFieldSchemaMap/traverseFields.ts
index 805faa011d..a251b46e8f 100644
--- a/packages/ui/src/utilities/buildFieldSchemaMap/traverseFields.ts
+++ b/packages/ui/src/utilities/buildFieldSchemaMap/traverseFields.ts
@@ -2,7 +2,7 @@ import type { I18n } from '@payloadcms/translations'
 import type { Field, FieldSchemaMap, SanitizedConfig } from 'payload'
 
 import { MissingEditorProp } from 'payload'
-import { getFieldPaths, tabHasName } from 'payload/shared'
+import { fieldAffectsData, getFieldPaths, tabHasName } from 'payload/shared'
 
 type Args = {
   config: SanitizedConfig
@@ -34,7 +34,6 @@ export const traverseFields = ({
 
     switch (field.type) {
       case 'array':
-      case 'group':
         traverseFields({
           config,
           fields: field.fields,
@@ -66,6 +65,7 @@ export const traverseFields = ({
         })
 
         break
+
       case 'collapsible':
       case 'row':
         traverseFields({
@@ -79,6 +79,29 @@ export const traverseFields = ({
 
         break
 
+      case 'group':
+        if (fieldAffectsData(field)) {
+          traverseFields({
+            config,
+            fields: field.fields,
+            i18n,
+            parentIndexPath: '',
+            parentSchemaPath: schemaPath,
+            schemaMap,
+          })
+        } else {
+          traverseFields({
+            config,
+            fields: field.fields,
+            i18n,
+            parentIndexPath: indexPath,
+            parentSchemaPath,
+            schemaMap,
+          })
+        }
+
+        break
+
       case 'richText':
         if (!field?.editor) {
           throw new MissingEditorProp(field) // while we allow disabling editor functionality, you should not have any richText fields defined if you do not have an editor
diff --git a/packages/ui/src/utilities/copyDataFromLocale.ts b/packages/ui/src/utilities/copyDataFromLocale.ts
index 5bf9711c38..7d11a2e5cd 100644
--- a/packages/ui/src/utilities/copyDataFromLocale.ts
+++ b/packages/ui/src/utilities/copyDataFromLocale.ts
@@ -130,7 +130,11 @@ function iterateFields(
           break
 
         case 'group': {
-          if (field.name in toLocaleData && fromLocaleData?.[field.name] !== undefined) {
+          if (
+            fieldAffectsData(field) &&
+            field.name in toLocaleData &&
+            fromLocaleData?.[field.name] !== undefined
+          ) {
             iterateFields(
               field.fields,
               fromLocaleData[field.name],
@@ -138,6 +142,8 @@ function iterateFields(
               req,
               parentIsLocalized || field.localized,
             )
+          } else {
+            iterateFields(field.fields, fromLocaleData, toLocaleData, req, parentIsLocalized)
           }
           break
         }
diff --git a/test/fields/collections/Group/e2e.spec.ts b/test/fields/collections/Group/e2e.spec.ts
new file mode 100644
index 0000000000..d49fbabf43
--- /dev/null
+++ b/test/fields/collections/Group/e2e.spec.ts
@@ -0,0 +1,123 @@
+import type { Page } from '@playwright/test'
+
+import { expect, test } from '@playwright/test'
+import { addListFilter } from 'helpers/e2e/addListFilter.js'
+import path from 'path'
+import { wait } from 'payload/shared'
+import { fileURLToPath } from 'url'
+
+import type { PayloadTestSDK } from '../../../helpers/sdk/index.js'
+import type { Config } from '../../payload-types.js'
+
+import {
+  ensureCompilationIsDone,
+  initPageConsoleErrorCatch,
+  saveDocAndAssert,
+} from '../../../helpers.js'
+import { AdminUrlUtil } from '../../../helpers/adminUrlUtil.js'
+import { assertToastErrors } from '../../../helpers/assertToastErrors.js'
+import { initPayloadE2ENoConfig } from '../../../helpers/initPayloadE2ENoConfig.js'
+import { reInitializeDB } from '../../../helpers/reInitializeDB.js'
+import { RESTClient } from '../../../helpers/rest.js'
+import { TEST_TIMEOUT_LONG } from '../../../playwright.config.js'
+import { groupFieldsSlug } from '../../slugs.js'
+import { namedGroupDoc } from './shared.js'
+
+const filename = fileURLToPath(import.meta.url)
+const currentFolder = path.dirname(filename)
+const dirname = path.resolve(currentFolder, '../../')
+
+const { beforeAll, beforeEach, describe } = test
+
+let payload: PayloadTestSDK<Config>
+let client: RESTClient
+let page: Page
+let serverURL: string
+// If we want to make this run in parallel: test.describe.configure({ mode: 'parallel' })
+let url: AdminUrlUtil
+
+describe('Group', () => {
+  beforeAll(async ({ browser }, testInfo) => {
+    testInfo.setTimeout(TEST_TIMEOUT_LONG)
+    process.env.SEED_IN_CONFIG_ONINIT = 'false' // Makes it so the payload config onInit seed is not run. Otherwise, the seed would be run unnecessarily twice for the initial test run - once for beforeEach and once for onInit
+    ;({ payload, serverURL } = await initPayloadE2ENoConfig<Config>({
+      dirname,
+      // prebuild,
+    }))
+    url = new AdminUrlUtil(serverURL, groupFieldsSlug)
+
+    const context = await browser.newContext()
+    page = await context.newPage()
+    initPageConsoleErrorCatch(page)
+
+    await ensureCompilationIsDone({ page, serverURL })
+  })
+
+  beforeEach(async () => {
+    await reInitializeDB({
+      serverURL,
+      snapshotKey: 'fieldsTest',
+      uploadsDir: path.resolve(dirname, './collections/Upload/uploads'),
+    })
+    if (client) {
+      await client.logout()
+    }
+    client = new RESTClient({ defaultSlug: 'users', serverURL })
+    await client.login()
+    await ensureCompilationIsDone({ page, serverURL })
+  })
+
+  describe('Named', () => {
+    test('should display field in list view', async () => {
+      await page.goto(url.list)
+
+      const textCell = page.locator('.row-1 .cell-group')
+
+      await expect(textCell).toContainText(JSON.stringify(namedGroupDoc.group?.text), {
+        useInnerText: true,
+      })
+    })
+  })
+
+  describe('Unnamed', () => {
+    test('should display field in list view', async () => {
+      await page.goto(url.list)
+
+      const textCell = page.locator('.row-1 .cell-insideUnnamedGroup')
+
+      await expect(textCell).toContainText(namedGroupDoc?.insideUnnamedGroup ?? '', {
+        useInnerText: true,
+      })
+    })
+
+    test('should display field in list view deeply nested', async () => {
+      await page.goto(url.list)
+
+      const textCell = page.locator('.row-1 .cell-deeplyNestedGroup')
+
+      await expect(textCell).toContainText(JSON.stringify(namedGroupDoc.deeplyNestedGroup), {
+        useInnerText: true,
+      })
+    })
+
+    test('should display field visually within nested groups', async () => {
+      await page.goto(url.create)
+
+      // Makes sure the fields are rendered
+      await page.mouse.wheel(0, 2000)
+
+      const unnamedGroupSelector = `.field-type.group-field #field-insideUnnamedGroup`
+      const unnamedGroupField = page.locator(unnamedGroupSelector)
+
+      await expect(unnamedGroupField).toBeVisible()
+
+      // Makes sure the fields are rendered
+      await page.mouse.wheel(0, 2000)
+
+      // A bit repetitive but this selector should fail if the group is not nested
+      const unnamedNestedGroupSelector = `.field-type.group-field .field-type.group-field .field-type.group-field .field-type.group-field .field-type.group-field #field-deeplyNestedGroup__insideNestedUnnamedGroup`
+      const unnamedNestedGroupField = page.locator(unnamedNestedGroupSelector)
+      await expect(unnamedNestedGroupField).toBeVisible()
+    })
+  })
+})
diff --git a/test/fields/collections/Group/index.ts b/test/fields/collections/Group/index.ts
index b09c356fc8..1323c92fef 100644
--- a/test/fields/collections/Group/index.ts
+++ b/test/fields/collections/Group/index.ts
@@ -8,6 +8,9 @@ export const groupDefaultChild = 'child takes priority'
 const GroupFields: CollectionConfig = {
   slug: groupFieldsSlug,
   versions: true,
+  admin: {
+    defaultColumns: ['id', 'group', 'insideUnnamedGroup', 'deeplyNestedGroup'],
+  },
   fields: [
     {
       label: 'Group Field',
@@ -301,6 +304,51 @@ const GroupFields: CollectionConfig = {
         },
       ],
     },
+    {
+      type: 'group',
+      label: 'Unnamed group',
+      fields: [
+        {
+          type: 'text',
+          name: 'insideUnnamedGroup',
+        },
+      ],
+    },
+    {
+      type: 'group',
+      label: 'Deeply nested group',
+      fields: [
+        {
+          type: 'group',
+          label: 'Deeply nested group',
+          fields: [
+            {
+              type: 'group',
+              name: 'deeplyNestedGroup',
+              label: 'Deeply nested group',
+              fields: [
+                {
+                  type: 'group',
+                  label: 'Deeply nested group',
+                  fields: [
+                    {
+                      type: 'group',
+                      label: 'Deeply nested group',
+                      fields: [
+                        {
+                          type: 'text',
+                          name: 'insideNestedUnnamedGroup',
+                        },
+                      ],
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    },
   ],
 }
 
diff --git a/test/fields/collections/Group/shared.ts b/test/fields/collections/Group/shared.ts
index 8fe425b69a..021f4b63fd 100644
--- a/test/fields/collections/Group/shared.ts
+++ b/test/fields/collections/Group/shared.ts
@@ -1,6 +1,6 @@
 import type { GroupField } from '../../payload-types.js'
 
-export const groupDoc: Partial<GroupField> = {
+export const namedGroupDoc: Partial<GroupField> = {
   group: {
     text: 'some text within a group',
     subGroup: {
@@ -12,4 +12,8 @@ export const groupDoc: Partial<GroupField> = {
       ],
     },
   },
+  insideUnnamedGroup: 'text in unnamed group',
+  deeplyNestedGroup: {
+    insideNestedUnnamedGroup: 'text in nested unnamed group',
+  },
 }
diff --git a/test/fields/int.spec.ts b/test/fields/int.spec.ts
index 5ab7350323..157ee33ec5 100644
--- a/test/fields/int.spec.ts
+++ b/test/fields/int.spec.ts
@@ -15,7 +15,7 @@ import { arrayDefaultValue } from './collections/Array/index.js'
 import { blocksDoc } from './collections/Blocks/shared.js'
 import { dateDoc } from './collections/Date/shared.js'
 import { groupDefaultChild, groupDefaultValue } from './collections/Group/index.js'
-import { groupDoc } from './collections/Group/shared.js'
+import { namedGroupDoc } from './collections/Group/shared.js'
 import { defaultNumber } from './collections/Number/index.js'
 import { numberDoc } from './collections/Number/shared.js'
 import { pointDoc } from './collections/Point/shared.js'
@@ -1614,7 +1614,7 @@ describe('Fields', () => {
     it('should create with ids and nested ids', async () => {
       const docWithIDs = (await payload.create({
         collection: groupFieldsSlug,
-        data: groupDoc,
+        data: namedGroupDoc,
       })) as Partial<GroupField>
       expect(docWithIDs.group.subGroup.arrayWithinGroup[0].id).toBeDefined()
     })
@@ -1913,6 +1913,53 @@ describe('Fields', () => {
       })
     })
 
+    it('should work with unnamed group', async () => {
+      const groupDoc = await payload.create({
+        collection: groupFieldsSlug,
+        data: {
+          insideUnnamedGroup: 'Hello world',
+          deeplyNestedGroup: { insideNestedUnnamedGroup: 'Secondfield' },
+        },
+      })
+      expect(groupDoc).toMatchObject({
+        id: expect.anything(),
+        insideUnnamedGroup: 'Hello world',
+        deeplyNestedGroup: {
+          insideNestedUnnamedGroup: 'Secondfield',
+        },
+      })
+    })
+
+    it('should work with unnamed group - graphql', async () => {
+      const mutation = `mutation {
+              createGroupField(
+                data: {
+                  insideUnnamedGroup: "Hello world",
+                  deeplyNestedGroup: { insideNestedUnnamedGroup: "Secondfield" },
+                  group: {text: "hello"}
+                }
+              ) {
+                insideUnnamedGroup
+                deeplyNestedGroup {
+                  insideNestedUnnamedGroup
+                }
+              }
+            }`
+
+      const groupDoc = await restClient.GRAPHQL_POST({
+        body: JSON.stringify({ query: mutation }),
+      })
+
+      const data = (await groupDoc.json()).data.createGroupField
+
+      expect(data).toMatchObject({
+        insideUnnamedGroup: 'Hello world',
+        deeplyNestedGroup: {
+          insideNestedUnnamedGroup: 'Secondfield',
+        },
+      })
+    })
+
     it('should query a subfield within a localized group', async () => {
       const text = 'find this'
       const hit = await payload.create({
@@ -2357,7 +2404,7 @@ describe('Fields', () => {
     it('should return empty object for groups when no data present', async () => {
       const doc = await payload.create({
         collection: groupFieldsSlug,
-        data: groupDoc,
+        data: namedGroupDoc,
       })
 
       expect(doc.potentiallyEmptyGroup).toBeDefined()
diff --git a/test/fields/payload-types.ts b/test/fields/payload-types.ts
index c303ea6b4c..dd8b11bc81 100644
--- a/test/fields/payload-types.ts
+++ b/test/fields/payload-types.ts
@@ -1080,6 +1080,10 @@ export interface GroupField {
         }[]
       | null;
   };
+  insideUnnamedGroup?: string | null;
+  deeplyNestedGroup?: {
+    insideNestedUnnamedGroup?: string | null;
+  };
   updatedAt: string;
   createdAt: string;
 }
@@ -2676,6 +2680,12 @@ export interface GroupFieldsSelect<T extends boolean = true> {
     | {
         email?: T;
       };
+  insideUnnamedGroup?: T;
+  deeplyNestedGroup?:
+    | T
+    | {
+        insideNestedUnnamedGroup?: T;
+      };
   updatedAt?: T;
   createdAt?: T;
 }
diff --git a/test/fields/seed.ts b/test/fields/seed.ts
index 572a987f8d..ac71bad5d9 100644
--- a/test/fields/seed.ts
+++ b/test/fields/seed.ts
@@ -16,7 +16,7 @@ import { conditionalLogicDoc } from './collections/ConditionalLogic/shared.js'
 import { customRowID, customTabID, nonStandardID } from './collections/CustomID/shared.js'
 import { dateDoc } from './collections/Date/shared.js'
 import { anotherEmailDoc, emailDoc } from './collections/Email/shared.js'
-import { groupDoc } from './collections/Group/shared.js'
+import { namedGroupDoc } from './collections/Group/shared.js'
 import { jsonDoc } from './collections/JSON/shared.js'
 import { numberDoc } from './collections/Number/shared.js'
 import { pointDoc } from './collections/Point/shared.js'
@@ -223,7 +223,7 @@ export const seed = async (_payload: Payload) => {
 
   await _payload.create({
     collection: groupFieldsSlug,
-    data: groupDoc,
+    data: namedGroupDoc,
     depth: 0,
     overrideAccess: true,
   })
diff --git a/test/types/config.ts b/test/types/config.ts
index a929272ff1..f33cf08169 100644
--- a/test/types/config.ts
+++ b/test/types/config.ts
@@ -38,6 +38,26 @@ export default buildConfigWithDefaults({
             },
           ],
         },
+        {
+          type: 'group',
+          label: 'Unnamed Group',
+          fields: [
+            {
+              type: 'text',
+              name: 'insideUnnamedGroup',
+            },
+          ],
+        },
+        {
+          type: 'group',
+          name: 'namedGroup',
+          fields: [
+            {
+              type: 'text',
+              name: 'insideNamedGroup',
+            },
+          ],
+        },
         {
           name: 'radioField',
           type: 'radio',
diff --git a/test/types/payload-types.ts b/test/types/payload-types.ts
index 480f4509c6..543350e287 100644
--- a/test/types/payload-types.ts
+++ b/test/types/payload-types.ts
@@ -144,6 +144,10 @@ export interface Post {
   text?: string | null;
   title?: string | null;
   selectField: MySelectOptions;
+  insideUnnamedGroup?: string | null;
+  namedGroup?: {
+    insideNamedGroup?: string | null;
+  };
   radioField: MyRadioOptions;
   updatedAt: string;
   createdAt: string;
@@ -264,6 +268,12 @@ export interface PostsSelect<T extends boolean = true> {
   text?: T;
   title?: T;
   selectField?: T;
+  insideUnnamedGroup?: T;
+  namedGroup?:
+    | T
+    | {
+        insideNamedGroup?: T;
+      };
   radioField?: T;
   updatedAt?: T;
   createdAt?: T;
diff --git a/test/types/types.spec.ts b/test/types/types.spec.ts
index fb315ec113..d7184cbd50 100644
--- a/test/types/types.spec.ts
+++ b/test/types/types.spec.ts
@@ -145,4 +145,17 @@ describe('Types testing', () => {
       expect(asType<Post['radioField']>()).type.toBe<MyRadioOptions>()
     })
   })
+
+  describe('fields', () => {
+    describe('Group', () => {
+      test('correctly ignores unnamed group', () => {
+        expect<Post>().type.toHaveProperty('insideUnnamedGroup')
+      })
+
+      test('generates nested group name', () => {
+        expect<Post>().type.toHaveProperty('namedGroup')
+        expect<NonNullable<Post['namedGroup']>>().type.toHaveProperty('insideNamedGroup')
+      })
+    })
+  })
 })
diff --git a/tools/scripts/src/generateTranslations/utils/index.ts b/tools/scripts/src/generateTranslations/utils/index.ts
index b3cb8e8177..6a73e7fb6c 100644
--- a/tools/scripts/src/generateTranslations/utils/index.ts
+++ b/tools/scripts/src/generateTranslations/utils/index.ts
@@ -129,7 +129,7 @@ export async function translateObject(props: {
     for (const missingKey of missingKeys) {
       const keys: string[] = missingKey.split('.')
       const sourceText = keys.reduce(
-        (acc, key) => acc[key] as GenericTranslationsObject,
+        (acc, key) => acc[key],
         fromTranslationsObject,
       )
       if (!sourceText || typeof sourceText !== 'string') {
diff --git a/tsconfig.base.json b/tsconfig.base.json
index b7c0ef5d5c..12877b1be6 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -31,7 +31,7 @@
       }
     ],
     "paths": {
-      "@payload-config": ["./test/query-presets/config.ts"],
+      "@payload-config": ["./test/_community/config.ts"],
       "@payloadcms/admin-bar": ["./packages/admin-bar/src"],
       "@payloadcms/live-preview": ["./packages/live-preview/src"],
       "@payloadcms/live-preview-react": ["./packages/live-preview-react/src/index.ts"],

From 8ebadd4190fd9a8e42fdd7b7dad8076cd4808788 Mon Sep 17 00:00:00 2001
From: Sasha <64744993+r1tsuu@users.noreply.github.com>
Date: Thu, 15 May 2025 05:13:15 +0300
Subject: [PATCH 37/46] fix(ui): respect `filterOptions: { id: { in: [] } }`
 (#12408)

Fixes the issue where this returns all the documents:
```
{
  name: 'post',
  type: 'relationship',
  relationTo: 'posts',
  filterOptions: { id: { in: [] } }
}
```

The issue isn't with the Local API but with how we send the query to the
REST API through `qs.stringify`. `qs.stringify({ id: { in: [] } }`
becomes `""`, so the server ignores the original query. I don't think
it's possible to encode empty arrays with this library
https://github.com/sindresorhus/query-string/issues/231, so I just made
sanitization to `{ exists: false }` for this case.
---
 packages/ui/src/fields/Relationship/index.tsx |  3 +++
 .../utilities/sanitizeFilterOptionsQuery.ts   | 24 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 packages/ui/src/utilities/sanitizeFilterOptionsQuery.ts

diff --git a/packages/ui/src/fields/Relationship/index.tsx b/packages/ui/src/fields/Relationship/index.tsx
index 21cbaa4299..dc50b3d309 100644
--- a/packages/ui/src/fields/Relationship/index.tsx
+++ b/packages/ui/src/fields/Relationship/index.tsx
@@ -33,6 +33,7 @@ import { useConfig } from '../../providers/Config/index.js'
 import { useLocale } from '../../providers/Locale/index.js'
 import { useTranslation } from '../../providers/Translation/index.js'
 import './index.scss'
+import { sanitizeFilterOptionsQuery } from '../../utilities/sanitizeFilterOptionsQuery.js'
 import { mergeFieldStyles } from '../mergeFieldStyles.js'
 import { fieldBaseClass } from '../shared/index.js'
 import { createRelationMap } from './createRelationMap.js'
@@ -299,6 +300,8 @@ const RelationshipFieldComponent: RelationshipFieldClientComponent = (props) =>
               query.where.and.push(relationFilterOption)
             }
 
+            sanitizeFilterOptionsQuery(query.where)
+
             const response = await fetch(`${serverURL}${api}/${relation}`, {
               body: qs.stringify(query),
               credentials: 'include',
diff --git a/packages/ui/src/utilities/sanitizeFilterOptionsQuery.ts b/packages/ui/src/utilities/sanitizeFilterOptionsQuery.ts
new file mode 100644
index 0000000000..5f41af9250
--- /dev/null
+++ b/packages/ui/src/utilities/sanitizeFilterOptionsQuery.ts
@@ -0,0 +1,24 @@
+import type { Where } from 'payload'
+
+export const sanitizeFilterOptionsQuery = (query: Where): Where => {
+  for (const key in query) {
+    const value = query[key]
+    if ((key.toLowerCase() === 'and' || key.toLowerCase() === 'or') && Array.isArray(value)) {
+      for (const val of value) {
+        sanitizeFilterOptionsQuery(val)
+      }
+    } else if (
+      value &&
+      typeof value === 'object' &&
+      'in' in value &&
+      Array.isArray(value.in) &&
+      value.in.length === 0
+    ) {
+      {
+        query[key] = { exists: false }
+      }
+    }
+  }
+
+  return query
+}

From 77bb7e3638167d21ebc885eebdd5372884bbcd6d Mon Sep 17 00:00:00 2001
From: Dmitrijs Trifonovs <49034932+dt-globelaxy@users.noreply.github.com>
Date: Thu, 15 May 2025 04:15:50 +0100
Subject: [PATCH 38/46] feat: add latvian language support (#12363)

This PR adds Latvian language support, based on the instructions
provided in the documentation
---
 packages/payload/src/exports/i18n/lv.ts       |   1 +
 packages/translations/src/exports/all.ts      |   2 +
 packages/translations/src/languages/lv.ts     | 515 ++++++++++++++++++
 packages/translations/src/types.ts            |   1 +
 .../translations/src/utilities/languages.ts   |   2 +-
 5 files changed, 520 insertions(+), 1 deletion(-)
 create mode 100644 packages/payload/src/exports/i18n/lv.ts
 create mode 100644 packages/translations/src/languages/lv.ts

diff --git a/packages/payload/src/exports/i18n/lv.ts b/packages/payload/src/exports/i18n/lv.ts
new file mode 100644
index 0000000000..b94af42339
--- /dev/null
+++ b/packages/payload/src/exports/i18n/lv.ts
@@ -0,0 +1 @@
+export { lv } from '@payloadcms/translations/languages/lv'
diff --git a/packages/translations/src/exports/all.ts b/packages/translations/src/exports/all.ts
index e4e4a8d1f9..6832af1d53 100644
--- a/packages/translations/src/exports/all.ts
+++ b/packages/translations/src/exports/all.ts
@@ -20,6 +20,7 @@ import { it } from '../languages/it.js'
 import { ja } from '../languages/ja.js'
 import { ko } from '../languages/ko.js'
 import { lt } from '../languages/lt.js'
+import { lv } from '../languages/lv.js'
 import { my } from '../languages/my.js'
 import { nb } from '../languages/nb.js'
 import { nl } from '../languages/nl.js'
@@ -60,6 +61,7 @@ export const translations = {
   ja,
   ko,
   lt,
+  lv,
   my,
   nb,
   nl,
diff --git a/packages/translations/src/languages/lv.ts b/packages/translations/src/languages/lv.ts
new file mode 100644
index 0000000000..21e1b56ea1
--- /dev/null
+++ b/packages/translations/src/languages/lv.ts
@@ -0,0 +1,515 @@
+import type { Language } from '../types.js'
+
+export const lvTranslations = {
+  authentication: {
+    account: 'Konts',
+    accountOfCurrentUser: 'Pašreizējā lietotāja konts',
+    accountVerified: 'Konts veiksmīgi verificēts.',
+    alreadyActivated: 'Jau aktivizēts',
+    alreadyLoggedIn: 'Jau pieslēdzies',
+    apiKey: 'API atslēga',
+    authenticated: 'Autentificēts',
+    backToLogin: 'Atpakaļ uz pieslēgšanos',
+    beginCreateFirstUser: 'Lai sāktu, izveidojiet savu pirmo lietotāju.',
+    changePassword: 'Mainīt paroli',
+    checkYourEmailForPasswordReset:
+      'Ja e-pasta adrese ir saistīta ar kontu, drīz saņemsiet norādījumus paroles atiestatīšanai. Lūdzu, pārbaudiet arī surogātpasta mapi, ja e-pasts nav iesūtnē.',
+    confirmGeneration: 'Apstiprināt ģenerēšanu',
+    confirmPassword: 'Apstiprināt paroli',
+    createFirstUser: 'Izveidot pirmo lietotāju',
+    emailNotValid: 'Norādītais e-pasts nav derīgs',
+    emailOrUsername: 'E-pasts vai lietotājvārds',
+    emailSent: 'E-pasts nosūtīts',
+    emailVerified: 'E-pasts veiksmīgi verificēts.',
+    enableAPIKey: 'Ieslēgt API atslēgu',
+    failedToUnlock: 'Neizdevās atbloķēt',
+    forceUnlock: 'Piespiedu atbloķēšana',
+    forgotPassword: 'Aizmirsi paroli?',
+    forgotPasswordEmailInstructions:
+      'Lūdzu, ievadiet savu e-pastu zemāk. Saņemsiet ziņojumu ar norādījumiem paroles atiestatīšanai.',
+    forgotPasswordUsernameInstructions:
+      'Lūdzu, ievadiet savu lietotājvārdu zemāk. Norādījumi paroles atiestatīšanai tiks nosūtīti uz e-pastu, kas saistīts ar jūsu lietotājvārdu.',
+    usernameNotValid: 'Norādītais lietotājvārds nav derīgs',
+
+    forgotPasswordQuestion: 'Aizmirsi paroli?',
+    generate: 'Ģenerēt',
+    generateNewAPIKey: 'Ģenerēt jaunu API atslēgu',
+    generatingNewAPIKeyWillInvalidate:
+      'Ģenerējot jaunu API atslēgu, <1>iepriekšējā atslēga kļūs nederīga</1>. Vai tiešām vēlaties turpināt?',
+    lockUntil: 'Bloķēts līdz',
+    logBackIn: 'Pieslēgties atkārtoti',
+    loggedIn: 'Lai pieslēgtos ar citu lietotāju, vispirms <0>atslēdzieties</0>.',
+    loggedInChangePassword:
+      'Lai mainītu paroli, dodieties uz savu <0>kontu</0> un rediģējiet paroli tur.',
+    loggedOutInactivity: 'Jūs esat atslēgts neaktivitātes dēļ.',
+    loggedOutSuccessfully: 'Jūs veiksmīgi atslēdzāties.',
+    loggingOut: 'Notiek atslēgšanās...',
+    login: 'Pieslēgties',
+    loginAttempts: 'Pieslēgšanās mēģinājumi',
+    loginUser: 'Pieslēgt lietotāju',
+    loginWithAnotherUser: 'Lai pieslēgtos ar citu lietotāju, vispirms <0>atslēdzieties</0>.',
+    logOut: 'Atslēgties',
+    logout: 'Atslēgties',
+    logoutSuccessful: 'Atslēgšanās veiksmīga.',
+    logoutUser: 'Atslēgt lietotāju',
+    newAccountCreated:
+      'Jums tikko ir izveidots jauns konts piekļuvei <a href="{{serverURL}}">{{serverURL}}</a>. Lūdzu, noklikšķiniet uz šīs saites vai iekopējiet URL pārlūkprogrammā, lai verificētu savu e-pastu: <a href="{{verificationURL}}">{{verificationURL}}</a><br> Pēc e-pasta verificēšanas varēsiet veiksmīgi pieslēgties.',
+    newAPIKeyGenerated: 'Jauna API atslēga ģenerēta.',
+    newPassword: 'Jauna parole',
+    passed: 'Autentifikācija veiksmīga',
+    passwordResetSuccessfully: 'Parole veiksmīgi atiestatīta.',
+    resetPassword: 'Atiestatīt paroli',
+    resetPasswordExpiration: 'Paroles atiestatīšanas termiņš',
+    resetPasswordToken: 'Paroles atiestatīšanas tokens',
+    resetYourPassword: 'Atiestatīt savu paroli',
+    stayLoggedIn: 'Palikt pieslēgtam',
+    successfullyRegisteredFirstUser: 'Pirmais lietotājs veiksmīgi reģistrēts.',
+    successfullyUnlocked: 'Veiksmīgi atbloķēts',
+    tokenRefreshSuccessful: 'Tokens veiksmīgi atjaunots.',
+    unableToVerify: 'Neizdevās verificēt',
+    username: 'Lietotājvārds',
+    verified: 'Verificēts',
+    verifiedSuccessfully: 'Veiksmīgi verificēts',
+    verify: 'Verificēt',
+    verifyUser: 'Verificēt lietotāju',
+    verifyYourEmail: 'Verificējiet savu e-pastu',
+    youAreInactive:
+      'Jūs kādu laiku neesat bijis aktīvs, un drošības nolūkos drīz automātiski tiksiet atslēgts. Vai vēlaties palikt pieslēgts?',
+    youAreReceivingResetPassword:
+      'Jūs saņemat šo ziņojumu, jo (vai kāds cits) esat pieprasījis paroles atiestatīšanu savam kontam. Lūdzu, noklikšķiniet uz šīs saites vai iekopējiet to pārlūkprogrammā, lai pabeigtu procesu:',
+    youDidNotRequestPassword:
+      'Ja neesat pieprasījis paroles atiestatīšanu, lūdzu, ignorējiet šo e-pastu, un parole paliks nemainīta.',
+  },
+  error: {
+    accountAlreadyActivated: 'Šis konts jau ir aktivizēts.',
+    autosaving: 'Radās problēma, automātiski saglabājot šo dokumentu.',
+    correctInvalidFields: 'Lūdzu, izlabojiet nederīgos laukus.',
+    deletingFile: 'Radās kļūda, dzēšot failu.',
+    deletingTitle:
+      'Radās kļūda, dzēšot {{title}}. Lūdzu, pārbaudiet savienojumu un mēģiniet vēlreiz.',
+    emailOrPasswordIncorrect: 'Norādītais e-pasts vai parole nav pareiza.',
+    followingFieldsInvalid_one: 'Šis lauks nav derīgs:',
+    followingFieldsInvalid_other: 'Šie lauki nav derīgi:',
+    incorrectCollection: 'Nepareiza kolekcija',
+    invalidFileType: 'Nederīgs faila tips',
+    invalidFileTypeValue: 'Nederīgs faila tips: {{value}}',
+    invalidRequestArgs: 'Pieprasījumā nodoti nederīgi argumenti: {{args}}',
+    loadingDocument: 'Radās problēma, ielādējot dokumentu ar ID {{id}}.',
+    localesNotSaved_one: 'Šo lokalizāciju nevarēja saglabāt:',
+    localesNotSaved_other: 'Šīs lokalizācijas nevarēja saglabāt:',
+    logoutFailed: 'Neizdevās atslēgties.',
+    missingEmail: 'Trūkst e-pasta.',
+    missingIDOfDocument: 'Trūkst dokumenta ID, ko atjaunināt.',
+    missingIDOfVersion: 'Trūkst versijas ID.',
+    missingRequiredData: 'Trūkst nepieciešamo datu.',
+    noFilesUploaded: 'Nav augšupielādēti faili.',
+    noMatchedField: 'Nav atrasts atbilstošs lauks "{{label}}"',
+    notAllowedToAccessPage: 'Jums nav atļauts piekļūt šai lapai.',
+    notAllowedToPerformAction: 'Jums nav atļauts veikt šo darbību.',
+    notFound: 'Pieprasītais resurss nav atrasts.',
+    noUser: 'Nav lietotāja',
+    previewing: 'Radās problēma, priekšskatot šo dokumentu.',
+    problemUploadingFile: 'Radās problēma, augšupielādējot failu.',
+    tokenInvalidOrExpired: 'Tokens ir nederīgs vai beidzies.',
+    tokenNotProvided: 'Tokens nav norādīts.',
+    unableToDeleteCount: 'Neizdevās izdzēst {{count}} no {{total}} {{label}}.',
+    unableToReindexCollection:
+      'Radās kļūda, pārindeksējot kolekciju {{collection}}. Operācija pārtraukta.',
+    unableToUpdateCount: 'Neizdevās atjaunināt {{count}} no {{total}} {{label}}.',
+    unauthorized: 'Neautorizēts, jums jāpieslēdzas, lai veiktu šo pieprasījumu.',
+    unauthorizedAdmin: 'Neautorizēts, šim lietotājam nav piekļuves administrācijas panelim.',
+    unknown: 'Radās nezināma kļūda.',
+    unPublishingDocument: 'Radās problēma, atceļot dokumenta publicēšanu.',
+    unspecific: 'Radās kļūda.',
+    unverifiedEmail: 'Lūdzu, verificējiet savu e-pastu pirms pieslēgšanās.',
+    userEmailAlreadyRegistered: 'Lietotājs ar šo e-pastu jau ir reģistrēts.',
+    userLocked: 'Šis lietotājs ir bloķēts pārāk daudzu neveiksmīgu pieslēgšanās mēģinājumu dēļ.',
+    usernameAlreadyRegistered: 'Lietotājs ar šo lietotājvārdu jau ir reģistrēts.',
+    usernameOrPasswordIncorrect: 'Norādītais lietotājvārds vai parole nav pareiza.',
+    valueMustBeUnique: 'Vērtībai jābūt unikālai',
+    verificationTokenInvalid: 'Verifikācijas tokens nav derīgs.',
+  },
+  fields: {
+    addLabel: 'Pievienot {{label}}',
+    addLink: 'Pievienot saiti',
+    addNew: 'Pievienot jaunu',
+    addNewLabel: 'Pievienot jaunu {{label}}',
+    addRelationship: 'Pievienot saistību',
+    addUpload: 'Pievienot augšupielādi',
+    block: 'bloks',
+    blocks: 'bloki',
+    blockType: 'Bloka tips',
+    chooseBetweenCustomTextOrDocument:
+      'Izvēlieties starp pielāgotu teksta URL vai saiti uz citu dokumentu.',
+    chooseDocumentToLink: 'Izvēlieties dokumentu, uz kuru saistīt',
+    chooseFromExisting: 'Izvēlieties no esošajiem',
+    chooseLabel: 'Izvēlieties {{label}}',
+    collapseAll: 'Sakļaut visus',
+    customURL: 'Pielāgots URL',
+    editLabelData: 'Rediģēt {{label}} datus',
+    editLink: 'Rediģēt saiti',
+    editRelationship: 'Rediģēt saistību',
+    enterURL: 'Ievadiet URL',
+    internalLink: 'Iekšēja saite',
+    itemsAndMore: '{{items}} un vēl {{count}}',
+    labelRelationship: '{{label}} saistība',
+    latitude: 'Platums',
+    linkedTo: 'Saistīts ar <0>{{label}}</0>',
+    linkType: 'Saites tips',
+    longitude: 'Garums',
+    newLabel: 'Jauns {{label}}',
+    openInNewTab: 'Atvērt jaunā cilnē',
+    passwordsDoNotMatch: 'Paroles nesakrīt.',
+    relatedDocument: 'Saistītais dokuments',
+    relationTo: 'Saistība ar',
+    removeRelationship: 'Noņemt saistību',
+    removeUpload: 'Noņemt augšupielādi',
+    saveChanges: 'Saglabāt izmaiņas',
+    searchForBlock: 'Meklēt bloku',
+    selectExistingLabel: 'Izvēlēties esošo {{label}}',
+    selectFieldsToEdit: 'Izvēlēties laukus rediģēšanai',
+    showAll: 'Rādīt visus',
+    swapRelationship: 'Mainīt saistību',
+    swapUpload: 'Mainīt augšupielādi',
+    textToDisplay: 'Rādāmais teksts',
+    toggleBlock: 'Pārslēgt bloku',
+    uploadNewLabel: 'Augšupielādēt jaunu {{label}}',
+  },
+  general: {
+    aboutToDelete: 'Jūs grasāties dzēst {{label}} <1>{{title}}</1>. Vai esat pārliecināts?',
+    aboutToDeleteCount_many: 'Jūs grasāties dzēst {{count}} {{label}}',
+    aboutToDeleteCount_one: 'Jūs grasāties dzēst {{count}} {{label}}',
+    aboutToDeleteCount_other: 'Jūs grasāties dzēst {{count}} {{label}}',
+    addBelow: 'Pievienot zemāk',
+    addFilter: 'Pievienot filtru',
+    adminTheme: 'Administratora tēma',
+    all: 'Visi',
+    allCollections: 'Visas kolekcijas',
+    and: 'Un',
+    anotherUser: 'Cits lietotājs',
+    anotherUserTakenOver: 'Cits lietotājs ir pārņēmis šī dokumenta rediģēšanu.',
+    applyChanges: 'Pielietot izmaiņas',
+    ascending: 'Augošā secībā',
+    automatic: 'Automātiski',
+    backToDashboard: 'Atpakaļ uz paneli',
+    cancel: 'Atcelt',
+    changesNotSaved: 'Jūsu izmaiņas nav saglabātas. Ja tagad pametīsiet, izmaiņas tiks zaudētas.',
+    clearAll: 'Notīrīt visu',
+    close: 'Aizvērt',
+    collapse: 'Sakļaut',
+    collections: 'Kolekcijas',
+    columns: 'Kolonnas',
+    columnToSort: 'Kolonna kārtošanai',
+    confirm: 'Apstiprināt',
+    confirmCopy: 'Apstiprināt kopēšanu',
+    confirmDeletion: 'Apstiprināt dzēšanu',
+    confirmDuplication: 'Apstiprināt dublēšanu',
+    confirmReindex: 'Pārindeksēt visus {{collections}}?',
+    confirmReindexAll: 'Pārindeksēt visas kolekcijas?',
+    confirmReindexDescription:
+      'Tas noņems esošos indeksus un pārindeksēs dokumentus kolekcijās {{collections}}.',
+    confirmReindexDescriptionAll:
+      'Tas noņems esošos indeksus un pārindeksēs dokumentus visās kolekcijās.',
+    copied: 'Nokopēts',
+    copy: 'Kopēt',
+    copying: 'Kopē...',
+    copyWarning:
+      'Jūs grasāties pārrakstīt {{to}} ar {{from}} priekš {{label}} {{title}}. Vai esat pārliecināts?',
+    create: 'Izveidot',
+    created: 'Izveidots',
+    createdAt: 'Izveidots',
+    createNew: 'Izveidot jaunu',
+    createNewLabel: 'Izveidot jaunu {{label}}',
+    creating: 'Izveido...',
+    creatingNewLabel: 'Izveido jaunu {{label}}',
+    currentlyEditing:
+      'pašlaik rediģē šo dokumentu. Ja pārņemsiet, viņi tiks bloķēti no turpmākas rediģēšanas un var zaudēt nesaglabātās izmaiņas.',
+    custom: 'Pielāgots',
+    dark: 'Tumšs',
+    dashboard: 'Panelis',
+    delete: 'Dzēst',
+    deletedCountSuccessfully: 'Veiksmīgi izdzēsti {{count}} {{label}}.',
+    deletedSuccessfully: 'Veiksmīgi izdzēsts.',
+    deleting: 'Dzēš...',
+    depth: 'Dziļums',
+    descending: 'Dilstošā secībā',
+    deselectAllRows: 'Atdzēlēt visas rindas',
+    document: 'Dokuments',
+    documentLocked: 'Dokuments bloķēts',
+    documents: 'Dokumenti',
+    duplicate: 'Dublēt',
+    duplicateWithoutSaving: 'Dublēt bez izmaiņu saglabāšanas',
+    edit: 'Rediģēt',
+    editAll: 'Rediģēt visus',
+    editedSince: 'Rediģēts kopš',
+    editing: 'Rediģē',
+    editingLabel_many: 'Rediģē {{count}} {{label}}',
+    editingLabel_one: 'Rediģē {{count}} {{label}}',
+    editingLabel_other: 'Rediģē {{count}} {{label}}',
+    editingTakenOver: 'Rediģēšana pārņemta',
+    editLabel: 'Rediģēt {{label}}',
+    email: 'E-pasts',
+    emailAddress: 'E-pasta adrese',
+    enterAValue: 'Ievadiet vērtību',
+    error: 'Kļūda',
+    errors: 'Kļūdas',
+    fallbackToDefaultLocale: 'Izmantot noklusēto lokalizāciju',
+    false: 'Nepatiesi',
+    filter: 'Filtrs',
+    filters: 'Filtri',
+    filterWhere: 'Filtrēt {{label}} kur',
+    globals: 'Globālie',
+    goBack: 'Doties atpakaļ',
+    isEditing: 'redzē',
+    language: 'Valoda',
+    lastModified: 'Pēdējoreiz mainīts',
+    leaveAnyway: 'Pamest tāpat',
+    leaveWithoutSaving: 'Pamest nesaglabājot',
+    light: 'Gaišs',
+    livePreview: 'Tiešais priekšskatījums',
+    loading: 'Ielādē...',
+    locale: 'Lokalizācija',
+    locales: 'Lokalizācijas',
+    menu: 'Izvēlne',
+    moreOptions: 'Vairāk opciju',
+    moveDown: 'Pārvietot uz leju',
+    moveUp: 'Pārvietot uz augšu',
+    newPassword: 'Jauna parole',
+    next: 'Nākamais',
+    noDateSelected: 'Datums nav izvēlēts',
+    noFiltersSet: 'Nav uzstādīti filtri',
+    noLabel: '<Nav {{label}}>',
+    none: 'Nav',
+    noOptions: 'Nav opciju',
+    noResults:
+      'Nav atrasts neviens {{label}}. Vai nu vēl nav izveidots, vai neviens neatbilst augstāk norādītajiem filtriem.',
+    notFound: 'Nav atrasts',
+    nothingFound: 'Nekas nav atrasts',
+    noUpcomingEventsScheduled: 'Nav ieplānotu notikumu.',
+    noValue: 'Nav vērtības',
+    of: 'no',
+    only: 'Tikai',
+    open: 'Atvērt',
+    or: 'Vai',
+    order: 'Kārtība',
+    overwriteExistingData: 'Pārrakstīt esošos datus',
+    pageNotFound: 'Lapa nav atrasta',
+    password: 'Parole',
+    payloadSettings: 'Payload iestatījumi',
+    perPage: 'Lapas ieraksti: {{limit}}',
+    previous: 'Iepriekšējais',
+    reindex: 'Pārindeksēt',
+    reindexingAll: 'Pārindeksē visus {{collections}}.',
+    remove: 'Noņemt',
+    reset: 'Atiestatīt',
+    resetPreferences: 'Atiestatīt iestatījumus',
+    resetPreferencesDescription: 'Tas atjaunos visus jūsu iestatījumus uz noklusētajiem.',
+    resettingPreferences: 'Atiestata iestatījumus...',
+    row: 'Rinda',
+    rows: 'Rindas',
+    save: 'Saglabāt',
+    saving: 'Saglabā...',
+    schedulePublishFor: 'Ieplānot publicēšanu priekš {{title}}',
+    searchBy: 'Meklēt pēc {{label}}',
+    selectAll: 'Atlasīt visus {{count}} {{label}}',
+    selectAllRows: 'Atlasīt visas rindas',
+    selectedCount: 'Atlasīti {{count}} {{label}}',
+    selectLabel: 'Atlasīt {{label}}',
+    selectValue: 'Atlasīt vērtību',
+    showAllLabel: 'Rādīt visus {{label}}',
+    sorryNotFound: 'Atvainojiet — jūsu pieprasījumam neatbilst nekas.',
+    sort: 'Kārtot',
+    sortByLabelDirection: 'Kārtot pēc {{label}} {{direction}}',
+    stayOnThisPage: 'Palikt šajā lapā',
+    submissionSuccessful: 'Iesniegšana veiksmīga.',
+    submit: 'Iesniegt',
+    submitting: 'Iesniedz...',
+    success: 'Veiksmīgi',
+    successfullyCreated: '{{label}} veiksmīgi izveidots.',
+    successfullyDuplicated: '{{label}} veiksmīgi dublēts.',
+    successfullyReindexed:
+      'Veiksmīgi pārindeksēti {{count}} no {{total}} dokumentiem no {{collections}}',
+    takeOver: 'Pārņemt',
+    thisLanguage: 'Latviešu',
+    time: 'Laiks',
+    timezone: 'Laika zona',
+    titleDeleted: '{{label}} "{{title}}" veiksmīgi izdzēsts.',
+    true: 'Patiesi',
+    unauthorized: 'Neautorizēts',
+    unsavedChanges: 'Jums ir nesaglabātas izmaiņas. Saglabājiet vai atceliet pirms turpināšanas.',
+    unsavedChangesDuplicate: 'Jums ir nesaglabātas izmaiņas. Vai vēlaties turpināt dublēšanu?',
+    untitled: 'Bez nosaukuma',
+    upcomingEvents: 'Gaidāmie notikumi',
+    updatedAt: 'Atjaunināts',
+    updatedCountSuccessfully: 'Veiksmīgi atjaunināti {{count}} {{label}}.',
+    updatedLabelSuccessfully: '{{label}} veiksmīgi atjaunināts.',
+    updatedSuccessfully: 'Veiksmīgi atjaunināts.',
+    updateForEveryone: 'Atjaunināt visiem',
+    updating: 'Atjaunina',
+    uploading: 'Augšupielādē...',
+    uploadingBulk: 'Augšupielādē {{current}} no {{total}}',
+    user: 'Lietotājs',
+    username: 'Lietotājvārds',
+    users: 'Lietotāji',
+    value: 'Vērtība',
+    viewReadOnly: 'Skatīt tikai lasāmu',
+    welcome: 'Laipni lūdzam',
+  },
+  localization: {
+    cannotCopySameLocale: 'Nevar kopēt uz to pašu lokalizāciju',
+    copyFrom: 'Kopēt no',
+    copyFromTo: 'Kopē no {{from}} uz {{to}}',
+    copyTo: 'Kopēt uz',
+    copyToLocale: 'Kopēt uz lokalizāciju',
+    localeToPublish: 'Lokalizācija publicēšanai',
+    selectLocaleToCopy: 'Izvēlieties lokalizāciju, no kuras kopēt',
+  },
+  operators: {
+    contains: 'satur',
+    equals: 'ir vienāds ar',
+    exists: 'eksistē',
+    intersects: 'krustojas',
+    isGreaterThan: 'ir lielāks par',
+    isGreaterThanOrEqualTo: 'ir lielāks vai vienāds ar',
+    isIn: 'ir iekšā',
+    isLessThan: 'ir mazāks par',
+    isLessThanOrEqualTo: 'ir mazāks vai vienāds ar',
+    isLike: 'ir līdzīgs',
+    isNotEqualTo: 'nav vienāds ar',
+    isNotIn: 'nav iekšā',
+    isNotLike: 'nav līdzīgs',
+    near: 'tuvu',
+    within: 'iekšā',
+  },
+  upload: {
+    addFile: 'Pievienot failu',
+    addFiles: 'Pievienot failus',
+    bulkUpload: 'Masveida augšupielāde',
+    crop: 'Apgriezt',
+    cropToolDescription:
+      'Velciet atlasītā apgabala stūrus, uzzīmējiet jaunu apgabalu vai pielāgojiet vērtības zemāk.',
+    dragAndDrop: 'Ievelciet un nometiet failu',
+    dragAndDropHere: 'vai ievelciet un nometiet failu šeit',
+    editImage: 'Rediģēt attēlu',
+    fileName: 'Faila nosaukums',
+    fileSize: 'Faila izmērs',
+    filesToUpload: 'Faili augšupielādei',
+    fileToUpload: 'Fails augšupielādei',
+    focalPoint: 'Fokusa punkts',
+    focalPointDescription:
+      'Velciet fokusa punktu tieši priekšskatījumā vai pielāgojiet vērtības zemāk.',
+    height: 'Augstums',
+    lessInfo: 'Mazāk informācijas',
+    moreInfo: 'Vairāk informācijas',
+    noFile: 'Nav faila',
+    pasteURL: 'Ielīmēt URL',
+    previewSizes: 'Priekšskatījuma izmēri',
+    selectCollectionToBrowse: 'Izvēlieties kolekciju, ko pārlūkot',
+    selectFile: 'Izvēlieties failu',
+    setCropArea: 'Iestatīt apgriešanas apgabalu',
+    setFocalPoint: 'Iestatīt fokusa punktu',
+    sizes: 'Izmēri',
+    sizesFor: 'Izmēri priekš {{label}}',
+    width: 'Platums',
+  },
+  validation: {
+    emailAddress: 'Lūdzu, ievadiet derīgu e-pasta adresi.',
+    enterNumber: 'Lūdzu, ievadiet derīgu numuru.',
+    fieldHasNo: 'Šim laukam nav {{label}}',
+    greaterThanMax: '{{value}} ir lielāks par maksimāli atļauto {{label}}: {{max}}.',
+    invalidInput: 'Šim laukam ir nederīga ievade.',
+    invalidSelection: 'Šim laukam ir nederīga izvēle.',
+    invalidSelections: 'Šim laukam ir šādas nederīgas izvēles:',
+    lessThanMin: '{{value}} ir mazāks par minimāli atļauto {{label}}: {{min}}.',
+    limitReached: 'Sasniegts limits, var pievienot tikai {{max}} vienumus.',
+    longerThanMin: 'Šai vērtībai jābūt garākai par minimālo garumu: {{minLength}} rakstzīmes.',
+    notValidDate: '"{{value}}" nav derīgs datums.',
+    required: 'Šis lauks ir obligāts.',
+    requiresAtLeast: 'Šim laukam nepieciešami vismaz {{count}} {{label}}.',
+    requiresNoMoreThan: 'Šim laukam nepieciešams ne vairāk kā {{count}} {{label}}.',
+    requiresTwoNumbers: 'Šim laukam nepieciešami divi skaitļi.',
+    shorterThanMax: 'Šai vērtībai jābūt īsākai par maksimālo garumu: {{maxLength}} rakstzīmes.',
+    timezoneRequired: 'Nepieciešama laika josla.',
+    trueOrFalse: 'Šis lauks var būt tikai "true" vai "false".',
+    username:
+      'Lūdzu, ievadiet derīgu lietotājvārdu. Drīkst saturēt burtus, ciparus, defises, punktus un pasvītras.',
+    validUploadID: 'Šis lauks nav derīgs augšupielādes ID.',
+  },
+  version: {
+    type: 'Tips',
+    aboutToPublishSelection:
+      'Jūs grasāties publicēt visus {{label}} izvēlētajā sarakstā. Vai esat pārliecināts?',
+    aboutToRestore:
+      'Jūs grasāties atjaunot šo {{label}} dokumentu uz stāvokli, kādā tas bija {{versionDate}}.',
+    aboutToRestoreGlobal:
+      'Jūs grasāties atjaunot globālo {{label}} uz stāvokli, kādā tas bija {{versionDate}}.',
+    aboutToRevertToPublished:
+      'Jūs grasāties atsaukt šī dokumenta izmaiņas uz publicēto versiju. Vai esat pārliecināts?',
+    aboutToUnpublish: 'Jūs grasāties atcelt šī dokumenta publicēšanu. Vai esat pārliecināts?',
+    aboutToUnpublishSelection:
+      'Jūs grasāties atcelt publicēšanu visiem {{label}} izvēlētajā sarakstā. Vai esat pārliecināts?',
+    autosave: 'Automātiskā saglabāšana',
+    autosavedSuccessfully: 'Veiksmīgi automātiski saglabāts.',
+    autosavedVersion: 'Automātiski saglabāta versija',
+    changed: 'Mainīts',
+    changedFieldsCount_one: '{{count}} mainīts lauks',
+    changedFieldsCount_other: '{{count}} mainīti lauki',
+    compareVersion: 'Salīdzināt versiju ar:',
+    confirmPublish: 'Apstiprināt publicēšanu',
+    confirmRevertToSaved: 'Apstiprināt atgriešanu uz saglabāto',
+    confirmUnpublish: 'Apstiprināt publicēšanas atcelšanu',
+    confirmVersionRestoration: 'Apstiprināt versijas atjaunošanu',
+    currentDocumentStatus: 'Pašreizējais {{docStatus}} dokuments',
+    currentDraft: 'Pašreizējais melnraksts',
+    currentPublishedVersion: 'Pašreizējā publicētā versija',
+    draft: 'Melnraksts',
+    draftSavedSuccessfully: 'Melnraksts veiksmīgi saglabāts.',
+    lastSavedAgo: 'Pēdējo reizi saglabāts pirms {{distance}}',
+    modifiedOnly: 'Tikai modificētie',
+    noFurtherVersionsFound: 'Papildu versijas nav atrastas',
+    noRowsFound: 'Nav atrasts neviens {{label}}',
+    noRowsSelected: 'Nav atlasīts neviens {{label}}',
+    preview: 'Priekšskatījums',
+    previouslyPublished: 'Iepriekš publicēts',
+    problemRestoringVersion: 'Radās problēma, atjaunojot šo versiju',
+    publish: 'Publicēt',
+    publishAllLocales: 'Publicēt visas lokalizācijas',
+    publishChanges: 'Publicēt izmaiņas',
+    published: 'Publicēts',
+    publishIn: 'Publicēt {{locale}}',
+    publishing: 'Publicē...',
+    restoreAsDraft: 'Atjaunot kā melnrakstu',
+    restoredSuccessfully: 'Veiksmīgi atjaunots.',
+    restoreThisVersion: 'Atjaunot šo versiju',
+    restoring: 'Atjauno...',
+    reverting: 'Atgriež...',
+    revertToPublished: 'Atgriezt uz publicēto',
+    saveDraft: 'Saglabāt melnrakstu',
+    scheduledSuccessfully: 'Veiksmīgi ieplānots.',
+    schedulePublish: 'Ieplānot publicēšanu',
+    selectLocales: 'Izvēlēties lokalizācijas, ko rādīt',
+    selectVersionToCompare: 'Izvēlēties versiju salīdzināšanai',
+    showingVersionsFor: 'Rāda versijas priekš:',
+    showLocales: 'Rādīt lokalizācijas:',
+    status: 'Statuss',
+    unpublish: 'Atcelt publicēšanu',
+    unpublishing: 'Atceļ publicēšanu...',
+    version: 'Versija',
+    versionCount_many: 'Atrastas {{count}} versijas',
+    versionCount_none: 'Nav atrastu versiju',
+    versionCount_one: 'Atrasta {{count}} versija',
+    versionCount_other: 'Atrastas {{count}} versijas',
+    versionCreatedOn: '{{version}} izveidota:',
+    versionID: 'Versijas ID',
+    versions: 'Versijas',
+    viewingVersion: 'Skatās versiju priekš {{entityLabel}} {{documentTitle}}',
+    viewingVersionGlobal: 'Skatās versiju globālajam {{entityLabel}}',
+    viewingVersions: 'Skatās versijas priekš {{entityLabel}} {{documentTitle}}',
+    viewingVersionsGlobal: 'Skatās versijas globālajam {{entityLabel}}',
+  },
+}
+
+export const lv: Language = {
+  dateFNSKey: 'lv',
+  translations: lvTranslations,
+}
diff --git a/packages/translations/src/types.ts b/packages/translations/src/types.ts
index f8ae412718..3490409273 100644
--- a/packages/translations/src/types.ts
+++ b/packages/translations/src/types.ts
@@ -25,6 +25,7 @@ type DateFNSKeys =
   | 'ja'
   | 'ko'
   | 'lt'
+  | 'lv'
   | 'nb'
   | 'nl'
   | 'pl'
diff --git a/packages/translations/src/utilities/languages.ts b/packages/translations/src/utilities/languages.ts
index 315cb589d1..264da4daa1 100644
--- a/packages/translations/src/utilities/languages.ts
+++ b/packages/translations/src/utilities/languages.ts
@@ -23,6 +23,7 @@ export const acceptedLanguages = [
   'ja',
   'ko',
   'lt',
+  'lv',
   'my',
   'nb',
   'nl',
@@ -85,7 +86,6 @@ export const acceptedLanguages = [
    * 'ku-Arab',
    * 'ky-Cyrl',
    * 'lb',
-   * 'lv',
    * 'mi-Latn',
    * 'mk',
    * 'ml',

From 3edfd7cc6dcc368166aaf86e9aa199c62576c753 Mon Sep 17 00:00:00 2001
From: Dan Ribbens <DanRibbens@users.noreply.github.com>
Date: Thu, 15 May 2025 09:02:15 -0400
Subject: [PATCH 39/46] fix(db-postgres): v2-v3 migration errors with relation
 already exists (#12310)

This fixes issues identified in the predefined migration for
postgres v2-v3 including the following:


### relation already exists
Can error with the following:
```ts
{
  err: [DatabaseError],
  msg: 'Error running migration 20250502_020052_relationships_v2_v3 column "relation_id" of relation "table_name" already exists.'
}
```
This was happening when you run a migration with both a required
relationship or upload field and no schema specified in the db adapter.
When both of these are true the function that replaces `ADD COLUMN` and
`ALTER COLUMN` in order to add `NOT NULL` constraints for requried
fields, wasn't working. This resulted in the `ADD COLUMN` statement from
being being called multiple times instead of altering it after data had
been copied over.

### camelCase column change

Enum columns from using `select` or `radio` have changed from camelCase
to snake case in v3. This change was not accounted for in the
relationship migration and needed to be accounted for.

### DROP CONSTRAINT

It was pointed out by
[here](https://github.com/payloadcms/payload/issues/10162#issuecomment-2610018940)
that the `DROP CONSTRAINT` needs to include `IF EXISTS` so that it can
continue if the contraint was already removed in a previous statement.

fixes https://github.com/payloadcms/payload/issues/10162
---
 .../v2-v3/groupUpSQLStatements.ts             | 127 ++++++++++++--
 .../predefinedMigrations/v2-v3/index.ts       | 164 ++++++++++++------
 .../v2-v3/migrateRelationships.ts             |   4 +-
 3 files changed, 219 insertions(+), 76 deletions(-)

diff --git a/packages/drizzle/src/postgres/predefinedMigrations/v2-v3/groupUpSQLStatements.ts b/packages/drizzle/src/postgres/predefinedMigrations/v2-v3/groupUpSQLStatements.ts
index 0a9bfe2fea..e4c6f8accb 100644
--- a/packages/drizzle/src/postgres/predefinedMigrations/v2-v3/groupUpSQLStatements.ts
+++ b/packages/drizzle/src/postgres/predefinedMigrations/v2-v3/groupUpSQLStatements.ts
@@ -1,49 +1,126 @@
 export type Groups =
   | 'addColumn'
   | 'addConstraint'
+  | 'alterType'
+  | 'createIndex'
+  | 'createTable'
+  | 'createType'
+  | 'disableRowSecurity'
   | 'dropColumn'
   | 'dropConstraint'
+  | 'dropIndex'
   | 'dropTable'
+  | 'dropType'
   | 'notNull'
+  | 'renameColumn'
+  | 'setDefault'
 
 /**
- * Convert an "ADD COLUMN" statement to an "ALTER COLUMN" statement
- * example: ALTER TABLE "pages_blocks_my_block" ADD COLUMN "person_id" integer NOT NULL;
- * to: ALTER TABLE "pages_blocks_my_block" ALTER COLUMN "person_id" SET NOT NULL;
- * @param sql
+ * Convert an "ADD COLUMN" statement to an "ALTER COLUMN" statement.
+ * Works with or without a schema name.
+ *
+ * Examples:
+ * 'ALTER TABLE "pages_blocks_my_block" ADD COLUMN "person_id" integer NOT NULL;'
+ * => 'ALTER TABLE "pages_blocks_my_block" ALTER COLUMN "person_id" SET NOT NULL;'
+ *
+ * 'ALTER TABLE "public"."pages_blocks_my_block" ADD COLUMN "person_id" integer NOT NULL;'
+ * => 'ALTER TABLE "public"."pages_blocks_my_block" ALTER COLUMN "person_id" SET NOT NULL;'
  */
 function convertAddColumnToAlterColumn(sql) {
   // Regular expression to match the ADD COLUMN statement with its constraints
-  const regex = /ALTER TABLE ("[^"]+")\.(".*?") ADD COLUMN ("[^"]+") [\w\s]+ NOT NULL;/
+  const regex = /ALTER TABLE ((?:"[^"]+"\.)?"[^"]+") ADD COLUMN ("[^"]+") [^;]*?NOT NULL;/i
 
   // Replace the matched part with "ALTER COLUMN ... SET NOT NULL;"
-  return sql.replace(regex, 'ALTER TABLE $1.$2 ALTER COLUMN $3 SET NOT NULL;')
+  return sql.replace(regex, 'ALTER TABLE $1 ALTER COLUMN $2 SET NOT NULL;')
 }
 
 export const groupUpSQLStatements = (list: string[]): Record<Groups, string[]> => {
   const groups = {
+    /**
+     * example: ALTER TABLE "posts" ADD COLUMN "category_id" integer
+     */
     addColumn: 'ADD COLUMN',
-    // example: ALTER TABLE "posts" ADD COLUMN "category_id" integer
 
+    /**
+     * example:
+     *  DO $$ BEGIN
+     *   ALTER TABLE "pages_blocks_my_block" ADD CONSTRAINT "pages_blocks_my_block_person_id_users_id_fk" FOREIGN KEY ("person_id") REFERENCES "users"("id") ON DELETE cascade ON UPDATE no action;
+     *  EXCEPTION
+     *   WHEN duplicate_object THEN null;
+     *  END $$;
+     */
     addConstraint: 'ADD CONSTRAINT',
-    //example:
-    // DO $$ BEGIN
-    //  ALTER TABLE "pages_blocks_my_block" ADD CONSTRAINT "pages_blocks_my_block_person_id_users_id_fk" FOREIGN KEY ("person_id") REFERENCES "users"("id") ON DELETE cascade ON UPDATE no action;
-    // EXCEPTION
-    //  WHEN duplicate_object THEN null;
-    // END $$;
 
+    /**
+     * example: CREATE TABLE IF NOT EXISTS "payload_locked_documents" (
+     *  "id" serial PRIMARY KEY NOT NULL,
+     *  "global_slug" varchar,
+     *  "updated_at" timestamp(3) with time zone DEFAULT now() NOT NULL,
+     *  "created_at" timestamp(3) with time zone DEFAULT now() NOT NULL
+     * );
+     */
+    createTable: 'CREATE TABLE',
+
+    /**
+     * example: ALTER TABLE "_posts_v_rels" DROP COLUMN IF EXISTS "posts_id";
+     */
     dropColumn: 'DROP COLUMN',
-    // example: ALTER TABLE "_posts_v_rels" DROP COLUMN IF EXISTS "posts_id";
 
+    /**
+     * example: ALTER TABLE "_posts_v_rels" DROP CONSTRAINT "_posts_v_rels_posts_fk";
+     */
     dropConstraint: 'DROP CONSTRAINT',
-    // example: ALTER TABLE "_posts_v_rels" DROP CONSTRAINT "_posts_v_rels_posts_fk";
 
+    /**
+     * example: DROP TABLE "pages_rels";
+     */
     dropTable: 'DROP TABLE',
-    // example: DROP TABLE "pages_rels";
 
+    /**
+     * example: ALTER TABLE "pages_blocks_my_block" ALTER COLUMN "person_id" SET NOT NULL;
+     */
     notNull: 'NOT NULL',
-    // example: ALTER TABLE "pages_blocks_my_block" ALTER COLUMN "person_id" SET NOT NULL;
+
+    /**
+     * example: CREATE TYPE "public"."enum__pages_v_published_locale" AS ENUM('en', 'es');
+     */
+    createType: 'CREATE TYPE',
+
+    /**
+     * example: ALTER TYPE "public"."enum_pages_blocks_cta" ADD VALUE 'copy';
+     */
+    alterType: 'ALTER TYPE',
+
+    /**
+     * example: ALTER TABLE "categories_rels" DISABLE ROW LEVEL SECURITY;
+     */
+    disableRowSecurity: 'DISABLE ROW LEVEL SECURITY;',
+
+    /**
+     * example: DROP INDEX IF EXISTS "pages_title_idx";
+     */
+    dropIndex: 'DROP INDEX IF EXISTS',
+
+    /**
+     * example: ALTER TABLE "pages" ALTER COLUMN "_status" SET DEFAULT 'draft';
+     */
+    setDefault: 'SET DEFAULT',
+
+    /**
+     * example: CREATE INDEX IF NOT EXISTS "payload_locked_documents_global_slug_idx" ON "payload_locked_documents" USING btree ("global_slug");
+     */
+    createIndex: 'INDEX IF NOT EXISTS',
+
+    /**
+     * example: DROP TYPE "public"."enum__pages_v_published_locale";
+     */
+    dropType: 'DROP TYPE',
+
+    /**
+     * columns were renamed from camelCase to snake_case
+     * example: ALTER TABLE "forms" RENAME COLUMN "confirmationType" TO "confirmation_type";
+     */
+    renameColumn: 'RENAME COLUMN',
   }
 
   const result = Object.keys(groups).reduce((result, group: Groups) => {
@@ -51,7 +128,17 @@ export const groupUpSQLStatements = (list: string[]): Record<Groups, string[]> =
     return result
   }, {}) as Record<Groups, string[]>
 
+  // push multi-line changes to a single grouping
+  let isCreateTable = false
+
   for (const line of list) {
+    if (isCreateTable) {
+      result.createTable.push(line)
+      if (line.includes(');')) {
+        isCreateTable = false
+      }
+      continue
+    }
     Object.entries(groups).some(([key, value]) => {
       if (line.endsWith('NOT NULL;')) {
         // split up the ADD COLUMN and ALTER COLUMN NOT NULL statements
@@ -64,7 +151,11 @@ export const groupUpSQLStatements = (list: string[]): Record<Groups, string[]> =
         return true
       }
       if (line.includes(value)) {
-        result[key].push(line)
+        let statement = line
+        if (key === 'dropConstraint') {
+          statement = line.replace('" DROP CONSTRAINT "', '" DROP CONSTRAINT IF EXISTS "')
+        }
+        result[key].push(statement)
         return true
       }
     })
diff --git a/packages/drizzle/src/postgres/predefinedMigrations/v2-v3/index.ts b/packages/drizzle/src/postgres/predefinedMigrations/v2-v3/index.ts
index 63fd4111fd..9b68c5d4f6 100644
--- a/packages/drizzle/src/postgres/predefinedMigrations/v2-v3/index.ts
+++ b/packages/drizzle/src/postgres/predefinedMigrations/v2-v3/index.ts
@@ -20,6 +20,17 @@ type Args = {
   req?: Partial<PayloadRequest>
 }
 
+const runStatementGroup = async ({ adapter, db, debug, statements }) => {
+  const addColumnsStatement = statements.join('\n')
+
+  if (debug) {
+    adapter.payload.logger.info(debug)
+    adapter.payload.logger.info(addColumnsStatement)
+  }
+
+  await db.execute(sql.raw(addColumnsStatement))
+}
+
 /**
  * Moves upload and relationship columns from the join table and into the tables while moving data
  * This is done in the following order:
@@ -40,16 +51,7 @@ export const migratePostgresV2toV3 = async ({ debug, payload, req }: Args) => {
 
   // get the drizzle migrateUpSQL from drizzle using the last schema
   const { generateDrizzleJson, generateMigration, upSnapshot } = adapter.requireDrizzleKit()
-
-  const toSnapshot: Record<string, unknown> = {}
-
-  for (const key of Object.keys(adapter.schema).filter(
-    (key) => !key.startsWith('payload_locked_documents'),
-  )) {
-    toSnapshot[key] = adapter.schema[key]
-  }
-
-  const drizzleJsonAfter = generateDrizzleJson(toSnapshot) as DrizzleSnapshotJSON
+  const drizzleJsonAfter = generateDrizzleJson(adapter.schema) as DrizzleSnapshotJSON
 
   // Get the previous migration snapshot
   const previousSnapshot = fs
@@ -81,18 +83,62 @@ export const migratePostgresV2toV3 = async ({ debug, payload, req }: Args) => {
 
   const sqlUpStatements = groupUpSQLStatements(generatedSQL)
 
-  const addColumnsStatement = sqlUpStatements.addColumn.join('\n')
-
-  if (debug) {
-    payload.logger.info('CREATING NEW RELATIONSHIP COLUMNS')
-    payload.logger.info(addColumnsStatement)
-  }
-
   const db = await getTransaction(adapter, req)
 
-  await db.execute(sql.raw(addColumnsStatement))
+  await runStatementGroup({
+    adapter,
+    db,
+    debug: debug ? 'CREATING TYPES' : null,
+    statements: sqlUpStatements.createType,
+  })
+
+  await runStatementGroup({
+    adapter,
+    db,
+    debug: debug ? 'ALTERING TYPES' : null,
+    statements: sqlUpStatements.alterType,
+  })
+
+  await runStatementGroup({
+    adapter,
+    db,
+    debug: debug ? 'CREATING TABLES' : null,
+    statements: sqlUpStatements.createTable,
+  })
+
+  await runStatementGroup({
+    adapter,
+    db,
+    debug: debug ? 'RENAMING COLUMNS' : null,
+    statements: sqlUpStatements.renameColumn,
+  })
+
+  await runStatementGroup({
+    adapter,
+    db,
+    debug: debug ? 'CREATING NEW RELATIONSHIP COLUMNS' : null,
+    statements: sqlUpStatements.addColumn,
+  })
+
+  // SET DEFAULTS
+  await runStatementGroup({
+    adapter,
+    db,
+    debug: debug ? 'SETTING DEFAULTS' : null,
+    statements: sqlUpStatements.setDefault,
+  })
+
+  await runStatementGroup({
+    adapter,
+    db,
+    debug: debug ? 'CREATING INDEXES' : null,
+    statements: sqlUpStatements.createIndex,
+  })
 
   for (const collection of payload.config.collections) {
+    if (collection.slug === 'payload-locked-documents') {
+      continue
+    }
     const tableName = adapter.tableNameMap.get(toSnakeCase(collection.slug))
     const pathsToQuery: PathsToQuery = new Set()
 
@@ -238,52 +284,58 @@ export const migratePostgresV2toV3 = async ({ debug, payload, req }: Args) => {
   }
 
   // ADD CONSTRAINT
-  const addConstraintsStatement = sqlUpStatements.addConstraint.join('\n')
-
-  if (debug) {
-    payload.logger.info('ADDING CONSTRAINTS')
-    payload.logger.info(addConstraintsStatement)
-  }
-
-  await db.execute(sql.raw(addConstraintsStatement))
+  await runStatementGroup({
+    adapter,
+    db,
+    debug: debug ? 'ADDING CONSTRAINTS' : null,
+    statements: sqlUpStatements.addConstraint,
+  })
 
   // NOT NULL
-  const notNullStatements = sqlUpStatements.notNull.join('\n')
-
-  if (debug) {
-    payload.logger.info('NOT NULL CONSTRAINTS')
-    payload.logger.info(notNullStatements)
-  }
-
-  await db.execute(sql.raw(notNullStatements))
+  await runStatementGroup({
+    adapter,
+    db,
+    debug: debug ? 'NOT NULL CONSTRAINTS' : null,
+    statements: sqlUpStatements.notNull,
+  })
 
   // DROP TABLE
-  const dropTablesStatement = sqlUpStatements.dropTable.join('\n')
+  await runStatementGroup({
+    adapter,
+    db,
+    debug: debug ? 'DROPPING TABLES' : null,
+    statements: sqlUpStatements.dropTable,
+  })
 
-  if (debug) {
-    payload.logger.info('DROPPING TABLES')
-    payload.logger.info(dropTablesStatement)
-  }
-
-  await db.execute(sql.raw(dropTablesStatement))
+  // DROP INDEX
+  await runStatementGroup({
+    adapter,
+    db,
+    debug: debug ? 'DROPPING INDEXES' : null,
+    statements: sqlUpStatements.dropIndex,
+  })
 
   // DROP CONSTRAINT
-  const dropConstraintsStatement = sqlUpStatements.dropConstraint.join('\n')
-
-  if (debug) {
-    payload.logger.info('DROPPING CONSTRAINTS')
-    payload.logger.info(dropConstraintsStatement)
-  }
-
-  await db.execute(sql.raw(dropConstraintsStatement))
+  await runStatementGroup({
+    adapter,
+    db,
+    debug: debug ? 'DROPPING CONSTRAINTS' : null,
+    statements: sqlUpStatements.dropConstraint,
+  })
 
   // DROP COLUMN
-  const dropColumnsStatement = sqlUpStatements.dropColumn.join('\n')
+  await runStatementGroup({
+    adapter,
+    db,
+    debug: debug ? 'DROPPING COLUMNS' : null,
+    statements: sqlUpStatements.dropColumn,
+  })
 
-  if (debug) {
-    payload.logger.info('DROPPING COLUMNS')
-    payload.logger.info(dropColumnsStatement)
-  }
-
-  await db.execute(sql.raw(dropColumnsStatement))
+  // DROP TYPES
+  await runStatementGroup({
+    adapter,
+    db,
+    debug: debug ? 'DROPPING TYPES' : null,
+    statements: sqlUpStatements.dropType,
+  })
 }
diff --git a/packages/drizzle/src/postgres/predefinedMigrations/v2-v3/migrateRelationships.ts b/packages/drizzle/src/postgres/predefinedMigrations/v2-v3/migrateRelationships.ts
index 7295ac95fc..3ba98d164e 100644
--- a/packages/drizzle/src/postgres/predefinedMigrations/v2-v3/migrateRelationships.ts
+++ b/packages/drizzle/src/postgres/predefinedMigrations/v2-v3/migrateRelationships.ts
@@ -56,7 +56,7 @@ export const migrateRelationships = async ({
     ${where} ORDER BY parent_id LIMIT 500 OFFSET ${offset * 500};
   `
 
-    paginationResult = await adapter.drizzle.execute(sql.raw(`${paginationStatement}`))
+    paginationResult = await db.execute(sql.raw(`${paginationStatement}`))
 
     if (paginationResult.rows.length === 0) {
       return
@@ -72,7 +72,7 @@ export const migrateRelationships = async ({
       payload.logger.info(statement)
     }
 
-    const result = await adapter.drizzle.execute(sql.raw(`${statement}`))
+    const result = await db.execute(sql.raw(`${statement}`))
 
     const docsToResave: DocsToResave = {}
 

From 7498d09f1c2ee7aca1dee110d8102cfe18c985bb Mon Sep 17 00:00:00 2001
From: Jarrod Flesch <30633324+JarrodMFlesch@users.noreply.github.com>
Date: Thu, 15 May 2025 11:21:23 -0400
Subject: [PATCH 40/46] fix(next): tells webpack not to bundle the
 require-in-the-middle pkg (#12417)

---
 packages/next/src/withPayload.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/next/src/withPayload.js b/packages/next/src/withPayload.js
index eabc23de14..9b8dc5d481 100644
--- a/packages/next/src/withPayload.js
+++ b/packages/next/src/withPayload.js
@@ -132,6 +132,7 @@ export const withPayload = (nextConfig = {}, options = {}) => {
           'drizzle-kit/api',
           'sharp',
           'libsql',
+          'require-in-the-middle',
         ],
         ignoreWarnings: [
           ...(incomingWebpackConfig?.ignoreWarnings || []),

From 3e7db302ee0c2da875e09968581294ea19d247d3 Mon Sep 17 00:00:00 2001
From: Paul <paul@payloadcms.com>
Date: Thu, 15 May 2025 08:57:23 -0700
Subject: [PATCH 41/46] fix(richtext-lexical): newTab not being able to be
 checked to true by default (#12389)

Previously the value of new tab checkbox in the link feature was not
able to be set to true by default because we were passing `false` as a
default value.

This fixes that and adds test coverage for customising that link drawer.
---
 .../src/features/link/client/index.tsx        |  1 -
 test/lexical/baseConfig.ts                    |  2 +
 .../LexicalLinkFeature/e2e.spec.ts            | 79 +++++++++++++++++++
 .../collections/LexicalLinkFeature/index.ts   | 44 +++++++++++
 .../collections/LexicalLinkFeature/utils.ts   | 49 ++++++++++++
 test/lexical/payload-types.ts                 | 39 +++++++++
 test/lexical/slugs.ts                         |  2 +
 7 files changed, 215 insertions(+), 1 deletion(-)
 create mode 100644 test/lexical/collections/LexicalLinkFeature/e2e.spec.ts
 create mode 100644 test/lexical/collections/LexicalLinkFeature/index.ts
 create mode 100644 test/lexical/collections/LexicalLinkFeature/utils.ts

diff --git a/packages/richtext-lexical/src/features/link/client/index.tsx b/packages/richtext-lexical/src/features/link/client/index.tsx
index c8600e309d..2200c2d20b 100644
--- a/packages/richtext-lexical/src/features/link/client/index.tsx
+++ b/packages/richtext-lexical/src/features/link/client/index.tsx
@@ -64,7 +64,6 @@ const toolbarGroups: ToolbarGroup[] = [
 
           const linkFields: Partial<LinkFields> = {
             doc: null,
-            newTab: false,
           }
 
           editor.dispatchCommand(TOGGLE_LINK_WITH_MODAL_COMMAND, {
diff --git a/test/lexical/baseConfig.ts b/test/lexical/baseConfig.ts
index f163abbd30..1d86a2b7f9 100644
--- a/test/lexical/baseConfig.ts
+++ b/test/lexical/baseConfig.ts
@@ -11,6 +11,7 @@ import {
 } from './collections/Lexical/index.js'
 import { LexicalAccessControl } from './collections/LexicalAccessControl/index.js'
 import { LexicalInBlock } from './collections/LexicalInBlock/index.js'
+import { LexicalLinkFeature } from './collections/LexicalLinkFeature/index.js'
 import { LexicalLocalizedFields } from './collections/LexicalLocalized/index.js'
 import { LexicalMigrateFields } from './collections/LexicalMigrate/index.js'
 import { LexicalObjectReferenceBugCollection } from './collections/LexicalObjectReferenceBug/index.js'
@@ -28,6 +29,7 @@ export const baseConfig: Partial<Config> = {
   // ...extend config here
   collections: [
     LexicalFullyFeatured,
+    LexicalLinkFeature,
     getLexicalFieldsCollection({
       blocks: lexicalBlocks,
       inlineBlocks: lexicalInlineBlocks,
diff --git a/test/lexical/collections/LexicalLinkFeature/e2e.spec.ts b/test/lexical/collections/LexicalLinkFeature/e2e.spec.ts
new file mode 100644
index 0000000000..90e6e040d2
--- /dev/null
+++ b/test/lexical/collections/LexicalLinkFeature/e2e.spec.ts
@@ -0,0 +1,79 @@
+import { expect, test } from '@playwright/test'
+import { AdminUrlUtil } from 'helpers/adminUrlUtil.js'
+import { reInitializeDB } from 'helpers/reInitializeDB.js'
+import { lexicalLinkFeatureSlug } from 'lexical/slugs.js'
+import path from 'path'
+import { fileURLToPath } from 'url'
+
+import { ensureCompilationIsDone } from '../../../helpers.js'
+import { initPayloadE2ENoConfig } from '../../../helpers/initPayloadE2ENoConfig.js'
+import { TEST_TIMEOUT_LONG } from '../../../playwright.config.js'
+import { LexicalHelpers } from './utils.js'
+const filename = fileURLToPath(import.meta.url)
+const currentFolder = path.dirname(filename)
+const dirname = path.resolve(currentFolder, '../../')
+
+const { beforeAll, beforeEach, describe } = test
+
+// Unlike the other suites, this one runs in parallel, as they run on the `lexical-fully-featured/create` URL and are "pure" tests
+test.describe.configure({ mode: 'parallel' })
+
+const { serverURL } = await initPayloadE2ENoConfig({
+  dirname,
+})
+
+describe('Lexical Link Feature', () => {
+  beforeAll(async ({ browser }, testInfo) => {
+    testInfo.setTimeout(TEST_TIMEOUT_LONG)
+    process.env.SEED_IN_CONFIG_ONINIT = 'false' // Makes it so the payload config onInit seed is not run. Otherwise, the seed would be run unnecessarily twice for the initial test run - once for beforeEach and once for onInit
+    const page = await browser.newPage()
+    await ensureCompilationIsDone({ page, serverURL })
+    await page.close()
+  })
+  beforeEach(async ({ page }) => {
+    await reInitializeDB({
+      serverURL,
+      snapshotKey: 'fieldsTest',
+      uploadsDir: [
+        path.resolve(dirname, './collections/Upload/uploads'),
+        path.resolve(dirname, './collections/Upload2/uploads2'),
+      ],
+    })
+    const url = new AdminUrlUtil(serverURL, lexicalLinkFeatureSlug)
+    const lexical = new LexicalHelpers(page)
+    await page.goto(url.create)
+    await lexical.editor.first().focus()
+  })
+
+  test('can add new custom fields in link feature modal', async ({ page }) => {
+    const lexical = new LexicalHelpers(page)
+
+    await lexical.editor.fill('link')
+    await lexical.editor.selectText()
+
+    const linkButtonClass = `.rich-text-lexical__wrap .fixed-toolbar .toolbar-popup__button-link`
+    const linkButton = page.locator(linkButtonClass).first()
+
+    await linkButton.click()
+
+    const customField = lexical.drawer.locator('#field-someText')
+
+    await expect(customField).toBeVisible()
+  })
+
+  test('can set default value of newTab checkbox to checked', async ({ page }) => {
+    const lexical = new LexicalHelpers(page)
+
+    await lexical.editor.fill('link')
+    await lexical.editor.selectText()
+
+    const linkButtonClass = `.rich-text-lexical__wrap .fixed-toolbar .toolbar-popup__button-link`
+    const linkButton = page.locator(linkButtonClass).first()
+
+    await linkButton.click()
+
+    const checkboxField = lexical.drawer.locator(`[id^="field-newTab"]`)
+
+    await expect(checkboxField).toBeChecked()
+  })
+})
diff --git a/test/lexical/collections/LexicalLinkFeature/index.ts b/test/lexical/collections/LexicalLinkFeature/index.ts
new file mode 100644
index 0000000000..57f84a7be0
--- /dev/null
+++ b/test/lexical/collections/LexicalLinkFeature/index.ts
@@ -0,0 +1,44 @@
+import type { CheckboxField, CollectionConfig } from 'payload'
+
+import {
+  FixedToolbarFeature,
+  lexicalEditor,
+  LinkFeature,
+  TreeViewFeature,
+} from '@payloadcms/richtext-lexical'
+
+import { lexicalLinkFeatureSlug } from '../../slugs.js'
+
+export const LexicalLinkFeature: CollectionConfig = {
+  slug: lexicalLinkFeatureSlug,
+  labels: {
+    singular: 'Lexical Link Feature',
+    plural: 'Lexical Link Feature',
+  },
+  fields: [
+    {
+      name: 'richText',
+      type: 'richText',
+      editor: lexicalEditor({
+        features: ({ defaultFeatures }) => [
+          ...defaultFeatures,
+          TreeViewFeature(),
+          LinkFeature({
+            fields: ({ defaultFields }) => {
+              const modifiedFields = defaultFields.map((field) => {
+                if (field.name === 'newTab') {
+                  return { ...field, defaultValue: true } as CheckboxField
+                }
+
+                return field
+              })
+
+              return [...modifiedFields, { type: 'text', name: 'someText' }]
+            },
+          }),
+          FixedToolbarFeature(),
+        ],
+      }),
+    },
+  ],
+}
diff --git a/test/lexical/collections/LexicalLinkFeature/utils.ts b/test/lexical/collections/LexicalLinkFeature/utils.ts
new file mode 100644
index 0000000000..95030f7fee
--- /dev/null
+++ b/test/lexical/collections/LexicalLinkFeature/utils.ts
@@ -0,0 +1,49 @@
+import type { Page } from 'playwright'
+
+import { expect } from '@playwright/test'
+
+export class LexicalHelpers {
+  page: Page
+  constructor(page: Page) {
+    this.page = page
+  }
+
+  async save(container: 'document' | 'drawer') {
+    if (container === 'drawer') {
+      await this.drawer.getByText('Save').click()
+    } else {
+      throw new Error('Not implemented')
+    }
+    await this.page.waitForTimeout(1000)
+  }
+
+  async slashCommand(
+    // prettier-ignore
+    command: 'block' | 'check' | 'code' | 'h1' | 'h2' | 'h3' | 'h4' | 'h5' |'h6' | 'inline' 
+    | 'link' | 'ordered' | 'paragraph' | 'quote' | 'relationship' | 'unordered' | 'upload',
+  ) {
+    await this.page.keyboard.press(`/`)
+
+    const slashMenuPopover = this.page.locator('#slash-menu .slash-menu-popup')
+    await expect(slashMenuPopover).toBeVisible()
+    await this.page.keyboard.type(command)
+    await this.page.keyboard.press(`Enter`)
+    await expect(slashMenuPopover).toBeHidden()
+  }
+
+  get decorator() {
+    return this.editor.locator('[data-lexical-decorator="true"]')
+  }
+
+  get drawer() {
+    return this.page.locator('.drawer__content')
+  }
+
+  get editor() {
+    return this.page.locator('[data-lexical-editor="true"]')
+  }
+
+  get paragraph() {
+    return this.editor.locator('p')
+  }
+}
diff --git a/test/lexical/payload-types.ts b/test/lexical/payload-types.ts
index 1964b49ffb..1f99ec2658 100644
--- a/test/lexical/payload-types.ts
+++ b/test/lexical/payload-types.ts
@@ -84,6 +84,7 @@ export interface Config {
   blocks: {};
   collections: {
     'lexical-fully-featured': LexicalFullyFeatured;
+    'lexical-link-feature': LexicalLinkFeature;
     'lexical-fields': LexicalField;
     'lexical-migrate-fields': LexicalMigrateField;
     'lexical-localized-fields': LexicalLocalizedField;
@@ -103,6 +104,7 @@ export interface Config {
   collectionsJoins: {};
   collectionsSelect: {
     'lexical-fully-featured': LexicalFullyFeaturedSelect<false> | LexicalFullyFeaturedSelect<true>;
+    'lexical-link-feature': LexicalLinkFeatureSelect<false> | LexicalLinkFeatureSelect<true>;
     'lexical-fields': LexicalFieldsSelect<false> | LexicalFieldsSelect<true>;
     'lexical-migrate-fields': LexicalMigrateFieldsSelect<false> | LexicalMigrateFieldsSelect<true>;
     'lexical-localized-fields': LexicalLocalizedFieldsSelect<false> | LexicalLocalizedFieldsSelect<true>;
@@ -179,6 +181,30 @@ export interface LexicalFullyFeatured {
   updatedAt: string;
   createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "lexical-link-feature".
+ */
+export interface LexicalLinkFeature {
+  id: string;
+  richText?: {
+    root: {
+      type: string;
+      children: {
+        type: string;
+        version: number;
+        [k: string]: unknown;
+      }[];
+      direction: ('ltr' | 'rtl') | null;
+      format: 'left' | 'start' | 'center' | 'right' | 'end' | 'justify' | '';
+      indent: number;
+      version: number;
+    };
+    [k: string]: unknown;
+  } | null;
+  updatedAt: string;
+  createdAt: string;
+}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "lexical-fields".
@@ -804,6 +830,10 @@ export interface PayloadLockedDocument {
         relationTo: 'lexical-fully-featured';
         value: string | LexicalFullyFeatured;
       } | null)
+    | ({
+        relationTo: 'lexical-link-feature';
+        value: string | LexicalLinkFeature;
+      } | null)
     | ({
         relationTo: 'lexical-fields';
         value: string | LexicalField;
@@ -903,6 +933,15 @@ export interface LexicalFullyFeaturedSelect<T extends boolean = true> {
   updatedAt?: T;
   createdAt?: T;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "lexical-link-feature_select".
+ */
+export interface LexicalLinkFeatureSelect<T extends boolean = true> {
+  richText?: T;
+  updatedAt?: T;
+  createdAt?: T;
+}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "lexical-fields_select".
diff --git a/test/lexical/slugs.ts b/test/lexical/slugs.ts
index 73cf167101..502cec89cf 100644
--- a/test/lexical/slugs.ts
+++ b/test/lexical/slugs.ts
@@ -2,6 +2,8 @@ export const usersSlug = 'users'
 
 export const lexicalFullyFeaturedSlug = 'lexical-fully-featured'
 export const lexicalFieldsSlug = 'lexical-fields'
+
+export const lexicalLinkFeatureSlug = 'lexical-link-feature'
 export const lexicalLocalizedFieldsSlug = 'lexical-localized-fields'
 export const lexicalMigrateFieldsSlug = 'lexical-migrate-fields'
 export const lexicalRelationshipFieldsSlug = 'lexical-relationship-fields'

From 5fce5015891ec2b6992a939cbfae874c8009e828 Mon Sep 17 00:00:00 2001
From: Sasha <64744993+r1tsuu@users.noreply.github.com>
Date: Thu, 15 May 2025 20:40:24 +0300
Subject: [PATCH 42/46] fix(db-postgres): `dbName` in arrays regression with
 long generated drizzle relation names (#12237)

Fixes https://github.com/payloadcms/payload/issues/12136 which caused by
regression from https://github.com/payloadcms/payload/pull/11995

The previous PR solved an issue where the generated drizzle relation
name was too long because of Payload field names, for example
```
{
  name: 'thisIsALongFieldNameThatWillCauseAPostgresErrorEvenThoughWeSetAShorterDBName',
  dbName: 'shortname',
  type: 'array',
  fields: [
    {
      name: 'nested_field_1',
      type: 'array',
      dbName: 'short_nested_1',
      fields: [],
    },
    {
      name: 'nested_field_2',
      type: 'text',
    },
  ],
},
```
But it caused regression, when custom `dbName` vice versa caused long
relation names:
```
export const Header: GlobalConfig = {
  slug: 'header',
  fields: [
    {
      name: 'itemsLvl1',
      type: 'array',
      dbName: 'header_items_lvl1',
      fields: [
        {
          name: 'label',
          type: 'text',
        },
        {
          name: 'itemsLvl2',
          type: 'array',
          dbName: 'header_items_lvl2',
          fields: [
            {
              name: 'label',
              type: 'text',
            },
            {
              name: 'itemsLvl3',
              type: 'array',
              dbName: 'header_items_lvl3',
              fields: [
                {
                  name: 'label',
                  type: 'text',
                },
                {
                  name: 'itemsLvl4',
                  type: 'array',
                  dbName: 'header_items_lvl4',
                  fields: [
                    {
                      name: 'label',
                      type: 'text',
                    },
                  ],
                },
              ],
            },
          ],
        },
      ],
    },
  ],
}
```

Notice if you calculate the generated relation name for `itemsLvl4` you
get:

`header__header_items_lvl1__header_items_lvl2__header_items_lvl3_header_items_lvl4`
- 81 characters, Drizzle, for joining shrink the alias to 63 characters
-`header__header_items_lvl1__header_items_lvl2__header_items_lvl3` and
Postgres throws:
```
error: table name "header__header_items_lvl1__header_items_lvl2__header_items_lvl3" specified more than once
```
---
 packages/drizzle/src/find/traverseFields.ts   |   8 +-
 packages/drizzle/src/schema/traverseFields.ts |   7 +-
 .../src/transform/read/traverseFields.ts      |   5 +-
 .../src/utilities/getArrayRelationName.ts     |  17 +
 test/database/config.ts                       |  49 ++
 test/database/int.spec.ts                     |  11 +
 test/database/payload-types.ts                |  68 ++
 .../migrations/20250328_185055.json           | 463 -------------
 .../migrations/20250328_185055.ts             | 122 ----
 .../migrations/20250428_121536.json           | 639 ++++++++++++++++++
 .../migrations/20250428_121536.ts             | 112 +++
 .../up-down-migration/migrations/index.ts     |   8 +-
 12 files changed, 915 insertions(+), 594 deletions(-)
 create mode 100644 packages/drizzle/src/utilities/getArrayRelationName.ts
 delete mode 100644 test/database/up-down-migration/migrations/20250328_185055.json
 delete mode 100644 test/database/up-down-migration/migrations/20250328_185055.ts
 create mode 100644 test/database/up-down-migration/migrations/20250428_121536.json
 create mode 100644 test/database/up-down-migration/migrations/20250428_121536.ts

diff --git a/packages/drizzle/src/find/traverseFields.ts b/packages/drizzle/src/find/traverseFields.ts
index 5d1c1bd170..d6ad716239 100644
--- a/packages/drizzle/src/find/traverseFields.ts
+++ b/packages/drizzle/src/find/traverseFields.ts
@@ -22,6 +22,7 @@ import type { Result } from './buildFindManyArgs.js'
 import buildQuery from '../queries/buildQuery.js'
 import { getTableAlias } from '../queries/getTableAlias.js'
 import { operatorMap } from '../queries/operatorMap.js'
+import { getArrayRelationName } from '../utilities/getArrayRelationName.js'
 import { getNameFromDrizzleTable } from '../utilities/getNameFromDrizzleTable.js'
 import { jsonAggBuildObject } from '../utilities/json.js'
 import { rawConstraint } from '../utilities/rawConstraint.js'
@@ -196,7 +197,12 @@ export const traverseFields = ({
           }
         }
 
-        const relationName = field.dbName ? `_${arrayTableName}` : `${path}${field.name}`
+        const relationName = getArrayRelationName({
+          field,
+          path: `${path}${field.name}`,
+          tableName: arrayTableName,
+        })
+
         currentArgs.with[relationName] = withArray
 
         traverseFields({
diff --git a/packages/drizzle/src/schema/traverseFields.ts b/packages/drizzle/src/schema/traverseFields.ts
index a10c09e704..79136ec2f0 100644
--- a/packages/drizzle/src/schema/traverseFields.ts
+++ b/packages/drizzle/src/schema/traverseFields.ts
@@ -23,6 +23,7 @@ import type {
 
 import { createTableName } from '../createTableName.js'
 import { buildIndexName } from '../utilities/buildIndexName.js'
+import { getArrayRelationName } from '../utilities/getArrayRelationName.js'
 import { hasLocalesTable } from '../utilities/hasLocalesTable.js'
 import { validateExistingBlockIsIdentical } from '../utilities/validateExistingBlockIsIdentical.js'
 import { buildTable } from './build.js'
@@ -288,7 +289,11 @@ export const traverseFields = ({
           }
         }
 
-        const relationName = field.dbName ? `_${arrayTableName}` : fieldName
+        const relationName = getArrayRelationName({
+          field,
+          path: fieldName,
+          tableName: arrayTableName,
+        })
 
         relationsToBuild.set(relationName, {
           type: 'many',
diff --git a/packages/drizzle/src/transform/read/traverseFields.ts b/packages/drizzle/src/transform/read/traverseFields.ts
index 43fbf0539c..b063d7f65c 100644
--- a/packages/drizzle/src/transform/read/traverseFields.ts
+++ b/packages/drizzle/src/transform/read/traverseFields.ts
@@ -6,6 +6,7 @@ import toSnakeCase from 'to-snake-case'
 import type { DrizzleAdapter } from '../../types.js'
 import type { BlocksMap } from '../../utilities/createBlocksMap.js'
 
+import { getArrayRelationName } from '../../utilities/getArrayRelationName.js'
 import { transformHasManyNumber } from './hasManyNumber.js'
 import { transformHasManyText } from './hasManyText.js'
 import { transformRelationship } from './relationship.js'
@@ -121,9 +122,7 @@ export const traverseFields = <T extends Record<string, unknown>>({
         `${currentTableName}_${tablePath}${toSnakeCase(field.name)}`,
       )
 
-      if (field.dbName) {
-        fieldData = table[`_${arrayTableName}`]
-      }
+      fieldData = table[getArrayRelationName({ field, path: fieldName, tableName: arrayTableName })]
 
       if (Array.isArray(fieldData)) {
         if (isLocalized) {
diff --git a/packages/drizzle/src/utilities/getArrayRelationName.ts b/packages/drizzle/src/utilities/getArrayRelationName.ts
new file mode 100644
index 0000000000..4127d26a4a
--- /dev/null
+++ b/packages/drizzle/src/utilities/getArrayRelationName.ts
@@ -0,0 +1,17 @@
+import type { ArrayField } from 'payload'
+
+export const getArrayRelationName = ({
+  field,
+  path,
+  tableName,
+}: {
+  field: ArrayField
+  path: string
+  tableName: string
+}) => {
+  if (field.dbName && path.length > 63) {
+    return `_${tableName}`
+  }
+
+  return path
+}
diff --git a/test/database/config.ts b/test/database/config.ts
index 806872ee68..a25e358a0c 100644
--- a/test/database/config.ts
+++ b/test/database/config.ts
@@ -700,6 +700,55 @@ export default buildConfigWithDefaults({
     },
   ],
   globals: [
+    {
+      slug: 'header',
+      fields: [
+        {
+          name: 'itemsLvl1',
+          type: 'array',
+          dbName: 'header_items_lvl1',
+          fields: [
+            {
+              name: 'label',
+              type: 'text',
+            },
+            {
+              name: 'itemsLvl2',
+              type: 'array',
+              dbName: 'header_items_lvl2',
+              fields: [
+                {
+                  name: 'label',
+                  type: 'text',
+                },
+                {
+                  name: 'itemsLvl3',
+                  type: 'array',
+                  dbName: 'header_items_lvl3',
+                  fields: [
+                    {
+                      name: 'label',
+                      type: 'text',
+                    },
+                    {
+                      name: 'itemsLvl4',
+                      type: 'array',
+                      dbName: 'header_items_lvl4',
+                      fields: [
+                        {
+                          name: 'label',
+                          type: 'text',
+                        },
+                      ],
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
+        },
+      ],
+    },
     {
       slug: 'global',
       dbName: 'customGlobal',
diff --git a/test/database/int.spec.ts b/test/database/int.spec.ts
index efad1d825d..a7dbf81032 100644
--- a/test/database/int.spec.ts
+++ b/test/database/int.spec.ts
@@ -2452,6 +2452,17 @@ describe('database', () => {
     expect(res.docs[0].id).toBe(customID.id)
   })
 
+  it('deep nested arrays', async () => {
+    await payload.updateGlobal({
+      slug: 'header',
+      data: { itemsLvl1: [{ itemsLvl2: [{ itemsLvl3: [{ itemsLvl4: [{ label: 'label' }] }] }] }] },
+    })
+
+    const header = await payload.findGlobal({ slug: 'header' })
+
+    expect(header.itemsLvl1[0]?.itemsLvl2[0]?.itemsLvl3[0]?.itemsLvl4[0]?.label).toBe('label')
+  })
+
   it('should count with a query that contains subqueries', async () => {
     const category = await payload.create({
       collection: 'categories',
diff --git a/test/database/payload-types.ts b/test/database/payload-types.ts
index 5cdc1faac9..88bc6d131d 100644
--- a/test/database/payload-types.ts
+++ b/test/database/payload-types.ts
@@ -115,12 +115,14 @@ export interface Config {
     defaultIDType: string;
   };
   globals: {
+    header: Header;
     global: Global;
     'global-2': Global2;
     'global-3': Global3;
     'virtual-relation-global': VirtualRelationGlobal;
   };
   globalsSelect: {
+    header: HeaderSelect<false> | HeaderSelect<true>;
     global: GlobalSelect<false> | GlobalSelect<true>;
     'global-2': Global2Select<false> | Global2Select<true>;
     'global-3': Global3Select<false> | Global3Select<true>;
@@ -977,6 +979,39 @@ export interface PayloadMigrationsSelect<T extends boolean = true> {
   updatedAt?: T;
   createdAt?: T;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "header".
+ */
+export interface Header {
+  id: string;
+  itemsLvl1?:
+    | {
+        label?: string | null;
+        itemsLvl2?:
+          | {
+              label?: string | null;
+              itemsLvl3?:
+                | {
+                    label?: string | null;
+                    itemsLvl4?:
+                      | {
+                          label?: string | null;
+                          id?: string | null;
+                        }[]
+                      | null;
+                    id?: string | null;
+                  }[]
+                | null;
+              id?: string | null;
+            }[]
+          | null;
+        id?: string | null;
+      }[]
+    | null;
+  updatedAt?: string | null;
+  createdAt?: string | null;
+}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "global".
@@ -1018,6 +1053,39 @@ export interface VirtualRelationGlobal {
   updatedAt?: string | null;
   createdAt?: string | null;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "header_select".
+ */
+export interface HeaderSelect<T extends boolean = true> {
+  itemsLvl1?:
+    | T
+    | {
+        label?: T;
+        itemsLvl2?:
+          | T
+          | {
+              label?: T;
+              itemsLvl3?:
+                | T
+                | {
+                    label?: T;
+                    itemsLvl4?:
+                      | T
+                      | {
+                          label?: T;
+                          id?: T;
+                        };
+                    id?: T;
+                  };
+              id?: T;
+            };
+        id?: T;
+      };
+  updatedAt?: T;
+  createdAt?: T;
+  globalType?: T;
+}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "global_select".
diff --git a/test/database/up-down-migration/migrations/20250328_185055.json b/test/database/up-down-migration/migrations/20250328_185055.json
deleted file mode 100644
index 7ef134f6aa..0000000000
--- a/test/database/up-down-migration/migrations/20250328_185055.json
+++ /dev/null
@@ -1,463 +0,0 @@
-{
-  "version": "6",
-  "dialect": "sqlite",
-  "tables": {
-    "users": {
-      "name": "users",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(strftime('%Y-%m-%dT%H:%M:%fZ', 'now'))"
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(strftime('%Y-%m-%dT%H:%M:%fZ', 'now'))"
-        },
-        "email": {
-          "name": "email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "reset_password_token": {
-          "name": "reset_password_token",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "reset_password_expiration": {
-          "name": "reset_password_expiration",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "salt": {
-          "name": "salt",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "hash": {
-          "name": "hash",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "login_attempts": {
-          "name": "login_attempts",
-          "type": "numeric",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": 0
-        },
-        "lock_until": {
-          "name": "lock_until",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "users_updated_at_idx": {
-          "name": "users_updated_at_idx",
-          "columns": ["updated_at"],
-          "isUnique": false
-        },
-        "users_created_at_idx": {
-          "name": "users_created_at_idx",
-          "columns": ["created_at"],
-          "isUnique": false
-        },
-        "users_email_idx": {
-          "name": "users_email_idx",
-          "columns": ["email"],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "payload_locked_documents": {
-      "name": "payload_locked_documents",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "global_slug": {
-          "name": "global_slug",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(strftime('%Y-%m-%dT%H:%M:%fZ', 'now'))"
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(strftime('%Y-%m-%dT%H:%M:%fZ', 'now'))"
-        }
-      },
-      "indexes": {
-        "payload_locked_documents_global_slug_idx": {
-          "name": "payload_locked_documents_global_slug_idx",
-          "columns": ["global_slug"],
-          "isUnique": false
-        },
-        "payload_locked_documents_updated_at_idx": {
-          "name": "payload_locked_documents_updated_at_idx",
-          "columns": ["updated_at"],
-          "isUnique": false
-        },
-        "payload_locked_documents_created_at_idx": {
-          "name": "payload_locked_documents_created_at_idx",
-          "columns": ["created_at"],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "payload_locked_documents_rels": {
-      "name": "payload_locked_documents_rels",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "order": {
-          "name": "order",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "parent_id": {
-          "name": "parent_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "path": {
-          "name": "path",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "users_id": {
-          "name": "users_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "payload_locked_documents_rels_order_idx": {
-          "name": "payload_locked_documents_rels_order_idx",
-          "columns": ["order"],
-          "isUnique": false
-        },
-        "payload_locked_documents_rels_parent_idx": {
-          "name": "payload_locked_documents_rels_parent_idx",
-          "columns": ["parent_id"],
-          "isUnique": false
-        },
-        "payload_locked_documents_rels_path_idx": {
-          "name": "payload_locked_documents_rels_path_idx",
-          "columns": ["path"],
-          "isUnique": false
-        },
-        "payload_locked_documents_rels_users_id_idx": {
-          "name": "payload_locked_documents_rels_users_id_idx",
-          "columns": ["users_id"],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "payload_locked_documents_rels_parent_fk": {
-          "name": "payload_locked_documents_rels_parent_fk",
-          "tableFrom": "payload_locked_documents_rels",
-          "tableTo": "payload_locked_documents",
-          "columnsFrom": ["parent_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "payload_locked_documents_rels_users_fk": {
-          "name": "payload_locked_documents_rels_users_fk",
-          "tableFrom": "payload_locked_documents_rels",
-          "tableTo": "users",
-          "columnsFrom": ["users_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "payload_preferences": {
-      "name": "payload_preferences",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "key": {
-          "name": "key",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "value": {
-          "name": "value",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(strftime('%Y-%m-%dT%H:%M:%fZ', 'now'))"
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(strftime('%Y-%m-%dT%H:%M:%fZ', 'now'))"
-        }
-      },
-      "indexes": {
-        "payload_preferences_key_idx": {
-          "name": "payload_preferences_key_idx",
-          "columns": ["key"],
-          "isUnique": false
-        },
-        "payload_preferences_updated_at_idx": {
-          "name": "payload_preferences_updated_at_idx",
-          "columns": ["updated_at"],
-          "isUnique": false
-        },
-        "payload_preferences_created_at_idx": {
-          "name": "payload_preferences_created_at_idx",
-          "columns": ["created_at"],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "payload_preferences_rels": {
-      "name": "payload_preferences_rels",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "order": {
-          "name": "order",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "parent_id": {
-          "name": "parent_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "path": {
-          "name": "path",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "users_id": {
-          "name": "users_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "payload_preferences_rels_order_idx": {
-          "name": "payload_preferences_rels_order_idx",
-          "columns": ["order"],
-          "isUnique": false
-        },
-        "payload_preferences_rels_parent_idx": {
-          "name": "payload_preferences_rels_parent_idx",
-          "columns": ["parent_id"],
-          "isUnique": false
-        },
-        "payload_preferences_rels_path_idx": {
-          "name": "payload_preferences_rels_path_idx",
-          "columns": ["path"],
-          "isUnique": false
-        },
-        "payload_preferences_rels_users_id_idx": {
-          "name": "payload_preferences_rels_users_id_idx",
-          "columns": ["users_id"],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {
-        "payload_preferences_rels_parent_fk": {
-          "name": "payload_preferences_rels_parent_fk",
-          "tableFrom": "payload_preferences_rels",
-          "tableTo": "payload_preferences",
-          "columnsFrom": ["parent_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "payload_preferences_rels_users_fk": {
-          "name": "payload_preferences_rels_users_fk",
-          "tableFrom": "payload_preferences_rels",
-          "tableTo": "users",
-          "columnsFrom": ["users_id"],
-          "columnsTo": ["id"],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "payload_migrations": {
-      "name": "payload_migrations",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "name": {
-          "name": "name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "batch": {
-          "name": "batch",
-          "type": "numeric",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(strftime('%Y-%m-%dT%H:%M:%fZ', 'now'))"
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(strftime('%Y-%m-%dT%H:%M:%fZ', 'now'))"
-        }
-      },
-      "indexes": {
-        "payload_migrations_updated_at_idx": {
-          "name": "payload_migrations_updated_at_idx",
-          "columns": ["updated_at"],
-          "isUnique": false
-        },
-        "payload_migrations_created_at_idx": {
-          "name": "payload_migrations_created_at_idx",
-          "columns": ["created_at"],
-          "isUnique": false
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    }
-  },
-  "views": {},
-  "enums": {},
-  "_meta": {
-    "tables": {},
-    "columns": {}
-  },
-  "internal": {
-    "indexes": {}
-  },
-  "id": "2b2f5008-c761-40d0-a858-67d6b4233615",
-  "prevId": "00000000-0000-0000-0000-000000000000"
-}
diff --git a/test/database/up-down-migration/migrations/20250328_185055.ts b/test/database/up-down-migration/migrations/20250328_185055.ts
deleted file mode 100644
index 3e6ffda86a..0000000000
--- a/test/database/up-down-migration/migrations/20250328_185055.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-import type { MigrateDownArgs, MigrateUpArgs } from '@payloadcms/db-sqlite'
-
-import { sql } from '@payloadcms/db-sqlite'
-
-export async function up({ db, payload, req }: MigrateUpArgs): Promise<void> {
-  await db.run(sql`CREATE TABLE \`users\` (
-  	\`id\` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
-  	\`updated_at\` text DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now')) NOT NULL,
-  	\`created_at\` text DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now')) NOT NULL,
-  	\`email\` text NOT NULL,
-  	\`reset_password_token\` text,
-  	\`reset_password_expiration\` text,
-  	\`salt\` text,
-  	\`hash\` text,
-  	\`login_attempts\` numeric DEFAULT 0,
-  	\`lock_until\` text
-  );
-  `)
-  await db.run(sql`CREATE INDEX \`users_updated_at_idx\` ON \`users\` (\`updated_at\`);`)
-  await db.run(sql`CREATE INDEX \`users_created_at_idx\` ON \`users\` (\`created_at\`);`)
-  await db.run(sql`CREATE UNIQUE INDEX \`users_email_idx\` ON \`users\` (\`email\`);`)
-  await db.run(sql`CREATE TABLE \`payload_locked_documents\` (
-  	\`id\` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
-  	\`global_slug\` text,
-  	\`updated_at\` text DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now')) NOT NULL,
-  	\`created_at\` text DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now')) NOT NULL
-  );
-  `)
-  await db.run(
-    sql`CREATE INDEX \`payload_locked_documents_global_slug_idx\` ON \`payload_locked_documents\` (\`global_slug\`);`,
-  )
-  await db.run(
-    sql`CREATE INDEX \`payload_locked_documents_updated_at_idx\` ON \`payload_locked_documents\` (\`updated_at\`);`,
-  )
-  await db.run(
-    sql`CREATE INDEX \`payload_locked_documents_created_at_idx\` ON \`payload_locked_documents\` (\`created_at\`);`,
-  )
-  await db.run(sql`CREATE TABLE \`payload_locked_documents_rels\` (
-  	\`id\` integer PRIMARY KEY NOT NULL,
-  	\`order\` integer,
-  	\`parent_id\` integer NOT NULL,
-  	\`path\` text NOT NULL,
-  	\`users_id\` integer,
-  	FOREIGN KEY (\`parent_id\`) REFERENCES \`payload_locked_documents\`(\`id\`) ON UPDATE no action ON DELETE cascade,
-  	FOREIGN KEY (\`users_id\`) REFERENCES \`users\`(\`id\`) ON UPDATE no action ON DELETE cascade
-  );
-  `)
-  await db.run(
-    sql`CREATE INDEX \`payload_locked_documents_rels_order_idx\` ON \`payload_locked_documents_rels\` (\`order\`);`,
-  )
-  await db.run(
-    sql`CREATE INDEX \`payload_locked_documents_rels_parent_idx\` ON \`payload_locked_documents_rels\` (\`parent_id\`);`,
-  )
-  await db.run(
-    sql`CREATE INDEX \`payload_locked_documents_rels_path_idx\` ON \`payload_locked_documents_rels\` (\`path\`);`,
-  )
-  await db.run(
-    sql`CREATE INDEX \`payload_locked_documents_rels_users_id_idx\` ON \`payload_locked_documents_rels\` (\`users_id\`);`,
-  )
-  await db.run(sql`CREATE TABLE \`payload_preferences\` (
-  	\`id\` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
-  	\`key\` text,
-  	\`value\` text,
-  	\`updated_at\` text DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now')) NOT NULL,
-  	\`created_at\` text DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now')) NOT NULL
-  );
-  `)
-  await db.run(
-    sql`CREATE INDEX \`payload_preferences_key_idx\` ON \`payload_preferences\` (\`key\`);`,
-  )
-  await db.run(
-    sql`CREATE INDEX \`payload_preferences_updated_at_idx\` ON \`payload_preferences\` (\`updated_at\`);`,
-  )
-  await db.run(
-    sql`CREATE INDEX \`payload_preferences_created_at_idx\` ON \`payload_preferences\` (\`created_at\`);`,
-  )
-  await db.run(sql`CREATE TABLE \`payload_preferences_rels\` (
-  	\`id\` integer PRIMARY KEY NOT NULL,
-  	\`order\` integer,
-  	\`parent_id\` integer NOT NULL,
-  	\`path\` text NOT NULL,
-  	\`users_id\` integer,
-  	FOREIGN KEY (\`parent_id\`) REFERENCES \`payload_preferences\`(\`id\`) ON UPDATE no action ON DELETE cascade,
-  	FOREIGN KEY (\`users_id\`) REFERENCES \`users\`(\`id\`) ON UPDATE no action ON DELETE cascade
-  );
-  `)
-  await db.run(
-    sql`CREATE INDEX \`payload_preferences_rels_order_idx\` ON \`payload_preferences_rels\` (\`order\`);`,
-  )
-  await db.run(
-    sql`CREATE INDEX \`payload_preferences_rels_parent_idx\` ON \`payload_preferences_rels\` (\`parent_id\`);`,
-  )
-  await db.run(
-    sql`CREATE INDEX \`payload_preferences_rels_path_idx\` ON \`payload_preferences_rels\` (\`path\`);`,
-  )
-  await db.run(
-    sql`CREATE INDEX \`payload_preferences_rels_users_id_idx\` ON \`payload_preferences_rels\` (\`users_id\`);`,
-  )
-  await db.run(sql`CREATE TABLE \`payload_migrations\` (
-  	\`id\` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
-  	\`name\` text,
-  	\`batch\` numeric,
-  	\`updated_at\` text DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now')) NOT NULL,
-  	\`created_at\` text DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now')) NOT NULL
-  );
-  `)
-  await db.run(
-    sql`CREATE INDEX \`payload_migrations_updated_at_idx\` ON \`payload_migrations\` (\`updated_at\`);`,
-  )
-  await db.run(
-    sql`CREATE INDEX \`payload_migrations_created_at_idx\` ON \`payload_migrations\` (\`created_at\`);`,
-  )
-}
-
-export async function down({ db, payload, req }: MigrateDownArgs): Promise<void> {
-  await db.run(sql`DROP TABLE \`users\`;`)
-  await db.run(sql`DROP TABLE \`payload_locked_documents\`;`)
-  await db.run(sql`DROP TABLE \`payload_locked_documents_rels\`;`)
-  await db.run(sql`DROP TABLE \`payload_preferences\`;`)
-  await db.run(sql`DROP TABLE \`payload_preferences_rels\`;`)
-  await db.run(sql`DROP TABLE \`payload_migrations\`;`)
-}
diff --git a/test/database/up-down-migration/migrations/20250428_121536.json b/test/database/up-down-migration/migrations/20250428_121536.json
new file mode 100644
index 0000000000..739b1f0dc0
--- /dev/null
+++ b/test/database/up-down-migration/migrations/20250428_121536.json
@@ -0,0 +1,639 @@
+{
+  "id": "36a35217-e468-4780-becb-9146c56e3e54",
+  "prevId": "00000000-0000-0000-0000-000000000000",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "public.users": {
+      "name": "users",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "email": {
+          "name": "email",
+          "type": "varchar",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "reset_password_token": {
+          "name": "reset_password_token",
+          "type": "varchar",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "reset_password_expiration": {
+          "name": "reset_password_expiration",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "salt": {
+          "name": "salt",
+          "type": "varchar",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "hash": {
+          "name": "hash",
+          "type": "varchar",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "login_attempts": {
+          "name": "login_attempts",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 0
+        },
+        "lock_until": {
+          "name": "lock_until",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "users_updated_at_idx": {
+          "name": "users_updated_at_idx",
+          "columns": [
+            {
+              "expression": "updated_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "users_created_at_idx": {
+          "name": "users_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "users_email_idx": {
+          "name": "users_email_idx",
+          "columns": [
+            {
+              "expression": "email",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.payload_locked_documents": {
+      "name": "payload_locked_documents",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "global_slug": {
+          "name": "global_slug",
+          "type": "varchar",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "payload_locked_documents_global_slug_idx": {
+          "name": "payload_locked_documents_global_slug_idx",
+          "columns": [
+            {
+              "expression": "global_slug",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "payload_locked_documents_updated_at_idx": {
+          "name": "payload_locked_documents_updated_at_idx",
+          "columns": [
+            {
+              "expression": "updated_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "payload_locked_documents_created_at_idx": {
+          "name": "payload_locked_documents_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.payload_locked_documents_rels": {
+      "name": "payload_locked_documents_rels",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "order": {
+          "name": "order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "parent_id": {
+          "name": "parent_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "path": {
+          "name": "path",
+          "type": "varchar",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "users_id": {
+          "name": "users_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "payload_locked_documents_rels_order_idx": {
+          "name": "payload_locked_documents_rels_order_idx",
+          "columns": [
+            {
+              "expression": "order",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "payload_locked_documents_rels_parent_idx": {
+          "name": "payload_locked_documents_rels_parent_idx",
+          "columns": [
+            {
+              "expression": "parent_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "payload_locked_documents_rels_path_idx": {
+          "name": "payload_locked_documents_rels_path_idx",
+          "columns": [
+            {
+              "expression": "path",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "payload_locked_documents_rels_users_id_idx": {
+          "name": "payload_locked_documents_rels_users_id_idx",
+          "columns": [
+            {
+              "expression": "users_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "payload_locked_documents_rels_parent_fk": {
+          "name": "payload_locked_documents_rels_parent_fk",
+          "tableFrom": "payload_locked_documents_rels",
+          "tableTo": "payload_locked_documents",
+          "columnsFrom": ["parent_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "payload_locked_documents_rels_users_fk": {
+          "name": "payload_locked_documents_rels_users_fk",
+          "tableFrom": "payload_locked_documents_rels",
+          "tableTo": "users",
+          "columnsFrom": ["users_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.payload_preferences": {
+      "name": "payload_preferences",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "key": {
+          "name": "key",
+          "type": "varchar",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "value": {
+          "name": "value",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "payload_preferences_key_idx": {
+          "name": "payload_preferences_key_idx",
+          "columns": [
+            {
+              "expression": "key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "payload_preferences_updated_at_idx": {
+          "name": "payload_preferences_updated_at_idx",
+          "columns": [
+            {
+              "expression": "updated_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "payload_preferences_created_at_idx": {
+          "name": "payload_preferences_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.payload_preferences_rels": {
+      "name": "payload_preferences_rels",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "order": {
+          "name": "order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "parent_id": {
+          "name": "parent_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "path": {
+          "name": "path",
+          "type": "varchar",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "users_id": {
+          "name": "users_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "payload_preferences_rels_order_idx": {
+          "name": "payload_preferences_rels_order_idx",
+          "columns": [
+            {
+              "expression": "order",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "payload_preferences_rels_parent_idx": {
+          "name": "payload_preferences_rels_parent_idx",
+          "columns": [
+            {
+              "expression": "parent_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "payload_preferences_rels_path_idx": {
+          "name": "payload_preferences_rels_path_idx",
+          "columns": [
+            {
+              "expression": "path",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "payload_preferences_rels_users_id_idx": {
+          "name": "payload_preferences_rels_users_id_idx",
+          "columns": [
+            {
+              "expression": "users_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "payload_preferences_rels_parent_fk": {
+          "name": "payload_preferences_rels_parent_fk",
+          "tableFrom": "payload_preferences_rels",
+          "tableTo": "payload_preferences",
+          "columnsFrom": ["parent_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "payload_preferences_rels_users_fk": {
+          "name": "payload_preferences_rels_users_fk",
+          "tableFrom": "payload_preferences_rels",
+          "tableTo": "users",
+          "columnsFrom": ["users_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.payload_migrations": {
+      "name": "payload_migrations",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "serial",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "varchar",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "batch": {
+          "name": "batch",
+          "type": "numeric",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp(3) with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "payload_migrations_updated_at_idx": {
+          "name": "payload_migrations_updated_at_idx",
+          "columns": [
+            {
+              "expression": "updated_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "payload_migrations_created_at_idx": {
+          "name": "payload_migrations_created_at_idx",
+          "columns": [
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    }
+  },
+  "enums": {},
+  "schemas": {},
+  "sequences": {},
+  "roles": {},
+  "policies": {},
+  "views": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  }
+}
diff --git a/test/database/up-down-migration/migrations/20250428_121536.ts b/test/database/up-down-migration/migrations/20250428_121536.ts
new file mode 100644
index 0000000000..086047bb65
--- /dev/null
+++ b/test/database/up-down-migration/migrations/20250428_121536.ts
@@ -0,0 +1,112 @@
+import type { MigrateDownArgs, MigrateUpArgs} from '@payloadcms/db-postgres';
+
+import { sql } from '@payloadcms/db-postgres'
+
+export async function up({ db, payload, req }: MigrateUpArgs): Promise<void> {
+  await db.execute(sql`
+   CREATE TABLE IF NOT EXISTS "users" (
+  	"id" serial PRIMARY KEY NOT NULL,
+  	"updated_at" timestamp(3) with time zone DEFAULT now() NOT NULL,
+  	"created_at" timestamp(3) with time zone DEFAULT now() NOT NULL,
+  	"email" varchar NOT NULL,
+  	"reset_password_token" varchar,
+  	"reset_password_expiration" timestamp(3) with time zone,
+  	"salt" varchar,
+  	"hash" varchar,
+  	"login_attempts" numeric DEFAULT 0,
+  	"lock_until" timestamp(3) with time zone
+  );
+  
+  CREATE TABLE IF NOT EXISTS "payload_locked_documents" (
+  	"id" serial PRIMARY KEY NOT NULL,
+  	"global_slug" varchar,
+  	"updated_at" timestamp(3) with time zone DEFAULT now() NOT NULL,
+  	"created_at" timestamp(3) with time zone DEFAULT now() NOT NULL
+  );
+  
+  CREATE TABLE IF NOT EXISTS "payload_locked_documents_rels" (
+  	"id" serial PRIMARY KEY NOT NULL,
+  	"order" integer,
+  	"parent_id" integer NOT NULL,
+  	"path" varchar NOT NULL,
+  	"users_id" integer
+  );
+  
+  CREATE TABLE IF NOT EXISTS "payload_preferences" (
+  	"id" serial PRIMARY KEY NOT NULL,
+  	"key" varchar,
+  	"value" jsonb,
+  	"updated_at" timestamp(3) with time zone DEFAULT now() NOT NULL,
+  	"created_at" timestamp(3) with time zone DEFAULT now() NOT NULL
+  );
+  
+  CREATE TABLE IF NOT EXISTS "payload_preferences_rels" (
+  	"id" serial PRIMARY KEY NOT NULL,
+  	"order" integer,
+  	"parent_id" integer NOT NULL,
+  	"path" varchar NOT NULL,
+  	"users_id" integer
+  );
+  
+  CREATE TABLE IF NOT EXISTS "payload_migrations" (
+  	"id" serial PRIMARY KEY NOT NULL,
+  	"name" varchar,
+  	"batch" numeric,
+  	"updated_at" timestamp(3) with time zone DEFAULT now() NOT NULL,
+  	"created_at" timestamp(3) with time zone DEFAULT now() NOT NULL
+  );
+  
+  DO $$ BEGIN
+   ALTER TABLE "payload_locked_documents_rels" ADD CONSTRAINT "payload_locked_documents_rels_parent_fk" FOREIGN KEY ("parent_id") REFERENCES "public"."payload_locked_documents"("id") ON DELETE cascade ON UPDATE no action;
+  EXCEPTION
+   WHEN duplicate_object THEN null;
+  END $$;
+  
+  DO $$ BEGIN
+   ALTER TABLE "payload_locked_documents_rels" ADD CONSTRAINT "payload_locked_documents_rels_users_fk" FOREIGN KEY ("users_id") REFERENCES "public"."users"("id") ON DELETE cascade ON UPDATE no action;
+  EXCEPTION
+   WHEN duplicate_object THEN null;
+  END $$;
+  
+  DO $$ BEGIN
+   ALTER TABLE "payload_preferences_rels" ADD CONSTRAINT "payload_preferences_rels_parent_fk" FOREIGN KEY ("parent_id") REFERENCES "public"."payload_preferences"("id") ON DELETE cascade ON UPDATE no action;
+  EXCEPTION
+   WHEN duplicate_object THEN null;
+  END $$;
+  
+  DO $$ BEGIN
+   ALTER TABLE "payload_preferences_rels" ADD CONSTRAINT "payload_preferences_rels_users_fk" FOREIGN KEY ("users_id") REFERENCES "public"."users"("id") ON DELETE cascade ON UPDATE no action;
+  EXCEPTION
+   WHEN duplicate_object THEN null;
+  END $$;
+  
+  CREATE INDEX IF NOT EXISTS "users_updated_at_idx" ON "users" USING btree ("updated_at");
+  CREATE INDEX IF NOT EXISTS "users_created_at_idx" ON "users" USING btree ("created_at");
+  CREATE UNIQUE INDEX IF NOT EXISTS "users_email_idx" ON "users" USING btree ("email");
+  CREATE INDEX IF NOT EXISTS "payload_locked_documents_global_slug_idx" ON "payload_locked_documents" USING btree ("global_slug");
+  CREATE INDEX IF NOT EXISTS "payload_locked_documents_updated_at_idx" ON "payload_locked_documents" USING btree ("updated_at");
+  CREATE INDEX IF NOT EXISTS "payload_locked_documents_created_at_idx" ON "payload_locked_documents" USING btree ("created_at");
+  CREATE INDEX IF NOT EXISTS "payload_locked_documents_rels_order_idx" ON "payload_locked_documents_rels" USING btree ("order");
+  CREATE INDEX IF NOT EXISTS "payload_locked_documents_rels_parent_idx" ON "payload_locked_documents_rels" USING btree ("parent_id");
+  CREATE INDEX IF NOT EXISTS "payload_locked_documents_rels_path_idx" ON "payload_locked_documents_rels" USING btree ("path");
+  CREATE INDEX IF NOT EXISTS "payload_locked_documents_rels_users_id_idx" ON "payload_locked_documents_rels" USING btree ("users_id");
+  CREATE INDEX IF NOT EXISTS "payload_preferences_key_idx" ON "payload_preferences" USING btree ("key");
+  CREATE INDEX IF NOT EXISTS "payload_preferences_updated_at_idx" ON "payload_preferences" USING btree ("updated_at");
+  CREATE INDEX IF NOT EXISTS "payload_preferences_created_at_idx" ON "payload_preferences" USING btree ("created_at");
+  CREATE INDEX IF NOT EXISTS "payload_preferences_rels_order_idx" ON "payload_preferences_rels" USING btree ("order");
+  CREATE INDEX IF NOT EXISTS "payload_preferences_rels_parent_idx" ON "payload_preferences_rels" USING btree ("parent_id");
+  CREATE INDEX IF NOT EXISTS "payload_preferences_rels_path_idx" ON "payload_preferences_rels" USING btree ("path");
+  CREATE INDEX IF NOT EXISTS "payload_preferences_rels_users_id_idx" ON "payload_preferences_rels" USING btree ("users_id");
+  CREATE INDEX IF NOT EXISTS "payload_migrations_updated_at_idx" ON "payload_migrations" USING btree ("updated_at");
+  CREATE INDEX IF NOT EXISTS "payload_migrations_created_at_idx" ON "payload_migrations" USING btree ("created_at");`)
+}
+
+export async function down({ db, payload, req }: MigrateDownArgs): Promise<void> {
+  await db.execute(sql`
+   DROP TABLE "users" CASCADE;
+  DROP TABLE "payload_locked_documents" CASCADE;
+  DROP TABLE "payload_locked_documents_rels" CASCADE;
+  DROP TABLE "payload_preferences" CASCADE;
+  DROP TABLE "payload_preferences_rels" CASCADE;
+  DROP TABLE "payload_migrations" CASCADE;`)
+}
diff --git a/test/database/up-down-migration/migrations/index.ts b/test/database/up-down-migration/migrations/index.ts
index c7646c19ea..eaea2e87a0 100644
--- a/test/database/up-down-migration/migrations/index.ts
+++ b/test/database/up-down-migration/migrations/index.ts
@@ -1,9 +1,9 @@
-import * as migration_20250328_185055 from './20250328_185055.js'
+import * as migration_20250428_121536 from './20250428_121536.js'
 
 export const migrations = [
   {
-    up: migration_20250328_185055.up,
-    down: migration_20250328_185055.down,
-    name: '20250328_185055',
+    up: migration_20250428_121536.up,
+    down: migration_20250428_121536.down,
+    name: '20250428_121536',
   },
 ]

From 58fc2f9a7470ea1b0856ef471562eba5499e815a Mon Sep 17 00:00:00 2001
From: Sasha <64744993+r1tsuu@users.noreply.github.com>
Date: Thu, 15 May 2025 20:45:33 +0300
Subject: [PATCH 43/46] fix(db-postgres): build `near` sort query properly for
 point fields (#12240)

Continuation of https://github.com/payloadcms/payload/pull/12185 and fix
https://github.com/payloadcms/payload/issues/12221

The mentioned PR introduced auto sorting by the point field when a
`near` query is used, but it didn't build actual needed query to order
results by their distance to a _given_ (from the `near` query) point.

Now, we build:
```sql
order by pont_field <-> ST_SetSRID(ST_MakePoint(lng, lat), 4326)
```

Which does what we want
---
 packages/drizzle/src/queries/buildOrderBy.ts | 14 +++++++++++---
 packages/drizzle/src/queries/buildQuery.ts   |  1 +
 packages/drizzle/src/queries/parseParams.ts  |  3 ++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/packages/drizzle/src/queries/buildOrderBy.ts b/packages/drizzle/src/queries/buildOrderBy.ts
index da779bbb20..758b8854ce 100644
--- a/packages/drizzle/src/queries/buildOrderBy.ts
+++ b/packages/drizzle/src/queries/buildOrderBy.ts
@@ -1,7 +1,7 @@
-import type { Table } from 'drizzle-orm'
+import type { SQL, Table } from 'drizzle-orm'
 import type { FlattenedField, Sort } from 'payload'
 
-import { asc, desc } from 'drizzle-orm'
+import { asc, desc, or } from 'drizzle-orm'
 
 import type { DrizzleAdapter, GenericColumn } from '../types.js'
 import type { BuildQueryJoinAliases, BuildQueryResult } from './buildQuery.js'
@@ -16,6 +16,7 @@ type Args = {
   joins: BuildQueryJoinAliases
   locale?: string
   parentIsLocalized: boolean
+  rawSort?: SQL
   selectFields: Record<string, GenericColumn>
   sort?: Sort
   tableName: string
@@ -31,6 +32,7 @@ export const buildOrderBy = ({
   joins,
   locale,
   parentIsLocalized,
+  rawSort,
   selectFields,
   sort,
   tableName,
@@ -74,12 +76,18 @@ export const buildOrderBy = ({
         value: sortProperty,
       })
       if (sortTable?.[sortTableColumnName]) {
+        let order = sortDirection === 'asc' ? asc : desc
+
+        if (rawSort) {
+          order = () => rawSort
+        }
+
         orderBy.push({
           column:
             aliasTable && tableName === getNameFromDrizzleTable(sortTable)
               ? aliasTable[sortTableColumnName]
               : sortTable[sortTableColumnName],
-          order: sortDirection === 'asc' ? asc : desc,
+          order,
         })
 
         selectFields[sortTableColumnName] = sortTable[sortTableColumnName]
diff --git a/packages/drizzle/src/queries/buildQuery.ts b/packages/drizzle/src/queries/buildQuery.ts
index 9b5326b9cc..b91869c46f 100644
--- a/packages/drizzle/src/queries/buildQuery.ts
+++ b/packages/drizzle/src/queries/buildQuery.ts
@@ -79,6 +79,7 @@ const buildQuery = function buildQuery({
     joins,
     locale,
     parentIsLocalized,
+    rawSort: context.rawSort,
     selectFields,
     sort: context.sort,
     tableName,
diff --git a/packages/drizzle/src/queries/parseParams.ts b/packages/drizzle/src/queries/parseParams.ts
index 90bba4136e..8ca7503669 100644
--- a/packages/drizzle/src/queries/parseParams.ts
+++ b/packages/drizzle/src/queries/parseParams.ts
@@ -14,7 +14,7 @@ import { buildAndOrConditions } from './buildAndOrConditions.js'
 import { getTableColumnFromPath } from './getTableColumnFromPath.js'
 import { sanitizeQueryValue } from './sanitizeQueryValue.js'
 
-export type QueryContext = { sort: Sort }
+export type QueryContext = { rawSort?: SQL; sort: Sort }
 
 type Args = {
   adapter: DrizzleAdapter
@@ -348,6 +348,7 @@ export function parseParams({
                       }
                       if (geoConstraints.length) {
                         context.sort = relationOrPath
+                        context.rawSort = sql`${table[columnName]} <-> ST_SetSRID(ST_MakePoint(${lng}, ${lat}), 4326)`
                         constraints.push(and(...geoConstraints))
                       }
                       break

From 561708720d4b2e0dc9eb2133117ba92fb0e4a7fd Mon Sep 17 00:00:00 2001
From: Elliot DeNolf <denolfe@gmail.com>
Date: Thu, 15 May 2025 14:39:34 -0400
Subject: [PATCH 44/46] chore(release): v3.38.0 [skip ci]

---
 package.json                               | 2 +-
 packages/admin-bar/package.json            | 2 +-
 packages/create-payload-app/package.json   | 2 +-
 packages/db-mongodb/package.json           | 2 +-
 packages/db-postgres/package.json          | 2 +-
 packages/db-sqlite/package.json            | 2 +-
 packages/db-vercel-postgres/package.json   | 2 +-
 packages/drizzle/package.json              | 2 +-
 packages/email-nodemailer/package.json     | 2 +-
 packages/email-resend/package.json         | 2 +-
 packages/graphql/package.json              | 2 +-
 packages/live-preview-react/package.json   | 2 +-
 packages/live-preview-vue/package.json     | 2 +-
 packages/live-preview/package.json         | 2 +-
 packages/next/package.json                 | 2 +-
 packages/payload-cloud/package.json        | 2 +-
 packages/payload/package.json              | 2 +-
 packages/plugin-cloud-storage/package.json | 2 +-
 packages/plugin-form-builder/package.json  | 2 +-
 packages/plugin-import-export/package.json | 2 +-
 packages/plugin-multi-tenant/package.json  | 2 +-
 packages/plugin-nested-docs/package.json   | 2 +-
 packages/plugin-redirects/package.json     | 2 +-
 packages/plugin-search/package.json        | 2 +-
 packages/plugin-sentry/package.json        | 2 +-
 packages/plugin-seo/package.json           | 2 +-
 packages/plugin-stripe/package.json        | 2 +-
 packages/richtext-lexical/package.json     | 2 +-
 packages/richtext-slate/package.json       | 2 +-
 packages/storage-azure/package.json        | 2 +-
 packages/storage-gcs/package.json          | 2 +-
 packages/storage-s3/package.json           | 2 +-
 packages/storage-uploadthing/package.json  | 2 +-
 packages/storage-vercel-blob/package.json  | 2 +-
 packages/translations/package.json         | 2 +-
 packages/ui/package.json                   | 2 +-
 36 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/package.json b/package.json
index 79930f4428..34cfdc72de 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "payload-monorepo",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/packages/admin-bar/package.json b/packages/admin-bar/package.json
index e763beb870..87864c5944 100644
--- a/packages/admin-bar/package.json
+++ b/packages/admin-bar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/admin-bar",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "description": "An admin bar for React apps using Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/create-payload-app/package.json b/packages/create-payload-app/package.json
index 10daccb29c..95c959166d 100644
--- a/packages/create-payload-app/package.json
+++ b/packages/create-payload-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-payload-app",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",
diff --git a/packages/db-mongodb/package.json b/packages/db-mongodb/package.json
index 0fb0510d8b..f3e2358789 100644
--- a/packages/db-mongodb/package.json
+++ b/packages/db-mongodb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-mongodb",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "description": "The officially supported MongoDB database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/db-postgres/package.json b/packages/db-postgres/package.json
index 3784dabc2a..04e8f89f36 100644
--- a/packages/db-postgres/package.json
+++ b/packages/db-postgres/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-postgres",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "description": "The officially supported Postgres database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/db-sqlite/package.json b/packages/db-sqlite/package.json
index d10d787b88..d3555bfda6 100644
--- a/packages/db-sqlite/package.json
+++ b/packages/db-sqlite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-sqlite",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "description": "The officially supported SQLite database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/db-vercel-postgres/package.json b/packages/db-vercel-postgres/package.json
index 3bd14d72f3..3d1e51c536 100644
--- 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.37.0",
+  "version": "3.38.0",
   "description": "Vercel Postgres adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/drizzle/package.json b/packages/drizzle/package.json
index 7a35ef4978..2024ca9217 100644
--- a/packages/drizzle/package.json
+++ b/packages/drizzle/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/drizzle",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "description": "A library of shared functions used by different payload database adapters",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/email-nodemailer/package.json b/packages/email-nodemailer/package.json
index f3641b8c2a..4bf652f73e 100644
--- a/packages/email-nodemailer/package.json
+++ b/packages/email-nodemailer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/email-nodemailer",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "description": "Payload Nodemailer Email Adapter",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/email-resend/package.json b/packages/email-resend/package.json
index bef586ee5b..04a5fb9872 100644
--- a/packages/email-resend/package.json
+++ b/packages/email-resend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/email-resend",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "description": "Payload Resend Email Adapter",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/graphql/package.json b/packages/graphql/package.json
index add54873c0..45228a4a30 100644
--- a/packages/graphql/package.json
+++ b/packages/graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/graphql",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",
diff --git a/packages/live-preview-react/package.json b/packages/live-preview-react/package.json
index 617df63dce..24991df8a4 100644
--- 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.37.0",
+  "version": "3.38.0",
   "description": "The official React SDK for Payload Live Preview",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/live-preview-vue/package.json b/packages/live-preview-vue/package.json
index 0e801fc27d..d81abf67a2 100644
--- 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.37.0",
+  "version": "3.38.0",
   "description": "The official Vue SDK for Payload Live Preview",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/live-preview/package.json b/packages/live-preview/package.json
index eb7b207519..394f1be881 100644
--- a/packages/live-preview/package.json
+++ b/packages/live-preview/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/live-preview",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "description": "The official live preview JavaScript SDK for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/next/package.json b/packages/next/package.json
index 8358c0b498..fd88d6f802 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/next",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",
diff --git a/packages/payload-cloud/package.json b/packages/payload-cloud/package.json
index 6b3da32074..283dddb68e 100644
--- a/packages/payload-cloud/package.json
+++ b/packages/payload-cloud/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/payload-cloud",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "description": "The official Payload Cloud plugin",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/payload/package.json b/packages/payload/package.json
index 5e4eef830c..55d139aefc 100644
--- a/packages/payload/package.json
+++ b/packages/payload/package.json
@@ -1,6 +1,6 @@
 {
   "name": "payload",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "description": "Node, React, Headless CMS and Application Framework built on Next.js",
   "keywords": [
     "admin panel",
diff --git a/packages/plugin-cloud-storage/package.json b/packages/plugin-cloud-storage/package.json
index 58347227bc..c292b0f7be 100644
--- 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.37.0",
+  "version": "3.38.0",
   "description": "The official cloud storage plugin for Payload CMS",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/plugin-form-builder/package.json b/packages/plugin-form-builder/package.json
index be94aebd41..d6ca17d493 100644
--- 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.37.0",
+  "version": "3.38.0",
   "description": "Form builder plugin for Payload CMS",
   "keywords": [
     "payload",
diff --git a/packages/plugin-import-export/package.json b/packages/plugin-import-export/package.json
index 6720f615ad..bb1356d6ac 100644
--- a/packages/plugin-import-export/package.json
+++ b/packages/plugin-import-export/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-import-export",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "description": "Import-Export plugin for Payload",
   "keywords": [
     "payload",
diff --git a/packages/plugin-multi-tenant/package.json b/packages/plugin-multi-tenant/package.json
index fb4d6e804d..43029726bd 100644
--- a/packages/plugin-multi-tenant/package.json
+++ b/packages/plugin-multi-tenant/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-multi-tenant",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "description": "Multi Tenant plugin for Payload",
   "keywords": [
     "payload",
diff --git a/packages/plugin-nested-docs/package.json b/packages/plugin-nested-docs/package.json
index 87bfc03e28..c7af667b49 100644
--- 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.37.0",
+  "version": "3.38.0",
   "description": "The official Nested Docs plugin for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/plugin-redirects/package.json b/packages/plugin-redirects/package.json
index c348c222d6..326d2261a7 100644
--- a/packages/plugin-redirects/package.json
+++ b/packages/plugin-redirects/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-redirects",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "description": "Redirects plugin for Payload",
   "keywords": [
     "payload",
diff --git a/packages/plugin-search/package.json b/packages/plugin-search/package.json
index 869c7915bb..211566e274 100644
--- a/packages/plugin-search/package.json
+++ b/packages/plugin-search/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-search",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "description": "Search plugin for Payload",
   "keywords": [
     "payload",
diff --git a/packages/plugin-sentry/package.json b/packages/plugin-sentry/package.json
index 4a4f637972..432165fb8a 100644
--- a/packages/plugin-sentry/package.json
+++ b/packages/plugin-sentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-sentry",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "description": "Sentry plugin for Payload",
   "keywords": [
     "payload",
diff --git a/packages/plugin-seo/package.json b/packages/plugin-seo/package.json
index 113ae4add7..036119e718 100644
--- a/packages/plugin-seo/package.json
+++ b/packages/plugin-seo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-seo",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "description": "SEO plugin for Payload",
   "keywords": [
     "payload",
diff --git a/packages/plugin-stripe/package.json b/packages/plugin-stripe/package.json
index f808e3d67a..2062949cd4 100644
--- a/packages/plugin-stripe/package.json
+++ b/packages/plugin-stripe/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-stripe",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "description": "Stripe plugin for Payload",
   "keywords": [
     "payload",
diff --git a/packages/richtext-lexical/package.json b/packages/richtext-lexical/package.json
index acd088e2d9..567bd6d3bf 100644
--- a/packages/richtext-lexical/package.json
+++ b/packages/richtext-lexical/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/richtext-lexical",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "description": "The officially supported Lexical richtext adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/richtext-slate/package.json b/packages/richtext-slate/package.json
index ae8481e76f..a0918c4743 100644
--- a/packages/richtext-slate/package.json
+++ b/packages/richtext-slate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/richtext-slate",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "description": "The officially supported Slate richtext adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/storage-azure/package.json b/packages/storage-azure/package.json
index 5200a09b91..0687d7f541 100644
--- a/packages/storage-azure/package.json
+++ b/packages/storage-azure/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/storage-azure",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "description": "Payload storage adapter for Azure Blob Storage",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/storage-gcs/package.json b/packages/storage-gcs/package.json
index 6fe94f1293..ce7689706b 100644
--- a/packages/storage-gcs/package.json
+++ b/packages/storage-gcs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/storage-gcs",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "description": "Payload storage adapter for Google Cloud Storage",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/storage-s3/package.json b/packages/storage-s3/package.json
index bacb9301e6..cd4d65c2b9 100644
--- a/packages/storage-s3/package.json
+++ b/packages/storage-s3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/storage-s3",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "description": "Payload storage adapter for Amazon S3",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/storage-uploadthing/package.json b/packages/storage-uploadthing/package.json
index 675b8c9d13..0c2e910360 100644
--- a/packages/storage-uploadthing/package.json
+++ b/packages/storage-uploadthing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/storage-uploadthing",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "description": "Payload storage adapter for uploadthing",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/storage-vercel-blob/package.json b/packages/storage-vercel-blob/package.json
index 60ab37e7f1..7441fe8c35 100644
--- a/packages/storage-vercel-blob/package.json
+++ b/packages/storage-vercel-blob/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/storage-vercel-blob",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "description": "Payload storage adapter for Vercel Blob Storage",
   "homepage": "https://payloadcms.com",
   "repository": {
diff --git a/packages/translations/package.json b/packages/translations/package.json
index 384e79efb4..7237f3ba37 100644
--- a/packages/translations/package.json
+++ b/packages/translations/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/translations",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",
diff --git a/packages/ui/package.json b/packages/ui/package.json
index e0c0f4c340..958662ca05 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/ui",
-  "version": "3.37.0",
+  "version": "3.38.0",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",

From bd6ee317c17817ba551678378348ab71f6c5be00 Mon Sep 17 00:00:00 2001
From: Jarrod Flesch <30633324+JarrodMFlesch@users.noreply.github.com>
Date: Thu, 15 May 2025 14:49:37 -0400
Subject: [PATCH 45/46] fix(ui): req not being threaded through to views
 (#12213)

---
 packages/next/src/elements/Nav/getNavPrefs.ts | 65 +++++++++----------
 packages/next/src/elements/Nav/index.tsx      |  9 ++-
 packages/next/src/layouts/Root/index.tsx      |  2 +-
 packages/next/src/templates/Default/index.tsx |  5 ++
 .../src/views/Document/getDocumentData.ts     |  9 +--
 packages/next/src/views/Root/index.tsx        |  1 +
 6 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/packages/next/src/elements/Nav/getNavPrefs.ts b/packages/next/src/elements/Nav/getNavPrefs.ts
index a64e24227e..0a5517eb6c 100644
--- a/packages/next/src/elements/Nav/getNavPrefs.ts
+++ b/packages/next/src/elements/Nav/getNavPrefs.ts
@@ -1,41 +1,36 @@
-import type { DefaultDocumentIDType, NavPreferences, Payload, User } from 'payload'
+import type { NavPreferences, PayloadRequest } from 'payload'
 
 import { cache } from 'react'
 
-export const getNavPrefs = cache(
-  async (
-    payload: Payload,
-    userID: DefaultDocumentIDType,
-    userSlug: string,
-  ): Promise<NavPreferences> => {
-    return userSlug
-      ? await payload
-          .find({
-            collection: 'payload-preferences',
-            depth: 0,
-            limit: 1,
-            pagination: false,
-            where: {
-              and: [
-                {
-                  key: {
-                    equals: 'nav',
-                  },
+export const getNavPrefs = cache(async (req: PayloadRequest): Promise<NavPreferences> => {
+  return req?.user?.collection
+    ? await req.payload
+        .find({
+          collection: 'payload-preferences',
+          depth: 0,
+          limit: 1,
+          pagination: false,
+          req,
+          where: {
+            and: [
+              {
+                key: {
+                  equals: 'nav',
                 },
-                {
-                  'user.relationTo': {
-                    equals: userSlug,
-                  },
+              },
+              {
+                'user.relationTo': {
+                  equals: req.user.collection,
                 },
-                {
-                  'user.value': {
-                    equals: userID,
-                  },
+              },
+              {
+                'user.value': {
+                  equals: req?.user?.id,
                 },
-              ],
-            },
-          })
-          ?.then((res) => res?.docs?.[0]?.value)
-      : null
-  },
-)
+              },
+            ],
+          },
+        })
+        ?.then((res) => res?.docs?.[0]?.value)
+    : null
+})
diff --git a/packages/next/src/elements/Nav/index.tsx b/packages/next/src/elements/Nav/index.tsx
index 1ee12bc2e1..c7aabc3aec 100644
--- a/packages/next/src/elements/Nav/index.tsx
+++ b/packages/next/src/elements/Nav/index.tsx
@@ -1,5 +1,5 @@
 import type { EntityToGroup } from '@payloadcms/ui/shared'
-import type { ServerProps } from 'payload'
+import type { PayloadRequest, ServerProps } from 'payload'
 
 import { Logout } from '@payloadcms/ui'
 import { RenderServerComponent } from '@payloadcms/ui/elements/RenderServerComponent'
@@ -15,7 +15,9 @@ const baseClass = 'nav'
 import { getNavPrefs } from './getNavPrefs.js'
 import { DefaultNavClient } from './index.client.js'
 
-export type NavProps = ServerProps
+export type NavProps = {
+  req?: PayloadRequest
+} & ServerProps
 
 export const DefaultNav: React.FC<NavProps> = async (props) => {
   const {
@@ -25,6 +27,7 @@ export const DefaultNav: React.FC<NavProps> = async (props) => {
     params,
     payload,
     permissions,
+    req,
     searchParams,
     user,
     viewType,
@@ -68,7 +71,7 @@ export const DefaultNav: React.FC<NavProps> = async (props) => {
     i18n,
   )
 
-  const navPreferences = await getNavPrefs(payload, user?.id, user?.collection)
+  const navPreferences = await getNavPrefs(req)
 
   const LogoutComponent = RenderServerComponent({
     clientProps: {
diff --git a/packages/next/src/layouts/Root/index.tsx b/packages/next/src/layouts/Root/index.tsx
index f0c8c31526..ac2319aabb 100644
--- a/packages/next/src/layouts/Root/index.tsx
+++ b/packages/next/src/layouts/Root/index.tsx
@@ -79,7 +79,7 @@ export const RootLayout = async ({
     })
   }
 
-  const navPrefs = await getNavPrefs(req.payload, req.user?.id, req.user?.collection)
+  const navPrefs = await getNavPrefs(req)
 
   const clientConfig = getClientConfig({
     config,
diff --git a/packages/next/src/templates/Default/index.tsx b/packages/next/src/templates/Default/index.tsx
index a0418a3607..431d5f32da 100644
--- a/packages/next/src/templates/Default/index.tsx
+++ b/packages/next/src/templates/Default/index.tsx
@@ -1,6 +1,7 @@
 import type {
   CustomComponent,
   DocumentSubViewTypes,
+  PayloadRequest,
   ServerProps,
   ViewTypes,
   VisibleEntities,
@@ -32,6 +33,7 @@ export type DefaultTemplateProps = {
   docID?: number | string
   documentSubViewType?: DocumentSubViewTypes
   globalSlug?: string
+  req?: PayloadRequest
   viewActions?: CustomComponent[]
   viewType?: ViewTypes
   visibleEntities: VisibleEntities
@@ -49,6 +51,7 @@ export const DefaultTemplate: React.FC<DefaultTemplateProps> = ({
   params,
   payload,
   permissions,
+  req,
   searchParams,
   user,
   viewActions,
@@ -84,6 +87,7 @@ export const DefaultTemplate: React.FC<DefaultTemplateProps> = ({
       params,
       payload,
       permissions,
+      req,
       searchParams,
       user,
     }),
@@ -98,6 +102,7 @@ export const DefaultTemplate: React.FC<DefaultTemplateProps> = ({
       globalSlug,
       collectionSlug,
       docID,
+      req,
     ],
   )
 
diff --git a/packages/next/src/views/Document/getDocumentData.ts b/packages/next/src/views/Document/getDocumentData.ts
index f1ca4226ca..5200813b6f 100644
--- a/packages/next/src/views/Document/getDocumentData.ts
+++ b/packages/next/src/views/Document/getDocumentData.ts
@@ -29,6 +29,7 @@ export const getDocumentData = async ({
 }: Args): Promise<null | Record<string, unknown> | TypeWithID> => {
   const id = sanitizeID(idArg)
   let resolvedData: Record<string, unknown> | TypeWithID = null
+  const { transactionID, ...rest } = req
 
   try {
     if (collectionSlug && id) {
@@ -41,9 +42,7 @@ export const getDocumentData = async ({
         locale: locale?.code,
         overrideAccess: false,
         req: {
-          query: req?.query,
-          search: req?.search,
-          searchParams: req?.searchParams,
+          ...rest,
         },
         user,
       })
@@ -58,9 +57,7 @@ export const getDocumentData = async ({
         locale: locale?.code,
         overrideAccess: false,
         req: {
-          query: req?.query,
-          search: req?.search,
-          searchParams: req?.searchParams,
+          ...rest,
         },
         user,
       })
diff --git a/packages/next/src/views/Root/index.tsx b/packages/next/src/views/Root/index.tsx
index 8a076b71f7..b5384ff2aa 100644
--- a/packages/next/src/views/Root/index.tsx
+++ b/packages/next/src/views/Root/index.tsx
@@ -167,6 +167,7 @@ export const RootPage = async ({
           params={params}
           payload={initPageResult?.req.payload}
           permissions={initPageResult?.permissions}
+          req={initPageResult?.req}
           searchParams={searchParams}
           user={initPageResult?.req.user}
           viewActions={serverProps.viewActions}

From 88769c824423362db5d89919a52d576dee8ab38f Mon Sep 17 00:00:00 2001
From: Jarrod Flesch <30633324+JarrodMFlesch@users.noreply.github.com>
Date: Thu, 15 May 2025 14:54:26 -0400
Subject: [PATCH 46/46] feat(ui): extracts relationship input for external use
 (#12339)

---
 .../src/lib/manage-env-files.ts               |   4 +-
 packages/payload/src/fields/config/types.ts   |   2 +-
 .../ui/src/elements/AddNewRelation/index.tsx  |  39 +-
 .../ui/src/elements/AddNewRelation/types.ts   |  19 +-
 packages/ui/src/exports/client/index.ts       |   2 +-
 packages/ui/src/fields/Relationship/Input.tsx | 852 ++++++++++++++++
 .../fields/Relationship/createRelationMap.ts  |  66 +-
 .../fields/Relationship/findOptionsByValue.ts |  17 +-
 packages/ui/src/fields/Relationship/index.tsx | 906 +++---------------
 .../src/fields/Relationship/optionsReducer.ts |   5 +-
 packages/ui/src/fields/Relationship/types.ts  |  93 +-
 packages/ui/src/hooks/useDebouncedCallback.ts |   4 +-
 test/admin/payload-types.ts                   |  31 +
 test/helpers.ts                               |  13 +-
 .../src/generateTranslations/utils/index.ts   |   5 +-
 15 files changed, 1203 insertions(+), 855 deletions(-)
 create mode 100644 packages/ui/src/fields/Relationship/Input.tsx

diff --git a/packages/create-payload-app/src/lib/manage-env-files.ts b/packages/create-payload-app/src/lib/manage-env-files.ts
index 6ea4ba364b..aa87e4d6e0 100644
--- a/packages/create-payload-app/src/lib/manage-env-files.ts
+++ b/packages/create-payload-app/src/lib/manage-env-files.ts
@@ -22,7 +22,9 @@ const updateEnvExampleVariables = (
 
       const [key] = line.split('=')
 
-      if (!key) {return}
+      if (!key) {
+        return
+      }
 
       if (key === 'DATABASE_URI' || key === 'POSTGRES_URL' || key === 'MONGODB_URI') {
         const dbChoice = databaseType ? dbChoiceRecord[databaseType] : null
diff --git a/packages/payload/src/fields/config/types.ts b/packages/payload/src/fields/config/types.ts
index 65fc86105c..55642663fc 100644
--- a/packages/payload/src/fields/config/types.ts
+++ b/packages/payload/src/fields/config/types.ts
@@ -1208,7 +1208,7 @@ export type PolymorphicRelationshipField = {
 
 export type PolymorphicRelationshipFieldClient = {
   admin?: {
-    sortOptions?: Pick<PolymorphicRelationshipField['admin'], 'sortOptions'>
+    sortOptions?: PolymorphicRelationshipField['admin']['sortOptions']
   } & RelationshipAdminClient
 } & Pick<PolymorphicRelationshipField, 'relationTo'> &
   SharedRelationshipPropertiesClient
diff --git a/packages/ui/src/elements/AddNewRelation/index.tsx b/packages/ui/src/elements/AddNewRelation/index.tsx
index 0d1aa15322..9aefd0b0bf 100644
--- a/packages/ui/src/elements/AddNewRelation/index.tsx
+++ b/packages/ui/src/elements/AddNewRelation/index.tsx
@@ -4,7 +4,6 @@ import type { ClientCollectionConfig } from 'payload'
 import { getTranslation } from '@payloadcms/translations'
 import React, { Fragment, useCallback, useEffect, useState } from 'react'
 
-import type { Value } from '../../fields/Relationship/types.js'
 import type { DocumentDrawerContextType } from '../DocumentDrawer/Provider.js'
 import type { Props } from './types.js'
 
@@ -24,9 +23,9 @@ const baseClass = 'relationship-add-new'
 export const AddNewRelation: React.FC<Props> = ({
   Button: ButtonFromProps,
   hasMany,
+  onChange,
   path,
   relationTo,
-  setValue,
   unstyled,
   value,
 }) => {
@@ -54,18 +53,15 @@ export const AddNewRelation: React.FC<Props> = ({
   const onSave: DocumentDrawerContextType['onSave'] = useCallback(
     ({ doc, operation }) => {
       if (operation === 'create') {
-        const newValue: Value = Array.isArray(relationTo)
-          ? {
-              relationTo: collectionConfig?.slug,
-              value: doc.id,
-            }
-          : doc.id
-
         // ensure the value is not already in the array
-        const isNewValue =
-          Array.isArray(relationTo) && Array.isArray(value)
-            ? !value.some((v) => v && typeof v === 'object' && v.value === doc.id)
-            : value !== doc.id
+        let isNewValue = false
+        if (!value) {
+          isNewValue = true
+        } else {
+          isNewValue = Array.isArray(value)
+            ? !value.some((v) => v && v.value === doc.id)
+            : value.value !== doc.id
+        }
 
         if (isNewValue) {
           // dispatchOptions({
@@ -79,17 +75,26 @@ export const AddNewRelation: React.FC<Props> = ({
           //   sort: true,
           // })
 
-          if (hasMany) {
-            setValue([...(Array.isArray(value) ? value : []), newValue])
+          if (hasMany === true) {
+            onChange([
+              ...(Array.isArray(value) ? value : []),
+              {
+                relationTo: collectionConfig?.slug,
+                value: doc.id,
+              },
+            ])
           } else {
-            setValue(newValue)
+            onChange({
+              relationTo: relatedCollections[0].slug,
+              value: doc.id,
+            })
           }
         }
 
         setSelectedCollection(undefined)
       }
     },
-    [relationTo, collectionConfig, hasMany, setValue, value],
+    [collectionConfig, hasMany, onChange, value, relatedCollections],
   )
 
   const onPopupToggle = useCallback((state) => {
diff --git a/packages/ui/src/elements/AddNewRelation/types.ts b/packages/ui/src/elements/AddNewRelation/types.ts
index 11be593804..f57577f2b9 100644
--- a/packages/ui/src/elements/AddNewRelation/types.ts
+++ b/packages/ui/src/elements/AddNewRelation/types.ts
@@ -1,11 +1,20 @@
-import type { Value } from '../../fields/Relationship/types.js'
+import type { ValueWithRelation } from 'payload'
 
 export type Props = {
   readonly Button?: React.ReactNode
-  readonly hasMany: boolean
   readonly path: string
   readonly relationTo: string | string[]
-  readonly setValue: (value: unknown) => void
   readonly unstyled?: boolean
-  readonly value: Value | Value[]
-}
+} & SharedRelationshipInputProps
+
+type SharedRelationshipInputProps =
+  | {
+      readonly hasMany: false
+      readonly onChange: (value: ValueWithRelation, modifyForm?: boolean) => void
+      readonly value?: null | ValueWithRelation
+    }
+  | {
+      readonly hasMany: true
+      readonly onChange: (value: ValueWithRelation[]) => void
+      readonly value?: null | ValueWithRelation[]
+    }
diff --git a/packages/ui/src/exports/client/index.ts b/packages/ui/src/exports/client/index.ts
index e4de8e3f59..255e18130f 100644
--- a/packages/ui/src/exports/client/index.ts
+++ b/packages/ui/src/exports/client/index.ts
@@ -176,7 +176,7 @@ export { NumberField } from '../../fields/Number/index.js'
 export { PasswordField } from '../../fields/Password/index.js'
 export { PointField } from '../../fields/Point/index.js'
 export { RadioGroupField } from '../../fields/RadioGroup/index.js'
-export { RelationshipField } from '../../fields/Relationship/index.js'
+export { RelationshipField, RelationshipInput } from '../../fields/Relationship/index.js'
 export { RichTextField } from '../../fields/RichText/index.js'
 export { RowField } from '../../fields/Row/index.js'
 export { SelectField, SelectInput } from '../../fields/Select/index.js'
diff --git a/packages/ui/src/fields/Relationship/Input.tsx b/packages/ui/src/fields/Relationship/Input.tsx
new file mode 100644
index 0000000000..cab658c5e1
--- /dev/null
+++ b/packages/ui/src/fields/Relationship/Input.tsx
@@ -0,0 +1,852 @@
+'use client'
+import type { FilterOptionsResult, PaginatedDocs, ValueWithRelation, Where } from 'payload'
+
+import { dequal } from 'dequal/lite'
+import { formatAdminURL, wordBoundariesRegex } from 'payload/shared'
+import * as qs from 'qs-esm'
+import React, { useCallback, useEffect, useMemo, useReducer, useRef, useState } from 'react'
+
+import type { DocumentDrawerProps } from '../../elements/DocumentDrawer/types.js'
+import type { ListDrawerProps } from '../../elements/ListDrawer/types.js'
+import type { ReactSelectAdapterProps } from '../../elements/ReactSelect/types.js'
+import type { GetResults, HasManyValueUnion, Option, RelationshipInputProps } from './types.js'
+
+import { AddNewRelation } from '../../elements/AddNewRelation/index.js'
+import { useDocumentDrawer } from '../../elements/DocumentDrawer/index.js'
+import { useListDrawer } from '../../elements/ListDrawer/index.js'
+import { ReactSelect } from '../../elements/ReactSelect/index.js'
+import { RenderCustomComponent } from '../../elements/RenderCustomComponent/index.js'
+import { FieldDescription } from '../../fields/FieldDescription/index.js'
+import { FieldError } from '../../fields/FieldError/index.js'
+import { FieldLabel } from '../../fields/FieldLabel/index.js'
+import { useDebouncedCallback } from '../../hooks/useDebouncedCallback.js'
+import { useEffectEvent } from '../../hooks/useEffectEvent.js'
+import { useAuth } from '../../providers/Auth/index.js'
+import { useConfig } from '../../providers/Config/index.js'
+import { useLocale } from '../../providers/Locale/index.js'
+import { useTranslation } from '../../providers/Translation/index.js'
+import { sanitizeFilterOptionsQuery } from '../../utilities/sanitizeFilterOptionsQuery.js'
+import { fieldBaseClass } from '../shared/index.js'
+import { createRelationMap } from './createRelationMap.js'
+import { findOptionsByValue } from './findOptionsByValue.js'
+import { optionsReducer } from './optionsReducer.js'
+import { MultiValueLabel } from './select-components/MultiValueLabel/index.js'
+import { SingleValue } from './select-components/SingleValue/index.js'
+import './index.scss'
+
+const baseClass = 'relationship'
+
+export const RelationshipInput: React.FC<RelationshipInputProps> = (props) => {
+  const {
+    AfterInput,
+    allowCreate = true,
+    allowEdit = true,
+    appearance = 'select',
+    BeforeInput,
+    className,
+    description,
+    Description,
+    Error,
+    filterOptions,
+    hasMany,
+    initialValue,
+    isSortable = true,
+    label,
+    Label,
+    localized,
+    maxResultsPerRequest = 10,
+    onChange,
+    path,
+    placeholder,
+    readOnly,
+    relationTo,
+    required,
+    showError,
+    sortOptions,
+    style,
+    value,
+  } = props
+
+  const { config, getEntityConfig } = useConfig()
+
+  const {
+    routes: { api },
+    serverURL,
+  } = config
+
+  const { i18n, t } = useTranslation()
+  const { permissions } = useAuth()
+  const { code: locale } = useLocale()
+
+  const [currentlyOpenRelationship, setCurrentlyOpenRelationship] = useState<
+    Parameters<ReactSelectAdapterProps['customProps']['onDocumentOpen']>[0]
+  >({
+    id: undefined,
+    collectionSlug: undefined,
+    hasReadPermission: false,
+  })
+
+  const [lastFullyLoadedRelation, setLastFullyLoadedRelation] = useState(-1)
+  const [lastLoadedPage, setLastLoadedPage] = useState<Record<string, number>>({})
+  const [errorLoading, setErrorLoading] = useState('')
+  const [search, setSearch] = useState('')
+  const [isLoading, setIsLoading] = useState(false)
+  const [enableWordBoundarySearch, setEnableWordBoundarySearch] = useState(false)
+  const [menuIsOpen, setMenuIsOpen] = useState(false)
+  const hasLoadedFirstPageRef = useRef(false)
+
+  const [options, dispatchOptions] = useReducer(optionsReducer, [])
+
+  const valueRef = useRef(value)
+  // the line below seems odd
+  valueRef.current = value
+
+  const [DocumentDrawer, , { isDrawerOpen, openDrawer }] = useDocumentDrawer({
+    id: currentlyOpenRelationship.id,
+    collectionSlug: currentlyOpenRelationship.collectionSlug,
+  })
+
+  // Filter selected values from displaying in the list drawer
+  const listDrawerFilterOptions = useMemo<FilterOptionsResult>(() => {
+    let newFilterOptions = filterOptions
+
+    if (value) {
+      const valuesByRelation = (hasMany === false ? [value] : value).reduce((acc, val) => {
+        if (!acc[val.relationTo]) {
+          acc[val.relationTo] = []
+        }
+        acc[val.relationTo].push(val.value)
+        return acc
+      }, {})
+
+      ;(Array.isArray(relationTo) ? relationTo : [relationTo]).forEach((relation) => {
+        newFilterOptions = {
+          ...(newFilterOptions || {}),
+          [relation]: {
+            ...(typeof filterOptions?.[relation] === 'object' ? filterOptions[relation] : {}),
+            ...(valuesByRelation[relation]
+              ? {
+                  id: {
+                    not_in: valuesByRelation[relation],
+                  },
+                }
+              : {}),
+          },
+        }
+      })
+    }
+
+    return newFilterOptions
+  }, [filterOptions, value, hasMany, relationTo])
+
+  const [
+    ListDrawer,
+    ,
+    { closeDrawer: closeListDrawer, isDrawerOpen: isListDrawerOpen, openDrawer: openListDrawer },
+  ] = useListDrawer({
+    collectionSlugs: relationTo,
+    filterOptions: listDrawerFilterOptions,
+  })
+
+  const onListSelect = useCallback<NonNullable<ListDrawerProps['onSelect']>>(
+    ({ collectionSlug, doc }) => {
+      if (hasMany) {
+        onChange([
+          ...(Array.isArray(value) ? value : []),
+          {
+            relationTo: collectionSlug,
+            value: doc.id,
+          },
+        ])
+      } else if (hasMany === false) {
+        onChange({
+          relationTo: collectionSlug,
+          value: doc.id,
+        })
+      }
+
+      closeListDrawer()
+    },
+    [hasMany, onChange, closeListDrawer, value],
+  )
+
+  const openDrawerWhenRelationChanges = useRef(false)
+
+  const getResults: GetResults = useCallback(
+    async ({
+      filterOptions,
+      hasMany: hasManyArg,
+      lastFullyLoadedRelation: lastFullyLoadedRelationArg,
+      lastLoadedPage: lastLoadedPageArg,
+      onSuccess,
+      search: searchArg,
+      sort,
+      value: valueArg,
+    }) => {
+      if (!permissions) {
+        return
+      }
+      const lastFullyLoadedRelationToUse =
+        typeof lastFullyLoadedRelationArg !== 'undefined' ? lastFullyLoadedRelationArg : -1
+
+      const relations = Array.isArray(relationTo) ? relationTo : [relationTo]
+      const relationsToFetch =
+        lastFullyLoadedRelationToUse === -1
+          ? relations
+          : relations.slice(lastFullyLoadedRelationToUse + 1)
+
+      let resultsFetched = 0
+      const relationMap = createRelationMap(
+        hasManyArg === true
+          ? {
+              hasMany: true,
+              relationTo,
+              value: valueArg,
+            }
+          : {
+              hasMany: false,
+              relationTo,
+              value: valueArg,
+            },
+      )
+
+      if (!errorLoading) {
+        await relationsToFetch.reduce(async (priorRelation, relation) => {
+          const relationFilterOption = filterOptions?.[relation]
+
+          let lastLoadedPageToUse
+          if (search !== searchArg) {
+            lastLoadedPageToUse = 1
+          } else {
+            lastLoadedPageToUse = lastLoadedPageArg[relation] + 1
+          }
+          await priorRelation
+
+          if (relationFilterOption === false) {
+            setLastFullyLoadedRelation(relations.indexOf(relation))
+            return Promise.resolve()
+          }
+
+          if (resultsFetched < 10) {
+            const collection = getEntityConfig({ collectionSlug: relation })
+            const fieldToSearch = collection?.admin?.useAsTitle || 'id'
+            let fieldToSort = collection?.defaultSort || 'id'
+            if (typeof sortOptions === 'string') {
+              fieldToSort = sortOptions
+            } else if (sortOptions?.[relation]) {
+              fieldToSort = sortOptions[relation]
+            }
+
+            const query: {
+              [key: string]: unknown
+              where: Where
+            } = {
+              depth: 0,
+              draft: true,
+              limit: maxResultsPerRequest,
+              locale,
+              page: lastLoadedPageToUse,
+              select: {
+                [fieldToSearch]: true,
+              },
+              sort: fieldToSort,
+              where: {
+                and: [
+                  {
+                    id: {
+                      not_in: relationMap[relation],
+                    },
+                  },
+                ],
+              },
+            }
+
+            if (searchArg) {
+              query.where.and.push({
+                [fieldToSearch]: {
+                  like: searchArg,
+                },
+              })
+            }
+
+            if (relationFilterOption && typeof relationFilterOption !== 'boolean') {
+              query.where.and.push(relationFilterOption)
+            }
+
+            sanitizeFilterOptionsQuery(query.where)
+
+            const response = await fetch(`${serverURL}${api}/${relation}`, {
+              body: qs.stringify(query),
+              credentials: 'include',
+              headers: {
+                'Accept-Language': i18n.language,
+                'Content-Type': 'application/x-www-form-urlencoded',
+                'X-HTTP-Method-Override': 'GET',
+              },
+              method: 'POST',
+            })
+
+            if (response.ok) {
+              const data: PaginatedDocs<unknown> = await response.json()
+              setLastLoadedPage((prevState) => {
+                return {
+                  ...prevState,
+                  [relation]: lastLoadedPageToUse,
+                }
+              })
+
+              if (!data.nextPage) {
+                setLastFullyLoadedRelation(relations.indexOf(relation))
+              }
+
+              if (data.docs.length > 0) {
+                resultsFetched += data.docs.length
+
+                dispatchOptions({
+                  type: 'ADD',
+                  collection,
+                  config,
+                  docs: data.docs,
+                  i18n,
+                  sort,
+                })
+              }
+            } else if (response.status === 403) {
+              setLastFullyLoadedRelation(relations.indexOf(relation))
+              dispatchOptions({
+                type: 'ADD',
+                collection,
+                config,
+                docs: [],
+                i18n,
+                ids: relationMap[relation],
+                sort,
+              })
+            } else {
+              setErrorLoading(t('error:unspecific'))
+            }
+          }
+        }, Promise.resolve())
+
+        if (typeof onSuccess === 'function') {
+          onSuccess()
+        }
+      }
+    },
+    [
+      permissions,
+      relationTo,
+      errorLoading,
+      search,
+      getEntityConfig,
+      sortOptions,
+      maxResultsPerRequest,
+      locale,
+      serverURL,
+      api,
+      i18n,
+      config,
+      t,
+    ],
+  )
+
+  const updateSearch = useDebouncedCallback<{ search: string } & HasManyValueUnion>(
+    ({ hasMany: hasManyArg, search: searchArg, value }) => {
+      void getResults({
+        filterOptions,
+        lastLoadedPage: {},
+        search: searchArg,
+        sort: true,
+        ...(hasManyArg === true
+          ? {
+              hasMany: hasManyArg,
+              value,
+            }
+          : {
+              hasMany: hasManyArg,
+              value,
+            }),
+      })
+      setSearch(searchArg)
+    },
+    300,
+  )
+
+  const handleInputChange = useCallback(
+    (options: { search: string } & HasManyValueUnion) => {
+      if (search !== options.search) {
+        setLastLoadedPage({})
+        updateSearch(options)
+      }
+    },
+    [search, updateSearch],
+  )
+
+  const handleValueChange = useEffectEvent(({ hasMany: hasManyArg, value }: HasManyValueUnion) => {
+    const relationMap = createRelationMap(
+      hasManyArg === true
+        ? {
+            hasMany: hasManyArg,
+            relationTo,
+            value,
+          }
+        : {
+            hasMany: hasManyArg,
+            relationTo,
+            value,
+          },
+    )
+
+    void Object.entries(relationMap).reduce(async (priorRelation, [relation, ids]) => {
+      await priorRelation
+
+      const idsToLoad = ids.filter((id) => {
+        return !options.find((optionGroup) =>
+          optionGroup?.options?.find(
+            (option) => option.value === id && option.relationTo === relation,
+          ),
+        )
+      })
+
+      if (idsToLoad.length > 0) {
+        const query = {
+          depth: 0,
+          draft: true,
+          limit: idsToLoad.length,
+          locale,
+          where: {
+            id: {
+              in: idsToLoad,
+            },
+          },
+        }
+
+        if (!errorLoading) {
+          const response = await fetch(`${serverURL}${api}/${relation}`, {
+            body: qs.stringify(query),
+            credentials: 'include',
+            headers: {
+              'Accept-Language': i18n.language,
+              'Content-Type': 'application/x-www-form-urlencoded',
+              'X-HTTP-Method-Override': 'GET',
+            },
+            method: 'POST',
+          })
+
+          const collection = getEntityConfig({ collectionSlug: relation })
+          let docs = []
+
+          if (response.ok) {
+            const data = await response.json()
+            docs = data.docs
+          }
+
+          dispatchOptions({
+            type: 'ADD',
+            collection,
+            config,
+            docs,
+            i18n,
+            ids: idsToLoad,
+            sort: true,
+          })
+        }
+      }
+    }, Promise.resolve())
+  })
+
+  const onSave = useCallback<DocumentDrawerProps['onSave']>(
+    (args) => {
+      dispatchOptions({
+        type: 'UPDATE',
+        collection: args.collectionConfig,
+        config,
+        doc: args.doc,
+        i18n,
+      })
+
+      const docID = args.doc.id
+
+      if (hasMany) {
+        const currentValue = valueRef.current
+          ? Array.isArray(valueRef.current)
+            ? valueRef.current
+            : [valueRef.current]
+          : []
+
+        const valuesToSet = currentValue.map((option: ValueWithRelation) => {
+          return {
+            relationTo: option.value === docID ? args.collectionConfig.slug : option.relationTo,
+            value: option.value,
+          }
+        })
+
+        onChange(valuesToSet)
+      } else if (hasMany === false) {
+        onChange({ relationTo: args.collectionConfig.slug, value: docID })
+      }
+    },
+    [i18n, config, hasMany, onChange],
+  )
+
+  const onDuplicate = useCallback<DocumentDrawerProps['onDuplicate']>(
+    (args) => {
+      dispatchOptions({
+        type: 'ADD',
+        collection: args.collectionConfig,
+        config,
+        docs: [args.doc],
+        i18n,
+        sort: true,
+      })
+
+      if (hasMany) {
+        onChange(
+          valueRef.current
+            ? (valueRef.current as ValueWithRelation[]).concat({
+                relationTo: args.collectionConfig.slug,
+                value: args.doc.id,
+              })
+            : null,
+        )
+      } else if (hasMany === false) {
+        onChange({
+          relationTo: args.collectionConfig.slug,
+          value: args.doc.id,
+        })
+      }
+    },
+    [i18n, config, hasMany, onChange],
+  )
+
+  const onDelete = useCallback<DocumentDrawerProps['onDelete']>(
+    (args) => {
+      dispatchOptions({
+        id: args.id,
+        type: 'REMOVE',
+        collection: args.collectionConfig,
+        config,
+        i18n,
+      })
+
+      if (hasMany) {
+        onChange(
+          valueRef.current
+            ? (valueRef.current as ValueWithRelation[]).filter((option) => {
+                return option.value !== args.id
+              })
+            : null,
+        )
+      } else {
+        onChange(null)
+      }
+
+      return
+    },
+    [i18n, config, hasMany, onChange],
+  )
+
+  const filterOption = useCallback((item: Option, searchFilter: string) => {
+    if (!searchFilter) {
+      return true
+    }
+    const r = wordBoundariesRegex(searchFilter || '')
+    // breaking the labels to search into smaller parts increases performance
+    const breakApartThreshold = 250
+    let labelString = String(item.label)
+    // strings less than breakApartThreshold length won't be chunked
+    while (labelString.length > breakApartThreshold) {
+      // slicing by the next space after the length of the search input prevents slicing the string up by partial words
+      const indexOfSpace = labelString.indexOf(' ', searchFilter.length)
+      if (
+        r.test(labelString.slice(0, indexOfSpace === -1 ? searchFilter.length : indexOfSpace + 1))
+      ) {
+        return true
+      }
+      labelString = labelString.slice(indexOfSpace === -1 ? searchFilter.length : indexOfSpace + 1)
+    }
+    return r.test(labelString.slice(-breakApartThreshold))
+  }, [])
+
+  const onDocumentOpen = useCallback<ReactSelectAdapterProps['customProps']['onDocumentOpen']>(
+    ({ id, collectionSlug, hasReadPermission, openInNewTab }) => {
+      if (openInNewTab) {
+        if (hasReadPermission && id && collectionSlug) {
+          const docUrl = formatAdminURL({
+            adminRoute: config.routes.admin,
+            path: `/collections/${collectionSlug}/${id}`,
+          })
+
+          window.open(docUrl, '_blank')
+        }
+      } else {
+        openDrawerWhenRelationChanges.current = true
+
+        setCurrentlyOpenRelationship({
+          id,
+          collectionSlug,
+          hasReadPermission,
+        })
+      }
+    },
+    [config.routes.admin],
+  )
+
+  const getResultsEffectEvent: GetResults = useEffectEvent(async (args) => {
+    return await getResults(args)
+  })
+
+  // When (`relationTo` || `filterOptions` || `locale`) changes, reset component
+  // Note - effect should not run on first run
+  useEffect(() => {
+    // If the menu is open while filterOptions changes
+    // due to latency of form state and fast clicking into this field,
+    // re-fetch options
+    if (hasLoadedFirstPageRef.current && menuIsOpen) {
+      setIsLoading(true)
+      void getResultsEffectEvent({
+        filterOptions,
+        lastLoadedPage: {},
+        onSuccess: () => {
+          hasLoadedFirstPageRef.current = true
+          setIsLoading(false)
+        },
+        ...(hasMany === true
+          ? {
+              hasMany,
+              value: valueRef.current as ValueWithRelation[],
+            }
+          : {
+              hasMany,
+              value: valueRef.current as ValueWithRelation,
+            }),
+      })
+    }
+
+    // If the menu is not open, still reset the field state
+    // because we need to get new options next time the menu opens
+    dispatchOptions({
+      type: 'CLEAR',
+      exemptValues: valueRef.current,
+    })
+
+    setLastFullyLoadedRelation(-1)
+    setLastLoadedPage({})
+  }, [relationTo, filterOptions, locale, path, menuIsOpen, hasMany])
+
+  const prevValue = useRef(value)
+  const isFirstRenderRef = useRef(true)
+  // ///////////////////////////////////
+  // Ensure we have an option for each value
+  // ///////////////////////////////////
+  useEffect(() => {
+    if (isFirstRenderRef.current || !dequal(value, prevValue.current)) {
+      handleValueChange(hasMany === true ? { hasMany, value } : { hasMany, value })
+    }
+    isFirstRenderRef.current = false
+    prevValue.current = value
+  }, [value, hasMany])
+
+  // Determine if we should switch to word boundary search
+  useEffect(() => {
+    const relations = Array.isArray(relationTo) ? relationTo : [relationTo]
+    const isIdOnly = relations.reduce((idOnly, relation) => {
+      const collection = getEntityConfig({ collectionSlug: relation })
+      const fieldToSearch = collection?.admin?.useAsTitle || 'id'
+      return fieldToSearch === 'id' && idOnly
+    }, true)
+    setEnableWordBoundarySearch(!isIdOnly)
+  }, [relationTo, getEntityConfig])
+
+  useEffect(() => {
+    if (openDrawerWhenRelationChanges.current) {
+      openDrawer()
+      openDrawerWhenRelationChanges.current = false
+    }
+  }, [openDrawer, currentlyOpenRelationship])
+
+  const valueToRender = findOptionsByValue({ allowEdit, options, value })
+
+  if (!Array.isArray(valueToRender) && valueToRender?.value === 'null') {
+    valueToRender.value = null
+  }
+
+  return (
+    <div
+      className={[
+        fieldBaseClass,
+        baseClass,
+        className,
+        showError && 'error',
+        errorLoading && 'error-loading',
+        readOnly && `${baseClass}--read-only`,
+        !readOnly && allowCreate && `${baseClass}--allow-create`,
+      ]
+        .filter(Boolean)
+        .join(' ')}
+      id={`field-${path.replace(/\./g, '__')}`}
+      style={style}
+    >
+      <RenderCustomComponent
+        CustomComponent={Label}
+        Fallback={
+          <FieldLabel label={label} localized={localized} path={path} required={required} />
+        }
+      />
+      <div className={`${fieldBaseClass}__wrap`}>
+        <RenderCustomComponent
+          CustomComponent={Error}
+          Fallback={<FieldError path={path} showError={showError} />}
+        />
+        {BeforeInput}
+        {!errorLoading && (
+          <div className={`${baseClass}__wrap`}>
+            <ReactSelect
+              backspaceRemovesValue={!(isDrawerOpen || isListDrawerOpen)}
+              components={{
+                MultiValueLabel,
+                SingleValue,
+                ...(appearance !== 'select' && { DropdownIndicator: null }),
+              }}
+              customProps={{
+                disableKeyDown: isDrawerOpen || isListDrawerOpen,
+                disableMouseDown: isDrawerOpen || isListDrawerOpen,
+                onDocumentOpen,
+                onSave,
+              }}
+              disabled={readOnly || isDrawerOpen || isListDrawerOpen}
+              filterOption={enableWordBoundarySearch ? filterOption : undefined}
+              getOptionValue={(option: ValueWithRelation) => {
+                if (!option) {
+                  return undefined
+                }
+                return hasMany && Array.isArray(relationTo)
+                  ? `${option.relationTo}_${option.value}`
+                  : (option.value as string)
+              }}
+              isLoading={appearance === 'select' && isLoading}
+              isMulti={hasMany}
+              isSearchable={appearance === 'select'}
+              isSortable={isSortable}
+              menuIsOpen={appearance === 'select' ? menuIsOpen : false}
+              onChange={
+                !readOnly
+                  ? (selected) => {
+                      if (hasMany) {
+                        if (selected === null) {
+                          onChange([])
+                        } else {
+                          onChange(selected as ValueWithRelation[])
+                        }
+                      } else if (hasMany === false) {
+                        if (selected === null) {
+                          onChange(null)
+                        } else {
+                          onChange(selected as ValueWithRelation)
+                        }
+                      }
+                    }
+                  : undefined
+              }
+              onInputChange={(newSearch) =>
+                handleInputChange({
+                  search: newSearch,
+                  ...(hasMany === true
+                    ? {
+                        hasMany,
+                        value,
+                      }
+                    : {
+                        hasMany,
+                        value,
+                      }),
+                })
+              }
+              onMenuClose={() => {
+                setMenuIsOpen(false)
+              }}
+              onMenuOpen={() => {
+                if (appearance === 'drawer') {
+                  openListDrawer()
+                } else if (appearance === 'select') {
+                  setMenuIsOpen(true)
+                  if (!hasLoadedFirstPageRef.current) {
+                    setIsLoading(true)
+                    void getResults({
+                      filterOptions,
+                      lastLoadedPage: {},
+                      onSuccess: () => {
+                        hasLoadedFirstPageRef.current = true
+                        setIsLoading(false)
+                      },
+                      ...(hasMany === true
+                        ? {
+                            hasMany,
+                            value,
+                          }
+                        : {
+                            hasMany,
+                            value,
+                          }),
+                    })
+                  }
+                }
+              }}
+              onMenuScrollToBottom={() => {
+                void getResults({
+                  filterOptions,
+                  lastFullyLoadedRelation,
+                  lastLoadedPage,
+                  search,
+                  sort: false,
+                  ...(hasMany === true
+                    ? {
+                        hasMany,
+                        value: initialValue,
+                      }
+                    : {
+                        hasMany,
+                        value: initialValue,
+                      }),
+                })
+              }}
+              options={options}
+              placeholder={placeholder}
+              showError={showError}
+              value={valueToRender ?? null}
+            />
+            {!readOnly && allowCreate && (
+              <AddNewRelation
+                path={path}
+                relationTo={relationTo}
+                {...(hasMany === true
+                  ? {
+                      hasMany,
+                      onChange,
+                      value,
+                    }
+                  : {
+                      hasMany,
+                      onChange,
+                      value,
+                    })}
+              />
+            )}
+          </div>
+        )}
+        {errorLoading && <div className={`${baseClass}__error-loading`}>{errorLoading}</div>}
+        {AfterInput}
+        <RenderCustomComponent
+          CustomComponent={Description}
+          Fallback={<FieldDescription description={description} path={path} />}
+        />
+      </div>
+      {currentlyOpenRelationship.collectionSlug && currentlyOpenRelationship.hasReadPermission && (
+        <DocumentDrawer onDelete={onDelete} onDuplicate={onDuplicate} onSave={onSave} />
+      )}
+      {appearance === 'drawer' && !readOnly && (
+        <ListDrawer allowCreate={allowCreate} enableRowSelections={false} onSelect={onListSelect} />
+      )}
+    </div>
+  )
+}
diff --git a/packages/ui/src/fields/Relationship/createRelationMap.ts b/packages/ui/src/fields/Relationship/createRelationMap.ts
index 6a3d030c2a..5bc52d23c6 100644
--- a/packages/ui/src/fields/Relationship/createRelationMap.ts
+++ b/packages/ui/src/fields/Relationship/createRelationMap.ts
@@ -1,62 +1,44 @@
 'use client'
-import type { Value } from './types.js'
+import type { HasManyValueUnion } from './types.js'
 
 type RelationMap = {
   [relation: string]: (number | string)[]
 }
 
-type CreateRelationMap = (args: {
-  hasMany: boolean
-  relationTo: string | string[]
-  value: null | Value | Value[] // really needs to be `ValueWithRelation`
-}) => RelationMap
+type CreateRelationMap = (
+  args: {
+    relationTo: string[]
+  } & HasManyValueUnion,
+) => RelationMap
 
 export const createRelationMap: CreateRelationMap = ({ hasMany, relationTo, value }) => {
-  const hasMultipleRelations = Array.isArray(relationTo)
-  let relationMap: RelationMap
-  if (Array.isArray(relationTo)) {
-    relationMap = relationTo.reduce((map, current) => {
-      return { ...map, [current]: [] }
-    }, {})
-  } else {
-    relationMap = { [relationTo]: [] }
-  }
+  const relationMap: RelationMap = relationTo.reduce((map, current) => {
+    return { ...map, [current]: [] }
+  }, {})
 
   if (value === null) {
     return relationMap
   }
 
-  const add = (relation: string, id: unknown) => {
-    if ((typeof id === 'string' || typeof id === 'number') && typeof relation === 'string') {
-      if (relationMap[relation]) {
-        relationMap[relation].push(id)
-      } else {
-        relationMap[relation] = [id]
+  if (value) {
+    const add = (relation: string, id: number | string) => {
+      if ((typeof id === 'string' || typeof id === 'number') && typeof relation === 'string') {
+        if (relationMap[relation]) {
+          relationMap[relation].push(id)
+        } else {
+          relationMap[relation] = [id]
+        }
       }
     }
-  }
-
-  if (hasMany && Array.isArray(value)) {
-    value.forEach((val) => {
-      if (
-        hasMultipleRelations &&
-        typeof val === 'object' &&
-        'relationTo' in val &&
-        'value' in val
-      ) {
-        add(val.relationTo, val.value)
-      }
-
-      if (!hasMultipleRelations && typeof relationTo === 'string') {
-        add(relationTo, val)
-      }
-    })
-  } else if (hasMultipleRelations && Array.isArray(relationTo)) {
-    if (typeof value === 'object' && 'relationTo' in value && 'value' in value) {
+    if (hasMany === true) {
+      value.forEach((val) => {
+        if (val) {
+          add(val.relationTo, val.value)
+        }
+      })
+    } else {
       add(value.relationTo, value.value)
     }
-  } else {
-    add(relationTo, value)
   }
 
   return relationMap
diff --git a/packages/ui/src/fields/Relationship/findOptionsByValue.ts b/packages/ui/src/fields/Relationship/findOptionsByValue.ts
index 82c9132d5a..8f27f1e3e9 100644
--- a/packages/ui/src/fields/Relationship/findOptionsByValue.ts
+++ b/packages/ui/src/fields/Relationship/findOptionsByValue.ts
@@ -1,11 +1,13 @@
 'use client'
+import type { ValueWithRelation } from 'payload'
+
 import type { Option } from '../../elements/ReactSelect/types.js'
-import type { OptionGroup, Value } from './types.js'
+import type { OptionGroup } from './types.js'
 
 type Args = {
   allowEdit: boolean
   options: OptionGroup[]
-  value: Value | Value[]
+  value: ValueWithRelation | ValueWithRelation[]
 }
 
 export const findOptionsByValue = ({ allowEdit, options, value }: Args): Option | Option[] => {
@@ -17,11 +19,7 @@ export const findOptionsByValue = ({ allowEdit, options, value }: Args): Option
         options.forEach((optGroup) => {
           if (!matchedOption) {
             matchedOption = optGroup.options.find((option) => {
-              if (typeof val === 'object') {
-                return option.value === val.value && option.relationTo === val.relationTo
-              }
-
-              return val === option.value
+              return option.value === val.value && option.relationTo === val.relationTo
             })
           }
         })
@@ -35,10 +33,7 @@ export const findOptionsByValue = ({ allowEdit, options, value }: Args): Option
     options.forEach((optGroup) => {
       if (!matchedOption) {
         matchedOption = optGroup.options.find((option) => {
-          if (typeof value === 'object') {
-            return option.value === value.value && option.relationTo === value.relationTo
-          }
-          return value === option.value
+          return option.value === value.value && option.relationTo === value.relationTo
         })
       }
     })
diff --git a/packages/ui/src/fields/Relationship/index.tsx b/packages/ui/src/fields/Relationship/index.tsx
index dc50b3d309..a4b4f6dd04 100644
--- a/packages/ui/src/fields/Relationship/index.tsx
+++ b/packages/ui/src/fields/Relationship/index.tsx
@@ -1,50 +1,17 @@
 'use client'
-import type {
-  FilterOptionsResult,
-  PaginatedDocs,
-  RelationshipFieldClientComponent,
-  Where,
-} from 'payload'
+import type { RelationshipFieldClientComponent, ValueWithRelation } from 'payload'
 
-import { dequal } from 'dequal/lite'
-import { formatAdminURL, wordBoundariesRegex } from 'payload/shared'
-import * as qs from 'qs-esm'
-import { useCallback, useEffect, useMemo, useReducer, useRef, useState } from 'react'
+import React, { useCallback, useMemo } from 'react'
 
-import type { DocumentDrawerProps } from '../../elements/DocumentDrawer/types.js'
-import type { ListDrawerProps } from '../../elements/ListDrawer/types.js'
-import type { ReactSelectAdapterProps } from '../../elements/ReactSelect/types.js'
-import type { GetResults, Option, Value } from './types.js'
+import type { PolymorphicRelationValue, Value } from './types.js'
 
-import { AddNewRelation } from '../../elements/AddNewRelation/index.js'
-import { useDocumentDrawer } from '../../elements/DocumentDrawer/index.js'
-import { useListDrawer } from '../../elements/ListDrawer/index.js'
-import { ReactSelect } from '../../elements/ReactSelect/index.js'
-import { RenderCustomComponent } from '../../elements/RenderCustomComponent/index.js'
-import { FieldDescription } from '../../fields/FieldDescription/index.js'
-import { FieldError } from '../../fields/FieldError/index.js'
-import { FieldLabel } from '../../fields/FieldLabel/index.js'
 import { useField } from '../../forms/useField/index.js'
 import { withCondition } from '../../forms/withCondition/index.js'
-import { useDebouncedCallback } from '../../hooks/useDebouncedCallback.js'
-import { useEffectEvent } from '../../hooks/useEffectEvent.js'
-import { useAuth } from '../../providers/Auth/index.js'
-import { useConfig } from '../../providers/Config/index.js'
-import { useLocale } from '../../providers/Locale/index.js'
-import { useTranslation } from '../../providers/Translation/index.js'
-import './index.scss'
-import { sanitizeFilterOptionsQuery } from '../../utilities/sanitizeFilterOptionsQuery.js'
 import { mergeFieldStyles } from '../mergeFieldStyles.js'
-import { fieldBaseClass } from '../shared/index.js'
-import { createRelationMap } from './createRelationMap.js'
-import { findOptionsByValue } from './findOptionsByValue.js'
-import { optionsReducer } from './optionsReducer.js'
-import { MultiValueLabel } from './select-components/MultiValueLabel/index.js'
-import { SingleValue } from './select-components/SingleValue/index.js'
+import { RelationshipInput } from './Input.js'
+import './index.scss'
 
-const maxResultsPerRequest = 10
-
-const baseClass = 'relationship'
+export { RelationshipInput }
 
 const RelationshipFieldComponent: RelationshipFieldClientComponent = (props) => {
   const {
@@ -63,7 +30,7 @@ const RelationshipFieldComponent: RelationshipFieldClientComponent = (props) =>
       hasMany,
       label,
       localized,
-      relationTo,
+      relationTo: relationToProp,
       required,
     },
     path: pathFromProps,
@@ -71,35 +38,6 @@ const RelationshipFieldComponent: RelationshipFieldClientComponent = (props) =>
     validate,
   } = props
 
-  const { config, getEntityConfig } = useConfig()
-
-  const {
-    routes: { api },
-    serverURL,
-  } = config
-
-  const { i18n, t } = useTranslation()
-  const { permissions } = useAuth()
-  const { code: locale } = useLocale()
-  const hasMultipleRelations = Array.isArray(relationTo)
-
-  const [currentlyOpenRelationship, setCurrentlyOpenRelationship] = useState<
-    Parameters<ReactSelectAdapterProps['customProps']['onDocumentOpen']>[0]
-  >({
-    id: undefined,
-    collectionSlug: undefined,
-    hasReadPermission: false,
-  })
-
-  const [lastFullyLoadedRelation, setLastFullyLoadedRelation] = useState(-1)
-  const [lastLoadedPage, setLastLoadedPage] = useState<Record<string, number>>({})
-  const [errorLoading, setErrorLoading] = useState('')
-  const [search, setSearch] = useState('')
-  const [isLoading, setIsLoading] = useState(false)
-  const [enableWordBoundarySearch, setEnableWordBoundarySearch] = useState(false)
-  const [menuIsOpen, setMenuIsOpen] = useState(false)
-  const hasLoadedFirstPageRef = useRef(false)
-
   const memoizedValidate = useCallback(
     (value, validationOptions) => {
       if (typeof validate === 'function') {
@@ -118,713 +56,175 @@ const RelationshipFieldComponent: RelationshipFieldClientComponent = (props) =>
     setValue,
     showError,
     value,
-  } = useField<Value | Value[]>({
+  } = useField<Value>({
     potentiallyStalePath: pathFromProps,
     validate: memoizedValidate,
   })
 
-  const [options, dispatchOptions] = useReducer(optionsReducer, [])
-
-  const valueRef = useRef(value)
-  valueRef.current = value
-
-  const [DocumentDrawer, , { isDrawerOpen, openDrawer }] = useDocumentDrawer({
-    id: currentlyOpenRelationship.id,
-    collectionSlug: currentlyOpenRelationship.collectionSlug,
-  })
-
-  // Filter selected values from displaying in the list drawer
-  const listDrawerFilterOptions = useMemo<FilterOptionsResult>(() => {
-    let newFilterOptions = filterOptions
-
-    if (value) {
-      const valuesByRelation = (Array.isArray(value) ? value : [value]).reduce((acc, val) => {
-        if (typeof val === 'object' && val.relationTo) {
-          if (!acc[val.relationTo]) {
-            acc[val.relationTo] = []
-          }
-          acc[val.relationTo].push(val.value)
-        } else if (val) {
-          const relation = Array.isArray(relationTo) ? undefined : relationTo
-          if (relation) {
-            if (!acc[relation]) {
-              acc[relation] = []
-            }
-            acc[relation].push(val)
-          }
-        }
-        return acc
-      }, {})
-
-      ;(Array.isArray(relationTo) ? relationTo : [relationTo]).forEach((relation) => {
-        newFilterOptions = {
-          ...(newFilterOptions || {}),
-          [relation]: {
-            ...(typeof filterOptions?.[relation] === 'object' ? filterOptions[relation] : {}),
-            ...(valuesByRelation[relation]
-              ? {
-                  id: {
-                    not_in: valuesByRelation[relation],
-                  },
-                }
-              : {}),
-          },
-        }
-      })
-    }
-
-    return newFilterOptions
-  }, [filterOptions, value, relationTo])
-
-  const [
-    ListDrawer,
-    ,
-    { closeDrawer: closeListDrawer, isDrawerOpen: isListDrawerOpen, openDrawer: openListDrawer },
-  ] = useListDrawer({
-    collectionSlugs: hasMultipleRelations ? relationTo : [relationTo],
-    filterOptions: listDrawerFilterOptions,
-  })
-
-  const onListSelect = useCallback<NonNullable<ListDrawerProps['onSelect']>>(
-    ({ collectionSlug, doc }) => {
-      const formattedSelection = hasMultipleRelations
-        ? {
-            relationTo: collectionSlug,
-            value: doc.id,
-          }
-        : doc.id
-
-      if (hasMany) {
-        const withSelection = Array.isArray(value) ? value : []
-        setValue([...withSelection, formattedSelection])
-      } else {
-        setValue(formattedSelection)
-      }
-
-      closeListDrawer()
-    },
-    [hasMany, hasMultipleRelations, setValue, closeListDrawer, value],
+  const styles = useMemo(() => mergeFieldStyles(field), [field])
+  const isPolymorphic = Array.isArray(relationToProp)
+  const [relationTo] = React.useState(() =>
+    Array.isArray(relationToProp) ? relationToProp : [relationToProp],
   )
 
-  const openDrawerWhenRelationChanges = useRef(false)
-
-  const getResults: GetResults = useCallback(
-    async ({
-      filterOptions,
-      lastFullyLoadedRelation: lastFullyLoadedRelationArg,
-      lastLoadedPage: lastLoadedPageArg,
-      onSuccess,
-      search: searchArg,
-      sort,
-      value: valueArg,
-    }) => {
-      if (!permissions) {
+  const handleChangeHasMulti = useCallback(
+    (newValue: ValueWithRelation[]) => {
+      if (!newValue) {
+        setValue(null, newValue === value)
         return
       }
-      const lastFullyLoadedRelationToUse =
-        typeof lastFullyLoadedRelationArg !== 'undefined' ? lastFullyLoadedRelationArg : -1
 
-      const relations = Array.isArray(relationTo) ? relationTo : [relationTo]
-      const relationsToFetch =
-        lastFullyLoadedRelationToUse === -1
-          ? relations
-          : relations.slice(lastFullyLoadedRelationToUse + 1)
+      let disableFormModication = false
+      if (isPolymorphic) {
+        disableFormModication =
+          Array.isArray(value) &&
+          Array.isArray(newValue) &&
+          value.length === newValue.length &&
+          (value as PolymorphicRelationValue[]).every((val, idx) => {
+            const newVal = newValue[idx]
+            return val.value === newVal.value && val.relationTo === newVal.relationTo
+          })
+      } else {
+        disableFormModication =
+          Array.isArray(value) &&
+          Array.isArray(newValue) &&
+          value.length === newValue.length &&
+          value.every((val, idx) => val === newValue[idx].value)
+      }
 
-      let resultsFetched = 0
-      const relationMap = createRelationMap({
-        hasMany,
-        relationTo,
-        value: valueArg,
+      const dataToSet = newValue.map((val) => {
+        if (isPolymorphic) {
+          return val
+        } else {
+          return val.value
+        }
       })
+      setValue(dataToSet, disableFormModication)
+    },
+    [isPolymorphic, setValue, value],
+  )
 
-      if (!errorLoading) {
-        await relationsToFetch.reduce(async (priorRelation, relation) => {
-          const relationFilterOption = filterOptions?.[relation]
+  const handleChangeSingle = useCallback(
+    (newValue: ValueWithRelation) => {
+      if (!newValue) {
+        setValue(null, newValue === value)
+        return
+      }
 
-          let lastLoadedPageToUse
-          if (search !== searchArg) {
-            lastLoadedPageToUse = 1
-          } else {
-            lastLoadedPageToUse = lastLoadedPageArg[relation] + 1
-          }
-          await priorRelation
+      let disableFormModication = false
+      if (isPolymorphic) {
+        disableFormModication =
+          value &&
+          newValue &&
+          (value as PolymorphicRelationValue).value === newValue.value &&
+          (value as PolymorphicRelationValue).relationTo === newValue.relationTo
+      } else {
+        disableFormModication = value && newValue && value === newValue.value
+      }
 
-          if (relationFilterOption === false) {
-            setLastFullyLoadedRelation(relations.indexOf(relation))
-            return Promise.resolve()
-          }
+      const dataToSet = isPolymorphic ? newValue : newValue.value
+      setValue(dataToSet, disableFormModication)
+    },
+    [isPolymorphic, setValue, value],
+  )
 
-          if (resultsFetched < 10) {
-            const collection = getEntityConfig({ collectionSlug: relation })
-            const fieldToSearch = collection?.admin?.useAsTitle || 'id'
-            let fieldToSort = collection?.defaultSort || 'id'
-            if (typeof sortOptions === 'string') {
-              fieldToSort = sortOptions
-            } else if (sortOptions?.[relation]) {
-              fieldToSort = sortOptions[relation]
-            }
-
-            const query: {
-              [key: string]: unknown
-              where: Where
-            } = {
-              depth: 0,
-              draft: true,
-              limit: maxResultsPerRequest,
-              locale,
-              page: lastLoadedPageToUse,
-              select: {
-                [fieldToSearch]: true,
-              },
-              sort: fieldToSort,
-              where: {
-                and: [
-                  {
-                    id: {
-                      not_in: relationMap[relation],
-                    },
-                  },
-                ],
-              },
-            }
-
-            if (searchArg) {
-              query.where.and.push({
-                [fieldToSearch]: {
-                  like: searchArg,
-                },
-              })
-            }
-
-            if (relationFilterOption && typeof relationFilterOption !== 'boolean') {
-              query.where.and.push(relationFilterOption)
-            }
-
-            sanitizeFilterOptionsQuery(query.where)
-
-            const response = await fetch(`${serverURL}${api}/${relation}`, {
-              body: qs.stringify(query),
-              credentials: 'include',
-              headers: {
-                'Accept-Language': i18n.language,
-                'Content-Type': 'application/x-www-form-urlencoded',
-                'X-HTTP-Method-Override': 'GET',
-              },
-              method: 'POST',
+  const memoizedValue: ValueWithRelation | ValueWithRelation[] = React.useMemo(() => {
+    if (hasMany === true) {
+      return (
+        Array.isArray(value)
+          ? value.map((val) => {
+              return isPolymorphic
+                ? val
+                : {
+                    relationTo: Array.isArray(relationTo) ? relationTo[0] : relationTo,
+                    value: val,
+                  }
             })
-
-            if (response.ok) {
-              const data: PaginatedDocs<unknown> = await response.json()
-              setLastLoadedPage((prevState) => {
-                return {
-                  ...prevState,
-                  [relation]: lastLoadedPageToUse,
-                }
-              })
-
-              if (!data.nextPage) {
-                setLastFullyLoadedRelation(relations.indexOf(relation))
+          : value
+      ) as ValueWithRelation[]
+    } else {
+      return (
+        value
+          ? isPolymorphic
+            ? value
+            : {
+                relationTo: Array.isArray(relationTo) ? relationTo[0] : relationTo,
+                value,
               }
+          : value
+      ) as ValueWithRelation
+    }
+  }, [hasMany, value, isPolymorphic, relationTo])
 
-              if (data.docs.length > 0) {
-                resultsFetched += data.docs.length
-
-                dispatchOptions({
-                  type: 'ADD',
-                  collection,
-                  config,
-                  docs: data.docs,
-                  i18n,
-                  sort,
-                })
+  const memoizedInitialValue: ValueWithRelation | ValueWithRelation[] = React.useMemo(() => {
+    if (hasMany === true) {
+      return (
+        Array.isArray(initialValue)
+          ? initialValue.map((val) => {
+              return isPolymorphic
+                ? val
+                : {
+                    relationTo: Array.isArray(relationTo) ? relationTo[0] : relationTo,
+                    value: val,
+                  }
+            })
+          : initialValue
+      ) as ValueWithRelation[]
+    } else {
+      return (
+        initialValue
+          ? isPolymorphic
+            ? initialValue
+            : {
+                relationTo: Array.isArray(relationTo) ? relationTo[0] : relationTo,
+                value: initialValue,
               }
-            } else if (response.status === 403) {
-              setLastFullyLoadedRelation(relations.indexOf(relation))
-              dispatchOptions({
-                type: 'ADD',
-                collection,
-                config,
-                docs: [],
-                i18n,
-                ids: relationMap[relation],
-                sort,
-              })
-            } else {
-              setErrorLoading(t('error:unspecific'))
-            }
-          }
-        }, Promise.resolve())
-
-        if (typeof onSuccess === 'function') {
-          onSuccess()
-        }
-      }
-    },
-    [
-      permissions,
-      relationTo,
-      hasMany,
-      errorLoading,
-      search,
-      getEntityConfig,
-      locale,
-      serverURL,
-      sortOptions,
-      api,
-      i18n,
-      config,
-      t,
-    ],
-  )
-
-  const updateSearch = useDebouncedCallback((searchArg: string, valueArg: Value | Value[]) => {
-    void getResults({
-      filterOptions,
-      lastLoadedPage: {},
-      search: searchArg,
-      sort: true,
-      value: valueArg,
-    })
-    setSearch(searchArg)
-  }, 300)
-
-  const handleInputChange = useCallback(
-    (searchArg: string, valueArg: Value | Value[]) => {
-      if (search !== searchArg) {
-        setLastLoadedPage({})
-        updateSearch(searchArg, valueArg, searchArg !== '')
-      }
-    },
-    [search, updateSearch],
-  )
-
-  const handleValueChange = useEffectEvent((value: Value | Value[]) => {
-    const relationMap = createRelationMap({
-      hasMany,
-      relationTo,
-      value,
-    })
-
-    void Object.entries(relationMap).reduce(async (priorRelation, [relation, ids]) => {
-      await priorRelation
-
-      const idsToLoad = ids.filter((id) => {
-        return !options.find((optionGroup) =>
-          optionGroup?.options?.find(
-            (option) => option.value === id && option.relationTo === relation,
-          ),
-        )
-      })
-
-      if (idsToLoad.length > 0) {
-        const query = {
-          depth: 0,
-          draft: true,
-          limit: idsToLoad.length,
-          locale,
-          where: {
-            id: {
-              in: idsToLoad,
-            },
-          },
-        }
-
-        if (!errorLoading) {
-          const response = await fetch(`${serverURL}${api}/${relation}`, {
-            body: qs.stringify(query),
-            credentials: 'include',
-            headers: {
-              'Accept-Language': i18n.language,
-              'Content-Type': 'application/x-www-form-urlencoded',
-              'X-HTTP-Method-Override': 'GET',
-            },
-            method: 'POST',
-          })
-
-          const collection = getEntityConfig({ collectionSlug: relation })
-          let docs = []
-
-          if (response.ok) {
-            const data = await response.json()
-            docs = data.docs
-          }
-
-          dispatchOptions({
-            type: 'ADD',
-            collection,
-            config,
-            docs,
-            i18n,
-            ids: idsToLoad,
-            sort: true,
-          })
-        }
-      }
-    }, Promise.resolve())
-  })
-
-  const prevValue = useRef(value)
-  const isFirstRenderRef = useRef(true)
-  // ///////////////////////////////////
-  // Ensure we have an option for each value
-  // ///////////////////////////////////
-  useEffect(() => {
-    if (isFirstRenderRef.current || !dequal(value, prevValue.current)) {
-      handleValueChange(value)
+          : initialValue
+      ) as ValueWithRelation
     }
-    isFirstRenderRef.current = false
-    prevValue.current = value
-  }, [value])
-
-  // Determine if we should switch to word boundary search
-  useEffect(() => {
-    const relations = Array.isArray(relationTo) ? relationTo : [relationTo]
-    const isIdOnly = relations.reduce((idOnly, relation) => {
-      const collection = getEntityConfig({ collectionSlug: relation })
-      const fieldToSearch = collection?.admin?.useAsTitle || 'id'
-      return fieldToSearch === 'id' && idOnly
-    }, true)
-    setEnableWordBoundarySearch(!isIdOnly)
-  }, [relationTo, getEntityConfig])
-
-  const getResultsEffectEvent: GetResults = useEffectEvent(async (args) => {
-    return await getResults(args)
-  })
-
-  // When (`relationTo` || `filterOptions` || `locale`) changes, reset component
-  // Note - effect should not run on first run
-  useEffect(() => {
-    // If the menu is open while filterOptions changes
-    // due to latency of form state and fast clicking into this field,
-    // re-fetch options
-    if (hasLoadedFirstPageRef.current && menuIsOpen) {
-      setIsLoading(true)
-      void getResultsEffectEvent({
-        filterOptions,
-        lastLoadedPage: {},
-        onSuccess: () => {
-          hasLoadedFirstPageRef.current = true
-          setIsLoading(false)
-        },
-        value: valueRef.current,
-      })
-    }
-
-    // If the menu is not open, still reset the field state
-    // because we need to get new options next time the menu opens
-    dispatchOptions({
-      type: 'CLEAR',
-      exemptValues: valueRef.current,
-    })
-
-    setLastFullyLoadedRelation(-1)
-    setLastLoadedPage({})
-  }, [relationTo, filterOptions, locale, path, menuIsOpen])
-
-  const onSave = useCallback<DocumentDrawerProps['onSave']>(
-    (args) => {
-      dispatchOptions({
-        type: 'UPDATE',
-        collection: args.collectionConfig,
-        config,
-        doc: args.doc,
-        i18n,
-      })
-
-      const currentValue = valueRef.current
-      const docID = args.doc.id
-
-      if (hasMany) {
-        const unchanged = (currentValue as Option[]).some((option) =>
-          typeof option === 'string' ? option === docID : option.value === docID,
-        )
-
-        const valuesToSet = (currentValue as Option[]).map((option) =>
-          option.value === docID
-            ? { relationTo: args.collectionConfig.slug, value: docID }
-            : option,
-        )
-
-        setValue(valuesToSet, unchanged)
-      } else {
-        const unchanged = currentValue === docID
-
-        setValue({ relationTo: args.collectionConfig.slug, value: docID }, unchanged)
-      }
-    },
-    [i18n, config, hasMany, setValue],
-  )
-
-  const onDuplicate = useCallback<DocumentDrawerProps['onDuplicate']>(
-    (args) => {
-      dispatchOptions({
-        type: 'ADD',
-        collection: args.collectionConfig,
-        config,
-        docs: [args.doc],
-        i18n,
-        sort: true,
-      })
-
-      if (hasMany) {
-        setValue(
-          valueRef.current
-            ? (valueRef.current as Option[]).concat({
-                relationTo: args.collectionConfig.slug,
-                value: args.doc.id,
-              } as Option)
-            : null,
-        )
-      } else {
-        setValue({
-          relationTo: args.collectionConfig.slug,
-          value: args.doc.id,
-        })
-      }
-    },
-    [i18n, config, hasMany, setValue],
-  )
-
-  const onDelete = useCallback<DocumentDrawerProps['onDelete']>(
-    (args) => {
-      dispatchOptions({
-        id: args.id,
-        type: 'REMOVE',
-        collection: args.collectionConfig,
-        config,
-        i18n,
-      })
-
-      if (hasMany) {
-        setValue(
-          valueRef.current
-            ? (valueRef.current as Option[]).filter((option) => {
-                return option.value !== args.id
-              })
-            : null,
-        )
-      } else {
-        setValue(null)
-      }
-
-      return
-    },
-    [i18n, config, hasMany, setValue],
-  )
-
-  const filterOption = useCallback((item: Option, searchFilter: string) => {
-    if (!searchFilter) {
-      return true
-    }
-    const r = wordBoundariesRegex(searchFilter || '')
-    // breaking the labels to search into smaller parts increases performance
-    const breakApartThreshold = 250
-    let labelString = String(item.label)
-    // strings less than breakApartThreshold length won't be chunked
-    while (labelString.length > breakApartThreshold) {
-      // slicing by the next space after the length of the search input prevents slicing the string up by partial words
-      const indexOfSpace = labelString.indexOf(' ', searchFilter.length)
-      if (
-        r.test(labelString.slice(0, indexOfSpace === -1 ? searchFilter.length : indexOfSpace + 1))
-      ) {
-        return true
-      }
-      labelString = labelString.slice(indexOfSpace === -1 ? searchFilter.length : indexOfSpace + 1)
-    }
-    return r.test(labelString.slice(-breakApartThreshold))
-  }, [])
-
-  const onDocumentOpen = useCallback<ReactSelectAdapterProps['customProps']['onDocumentOpen']>(
-    ({ id, collectionSlug, hasReadPermission, openInNewTab }) => {
-      if (openInNewTab) {
-        if (hasReadPermission && id && collectionSlug) {
-          const docUrl = formatAdminURL({
-            adminRoute: config.routes.admin,
-            path: `/collections/${collectionSlug}/${id}`,
-          })
-
-          window.open(docUrl, '_blank')
-        }
-      } else {
-        openDrawerWhenRelationChanges.current = true
-
-        setCurrentlyOpenRelationship({
-          id,
-          collectionSlug,
-          hasReadPermission,
-        })
-      }
-    },
-    [setCurrentlyOpenRelationship, config.routes.admin],
-  )
-
-  useEffect(() => {
-    if (openDrawerWhenRelationChanges.current) {
-      openDrawer()
-      openDrawerWhenRelationChanges.current = false
-    }
-  }, [openDrawer, currentlyOpenRelationship])
-
-  const valueToRender = findOptionsByValue({ allowEdit, options, value })
-
-  if (!Array.isArray(valueToRender) && valueToRender?.value === 'null') {
-    valueToRender.value = null
-  }
-
-  const styles = useMemo(() => mergeFieldStyles(field), [field])
+  }, [initialValue, isPolymorphic, relationTo, hasMany])
 
   return (
-    <div
-      className={[
-        fieldBaseClass,
-        baseClass,
-        className,
-        showError && 'error',
-        errorLoading && 'error-loading',
-        (readOnly || disabled) && `${baseClass}--read-only`,
-        !(readOnly || disabled) && allowCreate && `${baseClass}--allow-create`,
-      ]
-        .filter(Boolean)
-        .join(' ')}
-      id={`field-${path.replace(/\./g, '__')}`}
+    <RelationshipInput
+      AfterInput={AfterInput}
+      allowCreate={allowCreate}
+      allowEdit={allowEdit}
+      appearance={appearance}
+      BeforeInput={BeforeInput}
+      className={className}
+      Description={Description}
+      description={description}
+      Error={Error}
+      filterOptions={filterOptions}
+      isSortable={isSortable}
+      Label={Label}
+      label={label}
+      localized={localized}
+      maxResultsPerRequest={10}
+      maxRows={field?.maxRows}
+      minRows={field?.minRows}
+      path={path}
+      placeholder={placeholder}
+      readOnly={readOnly || disabled}
+      relationTo={relationTo}
+      required={required}
+      showError={showError}
+      sortOptions={sortOptions as any}
       style={styles}
-    >
-      <RenderCustomComponent
-        CustomComponent={Label}
-        Fallback={
-          <FieldLabel label={label} localized={localized} path={path} required={required} />
-        }
-      />
-      <div className={`${fieldBaseClass}__wrap`}>
-        <RenderCustomComponent
-          CustomComponent={Error}
-          Fallback={<FieldError path={path} showError={showError} />}
-        />
-        {BeforeInput}
-        {!errorLoading && (
-          <div className={`${baseClass}__wrap`}>
-            <ReactSelect
-              backspaceRemovesValue={!(isDrawerOpen || isListDrawerOpen)}
-              components={{
-                MultiValueLabel,
-                SingleValue,
-                ...(appearance !== 'select' && { DropdownIndicator: null }),
-              }}
-              customProps={{
-                disableKeyDown: isDrawerOpen || isListDrawerOpen,
-                disableMouseDown: isDrawerOpen || isListDrawerOpen,
-                onDocumentOpen,
-                onSave,
-              }}
-              disabled={readOnly || disabled || isDrawerOpen || isListDrawerOpen}
-              filterOption={enableWordBoundarySearch ? filterOption : undefined}
-              getOptionValue={(option) => {
-                if (!option) {
-                  return undefined
-                }
-                return hasMany && Array.isArray(relationTo)
-                  ? `${option.relationTo}_${option.value}`
-                  : (option.value as string)
-              }}
-              isLoading={appearance === 'select' && isLoading}
-              isMulti={hasMany}
-              isSearchable={appearance === 'select'}
-              isSortable={isSortable}
-              menuIsOpen={appearance === 'select' ? menuIsOpen : false}
-              onChange={
-                !(readOnly || disabled)
-                  ? (selected) => {
-                      if (selected === null) {
-                        setValue(hasMany ? [] : null)
-                      } else if (hasMany && Array.isArray(selected)) {
-                        setValue(
-                          selected
-                            ? selected.map((option) => {
-                                if (hasMultipleRelations) {
-                                  return {
-                                    relationTo: option.relationTo,
-                                    value: option.value,
-                                  }
-                                }
-
-                                return option.value
-                              })
-                            : null,
-                        )
-                      } else if (hasMultipleRelations && !Array.isArray(selected)) {
-                        setValue({
-                          relationTo: selected.relationTo,
-                          value: selected.value,
-                        })
-                      } else if (!Array.isArray(selected)) {
-                        setValue(selected.value)
-                      }
-                    }
-                  : undefined
-              }
-              onInputChange={(newSearch) => handleInputChange(newSearch, value)}
-              onMenuClose={() => {
-                setMenuIsOpen(false)
-              }}
-              onMenuOpen={() => {
-                if (appearance === 'drawer') {
-                  openListDrawer()
-                } else if (appearance === 'select') {
-                  setMenuIsOpen(true)
-                  if (!hasLoadedFirstPageRef.current) {
-                    setIsLoading(true)
-                    void getResults({
-                      filterOptions,
-                      lastLoadedPage: {},
-                      onSuccess: () => {
-                        hasLoadedFirstPageRef.current = true
-                        setIsLoading(false)
-                      },
-                      value: initialValue,
-                    })
-                  }
-                }
-              }}
-              onMenuScrollToBottom={() => {
-                void getResults({
-                  filterOptions,
-                  lastFullyLoadedRelation,
-                  lastLoadedPage,
-                  search,
-                  sort: false,
-                  value: initialValue,
-                })
-              }}
-              options={options}
-              placeholder={placeholder}
-              showError={showError}
-              value={valueToRender ?? null}
-            />
-            {!(readOnly || disabled) && allowCreate && (
-              <AddNewRelation
-                hasMany={hasMany}
-                path={path}
-                relationTo={relationTo}
-                setValue={setValue}
-                value={value}
-              />
-            )}
-          </div>
-        )}
-        {errorLoading && <div className={`${baseClass}__error-loading`}>{errorLoading}</div>}
-        {AfterInput}
-        <RenderCustomComponent
-          CustomComponent={Description}
-          Fallback={<FieldDescription description={description} path={path} />}
-        />
-      </div>
-      {currentlyOpenRelationship.collectionSlug && currentlyOpenRelationship.hasReadPermission && (
-        <DocumentDrawer onDelete={onDelete} onDuplicate={onDuplicate} onSave={onSave} />
-      )}
-      {appearance === 'drawer' && !readOnly && (
-        <ListDrawer allowCreate={allowCreate} enableRowSelections={false} onSelect={onListSelect} />
-      )}
-    </div>
+      {...(hasMany === true
+        ? {
+            hasMany: true,
+            initialValue: memoizedInitialValue as ValueWithRelation[],
+            onChange: handleChangeHasMulti,
+            value: memoizedValue as ValueWithRelation[],
+          }
+        : {
+            hasMany: false,
+            initialValue: memoizedInitialValue as ValueWithRelation,
+            onChange: handleChangeSingle,
+            value: memoizedValue as ValueWithRelation,
+          })}
+    />
   )
 }
 
diff --git a/packages/ui/src/fields/Relationship/optionsReducer.ts b/packages/ui/src/fields/Relationship/optionsReducer.ts
index 037af34428..a7547c0987 100644
--- a/packages/ui/src/fields/Relationship/optionsReducer.ts
+++ b/packages/ui/src/fields/Relationship/optionsReducer.ts
@@ -103,10 +103,7 @@ export const optionsReducer = (state: OptionGroup[], action: Action): OptionGrou
         const clearedOptions = optionGroup.options.filter((option) => {
           if (exemptValues) {
             return exemptValues.some((exemptValue) => {
-              return (
-                exemptValue &&
-                option.value === (typeof exemptValue === 'object' ? exemptValue.value : exemptValue)
-              )
+              return exemptValue && option.value === exemptValue.value
             })
           }
 
diff --git a/packages/ui/src/fields/Relationship/types.ts b/packages/ui/src/fields/Relationship/types.ts
index 8336f39ebc..b90fc47c0f 100644
--- a/packages/ui/src/fields/Relationship/types.ts
+++ b/packages/ui/src/fields/Relationship/types.ts
@@ -1,5 +1,13 @@
 import type { I18nClient } from '@payloadcms/translations'
-import type { ClientCollectionConfig, ClientConfig, FilterOptionsResult } from 'payload'
+import type {
+  ClientCollectionConfig,
+  ClientConfig,
+  CollectionSlug,
+  FilterOptionsResult,
+  LabelFunction,
+  StaticDescription,
+  StaticLabel,
+} from 'payload'
 
 export type Option = {
   allowEdit: boolean
@@ -14,15 +22,21 @@ export type OptionGroup = {
   options: Option[]
 }
 
-export type ValueWithRelation = {
+export type PolymorphicRelationValue = {
   relationTo: string
   value: number | string
 }
 
-export type Value = number | string | ValueWithRelation
+export type MonomorphicRelationValue = number | string
+
+export type Value =
+  | MonomorphicRelationValue
+  | MonomorphicRelationValue[]
+  | PolymorphicRelationValue
+  | PolymorphicRelationValue[]
 
 type CLEAR = {
-  exemptValues?: Value | Value[]
+  exemptValues?: PolymorphicRelationValue | PolymorphicRelationValue[]
   type: 'CLEAR'
 }
 
@@ -54,12 +68,65 @@ type REMOVE = {
 
 export type Action = ADD | CLEAR | REMOVE | UPDATE
 
-export type GetResults = (args: {
-  filterOptions?: FilterOptionsResult
-  lastFullyLoadedRelation?: number
-  lastLoadedPage: Record<string, number>
-  onSuccess?: () => void
-  search?: string
-  sort?: boolean
-  value?: Value | Value[]
-}) => Promise<void>
+export type HasManyValueUnion =
+  | {
+      hasMany: false
+      value?: PolymorphicRelationValue
+    }
+  | {
+      hasMany: true
+      value?: PolymorphicRelationValue[]
+    }
+
+export type GetResults = (
+  args: {
+    filterOptions?: FilterOptionsResult
+    lastFullyLoadedRelation?: number
+    lastLoadedPage: Record<string, number>
+    onSuccess?: () => void
+    search?: string
+    sort?: boolean
+  } & HasManyValueUnion,
+) => Promise<void>
+
+export type RelationshipInputProps = {
+  readonly AfterInput?: React.ReactNode
+  readonly allowCreate?: boolean
+  readonly allowEdit?: boolean
+  readonly appearance?: 'drawer' | 'select'
+  readonly BeforeInput?: React.ReactNode
+  readonly className?: string
+  readonly Description?: React.ReactNode
+  readonly description?: StaticDescription
+  readonly Error?: React.ReactNode
+  readonly filterOptions?: FilterOptionsResult
+  readonly isSortable?: boolean
+  readonly Label?: React.ReactNode
+  readonly label?: StaticLabel
+  readonly localized?: boolean
+  readonly maxResultsPerRequest?: number
+  readonly maxRows?: number
+  readonly minRows?: number
+  readonly path: string
+  readonly placeholder?: LabelFunction | string
+  readonly readOnly?: boolean
+  readonly relationTo: string[]
+  readonly required?: boolean
+  readonly showError?: boolean
+  readonly sortOptions?: Partial<Record<CollectionSlug, string>>
+  readonly style?: React.CSSProperties
+} & SharedRelationshipInputProps
+
+type SharedRelationshipInputProps =
+  | {
+      readonly hasMany: false
+      readonly initialValue?: null | PolymorphicRelationValue
+      readonly onChange: (value: PolymorphicRelationValue) => void
+      readonly value?: null | PolymorphicRelationValue
+    }
+  | {
+      readonly hasMany: true
+      readonly initialValue?: null | PolymorphicRelationValue[]
+      readonly onChange: (value: PolymorphicRelationValue[]) => void
+      readonly value?: null | PolymorphicRelationValue[]
+    }
diff --git a/packages/ui/src/hooks/useDebouncedCallback.ts b/packages/ui/src/hooks/useDebouncedCallback.ts
index d5cac66f28..ac27c28115 100644
--- a/packages/ui/src/hooks/useDebouncedCallback.ts
+++ b/packages/ui/src/hooks/useDebouncedCallback.ts
@@ -7,13 +7,13 @@ import { useCallback, useRef } from 'react'
  * @param wait Wait period after function hasn't been called for
  * @returns A memoized function that is debounced
  */
-export const useDebouncedCallback = (func, wait) => {
+export const useDebouncedCallback = <TFunctionArgs = any>(func, wait) => {
   // Use a ref to store the timeout between renders
   // and prevent changes to it from causing re-renders
   const timeout = useRef<ReturnType<typeof setTimeout>>(undefined)
 
   return useCallback(
-    (...args) => {
+    (...args: TFunctionArgs[]) => {
       const later = () => {
         clearTimeout(timeout.current)
         func(...args)
diff --git a/test/admin/payload-types.ts b/test/admin/payload-types.ts
index 4d312ccf22..e29ed5f276 100644
--- a/test/admin/payload-types.ts
+++ b/test/admin/payload-types.ts
@@ -88,6 +88,7 @@ export interface Config {
     'base-list-filters': BaseListFilter;
     with300documents: With300Document;
     'with-list-drawer': WithListDrawer;
+    placeholder: Placeholder;
     'payload-locked-documents': PayloadLockedDocument;
     'payload-preferences': PayloadPreference;
     'payload-migrations': PayloadMigration;
@@ -115,6 +116,7 @@ export interface Config {
     'base-list-filters': BaseListFiltersSelect<false> | BaseListFiltersSelect<true>;
     with300documents: With300DocumentsSelect<false> | With300DocumentsSelect<true>;
     'with-list-drawer': WithListDrawerSelect<false> | WithListDrawerSelect<true>;
+    placeholder: PlaceholderSelect<false> | PlaceholderSelect<true>;
     'payload-locked-documents': PayloadLockedDocumentsSelect<false> | PayloadLockedDocumentsSelect<true>;
     'payload-preferences': PayloadPreferencesSelect<false> | PayloadPreferencesSelect<true>;
     'payload-migrations': PayloadMigrationsSelect<false> | PayloadMigrationsSelect<true>;
@@ -484,6 +486,19 @@ export interface WithListDrawer {
   updatedAt: string;
   createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "placeholder".
+ */
+export interface Placeholder {
+  id: string;
+  defaultSelect?: 'option1' | null;
+  placeholderSelect?: 'option1' | null;
+  defaultRelationship?: (string | null) | Post;
+  placeholderRelationship?: (string | null) | Post;
+  updatedAt: string;
+  createdAt: string;
+}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "payload-locked-documents".
@@ -574,6 +589,10 @@ export interface PayloadLockedDocument {
     | ({
         relationTo: 'with-list-drawer';
         value: string | WithListDrawer;
+      } | null)
+    | ({
+        relationTo: 'placeholder';
+        value: string | Placeholder;
       } | null);
   globalSlug?: string | null;
   user: {
@@ -901,6 +920,18 @@ export interface WithListDrawerSelect<T extends boolean = true> {
   updatedAt?: T;
   createdAt?: T;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "placeholder_select".
+ */
+export interface PlaceholderSelect<T extends boolean = true> {
+  defaultSelect?: T;
+  placeholderSelect?: T;
+  defaultRelationship?: T;
+  placeholderRelationship?: T;
+  updatedAt?: T;
+  createdAt?: T;
+}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "payload-locked-documents_select".
diff --git a/test/helpers.ts b/test/helpers.ts
index f5e830de46..eb70eaffd7 100644
--- a/test/helpers.ts
+++ b/test/helpers.ts
@@ -185,10 +185,21 @@ export async function login(args: LoginArgs): Promise<void> {
   const { customAdminRoutes, customRoutes, data = devUser, page, serverURL } = args
 
   const {
-    admin: { routes: { createFirstUser, login: incomingLoginRoute } = {} },
+    admin: {
+      routes: { createFirstUser, login: incomingLoginRoute, logout: incomingLogoutRoute } = {},
+    },
     routes: { admin: incomingAdminRoute } = {},
   } = getRoutes({ customAdminRoutes, customRoutes })
 
+  const logoutRoute = formatAdminURL({
+    serverURL,
+    adminRoute: incomingAdminRoute,
+    path: incomingLogoutRoute,
+  })
+
+  await page.goto(logoutRoute)
+  await wait(500)
+
   const adminRoute = formatAdminURL({ serverURL, adminRoute: incomingAdminRoute, path: '' })
   const loginRoute = formatAdminURL({
     serverURL,
diff --git a/tools/scripts/src/generateTranslations/utils/index.ts b/tools/scripts/src/generateTranslations/utils/index.ts
index 6a73e7fb6c..264006bc62 100644
--- a/tools/scripts/src/generateTranslations/utils/index.ts
+++ b/tools/scripts/src/generateTranslations/utils/index.ts
@@ -128,10 +128,7 @@ export async function translateObject(props: {
 
     for (const missingKey of missingKeys) {
       const keys: string[] = missingKey.split('.')
-      const sourceText = keys.reduce(
-        (acc, key) => acc[key],
-        fromTranslationsObject,
-      )
+      const sourceText = keys.reduce((acc, key) => acc[key], fromTranslationsObject)
       if (!sourceText || typeof sourceText !== 'string') {
         throw new Error(
           `Missing key ${missingKey} or key not "leaf" in fromTranslationsObject for lang ${targetLang}. (2)`,