Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 08:58:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fixed bug on table date column sort (#6119)

Browse source
This commit is contained in:
Kavin Venkatachalam 2023-04-27 13:47:02 +05:30 committed by GitHub
parent 9e63783eff
commit 83deef37ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
frontend/src/Editor/Components/Table/columns/index.jsx
View file

@ -55,13 +55,14 @@ export default function generateColumnsData({
column.dateFormat = column.dateFormat ? column.dateFormat : 'DD/MM/YYYY';
column.parseDateFormat = column.parseDateFormat ?? column.dateFormat; //backwards compatibility
sortType = (firstDate, secondDate) => {
const columnKey = column.key || column.name;
// Return -1 if second date is higher, 1 if first date is higher
if (secondDate?.original[column.name] === '') {
if (secondDate?.original[columnKey] === '') {
return 1;
} else if (firstDate?.original[column.name] === '') return -1;
} else if (firstDate?.original[columnKey] === '') return -1;
const parsedFirstDate = moment(firstDate?.original[column.name], column.parseDateFormat);
const parsedSecondDate = moment(secondDate?.original[column.name], column.parseDateFormat);
const parsedFirstDate = moment(firstDate?.original[columnKey], column.parseDateFormat);
const parsedSecondDate = moment(secondDate?.original[columnKey], column.parseDateFormat);
if (moment(parsedSecondDate).isSameOrAfter(parsedFirstDate)) {
return -1;
@ -90,6 +91,7 @@ export default function generateColumnsData({
maxLength: column.maxLength,
regex: column.regex,
customRule: column?.customRule,
sortType,
Cell: function ({ cell, isEditable, newRowsChangeSet = null }) {
const updatedChangeSet = newRowsChangeSet === null ? changeSet : newRowsChangeSet;
const rowChangeSet = updatedChangeSet ? updatedChangeSet[cell.row.index] : null;