Merge branch 'main' into feat/view-conditions

Author: jessrynkar

.github/actions/setup/action.yml

@@ -10,7 +10,7 @@ inputs:
   pnpm-version:
     description: Pnpm version
     required: true
-    default: 9.7.1
+    default: 10.12.1
   pnpm-run-install:
     description: Whether to run pnpm install
     required: false

.github/workflows/main.yml

@@ -18,7 +18,7 @@ concurrency:
 
 env:
   NODE_VERSION: 23.11.0
-  PNPM_VERSION: 9.7.1
+  PNPM_VERSION: 10.12.1
   DO_NOT_TRACK: 1 # Disable Turbopack telemetry
   NEXT_TELEMETRY_DISABLED: 1 # Disable Next telemetry
 

.github/workflows/post-release-templates.yml

@@ -8,7 +8,7 @@ on:
 
 env:
   NODE_VERSION: 23.11.0
-  PNPM_VERSION: 9.7.1
+  PNPM_VERSION: 10.12.1
   DO_NOT_TRACK: 1 # Disable Turbopack telemetry
   NEXT_TELEMETRY_DISABLED: 1 # Disable Next telemetry
 

.github/workflows/post-release.yml

@@ -13,7 +13,7 @@ on:
 
 env:
   NODE_VERSION: 23.11.0
-  PNPM_VERSION: 9.7.1
+  PNPM_VERSION: 10.12.1
   DO_NOT_TRACK: 1 # Disable Turbopack telemetry
   NEXT_TELEMETRY_DISABLED: 1 # Disable Next telemetry
 

.github/workflows/publish-prerelease.yml

@@ -8,7 +8,7 @@ on:
 
 env:
   NODE_VERSION: 23.11.0
-  PNPM_VERSION: 9.7.1
+  PNPM_VERSION: 10.12.1
   DO_NOT_TRACK: 1 # Disable Turbopack telemetry
   NEXT_TELEMETRY_DISABLED: 1 # Disable Next telemetry
 

.tool-versions

@@ -1,2 +1,2 @@
-pnpm 9.7.1
+pnpm 10.12.1
 nodejs 23.11.0

docs/configuration/collections.mdx

@@ -85,6 +85,7 @@ The following options are available:
 | `defaultPopulate`    | Specify which fields to select when this Collection is populated from another document. [More Details](../queries/select#defaultpopulate-collection-config-property).                                                            |
 | `indexes`            | Define compound indexes for this collection. This can be used to either speed up querying/sorting by 2 or more fields at the same time or to ensure uniqueness between several fields.                                           |
 | `forceSelect`        | Specify which fields should be selected always, regardless of the `select` query which can be useful that the field exists for access control / hooks                                                                            |
+| `disableBulkEdit`    | Disable the bulk edit operation for the collection in the admin panel and the REST API                                                                                                                                           |
 
 _\* An asterisk denotes that a property is required._
 

package.json

@@ -154,6 +154,7 @@
     "drizzle-kit": "0.31.0",
     "drizzle-orm": "0.43.1",
     "escape-html": "^1.0.3",
+    "eslint": "9.22.0",
     "execa": "5.1.1",
     "form-data": "3.0.1",
     "fs-extra": "10.1.0",
@@ -184,10 +185,10 @@
     "turbo": "^2.3.3",
     "typescript": "5.7.3"
   },
