Skip to content

Fix report table sorting #1064

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

Merged
merged 1 commit into from
Sep 19, 2024
Merged

Fix report table sorting #1064

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
13 changes: 8 additions & 5 deletions src/components/Dashboard/NewReport/MetricsTable/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {
getCoreRowModel,
getSortedRowModel,
SortingFn,
sortingFns,
useReactTable
} from "@tanstack/react-table";

Expand Down Expand Up @@ -84,7 +83,6 @@ export const MetricsTable = ({
const columns = [
columnHelper.accessor((row) => row.key.service, {
header: "Service",
enableSorting: false,
cell: (info) => info.getValue()
}),
columnHelper.accessor((row) => row, {
Expand Down Expand Up @@ -135,7 +133,7 @@ export const MetricsTable = ({
cell: (info) => {
return info.getValue();
},
sortingFn: sortingFns.alphanumeric,
sortingFn: sortImpactFn,
meta: {
contentAlign: "center"
}
Expand All @@ -147,7 +145,8 @@ export const MetricsTable = ({
data,
columns,
getCoreRowModel: getCoreRowModel(),
getSortedRowModel: getSortedRowModel()
getSortedRowModel: getSortedRowModel(),
enableSortingRemoval: false
});

return (
Expand All @@ -163,8 +162,12 @@ export const MetricsTable = ({
return (
<s.TableHeaderCell key={header.id}>
<s.TableHeaderCellContent
onClick={header.column.getToggleSortingHandler()}
$align={meta?.contentAlign}
onClick={
header.column.columnDef.enableSorting
? header.column.getToggleSortingHandler()
: undefined
}
>
{header.isPlaceholder
? null
Expand Down
4 changes: 2 additions & 2 deletions src/components/Dashboard/NewReport/MetricsTable/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const TableHead = styled.thead`
`;

export const TableHeaderCell = styled.th`
height: 70;
height: 70px;
`;

export const TableCellContent = styled.div<TableCellContentProps>`
Expand Down Expand Up @@ -49,7 +49,7 @@ export const TableHeaderCellContent = styled(TableCellContent)`
font-weight: 400;
gap: 4px;
color: ${({ theme }) => theme.colors.v3.text.tertiary};
cursor: pointer;
${({ onClick }) => (onClick ? "cursor: pointer;" : "")}
`;

export const TableBodyRow = styled.tr`
Expand Down