Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -121,4 +121,31 @@ describe('datatableFn', () => {
expect(resultColumnIds).toEqual(expectedColumnIds);
expect(resultColumnIds).toEqual(['bucket1', 'bucket2', 'bucket3', 'metric1', 'metric2']);
});

// This is needed for ghost formula columns, see https://github.com/elastic/kibana/issues/239170
it('should sort unknown columns in table by order of args.columns', async () => {
const table = buildTable();
const shuffledTable: Datatable = {
...table,
columns: shuffle([
...table.columns,
{ id: 'unknown', name: 'unknown', meta: { type: 'number' } },
]),
};
const args = buildArgs();
const result = await datatableFn(() => mockFormatFactory)(shuffledTable, args, context);

const resultColumnIds = result.value.data.columns.map((c) => c.id);
const expectedColumnIds = args.columns.map((c) => c.columnId).concat('unknown');

expect(resultColumnIds).toEqual(expectedColumnIds);
expect(resultColumnIds).toEqual([
'bucket1',
'bucket2',
'bucket3',
'metric1',
'metric2',
'unknown',
]);
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export const datatableFn =
): DatatableExpressionFunction['fn'] =>
async (table, args, context) => {
const columnSortMap = args.columns.reduce((acc, c, i) => acc.set(c.columnId, i), new Map());
const getColumnSort = (id: string) => columnSortMap.get(id) ?? -1;
const getColumnSort = (id: string) => columnSortMap.get(id) ?? Infinity;
const sortedTable: Datatable = {
...table,
columns: table.columns.slice().sort((a, b) => getColumnSort(a.id) - getColumnSort(b.id)),
Expand Down