Correct paths

x-pack/plugins/canvas/__tests__/fixtures/function_specs.ts

@@ -5,6 +5,6 @@
  */
 
 import { functions as browserFns } from '../../canvas_plugin_src/functions/browser';
-import { ExpressionFunction } from '../../../../../../src/plugins/expressions';
+import { ExpressionFunction } from '../../../../../src/plugins/expressions';
 
 export const functionSpecs = browserFns.map(fn => new ExpressionFunction(fn()));

x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts

@@ -4,8 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { ExpressionTypeDefinition } from '../../../../../../src/plugins/expressions';
-import { EmbeddableInput } from '../../../../../../src/plugins/embeddable/public';
+import { ExpressionTypeDefinition } from '../../../../../src/plugins/expressions';
+import { EmbeddableInput } from '../../../../../src/plugins/embeddable/public';
 import { EmbeddableTypes } from './embeddable_types';
 
 export const EmbeddableExpressionType = 'embeddable';

x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts

@@ -3,11 +3,10 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
-import { MAP_SAVED_OBJECT_TYPE } from '../../../../../plugins/maps/public';
-import { VISUALIZE_EMBEDDABLE_TYPE } from '../../../../../../src/plugins/visualizations/public';
-import { LENS_EMBEDDABLE_TYPE } from '../../../../../plugins/lens/common/constants';
-import { SEARCH_EMBEDDABLE_TYPE } from '../../../../../../src/plugins/discover/public';
+import { MAP_SAVED_OBJECT_TYPE } from '../../../../plugins/maps/public';
+import { VISUALIZE_EMBEDDABLE_TYPE } from '../../../../../src/plugins/visualizations/public';
+import { LENS_EMBEDDABLE_TYPE } from '../../../../plugins/lens/common/constants';
+import { SEARCH_EMBEDDABLE_TYPE } from '../../../../../src/plugins/discover/public';
 
 export const EmbeddableTypes: {
   lens: string;

x-pack/plugins/canvas/canvas_plugin_src/functions/common/plot/get_flot_axis_config.ts

@@ -6,7 +6,7 @@
 
 import { get, map } from 'lodash';
 import { Ticks, AxisConfig, isAxisConfig } from '../../../../types';
-import { Style, PointSeriesColumns } from '../../../../../../../../src/plugins/expressions/common';
+import { Style, PointSeriesColumns } from '../../../../../../../src/plugins/expressions/common';
 
 type Position = 'bottom' | 'top' | 'left' | 'right';
 interface Config {

x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts

@@ -13,7 +13,7 @@ import {
   EmbeddableExpression,
 } from '../../expression_types';
 import { getFunctionHelp } from '../../../i18n';
-import { MapEmbeddableInput } from '../../../../../plugins/maps/public';
+import { MapEmbeddableInput } from '../../../../../legacy/plugins/maps/public';
 
 interface Arguments {
   id: string;

x-pack/plugins/canvas/canvas_plugin_src/functions/server/escount.ts

@@ -10,7 +10,7 @@ import {
 } from 'src/plugins/expressions/common';
 /* eslint-disable */
 // @ts-ignore untyped local
-import { buildESRequest } from '../../../../../../plugins/canvas/server/lib/build_es_request';
+import { buildESRequest } from '../../../server/lib/build_es_request';
 /* eslint-enable */
 import { getFunctionHelp } from '../../../i18n';
 

x-pack/plugins/canvas/canvas_plugin_src/functions/server/esdocs.ts

@@ -8,7 +8,7 @@ import squel from 'squel';
 import { ExpressionFunctionDefinition } from 'src/plugins/expressions';
 /* eslint-disable */
 // @ts-ignore untyped local
-import { queryEsSQL } from '../../../../../../plugins/canvas/server/lib/query_es_sql';
+import { queryEsSQL } from '../../../server/lib/query_es_sql';
 /* eslint-enable */
 import { ExpressionValueFilter } from '../../../types';
 import { getFunctionHelp } from '../../../i18n';

x-pack/plugins/canvas/canvas_plugin_src/functions/server/essql.ts

@@ -7,7 +7,7 @@
 import { ExpressionFunctionDefinition } from 'src/plugins/expressions/common';
 /* eslint-disable */
 // @ts-ignore untyped local
-import { queryEsSQL } from '../../../../../../plugins/canvas/server/lib/query_es_sql';
+import { queryEsSQL } from '../../../server/lib/query_es_sql';
 /* eslint-enable */
 import { ExpressionValueFilter } from '../../../types';
 import { getFunctionHelp } from '../../../i18n';

x-pack/plugins/canvas/canvas_plugin_src/plugin.ts

@@ -6,9 +6,9 @@
 
 import { CoreSetup, CoreStart, Plugin } from 'src/core/public';
 import { CanvasSetup } from '../public';
-import { EmbeddableStart } from '../../../../../src/plugins/embeddable/public';
-import { UiActionsStart } from '../../../../../src/plugins/ui_actions/public';
-import { Start as InspectorStart } from '../../../../../src/plugins/inspector/public';
+import { EmbeddableStart } from '../../../../src/plugins/embeddable/public';
+import { UiActionsStart } from '../../../../src/plugins/ui_actions/public';
+import { Start as InspectorStart } from '../../../../src/plugins/inspector/public';
 
 import { functions } from './functions/browser';
 import { typeFunctions } from './expression_types';

x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx

@@ -6,17 +6,17 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { CoreStart } from '../../../../../../../src/core/public';
+import { CoreStart } from '../../../../../../src/core/public';
 import { StartDeps } from '../../plugin';
 import {
   IEmbeddable,
   EmbeddableFactory,
   EmbeddablePanel,
   EmbeddableFactoryNotFoundError,
-} from '../../../../../../../src/plugins/embeddable/public';
+} from '../../../../../../src/plugins/embeddable/public';
 import { EmbeddableExpression } from '../../expression_types/embeddable';
 import { RendererStrings } from '../../../i18n';
-import { getSavedObjectFinder } from '../../../../../../../src/plugins/saved_objects/public';
+import { getSavedObjectFinder } from '../../../../../../src/plugins/saved_objects/public';
 import { embeddableInputToExpression } from './embeddable_input_to_expression';
 import { EmbeddableInput } from '../../expression_types';
 import { RendererHandlers } from '../../../types';

x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.test.ts

@@ -5,7 +5,7 @@
  */
 
 import { toExpression } from './map';
-import { MapEmbeddableInput } from '../../../../../maps/public';
+import { MapEmbeddableInput } from '../../../../../../legacy/plugins/maps/public';
 import { fromExpression, Ast } from '@kbn/interpreter/common';
 
 const baseSavedMapInput = {

x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.ts

@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { MapEmbeddableInput } from '../../../../../maps/public';
+import { MapEmbeddableInput } from '../../../../../../legacy/plugins/maps/public';
 
 export function toExpression(input: MapEmbeddableInput): string {
   const expressionParts = [] as string[];

x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/index.js

@@ -7,7 +7,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { RendererStrings } from '../../../i18n';
-import { Markdown } from '../../../../../../../src/plugins/kibana_react/public';
+import { Markdown } from '../../../../../../src/plugins/kibana_react/public';
 
 const { markdown: strings } = RendererStrings;
 

x-pack/plugins/canvas/common/lib/autocomplete.ts

@@ -14,7 +14,7 @@ import {
   ExpressionFunction,
   ExpressionFunctionParameter,
   getByAlias,
-} from '../../../../../../src/plugins/expressions';
+} from '../../../../../src/plugins/expressions';
 
 const MARKER = 'CANVAS_SUGGESTION_MARKER';
 

x-pack/plugins/canvas/common/lib/fonts.ts

@@ -4,4 +4,4 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export * from '../../../../../../src/plugins/expressions/common/fonts';
+export * from '../../../../../src/plugins/expressions/common/fonts';

x-pack/plugins/canvas/public/legacy_register_feature.ts → x-pack/plugins/canvas/common/lib/get_id.ts

@@ -4,11 +4,8 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { npSetup } from 'ui/new_platform';
-import { featureCatalogueEntry } from './feature_catalogue_entry';
+import uuid from 'uuid/v4';
 
-const {
-  plugins: { home },
-} = npSetup;
-
-home.featureCatalogue.register(featureCatalogueEntry);
+export function getId(type: string): string {
+  return `${type}-${uuid()}`;
+}

x-pack/plugins/canvas/i18n/elements/element_strings.test.ts

@@ -5,7 +5,7 @@
  */
 import { getElementStrings } from './element_strings';
 import { initializeElements } from '../../canvas_plugin_src/elements';
-import { coreMock } from '../../../../../../src/core/public/mocks';
+import { coreMock } from '../../../../../src/core/public/mocks';
 
 const elementSpecs = initializeElements(coreMock.createSetup() as any, {} as any);
 

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

@@ -16,7 +16,7 @@ import { AppMountParameters, CoreStart, CoreSetup } from 'kibana/public';
 import { CanvasStartDeps, CanvasSetupDeps } from './plugin';
 // @ts-ignore Untyped local
 import { App } from './components/app';
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
+import { KibanaContextProvider } from '../../../../src/plugins/kibana_react/public';
 import { initInterpreter, resetInterpreter } from './lib/run_interpreter';
 import { registerLanguage } from './lib/monaco_language_def';
 import { SetupRegistries } from './plugin_api';
@@ -26,9 +26,9 @@ import { getDocumentationLinks } from './lib/documentation_links';
 import { HelpMenu } from './components/help_menu/help_menu';
 import { createStore, destroyStore } from './store';
 
-import { VALUE_CLICK_TRIGGER, ActionByType } from '../../../../../src/plugins/ui_actions/public';
+import { VALUE_CLICK_TRIGGER, ActionByType } from '../../../../src/plugins/ui_actions/public';
 /* eslint-disable */
-import { ACTION_VALUE_CLICK } from '../../../../../src/plugins/data/public/actions/value_click_action';
+import { ACTION_VALUE_CLICK } from '../../../../src/plugins/data/public/actions/value_click_action';
 /* eslint-enable */
 import { init as initStatsReporter } from './lib/ui_metric';
 

x-pack/plugins/canvas/public/components/asset_manager/index.ts

@@ -21,7 +21,7 @@ import { getId } from '../../lib/get_id';
 // @ts-ignore Untyped Local
 import { findExistingAsset } from '../../lib/find_existing_asset';
 import { VALID_IMAGE_TYPES } from '../../../common/lib/constants';
-import { withKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { WithKibanaProps } from '../../';
 import { AssetManager as Component, Props as AssetManagerProps } from './asset_manager';
 

x-pack/plugins/canvas/public/components/element_content/index.js

@@ -9,7 +9,7 @@ import { connect } from 'react-redux';
 import { compose, withProps } from 'recompose';
 import { get } from 'lodash';
 import { getSelectedPage, getPageById } from '../../state/selectors/workpad';
-import { withKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { ElementContent as Component } from './element_content';
 
 const mapStateToProps = state => ({

x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.tsx

@@ -9,9 +9,9 @@ import { EuiFlyout, EuiFlyoutHeader, EuiFlyoutBody, EuiTitle } from '@elastic/eu
 import {
   SavedObjectFinderUi,
   SavedObjectMetaData,
-} from '../../../../../../../src/plugins/saved_objects/public/';
+} from '../../../../../../src/plugins/saved_objects/public/';
 import { ComponentStrings } from '../../../i18n';
-import { CoreStart } from '../../../../../../../src/core/public';
+import { CoreStart } from '../../../../../../src/core/public';
 import { CanvasStartDeps } from '../../plugin';
 
 const { AddEmbeddableFlyout: strings } = ComponentStrings;

x-pack/plugins/canvas/public/components/embeddable_flyout/index.tsx

@@ -15,7 +15,7 @@ import { addElement } from '../../state/actions/elements';
 import { getSelectedPage } from '../../state/selectors/workpad';
 import { EmbeddableTypes } from '../../../canvas_plugin_src/expression_types/embeddable';
 import { WithKibanaProps } from '../../index';
-import { withKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '../../../../../../src/plugins/kibana_react/public';
 
 const allowedEmbeddables = {
   [EmbeddableTypes.map]: (id: string) => {

x-pack/plugins/canvas/public/components/expression/index.js

@@ -15,7 +15,7 @@ import {
   renderComponent,
 } from 'recompose';
 import { fromExpression } from '@kbn/interpreter/common';
-import { withKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { getSelectedPage, getSelectedElement } from '../../state/selectors/workpad';
 import { setExpression, flushContext } from '../../state/actions/elements';
 import { ElementNotSelected } from './element_not_selected';

x-pack/plugins/canvas/public/components/expression_input/expression_input.tsx

@@ -9,8 +9,8 @@ import PropTypes from 'prop-types';
 import { EuiFormRow } from '@elastic/eui';
 import { debounce } from 'lodash';
 import { monaco } from '@kbn/ui-shared-deps/monaco';
-import { ExpressionFunction } from '../../../../../../../src/plugins/expressions';
-import { CodeEditor } from '../../../../../../../src/plugins/kibana_react/public';
+import { ExpressionFunction } from '../../../types';
+import { CodeEditor } from '../../../../../../src/plugins/kibana_react/public';
 import {
   AutocompleteSuggestion,
   getAutocompleteSuggestions,

x-pack/plugins/canvas/public/components/expression_input/reference.ts

@@ -8,7 +8,7 @@ import { ComponentStrings } from '../../../i18n';
 import {
   ExpressionFunction,
   ExpressionFunctionParameter,
-} from '../../../../../../../src/plugins/expressions';
+} from '../../../../../../src/plugins/expressions';
 
 const { ExpressionInput: strings } = ComponentStrings;
 

x-pack/plugins/canvas/public/components/render_with_fn/index.js

@@ -7,7 +7,7 @@
 import { compose, withProps, withPropsOnChange } from 'recompose';
 import PropTypes from 'prop-types';
 import isEqual from 'react-fast-compare';
-import { withKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { RenderWithFn as Component } from './render_with_fn';
 import { ElementHandlers } from './lib/handlers';
 

x-pack/plugins/canvas/public/components/saved_elements_modal/index.ts

@@ -11,7 +11,7 @@ import { camelCase } from 'lodash';
 // @ts-ignore Untyped local
 import { cloneSubgraphs } from '../../lib/clone_subgraphs';
 import * as customElementService from '../../lib/custom_element_service';
-import { withKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { WithKibanaProps } from '../../';
 // @ts-ignore Untyped local
 import { selectToplevelNodes } from '../../state/actions/transient';

x-pack/plugins/canvas/public/components/workpad_header/element_menu/index.tsx

@@ -8,7 +8,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 import { compose, withProps } from 'recompose';
 import { Dispatch } from 'redux';
-import { withKibana } from '../../../../../../../../src/plugins/kibana_react/public/';
+import { withKibana } from '../../../../../../../src/plugins/kibana_react/public/';
 import { State, ElementSpec } from '../../../../types';
 // @ts-ignore Untyped local
 import { elementsRegistry } from '../../../lib/elements_registry';

x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/index.ts

@@ -25,7 +25,7 @@ import { API_ROUTE_SHAREABLE_ZIP } from '../../../../../common/lib/constants';
 import { renderFunctionNames } from '../../../../../shareable_runtime/supported_renderers';
 
 import { ComponentStrings } from '../../../../../i18n/components';
-import { withKibana } from '../../../../../../../../../src/plugins/kibana_react/public/';
+import { withKibana } from '../../../../../../../../src/plugins/kibana_react/public/';
 import { OnCloseFn } from '../share_menu';
 import { WithKibanaProps } from '../../../../index';
 const { WorkpadHeaderShareMenu: strings } = ComponentStrings;

x-pack/plugins/canvas/public/components/workpad_header/share_menu/index.ts

@@ -6,14 +6,14 @@
 
 import { connect } from 'react-redux';
 import { compose, withProps } from 'recompose';
-import { jobCompletionNotifications } from '../../../../../../../plugins/reporting/public';
+import { jobCompletionNotifications } from '../../../../../../plugins/reporting/public';
 import { getWorkpad, getPages } from '../../../state/selectors/workpad';
 import { getWindow } from '../../../lib/get_window';
 import { downloadWorkpad } from '../../../lib/download_workpad';
 import { ShareMenu as Component, Props as ComponentProps } from './share_menu';
 import { getPdfUrl, createPdf } from './utils';
 import { State, CanvasWorkpad } from '../../../../types';
-import { withKibana } from '../../../../../../../../src/plugins/kibana_react/public/';
+import { withKibana } from '../../../../../../../src/plugins/kibana_react/public/';
 import { WithKibanaProps } from '../../../index';
 
 import { ComponentStrings } from '../../../../i18n';

x-pack/plugins/canvas/public/components/workpad_header/share_menu/utils.ts

@@ -9,7 +9,7 @@ import rison from 'rison-node';
 import { IBasePath } from 'kibana/public';
 import { fetch } from '../../../../common/lib/fetch';
 import { CanvasWorkpad } from '../../../../types';
-import { url } from '../../../../../../../../src/plugins/kibana_utils/public';
+import { url } from '../../../../../../../src/plugins/kibana_utils/public';
 
 // type of the desired pdf output (print or preserve_layout)
 const PDF_LAYOUT_TYPE = 'preserve_layout';

x-pack/plugins/canvas/public/components/workpad_header/view_menu/index.ts

@@ -7,7 +7,7 @@
 import { connect } from 'react-redux';
 import { compose, withHandlers } from 'recompose';
 import { Dispatch } from 'redux';
-import { withKibana } from '../../../../../../../../src/plugins/kibana_react/public/';
+import { withKibana } from '../../../../../../../src/plugins/kibana_react/public/';
 import { zoomHandlerCreators } from '../../../lib/app_handler_creators';
 import { State, CanvasWorkpadBoundingBox } from '../../../../types';
 // @ts-ignore Untyped local

x-pack/plugins/canvas/public/components/workpad_loader/index.js

@@ -14,7 +14,7 @@ import { getWorkpad } from '../../state/selectors/workpad';
 import { getId } from '../../lib/get_id';
 import { downloadWorkpad } from '../../lib/download_workpad';
 import { ComponentStrings, ErrorStrings } from '../../../i18n';
-import { withKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { WorkpadLoader as Component } from './workpad_loader';
 
 const { WorkpadLoader: strings } = ComponentStrings;

x-pack/plugins/canvas/public/components/workpad_templates/index.js

@@ -9,7 +9,7 @@ import { compose, getContext, withHandlers, withProps } from 'recompose';
 import * as workpadService from '../../lib/workpad_service';
 import { getId } from '../../lib/get_id';
 import { templatesRegistry } from '../../lib/templates_registry';
-import { withKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { WorkpadTemplates as Component } from './workpad_templates';
 
 export const WorkpadTemplates = compose(

x-pack/plugins/canvas/public/feature_catalogue_entry.ts

@@ -5,7 +5,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { FeatureCatalogueCategory } from '../../../../../src/plugins/home/public';
+import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
 
 export const featureCatalogueEntry = {
   id: 'canvas',

x-pack/plugins/canvas/public/index.ts

@@ -5,6 +5,16 @@
  */
 
 import { PluginInitializerContext } from 'kibana/public';
-import { CanvasPlugin } from '../../../legacy/plugins/canvas/public/plugin';
+import { CoreStart } from '../../../../src/core/public';
+import { CanvasServices } from './services';
+import { CanvasSetup, CanvasStart, CanvasStartDeps, CanvasPlugin } from './plugin';
+
+export { CanvasSetup, CanvasStart };
+
+export interface WithKibanaProps {
+  kibana: {
+    services: CoreStart & CanvasStartDeps & { canvas: CanvasServices };
+  };
+}
 
 export const plugin = (initializerContext: PluginInitializerContext) => new CanvasPlugin();