Merge branch 'master' into siem-optimize-tsconfig

src/plugins/data/public/search/search_interceptor.ts

@@ -140,7 +140,7 @@ export class SearchInterceptor {
         }),
       },
       {
-        toastLifeTimeMs: Infinity,
+        toastLifeTimeMs: 1000000,
       }
     );
   };

src/plugins/telemetry/common/telemetry_config/get_telemetry_allow_changing_opt_in_status.ts

@@ -32,9 +32,9 @@ export function getTelemetryAllowChangingOptInStatus({
     return configTelemetryAllowChangingOptInStatus;
   }
 
-  if (typeof telemetrySavedObject.telemetryAllowChangingOptInStatus === 'undefined') {
+  if (typeof telemetrySavedObject.allowChangingOptInStatus === 'undefined') {
     return configTelemetryAllowChangingOptInStatus;
   }
 
-  return telemetrySavedObject.telemetryAllowChangingOptInStatus;
+  return telemetrySavedObject.allowChangingOptInStatus;
 }

src/plugins/telemetry/common/telemetry_config/types.ts

@@ -22,7 +22,7 @@ export interface TelemetrySavedObjectAttributes {
   lastVersionChecked?: string;
   sendUsageFrom?: 'browser' | 'server';
   lastReported?: number;
-  telemetryAllowChangingOptInStatus?: boolean;
+  allowChangingOptInStatus?: boolean;
   userHasSeenNotice?: boolean;
   reportFailureCount?: number;
   reportFailureVersion?: string;

src/plugins/telemetry/server/plugin.ts

@@ -143,6 +143,9 @@ export class TelemetryPlugin implements Plugin {
           reportFailureVersion: {
             type: 'keyword',
           },
+          allowChangingOptInStatus: {
+            type: 'boolean',
+          },
         },
       },
     });

x-pack/legacy/plugins/canvas/public/apps/export/export/export_app.js

