Fix timelion vis escapes single quotes (elastic#84196)

* Remove string escaping * Add unit test
sulemanof · Nov 24, 2020 · a4fb489 · a4fb489
1 parent 2a49925
commit a4fb489
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 6 deletions.
diff --git a/src/plugins/vis_type_timelion/public/__snapshots__/to_ast.test.ts.snap b/src/plugins/vis_type_timelion/public/__snapshots__/to_ast.test.ts.snap
diff --git a/src/plugins/vis_type_timelion/public/to_ast.test.ts b/src/plugins/vis_type_timelion/public/to_ast.test.ts
@@ -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();
+  });
 });
diff --git a/src/plugins/vis_type_timelion/public/to_ast.ts b/src/plugins/vis_type_timelion/public/to_ast.ts
@@ -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]);