Merge branch 'master' of github.com:elastic/kibana into fix/autocompl…

…ete-for-distance_feature

* 'master' of github.com:elastic/kibana:
  [SIEM] Fixes escape bug for filterQuery  (elastic#43030)
  Export saved objects based on search criteria (elastic#44723)
  refactor(webhook-whitelisting): Removed unneeded schema config (elastic#44974)
  [APM] Make number of x ticks responsive to the plot width (elastic#44870)
  [ML] Single metric viewer: Fix top nav refresh behaviour. (elastic#44860)

src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/__jest__/objects_table.test.js

@@ -20,7 +20,7 @@
 import React from 'react';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
 
-import { ObjectsTable, POSSIBLE_TYPES } from '../objects_table';
+import { ObjectsTable } from '../objects_table';
 import { Flyout } from '../components/flyout/';
 import { Relationships } from '../components/relationships/';
 import { findObjects } from '../../../lib';
@@ -57,10 +57,6 @@ jest.mock('../../../lib/fetch_export_objects', () => ({
   fetchExportObjects: jest.fn(),
 }));
 
-jest.mock('../../../lib/fetch_export_by_type', () => ({
-  fetchExportByType: jest.fn(),
-}));
-
 jest.mock('../../../lib/get_saved_object_counts', () => ({
   getSavedObjectCounts: jest.fn().mockImplementation(() => {
     return {
@@ -318,7 +314,7 @@ describe('ObjectsTable', () => {
     });
 
     it('should export all', async () => {
-      const { fetchExportByType } = require('../../../lib/fetch_export_by_type');
+      const { fetchExportObjects } = require('../../../lib/fetch_export_objects');
       const { saveAs } = require('@elastic/filesaver');
       const component = shallowWithIntl(
         <ObjectsTable.WrappedComponent
@@ -333,11 +329,11 @@ describe('ObjectsTable', () => {
 
       // Set up mocks
       const blob = new Blob([JSON.stringify(allSavedObjects)], { type: 'application/ndjson' });
-      fetchExportByType.mockImplementation(() => blob);
+      fetchExportObjects.mockImplementation(() => blob);
 
       await component.instance().onExportAll();
 
-      expect(fetchExportByType).toHaveBeenCalledWith(POSSIBLE_TYPES, true);
+      expect(fetchExportObjects).toHaveBeenCalledWith(allSavedObjects.map(so => ({ type: so.type, id: so.id })), true);
       expect(saveAs).toHaveBeenCalledWith(blob, 'export.ndjson');
       expect(addSuccessMock).toHaveBeenCalledWith({ title: 'Your file is downloading in the background' });
     });

src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/components/relationships/__jest__/relationships.test.js

@@ -39,10 +39,6 @@ jest.mock('ui/chrome', () => ({
   addBasePath: () => ''
 }));
 
-jest.mock('../../../../../lib/fetch_export_by_type', () => ({
-  fetchExportByType: jest.fn(),
-}));
-
 jest.mock('../../../../../lib/fetch_export_objects', () => ({
   fetchExportObjects: jest.fn(),
 }));

src/legacy/core_plugins/kibana/public/management/sections/objects/components/objects_table/objects_table.js

@@ -58,7 +58,6 @@ import {
   getRelationships,
   getSavedObjectLabel,
   fetchExportObjects,
-  fetchExportByType,
   findObjects,
 } from '../../lib';
 import { FormattedMessage, injectI18n } from '@kbn/i18n/react';
@@ -303,20 +302,14 @@ class ObjectsTableUI extends Component {
 
   onExportAll = async () => {
     const { intl } = this.props;
-    const { exportAllSelectedOptions, isIncludeReferencesDeepChecked } = this.state;
-    const exportTypes = Object.entries(exportAllSelectedOptions).reduce(
-      (accum, [id, selected]) => {
-        if (selected) {
-          accum.push(id);
-        }
-        return accum;
-      },
-      []
-    );
+
+    const { exportAllSelectedOptions, isIncludeReferencesDeepChecked, savedObjects } = this.state;
+
+    const exportObjects = savedObjects.filter(so => exportAllSelectedOptions[so.type]).map(so => ({ type: so.type, id: so.id }));
 
     let blob;
     try {
-      blob = await fetchExportByType(exportTypes, isIncludeReferencesDeepChecked);
+      blob = await fetchExportObjects(exportObjects, isIncludeReferencesDeepChecked);
     } catch (e) {
       toastNotifications.addDanger({
         title: intl.formatMessage({

src/legacy/core_plugins/kibana/public/management/sections/objects/lib/index.js

@@ -17,7 +17,6 @@
  * under the License.
  */
 
-export * from './fetch_export_by_type';
 export * from './fetch_export_objects';
 export * from './in_app_url';
 export * from './get_relationships';

x-pack/legacy/plugins/actions/index.ts

@@ -27,12 +27,9 @@ export function actions(kibana: any) {
       return Joi.object()
         .keys({
           enabled: Joi.boolean().default(false),
-          whitelistedHosts: Joi.alternatives()
-            .try(
-              Joi.array()
-                .items(Joi.string().hostname())
-                .sparse(false)
-            )
+          whitelistedHosts: Joi.array()
+            .items(Joi.string().hostname())
+            .sparse(false)
             .default([]),
         })
         .default();

x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/StaticPlot.js

@@ -27,8 +27,6 @@ import { isValidCoordinateValue } from '../../../../utils/isValidCoordinateValue
 // see https://github.com/uber/react-vis/issues/1214
 const getNull = d => isValidCoordinateValue(d.y) && !isNaN(d.y);
 
-const X_TICK_TOTAL = 7;
-
 class StaticPlot extends PureComponent {
   getVisSeries(series, plotValues) {
     return series
@@ -141,12 +139,23 @@ class StaticPlot extends PureComponent {
   }
 
   render() {
-    const { series, tickFormatX, tickFormatY, plotValues, noHits } = this.props;
+    const {
+      width,
+      series,
+      tickFormatX,
+      tickFormatY,
+      plotValues,
+      noHits
+    } = this.props;
     const { yTickValues } = plotValues;
 
+    // approximate number of x-axis ticks based on the width of the plot. There should by approx 1 tick per 100px
+    // d3 will determine the exact number of ticks based on the selected range
+    const xTickTotal = Math.floor(width / 100);
+
     return (
       <SharedPlot plotValues={plotValues}>
-        <XAxis tickSize={0} tickTotal={X_TICK_TOTAL} tickFormat={tickFormatX} />
+        <XAxis tickSize={0} tickTotal={xTickTotal} tickFormat={tickFormatX} />
         {noHits ? (
           <StatusText
             marginLeft={30}
@@ -181,5 +190,6 @@ StaticPlot.propTypes = {
   series: PropTypes.array.isRequired,
   plotValues: PropTypes.object.isRequired,
   tickFormatX: PropTypes.func,
-  tickFormatY: PropTypes.func.isRequired
+  tickFormatY: PropTypes.func.isRequired,
+  width: PropTypes.number.isRequired
 };

x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/index.js

@@ -158,6 +158,7 @@ export class InnerCustomPlot extends PureComponent {
       <Fragment>
         <div style={{ position: 'relative', height: plotValues.XY_HEIGHT }}>
           <StaticPlot
+            width={width}
             noHits={noHits}
             plotValues={plotValues}
             series={enabledSeries}

x-pack/legacy/plugins/apm/public/components/shared/charts/CustomPlot/test/CustomPlot.test.js

@@ -293,7 +293,7 @@ describe('when response has no data', () => {
         onHover={onHover}
         onMouseLeave={onMouseLeave}
         onSelectionEnd={onSelectionEnd}
-        width={100}
+        width={800}
         tickFormatX={x => x.getTime()} // Avoid timezone issues in snapshots
       />
     );