yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-12 00:03:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

CM: Allow list-view to be sorted by stages

Browse Source
This commit is contained in:
Gustav Hansen 2023-04-27 17:10:14 +02:00
parent 9de528d7d5
commit 476821033f
2 changed files with 60 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/core/admin/ee/admin/content-manager/components/DynamicTable/CellContent/ReviewWorkflowsStage/getTableColumn.js
View File

@ -24,7 +24,7 @@ export default (layout) => {
key: '__strapi_reviewWorkflows_stage_temp_key__',
name: 'strapi_reviewWorkflows_stage',
fieldSchema: {
type: 'custom',
type: 'relation',
},
metadatas: {
label: formatMessage({
@ -32,7 +32,8 @@ export default (layout) => {
defaultMessage: 'Review stage',
}),
searchable: false,
sortable: false,
sortable: true,
mainField: 'name',
},
cellFormatter({ strapi_reviewWorkflows_stage }) {
// if entities are created e.g. through lifecycle methods

26
packages/core/helper-plugin/src/components/DynamicTable/TableHead/index.js
View File

@ -26,7 +26,6 @@ const TableHead = ({
const [{ query }, setQuery] = useQueryParams();
const sort = query?.sort || '';
const [sortBy, sortOrder] = sort.split(':');
const isIndeterminate = !areAllEntriesSelected && entriesToDelete.length > 0;
return (
@ -45,10 +44,17 @@ const TableHead = ({
/>
</Th>
)}
{headers.map(({ name, metadatas: { sortable: isSortable, label } }) => {
const isSorted = sortBy === name;
{headers.map(
({ fieldSchema, name, metadatas: { sortable: isSortable, label, mainField } }) => {
let isSorted = sortBy === name;
const isUp = sortOrder === 'ASC';
// 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}]`;
}
const sortLabel = formatMessage(
{ id: 'components.TableHeader.sort', defaultMessage: 'Sort on {label}' },
{ label }
@ -56,11 +62,16 @@ const TableHead = ({
const handleClickSort = (shouldAllowClick = true) => {
if (isSortable && shouldAllowClick) {
const nextSortOrder = isSorted && sortOrder === 'ASC' ? 'DESC' : 'ASC';
const nextSort = `${name}:${nextSortOrder}`;
let nextSort = name;
// 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}]`;
}
setQuery({
sort: nextSort,
sort: `${nextSort}:${isSorted && sortOrder === 'ASC' ? 'DESC' : 'ASC'}`,
});
}
};
@ -92,7 +103,8 @@ const TableHead = ({
</Tooltip>
</Th>
);
})}
}
)}
{withBulkActions && (
<Th>