diff --git a/packages/next/src/views/Versions/buildColumns.tsx b/packages/next/src/views/Versions/buildColumns.tsx index e93a7f3ce0..5870562b87 100644 --- a/packages/next/src/views/Versions/buildColumns.tsx +++ b/packages/next/src/views/Versions/buildColumns.tsx @@ -29,6 +29,7 @@ export const buildVersionColumns = ({ }): Column[] => [ { name: '', + Label: '', accessor: 'updatedAt', active: true, components: { @@ -39,28 +40,27 @@ export const buildVersionColumns = ({ globalSlug={globalConfig?.slug} /> ), - Heading: , + Heading: , }, - label: '', }, { name: '', + Label: '', accessor: 'id', active: true, components: { Cell: , - Heading: , + Heading: , }, - label: '', }, { name: '', + Label: '', accessor: 'autosave', active: true, components: { Cell: , - Heading: , + Heading: , }, - label: '', }, ] diff --git a/packages/ui/src/elements/ColumnSelector/index.tsx b/packages/ui/src/elements/ColumnSelector/index.tsx index 929e1d82ca..b7016aa5a3 100644 --- a/packages/ui/src/elements/ColumnSelector/index.tsx +++ b/packages/ui/src/elements/ColumnSelector/index.tsx @@ -41,7 +41,7 @@ export const ColumnSelector: React.FC = ({ collectionSlug }) => { {columns.map((col, i) => { if (!col) return null - const { name, accessor, active, label } = col + const { Label, accessor, active } = col if (col.accessor === '_select') return null @@ -60,7 +60,7 @@ export const ColumnSelector: React.FC = ({ collectionSlug }) => { toggleColumn(accessor) }} > - {label} + {Label} ) })} diff --git a/packages/ui/src/elements/SortColumn/index.tsx b/packages/ui/src/elements/SortColumn/index.tsx index 5b602b5da1..1c15f72e10 100644 --- a/packages/ui/src/elements/SortColumn/index.tsx +++ b/packages/ui/src/elements/SortColumn/index.tsx @@ -5,11 +5,14 @@ import queryString from 'qs' import React, { useCallback } from 'react' export type SortColumnProps = { + Label: React.ReactNode disable?: boolean - label: React.ReactNode + label?: FieldBase['label'] name: string } +import type { FieldBase } from 'payload/types' + import { Chevron } from '../../icons/Chevron/index.js' import { useSearchParams } from '../../providers/SearchParams/index.js' import { useTranslation } from '../../providers/Translation/index.js' @@ -18,7 +21,7 @@ import './index.scss' const baseClass = 'sort-column' export const SortColumn: React.FC = (props) => { - const { name, disable = false, label } = props + const { name, Label, disable = false, label } = props const { searchParams } = useSearchParams() const router = useRouter() const pathname = usePathname() @@ -52,7 +55,7 @@ export const SortColumn: React.FC = (props) => { return (
- {label} + {Label} {!disable && (