chore: roll back PR #2396

payloadcms · Mar 27, 2023 · 0ca5851 · 0ca5851
1 parent 4bb0bdc
commit 0ca5851
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/admin/components/elements/TableColumns/buildColumns.tsx b/src/admin/components/elements/TableColumns/buildColumns.tsx
@@ -18,10 +18,8 @@ const buildColumns = ({
   columns: Pick<Column, 'accessor' | 'active'>[],
   cellProps: Partial<CellProps>[]
 }): Column[] => {
-  const filteredFields = collection.fields.filter((field) => fieldIsPresentationalOnly(field) || !field.admin?.hidden);
-
   // sort the fields to the order of activeColumns
-  const sortedFields = flattenFields(filteredFields, true).sort((a, b) => {
+  const sortedFields = flattenFields(collection.fields, true).sort((a, b) => {
     const aIndex = columns.findIndex((column) => column.accessor === a.name);
     const bIndex = columns.findIndex((column) => column.accessor === b.name);
     if (aIndex === -1 && bIndex === -1) return 0;

diff --git a/src/admin/components/views/collections/List/formatFields.tsx b/src/admin/components/views/collections/List/formatFields.tsx
@@ -6,7 +6,7 @@ import { Field, fieldAffectsData, fieldIsPresentationalOnly } from '../../../../
 const formatFields = (config: SanitizedCollectionConfig, t: TFunction): Field[] => {
   const hasID = config.fields.findIndex((field) => fieldAffectsData(field) && field.name === 'id') > -1;
   const fields: Field[] = config.fields.reduce((formatted, field) => {
-    if (!fieldIsPresentationalOnly(field) && (field.hidden === true || field.admin?.hidden === true || field.admin?.disabled === true)) {
+    if (!fieldIsPresentationalOnly(field) && (field.hidden === true || field?.admin?.disabled === true)) {
       return formatted;
     }
 
@@ -32,7 +32,8 @@ const formatFields = (config: SanitizedCollectionConfig, t: TFunction): Field[]
         admin: {
           disableBulkEdit: true,
         },
-      }, {
+      },
+      {
         name: 'updatedAt',
         label: t('general:updatedAt'),
         type: 'date',