fixing custom vis types buildPipeline (#39874) (#40136)

elastic · Jul 2, 2019 · 4443308 · 4443308
1 parent 137252b
commit 4443308
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 5 deletions.
diff --git a/src/legacy/core_plugins/interpreter/public/functions/visualization.js b/src/legacy/core_plugins/interpreter/public/functions/visualization.js
@@ -116,17 +116,21 @@ export const visualization = () => ({
       if (context.columns) {
         // assign schemas to aggConfigs
         context.columns.forEach(column => {
-          column.aggConfig.aggConfigs.schemas = visType.schemas.all;
+          if (column.aggConfig) {
+            column.aggConfig.aggConfigs.schemas = visType.schemas.all;
+          }
         });
 
         Object.keys(schemas).forEach(key => {
           schemas[key].forEach(i => {
-            context.columns[i].aggConfig.schema = key;
+            if (context.columns[i] && context.columns[i].aggConfig) {
+              context.columns[i].aggConfig.schema = key;
+            }
           });
         });
       }
 
-      context = await responseHandler(context);
+      context = await responseHandler(context, visConfigParams.dimensions);
     }
 
     return {

diff --git a/...acy/ui/public/visualize/loader/pipeline_helpers/__snapshots__/build_pipeline.test.js.snap b/...acy/ui/public/visualize/loader/pipeline_helpers/__snapshots__/build_pipeline.test.js.snap
diff --git a/src/legacy/ui/public/visualize/loader/pipeline_helpers/build_pipeline.test.js b/src/legacy/ui/public/visualize/loader/pipeline_helpers/build_pipeline.test.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { prepareJson, prepareString, buildPipelineVisFunction } from './build_pipeline';
+import { prepareJson, prepareString, buildPipelineVisFunction, buildPipeline } from './build_pipeline';
 
 jest.mock('ui/agg_types/buckets/date_histogram', () => ({}));
 
@@ -224,4 +224,25 @@ describe('visualize loader pipeline helpers: build pipeline', () => {
       expect(actual).toMatchSnapshot();
     });
   });
+
+  describe('buildPipeline', () => {
+    it('calls toExpression on vis_type if it exists', async () => {
+      const vis = {
+        getCurrentState: () => {},
+        getUiState: () => null,
+        isHierarchical: () => false,
+        aggs: {
+          getResponseAggs: () => [],
+        },
+        type: {
+          toExpression: () => 'testing custom expressions',
+        }
+      };
+      const searchSource = {
+        getField: () => null,
+      };
+      const expression = await buildPipeline(vis, { searchSource });
+      expect(expression).toMatchSnapshot();
+    });
+  });
 });
diff --git a/src/legacy/ui/public/visualize/loader/pipeline_helpers/build_pipeline.ts b/src/legacy/ui/public/visualize/loader/pipeline_helpers/build_pipeline.ts
@@ -464,9 +464,13 @@ export const buildPipeline = async (
     visConfig.dimensions = await buildVislibDimensions(vis, params);
 
     pipeline += `vislib ${prepareJson('visConfig', visState.params)}`;
+  } else if (vis.type.toExpression) {
+    pipeline += await vis.type.toExpression(vis, params);
   } else {
+    const visConfig = visState.params;
+    visConfig.dimensions = schemas;
     pipeline += `visualization type='${vis.type.name}'
-    ${prepareJson('visConfig', visState.params)}
+    ${prepareJson('visConfig', visConfig)}
     metricsAtAllLevels=${vis.isHierarchical()}
     partialRows=${vis.type.requiresPartialRows || vis.params.showPartialRows || false} `;
     if (indexPattern) {