Fix merge conflicts

config/kibana.yml

@@ -18,10 +18,6 @@
 # default to `true` starting in Kibana 7.0.
 #server.rewriteBasePath: false
 
-# Specifies the default route when opening Kibana. You can use this setting to modify
-# the landing page when opening Kibana.
-#server.defaultRoute: /app/kibana
-
 # The maximum payload size in bytes for incoming server requests.
 #server.maxPayloadBytes: 1048576
 

docs/setup/settings.asciidoc

@@ -256,10 +256,6 @@ deprecation warning at startup. This setting cannot end in a slash (`/`).
 `server.customResponseHeaders:`:: *Default: `{}`* Header names and values to
   send on all responses to the client from the Kibana server.
 
-[[server-default]]`server.defaultRoute:`:: *Default: "/app/kibana"* This setting
-specifies the default route when opening Kibana. You can use this setting to
-modify the landing page when opening Kibana. Supported on {ece}.
-
 `server.host:`:: *Default: "localhost"* This setting specifies the host of the
 back end server.
 

package.json

@@ -107,7 +107,7 @@
     "@babel/register": "^7.5.5",
     "@elastic/charts": "^12.0.2",
     "@elastic/datemath": "5.0.2",
-    "@elastic/eui": "14.3.0",
+    "@elastic/eui": "14.4.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "2.3.3",

src/dev/run_check_core_api_changes.ts

@@ -139,14 +139,51 @@ const runApiExtractor = (
   return Extractor.invoke(config, options);
 };
 
