Skip to content

adds id column and sort by it in main table #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: staging
Choose a base branch
from
+23 −2
Open

adds id column and sort by it in main table #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion admin/src/components/MenuRows/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,13 @@ const MenuRows = ({ data, onClickClone, onClickDelete, onClickEdit }) => {
const [sortKey, sortOrder] = query.sort.split(':');

rows = data.sort((a, b) => {
const compare = a.attributes[sortKey].localeCompare(b.attributes[sortKey]);
let compare;
if (sortKey === 'id') {
// Directly compare IDs
compare = a.id - b.id;
} else {
compare = a.attributes[sortKey].localeCompare(b.attributes[sortKey]);
}

return sortOrder === 'ASC' ? compare : -compare;
});
Expand All @@ -40,6 +46,9 @@ const MenuRows = ({ data, onClickClone, onClickDelete, onClickEdit }) => {
fn: () => onClickEdit(row.id),
})}
>
<Td>
<Typography textColor="neutral800">{row.id}</Typography>
</Td>
<Td>
<Typography textColor="neutral800">{row.attributes.title}</Typography>
</Td>
Expand Down Expand Up @@ -104,6 +113,7 @@ MenuRows.propTypes = {
PropTypes.shape({
id: PropTypes.number.isRequired,
attributes: PropTypes.shape({
id: PropTypes.number.isRequired,
title: PropTypes.string.isRequired,
slug: PropTypes.string.isRequired,
items: PropTypes.shape({
Expand Down
13 changes: 12 additions & 1 deletion admin/src/pages/IndexView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,17 @@ const IndexView = ({ history }) => {
const pageCount = data?.meta?.total ? Math.ceil(data.meta.total / data.meta.limit) : 1;

const tableHeaders = [
{
name: 'id',
key: 'id',
metadatas: {
label: formatMessage({
id: getTrad('form.label.id'),
defaultMessage: 'Id',
}),
sortable: true,
},
},
{
name: 'title',
key: 'title',
Expand Down Expand Up @@ -255,4 +266,4 @@ IndexView.propTypes = {
}).isRequired,
};

export default memo(IndexView);
export default memo(IndexView);