fix(QueryResultTable): fix table error on null cell sort (#590)

Author: artemmufazalov

src/components/QueryResultTable/QueryResultTable.tsx

@@ -36,10 +36,14 @@ const prepareTypedColumns = (columns: ColumnType[]) => {
             align: columnType === 'number' ? DataTable.RIGHT : DataTable.LEFT,
             sortAccessor: (row) => {
                 const value = row[name];
-                if (value === undefined || value === null) return null;
+
+                if (value === undefined || value === null) {
+                    return null;
+                }
+
                 return columnType === 'number' ? BigInt(value) : value;
             },
-            render: ({value}) => <Cell value={value as string} />,
+            render: ({row}) => <Cell value={String(row[name])} />,
         };
 
         return column;
@@ -56,7 +60,7 @@ const prepareGenericColumns = (data: KeyValueRow[]) => {
             name,
             align: isNumeric(data[0][name]) ? DataTable.RIGHT : DataTable.LEFT,
             sortAccessor: (row) => (isNumeric(row[name]) ? Number(row[name]) : row[name]),
-            render: ({value}) => <Cell value={value as string} />,
+            render: ({row}) => <Cell value={String(row[name])} />,
         };
 
         return column;

src/utils/query.ts

@@ -175,7 +175,14 @@ export const prepareQueryResponse = (data?: KeyValueRow[]) => {
         for (const field in row) {
             if (Object.prototype.hasOwnProperty.call(row, field)) {
                 const type = typeof row[field];
-                if (type === 'object' || type === 'boolean' || Array.isArray(row[field])) {
+
+                // Although typeof null == 'object'
+                // null result should be preserved
+                if (
+                    (row[field] !== null && type === 'object') ||
+                    type === 'boolean' ||
+                    Array.isArray(row[field])
+                ) {
                     formattedData[field] = JSON.stringify(row[field]);
                 } else {
                     formattedData[field] = row[field];