Merge branch 'master' of github.com:elastic/kibana into security/authc-telemetry

Author: legrego

src/core/server/saved_objects/migrations/core/index_migrator.test.ts

@@ -369,6 +369,30 @@ describe('IndexMigrator', () => {
       ],
     });
   });
+
+  test('rejects when the migration function throws an error', async () => {
+    const { client } = testOpts;
+    const migrateDoc = jest.fn((doc: SavedObjectUnsanitizedDoc) => {
+      throw new Error('error migrating document');
+    });
+
+    testOpts.documentMigrator = {
+      migrationVersion: { foo: '1.2.3' },
+      migrate: migrateDoc,
+    };
+
+    withIndex(client, {
+      numOutOfDate: 1,
+      docs: [
+        [{ _id: 'foo:1', _source: { type: 'foo', foo: { name: 'Bar' } } }],
+        [{ _id: 'foo:2', _source: { type: 'foo', foo: { name: 'Baz' } } }],
+      ],
+    });
+
+    await expect(new IndexMigrator(testOpts).migrate()).rejects.toThrowErrorMatchingInlineSnapshot(
+      `"error migrating document"`
+    );
+  });
 });
 
 function withIndex(

src/core/server/saved_objects/migrations/core/migrate_raw_docs.test.ts

@@ -90,4 +90,18 @@ describe('migrateRawDocs', () => {
 
     expect(logger.error).toBeCalledTimes(1);
   });
+
+  test('rejects when the transform function throws an error', async () => {
+    const transform = jest.fn<any, any>((doc: any) => {
+      throw new Error('error during transform');
+    });
+    await expect(
+      migrateRawDocs(
+        new SavedObjectsSerializer(new SavedObjectTypeRegistry()),
+        transform,
+        [{ _id: 'a:b', _source: { type: 'a', a: { name: 'AAA' } } }],
+        createSavedObjectsMigrationLoggerMock()
+      )
+    ).rejects.toThrowErrorMatchingInlineSnapshot(`"error during transform"`);
+  });
 });

src/core/server/saved_objects/migrations/core/migrate_raw_docs.ts