@@ -28,6 +28,7 @@ export class ExportApp extends React.PureComponent {
     const { workpad, selectedPageId } = this.props;
     const { pages, height, width } = workpad;
     const activePage = pages.find(page => page.id === selectedPageId);
+    const pageElementCount = activePage.elements.length;
 
     return (
       <div className="canvasExport">
@@ -39,7 +40,7 @@ export class ExportApp extends React.PureComponent {
           </div>
           {Style.it(
             workpad.css,
-            <div className="canvasExport__stageContent">
+            <div className="canvasExport__stageContent" data-shared-items-count={pageElementCount}>
               <WorkpadPage
                 isSelected
                 key={activePage.id}

x-pack/legacy/plugins/canvas/public/components/element_share_container/element_share_container.js

@@ -81,11 +81,15 @@ export class ElementShareContainer extends React.PureComponent {
   };
 
   render() {
+    const shouldTrackComplete = this.props.functionName !== 'embeddable';
+
     // NOTE: the data-shared-item and data-render-complete attributes are used for reporting
+    // Embeddables should be setting data-shared-item and data-render-complete on themselves
+    // so we should not be tracking them here.
     return (
       <div
-        data-shared-item
-        data-render-complete={this.state.renderComplete}
+        data-shared-item={shouldTrackComplete ? this.state.renderComplete : undefined}
+        data-render-complete={shouldTrackComplete ? this.state.renderComplete : undefined}
         className={this.props.className}
         ref={ref => (this.sharedItemRef = ref)}
       >

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

@@ -7,12 +7,7 @@
 import * as Joi from 'joi';
 import { resolve } from 'path';
 import { LegacyPluginInitializer } from 'src/legacy/types';
-import mappings from './mappings.json';
-import {
-  PLUGIN_ID,
-  getEditPath,
-  NOT_INTERNATIONALIZED_PRODUCT_NAME,
-} from '../../../plugins/lens/common';
+import { PLUGIN_ID, NOT_INTERNATIONALIZED_PRODUCT_NAME } from '../../../plugins/lens/common';
 
 export const lens: LegacyPluginInitializer = kibana => {
   return new kibana.Plugin({
@@ -32,18 +27,6 @@ export const lens: LegacyPluginInitializer = kibana => {
       visualize: [`plugins/${PLUGIN_ID}/legacy`],
       embeddableFactories: [`plugins/${PLUGIN_ID}/legacy`],
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
-      mappings,
-      savedObjectsManagement: {
-        lens: {
-          defaultSearchField: 'title',
-          isImportableAndExportable: true,
-          getTitle: (obj: { attributes: { title: string } }) => obj.attributes.title,
-          getInAppUrl: (obj: { id: string }) => ({
-            path: getEditPath(obj.id),
-            uiCapabilitiesPath: 'lens.show',
-          }),
-        },
-      },
     },
 
     config: () => {

x-pack/legacy/plugins/maps/common/descriptor_types.ts

@@ -0,0 +1,8 @@
+/*
+ * 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.
+ */
+
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+export * from '../../../../plugins/maps/common/descriptor_types';

x-pack/legacy/plugins/maps/public/actions/map_actions.d.ts

@@ -6,7 +6,7 @@
 /* eslint-disable @typescript-eslint/consistent-type-definitions */
 
 import { LAYER_TYPE } from '../../common/constants';
-import { DataMeta, MapFilters } from '../../common/data_request_descriptor_types';
+import { DataMeta, MapFilters } from '../../common/descriptor_types';
 
 export type SyncContext = {
   startLoading(dataId: string, requestToken: symbol, meta: DataMeta): void;

x-pack/legacy/plugins/maps/public/layers/blended_vector_layer.ts

@@ -34,7 +34,7 @@ import {
   VectorStyleDescriptor,
   SizeDynamicOptions,
   DynamicStylePropertyOptions,
-} from '../../common/style_property_descriptor_types';
+} from '../../common/descriptor_types';
 
 const ACTIVE_COUNT_DATA_ID = 'ACTIVE_COUNT_DATA_ID';
 

x-pack/legacy/plugins/maps/public/layers/sources/es_source.d.ts

@@ -7,7 +7,7 @@
 import { AbstractVectorSource } from './vector_source';
 import { IVectorSource } from './vector_source';
 import { IndexPattern, SearchSource } from '../../../../../../../src/plugins/data/public';
-import { VectorSourceRequestMeta } from '../../../common/data_request_descriptor_types';
+import { VectorSourceRequestMeta } from '../../../common/descriptor_types';
 
 export interface IESSource extends IVectorSource {
   getId(): string;

x-pack/legacy/plugins/maps/public/layers/sources/vector_source.d.ts

@@ -8,7 +8,7 @@
 import { FeatureCollection } from 'geojson';
 import { AbstractSource, ISource } from './source';
 import { IField } from '../fields/field';
-import { ESSearchSourceResponseMeta } from '../../../common/data_request_descriptor_types';
+import { ESSearchSourceResponseMeta } from '../../../common/descriptor_types';
 
 export type GeoJsonFetchMeta = ESSearchSourceResponseMeta;
 

x-pack/legacy/plugins/maps/public/layers/styles/vector/components/field_meta/categorical_field_meta_popover.tsx

@@ -11,7 +11,7 @@ import { EuiFormRow, EuiSwitch, EuiSwitchEvent } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FieldMetaPopover } from './field_meta_popover';
 import { IDynamicStyleProperty } from '../../properties/dynamic_style_property';
-import { FieldMetaOptions } from '../../../../../../common/style_property_descriptor_types';
+import { FieldMetaOptions } from '../../../../../../common/descriptor_types';
 
 type Props = {
   styleProperty: IDynamicStyleProperty;

x-pack/legacy/plugins/maps/public/layers/styles/vector/components/field_meta/ordinal_field_meta_popover.tsx

@@ -12,7 +12,7 @@ import { i18n } from '@kbn/i18n';
 import { DEFAULT_SIGMA } from '../../vector_style_defaults';
 import { FieldMetaPopover } from './field_meta_popover';
 import { IDynamicStyleProperty } from '../../properties/dynamic_style_property';
-import { FieldMetaOptions } from '../../../../../../common/style_property_descriptor_types';
+import { FieldMetaOptions } from '../../../../../../common/descriptor_types';
 import { VECTOR_STYLES } from '../../../../../../common/constants';
 
 function getIsEnableToggleLabel(styleName: string) {

x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/dynamic_style_property.d.ts

@@ -8,11 +8,12 @@
 import { IStyleProperty } from './style_property';
 import { FIELD_ORIGIN } from '../../../../../common/constants';
 import {
-  FieldMetaOptions,
+  CategoryFieldMeta,
   DynamicStylePropertyOptions,
-} from '../../../../../common/style_property_descriptor_types';
+  FieldMetaOptions,
+  RangeFieldMeta,
+} from '../../../../../common/descriptor_types';
 import { IField } from '../../../fields/field';
-import { CategoryFieldMeta, RangeFieldMeta } from '../../../../../common/descriptor_types';
 
 export interface IDynamicStyleProperty extends IStyleProperty {
   getOptions(): DynamicStylePropertyOptions;

x-pack/legacy/plugins/maps/public/layers/styles/vector/properties/style_property.ts

@@ -8,10 +8,7 @@
 import { ReactElement } from 'react';
 // @ts-ignore
 import { getVectorStyleLabel } from '../components/get_vector_style_label';
-import {
-  FieldMetaOptions,
-  StylePropertyOptions,
-} from '../../../../../common/style_property_descriptor_types';
+import { FieldMetaOptions, StylePropertyOptions } from '../../../../../common/descriptor_types';
 import { VECTOR_STYLES } from '../../../../../common/constants';
 
 type LegendProps = {

x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style.d.ts

@@ -7,7 +7,7 @@ import { IStyleProperty } from './properties/style_property';
 import { IDynamicStyleProperty } from './properties/dynamic_style_property';
 import { IVectorLayer } from '../../vector_layer';
 import { IVectorSource } from '../../sources/vector_source';
-import { VectorStyleDescriptor } from '../../../../common/style_property_descriptor_types';
+import { VectorStyleDescriptor } from '../../../../common/descriptor_types';
 
 export interface IVectorStyle {
   getAllStyleProperties(): IStyleProperty[];

x-pack/legacy/plugins/maps/public/layers/styles/vector/vector_style_defaults.ts

@@ -18,7 +18,7 @@ import {
   DEFAULT_LINE_COLORS,
   // @ts-ignore
 } from '../color_utils';
-import { VectorStylePropertiesDescriptor } from '../../../../common/style_property_descriptor_types';
+import { VectorStylePropertiesDescriptor } from '../../../../common/descriptor_types';
 // @ts-ignore
 import { getUiSettings } from '../../../kibana_services';
 

x-pack/legacy/plugins/maps/public/layers/util/can_skip_fetch.ts

@@ -9,7 +9,7 @@ import turf from 'turf';
 import turfBooleanContains from '@turf/boolean-contains';
 import { isRefreshOnlyQuery } from './is_refresh_only_query';
 import { ISource } from '../sources/source';
-import { DataMeta } from '../../../common/data_request_descriptor_types';
+import { DataMeta } from '../../../common/descriptor_types';
 import { DataRequest } from './data_request';
 
 const SOURCE_UPDATE_REQUIRED = true;

x-pack/legacy/plugins/maps/public/layers/util/data_request.ts

@@ -6,7 +6,7 @@
 /* eslint-disable max-classes-per-file */
 
 import _ from 'lodash';
-import { DataRequestDescriptor, DataMeta } from '../../../common/data_request_descriptor_types';
+import { DataRequestDescriptor, DataMeta } from '../../../common/descriptor_types';
 
 export class DataRequest {
   private readonly _descriptor: DataRequestDescriptor;

x-pack/legacy/plugins/maps/public/layers/util/is_refresh_only_query.ts

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { Query } from '../../../common/map_descriptor';
+import { Query } from '../../../common/descriptor_types';
 
 // Refresh only query is query where timestamps are different but query is the same.
 // Triggered by clicking "Refresh" button in QueryBar

x-pack/legacy/plugins/maps/public/layers/vector_layer.d.ts

@@ -7,8 +7,11 @@
 
 import { AbstractLayer } from './layer';
 import { IVectorSource } from './sources/vector_source';
-import { VectorLayerDescriptor } from '../../common/descriptor_types';
-import { MapFilters, VectorSourceRequestMeta } from '../../common/data_request_descriptor_types';
+import {
+  MapFilters,
+  VectorLayerDescriptor,
+  VectorSourceRequestMeta,
+} from '../../common/descriptor_types';
 import { ILayer } from './layer';
 import { IJoin } from './joins/join';
 import { IVectorStyle } from './styles/vector/vector_style';

x-pack/plugins/data_enhanced/public/search/search_interceptor.ts

@@ -49,7 +49,7 @@ export class EnhancedSearchInterceptor extends SearchInterceptor {
         }),
       },
       {
-        toastLifeTimeMs: Infinity,
+        toastLifeTimeMs: 1000000,
       }
     );
   };