-async function run(folder: string): Promise<boolean> {
+interface Options {
+  accept: boolean;
+  docs: boolean;
+  help: boolean;
+}
+
+async function run(
+  folder: string,
+  { log, opts }: { log: ToolingLog; opts: Options }
+): Promise<boolean> {
+  log.info(`Core ${folder} API: checking for changes in API signature...`);
+
+  const { apiReportChanged, succeeded } = runApiExtractor(log, folder, opts.accept);
+
+  // If we're not accepting changes and there's a failure, exit.
+  if (!opts.accept && !succeeded) {
+    return false;
+  }
+
+  // Attempt to generate docs even if api-extractor didn't succeed
+  if ((opts.accept && apiReportChanged) || opts.docs) {
+    try {
+      await renameExtractedApiPackageName(folder);
+      await runApiDocumenter(folder);
+    } catch (e) {
+      log.error(e);
+      return false;
+    }
+    log.info(`Core ${folder} API: updated documentation ✔`);
+  }
+
+  // If the api signature changed or any errors or warnings occured, exit with an error
+  // NOTE: Because of https://github.com/Microsoft/web-build-tools/issues/1258
+  //  api-extractor will not return `succeeded: false` when the API changes.
+  return !apiReportChanged && succeeded;
+}
+
+(async () => {
   const log = new ToolingLog({
     level: 'info',
     writeTo: process.stdout,
   });
 
   const extraFlags: string[] = [];
-  const opts = getopts(process.argv.slice(2), {
+  const opts = (getopts(process.argv.slice(2), {
     boolean: ['accept', 'docs', 'help'],
     default: {
       project: undefined,
@@ -155,7 +192,7 @@ async function run(folder: string): Promise<boolean> {
       extraFlags.push(name);
       return false;
     },
-  });
+  }) as any) as Options;
 
   if (extraFlags.length > 0) {
     for (const flag of extraFlags) {
@@ -193,45 +230,18 @@ async function run(folder: string): Promise<boolean> {
     return !(extraFlags.length > 0);
   }
 
-  log.info(`Core ${folder} API: checking for changes in API signature...`);
-
   try {
+    log.info(`Core: Building types...`);
     await runBuildTypes();
   } catch (e) {
     log.error(e);
     return false;
   }
 
-  const { apiReportChanged, succeeded } = runApiExtractor(log, folder, opts.accept);
-
-  // If we're not accepting changes and there's a failure, exit.
-  if (!opts.accept && !succeeded) {
-    return false;
-  }
-
-  // Attempt to generate docs even if api-extractor didn't succeed
-  if ((opts.accept && apiReportChanged) || opts.docs) {
-    try {
-      await renameExtractedApiPackageName(folder);
-      await runApiDocumenter(folder);
-    } catch (e) {
-      log.error(e);
-      return false;
-    }
-    log.info(`Core ${folder} API: updated documentation ✔`);
-  }
-
-  // If the api signature changed or any errors or warnings occured, exit with an error
-  // NOTE: Because of https://github.com/Microsoft/web-build-tools/issues/1258
-  //  api-extractor will not return `succeeded: false` when the API changes.
-  return !apiReportChanged && succeeded;
-}
-
-(async () => {
-  const publicSucceeded = await run('public');
-  const serverSucceeded = await run('server');
+  const folders = ['public', 'server'];
+  const results = await Promise.all(folders.map(folder => run(folder, { log, opts })));
 
-  if (!publicSucceeded || !serverSucceeded) {
+  if (results.find(r => r === false) !== undefined) {
     process.exitCode = 1;
   }
 })();

src/legacy/core_plugins/console/np_ready/public/application/containers/main/main.tsx

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import React, { useCallback, useRef, useState } from 'react';
+import React, { useCallback, useState } from 'react';
 import { debounce } from 'lodash';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 
@@ -52,8 +52,6 @@ export function Main() {
   const [showSettings, setShowSettings] = useState(false);
   const [showHelp, setShowHelp] = useState(false);
 
-  const containerRef = useRef<null | HTMLDivElement>(null);
-
   const [firstPanelWidth, secondPanelWidth] = storage.get(StorageKeys.WIDTH, [
     INITIAL_PANEL_WIDTH,
     INITIAL_PANEL_WIDTH,
@@ -71,9 +69,9 @@ export function Main() {
   };
 
   return (
-    <div className="consoleContainer" style={{ height: '100%', width: '100%' }} ref={containerRef}>
+    <>
       <EuiFlexGroup
-        style={{ height: '100%' }}
+        className="consoleContainer"
         gutterSize="none"
         direction="column"
         responsive={false}
@@ -118,6 +116,6 @@ export function Main() {
       {showSettings ? <Settings onClose={() => setShowSettings(false)} /> : null}
 
       {showHelp ? <HelpPanel onClose={() => setShowHelp(false)} /> : null}
-    </div>
+    </>
   );
 }

src/legacy/core_plugins/console/public/quarantined/_app.scss

@@ -1,6 +1,7 @@
 // TODO: Move all of the styles here (should be modularised by, e.g., CSS-in-JS or CSS modules).
 #consoleRoot {
-  height: 100%;
+  display: flex;
+  flex: 1 1 auto;
   // Make sure the editor actions don't create scrollbars on this container
   // SASSTODO: Uncomment when tooltips are EUI-ified (inside portals)
   overflow: hidden;

src/legacy/core_plugins/data/public/legacy.ts

@@ -45,4 +45,7 @@ export const setup = dataPlugin.setup(npSetup.core, {
   __LEGACY: legacyPlugin.setup(),
 });
 
-export const start = dataPlugin.start(npStart.core);
+export const start = dataPlugin.start(npStart.core, {
+  data: npStart.plugins.data,
+  __LEGACY: legacyPlugin.start(),
+});

src/legacy/core_plugins/data/public/plugin.ts

@@ -18,12 +18,16 @@
  */
 
 import { CoreSetup, CoreStart, Plugin } from '../../../../core/public';
-import { SearchService, SearchSetup } from './search';
+import { SearchService, SearchSetup, createSearchBar, StatetfulSearchBarProps } from './search';
 import { QueryService, QuerySetup } from './query';
 import { FilterService, FilterSetup } from './filter';
 import { TimefilterService, TimefilterSetup } from './timefilter';
 import { IndexPatternsService, IndexPatternsSetup } from './index_patterns';
-import { LegacyDependenciesPluginSetup } from './shim/legacy_dependencies_plugin';
+import {
+  LegacyDependenciesPluginSetup,
+  LegacyDependenciesPluginStart,
+} from './shim/legacy_dependencies_plugin';
+import { DataPublicPluginStart } from '../../../../plugins/data/public';
 
 /**
  * Interface for any dependencies on other plugins' `setup` contracts.
@@ -34,6 +38,11 @@ export interface DataPluginSetupDependencies {
   __LEGACY: LegacyDependenciesPluginSetup;
 }
 
+export interface DataPluginStartDependencies {
+  data: DataPublicPluginStart;
+  __LEGACY: LegacyDependenciesPluginStart;
+}
+
 /**
  * Interface for this plugin's returned `setup` contract.
  *
@@ -47,6 +56,22 @@ export interface DataSetup {
   timefilter: TimefilterSetup;
 }
 
+/**
+ * Interface for this plugin's returned `start` contract.
+ *
+ * @public
+ */
+export interface DataStart {
+  indexPatterns: IndexPatternsSetup;
+  filter: FilterSetup;
+  query: QuerySetup;
+  search: SearchSetup;
+  timefilter: TimefilterSetup;
+  ui: {
+    SearchBar: React.ComponentType<StatetfulSearchBarProps>;
+  };
+}
+
 /**
  * Data Plugin - public
  *
@@ -58,7 +83,9 @@ export interface DataSetup {
  * in the setup/start interfaces. The remaining items exported here are either types,
  * or static code.
  */
-export class DataPlugin implements Plugin<DataSetup, {}, DataPluginSetupDependencies> {
+export class DataPlugin
+  implements
+    Plugin<DataSetup, DataStart, DataPluginSetupDependencies, DataPluginStartDependencies> {
   // Exposed services, sorted alphabetically
   private readonly filter: FilterService = new FilterService();
   private readonly indexPatterns: IndexPatternsService = new IndexPatternsService();
@@ -96,9 +123,20 @@ export class DataPlugin implements Plugin<DataSetup, {}, DataPluginSetupDependen
     return this.setupApi;
   }
 
-  public start(core: CoreStart) {
+  public start(core: CoreStart, { __LEGACY, data }: DataPluginStartDependencies) {
+    const SearchBar = createSearchBar({
+      core,
+      store: __LEGACY.storage,
+      timefilter: this.setupApi.timefilter,
+      filterManager: this.setupApi.filter.filterManager,
+      autocomplete: data.autocomplete,
+    });
+
     return {
       ...this.setupApi!,
+      ui: {
+        SearchBar,
+      },
     };
   }