Merge remote-tracking branch 'upstream/master' into switch-to-core-application-service

Author: flash1293

src/plugins/console/public/styles/_app.scss

@@ -1,8 +1,11 @@
 // TODO: Move all of the styles here (should be modularised by, e.g., CSS-in-JS or CSS modules).
 @import '@elastic/eui/src/components/header/variables';
 
+// This value is calculated to static value using SCSS because calc in calc has issues in IE11
+$headerHeightOffset: $euiHeaderHeightCompensation * 2;
+
 #consoleRoot {
-  height: calc(100vh - calc(#{$euiHeaderChildSize} * 2));
+  height: calc(100vh - #{$headerHeightOffset});
   display: flex;
   flex: 1 1 auto;
   // Make sure the editor actions don't create scrollbars on this container

src/plugins/data/common/es_query/es_query/migrate_filter.ts

@@ -43,18 +43,25 @@ export function migrateFilter(filter: Filter, indexPattern?: IIndexPattern) {
   if (isDeprecatedMatchPhraseFilter(filter)) {
     const fieldName = Object.keys(filter.query.match)[0];
     const params: Record<string, any> = get(filter, ['query', 'match', fieldName]);
+    let query = params.query;
     if (indexPattern) {
       const field = indexPattern.fields.find(f => f.name === fieldName);
 
       if (field) {
-        params.query = getConvertedValueForField(field, params.query);
+        query = getConvertedValueForField(field, params.query);
       }
     }
     return {
       ...filter,
       query: {
         match_phrase: {
-          [fieldName]: omit(params, 'type'),
+          [fieldName]: omit(
+            {
+              ...params,
+              query,
+            },
+            'type'
+          ),
         },
       },
     };

src/plugins/visualizations/public/embeddable/visualize_embeddable.ts

@@ -74,6 +74,8 @@ export interface VisualizeOutput extends EmbeddableOutput {
 
 type ExpressionLoader = InstanceType<ExpressionsStart['ExpressionLoader']>;
 
+const visTypesWithoutInspector = ['markdown', 'input_control_vis', 'metrics', 'vega', 'timelion'];
+
 export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOutput> {
   private handler?: ExpressionLoader;
   private timefilter: TimefilterContract;
@@ -131,7 +133,7 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
   }
 
   public getInspectorAdapters = () => {
-    if (!this.handler) {
+    if (!this.handler || visTypesWithoutInspector.includes(this.vis.type.name)) {
       return undefined;
     }
     return this.handler.inspect();
@@ -220,19 +222,7 @@ export class VisualizeEmbeddable extends Embeddable<VisualizeInput, VisualizeOut
 
   // this is a hack to make editor still work, will be removed once we clean up editor
   // @ts-ignore
-  hasInspector = () => {
-    const visTypesWithoutInspector = [
-      'markdown',
-      'input_control_vis',
-      'metrics',
-      'vega',
-      'timelion',
-    ];
-    if (visTypesWithoutInspector.includes(this.vis.type.name)) {
-      return false;
-    }
-    return this.getInspectorAdapters();
-  };
+  hasInspector = () => Boolean(this.getInspectorAdapters());
 
   /**
    *

test/functional/services/find.ts

@@ -17,20 +17,16 @@
  * under the License.
  */
 
-import { WebDriver, WebElement, By } from 'selenium-webdriver';
+import { WebDriver, WebElement, By, until } from 'selenium-webdriver';
 import { FtrProviderContext } from '../ftr_provider_context';
 import { WebElementWrapper } from './lib/web_element_wrapper';
 
 export async function FindProvider({ getService }: FtrProviderContext) {
   const log = getService('log');
   const config = getService('config');
-  const webdriver = await getService('__webdriver__').init();
+  const { driver, browserType } = await getService('__webdriver__').init();
   const retry = getService('retry');
 
-  const driver = webdriver.driver;
-  const until = webdriver.until;
-  const browserType = webdriver.browserType;
-
   const WAIT_FOR_EXISTS_TIME = config.get('timeouts.waitForExists');
   const POLLING_TIME = 500;
   const defaultFindTimeout = config.get('timeouts.find');
@@ -40,7 +36,7 @@ export async function FindProvider({ getService }: FtrProviderContext) {
     WebElementWrapper.create(
       webElement,
       locator,
-      webdriver,
+      driver,
       defaultFindTimeout,
       fixedHeaderHeight,
       log,

test/functional/services/lib/web_element_wrapper/web_element_wrapper.ts

@@ -18,7 +18,7 @@
  */
 
 import { delay } from 'bluebird';
-import { WebElement, WebDriver, By, Key, until } from 'selenium-webdriver';
+import { WebElement, WebDriver, By, Key } from 'selenium-webdriver';
 import { PNG } from 'pngjs';
 // @ts-ignore not supported yet
 import cheerio from 'cheerio';
@@ -29,12 +29,6 @@ import { CustomCheerio, CustomCheerioStatic } from './custom_cheerio_api';
 import { scrollIntoViewIfNecessary } from './scroll_into_view_if_necessary';
 import { Browsers } from '../../remote/browsers';
 
-interface Driver {
-  driver: WebDriver;
-  By: typeof By;
-  until: typeof until;
-}
-
 interface TypeOptions {
   charByChar: boolean;
 }
@@ -51,16 +45,15 @@ const RETRY_CLICK_RETRY_ON_ERRORS = [
 ];
 
 export class WebElementWrapper {
-  private By = this.webDriver.By;
-  private driver: WebDriver = this.webDriver.driver;
+  private By = By;
   private Keys = Key;
-  public isW3CEnabled: boolean = (this.webDriver.driver as any).executor_.w3c === true;
+  public isW3CEnabled: boolean = (this.driver as any).executor_.w3c === true;
   public isChromium: boolean = [Browsers.Chrome, Browsers.ChromiumEdge].includes(this.browserType);
 
   public static create(
     webElement: WebElement | WebElementWrapper,
     locator: By | null,
-    webDriver: Driver,
+    driver: WebDriver,
     timeout: number,
     fixedHeaderHeight: number,
     logger: ToolingLog,
@@ -73,7 +66,7 @@ export class WebElementWrapper {
     return new WebElementWrapper(
       webElement,
       locator,
-      webDriver,
+      driver,
       timeout,
       fixedHeaderHeight,
       logger,
@@ -84,7 +77,7 @@ export class WebElementWrapper {
   constructor(
     public _webElement: WebElement,
     private locator: By | null,
-    private webDriver: Driver,
+    private driver: WebDriver,
     private timeout: number,
     private fixedHeaderHeight: number,
     private logger: ToolingLog,
@@ -109,7 +102,7 @@ export class WebElementWrapper {
     return WebElementWrapper.create(
       otherWebElement,
       locator,
-      this.webDriver,
+      this.driver,
       this.timeout,
       this.fixedHeaderHeight,
       this.logger,

test/functional/services/remote/remote.ts

@@ -58,7 +58,7 @@ export async function RemoteProvider({ getService }: FtrProviderContext) {
     Fs.writeFileSync(path, JSON.stringify(JSON.parse(coverageJson), null, 2));
   };
 
-  const { driver, By, until, consoleLog$ } = await initWebDriver(
+  const { driver, consoleLog$ } = await initWebDriver(
     log,
     browserType,
     lifecycle,
@@ -153,5 +153,5 @@ export async function RemoteProvider({ getService }: FtrProviderContext) {
     await driver.quit();
   });
 
-  return { driver, By, until, browserType, consoleLog$ };
+  return { driver, browserType, consoleLog$ };
 }

test/functional/services/remote/webdriver.ts

@@ -28,7 +28,7 @@ import { delay } from 'bluebird';
 import chromeDriver from 'chromedriver';
 // @ts-ignore types not available
 import geckoDriver from 'geckodriver';
-import { Builder, Capabilities, By, logging, until } from 'selenium-webdriver';
+import { Builder, Capabilities, logging } from 'selenium-webdriver';
 import chrome from 'selenium-webdriver/chrome';
 import firefox from 'selenium-webdriver/firefox';
 import edge from 'selenium-webdriver/edge';
@@ -310,7 +310,7 @@ async function attemptToCreateCommand(
     return;
   } // abort
 
-  return { driver: session, By, until, consoleLog$ };
+  return { driver: session, consoleLog$ };
 }
 
 export async function initWebDriver(

x-pack/plugins/advanced_ui_actions/public/drilldowns/drilldown_definition.ts

@@ -15,11 +15,6 @@ import { ActionFactoryDefinition } from '../dynamic_actions';
  * `Config` is a serializable object containing the configuration that the
  * drilldown is able to collect using UI.
  *
- * `PlaceContext` is an object that the app that opens drilldown management
- * flyout provides to the React component, specifying the contextual information
- * about that app. For example, on Dashboard app this context contains
- * information about the current embeddable and dashboard.
- *
  * `ExecutionContext` is an object created in response to user's interaction
  * and provided to the `execute` function of the drilldown. This object contains
  * information about the action user performed.

x-pack/plugins/advanced_ui_actions/public/dynamic_actions/types.ts

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export interface SerializedAction<Config> {
+export interface SerializedAction<Config = unknown> {
   readonly factoryId: string;
   readonly name: string;
   readonly config: Config;
@@ -16,5 +16,5 @@ export interface SerializedAction<Config> {
 export interface SerializedEvent {
   eventId: string;
   triggers: string[];
-  action: SerializedAction<unknown>;
+  action: SerializedAction;
 }

x-pack/plugins/dashboard_enhanced/public/services/drilldowns/actions/flyout_create_drilldown/flyout_create_drilldown.tsx

@@ -72,7 +72,6 @@ export class FlyoutCreateDrilldownAction implements ActionByType<typeof OPEN_FLY
       toMountPoint(
         <plugins.drilldowns.FlyoutManageDrilldowns
           onClose={() => handle.close()}
-          placeContext={context}
           viewMode={'create'}
           dynamicActionManager={embeddable.enhancements.dynamicActions}
         />