Merge branch 'master' into stabilize-rollup-test

Author: elasticmachine

src/dev/i18n/__snapshots__/integrate_locale_files.test.ts.snap

@@ -63,6 +63,9 @@ export async function matchEntriesWithExctractors(inputPath, options = {}) {
   const ignore = [
     '**/node_modules/**',
     '**/__tests__/**',
+    '**/dist/**',
+    '**/target/**',
+    '**/vendor/**',
     '**/*.test.{js,jsx,ts,tsx}',
     '**/*.d.ts',
   ].concat(additionalIgnore);

src/dev/i18n/extract_default_translations.js

@@ -34,5 +34,5 @@ export const serializeToJson: Serializer = (messages, formats = i18n.formats) =>
     }
   }
 
-  return JSON.stringify(resultJsonObject, undefined, 2);
+  return JSON.stringify(resultJsonObject, undefined, 2).concat('\n');
 };

src/dev/i18n/serializers/__snapshots__/json.test.ts.snap

@@ -190,6 +190,7 @@ <h1 class="euiScreenReaderOnly">{{screenTitle}}</h1>
                 data-shared-item
                 data-title="{{opts.savedSearch.lastSavedTitle}}"
                 data-description="{{opts.savedSearch.description}}"
+                data-test-subj="discoverDocTable"
                 minimum-visible-rows="minimumVisibleRows"
                 render-complete
                 on-add-column="addColumn"

src/dev/i18n/serializers/json.ts

@@ -31,14 +31,14 @@ import { TelemetryPluginStart } from '../../../../../plugins/telemetry/public';
 import {
   Environment,
   HomePublicPluginSetup,
+  TutorialStart,
   HomePublicPluginStart,
 } from '../../../../../plugins/home/public';
 import { KibanaLegacySetup } from '../../../../../plugins/kibana_legacy/public';
 
 export interface HomeKibanaServices {
   indexPatternService: any;
   kibanaVersion: string;
-  getInjected: (name: string, defaultValue?: any) => unknown;
   chrome: ChromeStart;
   uiSettings: IUiSettingsClient;
   config: KibanaLegacySetup['config'];
@@ -54,6 +54,7 @@ export interface HomeKibanaServices {
   addBasePath: (url: string) => string;
   environment: Environment;
   telemetry?: TelemetryPluginStart;
+  tutorialVariables: TutorialStart['get'];
 }
 
 let services: HomeKibanaServices | null = null;

src/legacy/core_plugins/kibana/public/discover/np_ready/angular/discover.html

@@ -29,7 +29,7 @@ import { FeatureCatalogueCategory } from '../../../../../../../plugins/home/publ
 jest.mock('../../kibana_services', () => ({
   getServices: () => ({
     getBasePath: () => 'path',
-    getInjected: () => '',
+    tutorialVariables: () => ({}),
     homeConfig: { disableWelcomeScreen: false },
   }),
 }));

src/legacy/core_plugins/kibana/public/home/kibana_services.ts

@@ -33,17 +33,15 @@ mustacheWriter.escapedValue = function escapedValue(token, context) {
 };
 
 export function replaceTemplateStrings(text, params = {}) {
-  const { getInjected, kibanaVersion, docLinks } = getServices();
+  const { tutorialVariables, kibanaVersion, docLinks } = getServices();
 
   const variables = {
     // '{' and '}' can not be used in template since they are used as template tags.
     // Must use '{curlyOpen}'' and '{curlyClose}'
     curlyOpen: '{',
     curlyClose: '}',
     config: {
-      cloud: {
-        id: getInjected('cloudId'),
-      },
+      ...tutorialVariables(),
       docs: {
         base_url: docLinks.ELASTIC_WEBSITE_URL,
         beats: {

src/legacy/core_plugins/kibana/public/home/np_ready/components/home.test.js

@@ -57,20 +57,22 @@ export class HomePlugin implements Plugin {
 
   constructor(private initializerContext: PluginInitializerContext) {}
 
-  setup(core: CoreSetup, { home, kibanaLegacy, usageCollection }: HomePluginSetupDependencies) {
+  setup(
+    core: CoreSetup<HomePluginStartDependencies>,
+    { home, kibanaLegacy, usageCollection }: HomePluginSetupDependencies
+  ) {
     kibanaLegacy.registerLegacyApp({
       id: 'home',
       title: 'Home',
       mount: async (params: AppMountParameters) => {
         const trackUiMetric = usageCollection.reportUiStats.bind(usageCollection, 'Kibana_home');
-        const [coreStart] = await core.getStartServices();
+        const [coreStart, { home: homeStart }] = await core.getStartServices();
         setServices({
           trackUiMetric,
           kibanaVersion: this.initializerContext.env.packageInfo.version,
           http: coreStart.http,
           toastNotifications: core.notifications.toasts,
           banners: coreStart.overlays.banners,
-          getInjected: core.injectedMetadata.getInjectedVar,
           docLinks: coreStart.docLinks,
           savedObjectsClient: this.savedObjectsClient!,
           chrome: coreStart.chrome,
@@ -82,6 +84,7 @@ export class HomePlugin implements Plugin {
           environment: this.environment!,
           config: kibanaLegacy.config,
           homeConfig: home.config,
+          tutorialVariables: homeStart.tutorials.get,
           featureCatalogue: this.featureCatalogue!,
         });
         const { renderApp } = await import('./np_ready/application');

src/legacy/core_plugins/kibana/public/home/np_ready/components/tutorial/replace_template_strings.js

@@ -22,10 +22,19 @@ import { PluginInitializerContext } from 'kibana/public';
 export {
   FeatureCatalogueSetup,
   FeatureCatalogueStart,
+  EnvironmentSetup,
+  EnvironmentStart,
+  TutorialSetup,
+  TutorialStart,
   HomePublicPluginSetup,
   HomePublicPluginStart,
 } from './plugin';
-export { FeatureCatalogueEntry, FeatureCatalogueCategory, Environment } from './services';
+export {
+  FeatureCatalogueEntry,
+  FeatureCatalogueCategory,
+  Environment,
+  TutorialVariables,
+} from './services';
 export * from '../common/instruction_variant';
 import { HomePublicPlugin } from './plugin';