From 169c4c156c9bceaa66559bfcaa1cff2aae1ebc8c Mon Sep 17 00:00:00 2001 From: Walter Rafelsberger Date: Mon, 14 Dec 2020 13:39:09 +0100 Subject: [PATCH] [ML] Fix types. --- x-pack/plugins/transform/common/types/pivot_group_by.ts | 3 +++ .../plugins/transform/public/app/common/pivot_group_by.ts | 8 ++++++-- x-pack/plugins/transform/public/app/common/request.ts | 5 ++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/x-pack/plugins/transform/common/types/pivot_group_by.ts b/x-pack/plugins/transform/common/types/pivot_group_by.ts index bfaf17a32b58..3d1a833b1b56 100644 --- a/x-pack/plugins/transform/common/types/pivot_group_by.ts +++ b/x-pack/plugins/transform/common/types/pivot_group_by.ts @@ -12,6 +12,7 @@ export type GenericAgg = object; export interface TermsAgg { terms: { field: EsFieldName; + missing_bucket?: boolean; }; } @@ -19,6 +20,7 @@ export interface HistogramAgg { histogram: { field: EsFieldName; interval: string; + missing_bucket?: boolean; }; } @@ -26,6 +28,7 @@ export interface DateHistogramAgg { date_histogram: { field: EsFieldName; calendar_interval: string; + missing_bucket?: boolean; }; } diff --git a/x-pack/plugins/transform/public/app/common/pivot_group_by.ts b/x-pack/plugins/transform/public/app/common/pivot_group_by.ts index a8c8943d1e6d..281aee080516 100644 --- a/x-pack/plugins/transform/public/app/common/pivot_group_by.ts +++ b/x-pack/plugins/transform/public/app/common/pivot_group_by.ts @@ -41,8 +41,6 @@ interface GroupByConfigBase { agg: PIVOT_SUPPORTED_GROUP_BY_AGGS; aggName: AggName; dropDownName: string; - field: EsFieldName; - missing_bucket?: boolean; } // Don't allow an interval of '0', but allow a float interval of '0.1' with a leading zero. @@ -52,16 +50,22 @@ export const dateHistogramIntervalFormatRegex = /^[1-9][0-9]*(ms|s|m|h|d|w|M|q|y interface GroupByDateHistogram extends GroupByConfigBase { agg: PIVOT_SUPPORTED_GROUP_BY_AGGS.DATE_HISTOGRAM; + field: EsFieldName; calendar_interval: string; + missing_bucket?: boolean; } interface GroupByHistogram extends GroupByConfigBase { agg: PIVOT_SUPPORTED_GROUP_BY_AGGS.HISTOGRAM; + field: EsFieldName; interval: string; + missing_bucket?: boolean; } interface GroupByTerms extends GroupByConfigBase { agg: PIVOT_SUPPORTED_GROUP_BY_AGGS.TERMS; + field: EsFieldName; + missing_bucket?: boolean; } export type GroupByConfigWithInterval = GroupByDateHistogram | GroupByHistogram; diff --git a/x-pack/plugins/transform/public/app/common/request.ts b/x-pack/plugins/transform/public/app/common/request.ts index f28b022a9e2d..d92a4ee25875 100644 --- a/x-pack/plugins/transform/public/app/common/request.ts +++ b/x-pack/plugins/transform/public/app/common/request.ts @@ -30,6 +30,7 @@ import { isGroupByDateHistogram, isGroupByHistogram, isGroupByTerms, + GroupByConfigWithUiSupport, PivotGroupByConfig, } from '../common'; @@ -71,7 +72,9 @@ export function isDefaultQuery(query: PivotQuery): boolean { return isSimpleQuery(query) && query.query_string.query === '*'; } -export const getMissingBucketConfig = (g: PivotGroupByConfig): { missing_bucket?: boolean } => { +export const getMissingBucketConfig = ( + g: GroupByConfigWithUiSupport +): { missing_bucket?: boolean } => { return g.missing_bucket !== undefined ? { missing_bucket: g.missing_bucket } : {}; };