From 46439e31bd5d5d319826e8a8b12b8a1ce42c477f Mon Sep 17 00:00:00 2001
From: Patrik Kozak <patrik@payloadcms.com>
Date: Thu, 30 May 2024 14:40:49 -0400
Subject: [PATCH 1/3] fix: removes sort from arrays & blocks & group fields

---
 .../src/admin/components/elements/SortColumn/index.tsx      | 6 ++++--
 .../src/admin/components/elements/SortColumn/types.ts       | 1 +
 .../admin/components/elements/TableColumns/buildColumns.tsx | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/payload/src/admin/components/elements/SortColumn/index.tsx b/packages/payload/src/admin/components/elements/SortColumn/index.tsx
index e2f90d3bfd1..c0086cda509 100644
--- a/packages/payload/src/admin/components/elements/SortColumn/index.tsx
+++ b/packages/payload/src/admin/components/elements/SortColumn/index.tsx
@@ -13,7 +13,7 @@ import './index.scss'
 const baseClass = 'sort-column'
 
 const SortColumn: React.FC<Props> = (props) => {
-  const { name, disable = false, label } = props
+  const { name, type, disable = false, label } = props
   const params = useSearchParams()
   const history = useHistory()
   const { i18n, t } = useTranslation('general')
@@ -29,6 +29,8 @@ const SortColumn: React.FC<Props> = (props) => {
   const descClasses = [`${baseClass}__desc`]
   if (sort === desc) descClasses.push(`${baseClass}--active`)
 
+  const shouldRenderButtons = !disable && type !== 'array' && type !== 'group' && type !== 'blocks'
+
   const setSort = useCallback(
     (newSort) => {
       history.push({
@@ -47,7 +49,7 @@ const SortColumn: React.FC<Props> = (props) => {
   return (
     <div className={baseClass}>
       <span className={`${baseClass}__label`}>{getTranslation(label, i18n)}</span>
-      {!disable && (
+      {shouldRenderButtons && (
         <div className={`${baseClass}__buttons`}>
           <button
             aria-label={t('sortByLabelDirection', {
diff --git a/packages/payload/src/admin/components/elements/SortColumn/types.ts b/packages/payload/src/admin/components/elements/SortColumn/types.ts
index 8b0c314aa3d..8609eeadf9f 100644
--- a/packages/payload/src/admin/components/elements/SortColumn/types.ts
+++ b/packages/payload/src/admin/components/elements/SortColumn/types.ts
@@ -2,4 +2,5 @@ export type Props = {
   disable?: boolean
   label: Record<string, string> | string
   name: string
+  type: string
 }
diff --git a/packages/payload/src/admin/components/elements/TableColumns/buildColumns.tsx b/packages/payload/src/admin/components/elements/TableColumns/buildColumns.tsx
index 642bed17315..0d136b769d7 100644
--- a/packages/payload/src/admin/components/elements/TableColumns/buildColumns.tsx
+++ b/packages/payload/src/admin/components/elements/TableColumns/buildColumns.tsx
@@ -56,6 +56,7 @@ const buildColumns = ({
             }
             label={field.label || field.name}
             name={field.name}
+            type={field.type}
           />
         ),
         renderCell: (rowData, cellData) => {

From 542a63312c86a99cd99f50fb58f9d39ad3831113 Mon Sep 17 00:00:00 2001
From: Patrik Kozak <patrik@payloadcms.com>
Date: Thu, 30 May 2024 14:46:02 -0400
Subject: [PATCH 2/3] fix: makes type prop optional for SortColumn

---
 .../payload/src/admin/components/elements/SortColumn/types.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/payload/src/admin/components/elements/SortColumn/types.ts b/packages/payload/src/admin/components/elements/SortColumn/types.ts
index 8609eeadf9f..737a9677246 100644
--- a/packages/payload/src/admin/components/elements/SortColumn/types.ts
+++ b/packages/payload/src/admin/components/elements/SortColumn/types.ts
@@ -2,5 +2,5 @@ export type Props = {
   disable?: boolean
   label: Record<string, string> | string
   name: string
-  type: string
+  type?: string
 }

From 3f69a570d55051ddb6077499935e436a8cb2c1fb Mon Sep 17 00:00:00 2001
From: Patrik Kozak <patrik@payloadcms.com>
Date: Fri, 7 Jun 2024 12:39:41 -0400
Subject: [PATCH 3/3] fix: simplifies sort conditionals

---
 .../admin/components/elements/SortColumn/index.tsx  |  6 ++----
 .../admin/components/elements/SortColumn/types.ts   |  1 -
 .../elements/TableColumns/buildColumns.tsx          | 13 +++++++------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/packages/payload/src/admin/components/elements/SortColumn/index.tsx b/packages/payload/src/admin/components/elements/SortColumn/index.tsx
index c0086cda509..e2f90d3bfd1 100644
--- a/packages/payload/src/admin/components/elements/SortColumn/index.tsx
+++ b/packages/payload/src/admin/components/elements/SortColumn/index.tsx
@@ -13,7 +13,7 @@ import './index.scss'
 const baseClass = 'sort-column'
 
 const SortColumn: React.FC<Props> = (props) => {
-  const { name, type, disable = false, label } = props
+  const { name, disable = false, label } = props
   const params = useSearchParams()
   const history = useHistory()
   const { i18n, t } = useTranslation('general')
@@ -29,8 +29,6 @@ const SortColumn: React.FC<Props> = (props) => {
   const descClasses = [`${baseClass}__desc`]
   if (sort === desc) descClasses.push(`${baseClass}--active`)
 
-  const shouldRenderButtons = !disable && type !== 'array' && type !== 'group' && type !== 'blocks'
-
   const setSort = useCallback(
     (newSort) => {
       history.push({
@@ -49,7 +47,7 @@ const SortColumn: React.FC<Props> = (props) => {
   return (
     <div className={baseClass}>
       <span className={`${baseClass}__label`}>{getTranslation(label, i18n)}</span>
-      {shouldRenderButtons && (
+      {!disable && (
         <div className={`${baseClass}__buttons`}>
           <button
             aria-label={t('sortByLabelDirection', {
diff --git a/packages/payload/src/admin/components/elements/SortColumn/types.ts b/packages/payload/src/admin/components/elements/SortColumn/types.ts
index 737a9677246..8b0c314aa3d 100644
--- a/packages/payload/src/admin/components/elements/SortColumn/types.ts
+++ b/packages/payload/src/admin/components/elements/SortColumn/types.ts
@@ -2,5 +2,4 @@ export type Props = {
   disable?: boolean
   label: Record<string, string> | string
   name: string
-  type?: string
 }
diff --git a/packages/payload/src/admin/components/elements/TableColumns/buildColumns.tsx b/packages/payload/src/admin/components/elements/TableColumns/buildColumns.tsx
index 0d136b769d7..6ad228e28c3 100644
--- a/packages/payload/src/admin/components/elements/TableColumns/buildColumns.tsx
+++ b/packages/payload/src/admin/components/elements/TableColumns/buildColumns.tsx
@@ -42,6 +42,12 @@ const buildColumns = ({
       colIndex += 1
     }
     const props = cellProps?.[colIndex] || {}
+
+    const fieldAffectsDataSubFields =
+      field &&
+      field.type &&
+      (field.type === 'array' || field.type === 'group' || field.type === 'blocks')
+
     return {
       name: field.name,
       accessor: field.name,
@@ -49,14 +55,9 @@ const buildColumns = ({
       components: {
         Heading: (
           <SortColumn
-            disable={
-              ('disableSort' in field && Boolean(field.disableSort)) ||
-              fieldIsPresentationalOnly(field) ||
-              undefined
-            }
+            disable={fieldAffectsDataSubFields || fieldIsPresentationalOnly(field) || undefined}
             label={field.label || field.name}
             name={field.name}
-            type={field.type}
           />
         ),
         renderCell: (rowData, cellData) => {