From 09d97e5d55533ea3fcb5af006c5f5b30711859e9 Mon Sep 17 00:00:00 2001
From: Luke Elmers <luke.elmers@elastic.co>
Date: Mon, 20 Apr 2020 22:45:19 -0600
Subject: [PATCH] Ensure serialize() is used by agg param type.

---
 .../aggs/metrics/lib/parent_pipeline_agg_helper.ts | 12 +++---------
 .../metrics/lib/sibling_pipeline_agg_helper.ts     | 14 ++++----------
 .../data/public/search/aggs/param_types/agg.ts     |  8 ++++----
 3 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/src/plugins/data/public/search/aggs/metrics/lib/parent_pipeline_agg_helper.ts b/src/plugins/data/public/search/aggs/metrics/lib/parent_pipeline_agg_helper.ts
index 3868d8f1bcd16ca..947394c97bdcd22 100644
--- a/src/plugins/data/public/search/aggs/metrics/lib/parent_pipeline_agg_helper.ts
+++ b/src/plugins/data/public/search/aggs/metrics/lib/parent_pipeline_agg_helper.ts
@@ -36,14 +36,14 @@ const metricAggFilter = [
   '!geo_centroid',
 ];
 
-const parentPipelineType = i18n.translate(
+export const parentPipelineType = i18n.translate(
   'data.search.aggs.metrics.parentPipelineAggregationsSubtypeTitle',
   {
     defaultMessage: 'Parent Pipeline Aggregations',
   }
 );
 
-const parentPipelineAggHelper = {
+export const parentPipelineAggHelper = {
   subtype: parentPipelineType,
   params() {
     return [
@@ -56,13 +56,9 @@ const parentPipelineAggHelper = {
         name: 'customMetric',
         type: 'agg',
         allowedAggs: metricAggFilter,
-        makeAgg(termsAgg, state: any) {
-          state = state || { type: 'count' };
-
+        makeAgg(termsAgg, state = { type: 'count' }) {
           const metricAgg = termsAgg.aggConfigs.createAggConfig(state, { addToAggConfigs: false });
-
           metricAgg.id = termsAgg.id + '-metric';
-
           return metricAgg;
         },
         modifyAggConfigOnSearchRequestStart: forwardModifyAggConfigOnSearchRequestStart(
@@ -89,5 +85,3 @@ const parentPipelineAggHelper = {
     return subAgg ? subAgg.type.getFormat(subAgg) : new (FieldFormat.from(identity))();
   },
 };
-
-export { parentPipelineAggHelper, parentPipelineType };
diff --git a/src/plugins/data/public/search/aggs/metrics/lib/sibling_pipeline_agg_helper.ts b/src/plugins/data/public/search/aggs/metrics/lib/sibling_pipeline_agg_helper.ts
index c1d05a39285b704..17a6b769118aa67 100644
--- a/src/plugins/data/public/search/aggs/metrics/lib/sibling_pipeline_agg_helper.ts
+++ b/src/plugins/data/public/search/aggs/metrics/lib/sibling_pipeline_agg_helper.ts
@@ -43,14 +43,14 @@ const metricAggFilter: string[] = [
 ];
 const bucketAggFilter: string[] = [];
 
-const siblingPipelineType = i18n.translate(
+export const siblingPipelineType = i18n.translate(
   'data.search.aggs.metrics.siblingPipelineAggregationsSubtypeTitle',
   {
     defaultMessage: 'Sibling pipeline aggregations',
   }
 );
 
-const siblingPipelineAggHelper = {
+export const siblingPipelineAggHelper = {
   subtype: siblingPipelineType,
   params() {
     return [
@@ -59,11 +59,9 @@ const siblingPipelineAggHelper = {
         type: 'agg',
         allowedAggs: bucketAggFilter,
         default: null,
-        makeAgg(agg: IMetricAggConfig, state: any) {
-          state = state || { type: 'date_histogram' };
+        makeAgg(agg: IMetricAggConfig, state = { type: 'date_histogram' }) {
           const orderAgg = agg.aggConfigs.createAggConfig(state, { addToAggConfigs: false });
           orderAgg.id = agg.id + '-bucket';
-
           return orderAgg;
         },
         modifyAggConfigOnSearchRequestStart: forwardModifyAggConfigOnSearchRequestStart(
@@ -76,11 +74,9 @@ const siblingPipelineAggHelper = {
         type: 'agg',
         allowedAggs: metricAggFilter,
         default: null,
-        makeAgg(agg: IMetricAggConfig, state: any) {
-          state = state || { type: 'count' };
+        makeAgg(agg: IMetricAggConfig, state: { type: 'count' }) {
           const orderAgg = agg.aggConfigs.createAggConfig(state, { addToAggConfigs: false });
           orderAgg.id = agg.id + '-metric';
-
           return orderAgg;
         },
         modifyAggConfigOnSearchRequestStart: forwardModifyAggConfigOnSearchRequestStart(
@@ -98,5 +94,3 @@ const siblingPipelineAggHelper = {
       : new (FieldFormat.from(identity))();
   },
 };
-
-export { siblingPipelineAggHelper, siblingPipelineType };
diff --git a/src/plugins/data/public/search/aggs/param_types/agg.ts b/src/plugins/data/public/search/aggs/param_types/agg.ts
index e5b53020c3159b1..d9a72e541257d52 100644
--- a/src/plugins/data/public/search/aggs/param_types/agg.ts
+++ b/src/plugins/data/public/search/aggs/param_types/agg.ts
@@ -17,13 +17,13 @@
  * under the License.
  */
 
-import { AggConfig, IAggConfig } from '../agg_config';
+import { AggConfig, IAggConfig, AggConfigSerialized } from '../agg_config';
 import { BaseParamType } from './base';
 
 export class AggParamType<TAggConfig extends IAggConfig = IAggConfig> extends BaseParamType<
   TAggConfig
 > {
-  makeAgg: (agg: TAggConfig, state?: any) => TAggConfig;
+  makeAgg: (agg: TAggConfig, state?: AggConfigSerialized) => TAggConfig;
   allowedAggs: string[] = [];
 
   constructor(config: Record<string, any>) {
@@ -42,11 +42,11 @@ export class AggParamType<TAggConfig extends IAggConfig = IAggConfig> extends Ba
     }
     if (!config.serialize) {
       this.serialize = (agg: TAggConfig) => {
-        return agg.toJSON();
+        return agg.serialize();
       };
     }
     if (!config.deserialize) {
-      this.deserialize = (state: unknown, agg?: TAggConfig): TAggConfig => {
+      this.deserialize = (state: AggConfigSerialized, agg?: TAggConfig): TAggConfig => {
         if (!agg) {
           throw new Error('aggConfig was not provided to AggParamType deserialize function');
         }