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

Jump to bottom

Fix timelion not working with single quotes #84196

Merged
merged 3 commits into from
Nov 24, 2020
Merged

Fix timelion not working with single quotes #84196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d762195
Remove string escaping
Nov 24, 2020
525bbfd
Add unit test
Nov 24, 2020
c0aacb5
Merge remote-tracking branch 'upstream/master' into fix/timelion_esca…
Nov 24, 2020
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
20 changes: 20 additions & 0 deletions src/plugins/vis_type_timelion/public/__snapshots__/to_ast.test.ts.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions src/plugins/vis_type_timelion/public/to_ast.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,10 @@ describe('timelion vis toExpressionAst function', () => {
const actual = toExpressionAst(vis);
expect(actual).toMatchSnapshot();
});

it('should not escape single quotes', () => {
vis.params.expression = `.es(index=my*,timefield="date",split='test field:3',metric='avg:value')`;
const actual = toExpressionAst(vis);
expect(actual).toMatchSnapshot();
});
});
10 changes: 4 additions & 6 deletions src/plugins/vis_type_timelion/public/to_ast.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,12 @@ import { buildExpression, buildExpressionFunction } from '../../expressions/publ
import { Vis } from '../../visualizations/public';
import { TimelionExpressionFunctionDefinition, TimelionVisParams } from './timelion_vis_fn';

const escapeString = (data: string): string => {
return data.replace(/\\/g, `\\\\`).replace(/'/g, `\\'`);
};

export const toExpressionAst = (vis: Vis<TimelionVisParams>) => {
const { expression, interval } = vis.params;

const timelion = buildExpressionFunction<TimelionExpressionFunctionDefinition>('timelion_vis', {
expression: escapeString(vis.params.expression),
interval: escapeString(vis.params.interval),
expression,
interval,
});

const ast = buildExpression([timelion]);
Expand Down