Fixed terms.

elastic · Oct 27, 2022 · a53dd45 · a53dd45
1 parent 7eb9001
commit a53dd45
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/src/plugins/visualizations/common/convert_to_lens/lib/convert/range.test.ts b/src/plugins/visualizations/common/convert_to_lens/lib/convert/range.test.ts
@@ -60,7 +60,6 @@ describe('convertToRangeColumn', () => {
         params: {
           type: RANGE_MODES.Histogram,
           maxBars: 'auto',
-          ranges: [],
         },
       },
     ],

diff --git a/src/plugins/visualizations/common/convert_to_lens/lib/convert/terms.test.ts b/src/plugins/visualizations/common/convert_to_lens/lib/convert/terms.test.ts
@@ -110,6 +110,8 @@ describe('convertToDateHistogramColumn', () => {
           size: 5,
           include: [],
           exclude: [],
+          includeIsRegex: false,
+          excludeIsRegex: false,
           parentFormat: { id: 'terms' },
           orderBy: { type: 'alphabetical' },
           orderDirection: 'asc',
@@ -139,6 +141,8 @@ describe('convertToDateHistogramColumn', () => {
           size: 5,
           include: [],
           exclude: [],
+          includeIsRegex: false,
+          excludeIsRegex: false,
           parentFormat: { id: 'terms' },
           orderBy: { type: 'column', columnId: metricColumns[0].columnId },
           orderAgg: metricColumns[0],
@@ -228,6 +232,8 @@ describe('convertToDateHistogramColumn', () => {
           size: 5,
           include: [],
           exclude: [],
+          includeIsRegex: false,
+          excludeIsRegex: false,
           parentFormat: { id: 'terms' },
           orderBy: { type: 'custom' },
           orderAgg: metricColumns[0],

diff --git a/src/plugins/visualizations/common/convert_to_lens/lib/convert/terms.ts b/src/plugins/visualizations/common/convert_to_lens/lib/convert/terms.ts
@@ -72,7 +72,7 @@ const getOrderByWithAgg = ({
 
 const filterOutEmptyValues = (values: string | Array<number | string>): number[] | string[] => {
   if (typeof values === 'string') {
-    return Boolean(values) ? [] : [values];
+    return Boolean(values) ? [values] : [];
   }
 
   return values.filter((v): v is string | number => {
@@ -99,12 +99,14 @@ export const convertToTermsParams = ({
     return null;
   }
 
+  const exclude = agg.aggParams.exclude ? filterOutEmptyValues(agg.aggParams.exclude) : [];
+  const include = agg.aggParams.include ? filterOutEmptyValues(agg.aggParams.include) : [];
   return {
     size: agg.aggParams.size ?? 10,
-    include: agg.aggParams.include ? filterOutEmptyValues(agg.aggParams.include) : [],
-    includeIsRegex: agg.aggParams.includeIsRegex,
-    exclude: agg.aggParams.exclude ? filterOutEmptyValues(agg.aggParams.exclude) : [],
-    excludeIsRegex: agg.aggParams.excludeIsRegex,
+    include,
+    exclude,
+    includeIsRegex: Boolean(include.length && agg.aggParams.includeIsRegex),
+    excludeIsRegex: Boolean(exclude.length && agg.aggParams.excludeIsRegex),
     otherBucket: agg.aggParams.otherBucket,
     orderDirection: agg.aggParams.order?.value ?? 'desc',
     parentFormat: { id: 'terms' },