Merge branch '7.x' into backport/7.x/pr-56046

docs/api/saved-objects/import.asciidoc

@@ -49,7 +49,7 @@ Import an index pattern and dashboard:
 
 [source,js]
 --------------------------------------------------
-$ curl -X POST "localhost:5601/api/saved_objects/_import" -H "kbn-xsrf: true" --form file=@file.ndjson <1>
+$ curl -X POST "localhost:5601/api/saved_objects/_import" -H "kbn-xsrf: true" --form file=@file.ndjson
 --------------------------------------------------
 
 The `file.ndjson` file contains the following:

x-pack/legacy/plugins/canvas/.storybook/storyshots.test.js

@@ -50,14 +50,6 @@ jest.mock('@elastic/eui/packages/react-datepicker', () => {
 
 jest.mock('plugins/interpreter/registries', () => ({}));
 
-// Disabling this test due to https://github.com/elastic/eui/issues/2242
-jest.mock(
-  '../public/components/workpad_header/workpad_export/__examples__/disabled_panel.stories',
-  () => {
-    return 'Disabled Panel';
-  }
-);
-
 // Disabling this test due to https://github.com/elastic/eui/issues/2242
 jest.mock(
   '../public/components/workpad_header/workpad_export/flyout/__examples__/share_website_flyout.stories',

x-pack/legacy/plugins/canvas/i18n/angular.ts → x-pack/legacy/plugins/canvas/i18n/capabilities.ts

@@ -7,13 +7,13 @@
 import { i18n } from '@kbn/i18n';
 import { CANVAS as canvas } from './constants';
 
-export const AngularStrings = {
-  CanvasRootController: {
-    getReadOnlyBadgeText: () =>
+export const CapabilitiesStrings = {
+  ReadOnlyBadge: {
+    getText: () =>
       i18n.translate('xpack.canvas.badge.readOnly.text', {
         defaultMessage: 'Read only',
       }),
-    getReadOnlyBadgeTooltip: () =>
+    getTooltip: () =>
       i18n.translate('xpack.canvas.badge.readOnly.tooltip', {
         defaultMessage: 'Unable to save {canvas} workpads',
         values: {

x-pack/legacy/plugins/canvas/i18n/index.ts

@@ -6,7 +6,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-export * from './angular';
+export * from './capabilities';
 export * from './components';
 export * from './constants';
 export * from './errors';

x-pack/legacy/plugins/canvas/public/application.tsx

@@ -0,0 +1,36 @@
+/*
+ * 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.
+ */
+
+import React from 'react';
+import { Store } from 'redux';
+import ReactDOM from 'react-dom';
+import { I18nProvider } from '@kbn/i18n/react';
+import { Provider } from 'react-redux';
+
+import { AppMountParameters, CoreStart } from 'kibana/public';
+
+// @ts-ignore Untyped local
+import { App } from './components/app';
+import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
+
+export const renderApp = (
+  coreStart: CoreStart,
+  plugins: object,
+  { element }: AppMountParameters,
+  canvasStore: Store
+) => {
+  ReactDOM.render(
+    <KibanaContextProvider services={{ ...coreStart, ...plugins }}>
+      <I18nProvider>
+        <Provider store={canvasStore}>
+          <App />
+        </Provider>
+      </I18nProvider>
+    </KibanaContextProvider>,
+    element
+  );
+  return () => ReactDOM.unmountComponentAtNode(element);
+};

x-pack/legacy/plugins/canvas/public/components/workpad_header/workpad_export/__examples__/workpad_export.examples.tsx

@@ -8,26 +8,13 @@ import { action } from '@storybook/addon-actions';
 import React from 'react';
 import { WorkpadExport } from '../workpad_export';
 
-storiesOf('components/Export/WorkpadExport', module)
-  .add('enabled', () => (
-    <WorkpadExport
-      enabled={true}
-      onCopy={action('onCopy')}
-      onExport={action('onExport')}
-      getExportUrl={(type: string) => {
-        action(`getExportUrl('${type}')`);
-        return type;
-      }}
-    />
-  ))
-  .add('disabled', () => (
-    <WorkpadExport
-      enabled={false}
-      onCopy={action('onCopy')}
-      onExport={action('onExport')}
-      getExportUrl={(type: string) => {
-        action(`getExportUrl('${type}')`);
-        return type;
-      }}
-    />
-  ));
+storiesOf('components/Export/WorkpadExport', module).add('enabled', () => (
+  <WorkpadExport
+    onCopy={action('onCopy')}
+    onExport={action('onExport')}
+    getExportUrl={(type: string) => {
+      action(`getExportUrl('${type}')`);
+      return type;
+    }}
+  />
+));