Merge branch '8.16' into backport/8.16/pr-196122

elastic · Oct 18, 2024 · 5a99fe2 · 5a99fe2
2 parents 6cd118d + 7d58ea5
commit 5a99fe2
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/cumulative_sum.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/cumulative_sum.ts
@@ -33,7 +33,7 @@ export const convertToCumulativeSumColumns = (
   // lens supports cumulative sum for count and sum as quick function
   // and everything else as formula
   if (subFunctionMetric.type !== 'count' && pipelineAgg.name !== 'sum') {
-    const metaValue = Number(meta?.replace(']', ''));
+    const metaValue = Number(meta?.replace(/\]/g, ''));
     formula = getPipelineSeriesFormula(metric, metrics, subFunctionMetric, {
       metaValue,
       reducedTimeRange,

diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/formula.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/formula.ts
@@ -66,7 +66,7 @@ const convertFormulaScriptForPercentileAggs = (
 ) => {
   variables.forEach((variable) => {
     const [_, meta] = variable?.field?.split('[') ?? [];
-    const metaValue = Number(meta?.replace(']', ''));
+    const metaValue = Number(meta?.replace(/\]/g, ''));
     if (!metaValue) {
       return;
     }
@@ -163,7 +163,7 @@ export const convertOtherAggsToFormulaColumn = (
   const metric = metrics[metrics.length - 1];
   const [fieldId, meta] = metric?.field?.split('[') ?? [];
   const subFunctionMetric = metrics.find(({ id }) => id === fieldId);
-  const metaValue = meta ? Number(meta?.replace(']', '')) : undefined;
+  const metaValue = meta ? Number(meta?.replace(/\]/g, '')) : undefined;
 
   if (!subFunctionMetric) {
     return null;

diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/parent_pipeline.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/convert/parent_pipeline.ts
@@ -235,7 +235,7 @@ const convertMovingAvgOrDerivativeToColumns = (
   if (!pipelineAgg) {
     return null;
   }
-  const metaValue = Number(meta?.replace(']', ''));
+  const metaValue = Number(meta?.replace(/\]/g, ''));
   const subMetricField = subFunctionMetric.field;
   const [nestedFieldId, _] = subMetricField?.split('[') ?? [];
   // support nested aggs with formula

diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/metrics/filter_ratio_formula.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/metrics/filter_ratio_formula.ts
@@ -14,7 +14,7 @@ import { addAdditionalArgs } from '.';
 import { AdditionalArgs } from '../../types';
 
 const escapeQuotes = (str: string) => {
-  return str?.replace(/'/g, "\\'");
+  return str?.replace(/\\/g, '\\\\').replace(/'/g, "\\'");
 };
 
 const constructFilterRationFormula = (

diff --git a/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/metrics/metrics_helpers.ts b/src/plugins/vis_types/timeseries/public/convert_to_lens/lib/metrics/metrics_helpers.ts
@@ -113,7 +113,7 @@ export const getFormulaEquivalent = (
       }
 
       return getPipelineSeriesFormula(currentMetric, metrics, subFunctionMetric, {
-        metaValue: nestedMetaValue ? Number(nestedMetaValue?.replace(']', '')) : undefined,
+        metaValue: nestedMetaValue ? Number(nestedMetaValue?.replace(/\]/g, '')) : undefined,
         reducedTimeRange,
         timeShift,
       });

diff --git a/x-pack/plugins/graph/public/helpers/kql_encoder.ts b/x-pack/plugins/graph/public/helpers/kql_encoder.ts
@@ -10,7 +10,7 @@ import rison from '@kbn/rison';
 import { Workspace } from '../types';
 
 function escapeQuotes(str: string) {
-  return str.replace(/"/g, '\\"');
+  return str.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
 }
 
 export function asKQL(workspace: Workspace, joinBy: 'and' | 'or') {

diff --git a/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/dimension_panel.test.tsx b/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/dimension_panel.test.tsx
@@ -373,7 +373,7 @@ describe('FormBasedDimensionEditor', () => {
     // // press arrow up to go back to the beginning
     await userEvent.type(comboBoxInput, '{ArrowUp}{ArrowUp}');
     expect(getVisibleFieldSelectOptions()).toEqual(allOptions.slice(8));
-  });
+  }, 10000); // this test can be long running due to a big tree we're rendering and userEvent.type function that is slow
 
   it('should hide fields that have no data', () => {
     (useExistingFieldsReader as jest.Mock).mockImplementationOnce(() => {