@@ -78,10 +78,14 @@ function transformNonBlocking(
 ): (doc: SavedObjectUnsanitizedDoc) => Promise<SavedObjectUnsanitizedDoc> {
   // promises aren't enough to unblock the event loop
   return (doc: SavedObjectUnsanitizedDoc) =>
-    new Promise((resolve) => {
+    new Promise((resolve, reject) => {
       // set immediate is though
       setImmediate(() => {
-        resolve(transform(doc));
+        try {
+          resolve(transform(doc));
+        } catch (e) {
+          reject(e);
+        }
       });
     });
 }

x-pack/plugins/maps/public/components/_index.scss

@@ -1,4 +1,4 @@
 @import 'action_select';
-@import 'metric_editors';
+@import 'metrics_editor/metric_editors';
 @import './geometry_filter';
 @import 'tooltip_selector/tooltip_selector';

x-pack/plugins/maps/public/components/__snapshots__/metrics_editor.test.js.snap renamed to x-pack/plugins/maps/public/components/metrics_editor/__snapshots__/metrics_editor.test.tsx.snap

@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { MetricsEditor } from './metrics_editor';

x-pack/plugins/maps/public/components/_metric_editors.scss renamed to x-pack/plugins/maps/public/components/metrics_editor/_metric_editors.scss

@@ -4,18 +4,20 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { Fragment } from 'react';
-import PropTypes from 'prop-types';
+import React, { ChangeEvent, Fragment } from 'react';
 import { i18n } from '@kbn/i18n';
 
-import { EuiFieldText, EuiFormRow } from '@elastic/eui';
+import { EuiButtonEmpty, EuiComboBoxOptionOption, EuiFieldText, EuiFormRow } from '@elastic/eui';
 
-import { MetricSelect, METRIC_AGGREGATION_VALUES } from './metric_select';
-import { SingleFieldSelect } from './single_field_select';
-import { AGG_TYPE } from '../../common/constants';
-import { getTermsFields } from '../index_pattern_util';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { MetricSelect } from './metric_select';
+import { SingleFieldSelect } from '../single_field_select';
+import { AggDescriptor } from '../../../common/descriptor_types';
+import { AGG_TYPE } from '../../../common/constants';
+import { getTermsFields } from '../../index_pattern_util';
+import { IFieldType } from '../../../../../../src/plugins/data/public';
 
-function filterFieldsForAgg(fields, aggType) {
+function filterFieldsForAgg(fields: IFieldType[], aggType: AGG_TYPE) {
   if (!fields) {
     return [];
   }
@@ -34,8 +36,27 @@ function filterFieldsForAgg(fields, aggType) {
   });
 }
 
-export function MetricEditor({ fields, metricsFilter, metric, onChange, removeButton }) {
-  const onAggChange = (metricAggregationType) => {
+interface Props {
+  metric: AggDescriptor;
+  fields: IFieldType[];
+  onChange: (metric: AggDescriptor) => void;
+  onRemove: () => void;
+  metricsFilter?: (metricOption: EuiComboBoxOptionOption<AGG_TYPE>) => boolean;
+  showRemoveButton: boolean;
+}
+
+export function MetricEditor({
+  fields,
+  metricsFilter,
+  metric,
+  onChange,
+  showRemoveButton,
+  onRemove,
+}: Props) {
+  const onAggChange = (metricAggregationType?: AGG_TYPE) => {
+    if (!metricAggregationType) {
+      return;
+    }
     const newMetricProps = {
       ...metric,
       type: metricAggregationType,
@@ -54,13 +75,16 @@ export function MetricEditor({ fields, metricsFilter, metric, onChange, removeBu
 
     onChange(newMetricProps);
   };
-  const onFieldChange = (fieldName) => {
+  const onFieldChange = (fieldName?: string) => {
+    if (!fieldName) {
+      return;
+    }
     onChange({
       ...metric,
       field: fieldName,
     });
   };
-  const onLabelChange = (e) => {
+  const onLabelChange = (e: ChangeEvent<HTMLInputElement>) => {
     onChange({
       ...metric,
       label: e.target.value,
@@ -80,7 +104,7 @@ export function MetricEditor({ fields, metricsFilter, metric, onChange, removeBu
           placeholder={i18n.translate('xpack.maps.metricsEditor.selectFieldPlaceholder', {
             defaultMessage: 'Select field',
           })}
-          value={metric.field}
+          value={metric.field ? metric.field : null}
           onChange={onFieldChange}
           fields={filterFieldsForAgg(fields, metric.type)}
           isClearable={false}
@@ -108,6 +132,28 @@ export function MetricEditor({ fields, metricsFilter, metric, onChange, removeBu
     );
   }
 
+  let removeButton;
+  if (showRemoveButton) {
+    removeButton = (
+      <div className="mapMetricEditorPanel__metricRemoveButton">
+        <EuiButtonEmpty
+          iconType="trash"
+          size="xs"
+          color="danger"
+          onClick={onRemove}
+          aria-label={i18n.translate('xpack.maps.metricsEditor.deleteMetricAriaLabel', {
+            defaultMessage: 'Delete metric',
+          })}
+        >
+          <FormattedMessage
+            id="xpack.maps.metricsEditor.deleteMetricButtonLabel"
+            defaultMessage="Delete metric"
+          />
+        </EuiButtonEmpty>
+      </div>
+    );
+  }
+
   return (
     <Fragment>
       <EuiFormRow
@@ -130,14 +176,3 @@ export function MetricEditor({ fields, metricsFilter, metric, onChange, removeBu
     </Fragment>
   );
 }
-
-MetricEditor.propTypes = {
-  metric: PropTypes.shape({
-    type: PropTypes.oneOf(METRIC_AGGREGATION_VALUES),
-    field: PropTypes.string,
-    label: PropTypes.string,
-  }),
-  fields: PropTypes.array,
-  onChange: PropTypes.func.isRequired,
-  metricsFilter: PropTypes.func,
-};

x-pack/plugins/maps/public/components/metrics_editor/index.ts

@@ -5,10 +5,9 @@
  */
 
 import React from 'react';
-import PropTypes from 'prop-types';
 import { i18n } from '@kbn/i18n';
-import { EuiComboBox } from '@elastic/eui';
-import { AGG_TYPE } from '../../common/constants';
+import { EuiComboBox, EuiComboBoxOptionOption, EuiComboBoxProps } from '@elastic/eui';
+import { AGG_TYPE } from '../../../common/constants';
 
 const AGG_OPTIONS = [
   {
@@ -55,17 +54,19 @@ const AGG_OPTIONS = [
   },
 ];
 
-export const METRIC_AGGREGATION_VALUES = AGG_OPTIONS.map(({ value }) => {
-  return value;
-});
+type Props = Omit<EuiComboBoxProps<AGG_TYPE>, 'onChange'> & {
+  value: AGG_TYPE;
+  onChange: (aggType: AGG_TYPE) => void;
+  metricsFilter?: (metricOption: EuiComboBoxOptionOption<AGG_TYPE>) => boolean;
+};
 
-export function MetricSelect({ value, onChange, metricsFilter, ...rest }) {
-  function onAggChange(selectedOptions) {
+export function MetricSelect({ value, onChange, metricsFilter, ...rest }: Props) {
+  function onAggChange(selectedOptions: Array<EuiComboBoxOptionOption<AGG_TYPE>>) {
     if (selectedOptions.length === 0) {
       return;
     }
 
-    const aggType = selectedOptions[0].value;
+    const aggType = selectedOptions[0].value!;
     onChange(aggType);
   }
 
@@ -87,9 +88,3 @@ export function MetricSelect({ value, onChange, metricsFilter, ...rest }) {
     />
   );
 }
-
-MetricSelect.propTypes = {
-  metricsFilter: PropTypes.func,
-  value: PropTypes.oneOf(METRIC_AGGREGATION_VALUES),
-  onChange: PropTypes.func.isRequired,
-};

x-pack/plugins/maps/public/components/metric_editor.js renamed to x-pack/plugins/maps/public/components/metrics_editor/metric_editor.tsx

@@ -7,7 +7,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import { MetricsEditor } from './metrics_editor';
-import { AGG_TYPE } from '../../common/constants';
+import { AGG_TYPE } from '../../../common/constants';
 
 const defaultProps = {
   metrics: [
@@ -19,15 +19,14 @@ const defaultProps = {
   fields: [],
   onChange: () => {},
   allowMultipleMetrics: true,
-  metricsFilter: () => {},
 };
 
-test('should render metrics editor', async () => {
+test('should render metrics editor', () => {
   const component = shallow(<MetricsEditor {...defaultProps} />);
   expect(component).toMatchSnapshot();
 });
 
-test('should add default count metric when metrics is empty array', async () => {
+test('should add default count metric when metrics is empty array', () => {
   const component = shallow(<MetricsEditor {...defaultProps} metrics={[]} />);
   expect(component).toMatchSnapshot();
 });