diff --git a/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/getTableColumn.js b/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/getTableColumn.js index 1f52c0af40..685fe7c455 100644 --- a/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/getTableColumn.js +++ b/packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/getTableColumn.js @@ -34,7 +34,12 @@ export default (layout) => { }), searchable: false, sortable: true, - mainField: 'name', + mainField: { + name: 'name', + schema: { + type: 'string', + }, + }, }, cellFormatter({ strapi_reviewWorkflows_stage }) { // if entities are created e.g. through lifecycle methods diff --git a/packages/core/helper-plugin/src/components/DynamicTable/TableHead/index.js b/packages/core/helper-plugin/src/components/DynamicTable/TableHead/index.js index 2d405c3413..4f0b75401d 100644 --- a/packages/core/helper-plugin/src/components/DynamicTable/TableHead/index.js +++ b/packages/core/helper-plugin/src/components/DynamicTable/TableHead/index.js @@ -52,7 +52,7 @@ const TableHead = ({ // relations always have to be sorted by their main field instead of only the // attribute name; sortBy e.g. looks like: &sortBy=attributeName[mainField]:ASC if (fieldSchema?.type === 'relation' && mainField) { - isSorted = sortBy === `${name}[${mainField}]`; + isSorted = sortBy === `${name.split('.')[0]}[${mainField.name}]`; } const sortLabel = formatMessage( @@ -67,7 +67,7 @@ const TableHead = ({ // relations always have to be sorted by their main field instead of only the // attribute name; nextSort e.g. looks like: &nextSort=attributeName[mainField]:ASC if (fieldSchema?.type === 'relation' && mainField) { - nextSort = `${name}[${mainField}]`; + nextSort = `${name.split('.')[0]}[${mainField.name}]`; } setQuery({