fixes

elastic · Mar 3, 2020 · a255bb3 · a255bb3
1 parent 34aa486
commit a255bb3
Show file tree

Hide file tree

Showing 16 changed files with 52 additions and 74 deletions.
diff --git a/src/legacy/core_plugins/data/public/search/aggs/agg_configs.ts b/src/legacy/core_plugins/data/public/search/aggs/agg_configs.ts
@@ -236,15 +236,15 @@ export class AggConfigs {
   }
 
   byName(name: string) {
-    return this.aggs.filter(agg => agg.type.name === name);
+    return this.aggs.filter(agg => agg.type && agg.type.name === name);
   }
 
   byType(type: string) {
-    return this.aggs.filter(agg => agg.type.type === type);
+    return this.aggs.filter(agg => agg.type && agg.type.type === type);
   }
 
   byTypeName(type: string) {
-    return this.aggs.filter(agg => agg.type.name === type);
+    return this.byName(type);
   }
 
   bySchemaName(schema: string) {

diff --git a/src/legacy/core_plugins/data/public/search/aggs/metrics/top_hit.ts b/src/legacy/core_plugins/data/public/search/aggs/metrics/top_hit.ts
@@ -63,10 +63,7 @@ export const topHitMetricAgg = new MetricAggType({
       name: 'field',
       type: 'field',
       onlyAggregatable: false,
-      filterFieldTypes: (aggConfig: IMetricAggConfig) =>
-        _.get(aggConfig.schema, 'aggSettings.top_hits.allowStrings', false)
-          ? '*'
-          : KBN_FIELD_TYPES.NUMBER,
+      filterFieldTypes: '*',
       write(agg, output) {
         const field = agg.getParam('field');
         output.params = {};
@@ -133,7 +130,7 @@ export const topHitMetricAgg = new MetricAggType({
             defaultMessage: 'Concatenate',
           }),
           isCompatible(aggConfig: IMetricAggConfig) {
-            return _.get(aggConfig.schema, 'aggSettings.top_hits.allowStrings', false);
+            return _.get(aggConfig.params, 'field.filterFieldTypes', '*') === '*';
           },
           disabled: true,
           value: 'concat',

diff --git a/src/legacy/core_plugins/data/public/search/aggs/param_types/agg.ts b/src/legacy/core_plugins/data/public/search/aggs/param_types/agg.ts
@@ -29,6 +29,10 @@ export class AggParamType<TAggConfig extends IAggConfig = IAggConfig> extends Ba
   constructor(config: Record<string, any>) {
     super(config);
 
+    if (config.allowedAggs) {
+      this.allowedAggs = config.allowedAggs;
+    }
+
     if (!config.write) {
       this.write = (aggConfig: TAggConfig, output: Record<string, any>) => {
         if (aggConfig.params[this.name] && aggConfig.params[this.name].length) {

diff --git a/src/legacy/core_plugins/data/public/search/aggs/param_types/field.test.ts b/src/legacy/core_plugins/data/public/search/aggs/param_types/field.test.ts
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import { get } from 'lodash';
 import { BaseParamType } from './base';
 import { FieldParamType } from './field';
 import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '../../../../../../../plugins/data/public';
@@ -109,10 +108,7 @@ describe('Field', () => {
       const aggParam = new FieldParamType({
         name: 'field',
         type: 'field',
-        filterFieldTypes: (aggConfig: IMetricAggConfig) =>
-          get(aggConfig.schema, 'aggSettings.top_hits.allowStrings', false)
-            ? '*'
-            : KBN_FIELD_TYPES.NUMBER,
+        filterFieldTypes: '*',
       });
       const fields = aggParam.getAvailableFields(agg);
 

diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/agg_params.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/agg_params.tsx
@@ -59,6 +59,7 @@ export interface DefaultEditorAggParamsProps extends DefaultEditorCommonProps {
   setValidity: (isValid: boolean) => void;
   setTouched: (isTouched: boolean) => void;
   schemas: Schema[];
+  allowedAggs?: string[];
 }
 
 function DefaultEditorAggParams({
@@ -78,12 +79,12 @@ function DefaultEditorAggParams({
   setTouched,
   setValidity,
   schemas,
+  allowedAggs,
 }: DefaultEditorAggParamsProps) {
-  const groupedAggTypeOptions = useMemo(() => getAggTypeOptions(agg, indexPattern, groupName), [
-    agg,
-    indexPattern,
-    groupName,
-  ]);
+  const groupedAggTypeOptions = useMemo(
+    () => getAggTypeOptions(agg, indexPattern, groupName, allowedAggs || []),
+    [agg, indexPattern, groupName, allowedAggs]
+  );
   const { title } = getSchemaByName(schemas, agg.schema);
   const error = aggIsTooLow
     ? i18n.translate('visDefaultEditor.aggParams.errors.aggWrongRunOrderErrorMessage', {

diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/agg_params_helper.test.ts b/src/legacy/core_plugins/vis_default_editor/public/components/agg_params_helper.test.ts
@@ -172,7 +172,7 @@ describe('DefaultEditorAggParams helpers', () => {
   describe('getAggTypeOptions', () => {
     it('should return agg type options grouped by subtype', () => {
       const indexPattern = {} as IndexPattern;
-      const aggs = getAggTypeOptions({} as IAggConfig, indexPattern, 'metrics');
+      const aggs = getAggTypeOptions({} as IAggConfig, indexPattern, 'metrics', []);
 
       expect(aggs).toEqual(['indexedFields']);
     });

diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/agg_params_helper.ts b/src/legacy/core_plugins/vis_default_editor/public/components/agg_params_helper.ts
@@ -33,6 +33,7 @@ import {
   AggParam,
   IFieldParamType,
   IAggType,
+  propFilter,
 } from '../legacy_imports';
 import { EditorConfig } from './utils';
 import { Schema, getSchemaByName } from '../schemas';
@@ -82,9 +83,15 @@ function getAggParamsToRender({
     }
     // if field param exists, compute allowed fields
     if (param.type === 'field') {
-      const availableFields: IndexPatternField[] = (param as IFieldParamType).getAvailableFields(
-        agg
-      );
+      let availableFields: IndexPatternField[] = (param as IFieldParamType).getAvailableFields(agg);
+      // should be refactored in the future to provide a more general way
+      // for visualization to override some agg config settings
+      if (agg.type.name === 'top_hits') {
+        const allowStrings = _.get(schema, `aggSettings[${agg.type.name}].allowStrings`, false);
+        if (!allowStrings) {
+          availableFields = availableFields.filter(field => field.type === 'number');
+        }
+      }
       fields = aggTypeFieldFilters.filter(availableFields, agg);
       indexedFields = groupAndSortBy(fields, 'type', 'name');
 
@@ -126,12 +133,19 @@ function getAggParamsToRender({
   return params;
 }
 
+const filterByName = propFilter('name');
+
 function getAggTypeOptions(
   agg: IAggConfig,
   indexPattern: IndexPattern,
-  groupName: string
+  groupName: string,
+  allowedAggs: string[]
 ): ComboBoxGroupedOptions<IAggType> {
-  const aggTypeOptions = aggTypeFilters.filter((aggTypes as any)[groupName], indexPattern, agg);
+  const aggTypeOptions = aggTypeFilters
+    .filter((aggTypes as any)[groupName], indexPattern, agg)
+    .filter(aggType => {
+      return filterByName([aggType], allowedAggs).length !== 0;
+    });
   return groupAndSortBy(aggTypeOptions as any[], 'subtype', 'title');
 }
 

diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/order_agg.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/controls/order_agg.tsx
@@ -65,6 +65,7 @@ function OrderAggParamEditor({
       <EuiSpacer size="m" />
       <DefaultEditorAggParams
         agg={value as IAggConfig}
+        allowedAggs={aggParam.allowedAggs}
         groupName={AggGroupNames.Metrics}
         className="visEditorAgg__subAgg"
         formIsTouched={formIsTouched}

diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/sub_agg.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/controls/sub_agg.tsx
@@ -62,6 +62,7 @@ function SubAggParamEditor({
       <EuiSpacer size="m" />
       <DefaultEditorAggParams
         agg={agg.params.customMetric}
+        allowedAggs={aggParam.allowedAggs}
         groupName={AggGroupNames.Metrics}
         className="visEditorAgg__subAgg"
         formIsTouched={formIsTouched}

diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/controls/sub_metric.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/controls/sub_metric.tsx
@@ -74,6 +74,7 @@ function SubMetricParamEditor({
       <EuiSpacer size="s" />
       <DefaultEditorAggParams
         agg={agg.params[type]}
+        allowedAggs={aggParam.allowedAggs}
         groupName={aggGroup}
         className="visEditorAgg__subAgg"
         formIsTouched={formIsTouched}

diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/data_tab.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/data_tab.tsx
@@ -76,7 +76,7 @@ function DefaultEditorDataTab({
   const addSchema: AddSchema = useCallback(schema => dispatch(addNewAgg(schema)), [dispatch]);
 
   const onAggRemove: DefaultEditorAggCommonProps['removeAgg'] = useCallback(
-    aggId => dispatch(removeAgg(aggId, schemas.all)),
+    aggId => dispatch(removeAgg(aggId, schemas.all || [])),
     [dispatch, schemas]
   );
 

diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/sidebar.tsx b/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/sidebar.tsx
@@ -51,7 +51,7 @@ function DefaultEditorSideBar({
   const { formState, setTouched, setValidity, resetValidity } = useEditorFormState();
 
   const responseAggs = useMemo(() => state.aggs.getResponseAggs(), [state.aggs]);
-  const metricSchemas = getSchemasByGroup(vis.type.schemas.all, AggGroupNames.Metrics).map(
+  const metricSchemas = getSchemasByGroup(vis.type.schemas.all || [], AggGroupNames.Metrics).map(
     s => s.name
   );
   const metricAggs = useMemo(

diff --git a/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/state/reducers.ts b/src/legacy/core_plugins/vis_default_editor/public/components/sidebar/state/reducers.ts
@@ -33,9 +33,10 @@ function editorStateReducer(state: VisState, action: EditorAction): VisState {
   switch (action.type) {
     case EditorStateActionTypes.ADD_NEW_AGG: {
       const { schema } = action.payload;
-      const defaultConfig = schema.defaults
-        ? (schema as any).defaults.slice(0, schema.max)
-        : { schema: schema.name };
+      const defaultConfig =
+        !state.aggs.aggs.find(agg => agg.schema === schema.name) && schema.defaults
+          ? (schema as any).defaults.slice(0, schema.max)
+          : { schema: schema.name };
       const aggConfig = state.aggs.createAggConfig(defaultConfig, {
         addToAggConfigs: false,
       });

diff --git a/src/legacy/core_plugins/vis_default_editor/public/default_editor.tsx b/src/legacy/core_plugins/vis_default_editor/public/default_editor.tsx
@@ -26,7 +26,6 @@ import {
 } from '../../visualizations/public/';
 import { PanelsContainer, Panel } from '../../../../plugins/kibana_react/public';
 
-import './vis_type_agg_filter';
 import { DefaultEditorSideBar } from './components/sidebar';
 import { DefaultEditorControllerState } from './default_editor_controller';
 import { getInitialWidth } from './editor_size';

diff --git a/src/legacy/core_plugins/vis_default_editor/public/vis_type_agg_filter.ts b/src/legacy/core_plugins/vis_default_editor/public/vis_type_agg_filter.ts
diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/vis_impl.js b/src/legacy/core_plugins/visualizations/public/np_ready/public/vis_impl.js
@@ -69,15 +69,12 @@ class VisImpl extends EventEmitter {
     // but whatever). Also if a schema.name is already set then don't
     // set anything.
     const newConfigs = [...configStates];
-    _(schemas)
-      .filter(schema => {
-        return Array.isArray(schema.defaults) && schema.defaults.length > 0;
-      })
-      .each(schema => {
-        if (!configStates.find(agg => agg.schema && agg.schema === schema.name)) {
-          const defaults = schema.defaults.slice(0, schema.max);
-          defaults.forEach(d => newConfigs.push(d));
-        }
+    schemas
+      .filter(schema => Array.isArray(schema.defaults) && schema.defaults.length > 0)
+      .filter(schema => !configStates.find(agg => agg.schema && agg.schema === schema.name))
+      .forEach(schema => {
+        const defaults = schema.defaults.slice(0, schema.max);
+        defaults.forEach(d => newConfigs.push(d));
       });
     return newConfigs;
   }
@@ -104,7 +101,7 @@ class VisImpl extends EventEmitter {
 
     if (state.aggs || !this.aggs) {
       let configStates = state.aggs ? state.aggs.aggs || state.aggs : [];
-      configStates = this.initializeDefaultsFromSchemas(configStates, this.type.schemas.all);
+      configStates = this.initializeDefaultsFromSchemas(configStates, this.type.schemas.all || []);
       this.aggs = createAggConfigs(this.indexPattern, configStates);
     }
   }