Merge pull request #397 from protofire/sortable-date-column

Make date column sortable in Voter History
protofire · Apr 28, 2020 · 37cfb6f · 37cfb6f
2 parents 285b1ee + d15fc80
commit 37cfb6f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/components/List/helpers.tsx b/src/components/List/helpers.tsx
@@ -267,7 +267,10 @@ export const VoterHistoryColumns = () => {
       id: 'date',
       separator: true,
       disableFilters: true,
-      sortType: 'datetime',
+      accessor: 'lastParticipation.timestamp',
+      sortType: (a, b) => {
+        return a.original.lastParticipation.timestamp - b.original.lastParticipation.timestamp
+      },
       Cell: ({ row }) => {
         if (!row.original.lastParticipation) {
           return <Loading />

diff --git a/src/containers/VoterHistory/index.tsx b/src/containers/VoterHistory/index.tsx
@@ -26,6 +26,7 @@ const getHomeVariables = data => {
 }
 
 const descendantTimestampSort = (a, b) => (a.timestamp > b.timestamp ? 1 : -1)
+const defaultSort = [{ desc: true, id: 'date' }]
 
 function VoterHistory(props: Props) {
   const { match, history } = props
@@ -134,7 +135,7 @@ function VoterHistory(props: Props) {
   return (
     <>
       <PageTitle>{`Voter History - ${voterId}`}</PageTitle>
-      <List handleRow={getItem} data={[...executives, ...polls]} columns={historyColumns} />
+      <List handleRow={getItem} data={[...executives, ...polls]} columns={historyColumns} sortBy={defaultSort} />
     </>
   )
 }