maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Canvas] Fix column object shape in datatable created by CSV function (#98561)

Browse source 
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
This commit is contained in:
Catherine Liu 2021-05-17 09:45:48 -07:00 committed by GitHub
parent e30c7a4117
commit 49b1ccdc9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.test.js → x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.test.ts
View file

@ -5,19 +5,21 @@
* 2.0.
*/
// @ts-expect-error untyped lib
import { functionWrapper } from '../../../test_helpers/function_wrapper';
import { getFunctionErrors } from '../../../i18n';
import { csv } from './csv';
import { Datatable } from 'src/plugins/expressions';
const errors = getFunctionErrors().csv;
describe('csv', () => {
const fn = functionWrapper(csv);
const expected = {
const expected: Datatable = {
type: 'datatable',
columns: [
{ name: 'name', type: 'string' },
{ name: 'number', type: 'string' },
{ id: 'name', name: 'name', meta: { type: 'string' } },
{ id: 'number', name: 'number', meta: { type: 'string' } },
],
rows: [
{ name: 'one', number: '1' },
@ -69,43 +71,47 @@ fourty two%SPLIT%42`,
});
it('should trim column names', () => {
const expectedResult: Datatable = {
type: 'datatable',
columns: [
{ id: 'foo', name: 'foo', meta: { type: 'string' } },
{ id: 'bar', name: 'bar', meta: { type: 'string' } },
{ id: 'baz', name: 'baz', meta: { type: 'string' } },
{ id: 'buz', name: 'buz', meta: { type: 'string' } },
],
rows: [{ foo: '1', bar: '2', baz: '3', buz: '4' }],
};
expect(
fn(null, {
data: `foo," bar ", baz, " buz "
1,2,3,4`,
})
).toEqual({
type: 'datatable',
columns: [
{ name: 'foo', type: 'string' },
{ name: 'bar', type: 'string' },
{ name: 'baz', type: 'string' },
{ name: 'buz', type: 'string' },
],
rows: [{ foo: '1', bar: '2', baz: '3', buz: '4' }],
});
).toEqual(expectedResult);
});
it('should handle odd spaces correctly', () => {
const expectedResult: Datatable = {
type: 'datatable',
columns: [
{ id: 'foo', name: 'foo', meta: { type: 'string' } },
{ id: 'bar', name: 'bar', meta: { type: 'string' } },
{ id: 'baz', name: 'baz', meta: { type: 'string' } },
{ id: 'buz', name: 'buz', meta: { type: 'string' } },
],
rows: [
{ foo: '1', bar: ' best ', baz: '3', buz: ' ok' },
{ foo: ' good', bar: ' bad', baz: ' better ', buz: ' worst ' },
],
};
expect(
fn(null, {
data: `foo," bar ", baz, " buz "
1," best ",3, " ok"
" good", bad, better , " worst " `,
})
).toEqual({
type: 'datatable',
columns: [
{ name: 'foo', type: 'string' },
{ name: 'bar', type: 'string' },
{ name: 'baz', type: 'string' },
{ name: 'buz', type: 'string' },
],
rows: [
{ foo: '1', bar: ' best ', baz: '3', buz: ' ok' },
{ foo: ' good', bar: ' bad', baz: ' better ', buz: ' worst ' },
],
});
).toEqual(expectedResult);
});
it('throws when given invalid csv', () => {

6
x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.ts
View file

@ -73,7 +73,11 @@ export function csv(): ExpressionFunctionDefinition<'csv', null, Arguments, Data
if (i === 0) {
// first row, assume header values
row.forEach((colName: string) =>
acc.columns.push({ name: colName.trim(), type: 'string' })
acc.columns.push({
id: colName.trim(),
name: colName.trim(),
meta: { type: 'string' },
})
);
} else {
// any other row is a data row