Merge pull request #2396 from pascalgn/fix/admin-hidden-fields

fix: hide fields with admin.hidden attribute
This commit is contained in:
James Mikrut
2023-03-27 16:45:41 -05:00
committed by GitHub
2 changed files with 4 additions and 2 deletions

View File

@@ -18,8 +18,10 @@ 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(collection.fields, true).sort((a, b) => {
const sortedFields = flattenFields(filteredFields, 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;

View File

@@ -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?.disabled === true)) {
if (!fieldIsPresentationalOnly(field) && (field.hidden === true || field.admin?.hidden === true || field.admin?.disabled === true)) {
return formatted;
}