Merge branch 'main' of github.com:payloadcms/payload into feat/upload-imagesize-admin-props

feat: adds amin props inheritance for imageSize fields
2025-09-04 15:40:37 -04:00 · 2025-09-04 15:40:22 -04:00
2 changed files with 48 additions and 4 deletions
--- a/packages/payload/src/uploads/getBaseFields.ts
+++ b/packages/payload/src/uploads/getBaseFields.ts
@@ -196,10 +196,17 @@ export const getBaseUploadFields = ({ collection, config }: Options): Field[] =>
          type: 'group',
          admin: {
            hidden: true,
+            ...(size.admin?.disableListColumn && { disableListColumn: true }),
+            ...(size.admin?.disableListFilter && { disableListFilter: true }),
          },
          fields: [
            {
              ...url,
+              admin: {
+                ...url.admin,
+                ...(size.admin?.disableListColumn && { disableListColumn: true }),
+                ...(size.admin?.disableListFilter && { disableListFilter: true }),
+              },
              hooks: {
                afterRead: [
                  ({ data, value }) => {
@@ -218,12 +225,45 @@ export const getBaseUploadFields = ({ collection, config }: Options): Field[] =>
                ],
              },
            },
-            width,
-            height,
-            mimeType,
-            filesize,
+            {
+              ...width,
+              admin: {
+                ...width.admin,
+                ...(size.admin?.disableListColumn && { disableListColumn: true }),
+                ...(size.admin?.disableListFilter && { disableListFilter: true }),
+              },
+            },
+            {
+              ...height,
+              admin: {
+                ...height.admin,
+                ...(size.admin?.disableListColumn && { disableListColumn: true }),
+                ...(size.admin?.disableListFilter && { disableListFilter: true }),
+              },
+            },
+            {
+              ...mimeType,
+              admin: {
+                ...mimeType.admin,
+                ...(size.admin?.disableListColumn && { disableListColumn: true }),
+                ...(size.admin?.disableListFilter && { disableListFilter: true }),
+              },
+            },
+            {
+              ...filesize,
+              admin: {
+                ...filesize.admin,
+                ...(size.admin?.disableListColumn && { disableListColumn: true }),
+                ...(size.admin?.disableListFilter && { disableListFilter: true }),
+              },
+            },
            {
              ...filename,
+              admin: {
+                ...filename.admin,
+                ...(size.admin?.disableListColumn && { disableListColumn: true }),
+                ...(size.admin?.disableListFilter && { disableListFilter: true }),
+              },
              unique: false,
            },
          ],
--- a/packages/payload/src/uploads/types.ts
+++ b/packages/payload/src/uploads/types.ts
@@ -69,6 +69,10 @@ export type GenerateImageName = (args: {
 }) => string

 export type ImageSize = {
+  admin?: {
+    disableListColumn?: boolean
+    disableListFilter?: boolean
+  }
  /**
   * @deprecated prefer position
   */
Author	SHA1	Message	Date
Patrik Kozak	d2782f8a6f	Merge branch 'main' of github.com:payloadcms/payload into feat/upload-imagesize-admin-props	2025-09-04 15:40:37 -04:00
Patrik Kozak	dcec256903	feat: adds amin props inheritance for imageSize fields	2025-09-04 15:40:22 -04:00