-  "packageManager": "pnpm@9.7.1",
+  "packageManager": "pnpm@10.12.1",
   "engines": {
     "node": "^18.20.2 || >=20.9.0",
-    "pnpm": "^9.7.0"
+    "pnpm": "^10.12.1"
   },
   "pnpm": {
     "overrides": {

packages/next/src/views/List/index.tsx

@@ -274,7 +274,7 @@ export const renderListView = async (
                 collectionSlug,
                 columnState,
                 disableBulkDelete,
-                disableBulkEdit,
+                disableBulkEdit: collectionConfig.disableBulkEdit ?? disableBulkEdit,
                 disableQueryPresets,
                 enableRowSelections,
                 hasCreatePermission,

packages/payload/src/collections/config/types.ts

@@ -440,6 +440,10 @@ export type CollectionConfig<TSlug extends CollectionSlug = any> = {
    * Default field to sort by in collection list view
    */
   defaultSort?: Sort
+  /**
+   * Disable the bulk edit operation for the collection in the admin panel and the API
+   */
+  disableBulkEdit?: boolean
   /**
    * When true, do not show the "Duplicate" button while editing documents within this collection and prevent `duplicate` from all APIs
    */

packages/payload/src/collections/operations/update.ts

@@ -15,7 +15,7 @@ import type {
 import executeAccess from '../../auth/executeAccess.js'
 import { combineQueries } from '../../database/combineQueries.js'
 import { validateQueryPaths } from '../../database/queryValidation/validateQueryPaths.js'
-import { APIError } from '../../errors/index.js'
+import { APIError, Forbidden } from '../../errors/index.js'
 import { type CollectionSlug, deepCopyObjectSimple } from '../../index.js'
 import { generateFileData } from '../../uploads/generateFileData.js'
 import { unlinkTempFiles } from '../../uploads/unlinkTempFiles.js'
@@ -63,6 +63,10 @@ export const updateOperation = async <
 ): Promise<BulkOperationResult<TSlug, TSelect>> => {
   let args = incomingArgs
 
+  if (args.collection.config.disableBulkEdit && !args.overrideAccess) {
+    throw new APIError(`Collection ${args.collection.config.slug} has disabled bulk edit`, 403)
+  }
+
   try {
     const shouldCommit = !args.disableTransaction && (await initTransaction(args.req))
 

packages/richtext-lexical/src/features/blockquote/server/index.ts

@@ -53,7 +53,7 @@ export const BlockquoteFeature = createServerFeature({
               })
               const style = [
                 node.format ? `text-align: ${node.format};` : '',
-                node.indent > 0 ? `padding-inline-start: ${node.indent * 40}px;` : '',
+                node.indent > 0 ? `padding-inline-start: ${Number(node.indent) * 2}rem;` : '',
               ]
                 .filter(Boolean)
                 .join(' ')

packages/richtext-lexical/src/features/converters/lexicalToHtml/shared/findConverterForNode.ts

@@ -83,7 +83,7 @@ export function findConverterForNode<
 
   if (!disableIndent && (!Array.isArray(disableIndent) || !disableIndent?.includes(node.type))) {
     if ('indent' in node && node.indent && node.type !== 'listitem') {
-      style['padding-inline-start'] = `${Number(node.indent) * 2}em`
+      style['padding-inline-start'] = `${Number(node.indent) * 2}rem`
     }
   }
 

packages/richtext-lexical/src/features/converters/lexicalToHtml_deprecated/converter/converters/paragraph.ts

@@ -31,7 +31,7 @@ export const ParagraphHTMLConverter: HTMLConverter<SerializedParagraphNode> = {
     })
     const style = [
       node.format ? `text-align: ${node.format};` : '',
-      node.indent > 0 ? `padding-inline-start: ${node.indent * 40}px;` : '',
+      node.indent > 0 ? `padding-inline-start: ${Number(node.indent) * 2}rem;` : '',
     ]
       .filter(Boolean)
       .join(' ')

packages/richtext-lexical/src/features/heading/server/index.ts

@@ -71,7 +71,7 @@ export const HeadingFeature = createServerFeature<
                 })
                 const style = [
                   node.format ? `text-align: ${node.format};` : '',
-                  node.indent > 0 ? `padding-inline-start: ${node.indent * 40}px;` : '',
+                  node.indent > 0 ? `padding-inline-start: ${Number(node.indent) * 2}rem;` : '',
                 ]
                   .filter(Boolean)
                   .join(' ')

packages/ui/src/views/CollectionFolder/index.tsx

@@ -264,7 +264,7 @@ function CollectionFolderViewInContext(props: CollectionFolderViewInContextProps
               !smallBreak && (
                 <ListSelection
                   disableBulkDelete={disableBulkDelete}
-                  disableBulkEdit={disableBulkEdit}
+                  disableBulkEdit={collectionConfig.disableBulkEdit ?? disableBulkEdit}
                   key="list-selection"
                 />
               ),

pnpm-lock.yaml

@@ -5,3 +5,6 @@ packages:
   - 'test'
   # exclude packages that are inside test directories
   # - '!**/test/**'
+
+# Allow all build scripts
+neverBuiltDependencies: []

pnpm-workspace.yaml

@@ -0,0 +1,7 @@
+import type { CollectionConfig } from 'payload'
+
+export const DisableBulkEdit: CollectionConfig = {
+  slug: 'disable-bulk-edit',
+  fields: [],
+  disableBulkEdit: true,
+}

test/admin/collections/DisableBulkEdit.ts

@@ -1,4 +1,3 @@
- 
 import { fileURLToPath } from 'node:url'
 import path from 'path'
 
@@ -8,6 +7,7 @@ import { BaseListFilter } from './collections/BaseListFilter.js'
 import { CustomFields } from './collections/CustomFields/index.js'
 import { CustomViews1 } from './collections/CustomViews1.js'
 import { CustomViews2 } from './collections/CustomViews2.js'
+import { DisableBulkEdit } from './collections/DisableBulkEdit.js'
 import { DisableCopyToLocale } from './collections/DisableCopyToLocale.js'
 import { DisableDuplicate } from './collections/DisableDuplicate.js'
 import { EditMenuItems } from './collections/editMenuItems.js'
@@ -183,6 +183,7 @@ export default buildConfigWithDefaults({
     Placeholder,
     ViewConditions,
     UseAsTitleGroupField,
+    DisableBulkEdit,
   ],
   globals: [
     GlobalHidden,

test/admin/config.ts

@@ -66,6 +66,7 @@ describe('List View', () => {
   let with300DocumentsUrl: AdminUrlUtil
   let withListViewUrl: AdminUrlUtil
   let placeholderUrl: AdminUrlUtil
+  let disableBulkEditUrl: AdminUrlUtil
   let user: any
 
   let serverURL: string
@@ -90,6 +91,7 @@ describe('List View', () => {
     customViewsUrl = new AdminUrlUtil(serverURL, customViews1CollectionSlug)
     withListViewUrl = new AdminUrlUtil(serverURL, listDrawerSlug)
     placeholderUrl = new AdminUrlUtil(serverURL, placeholderCollectionSlug)
+    disableBulkEditUrl = new AdminUrlUtil(serverURL, 'disable-bulk-edit')
     const context = await browser.newContext()
     page = await context.newPage()
     initPageConsoleErrorCatch(page)
@@ -1302,6 +1304,16 @@ describe('List View', () => {
       await page.locator('#confirm-delete-many-docs #confirm-action').click()
       await expect(page.locator('.cell-_select')).toHaveCount(1)
     })
+
+    test('should hide edit many from collection with disableBulkEdit: true', async () => {
+      await payload.create({ collection: 'disable-bulk-edit', data: {} })
+      await page.goto(disableBulkEditUrl.list)
+
+      // select one row
+      await page.locator('.row-1 .cell-_select input').check()
+      // ensure the edit many button is hidden
+      await expect(page.locator('.edit-many button')).toBeHidden()
+    })
   })
 
   describe('pagination', () => {

test/admin/e2e/list-view/e2e.spec.ts

@@ -93,6 +93,7 @@ export interface Config {
     placeholder: Placeholder;
     'view-conditions': ViewCondition;
     'use-as-title-group-field': UseAsTitleGroupField;
+    'disable-bulk-edit': DisableBulkEdit;
     'payload-locked-documents': PayloadLockedDocument;
     'payload-preferences': PayloadPreference;
     'payload-migrations': PayloadMigration;
@@ -125,6 +126,7 @@ export interface Config {
     placeholder: PlaceholderSelect<false> | PlaceholderSelect<true>;
     'view-conditions': ViewConditionsSelect<false> | ViewConditionsSelect<true>;
     'use-as-title-group-field': UseAsTitleGroupFieldSelect<false> | UseAsTitleGroupFieldSelect<true>;
+    'disable-bulk-edit': DisableBulkEditSelect<false> | DisableBulkEditSelect<true>;
     'payload-locked-documents': PayloadLockedDocumentsSelect<false> | PayloadLockedDocumentsSelect<true>;
     'payload-preferences': PayloadPreferencesSelect<false> | PayloadPreferencesSelect<true>;
     'payload-migrations': PayloadMigrationsSelect<false> | PayloadMigrationsSelect<true>;
@@ -562,6 +564,15 @@ export interface UseAsTitleGroupField {
   updatedAt: string;
   createdAt: string;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "disable-bulk-edit".
+ */
+export interface DisableBulkEdit {
+  id: string;
+  updatedAt: string;
+  createdAt: string;
+}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "payload-locked-documents".
@@ -672,6 +683,10 @@ export interface PayloadLockedDocument {
     | ({
         relationTo: 'use-as-title-group-field';
         value: string | UseAsTitleGroupField;
+      } | null)
+    | ({
+        relationTo: 'disable-bulk-edit';
+        value: string | DisableBulkEdit;
       } | null);
   globalSlug?: string | null;
   user: {
@@ -1066,6 +1081,14 @@ export interface UseAsTitleGroupFieldSelect<T extends boolean = true> {
   updatedAt?: T;
   createdAt?: T;
 }
+/**
+ * This interface was referenced by `Config`'s JSON-Schema
+ * via the `definition` "disable-bulk-edit_select".
+ */
+export interface DisableBulkEditSelect<T extends boolean = true> {
+  updatedAt?: T;
+  createdAt?: T;
+}
 /**
  * This interface was referenced by `Config`'s JSON-Schema
  * via the `definition` "payload-locked-documents_select".

test/admin/payload-types.ts

@@ -270,6 +270,16 @@ export default buildConfigWithDefaults({
         path: `/${method}-test`,
       })),
     },
+    {
+      slug: 'disabled-bulk-edit-docs',
+      fields: [
+        {
+          name: 'text',
+          type: 'text',
+        },
+      ],
+      disableBulkEdit: true,
+    },
   ],
   endpoints: [
     {