fix agg filter

elastic · Dec 2, 2021 · 6750cae · 6750cae
1 parent 489baa8
commit 6750cae
Show file tree

Hide file tree

Showing 12 changed files with 272 additions and 34 deletions.
diff --git a/src/plugins/vis_types/heatmap/public/vis_type/heatmap.tsx b/src/plugins/vis_types/heatmap/public/vis_type/heatmap.tsx
@@ -98,15 +98,29 @@ export const getHeatmapVisTypeDefinition = ({
         }),
         min: 0,
         max: 1,
-        aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!sampler', '!multi_terms'],
+        aggFilter: [
+          '!geohash_grid',
+          '!geotile_grid',
+          '!filter',
+          '!sampler',
+          '!diversified_sampler',
+          '!multi_terms',
+        ],
       },
       {
         group: AggGroupNames.Buckets,
         name: 'group',
         title: i18n.translate('visTypeHeatmap.heatmap.groupTitle', { defaultMessage: 'Y-axis' }),
         min: 0,
         max: 1,
-        aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!sampler', '!multi_terms'],
+        aggFilter: [
+          '!geohash_grid',
+          '!geotile_grid',
+          '!filter',
+          '!sampler',
+          '!diversified_sampler',
+          '!multi_terms',
+        ],
       },
       {
         group: AggGroupNames.Buckets,
@@ -121,7 +135,14 @@ export const getHeatmapVisTypeDefinition = ({
         }),
         min: 0,
         max: 1,
-        aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!sampler', '!multi_terms'],
+        aggFilter: [
+          '!geohash_grid',
+          '!geotile_grid',
+          '!filter',
+          '!sampler',
+          '!diversified_sampler',
+          '!multi_terms',
+        ],
       },
     ],
   },

diff --git a/src/plugins/vis_types/metric/public/metric_vis_type.ts b/src/plugins/vis_types/metric/public/metric_vis_type.ts
@@ -86,7 +86,14 @@ export const createMetricVisTypeDefinition = (): VisTypeDefinition<VisParams> =>
         }),
         min: 0,
         max: 1,
-        aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!sampler', '!multi_terms'],
+        aggFilter: [
+          '!geohash_grid',
+          '!geotile_grid',
+          '!filter',
+          '!sampler',
+          '!diversified_sampler',
+          '!multi_terms',
+        ],
       },
     ],
   },

diff --git a/src/plugins/vis_types/pie/public/sample_vis.test.mocks.ts b/src/plugins/vis_types/pie/public/sample_vis.test.mocks.ts
@@ -87,7 +87,14 @@ export const samplePieVis = {
             title: 'Split slices',
             min: 0,
             max: null,
-            aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!sampler', '!multi_terms'],
+            aggFilter: [
+              '!geohash_grid',
+              '!geotile_grid',
+              '!filter',
+              '!sampler',
+              '!diversified_sampler',
+              '!multi_terms',
+            ],
             editor: false,
             params: [],
           },
@@ -98,7 +105,14 @@ export const samplePieVis = {
             mustBeFirst: true,
             min: 0,
             max: 1,
-            aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!sampler', '!multi_terms'],
+            aggFilter: [
+              '!geohash_grid',
+              '!geotile_grid',
+              '!filter',
+              '!sampler',
+              '!diversified_sampler',
+              '!multi_terms',
+            ],
             params: [
               {
                 name: 'row',

diff --git a/src/plugins/vis_types/pie/public/vis_type/pie.ts b/src/plugins/vis_types/pie/public/vis_type/pie.ts
@@ -80,7 +80,14 @@ export const getPieVisTypeDefinition = ({
         }),
         min: 0,
         max: Infinity,
-        aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!sampler', '!multi_terms'],
+        aggFilter: [
+          '!geohash_grid',
+          '!geotile_grid',
+          '!filter',
+          '!sampler',
+          '!diversified_sampler',
+          '!multi_terms',
+        ],
       },
       {
         group: AggGroupNames.Buckets,
@@ -91,7 +98,14 @@ export const getPieVisTypeDefinition = ({
         mustBeFirst: true,
         min: 0,
         max: 1,
-        aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!sampler', '!multi_terms'],
+        aggFilter: [
+          '!geohash_grid',
+          '!geotile_grid',
+          '!filter',
+          '!sampler',
+          '!diversified_sampler',
+          '!multi_terms',
+        ],
       },
     ],
   },

diff --git a/src/plugins/vis_types/vislib/public/gauge.ts b/src/plugins/vis_types/vislib/public/gauge.ts
@@ -132,7 +132,14 @@ export const gaugeVisTypeDefinition: VisTypeDefinition<GaugeVisParams> = {
         }),
         min: 0,
         max: 1,
-        aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!sampler', '!multi_terms'],
+        aggFilter: [
+          '!geohash_grid',
+          '!geotile_grid',
+          '!filter',
+          '!sampler',
+          '!diversified_sampler',
+          '!multi_terms',
+        ],
       },
     ],
   },

