diff --git a/packages/frontend-core/src/components/grid/stores/rows.js b/packages/frontend-core/src/components/grid/stores/rows.js index 25acad6520..4cfaa1cfd5 100644 --- a/packages/frontend-core/src/components/grid/stores/rows.js +++ b/packages/frontend-core/src/components/grid/stores/rows.js @@ -55,10 +55,10 @@ export const deriveStores = context => { return $rows.map((row, idx) => ({ ...row, __idx: idx, - ...customColumns.reduce((acc, c) => { - const fromField = $enrichedSchema[c.related.field] - acc[c.name] = getRelatedTableValues(row, c, fromField) - return acc + ...customColumns.reduce((map, column) => { + const fromField = $enrichedSchema[column.related.field] + map[column.name] = getRelatedTableValues(row, column, fromField) + return map }, {}), })) } diff --git a/packages/frontend-core/src/utils/relatedColumns.js b/packages/frontend-core/src/utils/relatedColumns.js index 9d389524fd..f625e83e95 100644 --- a/packages/frontend-core/src/utils/relatedColumns.js +++ b/packages/frontend-core/src/utils/relatedColumns.js @@ -40,9 +40,9 @@ export function enrichSchemaWithRelColumns(schema) { if (!schema) { return } - const result = Object.keys(schema).reduce((acc, c) => { - const field = schema[c] - acc[c] = field + const result = Object.keys(schema).reduce((result, fieldName) => { + const field = schema[fieldName] + result[fieldName] = field if (field.visible !== false && field.columns) { const fromSingle = @@ -54,17 +54,17 @@ export function enrichSchemaWithRelColumns(schema) { continue } const name = `${field.name}.${relColumn}` - acc[name] = { + result[name] = { ...relField, name, - related: { field: c, subField: relColumn }, + related: { field: fieldName, subField: relColumn }, cellRenderType: (!fromSingle && columnTypeManyTypeOverrides[relField.type]) || relField.type, } } } - return acc + return result }, {}) return result