Merge branch 'master' into savedObjectsBetweenVersionsTest

.github/ISSUE_TEMPLATE/v8_breaking_change.md

@@ -2,7 +2,7 @@
 name: 8.0 Breaking change
 about: Breaking changes from 7.x -> 8.0
 title: "[Breaking change]"
-labels: Team:Elasticsearch UI, Feature:Upgrade Assistant, Breaking Change
+labels: Feature:Upgrade Assistant, Breaking Change
 assignees: ''
 
 ---
@@ -12,8 +12,8 @@ assignees: ''
 ******* LABEL CHANGES NECESSARY ********
 ****************************************
  
-Please add a "NeededFor:${TeamName}" label to denote the team that is
-requesting the breaking change to be surfaced in the Upgrade Assistant.
+Please add a team label to denote the team that the
+breaking change is applicable to.
  
 -->
 
@@ -30,16 +30,14 @@ requesting the breaking change to be surfaced in the Upgrade Assistant.
 <!-- e.g. Based on telemetry data, roughly 75% of our users will need to make changes to x. -->
 <!-- e.g. A majority of users will need to make changes to x. -->
 
-**How can we programmatically determine whether the cluster is affected by this breaking change?**
+**Can the change be registered with the [Kibana deprecation service](https://github.com/elastic/kibana/blob/master/docs/development/core/server/kibana-plugin-core-server.deprecationsservicesetup.md)?**
 
-**What can users do to address the change manually?**
+<!-- The deprecation service is consumed by the Upgrade Assistant to surface Kibana deprecations.
+  It provides a way for Kibana deprecations to be resolved automatically via an API
+  or manually by providing step-by-step instructions for users to follow. -->
 
-<!-- If applicable, describe the manual migration steps and/or link to available docs. -->
-
-**How could we make migration easier with the Upgrade Assistant?**
-
-<!-- This can be as basic as notifying the user about the deprecation and linking to some
-  migration docs, or as advanced as a dedicated UI for fixing the problem. -->
+<!-- Each plugin owner is responsible for registering their deprecations via the service.
+  Please link to the issue/PR that will add this functionality. -->
 
 **Are there any edge cases?**
 

docs/discover/search.asciidoc

@@ -110,7 +110,7 @@ image::discover/images/read-only-badge.png[Example of Discover's read only acces
 ==== Save a search
 To save the current search:
 
-. Click *Save* in the Kibana toolbar.
+. Click *Save* in the toolbar.
 . Enter a name for the search and click *Save*.
 
 To import, export, and delete saved searches, open the main menu,
@@ -119,7 +119,7 @@ then click *Stack Management > Saved Objects*.
 ==== Open a saved search
 To load a saved search into Discover:
 
-. Click *Open* in the Kibana toolbar.
+. Click *Open* in the toolbar.
 . Select the search you want to open.
 
 If the saved search is associated with a different index pattern than is currently

packages/kbn-cli-dev-mode/src/dev_server.ts

@@ -249,5 +249,11 @@ export class DevServer {
         )
         .subscribe(subscriber)
     );
+
+    // complete state subjects when run$ completes
+    subscriber.add(() => {
+      this.phase$.complete();
+      this.ready$.complete();
+    });
   });
 }

packages/kbn-cli-dev-mode/src/optimizer.test.ts

