Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Lens] Formula can be colored by value #103572

Merged
merged 4 commits into from
Jun 30, 2021
Merged

[Lens] Formula can be colored by value #103572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
79b0bdf
[Lens] Formula can be colored by value
wylieconlon Jun 28, 2021
bf3c1ab
Fix mapColumn test
wylieconlon Jun 28, 2021
d17f4dd
Merge remote-tracking branch 'origin/master' into lens/fix-color-by-v…
wylieconlon Jun 29, 2021
4be696b
Fix tests
wylieconlon Jun 29, 2021
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
13 changes: 11 additions & 2 deletions src/plugins/expressions/common/expression_functions/specs/map_column.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { Observable, defer, of, zip } from 'rxjs';
import { map } from 'rxjs/operators';
import { i18n } from '@kbn/i18n';
import { ExpressionFunctionDefinition } from '../types';
import { Datatable, DatatableColumn, getType } from '../../expression_types';
import { Datatable, DatatableColumn, DatatableColumnType, getType } from '../../expression_types';

export interface MapColumnArguments {
id?: string | null;
Expand Down Expand Up @@ -103,7 +103,16 @@ export const mapColumn: ExpressionFunctionDefinition<

return rows$.pipe<Datatable>(
map((rows) => {
const type = getType(rows[0]?.[id]);
let type: DatatableColumnType = 'null';
if (rows.length) {
for (const row of rows) {
const rowType = getType(row[id]);
if (rowType !== 'null') {
type = rowType;
break;
}
}
}
const newColumn: DatatableColumn = {
id,
name: args.name,
Expand Down
13 changes: 11 additions & 2 deletions src/plugins/expressions/common/expression_functions/specs/math_column.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import { i18n } from '@kbn/i18n';
import { ExpressionFunctionDefinition } from '../types';
import { math, MathArguments } from './math';
import { Datatable, DatatableColumn, getType } from '../../expression_types';
import { Datatable, DatatableColumn, DatatableColumnType, getType } from '../../expression_types';

export type MathColumnArguments = MathArguments & {
id: string;
Expand Down Expand Up @@ -104,7 +104,16 @@ export const mathColumn: ExpressionFunctionDefinition<

return { ...row, [args.id]: result };
});
const type = newRows.length ? getType(newRows[0][args.id]) : 'null';
let type: DatatableColumnType = 'null';
if (newRows.length) {
for (const row of newRows) {
const rowType = getType(row[args.id]);
if (rowType !== 'null') {
type = rowType;
break;
}
}
}
const newColumn: DatatableColumn = {
id: args.id,
name: args.name ?? args.id,
Expand Down
34 changes: 30 additions & 4 deletions src/plugins/expressions/common/expression_functions/specs/tests/map_column.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ import { of, Observable } from 'rxjs';
import { TestScheduler } from 'rxjs/testing';
import { Datatable } from '../../../expression_types';
import { mapColumn, MapColumnArguments } from '../map_column';
import { emptyTable, functionWrapper, testTable } from './utils';
import { emptyTable, functionWrapper, testTable, tableWithNulls } from './utils';

const pricePlusTwo = (datatable: Datatable) => of(datatable.rows[0].price + 2);
const pricePlusTwo = (datatable: Datatable) =>
of(typeof datatable.rows[0].price === 'number' ? datatable.rows[0].price + 2 : null);

describe('mapColumn', () => {
const fn = functionWrapper(mapColumn);
Expand Down Expand Up @@ -219,11 +220,11 @@ describe('mapColumn', () => {
});
});

it('should correctly infer the type fromt he first row if the references column for meta information does not exists', () => {
it('should correctly infer the type from the first row if the references column for meta information does not exists', () => {
testScheduler.run(({ expectObservable }) => {
expectObservable(
runFn(
{ ...emptyTable, rows: [...emptyTable.rows, { value: 5 }] },
{ ...emptyTable, rows: [...emptyTable.rows, { price: 5 }] },
{ name: 'value', copyMetaFrom: 'time', expression: pricePlusTwo }
)
).toBe('(0|)', [
Expand All @@ -236,6 +237,31 @@ describe('mapColumn', () => {
meta: expect.objectContaining({ type: 'number' }),
}),
],
rows: [{ price: 5, value: 7 }],
}),
]);
});
});

it('should correctly infer the type from the first non-null row', () => {
testScheduler.run(({ expectObservable }) => {
expectObservable(
runFn(tableWithNulls, {
id: 'value',
name: 'value',
expression: pricePlusTwo,
})
).toBe('(0|)', [
expect.objectContaining({
type: 'datatable',
columns: [
...tableWithNulls.columns,
expect.objectContaining({
id: 'value',
name: 'value',
meta: expect.objectContaining({ type: 'number' }),
}),
],
}),
]);
});
Expand Down
20 changes: 19 additions & 1 deletion src/plugins/expressions/common/expression_functions/specs/tests/math_column.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

import { mathColumn } from '../math_column';
import { functionWrapper, testTable } from './utils';
import { functionWrapper, testTable, tableWithNulls } from './utils';

describe('mathColumn', () => {
const fn = functionWrapper(mathColumn);
Expand Down Expand Up @@ -95,4 +95,22 @@ describe('mathColumn', () => {
meta: { type: 'date', params: { id: 'number', params: { digits: 2 } } },
});
});

it('should correctly infer the type from the first non-null row', () => {
expect(
fn(tableWithNulls, { id: 'value', name: 'value', expression: 'price + 2', onError: 'null' })
).toEqual(
expect.objectContaining({
type: 'datatable',
columns: [
...tableWithNulls.columns,
expect.objectContaining({
id: 'value',
name: 'value',
meta: expect.objectContaining({ type: 'number' }),
}),
],
})
);
});
});
70 changes: 69 additions & 1 deletion src/plugins/expressions/common/expression_functions/specs/tests/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,4 +224,72 @@ const stringTable: Datatable = {
],
};

export { emptyTable, testTable, stringTable };
const tableWithNulls: Datatable = {
type: 'datatable',
columns: [
{
id: 'name',
name: 'name label',
meta: { type: 'string' },
},
{
id: 'time',
name: 'time label',
meta: { type: 'date' },
},
{
id: 'price',
name: 'price label',
meta: { type: 'number' },
},
],
rows: [
{
name: 'product1',
time: 1517842800950, // 05 Feb 2018 15:00:00 GMT
price: null,
},
{
name: 'product1',
time: 1517929200950, // 06 Feb 2018 15:00:00 GMT
price: null,
},
{
name: 'product1',
time: 1518015600950, // 07 Feb 2018 15:00:00 GMT
price: 420,
},
{
name: 'product2',
time: 1517842800950, // 05 Feb 2018 15:00:00 GMT
price: 216,
},
{
name: 'product2',
time: 1517929200950, // 06 Feb 2018 15:00:00 GMT
price: 200,
},
{
name: 'product2',
time: 1518015600950, // 07 Feb 2018 15:00:00 GMT
price: 190,
},
{
name: 'product3',
time: 1517842800950, // 05 Feb 2018 15:00:00 GMT
price: null,
},
{
name: 'product4',
time: 1517842800950, // 05 Feb 2018 15:00:00 GMT
price: 311,
},
{
name: 'product5',
time: 1517842800950, // 05 Feb 2018 15:00:00 GMT
price: 288,
},
],
};

export { emptyTable, testTable, stringTable, tableWithNulls };
12 changes: 9 additions & 3 deletions x-pack/test/functional/apps/lens/formula.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
expect(await PageObjects.lens.getErrorCount()).to.eql(0);
});

it('should duplicate a moving average formula and be a valid table', async () => {
it('should duplicate a moving average formula and be a valid table with conditional coloring', async () => {
await PageObjects.visualize.navigateToNewVisualization();
await PageObjects.visualize.clickVisType('lens');
await PageObjects.lens.goToTimeRange();
Expand All @@ -198,14 +198,20 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
formula: `moving_average(sum(bytes), window=5`,
keepOpen: true,
});
await PageObjects.lens.setTableDynamicColoring('text');
await PageObjects.header.waitUntilLoadingHasFinished();
const styleObj = await PageObjects.lens.getDatatableCellStyle(1, 1);
expect(styleObj['background-color']).to.be(undefined);
expect(styleObj.color).not.to.be(undefined);

await PageObjects.lens.closeDimensionEditor();

await PageObjects.lens.dragDimensionToDimension(
'lnsDatatable_metrics > lns-dimensionTrigger',
'lnsDatatable_metrics > lns-empty-dimension'
);
expect(await PageObjects.lens.getDatatableCellText(1, 1)).to.eql('222420');
expect(await PageObjects.lens.getDatatableCellText(1, 2)).to.eql('222420');
expect(await PageObjects.lens.getDatatableCellText(1, 1)).to.eql('222,420');
expect(await PageObjects.lens.getDatatableCellText(1, 2)).to.eql('222,420');
});

it('should keep the formula if the user does not fully transition to a quick function', async () => {
Expand Down