ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-26 01:25:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix sorting bug (#17769)

Browse Source 
* fix sorting bug

* comments
This commit is contained in:
Alan Ren
2021-11-30 17:11:57 -08:00
committed by GitHub
parent 7e17bfb6ec
commit 1006652a31
3 changed files with 73 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/sql/base/browser/ui/table/tableDataView.ts
View File

@@ -24,26 +24,33 @@ function defaultCellValueGetter(data: any): any {
return data;
}
function defaultSort<T extends Slick.SlickData>(args: Slick.OnSortEventArgs<T>, data: Array<T>, cellValueGetter: CellValueGetter = defaultCellValueGetter): Array<T> {
export function defaultSort<T extends Slick.SlickData>(args: Slick.OnSortEventArgs<T>, data: Array<T>, cellValueGetter: CellValueGetter = defaultCellValueGetter): Array<T> {
if (!args.sortCol || !args.sortCol.field || data.length === 0) {
return data;
}
const field = args.sortCol.field;
const sign = args.sortAsc ? 1 : -1;
let sampleData = data[0][field];
sampleData = types.isObject(sampleData) ? cellValueGetter(sampleData) : sampleData;
let comparer: (a: T, b: T) => number;
if (!isNaN(Number(sampleData))) {
comparer = (a: T, b: T) => {
let anum = Number(cellValueGetter(a[field]));
let bnum = Number(cellValueGetter(b[field]));
return anum === bnum ? 0 : anum > bnum ? 1 : -1;
};
} else {
comparer = (a: T, b: T) => {
return stringCompare(cellValueGetter(a[field]), cellValueGetter(b[field]));
};
}
const comparer: (a: T, b: T) => number = (a: T, b: T) => {
const value1 = cellValueGetter(a[field]);
const value2 = cellValueGetter(b[field]);
const num1 = Number(value1);
const num2 = Number(value2);
const isValue1Number = !isNaN(num1);
const isValue2Number = !isNaN(num2);
// Order: undefined -> number -> string
if (value1 === undefined || value2 === undefined) {
return value1 === value2 ? 0 : (value1 === undefined ? -1 : 1);
} else if (isValue1Number || isValue2Number) {
if (isValue1Number && isValue2Number) {
return num1 === num2 ? 0 : num1 > num2 ? 1 : -1;
} else {
return isValue1Number ? -1 : 1;
}
} else {
return stringCompare(value1, value2);
}
};
return data.sort((a, b) => comparer(a, b) * sign);
}

51
src/sql/base/test/browser/ui/table/tableDataView.test.ts
View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import * as assert from 'assert';
import { TableDataView } from 'sql/base/browser/ui/table/tableDataView';
import { defaultSort, TableDataView } from 'sql/base/browser/ui/table/tableDataView';
suite('TableDataView', () => {
test('Data can be filtered and filter can be cleared', () => {
@@ -173,6 +173,55 @@ suite('TableDataView', () => {
findValue = await dataView.findNext();
assert.deepStrictEqual(findValue, { row: 2, col: 0 });
});
test('Default Sorter test', async () => {
const originalData: Slick.SlickData[] = [
{ fieldName: '10b' },
{ fieldName: undefined },
{ fieldName: '100.01' },
{ fieldName: undefined },
{ fieldName: '10.1' },
{ fieldName: 'abc' }
];
const sortAscArg: Slick.OnSortEventArgs<Slick.SlickData> = {
sortAsc: true,
sortCol: {
field: 'fieldName'
},
multiColumnSort: false,
grid: undefined
};
const sortDescArg: Slick.OnSortEventArgs<Slick.SlickData> = {
sortAsc: false,
sortCol: {
field: 'fieldName'
},
multiColumnSort: false,
grid: undefined
};
const expectedAsc: Slick.SlickData[] = [
{ fieldName: undefined },
{ fieldName: undefined },
{ fieldName: '10.1' },
{ fieldName: '100.01' },
{ fieldName: '10b' },
{ fieldName: 'abc' }
];
const sortedAsc = defaultSort(sortAscArg, originalData);
assert.deepStrictEqual(sortedAsc, expectedAsc, 'ascending sorting is not working as expected');
const expectedDesc: Slick.SlickData[] = [
{ fieldName: 'abc' },
{ fieldName: '10b' },
{ fieldName: '100.01' },
{ fieldName: '10.1' },
{ fieldName: undefined },
{ fieldName: undefined },
];
const sortedDesc = defaultSort(sortDescArg, originalData);
assert.deepStrictEqual(sortedDesc, expectedDesc, 'descending sorting is not working as expected');
});
});
function populateData(row: number, column: number): any[] {