diff --git a/src/plugins/vis_types/vislib/public/goal.ts b/src/plugins/vis_types/vislib/public/goal.ts
@@ -96,7 +96,14 @@ export const goalVisTypeDefinition: VisTypeDefinition<GaugeVisParams> = {
         }),
         min: 0,
         max: 1,
-        aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!sampler', '!multi_terms'],
+        aggFilter: [
+          '!geohash_grid',
+          '!geotile_grid',
+          '!filter',
+          '!sampler',
+          '!diversified_sampler',
+          '!multi_terms',
+        ],
       },
     ],
   },

diff --git a/src/plugins/vis_types/xy/public/editor/components/options/point_series/point_series.mocks.ts b/src/plugins/vis_types/xy/public/editor/components/options/point_series/point_series.mocks.ts
@@ -625,7 +625,14 @@ export const getVis = (bucketType: string) => {
             title: 'X-axis',
             min: 0,
             max: 1,
-            aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!sampler', '!multi_terms'],
+            aggFilter: [
+              '!geohash_grid',
+              '!geotile_grid',
+              '!filter',
+              '!sampler',
+              '!diversified_sampler',
+              '!multi_terms',
+            ],
             params: [],
           },
           {
@@ -634,7 +641,14 @@ export const getVis = (bucketType: string) => {
             title: 'Split series',
             min: 0,
             max: 3,
-            aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!sampler', '!multi_terms'],
+            aggFilter: [
+              '!geohash_grid',
+              '!geotile_grid',
+              '!filter',
+              '!sampler',
+              '!diversified_sampler',
+              '!multi_terms',
+            ],
             params: [],
           },
           {
@@ -643,7 +657,14 @@ export const getVis = (bucketType: string) => {
             title: 'Split chart',
             min: 0,
             max: 1,
-            aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!sampler', '!multi_terms'],
+            aggFilter: [
+              '!geohash_grid',
+              '!geotile_grid',
+              '!filter',
+              '!sampler',
+              '!diversified_sampler',
+              '!multi_terms',
+            ],
             params: [
               {
                 name: 'row',
@@ -688,7 +709,14 @@ export const getVis = (bucketType: string) => {
             title: 'X-axis',
             min: 0,
             max: 1,
-            aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!sampler', '!multi_terms'],
+            aggFilter: [
+              '!geohash_grid',
+              '!geotile_grid',
+              '!filter',
+              '!sampler',
+              '!diversified_sampler',
+              '!multi_terms',
+            ],
             params: [],
           },
           {
@@ -697,7 +725,14 @@ export const getVis = (bucketType: string) => {
             title: 'Split series',
             min: 0,
             max: 3,
-            aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!sampler', '!multi_terms'],
+            aggFilter: [
+              '!geohash_grid',
+              '!geotile_grid',
+              '!filter',
+              '!sampler',
+              '!diversified_sampler',
+              '!multi_terms',
+            ],
             params: [],
           },
           {
@@ -706,7 +741,14 @@ export const getVis = (bucketType: string) => {
             title: 'Split chart',
             min: 0,
             max: 1,
-            aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!sampler', '!multi_terms'],
+            aggFilter: [
+              '!geohash_grid',
+              '!geotile_grid',
+              '!filter',
+              '!sampler',
+              '!diversified_sampler',
+              '!multi_terms',
+            ],
             params: [
               {
                 name: 'row',
@@ -722,7 +764,14 @@ export const getVis = (bucketType: string) => {
             title: 'X-axis',
             min: 0,
             max: 1,
-            aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!sampler', '!multi_terms'],
+            aggFilter: [
+              '!geohash_grid',
+              '!geotile_grid',
+              '!filter',
+              '!sampler',
+              '!diversified_sampler',
+              '!multi_terms',
+            ],
             params: [],
           },
           {
@@ -731,7 +780,14 @@ export const getVis = (bucketType: string) => {
             title: 'Split series',
             min: 0,
             max: 3,
-            aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!sampler', '!multi_terms'],
+            aggFilter: [
+              '!geohash_grid',
+              '!geotile_grid',
+              '!filter',
+              '!sampler',
+              '!diversified_sampler',
+              '!multi_terms',
+            ],
             params: [],
           },
           {
@@ -740,7 +796,14 @@ export const getVis = (bucketType: string) => {
             title: 'Split chart',
             min: 0,
             max: 1,
-            aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!sampler', '!multi_terms'],
+            aggFilter: [
+              '!geohash_grid',
+              '!geotile_grid',
+              '!filter',
+              '!sampler',
+              '!diversified_sampler',
+              '!multi_terms',
+            ],
             params: [
               {
                 name: 'row',

diff --git a/src/plugins/vis_types/xy/public/sample_vis.test.mocks.ts b/src/plugins/vis_types/xy/public/sample_vis.test.mocks.ts
@@ -149,7 +149,14 @@ export const sampleAreaVis = {
             title: 'X-axis',
             min: 0,
             max: 1,
-            aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!sampler', '!multi_terms'],
+            aggFilter: [
+              '!geohash_grid',
+              '!geotile_grid',
+              '!filter',
+              '!sampler',
+              '!diversified_sampler',
+              '!multi_terms',
+            ],
             editor: false,
             params: [],
           },
@@ -159,7 +166,14 @@ export const sampleAreaVis = {
             title: 'Split series',
             min: 0,
             max: 3,
-            aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!sampler', '!multi_terms'],
+            aggFilter: [
+              '!geohash_grid',
+              '!geotile_grid',
+              '!filter',
+              '!sampler',
+              '!diversified_sampler',
+              '!multi_terms',
+            ],
             editor: false,
             params: [],
           },
@@ -169,7 +183,14 @@ export const sampleAreaVis = {
             title: 'Split chart',
             min: 0,
             max: 1,
-            aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!sampler', '!multi_terms'],
+            aggFilter: [
+              '!geohash_grid',
+              '!geotile_grid',
+              '!filter',
+              '!sampler',
+              '!diversified_sampler',
+              '!multi_terms',
+            ],
             params: [
               {
                 name: 'row',

diff --git a/src/plugins/vis_types/xy/public/vis_types/area.ts b/src/plugins/vis_types/xy/public/vis_types/area.ts
@@ -157,7 +157,14 @@ export const areaVisTypeDefinition = {
         }),
         min: 0,
         max: 1,
-        aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!sampler', '!multi_terms'],
+        aggFilter: [
+          '!geohash_grid',
+          '!geotile_grid',
+          '!filter',
+          '!sampler',
+          '!diversified_sampler',
+          '!multi_terms',
+        ],
       },
       {
         group: AggGroupNames.Buckets,
@@ -167,7 +174,14 @@ export const areaVisTypeDefinition = {
         }),
         min: 0,
         max: 3,
-        aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!sampler', '!multi_terms'],
+        aggFilter: [
+          '!geohash_grid',
+          '!geotile_grid',
+          '!filter',
+          '!sampler',
+          '!diversified_sampler',
+          '!multi_terms',
+        ],
       },
       {
         group: AggGroupNames.Buckets,
@@ -177,7 +191,14 @@ export const areaVisTypeDefinition = {
         }),
         min: 0,
         max: 1,
-        aggFilter: ['!geohash_grid', '!geotile_grid', '!filter', '!sampler', '!multi_terms'],
+        aggFilter: [
+          '!geohash_grid',
+          '!geotile_grid',
+          '!filter',
+          '!sampler',
+          '!diversified_sampler',
+          '!multi_terms',
+        ],
       },
     ],
   },