Merge branch 'payloadcms:main' into bkovachev/nested-tabs

Author: BrannanKovachev

docs/custom-components/root-components.mdx

@@ -45,6 +45,7 @@ The following options are available:
 | `header`          | An array of Custom Components to be injected above the Payload header. [More details](#header).                                                                          |
 | `logout.Button`   | The button displayed in the sidebar that logs the user out. [More details](#logoutbutton).                                                                               |
 | `Nav`             | Contains the sidebar / mobile menu in its entirety. [More details](#nav).                                                                                                |
+| `settingsMenu`    | An array of Custom Components to inject into a popup menu accessible via a gear icon above the logout button. [More details](#settingsMenu).                             |
 | `providers`       | Custom [React Context](https://react.dev/learn/scaling-up-with-reducer-and-context) providers that will wrap the entire Admin Panel. [More details](./custom-providers). |
 | `views`           | Override or create new views within the Admin Panel. [More details](./custom-views).                                                                                     |
 
@@ -271,6 +272,65 @@ export default function MyAfterNavLinksComponent() {
 }
 ```
 
+### settingsMenu
+
+The `settingsMenu` property allows you to inject Custom Components into a popup menu accessible via a gear icon in the navigation controls, positioned above the logout button. This is ideal for adding custom actions, utilities, or settings that are relevant at the admin level.
+
+To add `settingsMenu` components, use the `admin.components.settingsMenu` property in your Payload Config:
+
+```ts
+import { buildConfig } from 'payload'
+
+export default buildConfig({
+  // ...
+  admin: {
+    // highlight-start
+    components: {
+      settingsMenu: ['/path/to/your/component#ComponentName'],
+    },
+    // highlight-end
+  },
+})
+```
+
+Here is an example of a simple `settingsMenu` component:
+
+```tsx
+'use client'
+import { PopupList } from '@payloadcms/ui'
+
+export function MySettingsMenu() {
+  return (
+    <PopupList.ButtonGroup>
+      <PopupList.Button onClick={() => console.log('Action triggered')}>
+        Custom Action
+      </PopupList.Button>
+      <PopupList.Button onClick={() => window.open('/admin/custom-page')}>
+        Custom Page
+      </PopupList.Button>
+    </PopupList.ButtonGroup>
+  )
+}
+```
+
+You can pass multiple components to create organized groups of menu items:
+
+```ts
+import { buildConfig } from 'payload'
+
+export default buildConfig({
+  // ...
+  admin: {
+    components: {
+      settingsMenu: [
+        '/components/SystemActions#SystemActions',
+        '/components/DataManagement#DataManagement',
+      ],
+    },
+  },
+})
+```
+
 ### Nav
 
 The `Nav` property contains the sidebar / mobile menu in its entirety. Use this property to completely replace the built-in Nav with your own custom navigation.

package.json

@@ -159,8 +159,8 @@
     "create-payload-app": "workspace:*",
     "cross-env": "7.0.3",
     "dotenv": "16.4.7",
-    "drizzle-kit": "0.31.4",
-    "drizzle-orm": "0.44.2",
+    "drizzle-kit": "0.31.5",
+    "drizzle-orm": "0.44.6",
     "escape-html": "^1.0.3",
     "execa": "5.1.1",
     "form-data": "3.0.1",

packages/db-d1-sqlite/package.json

@@ -74,8 +74,8 @@
   "dependencies": {
     "@payloadcms/drizzle": "workspace:*",
     "console-table-printer": "2.12.1",
-    "drizzle-kit": "0.31.4",
-    "drizzle-orm": "0.44.2",
+    "drizzle-kit": "0.31.5",
+    "drizzle-orm": "0.44.6",
     "prompts": "2.4.2",
     "to-snake-case": "1.0.0",
     "uuid": "9.0.0"

packages/db-mongodb/src/utilities/resolveJoins.ts

@@ -445,6 +445,20 @@ export async function resolveJoins({
 
 /**
  * Extracts relationTo filter values from a WHERE clause
+ *
+ * @purpose When you have a polymorphic join field that can reference multiple collection types (e.g. the documentsAndFolders join field on
+ * folders that points to all folder-enabled collections), Payload needs to decide which collections to actually query. Without filtering,
+ * it would query ALL possible collections even when the WHERE clause clearly indicates it only needs specific ones.
+ *
+ * extractRelationToFilter analyzes the WHERE clause to extract relationTo conditions and returns only the collection slugs that
+ * could possibly match, avoiding unnecessary database queries.
+ *
+ * @description The function recursively traverses a WHERE clause looking for relationTo conditions in these patterns:
+ *
+ * 1. Direct conditions: { relationTo: { equals: 'posts' } }
+ * 2. IN conditions: { relationTo: { in: ['posts', 'media'] } }
+ * 3. Nested in AND/OR: Recursively searches through logical operators
+
  * @param where - The WHERE clause to search
  * @returns Array of collection slugs if relationTo filter found, null otherwise
  */
@@ -466,21 +480,29 @@ function extractRelationToFilter(where: Record<string, unknown>): null | string[
 
   // Check for relationTo in logical operators
   if (where.and && Array.isArray(where.and)) {
+    const allResults: string[] = []
     for (const condition of where.and) {
       const result = extractRelationToFilter(condition)
       if (result) {
-        return result
+        allResults.push(...result)
       }
     }
+    if (allResults.length > 0) {
+      return [...new Set(allResults)] // Remove duplicates
+    }
   }
 
   if (where.or && Array.isArray(where.or)) {
+    const allResults: string[] = []
     for (const condition of where.or) {
       const result = extractRelationToFilter(condition)
       if (result) {
-        return result
+        allResults.push(...result)
       }
     }
+    if (allResults.length > 0) {
+      return [...new Set(allResults)] // Remove duplicates
+    }
   }
 
   return null

packages/db-postgres/package.json

@@ -78,8 +78,8 @@
     "@payloadcms/drizzle": "workspace:*",
     "@types/pg": "8.10.2",
     "console-table-printer": "2.12.1",
-    "drizzle-kit": "0.31.4",
-    "drizzle-orm": "0.44.2",
+    "drizzle-kit": "0.31.5",
+    "drizzle-orm": "0.44.6",
     "pg": "8.16.3",
     "prompts": "2.4.2",
     "to-snake-case": "1.0.0",

packages/db-sqlite/package.json

@@ -76,8 +76,8 @@
     "@libsql/client": "0.14.0",
     "@payloadcms/drizzle": "workspace:*",
     "console-table-printer": "2.12.1",
-    "drizzle-kit": "0.31.4",
-    "drizzle-orm": "0.44.2",
+    "drizzle-kit": "0.31.5",
+    "drizzle-orm": "0.44.6",
     "prompts": "2.4.2",
     "to-snake-case": "1.0.0",
     "uuid": "9.0.0"

packages/db-vercel-postgres/package.json

@@ -78,8 +78,8 @@
     "@payloadcms/drizzle": "workspace:*",
     "@vercel/postgres": "^0.9.0",
     "console-table-printer": "2.12.1",
-    "drizzle-kit": "0.31.4",
-    "drizzle-orm": "0.44.2",
+    "drizzle-kit": "0.31.5",
+    "drizzle-orm": "0.44.6",
     "pg": "8.16.3",
     "prompts": "2.4.2",
     "to-snake-case": "1.0.0",

packages/drizzle/package.json

@@ -60,7 +60,7 @@
   "dependencies": {
     "console-table-printer": "2.12.1",
     "dequal": "2.0.3",
-    "drizzle-orm": "0.44.2",
+    "drizzle-orm": "0.44.6",
     "prompts": "2.4.2",
     "to-snake-case": "1.0.0",
     "uuid": "9.0.0"

packages/graphql/package.json

@@ -56,7 +56,7 @@
     "graphql-scalars": "1.22.2",
     "pluralize": "8.0.0",
     "ts-essentials": "10.0.3",
-    "tsx": "4.19.2"
+    "tsx": "4.20.6"
   },
   "devDependencies": {
     "@payloadcms/eslint-config": "workspace:*",

packages/next/src/elements/Nav/SettingsMenuButton/index.scss

@@ -0,0 +1,11 @@
+@import '~@payloadcms/ui/scss';
+
+@layer payload-default {
+  .settings-menu-button {
+    &.popup--h-align-left {
+      .popup__content {
+        left: calc(var(--nav-padding-inline-start) * -0.5);
+      }
+    }
+  }
+}