Merge branch 'release' of https://github.com/appsmithorg/appsmith into release

This commit is contained in:
Automated Github Action 2020-08-28 09:20:41 +00:00
commit 85ba0dbba1

View File

@ -718,7 +718,12 @@ export function sortTableFunction(
)?.metaProperties?.type || ColumnTypes.TEXT;
return tableData.sort(
(a: { [key: string]: any }, b: { [key: string]: any }) => {
if (a[sortedColumn] !== undefined && b[sortedColumn] !== undefined) {
if (
a[sortedColumn] !== undefined &&
a[sortedColumn] !== null &&
b[sortedColumn] !== undefined &&
b[sortedColumn] !== null
) {
switch (columnType) {
case ColumnTypes.CURRENCY:
case ColumnTypes.NUMBER: