[TSVB] [Regression] Fix Top Hit / Filter Ratio aggregations (#96288)

Co-authored-by: Kibana Machine <[email protected]>
elastic · Apr 7, 2021 · 2efea06 · 2efea06
1 parent 1327bfe
commit 2efea06
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 13 deletions.
diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/calculation.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/calculation.js
@@ -131,7 +131,7 @@ export function CalculationAgg(props) {
 CalculationAgg.propTypes = {
   disableDelete: PropTypes.bool,
   fields: PropTypes.object,
-  indexPattern: PropTypes.string,
+  indexPattern: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
   model: PropTypes.object,
   onAdd: PropTypes.func,
   onChange: PropTypes.func,

diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/cumulative_sum.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/cumulative_sum.js
@@ -84,7 +84,7 @@ export function CumulativeSumAgg(props) {
 CumulativeSumAgg.propTypes = {
   disableDelete: PropTypes.bool,
   fields: PropTypes.object,
-  indexPattern: PropTypes.string,
+  indexPattern: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
   model: PropTypes.object,
   onAdd: PropTypes.func,
   onChange: PropTypes.func,

diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/derivative.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/derivative.js
@@ -110,7 +110,7 @@ export const DerivativeAgg = (props) => {
 DerivativeAgg.propTypes = {
   disableDelete: PropTypes.bool,
   fields: PropTypes.object,
-  indexPattern: PropTypes.string,
+  indexPattern: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
   model: PropTypes.object,
   onAdd: PropTypes.func,
   onChange: PropTypes.func,

diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/filter_ratio.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/filter_ratio.js
@@ -13,6 +13,7 @@ import { FieldSelect } from './field_select';
 import { AggRow } from './agg_row';
 import { createChangeHandler } from '../lib/create_change_handler';
 import { createSelectHandler } from '../lib/create_select_handler';
+import { getIndexPatternKey } from '../../../../common/index_patterns_utils';
 
 import {
   htmlIdGenerator,
@@ -29,7 +30,7 @@ import { getDataStart } from '../../../services';
 import { QueryBarWrapper } from '../query_bar_wrapper';
 
 const isFieldHistogram = (fields, indexPattern, field) => {
-  const indexFields = fields[indexPattern];
+  const indexFields = fields[getIndexPatternKey(indexPattern)];
   if (!indexFields) return false;
   const fieldObject = indexFields.find((f) => f.name === field);
   if (!fieldObject) return false;

diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/math.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/math.js
@@ -150,7 +150,7 @@ export function MathAgg(props) {
 MathAgg.propTypes = {
   disableDelete: PropTypes.bool,
   fields: PropTypes.object,
-  indexPattern: PropTypes.string,
+  indexPattern: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
   model: PropTypes.object,
   onAdd: PropTypes.func,
   onChange: PropTypes.func,

diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/moving_average.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/moving_average.js
@@ -305,7 +305,7 @@ export const MovingAverageAgg = (props) => {
 MovingAverageAgg.propTypes = {
   disableDelete: PropTypes.bool,
   fields: PropTypes.object,
-  indexPattern: PropTypes.string,
+  indexPattern: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
   model: PropTypes.object,
   onAdd: PropTypes.func,
   onChange: PropTypes.func,

diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/positive_only.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/positive_only.js
@@ -88,7 +88,7 @@ export const PositiveOnlyAgg = (props) => {
 PositiveOnlyAgg.propTypes = {
   disableDelete: PropTypes.bool,
   fields: PropTypes.object,
-  indexPattern: PropTypes.string,
+  indexPattern: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
   model: PropTypes.object,
   onAdd: PropTypes.func,
   onChange: PropTypes.func,

diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/serial_diff.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/serial_diff.js
@@ -115,7 +115,7 @@ export const SerialDiffAgg = (props) => {
 SerialDiffAgg.propTypes = {
   disableDelete: PropTypes.bool,
   fields: PropTypes.object,
-  indexPattern: PropTypes.string,
+  indexPattern: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
   model: PropTypes.object,
   onAdd: PropTypes.func,
   onChange: PropTypes.func,

diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/std_sibling.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/std_sibling.js
@@ -163,7 +163,7 @@ const StandardSiblingAggUi = (props) => {
 StandardSiblingAggUi.propTypes = {
   disableDelete: PropTypes.bool,
   fields: PropTypes.object,
-  indexPattern: PropTypes.string,
+  indexPattern: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
   model: PropTypes.object,
   onAdd: PropTypes.func,
   onChange: PropTypes.func,

diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/top_hit.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/top_hit.js
@@ -26,6 +26,7 @@ import {
 import { injectI18n, FormattedMessage } from '@kbn/i18n/react';
 import { KBN_FIELD_TYPES } from '../../../../../../plugins/data/public';
 import { PANEL_TYPES } from '../../../../common/panel_types';
+import { getIndexPatternKey } from '../../../../common/index_patterns_utils';
 
 const isFieldTypeEnabled = (fieldRestrictions, fieldType) =>
   fieldRestrictions.length ? fieldRestrictions.includes(fieldType) : true;
@@ -115,8 +116,8 @@ const TopHitAggUi = (props) => {
   const handleChange = createChangeHandler(props.onChange, model);
   const handleSelectChange = createSelectHandler(handleChange);
   const handleTextChange = createTextHandler(handleChange);
-
-  const field = fields[indexPattern].find((f) => f.name === model.field);
+  const fieldsSelector = getIndexPatternKey(indexPattern);
+  const field = fields[fieldsSelector].find((f) => f.name === model.field);
   const aggWithOptions = getAggWithOptions(field, aggWithOptionsRestrictFields);
   const orderOptions = getOrderOptions();
 

diff --git a/src/plugins/vis_type_timeseries/public/application/components/aggs/vars.js b/src/plugins/vis_type_timeseries/public/application/components/aggs/vars.js
@@ -96,7 +96,7 @@ CalculationVars.defaultProps = {
 
 CalculationVars.propTypes = {
   fields: PropTypes.object,
-  indexPattern: PropTypes.string,
+  indexPattern: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
   metrics: PropTypes.array,
   model: PropTypes.object,
   name: PropTypes.string,

diff --git a/src/plugins/vis_type_timeseries/public/application/components/splits/terms.js b/src/plugins/vis_type_timeseries/public/application/components/splits/terms.js
@@ -237,7 +237,7 @@ SplitByTermsUI.propTypes = {
   intl: PropTypes.object,
   model: PropTypes.object,
   onChange: PropTypes.func,
-  indexPattern: PropTypes.string,
+  indexPattern: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
   fields: PropTypes.object,
   uiRestrictions: PropTypes.object,
   seriesQuantity: PropTypes.object,