@@ -180,6 +180,7 @@ it('is ready when optimizer phase is success or issue and logs in familiar forma
       "ready: false",
       "<issue>",
       "ready: true",
+      "complete",
     ]
   `);
 

packages/kbn-cli-dev-mode/src/optimizer.ts

@@ -107,14 +107,26 @@ export class Optimizer {
       },
     ]);
 
-    this.run$ = runOptimizer(config).pipe(
-      logOptimizerState(log, config),
-      tap(({ state }) => {
-        this.phase$.next(state.phase);
-        this.ready$.next(state.phase === 'success' || state.phase === 'issue');
-      }),
-      ignoreElements()
-    );
+    this.run$ = new Rx.Observable<void>((subscriber) => {
+      subscriber.add(
+        runOptimizer(config)
+          .pipe(
+            logOptimizerState(log, config),
+            tap(({ state }) => {
+              this.phase$.next(state.phase);
+              this.ready$.next(state.phase === 'success' || state.phase === 'issue');
+            }),
+            ignoreElements()
+          )
+          .subscribe(subscriber)
+      );
+
+      // complete state subjects when run$ completes
+      subscriber.add(() => {
+        this.phase$.complete();
+        this.ready$.complete();
+      });
+    });
   }
 
   getPhase$() {

packages/kbn-cli-dev-mode/src/watcher.ts

@@ -103,6 +103,11 @@ export class Watcher {
         .pipe(ignoreElements())
         .subscribe(subscriber)
     );
+
+    // complete state subjects when run$ completes
+    subscriber.add(() => {
+      this.restart$.complete();
+    });
   });
 
   serverShouldRestart$() {

packages/kbn-optimizer/src/cli.ts

@@ -6,8 +6,6 @@
  * Side Public License, v 1.
  */
 
-import 'source-map-support/register';
-
 import Path from 'path';
 
 import { REPO_ROOT } from '@kbn/utils';

packages/kbn-storybook/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "incremental": false,
     "outDir": "target",

scripts/build_kibana_platform_plugins.js

@@ -7,6 +7,7 @@
  */
 
 require('../src/setup_node_env/ensure_node_preserve_symlinks');
+require('source-map-support/register');
 require('@kbn/optimizer').runKbnOptimizerCli({
   defaultLimitsPath: require.resolve('../packages/kbn-optimizer/limits.yml'),
 });

src/core/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.base.json",
+  "extends": "../../tsconfig.project.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",

src/dev/typescript/project.ts

@@ -7,7 +7,7 @@
  */
 
 import { basename, dirname, relative, resolve } from 'path';
-
+import { memoize } from 'lodash';
 import { IMinimatch, Minimatch } from 'minimatch';
 import { REPO_ROOT } from '@kbn/utils';
 
@@ -26,6 +26,10 @@ function testMatchers(matchers: IMinimatch[], path: string) {
   return matchers.some((matcher) => matcher.match(path));
 }
 
+const parentProjectFactory = memoize(function (parentConfigPath: string) {
+  return new Project(parentConfigPath);
+});
+
 export class Project {
   public directory: string;
   public name: string;
@@ -34,22 +38,24 @@ export class Project {
 
   private readonly include: IMinimatch[];
   private readonly exclude: IMinimatch[];
+  private readonly parent?: Project;
 
   constructor(
     public tsConfigPath: string,
     options: { name?: string; disableTypeCheck?: boolean } = {}
   ) {
     this.config = parseTsConfig(tsConfigPath);
 
-    const { files, include, exclude = [] } = this.config as {
+    const { files, include, exclude = [], extends: extendsPath } = this.config as {
       files?: string[];
       include?: string[];
       exclude?: string[];
+      extends?: string;
     };
 
     if (files || !include) {
       throw new Error(
-        'tsconfig.json files in the Kibana repo must use "include" keys and not "files"'
+        `[${tsConfigPath}]: tsconfig.json files in the Kibana repo must use "include" keys and not "files"`
       );
     }
 
@@ -58,9 +64,30 @@ export class Project {
     this.name = options.name || relative(REPO_ROOT, this.directory) || basename(this.directory);
     this.include = makeMatchers(this.directory, include);
     this.exclude = makeMatchers(this.directory, exclude);
+
+    if (extendsPath !== undefined) {
+      const parentConfigPath = resolve(this.directory, extendsPath);
+      this.parent = parentProjectFactory(parentConfigPath);
+    }
+  }
+
+  public isAbsolutePathSelected(path: string): boolean {
+    return this.isExcluded(path) ? false : this.isIncluded(path);
   }
 
-  public isAbsolutePathSelected(path: string) {
-    return testMatchers(this.exclude, path) ? false : testMatchers(this.include, path);
+  public isExcluded(path: string): boolean {
+    if (testMatchers(this.exclude, path)) return true;
+    if (this.parent) {
+      return this.parent.isExcluded(path);
+    }
+    return false;
+  }
+
+  public isIncluded(path: string): boolean {
+    if (testMatchers(this.include, path)) return true;
+    if (this.parent) {
+      return this.parent.isIncluded(path);
+    }
+    return false;
   }
 }

src/plugins/advanced_settings/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.project.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",

src/plugins/apm_oss/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.project.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",

src/plugins/bfetch/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.project.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",

src/plugins/charts/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.project.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",

src/plugins/console/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.project.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",

src/plugins/dashboard/public/application/dashboard_router.tsx

@@ -84,6 +84,7 @@ export async function mountApp({
 
   const spacesApi = pluginsStart.spacesOss?.isSpacesAvailable ? pluginsStart.spacesOss : undefined;
   const activeSpaceId = spacesApi && (await spacesApi.activeSpace$.pipe(first()).toPromise())?.id;
+  let globalEmbedSettings: DashboardEmbedSettings | undefined;
 
   const dashboardServices: DashboardAppServices = {
     navigation,
@@ -149,9 +150,6 @@ export async function mountApp({
   const getDashboardEmbedSettings = (
     routeParams: ParsedQuery<string>
   ): DashboardEmbedSettings | undefined => {
-    if (!routeParams.embed) {
-      return undefined;
-    }
     return {
       forceShowTopNavMenu: Boolean(routeParams[dashboardUrlParams.showTopMenu]),
       forceShowQueryInput: Boolean(routeParams[dashboardUrlParams.showQueryInput]),
@@ -162,11 +160,13 @@ export async function mountApp({
 
   const renderDashboard = (routeProps: RouteComponentProps<{ id?: string }>) => {
     const routeParams = parse(routeProps.history.location.search);
-    const embedSettings = getDashboardEmbedSettings(routeParams);
+    if (routeParams.embed && !globalEmbedSettings) {
+      globalEmbedSettings = getDashboardEmbedSettings(routeParams);
+    }
     return (
       <DashboardApp
         history={routeProps.history}
-        embedSettings={embedSettings}
+        embedSettings={globalEmbedSettings}
         savedDashboardId={routeProps.match.params.id}
         redirectTo={(props: RedirectToProps) => redirect(routeProps, props)}
       />

src/plugins/dashboard/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.project.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",

src/plugins/data/common/search/expressions/exists_filter.test.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createMockContext } from '../../../../expressions/common';
+import { createMockContext } from '../../../../expressions/common/mocks';
 import { functionWrapper } from './utils';
 import { existsFilterFunction } from './exists_filter';
 

src/plugins/data/common/search/expressions/kibana_filter.test.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createMockContext } from '../../../../expressions/common';
+import { createMockContext } from '../../../../expressions/common/mocks';
 import { functionWrapper } from './utils';
 import { kibanaFilterFunction } from './kibana_filter';
 

src/plugins/data/common/search/expressions/phrase_filter.test.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createMockContext } from '../../../../expressions/common';
+import { createMockContext } from '../../../../expressions/common/mocks';
 import { functionWrapper } from './utils';
 import { phraseFilterFunction } from './phrase_filter';
 

src/plugins/data/common/search/expressions/range_filter.test.ts

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { createMockContext } from '../../../../expressions/common';
+import { createMockContext } from '../../../../expressions/common/mocks';
 import { functionWrapper } from './utils';
 import { rangeFilterFunction } from './range_filter';
 

src/plugins/data/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.project.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",

src/plugins/dev_tools/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.project.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",

src/plugins/discover/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.project.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",

src/plugins/embeddable/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.project.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",

src/plugins/es_ui_shared/tsconfig.json

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../tsconfig.project.json",
   "compilerOptions": {
     "composite": true,
     "outDir": "./target/types",

src/plugins/expressions/common/mocks.ts

@@ -34,3 +34,5 @@ export const createMockExecutionContext = <ExtraContext extends object = object>
     ...extraContext,
   };
 };
+
+export { createMockContext } from './util/test_utils';

src/plugins/expressions/common/util/index.ts

@@ -10,4 +10,3 @@ export * from './create_error';
 export * from './get_by_alias';
 export * from './tables_adapter';
 export * from './expressions_inspector_adapter';
-export * from './test_utils';