diff --git a/.eslintignore b/.eslintignore index 53b3d807204390..362b3e42d48e5f 100644 --- a/.eslintignore +++ b/.eslintignore @@ -26,10 +26,10 @@ target /src/plugins/vis_type_timelion/public/webpackShims/jquery.flot.* /x-pack/legacy/plugins/**/__tests__/fixtures/** /x-pack/plugins/apm/e2e/cypress/**/snapshots.js -/x-pack/legacy/plugins/canvas/canvas_plugin -/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts -/x-pack/legacy/plugins/canvas/shareable_runtime/build -/x-pack/legacy/plugins/canvas/storybook +/x-pack/plugins/canvas/canvas_plugin +/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts +/x-pack/plugins/canvas/shareable_runtime/build +/x-pack/plugins/canvas/storybook /x-pack/plugins/monitoring/public/lib/jquery_flot /x-pack/legacy/plugins/infra/common/graphql/types.ts /x-pack/legacy/plugins/infra/public/graphql/types.ts diff --git a/.eslintrc.js b/.eslintrc.js index 52a83452bd00f4..dde0ce010d4d44 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -89,7 +89,7 @@ module.exports = { }, }, { - files: ['x-pack/legacy/plugins/canvas/**/*.{js,ts,tsx}'], + files: ['x-pack/plugins/canvas/**/*.{js,ts,tsx}'], rules: { 'react-hooks/exhaustive-deps': 'off', 'jsx-a11y/click-events-have-key-events': 'off', @@ -893,7 +893,7 @@ module.exports = { * Canvas overrides */ { - files: ['x-pack/legacy/plugins/canvas/**/*.js'], + files: ['x-pack/plugins/canvas/**/*.js'], rules: { radix: 'error', @@ -937,12 +937,12 @@ module.exports = { }, { files: [ - 'x-pack/legacy/plugins/canvas/gulpfile.js', - 'x-pack/legacy/plugins/canvas/scripts/*.js', - 'x-pack/legacy/plugins/canvas/tasks/*.js', - 'x-pack/legacy/plugins/canvas/tasks/**/*.js', - 'x-pack/legacy/plugins/canvas/__tests__/**/*.js', - 'x-pack/legacy/plugins/canvas/**/{__tests__,__test__,__jest__,__fixtures__,__mocks__}/**/*.js', + 'x-pack/plugins/canvas/gulpfile.js', + 'x-pack/plugins/canvas/scripts/*.js', + 'x-pack/plugins/canvas/tasks/*.js', + 'x-pack/plugins/canvas/tasks/**/*.js', + 'x-pack/plugins/canvas/__tests__/**/*.js', + 'x-pack/plugins/canvas/**/{__tests__,__test__,__jest__,__fixtures__,__mocks__}/**/*.js', ], rules: { 'import/no-extraneous-dependencies': [ @@ -955,7 +955,7 @@ module.exports = { }, }, { - files: ['x-pack/legacy/plugins/canvas/canvas_plugin_src/**/*.js'], + files: ['x-pack/plugins/canvas/canvas_plugin_src/**/*.js'], globals: { canvas: true, $: true }, rules: { 'import/no-unresolved': [ @@ -967,13 +967,13 @@ module.exports = { }, }, { - files: ['x-pack/legacy/plugins/canvas/public/**/*.js'], + files: ['x-pack/plugins/canvas/public/**/*.js'], env: { browser: true, }, }, { - files: ['x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/**/*.js'], + files: ['x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/**/*.js'], env: { jquery: true, }, diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 280cb6fbd1b1d6..638e86ef375fe6 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -77,7 +77,7 @@ /x-pack/legacy/plugins/beats_management/ @elastic/beats # Canvas -/x-pack/legacy/plugins/canvas/ @elastic/kibana-canvas +/x-pack/plugins/canvas/ @elastic/kibana-canvas # Observability UIs /x-pack/legacy/plugins/infra/ @elastic/logs-metrics-ui diff --git a/.sass-lint.yml b/.sass-lint.yml index 44b4d493841361..c8985108dabf26 100644 --- a/.sass-lint.yml +++ b/.sass-lint.yml @@ -5,14 +5,14 @@ files: - 'src/plugins/vis_type_vislib/**/*.s+(a|c)ss' - 'src/plugins/vis_type_xy/**/*.s+(a|c)ss' - 'x-pack/legacy/plugins/security/**/*.s+(a|c)ss' - - 'x-pack/legacy/plugins/canvas/**/*.s+(a|c)ss' + - 'x-pack/plugins/canvas/**/*.s+(a|c)ss' - 'x-pack/plugins/triggers_actions_ui/**/*.s+(a|c)ss' - 'x-pack/plugins/lens/**/*.s+(a|c)ss' - 'x-pack/plugins/cross_cluster_replication/**/*.s+(a|c)ss' - 'x-pack/legacy/plugins/maps/**/*.s+(a|c)ss' - 'x-pack/plugins/maps/**/*.s+(a|c)ss' ignore: - - 'x-pack/legacy/plugins/canvas/shareable_runtime/**/*.s+(a|c)ss' + - 'x-pack/plugins/canvas/shareable_runtime/**/*.s+(a|c)ss' rules: quotes: - 2 diff --git a/package.json b/package.json index 30d488eb04992d..178ccbac7d420c 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "test:ftr:server": "node scripts/functional_tests_server", "test:ftr:runner": "node scripts/functional_test_runner", "test:coverage": "grunt test:coverage", - "typespec": "typings-tester --config x-pack/legacy/plugins/canvas/public/lib/aeroelastic/tsconfig.json x-pack/legacy/plugins/canvas/public/lib/aeroelastic/__fixtures__/typescript/typespec_tests.ts", + "typespec": "typings-tester --config x-pack/plugins/canvas/public/lib/aeroelastic/tsconfig.json x-pack/plugins/canvas/public/lib/aeroelastic/__fixtures__/typescript/typespec_tests.ts", "checkLicenses": "node scripts/check_licenses --dev", "build": "node scripts/build --all-platforms", "start": "node scripts/kibana --dev", diff --git a/src/cli/cluster/cluster_manager.ts b/src/cli/cluster/cluster_manager.ts index 97dec3eead303c..3b3e4d78320d24 100644 --- a/src/cli/cluster/cluster_manager.ts +++ b/src/cli/cluster/cluster_manager.ts @@ -268,7 +268,7 @@ export class ClusterManager { fromRoot('x-pack/plugins/siem/cypress'), fromRoot('x-pack/plugins/apm/e2e'), fromRoot('x-pack/plugins/apm/scripts'), - fromRoot('x-pack/legacy/plugins/canvas/canvas_plugin_src'), // prevents server from restarting twice for Canvas plugin changes, + fromRoot('x-pack/plugins/canvas/canvas_plugin_src'), // prevents server from restarting twice for Canvas plugin changes, 'plugins/java_languageserver', ]; diff --git a/src/dev/precommit_hook/casing_check_config.js b/src/dev/precommit_hook/casing_check_config.js index 8630221b3e94f3..601dcc86352a76 100644 --- a/src/dev/precommit_hook/casing_check_config.js +++ b/src/dev/precommit_hook/casing_check_config.js @@ -35,8 +35,8 @@ export const IGNORE_FILE_GLOBS = [ '**/Gruntfile.js', 'tasks/config/**/*', '**/{Dockerfile,docker-compose.yml}', - 'x-pack/legacy/plugins/canvas/tasks/**/*', - 'x-pack/legacy/plugins/canvas/canvas_plugin_src/**/*', + 'x-pack/plugins/canvas/tasks/**/*', + 'x-pack/plugins/canvas/canvas_plugin_src/**/*', 'x-pack/plugins/monitoring/public/lib/jquery_flot/**/*', '**/.*', '**/{webpackShims,__mocks__}/**/*', @@ -48,7 +48,7 @@ export const IGNORE_FILE_GLOBS = [ 'vars/*', // Files in this directory must match a pre-determined name in some cases. - 'x-pack/legacy/plugins/canvas/.storybook/*', + 'x-pack/plugins/canvas/.storybook/*', // filename must match language code which requires capital letters '**/translations/*.json', diff --git a/src/dev/storybook/aliases.ts b/src/dev/storybook/aliases.ts index 0e91f0a214a45a..416702c56d852f 100644 --- a/src/dev/storybook/aliases.ts +++ b/src/dev/storybook/aliases.ts @@ -20,7 +20,7 @@ export const storybookAliases = { advanced_ui_actions: 'x-pack/plugins/advanced_ui_actions/scripts/storybook.js', apm: 'x-pack/plugins/apm/scripts/storybook.js', - canvas: 'x-pack/legacy/plugins/canvas/scripts/storybook_new.js', + canvas: 'x-pack/plugins/canvas/scripts/storybook_new.js', codeeditor: 'src/plugins/kibana_react/public/code_editor/scripts/storybook.ts', dashboard_enhanced: 'x-pack/plugins/dashboard_enhanced/scripts/storybook.js', drilldowns: 'x-pack/plugins/drilldowns/scripts/storybook.js', diff --git a/test/scripts/jenkins_xpack.sh b/test/scripts/jenkins_xpack.sh index 951ba8e22d8858..c1243527de2c37 100755 --- a/test/scripts/jenkins_xpack.sh +++ b/test/scripts/jenkins_xpack.sh @@ -38,7 +38,7 @@ else cd "$XPACK_DIR" # build runtime for canvas echo "NODE_ENV=$NODE_ENV" - node ./legacy/plugins/canvas/scripts/shareable_runtime + node ./plugins/canvas/scripts/shareable_runtime node --max-old-space-size=6144 scripts/jest --ci --verbose --detectOpenHandles --coverage # rename file in order to be unique one test -f ../target/kibana-coverage/jest/coverage-final.json \ diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json index ccf8739dd97300..a033515fef8b06 100644 --- a/x-pack/.i18nrc.json +++ b/x-pack/.i18nrc.json @@ -8,7 +8,7 @@ "xpack.alertingBuiltins": "plugins/alerting_builtins", "xpack.apm": ["legacy/plugins/apm", "plugins/apm"], "xpack.beatsManagement": "legacy/plugins/beats_management", - "xpack.canvas": "legacy/plugins/canvas", + "xpack.canvas": "plugins/canvas", "xpack.dashboard": "plugins/dashboard_enhanced", "xpack.crossClusterReplication": "plugins/cross_cluster_replication", "xpack.dashboardMode": "legacy/plugins/dashboard_mode", diff --git a/x-pack/.kibana-plugin-helpers.json b/x-pack/.kibana-plugin-helpers.json index 032783d9309f1a..ed0b38841c1a88 100644 --- a/x-pack/.kibana-plugin-helpers.json +++ b/x-pack/.kibana-plugin-helpers.json @@ -29,8 +29,8 @@ "!legacy/plugins/**/__snapshots__", "!legacy/plugins/**/__snapshots__/*", "!legacy/plugins/**/__mocks__/*", - "!legacy/plugins/canvas/shareable_runtime/test", - "!legacy/plugins/canvas/shareable_runtime/test/**/*" + "!plugins/canvas/shareable_runtime/test", + "!plugins/canvas/shareable_runtime/test/**/*" ], "skipInstallDependencies": true } diff --git a/x-pack/legacy/plugins/canvas/i18n/index.ts b/x-pack/legacy/plugins/canvas/i18n/index.ts deleted file mode 100644 index 864311d34aca08..00000000000000 --- a/x-pack/legacy/plugins/canvas/i18n/index.ts +++ /dev/null @@ -1,19 +0,0 @@ -/* - * 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. - */ - -export * from './capabilities'; -export * from './components'; -export * from './constants'; -export * from './errors'; -export * from './expression_types'; -export * from './elements'; -export * from './functions'; -export * from './renderers'; -export * from './shortcuts'; -export * from './tags'; -export * from './transitions'; -export * from './ui'; -export * from './units'; diff --git a/x-pack/legacy/plugins/canvas/index.js b/x-pack/legacy/plugins/canvas/index.js deleted file mode 100644 index d9ea54de2d8a86..00000000000000 --- a/x-pack/legacy/plugins/canvas/index.js +++ /dev/null @@ -1,68 +0,0 @@ -/* - * 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 { resolve } from 'path'; -import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server'; -import { CANVAS_APP, CANVAS_TYPE, CUSTOM_ELEMENT_TYPE } from './common/lib'; - -export function canvas(kibana) { - return new kibana.Plugin({ - id: CANVAS_APP, - configPrefix: 'xpack.canvas', - require: ['kibana', 'elasticsearch', 'xpack_main'], - publicDir: resolve(__dirname, 'public'), - uiExports: { - app: { - title: 'Canvas', - description: 'Data driven workpads', - icon: 'plugins/canvas/icon.svg', - euiIconType: 'canvasApp', - main: 'plugins/canvas/legacy_start', - category: DEFAULT_APP_CATEGORIES.analyze, - }, - interpreter: ['plugins/canvas/legacy_register_interpreter'], - styleSheetPaths: resolve(__dirname, 'public/style/index.scss'), - hacks: [ - // window.onerror override - 'plugins/canvas/lib/window_error_handler.js', - ], - home: ['plugins/canvas/legacy_register_feature'], - savedObjectsManagement: { - [CANVAS_TYPE]: { - icon: 'canvasApp', - defaultSearchField: 'name', - isImportableAndExportable: true, - getTitle(obj) { - return obj.attributes.name; - }, - getInAppUrl(obj) { - return { - path: `/app/canvas#/workpad/${encodeURIComponent(obj.id)}`, - uiCapabilitiesPath: 'canvas.show', - }; - }, - }, - [CUSTOM_ELEMENT_TYPE]: { - icon: 'canvasApp', - defaultSearchField: 'name', - isImportableAndExportable: true, - getTitle(obj) { - return obj.attributes.displayName; - }, - }, - }, - }, - - config: Joi => { - return Joi.object({ - enabled: Joi.boolean().default(true), - indexPrefix: Joi.string().default('.canvas'), - }).default(); - }, - - init: () => undefined, - }); -} diff --git a/x-pack/legacy/plugins/canvas/public/index.ts b/x-pack/legacy/plugins/canvas/public/index.ts deleted file mode 100644 index b053920fec6e4d..00000000000000 --- a/x-pack/legacy/plugins/canvas/public/index.ts +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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 { - PluginInitializer, - PluginInitializerContext, - CoreStart, -} from '../../../../../src/core/public'; -import { CanvasSetup, CanvasStart, CanvasSetupDeps, CanvasStartDeps, CanvasPlugin } from './plugin'; -import { CanvasServices } from './services'; - -export const plugin: PluginInitializer< - CanvasSetup, - CanvasStart, - CanvasSetupDeps, - CanvasStartDeps -> = (initializerContext: PluginInitializerContext) => { - return new CanvasPlugin(); -}; - -export interface WithKibanaProps { - kibana: { - services: CoreStart & CanvasStartDeps & { canvas: CanvasServices }; - }; -} - -// These are your public types & static code -export { CanvasSetup, CanvasStart }; diff --git a/x-pack/legacy/plugins/canvas/public/legacy.ts b/x-pack/legacy/plugins/canvas/public/legacy.ts deleted file mode 100644 index f4a2b309b34993..00000000000000 --- a/x-pack/legacy/plugins/canvas/public/legacy.ts +++ /dev/null @@ -1,53 +0,0 @@ -/* - * 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 { npSetup, npStart } from 'ui/new_platform'; -import { CanvasStartDeps, CanvasSetupDeps } from './plugin'; // eslint-disable-line import/order - -// @ts-ignore Untyped Kibana Lib -import chrome, { loadingCount } from 'ui/chrome'; // eslint-disable-line import/order -// @ts-ignore Untyped Kibana Lib -import { formatMsg } from '../../../../../src/plugins/kibana_legacy/public'; // eslint-disable-line import/order - -const shimCoreSetup = { - ...npSetup.core, -}; -const shimCoreStart = { - ...npStart.core, -}; - -const shimSetupPlugins: CanvasSetupDeps = { - data: npSetup.plugins.data, - expressions: npSetup.plugins.expressions, - home: npSetup.plugins.home, - usageCollection: npSetup.plugins.usageCollection, -}; -const shimStartPlugins: CanvasStartDeps = { - ...npStart.plugins, - embeddable: npStart.plugins.embeddable, - expressions: npStart.plugins.expressions, - inspector: npStart.plugins.inspector, - uiActions: npStart.plugins.uiActions, -}; - -// These methods are intended to be a replacement for import from 'ui/whatever' -// These will go away once all of this one plugin start/setup properly -// injects wherever these need to go. -export function getCoreSetup() { - return shimCoreSetup; -} - -export function getCoreStart() { - return shimCoreStart; -} - -export function getSetupPlugins() { - return shimSetupPlugins; -} - -export function getStartPlugins() { - return shimStartPlugins; -} diff --git a/x-pack/legacy/plugins/canvas/public/legacy_plugin_support.ts b/x-pack/legacy/plugins/canvas/public/legacy_plugin_support.ts deleted file mode 100644 index cfc3de8f6d54c2..00000000000000 --- a/x-pack/legacy/plugins/canvas/public/legacy_plugin_support.ts +++ /dev/null @@ -1,47 +0,0 @@ -/* - * 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. - */ - -// @ts-ignore -import { Registry, registryFactory } from '@kbn/interpreter/common'; - -type specFn = (...args: any[]) => { name: string }; - -const fnWrapper = (fn: specFn) => { - const obj = fn(); - return () => ({ - name: obj.name, - fn, - }); -}; - -class LegacyRegistry extends Registry { - register(fn: specFn) { - super.register(fnWrapper(fn)); - } - - getOriginalFns() { - return this.toArray().map(entry => entry.fn); - } -} - -export const legacyRegistries = { - browserFunctions: new LegacyRegistry(), - renderers: new LegacyRegistry(), - types: new LegacyRegistry(), - elements: new LegacyRegistry(), - transformUIs: new LegacyRegistry(), - datasourceUIs: new LegacyRegistry(), - modelUIs: new LegacyRegistry(), - viewUIs: new LegacyRegistry(), - argumentUIs: new LegacyRegistry(), - templates: new LegacyRegistry(), - tagUIs: new LegacyRegistry(), -}; - -(global as any).kbnInterpreter = Object.assign( - (global as any).kbnInterpreter || {}, - registryFactory(legacyRegistries) -); diff --git a/x-pack/legacy/plugins/canvas/public/legacy_register_interpreter.ts b/x-pack/legacy/plugins/canvas/public/legacy_register_interpreter.ts deleted file mode 100644 index 274a9875d123d6..00000000000000 --- a/x-pack/legacy/plugins/canvas/public/legacy_register_interpreter.ts +++ /dev/null @@ -1,18 +0,0 @@ -/* - * 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 { npSetup } from 'ui/new_platform'; -import { functions } from '../canvas_plugin_src/functions/browser'; -import { typeFunctions } from '../canvas_plugin_src/expression_types'; -// @ts-ignore untyped local -import { renderFunctions } from '../canvas_plugin_src/renderers'; - -functions.forEach(npSetup.plugins.expressions.registerFunction); -typeFunctions.forEach(npSetup.plugins.expressions.registerType); -renderFunctions.forEach(npSetup.plugins.expressions.registerRenderer); - -// eslint-disable-next-line import/no-default-export -export default functions; diff --git a/x-pack/legacy/plugins/canvas/public/legacy_start.ts b/x-pack/legacy/plugins/canvas/public/legacy_start.ts deleted file mode 100644 index ac647fe8a5a931..00000000000000 --- a/x-pack/legacy/plugins/canvas/public/legacy_start.ts +++ /dev/null @@ -1,27 +0,0 @@ -/* - * 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. - */ - -// TODO: These are legacy imports. We should work to have all of these come from New Platform -// Import the uiExports that the application uses -// These will go away as these plugins are converted to NP -import 'ui/autoload/all'; -import 'uiExports/savedObjectTypes'; -import 'uiExports/spyModes'; -import 'uiExports/embeddableFactories'; -import 'uiExports/interpreter'; - -import './legacy_plugin_support'; -// load application code -import 'uiExports/canvas'; - -import { PluginInitializerContext } from '../../../../../src/core/public'; -import { plugin } from './'; -import { getCoreStart, getStartPlugins, getSetupPlugins, getCoreSetup } from './legacy'; -const pluginInstance = plugin({} as PluginInitializerContext); - -// Setup and Startup the plugin -export const setup = pluginInstance.setup(getCoreSetup(), getSetupPlugins()); -export const start = pluginInstance.start(getCoreStart(), getStartPlugins()); diff --git a/x-pack/legacy/plugins/canvas/public/lib/function_definitions.js b/x-pack/legacy/plugins/canvas/public/lib/function_definitions.js deleted file mode 100644 index 36ad0ba0b0015d..00000000000000 --- a/x-pack/legacy/plugins/canvas/public/lib/function_definitions.js +++ /dev/null @@ -1,17 +0,0 @@ -/* - * 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 uniqBy from 'lodash.uniqby'; -import { npStart } from 'ui/new_platform'; -import { getServerFunctions } from '../state/selectors/app'; - -export async function getFunctionDefinitions(state) { - const serverFunctions = getServerFunctions(state); - return uniqBy( - serverFunctions.concat(Object.values(npStart.plugins.expressions.getFunctions())), - 'name' - ); -} diff --git a/x-pack/legacy/plugins/canvas/types/index.ts b/x-pack/legacy/plugins/canvas/types/index.ts deleted file mode 100644 index 21b3d2643c44c2..00000000000000 --- a/x-pack/legacy/plugins/canvas/types/index.ts +++ /dev/null @@ -1,16 +0,0 @@ -/* - * 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. - */ - -export * from '../../../../../src/plugins/expressions/common'; -export * from './assets'; -export * from './canvas'; -export * from './elements'; -export * from './functions'; -export * from './renderers'; -export * from './shortcuts'; -export * from './state'; -export * from './style'; -export * from './telemetry'; diff --git a/x-pack/package.json b/x-pack/package.json index 5461b21b571f8a..8d3d13d8cd75d3 100644 --- a/x-pack/package.json +++ b/x-pack/package.json @@ -6,7 +6,7 @@ "license": "Elastic-License", "scripts": { "kbn": "node ../scripts/kbn", - "kbn:bootstrap": "node legacy/plugins/canvas/scripts/storybook --clean", + "kbn:bootstrap": "node plugins/canvas/scripts/storybook --clean", "start": "gulp dev", "build": "gulp build", "testonly": "echo 'Deprecated, use `yarn test`' && gulp test", diff --git a/x-pack/legacy/plugins/canvas/.gitignore b/x-pack/plugins/canvas/.gitignore similarity index 100% rename from x-pack/legacy/plugins/canvas/.gitignore rename to x-pack/plugins/canvas/.gitignore diff --git a/x-pack/legacy/plugins/canvas/.prettierrc b/x-pack/plugins/canvas/.prettierrc similarity index 100% rename from x-pack/legacy/plugins/canvas/.prettierrc rename to x-pack/plugins/canvas/.prettierrc diff --git a/x-pack/legacy/plugins/canvas/.storybook/.babelrc b/x-pack/plugins/canvas/.storybook/.babelrc similarity index 100% rename from x-pack/legacy/plugins/canvas/.storybook/.babelrc rename to x-pack/plugins/canvas/.storybook/.babelrc diff --git a/x-pack/legacy/plugins/canvas/.storybook/addons.js b/x-pack/plugins/canvas/.storybook/addons.js similarity index 100% rename from x-pack/legacy/plugins/canvas/.storybook/addons.js rename to x-pack/plugins/canvas/.storybook/addons.js diff --git a/x-pack/legacy/plugins/canvas/.storybook/config.js b/x-pack/plugins/canvas/.storybook/config.js similarity index 93% rename from x-pack/legacy/plugins/canvas/.storybook/config.js rename to x-pack/plugins/canvas/.storybook/config.js index 725a3b12666d12..c808a672711aba 100644 --- a/x-pack/legacy/plugins/canvas/.storybook/config.js +++ b/x-pack/plugins/canvas/.storybook/config.js @@ -10,7 +10,7 @@ import { withKnobs } from '@storybook/addon-knobs/react'; import { withInfo } from '@storybook/addon-info'; import { create } from '@storybook/theming'; -import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public'; +import { KibanaContextProvider } from '../../../../src/plugins/kibana_react/public'; // If we're running Storyshots, be sure to register the require context hook. // Otherwise, add the other decorators. @@ -50,7 +50,7 @@ function loadStories() { // Only gather and require CSS files related to Canvas. The other CSS files // are built into the DLL. const css = require.context( - '../../../../../built_assets/css', + '../../../../built_assets/css', true, /plugins\/(?=canvas).*light\.css/ ); @@ -67,7 +67,7 @@ addParameters({ theme: create({ base: 'light', brandTitle: 'Canvas Storybook', - brandUrl: 'https://github.com/elastic/kibana/tree/master/x-pack/legacy/plugins/canvas', + brandUrl: 'https://github.com/elastic/kibana/tree/master/x-pack/plugins/canvas', }), showPanel: true, isFullscreen: false, diff --git a/x-pack/legacy/plugins/canvas/.storybook/constants.js b/x-pack/plugins/canvas/.storybook/constants.js similarity index 89% rename from x-pack/legacy/plugins/canvas/.storybook/constants.js rename to x-pack/plugins/canvas/.storybook/constants.js index 9b59afbaf69f20..258bf208ed8774 100644 --- a/x-pack/legacy/plugins/canvas/.storybook/constants.js +++ b/x-pack/plugins/canvas/.storybook/constants.js @@ -7,7 +7,7 @@ const path = require('path'); const DLL_NAME = 'canvas_storybook_dll'; -const KIBANA_ROOT = path.resolve(__dirname, '../../../../..'); +const KIBANA_ROOT = path.resolve(__dirname, '../../../..'); const BUILT_ASSETS = path.resolve(KIBANA_ROOT, 'built_assets'); const DLL_OUTPUT = path.resolve(BUILT_ASSETS, DLL_NAME); diff --git a/x-pack/legacy/plugins/canvas/.storybook/dll_contexts.js b/x-pack/plugins/canvas/.storybook/dll_contexts.js similarity index 84% rename from x-pack/legacy/plugins/canvas/.storybook/dll_contexts.js rename to x-pack/plugins/canvas/.storybook/dll_contexts.js index 273323d065ecf6..529fd8aa5c7914 100644 --- a/x-pack/legacy/plugins/canvas/.storybook/dll_contexts.js +++ b/x-pack/plugins/canvas/.storybook/dll_contexts.js @@ -11,7 +11,7 @@ // Pull in the built CSS produced by the Kibana server, but not // the Canvas CSS-- we want that in the HMR service. const css = require.context( - '../../../../../built_assets/css', + '../../../../built_assets/css', true, /\.\/plugins\/(?!canvas).*light\.css/ ); @@ -21,15 +21,11 @@ css.keys().forEach(filename => { // Include Legacy styles const uiStyles = require.context( - '../../../../../src/legacy/ui/public/styles', + '../../../../src/legacy/ui/public/styles', false, /[\/\\](?!mixins|variables|_|\.|bootstrap_(light|dark))[^\/\\]+\.less/ ); uiStyles.keys().forEach(key => uiStyles(key)); -const json = require.context( - '../shareable_runtime/test/workpads', - false, - /\.json$/ -); +const json = require.context('../shareable_runtime/test/workpads', false, /\.json$/); json.keys().forEach(key => json(key)); diff --git a/x-pack/legacy/plugins/canvas/.storybook/middleware.js b/x-pack/plugins/canvas/.storybook/middleware.js similarity index 100% rename from x-pack/legacy/plugins/canvas/.storybook/middleware.js rename to x-pack/plugins/canvas/.storybook/middleware.js diff --git a/x-pack/legacy/plugins/canvas/.storybook/preview-head.html b/x-pack/plugins/canvas/.storybook/preview-head.html similarity index 100% rename from x-pack/legacy/plugins/canvas/.storybook/preview-head.html rename to x-pack/plugins/canvas/.storybook/preview-head.html diff --git a/x-pack/legacy/plugins/canvas/.storybook/storyshots.test.js b/x-pack/plugins/canvas/.storybook/storyshots.test.js similarity index 96% rename from x-pack/legacy/plugins/canvas/.storybook/storyshots.test.js rename to x-pack/plugins/canvas/.storybook/storyshots.test.js index a679010c670924..59645cad262009 100644 --- a/x-pack/legacy/plugins/canvas/.storybook/storyshots.test.js +++ b/x-pack/plugins/canvas/.storybook/storyshots.test.js @@ -7,7 +7,7 @@ import path from 'path'; import moment from 'moment'; import 'moment-timezone'; -import ReactDOM from "react-dom"; +import ReactDOM from 'react-dom'; import initStoryshots, { multiSnapshotWithOptions } from '@storybook/addon-storyshots'; import styleSheetSerializer from 'jest-styled-components/src/styleSheetSerializer'; @@ -25,8 +25,8 @@ moment.tz.setDefault('UTC'); const testTime = new Date(Date.UTC(2019, 5, 1)); // June 1 2019 Date.now = jest.fn(() => testTime); -// Mock telemetry service -jest.mock('../public/lib/ui_metric', () => ({ trackCanvasUiMetric: () => { } })); +// Mock telemetry service +jest.mock('../public/lib/ui_metric', () => ({ trackCanvasUiMetric: () => {} })); // Mock EUI generated ids to be consistently predictable for snapshots. jest.mock(`@elastic/eui/lib/components/form/form_row/make_id`, () => () => `generated-id`); @@ -65,9 +65,8 @@ jest.mock('@elastic/eui/packages/react-datepicker', () => { }; }); - // Mock React Portal for components that use modals, tooltips, etc -ReactDOM.createPortal = jest.fn((element) => { +ReactDOM.createPortal = jest.fn(element => { return element; }); diff --git a/x-pack/legacy/plugins/canvas/.storybook/webpack.config.js b/x-pack/plugins/canvas/.storybook/webpack.config.js similarity index 100% rename from x-pack/legacy/plugins/canvas/.storybook/webpack.config.js rename to x-pack/plugins/canvas/.storybook/webpack.config.js diff --git a/x-pack/legacy/plugins/canvas/.storybook/webpack.dll.config.js b/x-pack/plugins/canvas/.storybook/webpack.dll.config.js similarity index 100% rename from x-pack/legacy/plugins/canvas/.storybook/webpack.dll.config.js rename to x-pack/plugins/canvas/.storybook/webpack.dll.config.js diff --git a/x-pack/legacy/plugins/canvas/README.md b/x-pack/plugins/canvas/README.md similarity index 100% rename from x-pack/legacy/plugins/canvas/README.md rename to x-pack/plugins/canvas/README.md diff --git a/x-pack/legacy/plugins/canvas/__tests__/fixtures/elasticsearch.js b/x-pack/plugins/canvas/__tests__/fixtures/elasticsearch.js similarity index 100% rename from x-pack/legacy/plugins/canvas/__tests__/fixtures/elasticsearch.js rename to x-pack/plugins/canvas/__tests__/fixtures/elasticsearch.js diff --git a/x-pack/legacy/plugins/canvas/__tests__/fixtures/elasticsearch_plugin.js b/x-pack/plugins/canvas/__tests__/fixtures/elasticsearch_plugin.js similarity index 100% rename from x-pack/legacy/plugins/canvas/__tests__/fixtures/elasticsearch_plugin.js rename to x-pack/plugins/canvas/__tests__/fixtures/elasticsearch_plugin.js diff --git a/x-pack/legacy/plugins/canvas/__tests__/fixtures/function_specs.ts b/x-pack/plugins/canvas/__tests__/fixtures/function_specs.ts similarity index 83% rename from x-pack/legacy/plugins/canvas/__tests__/fixtures/function_specs.ts rename to x-pack/plugins/canvas/__tests__/fixtures/function_specs.ts index 3ed08268222d0f..edf11f5a25c080 100644 --- a/x-pack/legacy/plugins/canvas/__tests__/fixtures/function_specs.ts +++ b/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())); diff --git a/x-pack/legacy/plugins/canvas/__tests__/fixtures/kibana.js b/x-pack/plugins/canvas/__tests__/fixtures/kibana.js similarity index 95% rename from x-pack/legacy/plugins/canvas/__tests__/fixtures/kibana.js rename to x-pack/plugins/canvas/__tests__/fixtures/kibana.js index 8caab5c41563c2..4503adcec0c2ca 100644 --- a/x-pack/legacy/plugins/canvas/__tests__/fixtures/kibana.js +++ b/x-pack/plugins/canvas/__tests__/fixtures/kibana.js @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { get, has, noop } from 'lodash'; +import { get, has } from 'lodash'; import mockElasticsearch from './elasticsearch_plugin'; const config = { diff --git a/x-pack/legacy/plugins/canvas/__tests__/fixtures/workpads.ts b/x-pack/plugins/canvas/__tests__/fixtures/workpads.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/__tests__/fixtures/workpads.ts rename to x-pack/plugins/canvas/__tests__/fixtures/workpads.ts diff --git a/x-pack/legacy/plugins/canvas/__tests__/helpers/function_wrapper.js b/x-pack/plugins/canvas/__tests__/helpers/function_wrapper.js similarity index 100% rename from x-pack/legacy/plugins/canvas/__tests__/helpers/function_wrapper.js rename to x-pack/plugins/canvas/__tests__/helpers/function_wrapper.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/area_chart/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/area_chart/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/area_chart/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/elements/area_chart/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/bubble_chart/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/bubble_chart/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/bubble_chart/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/elements/bubble_chart/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/debug/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/debug/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/debug/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/elements/debug/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/dropdown_filter/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/dropdown_filter/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/dropdown_filter/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/elements/dropdown_filter/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/filter_debug/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/filter_debug/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/filter_debug/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/elements/filter_debug/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/horizontal_bar_chart/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/horizontal_bar_chart/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/horizontal_bar_chart/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/elements/horizontal_bar_chart/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_bar/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_bar/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_bar/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_bar/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_pill/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_pill/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_pill/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/elements/horizontal_progress_pill/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/image/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/image/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/image/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/elements/image/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/elements/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/line_chart/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/line_chart/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/line_chart/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/elements/line_chart/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/markdown/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/markdown/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/markdown/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/elements/markdown/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/metric/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/metric/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/metric/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/elements/metric/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/pie/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/pie/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/pie/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/elements/pie/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/plot/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/plot/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/plot/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/elements/plot/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/progress_gauge/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/progress_gauge/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/progress_gauge/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/elements/progress_gauge/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/progress_semicircle/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/progress_semicircle/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/progress_semicircle/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/elements/progress_semicircle/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/progress_wheel/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/progress_wheel/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/progress_wheel/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/elements/progress_wheel/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/repeat_image/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/repeat_image/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/repeat_image/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/elements/repeat_image/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/reveal_image/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/reveal_image/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/reveal_image/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/elements/reveal_image/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/shape/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/shape/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/shape/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/elements/shape/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/table/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/table/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/table/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/elements/table/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/time_filter/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/time_filter/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/time_filter/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/elements/time_filter/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/vert_bar_chart/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/vert_bar_chart/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/vert_bar_chart/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/elements/vert_bar_chart/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/vertical_progress_bar/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/vertical_progress_bar/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/vertical_progress_bar/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/elements/vertical_progress_bar/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/vertical_progress_pill/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/elements/vertical_progress_pill/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/elements/vertical_progress_pill/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/elements/vertical_progress_pill/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts b/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts similarity index 84% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts rename to x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts index fbe7825c3b2c87..74de223b9fcb7a 100644 --- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable.ts +++ b/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'; diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts b/x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts similarity index 58% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts rename to x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts index 592da1ff039a15..85629936d9ad36 100644 --- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts +++ b/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; diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/expression_types/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/expression_types/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/expression_types/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/browser/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/browser/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/browser/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/browser/location.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/location.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/browser/location.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/browser/location.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/browser/markdown.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/browser/markdown.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/browser/markdown.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/browser/markdown.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/browser/markdown.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/browser/urlparam.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/browser/urlparam.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/browser/urlparam.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/browser/urlparam.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/__tests__/compare.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/__tests__/compare.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/__tests__/compare.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/__tests__/compare.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/__tests__/fixtures/test_filters.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/__tests__/fixtures/test_filters.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/__tests__/fixtures/test_filters.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/__tests__/fixtures/test_filters.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/__tests__/fixtures/test_pointseries.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/__tests__/fixtures/test_pointseries.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/__tests__/fixtures/test_pointseries.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/__tests__/fixtures/test_pointseries.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/__tests__/fixtures/test_styles.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/__tests__/fixtures/test_styles.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/__tests__/fixtures/test_styles.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/__tests__/fixtures/test_styles.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/__tests__/fixtures/test_tables.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/__tests__/fixtures/test_tables.ts similarity index 87% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/__tests__/fixtures/test_tables.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/__tests__/fixtures/test_tables.ts index 1f13157a360f3f..b5e5836dc5331c 100644 --- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/__tests__/fixtures/test_tables.ts +++ b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/__tests__/fixtures/test_tables.ts @@ -39,63 +39,63 @@ const testTable: Datatable = { rows: [ { name: 'product1', - time: 1517842800950, //05 Feb 2018 15:00:00 GMT + time: 1517842800950, // 05 Feb 2018 15:00:00 GMT price: 605, quantity: 100, in_stock: true, }, { name: 'product1', - time: 1517929200950, //06 Feb 2018 15:00:00 GMT + time: 1517929200950, // 06 Feb 2018 15:00:00 GMT price: 583, quantity: 200, in_stock: true, }, { name: 'product1', - time: 1518015600950, //07 Feb 2018 15:00:00 GMT + time: 1518015600950, // 07 Feb 2018 15:00:00 GMT price: 420, quantity: 300, in_stock: true, }, { name: 'product2', - time: 1517842800950, //05 Feb 2018 15:00:00 GMT + time: 1517842800950, // 05 Feb 2018 15:00:00 GMT price: 216, quantity: 350, in_stock: false, }, { name: 'product2', - time: 1517929200950, //06 Feb 2018 15:00:00 GMT + time: 1517929200950, // 06 Feb 2018 15:00:00 GMT price: 200, quantity: 256, in_stock: false, }, { name: 'product2', - time: 1518015600950, //07 Feb 2018 15:00:00 GMT + time: 1518015600950, // 07 Feb 2018 15:00:00 GMT price: 190, quantity: 231, in_stock: false, }, { name: 'product3', - time: 1517842800950, //05 Feb 2018 15:00:00 GMT + time: 1517842800950, // 05 Feb 2018 15:00:00 GMT price: 67, quantity: 240, in_stock: true, }, { name: 'product4', - time: 1517842800950, //05 Feb 2018 15:00:00 GMT + time: 1517842800950, // 05 Feb 2018 15:00:00 GMT price: 311, quantity: 447, in_stock: false, }, { name: 'product5', - time: 1517842800950, //05 Feb 2018 15:00:00 GMT + time: 1517842800950, // 05 Feb 2018 15:00:00 GMT price: 288, quantity: 384, in_stock: true, diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/__tests__/image.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/__tests__/image.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/__tests__/image.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/__tests__/image.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/__tests__/progress.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/__tests__/progress.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/__tests__/progress.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/__tests__/progress.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/all.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/all.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/all.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/all.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/all.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/all.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/all.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/all.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/alterColumn.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/any.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/any.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/any.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/any.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/any.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/any.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/any.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/any.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/as.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/as.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/as.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/as.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/as.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/as.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/as.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/as.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/axisConfig.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/axisConfig.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/axisConfig.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/axisConfig.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/axis_config.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/axis_config.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/axis_config.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/axis_config.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/case.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/case.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/case.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/case.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/case.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/clear.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/clear.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/clear.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/clear.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/clear.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/clear.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/clear.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/clear.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/columns.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/columns.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/columns.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/columns.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/columns.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/columns.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/columns.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/columns.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/compare.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/compare.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/compare.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/compare.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/containerStyle.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/containerStyle.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/containerStyle.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/containerStyle.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/container_style.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/container_style.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/container_style.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/container_style.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/context.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/context.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/context.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/context.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/context.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/context.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/context.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/context.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/csv.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/csv.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/csv.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/csv.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/csv.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/date.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/date.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/date.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/date.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/date.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/do.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/do.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/do.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/do.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/do.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/do.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/do.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/do.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/dropdownControl.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/dropdownControl.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/dropdownControl.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/dropdownControl.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/dropdown_control.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/dropdown_control.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/dropdown_control.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/dropdown_control.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/eq.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/eq.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/eq.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/eq.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/eq.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/eq.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/eq.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/eq.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/exactly.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/exactly.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/exactly.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/exactly.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/exactly.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/exactly.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/exactly.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/exactly.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/filterrows.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/filterrows.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/filterrows.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/filterrows.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/filterrows.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/filterrows.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/filterrows.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/filterrows.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/formatdate.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatdate.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/formatdate.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatdate.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/formatdate.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatdate.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/formatdate.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatdate.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/formatnumber.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatnumber.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/formatnumber.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatnumber.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/formatnumber.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatnumber.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/formatnumber.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/formatnumber.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/getCell.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/getCell.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/getCell.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/getCell.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/getCell.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/getCell.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/getCell.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/getCell.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/get_flot_axis_config.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/get_flot_axis_config.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/get_flot_axis_config.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/get_flot_axis_config.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/get_font_spec.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/get_font_spec.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/get_font_spec.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/get_font_spec.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/get_tick_hash.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/get_tick_hash.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/get_tick_hash.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/get_tick_hash.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/gt.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gt.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/gt.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/gt.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/gt.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gt.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/gt.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/gt.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/gte.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gte.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/gte.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/gte.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/gte.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/gte.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/gte.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/gte.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/head.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/head.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/head.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/head.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/head.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/head.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/head.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/head.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/if.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/if.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/if.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/if.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/if.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/if.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/if.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/if.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/image.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/image.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/image.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/image.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/join_rows.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/join_rows.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/join_rows.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/join_rows.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/join_rows.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/join_rows.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/join_rows.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/join_rows.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/lt.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lt.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/lt.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/lt.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/lt.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lt.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/lt.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/lt.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/lte.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lte.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/lte.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/lte.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/lte.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/lte.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/lte.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/lte.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/mapColumn.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/mapColumn.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/mapColumn.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/mapColumn.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/mapColumn.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/mapColumn.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/mapColumn.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/mapColumn.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/map_center.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/map_center.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/map_center.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/map_center.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/math.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/math.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/math.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/math.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/math.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/math.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/math.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/math.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/metric.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/metric.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/metric.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/metric.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/metric.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/metric.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/metric.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/metric.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/neq.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/neq.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/neq.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/neq.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/neq.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/neq.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/neq.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/neq.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/palette.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/palette.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/palette.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/palette.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/palette.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/palette.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/palette.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/palette.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/pie.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/pie.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/pie.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/pie.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/pie.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/pie.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/pie.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/pie.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/plot.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/plot.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/plot.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/plot.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/plot/get_flot_axis_config.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/plot/get_flot_axis_config.ts similarity index 98% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/plot/get_flot_axis_config.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/plot/get_flot_axis_config.ts index bdb3c0e8c1b2ec..660605c4c54c12 100644 --- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/plot/get_flot_axis_config.ts +++ b/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 { diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/plot/get_font_spec.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/plot/get_font_spec.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/plot/get_font_spec.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/plot/get_font_spec.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/plot/get_tick_hash.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/plot/get_tick_hash.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/plot/get_tick_hash.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/plot/get_tick_hash.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/plot/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/plot/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/plot/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/plot/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/plot/series_style_to_flot.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/plot/series_style_to_flot.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/plot/series_style_to_flot.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/plot/series_style_to_flot.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/ply.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/ply.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/ply.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/ply.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/ply.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/ply.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/ply.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/ply.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/progress.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/progress.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/progress.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/progress.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/render.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/render.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/render.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/render.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/render.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/repeatImage.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/repeatImage.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/repeatImage.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/repeatImage.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/repeat_image.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/repeat_image.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/repeat_image.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/repeat_image.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/replace.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/replace.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/replace.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/replace.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/replace.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/replace.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/replace.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/replace.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/revealImage.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/revealImage.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/revealImage.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/revealImage.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/reveal_image.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/reveal_image.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/reveal_image.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/reveal_image.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/rounddate.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rounddate.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/rounddate.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/rounddate.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/rounddate.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rounddate.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/rounddate.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/rounddate.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/rowCount.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rowCount.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/rowCount.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/rowCount.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/rowCount.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/rowCount.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/rowCount.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/rowCount.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_lens.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_lens.test.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_lens.test.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_lens.test.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_lens.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_lens.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_lens.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_lens.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_map.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_map.test.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_map.test.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_map.test.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts similarity index 97% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts index df316d0dd182f9..dacdc30e0c6f76 100644 --- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_map.ts +++ b/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; diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_search.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_search.test.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_search.test.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_search.test.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_search.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_search.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_search.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_search.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.test.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.test.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.test.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/saved_visualization.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/seriesStyle.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/seriesStyle.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/seriesStyle.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/seriesStyle.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/series_style.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/series_style.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/series_style.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/series_style.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/series_style_to_flot.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/series_style_to_flot.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/series_style_to_flot.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/series_style_to_flot.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/shape.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/shape.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/shape.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/shape.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/sort.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/sort.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/sort.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/sort.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/sort.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/sort.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/sort.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/sort.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/staticColumn.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/string.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/string.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/string.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/string.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/string.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/string.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/string.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/string.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/switch.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/switch.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/switch.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/switch.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/switch.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/switch.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/switch.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/switch.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/table.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/table.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/table.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/table.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/table.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/tail.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/tail.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/tail.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/tail.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/tail.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/tail.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/tail.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/tail.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/time_range.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/time_range.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/time_range.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/time_range.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/timefilter.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilter.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/timefilter.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilter.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/timefilter.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilter.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/timefilter.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilter.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/timefilterControl.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilterControl.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/timefilterControl.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilterControl.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/timefilter_control.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilter_control.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/common/timefilter_control.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/common/timefilter_control.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/demodata.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata.test.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/demodata.test.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata.test.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/demodata/ci.json b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/ci.json similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/demodata/ci.json rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/ci.json diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/demodata/demo_rows_types.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/demo_rows_types.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/demodata/demo_rows_types.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/demo_rows_types.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/demodata/get_demo_rows.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/get_demo_rows.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/demodata/get_demo_rows.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/get_demo_rows.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/demodata/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/demodata/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/demodata/shirts.json b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/shirts.json similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/demodata/shirts.json rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/demodata/shirts.json diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/escount.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/escount.ts similarity index 94% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/escount.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/escount.ts index 2ab48fe0029791..142331aabf3514 100644 --- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/escount.ts +++ b/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'; diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/esdocs.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/esdocs.ts similarity index 96% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/esdocs.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/esdocs.ts index 180afc89322c3b..1eb0a7c74780cc 100644 --- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/esdocs.ts +++ b/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'; diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/essql.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/essql.ts similarity index 94% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/essql.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/essql.ts index 7c9cb92ad009c6..c64398d4b3a183 100644 --- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/essql.ts +++ b/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'; diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/get_expression_type.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/get_expression_type.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/get_expression_type.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/get_expression_type.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/get_field_names.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/get_field_names.test.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/get_field_names.test.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/get_field_names.test.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/is_column_reference.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/is_column_reference.test.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/is_column_reference.test.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/is_column_reference.test.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/pointseries.test.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/pointseries.test.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries.test.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/pointseries/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/pointseries/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/get_expression_type.js b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/get_expression_type.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/get_expression_type.js rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/get_expression_type.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/get_field_names.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/get_field_names.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/get_field_names.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/get_field_names.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/is_column_reference.ts b/x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/is_column_reference.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/is_column_reference.ts rename to x-pack/plugins/canvas/canvas_plugin_src/functions/server/pointseries/lib/is_column_reference.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/elastic_logo.js b/x-pack/plugins/canvas/canvas_plugin_src/lib/elastic_logo.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/elastic_logo.js rename to x-pack/plugins/canvas/canvas_plugin_src/lib/elastic_logo.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/elastic_outline.js b/x-pack/plugins/canvas/canvas_plugin_src/lib/elastic_outline.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/elastic_outline.js rename to x-pack/plugins/canvas/canvas_plugin_src/lib/elastic_outline.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/API.md b/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/API.md similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/API.md rename to x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/API.md diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/index.js b/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/index.js rename to x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/index.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.colorhelpers.js b/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.colorhelpers.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.colorhelpers.js rename to x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.colorhelpers.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.canvas.js b/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.canvas.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.canvas.js rename to x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.canvas.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.categories.js b/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.categories.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.categories.js rename to x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.categories.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.crosshair.js b/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.crosshair.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.crosshair.js rename to x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.crosshair.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.errorbars.js b/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.errorbars.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.errorbars.js rename to x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.errorbars.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.fillbetween.js b/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.fillbetween.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.fillbetween.js rename to x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.fillbetween.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.image.js b/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.image.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.image.js rename to x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.image.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.js b/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.js rename to x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.navigate.js b/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.navigate.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.navigate.js rename to x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.navigate.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.resize.js b/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.resize.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.resize.js rename to x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.resize.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.selection.js b/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.selection.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.selection.js rename to x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.selection.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.stack.js b/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.stack.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.stack.js rename to x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.stack.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.symbol.js b/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.symbol.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.symbol.js rename to x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.symbol.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.threshold.js b/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.threshold.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.threshold.js rename to x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.threshold.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.time.js b/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.time.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.time.js rename to x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts/jquery.flot.time.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/plugin.ts b/x-pack/plugins/canvas/canvas_plugin_src/plugin.ts similarity index 90% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/plugin.ts rename to x-pack/plugins/canvas/canvas_plugin_src/plugin.ts index 4452e5e9e31fea..c9ce4d065968a4 100644 --- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/plugin.ts +++ b/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'; diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/__examples__/__snapshots__/advanced_filter.examples.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/__examples__/__snapshots__/advanced_filter.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/__examples__/__snapshots__/advanced_filter.examples.storyshot rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/__examples__/__snapshots__/advanced_filter.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/__examples__/advanced_filter.examples.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/__examples__/advanced_filter.examples.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/__examples__/advanced_filter.examples.tsx rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/__examples__/advanced_filter.examples.tsx diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/advanced_filter.scss b/x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/advanced_filter.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/advanced_filter.scss rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/advanced_filter.scss diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/advanced_filter.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/advanced_filter.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/advanced_filter.tsx rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/advanced_filter.tsx diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/component/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/index.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/index.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/index.tsx rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/advanced_filter/index.tsx diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/debug.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/debug.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/debug.js rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/debug.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/__examples__/__snapshots__/dropdown_filter.examples.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/__examples__/__snapshots__/dropdown_filter.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/__examples__/__snapshots__/dropdown_filter.examples.storyshot rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/__examples__/__snapshots__/dropdown_filter.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/__examples__/dropdown_filter.examples.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/__examples__/dropdown_filter.examples.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/__examples__/dropdown_filter.examples.tsx rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/__examples__/dropdown_filter.examples.tsx diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/dropdown_filter.scss b/x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/dropdown_filter.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/dropdown_filter.scss rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/dropdown_filter.scss diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/dropdown_filter.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/dropdown_filter.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/dropdown_filter.tsx rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/dropdown_filter.tsx diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/component/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/index.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/index.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/index.tsx rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/dropdown_filter/index.tsx diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.scss b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.scss rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.scss diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx similarity index 94% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx index 1e8983a0ca5e52..0e0d5fd1953fe7 100644 --- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable.tsx +++ b/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'; diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.test.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.test.ts rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.test.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.ts rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/embeddable_input_to_expression.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.test.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/lens.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.test.ts similarity index 96% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.test.ts rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.test.ts index f9ff94ee7d8f16..e0e0aeaeea272a 100644 --- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.test.ts +++ b/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 = { diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.ts similarity index 92% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.ts rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.ts index e0cb71c17774c0..1f9bec133488c7 100644 --- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/map.ts +++ b/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[]; diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.test.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.test.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.test.ts rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.test.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/embeddable/input_type_to_expression/visualization.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/error/error.scss b/x-pack/plugins/canvas/canvas_plugin_src/renderers/error/error.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/error/error.scss rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/error/error.scss diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/error/index.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/error/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/error/index.js rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/error/index.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/image.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/image.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/image.js rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/image.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/index.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/index.js rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/index.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/markdown/index.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/index.js similarity index 92% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/markdown/index.js rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/markdown/index.js index 126699534caadb..a7b0f620cf7100 100644 --- a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/markdown/index.js +++ b/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; diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/metric/component/__examples__/__snapshots__/metric.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/renderers/metric/component/__examples__/__snapshots__/metric.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/metric/component/__examples__/__snapshots__/metric.stories.storyshot rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/metric/component/__examples__/__snapshots__/metric.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/metric/component/__examples__/metric.stories.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/metric/component/__examples__/metric.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/metric/component/__examples__/metric.stories.tsx rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/metric/component/__examples__/metric.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/metric/component/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/metric/component/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/metric/component/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/metric/component/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/metric/component/metric.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/metric/component/metric.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/metric/component/metric.tsx rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/metric/component/metric.tsx diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/metric/index.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/metric/index.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/metric/index.tsx rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/metric/index.tsx diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/pie/index.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/pie/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/pie/index.js rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/pie/index.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/pie/plugins/pie.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/pie/plugins/pie.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/pie/plugins/pie.js rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/pie/plugins/pie.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/plot/index.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/plot/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/plot/index.js rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/plot/index.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/plot/plot.scss b/x-pack/plugins/canvas/canvas_plugin_src/renderers/plot/plot.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/plot/plot.scss rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/plot/plot.scss diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/plot/plugins/size.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/plot/plugins/size.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/plot/plugins/size.js rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/plot/plugins/size.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/plot/plugins/text.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/plot/plugins/text.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/plot/plugins/text.js rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/plot/plugins/text.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/progress/index.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/progress/index.js rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/index.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/gauge.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/gauge.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/gauge.svg rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/gauge.svg diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/horizontal_bar.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/horizontal_bar.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/horizontal_bar.svg rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/horizontal_bar.svg diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/horizontal_pill.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/horizontal_pill.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/horizontal_pill.svg rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/horizontal_pill.svg diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/index.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/index.js rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/index.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/semicircle.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/semicircle.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/semicircle.svg rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/semicircle.svg diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/unicorn.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/unicorn.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/unicorn.svg rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/unicorn.svg diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/vertical_bar.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/vertical_bar.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/vertical_bar.svg rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/vertical_bar.svg diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/vertical_pill.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/vertical_pill.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/vertical_pill.svg rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/vertical_pill.svg diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/wheel.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/wheel.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/wheel.svg rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/progress/shapes/wheel.svg diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/repeat_image.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/repeat_image.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/repeat_image.js rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/repeat_image.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/reveal_image/index.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/reveal_image/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/reveal_image/index.js rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/reveal_image/index.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/reveal_image/reveal_image.scss b/x-pack/plugins/canvas/canvas_plugin_src/renderers/reveal_image/reveal_image.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/reveal_image/reveal_image.scss rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/reveal_image/reveal_image.scss diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/index.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/index.js rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/index.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/arrow.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/arrow.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/arrow.svg rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/arrow.svg diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/arrow_multi.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/arrow_multi.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/arrow_multi.svg rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/arrow_multi.svg diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/bookmark.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/bookmark.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/bookmark.svg rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/bookmark.svg diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/circle.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/circle.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/circle.svg rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/circle.svg diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/cross.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/cross.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/cross.svg rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/cross.svg diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/hexagon.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/hexagon.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/hexagon.svg rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/hexagon.svg diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/kite.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/kite.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/kite.svg rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/kite.svg diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/pentagon.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/pentagon.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/pentagon.svg rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/pentagon.svg diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/rhombus.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/rhombus.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/rhombus.svg rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/rhombus.svg diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/semicircle.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/semicircle.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/semicircle.svg rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/semicircle.svg diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/speech_bubble.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/speech_bubble.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/speech_bubble.svg rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/speech_bubble.svg diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/square.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/square.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/square.svg rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/square.svg diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/star.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/star.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/star.svg rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/star.svg diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/tag.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/tag.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/tag.svg rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/tag.svg diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/triangle.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/triangle.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/triangle.svg rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/triangle.svg diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/triangle_right.svg b/x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/triangle_right.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/triangle_right.svg rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/shape/shapes/triangle_right.svg diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/table.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/table.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/table.js rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/table.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/text.js b/x-pack/plugins/canvas/canvas_plugin_src/renderers/text.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/text.js rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/text.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/__snapshots__/time_filter.examples.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/__snapshots__/time_filter.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/__snapshots__/time_filter.examples.storyshot rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/__snapshots__/time_filter.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/__snapshots__/time_filter.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/__snapshots__/time_filter.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/__snapshots__/time_filter.stories.storyshot rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/__snapshots__/time_filter.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/time_filter.stories.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/time_filter.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/time_filter.stories.tsx rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/__examples__/time_filter.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/index.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/index.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/index.tsx rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/index.tsx diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_filter.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_filter.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_filter.tsx rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/components/time_filter.tsx diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/index.tsx b/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/index.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/index.tsx rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/index.tsx diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/time_filter.scss b/x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/time_filter.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/renderers/time_filter/time_filter.scss rename to x-pack/plugins/canvas/canvas_plugin_src/renderers/time_filter/time_filter.scss diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/templates/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/templates/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/templates/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/templates/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/templates/pitch_presentation.json b/x-pack/plugins/canvas/canvas_plugin_src/templates/pitch_presentation.json similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/templates/pitch_presentation.json rename to x-pack/plugins/canvas/canvas_plugin_src/templates/pitch_presentation.json diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/templates/status_report.json b/x-pack/plugins/canvas/canvas_plugin_src/templates/status_report.json similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/templates/status_report.json rename to x-pack/plugins/canvas/canvas_plugin_src/templates/status_report.json diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/templates/summary_report.json b/x-pack/plugins/canvas/canvas_plugin_src/templates/summary_report.json similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/templates/summary_report.json rename to x-pack/plugins/canvas/canvas_plugin_src/templates/summary_report.json diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/templates/theme_dark.json b/x-pack/plugins/canvas/canvas_plugin_src/templates/theme_dark.json similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/templates/theme_dark.json rename to x-pack/plugins/canvas/canvas_plugin_src/templates/theme_dark.json diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/templates/theme_light.json b/x-pack/plugins/canvas/canvas_plugin_src/templates/theme_light.json similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/templates/theme_light.json rename to x-pack/plugins/canvas/canvas_plugin_src/templates/theme_light.json diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__examples__/__snapshots__/extended_template.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__examples__/__snapshots__/extended_template.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__examples__/__snapshots__/extended_template.stories.storyshot rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__examples__/__snapshots__/extended_template.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__examples__/__snapshots__/simple_template.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__examples__/__snapshots__/simple_template.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__examples__/__snapshots__/simple_template.stories.storyshot rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__examples__/__snapshots__/simple_template.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__examples__/extended_template.stories.tsx b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__examples__/extended_template.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__examples__/extended_template.stories.tsx rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__examples__/extended_template.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__examples__/simple_template.stories.tsx b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__examples__/simple_template.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__examples__/simple_template.stories.tsx rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__examples__/simple_template.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/extended_template.tsx b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/extended_template.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/extended_template.tsx rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/extended_template.tsx diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/simple_template.tsx b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/simple_template.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/simple_template.tsx rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/simple_template.tsx diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/datacolumn/__tests__/get_form_object.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/datacolumn/__tests__/get_form_object.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/datacolumn/__tests__/get_form_object.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/datacolumn/__tests__/get_form_object.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/datacolumn/get_form_object.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/datacolumn/get_form_object.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/datacolumn/get_form_object.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/datacolumn/get_form_object.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/datacolumn/index.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/datacolumn/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/datacolumn/index.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/datacolumn/index.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/datacolumn/simple_math_function.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/datacolumn/simple_math_function.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/datacolumn/simple_math_function.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/datacolumn/simple_math_function.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/__examples__/__snapshots__/date_format.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/__examples__/__snapshots__/date_format.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/__examples__/__snapshots__/date_format.stories.storyshot rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/__examples__/__snapshots__/date_format.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/__examples__/date_format.stories.tsx b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/__examples__/date_format.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/__examples__/date_format.stories.tsx rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/__examples__/date_format.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/date_format.tsx b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/date_format.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/date_format.tsx rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/date_format.tsx diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/filter_group.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/filter_group.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/filter_group.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/filter_group.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/forms/file.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/forms/file.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/forms/file.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/forms/file.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/forms/index.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/forms/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/forms/index.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/forms/index.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/forms/link.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/forms/link.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/forms/link.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/forms/link.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/image_upload.scss b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/image_upload.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/image_upload.scss rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/image_upload.scss diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/index.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/index.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/image_upload/index.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/number.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/number.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/__examples__/__snapshots__/number_format.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/__examples__/__snapshots__/number_format.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/__examples__/__snapshots__/number_format.stories.storyshot rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/__examples__/__snapshots__/number_format.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/__examples__/number_format.stories.tsx b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/__examples__/number_format.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/__examples__/number_format.stories.tsx rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/__examples__/number_format.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/number_format.tsx b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/number_format.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/number_format.tsx rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/number_format.tsx diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/palette.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/palette.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/palette.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/percentage.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/percentage.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/percentage.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/percentage.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/range.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/range.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/range.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/range.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/select.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/select.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/select.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/select.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/shape.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/shape.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/shape.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/shape.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/string.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/string.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/string.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/string.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/textarea.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/textarea.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/textarea.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/textarea.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/toggle.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/toggle.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/arguments/toggle.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/toggle.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/demodata.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/demodata.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/demodata.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/demodata.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/esdocs.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/esdocs.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/esdocs.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/esdocs.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/essql.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/essql.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/essql.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/essql.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/index.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/index.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/index.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/timelion.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/timelion.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/datasources/timelion.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/datasources/timelion.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/models/index.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/models/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/models/index.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/models/index.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/models/math.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/models/math.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/models/math.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/models/math.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/models/point_series.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/models/point_series.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/models/point_series.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/models/point_series.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/uis/tags/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/uis/tags/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/presentation.ts b/x-pack/plugins/canvas/canvas_plugin_src/uis/tags/presentation.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/presentation.ts rename to x-pack/plugins/canvas/canvas_plugin_src/uis/tags/presentation.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/report.ts b/x-pack/plugins/canvas/canvas_plugin_src/uis/tags/report.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/tags/report.ts rename to x-pack/plugins/canvas/canvas_plugin_src/uis/tags/report.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/transforms/formatdate.ts b/x-pack/plugins/canvas/canvas_plugin_src/uis/transforms/formatdate.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/transforms/formatdate.ts rename to x-pack/plugins/canvas/canvas_plugin_src/uis/transforms/formatdate.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/transforms/formatnumber.ts b/x-pack/plugins/canvas/canvas_plugin_src/uis/transforms/formatnumber.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/transforms/formatnumber.ts rename to x-pack/plugins/canvas/canvas_plugin_src/uis/transforms/formatnumber.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/transforms/index.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/transforms/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/transforms/index.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/transforms/index.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/transforms/rounddate.ts b/x-pack/plugins/canvas/canvas_plugin_src/uis/transforms/rounddate.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/transforms/rounddate.ts rename to x-pack/plugins/canvas/canvas_plugin_src/uis/transforms/rounddate.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/transforms/sort.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/transforms/sort.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/transforms/sort.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/transforms/sort.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/dropdownControl.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/dropdownControl.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/dropdownControl.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/views/dropdownControl.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/getCell.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/getCell.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/getCell.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/views/getCell.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/image.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/image.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/image.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/views/image.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/index.ts b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/index.ts rename to x-pack/plugins/canvas/canvas_plugin_src/uis/views/index.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/markdown.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/markdown.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/markdown.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/views/markdown.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/metric.ts b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/metric.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/metric.ts rename to x-pack/plugins/canvas/canvas_plugin_src/uis/views/metric.ts diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/pie.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/pie.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/pie.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/views/pie.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/plot.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/plot.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/plot.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/views/plot.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/progress.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/progress.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/progress.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/views/progress.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/render.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/render.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/render.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/views/render.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/repeatImage.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/repeatImage.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/repeatImage.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/views/repeatImage.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/revealImage.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/revealImage.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/revealImage.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/views/revealImage.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/shape.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/shape.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/shape.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/views/shape.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/table.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/table.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/table.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/views/table.js diff --git a/x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/timefilterControl.js b/x-pack/plugins/canvas/canvas_plugin_src/uis/views/timefilterControl.js similarity index 100% rename from x-pack/legacy/plugins/canvas/canvas_plugin_src/uis/views/timefilterControl.js rename to x-pack/plugins/canvas/canvas_plugin_src/uis/views/timefilterControl.js diff --git a/x-pack/legacy/plugins/canvas/common/lib/autocomplete.test.ts b/x-pack/plugins/canvas/common/lib/autocomplete.test.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/autocomplete.test.ts rename to x-pack/plugins/canvas/common/lib/autocomplete.test.ts diff --git a/x-pack/legacy/plugins/canvas/common/lib/autocomplete.ts b/x-pack/plugins/canvas/common/lib/autocomplete.ts similarity index 99% rename from x-pack/legacy/plugins/canvas/common/lib/autocomplete.ts rename to x-pack/plugins/canvas/common/lib/autocomplete.ts index 50341c977d6d93..5ee4d2104a0f79 100644 --- a/x-pack/legacy/plugins/canvas/common/lib/autocomplete.ts +++ b/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'; diff --git a/x-pack/legacy/plugins/canvas/common/lib/constants.ts b/x-pack/plugins/canvas/common/lib/constants.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/constants.ts rename to x-pack/plugins/canvas/common/lib/constants.ts diff --git a/x-pack/legacy/plugins/canvas/common/lib/datatable/index.js b/x-pack/plugins/canvas/common/lib/datatable/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/datatable/index.js rename to x-pack/plugins/canvas/common/lib/datatable/index.js diff --git a/x-pack/legacy/plugins/canvas/common/lib/datatable/query.js b/x-pack/plugins/canvas/common/lib/datatable/query.js similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/datatable/query.js rename to x-pack/plugins/canvas/common/lib/datatable/query.js diff --git a/x-pack/legacy/plugins/canvas/common/lib/dataurl.test.ts b/x-pack/plugins/canvas/common/lib/dataurl.test.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/dataurl.test.ts rename to x-pack/plugins/canvas/common/lib/dataurl.test.ts diff --git a/x-pack/legacy/plugins/canvas/common/lib/dataurl.ts b/x-pack/plugins/canvas/common/lib/dataurl.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/dataurl.ts rename to x-pack/plugins/canvas/common/lib/dataurl.ts diff --git a/x-pack/legacy/plugins/canvas/common/lib/errors.js b/x-pack/plugins/canvas/common/lib/errors.js similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/errors.js rename to x-pack/plugins/canvas/common/lib/errors.js diff --git a/x-pack/legacy/plugins/canvas/common/lib/errors.test.js b/x-pack/plugins/canvas/common/lib/errors.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/errors.test.js rename to x-pack/plugins/canvas/common/lib/errors.test.js diff --git a/x-pack/legacy/plugins/canvas/common/lib/expression_form_handlers.js b/x-pack/plugins/canvas/common/lib/expression_form_handlers.js similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/expression_form_handlers.js rename to x-pack/plugins/canvas/common/lib/expression_form_handlers.js diff --git a/x-pack/legacy/plugins/canvas/common/lib/expression_form_handlers.test.js b/x-pack/plugins/canvas/common/lib/expression_form_handlers.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/expression_form_handlers.test.js rename to x-pack/plugins/canvas/common/lib/expression_form_handlers.test.js diff --git a/x-pack/legacy/plugins/canvas/common/lib/fetch.test.ts b/x-pack/plugins/canvas/common/lib/fetch.test.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/fetch.test.ts rename to x-pack/plugins/canvas/common/lib/fetch.test.ts diff --git a/x-pack/legacy/plugins/canvas/common/lib/fetch.ts b/x-pack/plugins/canvas/common/lib/fetch.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/fetch.ts rename to x-pack/plugins/canvas/common/lib/fetch.ts diff --git a/x-pack/legacy/plugins/canvas/common/lib/fonts.ts b/x-pack/plugins/canvas/common/lib/fonts.ts similarity index 77% rename from x-pack/legacy/plugins/canvas/common/lib/fonts.ts rename to x-pack/plugins/canvas/common/lib/fonts.ts index 14cc403af86ac3..e0d39f65f01c28 100644 --- a/x-pack/legacy/plugins/canvas/common/lib/fonts.ts +++ b/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'; diff --git a/x-pack/legacy/plugins/canvas/common/lib/get_colors_from_palette.js b/x-pack/plugins/canvas/common/lib/get_colors_from_palette.js similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/get_colors_from_palette.js rename to x-pack/plugins/canvas/common/lib/get_colors_from_palette.js diff --git a/x-pack/legacy/plugins/canvas/common/lib/get_colors_from_palette.test.js b/x-pack/plugins/canvas/common/lib/get_colors_from_palette.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/get_colors_from_palette.test.js rename to x-pack/plugins/canvas/common/lib/get_colors_from_palette.test.js diff --git a/x-pack/legacy/plugins/canvas/common/lib/get_field_type.test.ts b/x-pack/plugins/canvas/common/lib/get_field_type.test.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/get_field_type.test.ts rename to x-pack/plugins/canvas/common/lib/get_field_type.test.ts diff --git a/x-pack/legacy/plugins/canvas/common/lib/get_field_type.ts b/x-pack/plugins/canvas/common/lib/get_field_type.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/get_field_type.ts rename to x-pack/plugins/canvas/common/lib/get_field_type.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/get_id.ts b/x-pack/plugins/canvas/common/lib/get_id.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/get_id.ts rename to x-pack/plugins/canvas/common/lib/get_id.ts diff --git a/x-pack/legacy/plugins/canvas/common/lib/get_legend_config.js b/x-pack/plugins/canvas/common/lib/get_legend_config.js similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/get_legend_config.js rename to x-pack/plugins/canvas/common/lib/get_legend_config.js diff --git a/x-pack/legacy/plugins/canvas/common/lib/get_legend_config.test.js b/x-pack/plugins/canvas/common/lib/get_legend_config.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/get_legend_config.test.js rename to x-pack/plugins/canvas/common/lib/get_legend_config.test.js diff --git a/x-pack/legacy/plugins/canvas/common/lib/handlebars.js b/x-pack/plugins/canvas/common/lib/handlebars.js similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/handlebars.js rename to x-pack/plugins/canvas/common/lib/handlebars.js diff --git a/x-pack/legacy/plugins/canvas/common/lib/handlebars.test.js b/x-pack/plugins/canvas/common/lib/handlebars.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/handlebars.test.js rename to x-pack/plugins/canvas/common/lib/handlebars.test.js diff --git a/x-pack/legacy/plugins/canvas/common/lib/hex_to_rgb.test.ts b/x-pack/plugins/canvas/common/lib/hex_to_rgb.test.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/hex_to_rgb.test.ts rename to x-pack/plugins/canvas/common/lib/hex_to_rgb.test.ts diff --git a/x-pack/legacy/plugins/canvas/common/lib/hex_to_rgb.ts b/x-pack/plugins/canvas/common/lib/hex_to_rgb.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/hex_to_rgb.ts rename to x-pack/plugins/canvas/common/lib/hex_to_rgb.ts diff --git a/x-pack/legacy/plugins/canvas/common/lib/httpurl.test.ts b/x-pack/plugins/canvas/common/lib/httpurl.test.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/httpurl.test.ts rename to x-pack/plugins/canvas/common/lib/httpurl.test.ts diff --git a/x-pack/legacy/plugins/canvas/common/lib/httpurl.ts b/x-pack/plugins/canvas/common/lib/httpurl.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/httpurl.ts rename to x-pack/plugins/canvas/common/lib/httpurl.ts diff --git a/x-pack/legacy/plugins/canvas/common/lib/index.ts b/x-pack/plugins/canvas/common/lib/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/index.ts rename to x-pack/plugins/canvas/common/lib/index.ts diff --git a/x-pack/legacy/plugins/canvas/common/lib/missing_asset.js b/x-pack/plugins/canvas/common/lib/missing_asset.js similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/missing_asset.js rename to x-pack/plugins/canvas/common/lib/missing_asset.js diff --git a/x-pack/legacy/plugins/canvas/common/lib/palettes.js b/x-pack/plugins/canvas/common/lib/palettes.js similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/palettes.js rename to x-pack/plugins/canvas/common/lib/palettes.js diff --git a/x-pack/legacy/plugins/canvas/common/lib/pivot_object_array.test.ts b/x-pack/plugins/canvas/common/lib/pivot_object_array.test.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/pivot_object_array.test.ts rename to x-pack/plugins/canvas/common/lib/pivot_object_array.test.ts diff --git a/x-pack/legacy/plugins/canvas/common/lib/pivot_object_array.ts b/x-pack/plugins/canvas/common/lib/pivot_object_array.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/pivot_object_array.ts rename to x-pack/plugins/canvas/common/lib/pivot_object_array.ts diff --git a/x-pack/legacy/plugins/canvas/common/lib/resolve_dataurl.js b/x-pack/plugins/canvas/common/lib/resolve_dataurl.js similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/resolve_dataurl.js rename to x-pack/plugins/canvas/common/lib/resolve_dataurl.js diff --git a/x-pack/legacy/plugins/canvas/common/lib/resolve_dataurl.test.js b/x-pack/plugins/canvas/common/lib/resolve_dataurl.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/resolve_dataurl.test.js rename to x-pack/plugins/canvas/common/lib/resolve_dataurl.test.js diff --git a/x-pack/legacy/plugins/canvas/common/lib/time_units.ts b/x-pack/plugins/canvas/common/lib/time_units.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/time_units.ts rename to x-pack/plugins/canvas/common/lib/time_units.ts diff --git a/x-pack/legacy/plugins/canvas/common/lib/unquote_string.test.ts b/x-pack/plugins/canvas/common/lib/unquote_string.test.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/unquote_string.test.ts rename to x-pack/plugins/canvas/common/lib/unquote_string.test.ts diff --git a/x-pack/legacy/plugins/canvas/common/lib/unquote_string.ts b/x-pack/plugins/canvas/common/lib/unquote_string.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/unquote_string.ts rename to x-pack/plugins/canvas/common/lib/unquote_string.ts diff --git a/x-pack/legacy/plugins/canvas/common/lib/url.js b/x-pack/plugins/canvas/common/lib/url.js similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/url.js rename to x-pack/plugins/canvas/common/lib/url.js diff --git a/x-pack/legacy/plugins/canvas/common/lib/url.test.js b/x-pack/plugins/canvas/common/lib/url.test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/common/lib/url.test.js rename to x-pack/plugins/canvas/common/lib/url.test.js diff --git a/x-pack/legacy/plugins/canvas/i18n/README.md b/x-pack/plugins/canvas/i18n/README.md similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/README.md rename to x-pack/plugins/canvas/i18n/README.md diff --git a/x-pack/legacy/plugins/canvas/i18n/capabilities.ts b/x-pack/plugins/canvas/i18n/capabilities.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/capabilities.ts rename to x-pack/plugins/canvas/i18n/capabilities.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/components.ts b/x-pack/plugins/canvas/i18n/components.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/components.ts rename to x-pack/plugins/canvas/i18n/components.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/constants.ts b/x-pack/plugins/canvas/i18n/constants.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/constants.ts rename to x-pack/plugins/canvas/i18n/constants.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/elements/apply_strings.ts b/x-pack/plugins/canvas/i18n/elements/apply_strings.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/elements/apply_strings.ts rename to x-pack/plugins/canvas/i18n/elements/apply_strings.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/elements/element_strings.test.ts b/x-pack/plugins/canvas/i18n/elements/element_strings.test.ts similarity index 95% rename from x-pack/legacy/plugins/canvas/i18n/elements/element_strings.test.ts rename to x-pack/plugins/canvas/i18n/elements/element_strings.test.ts index c28229bdab33f0..1eff73c1525b1e 100644 --- a/x-pack/legacy/plugins/canvas/i18n/elements/element_strings.test.ts +++ b/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); diff --git a/x-pack/legacy/plugins/canvas/i18n/elements/element_strings.ts b/x-pack/plugins/canvas/i18n/elements/element_strings.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/elements/element_strings.ts rename to x-pack/plugins/canvas/i18n/elements/element_strings.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/elements/index.ts b/x-pack/plugins/canvas/i18n/elements/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/elements/index.ts rename to x-pack/plugins/canvas/i18n/elements/index.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/errors.ts b/x-pack/plugins/canvas/i18n/errors.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/errors.ts rename to x-pack/plugins/canvas/i18n/errors.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/expression_types.ts b/x-pack/plugins/canvas/i18n/expression_types.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/expression_types.ts rename to x-pack/plugins/canvas/i18n/expression_types.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/all.ts b/x-pack/plugins/canvas/i18n/functions/dict/all.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/all.ts rename to x-pack/plugins/canvas/i18n/functions/dict/all.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/alter_column.ts b/x-pack/plugins/canvas/i18n/functions/dict/alter_column.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/alter_column.ts rename to x-pack/plugins/canvas/i18n/functions/dict/alter_column.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/any.ts b/x-pack/plugins/canvas/i18n/functions/dict/any.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/any.ts rename to x-pack/plugins/canvas/i18n/functions/dict/any.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/as.ts b/x-pack/plugins/canvas/i18n/functions/dict/as.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/as.ts rename to x-pack/plugins/canvas/i18n/functions/dict/as.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/asset.ts b/x-pack/plugins/canvas/i18n/functions/dict/asset.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/asset.ts rename to x-pack/plugins/canvas/i18n/functions/dict/asset.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/axis_config.ts b/x-pack/plugins/canvas/i18n/functions/dict/axis_config.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/axis_config.ts rename to x-pack/plugins/canvas/i18n/functions/dict/axis_config.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/case.ts b/x-pack/plugins/canvas/i18n/functions/dict/case.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/case.ts rename to x-pack/plugins/canvas/i18n/functions/dict/case.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/clear.ts b/x-pack/plugins/canvas/i18n/functions/dict/clear.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/clear.ts rename to x-pack/plugins/canvas/i18n/functions/dict/clear.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/columns.ts b/x-pack/plugins/canvas/i18n/functions/dict/columns.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/columns.ts rename to x-pack/plugins/canvas/i18n/functions/dict/columns.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/compare.ts b/x-pack/plugins/canvas/i18n/functions/dict/compare.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/compare.ts rename to x-pack/plugins/canvas/i18n/functions/dict/compare.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/container_style.ts b/x-pack/plugins/canvas/i18n/functions/dict/container_style.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/container_style.ts rename to x-pack/plugins/canvas/i18n/functions/dict/container_style.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/context.ts b/x-pack/plugins/canvas/i18n/functions/dict/context.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/context.ts rename to x-pack/plugins/canvas/i18n/functions/dict/context.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/csv.ts b/x-pack/plugins/canvas/i18n/functions/dict/csv.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/csv.ts rename to x-pack/plugins/canvas/i18n/functions/dict/csv.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/date.ts b/x-pack/plugins/canvas/i18n/functions/dict/date.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/date.ts rename to x-pack/plugins/canvas/i18n/functions/dict/date.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/demodata.ts b/x-pack/plugins/canvas/i18n/functions/dict/demodata.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/demodata.ts rename to x-pack/plugins/canvas/i18n/functions/dict/demodata.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/do.ts b/x-pack/plugins/canvas/i18n/functions/dict/do.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/do.ts rename to x-pack/plugins/canvas/i18n/functions/dict/do.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/dropdown_control.ts b/x-pack/plugins/canvas/i18n/functions/dict/dropdown_control.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/dropdown_control.ts rename to x-pack/plugins/canvas/i18n/functions/dict/dropdown_control.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/eq.ts b/x-pack/plugins/canvas/i18n/functions/dict/eq.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/eq.ts rename to x-pack/plugins/canvas/i18n/functions/dict/eq.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/escount.ts b/x-pack/plugins/canvas/i18n/functions/dict/escount.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/escount.ts rename to x-pack/plugins/canvas/i18n/functions/dict/escount.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/esdocs.ts b/x-pack/plugins/canvas/i18n/functions/dict/esdocs.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/esdocs.ts rename to x-pack/plugins/canvas/i18n/functions/dict/esdocs.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/essql.ts b/x-pack/plugins/canvas/i18n/functions/dict/essql.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/essql.ts rename to x-pack/plugins/canvas/i18n/functions/dict/essql.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/exactly.ts b/x-pack/plugins/canvas/i18n/functions/dict/exactly.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/exactly.ts rename to x-pack/plugins/canvas/i18n/functions/dict/exactly.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/filterrows.ts b/x-pack/plugins/canvas/i18n/functions/dict/filterrows.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/filterrows.ts rename to x-pack/plugins/canvas/i18n/functions/dict/filterrows.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/filters.ts b/x-pack/plugins/canvas/i18n/functions/dict/filters.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/filters.ts rename to x-pack/plugins/canvas/i18n/functions/dict/filters.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/formatdate.ts b/x-pack/plugins/canvas/i18n/functions/dict/formatdate.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/formatdate.ts rename to x-pack/plugins/canvas/i18n/functions/dict/formatdate.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/formatnumber.ts b/x-pack/plugins/canvas/i18n/functions/dict/formatnumber.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/formatnumber.ts rename to x-pack/plugins/canvas/i18n/functions/dict/formatnumber.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/get_cell.ts b/x-pack/plugins/canvas/i18n/functions/dict/get_cell.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/get_cell.ts rename to x-pack/plugins/canvas/i18n/functions/dict/get_cell.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/gt.ts b/x-pack/plugins/canvas/i18n/functions/dict/gt.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/gt.ts rename to x-pack/plugins/canvas/i18n/functions/dict/gt.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/gte.ts b/x-pack/plugins/canvas/i18n/functions/dict/gte.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/gte.ts rename to x-pack/plugins/canvas/i18n/functions/dict/gte.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/head.ts b/x-pack/plugins/canvas/i18n/functions/dict/head.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/head.ts rename to x-pack/plugins/canvas/i18n/functions/dict/head.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/if.ts b/x-pack/plugins/canvas/i18n/functions/dict/if.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/if.ts rename to x-pack/plugins/canvas/i18n/functions/dict/if.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/image.ts b/x-pack/plugins/canvas/i18n/functions/dict/image.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/image.ts rename to x-pack/plugins/canvas/i18n/functions/dict/image.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/join_rows.ts b/x-pack/plugins/canvas/i18n/functions/dict/join_rows.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/join_rows.ts rename to x-pack/plugins/canvas/i18n/functions/dict/join_rows.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/location.ts b/x-pack/plugins/canvas/i18n/functions/dict/location.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/location.ts rename to x-pack/plugins/canvas/i18n/functions/dict/location.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/lt.ts b/x-pack/plugins/canvas/i18n/functions/dict/lt.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/lt.ts rename to x-pack/plugins/canvas/i18n/functions/dict/lt.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/lte.ts b/x-pack/plugins/canvas/i18n/functions/dict/lte.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/lte.ts rename to x-pack/plugins/canvas/i18n/functions/dict/lte.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/map_center.ts b/x-pack/plugins/canvas/i18n/functions/dict/map_center.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/map_center.ts rename to x-pack/plugins/canvas/i18n/functions/dict/map_center.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/map_column.ts b/x-pack/plugins/canvas/i18n/functions/dict/map_column.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/map_column.ts rename to x-pack/plugins/canvas/i18n/functions/dict/map_column.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/markdown.ts b/x-pack/plugins/canvas/i18n/functions/dict/markdown.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/markdown.ts rename to x-pack/plugins/canvas/i18n/functions/dict/markdown.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/math.ts b/x-pack/plugins/canvas/i18n/functions/dict/math.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/math.ts rename to x-pack/plugins/canvas/i18n/functions/dict/math.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/metric.ts b/x-pack/plugins/canvas/i18n/functions/dict/metric.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/metric.ts rename to x-pack/plugins/canvas/i18n/functions/dict/metric.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/neq.ts b/x-pack/plugins/canvas/i18n/functions/dict/neq.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/neq.ts rename to x-pack/plugins/canvas/i18n/functions/dict/neq.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/palette.ts b/x-pack/plugins/canvas/i18n/functions/dict/palette.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/palette.ts rename to x-pack/plugins/canvas/i18n/functions/dict/palette.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/pie.ts b/x-pack/plugins/canvas/i18n/functions/dict/pie.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/pie.ts rename to x-pack/plugins/canvas/i18n/functions/dict/pie.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/plot.ts b/x-pack/plugins/canvas/i18n/functions/dict/plot.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/plot.ts rename to x-pack/plugins/canvas/i18n/functions/dict/plot.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/ply.ts b/x-pack/plugins/canvas/i18n/functions/dict/ply.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/ply.ts rename to x-pack/plugins/canvas/i18n/functions/dict/ply.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/pointseries.ts b/x-pack/plugins/canvas/i18n/functions/dict/pointseries.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/pointseries.ts rename to x-pack/plugins/canvas/i18n/functions/dict/pointseries.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/progress.ts b/x-pack/plugins/canvas/i18n/functions/dict/progress.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/progress.ts rename to x-pack/plugins/canvas/i18n/functions/dict/progress.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/render.ts b/x-pack/plugins/canvas/i18n/functions/dict/render.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/render.ts rename to x-pack/plugins/canvas/i18n/functions/dict/render.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/repeat_image.ts b/x-pack/plugins/canvas/i18n/functions/dict/repeat_image.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/repeat_image.ts rename to x-pack/plugins/canvas/i18n/functions/dict/repeat_image.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/replace.ts b/x-pack/plugins/canvas/i18n/functions/dict/replace.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/replace.ts rename to x-pack/plugins/canvas/i18n/functions/dict/replace.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/reveal_image.ts b/x-pack/plugins/canvas/i18n/functions/dict/reveal_image.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/reveal_image.ts rename to x-pack/plugins/canvas/i18n/functions/dict/reveal_image.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/rounddate.ts b/x-pack/plugins/canvas/i18n/functions/dict/rounddate.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/rounddate.ts rename to x-pack/plugins/canvas/i18n/functions/dict/rounddate.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/row_count.ts b/x-pack/plugins/canvas/i18n/functions/dict/row_count.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/row_count.ts rename to x-pack/plugins/canvas/i18n/functions/dict/row_count.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/saved_lens.ts b/x-pack/plugins/canvas/i18n/functions/dict/saved_lens.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/saved_lens.ts rename to x-pack/plugins/canvas/i18n/functions/dict/saved_lens.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/saved_map.ts b/x-pack/plugins/canvas/i18n/functions/dict/saved_map.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/saved_map.ts rename to x-pack/plugins/canvas/i18n/functions/dict/saved_map.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/saved_search.ts b/x-pack/plugins/canvas/i18n/functions/dict/saved_search.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/saved_search.ts rename to x-pack/plugins/canvas/i18n/functions/dict/saved_search.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/saved_visualization.ts b/x-pack/plugins/canvas/i18n/functions/dict/saved_visualization.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/saved_visualization.ts rename to x-pack/plugins/canvas/i18n/functions/dict/saved_visualization.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/series_style.ts b/x-pack/plugins/canvas/i18n/functions/dict/series_style.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/series_style.ts rename to x-pack/plugins/canvas/i18n/functions/dict/series_style.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/shape.ts b/x-pack/plugins/canvas/i18n/functions/dict/shape.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/shape.ts rename to x-pack/plugins/canvas/i18n/functions/dict/shape.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/sort.ts b/x-pack/plugins/canvas/i18n/functions/dict/sort.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/sort.ts rename to x-pack/plugins/canvas/i18n/functions/dict/sort.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/static_column.ts b/x-pack/plugins/canvas/i18n/functions/dict/static_column.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/static_column.ts rename to x-pack/plugins/canvas/i18n/functions/dict/static_column.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/string.ts b/x-pack/plugins/canvas/i18n/functions/dict/string.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/string.ts rename to x-pack/plugins/canvas/i18n/functions/dict/string.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/switch.ts b/x-pack/plugins/canvas/i18n/functions/dict/switch.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/switch.ts rename to x-pack/plugins/canvas/i18n/functions/dict/switch.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/table.ts b/x-pack/plugins/canvas/i18n/functions/dict/table.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/table.ts rename to x-pack/plugins/canvas/i18n/functions/dict/table.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/tail.ts b/x-pack/plugins/canvas/i18n/functions/dict/tail.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/tail.ts rename to x-pack/plugins/canvas/i18n/functions/dict/tail.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/time_range.ts b/x-pack/plugins/canvas/i18n/functions/dict/time_range.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/time_range.ts rename to x-pack/plugins/canvas/i18n/functions/dict/time_range.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/timefilter.ts b/x-pack/plugins/canvas/i18n/functions/dict/timefilter.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/timefilter.ts rename to x-pack/plugins/canvas/i18n/functions/dict/timefilter.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/timefilter_control.ts b/x-pack/plugins/canvas/i18n/functions/dict/timefilter_control.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/timefilter_control.ts rename to x-pack/plugins/canvas/i18n/functions/dict/timefilter_control.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/timelion.ts b/x-pack/plugins/canvas/i18n/functions/dict/timelion.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/timelion.ts rename to x-pack/plugins/canvas/i18n/functions/dict/timelion.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/to.ts b/x-pack/plugins/canvas/i18n/functions/dict/to.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/to.ts rename to x-pack/plugins/canvas/i18n/functions/dict/to.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/dict/urlparam.ts b/x-pack/plugins/canvas/i18n/functions/dict/urlparam.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/dict/urlparam.ts rename to x-pack/plugins/canvas/i18n/functions/dict/urlparam.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/function_errors.ts b/x-pack/plugins/canvas/i18n/functions/function_errors.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/function_errors.ts rename to x-pack/plugins/canvas/i18n/functions/function_errors.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/function_help.ts b/x-pack/plugins/canvas/i18n/functions/function_help.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/function_help.ts rename to x-pack/plugins/canvas/i18n/functions/function_help.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/functions/index.ts b/x-pack/plugins/canvas/i18n/functions/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/functions/index.ts rename to x-pack/plugins/canvas/i18n/functions/index.ts diff --git a/x-pack/plugins/canvas/i18n/index.ts b/x-pack/plugins/canvas/i18n/index.ts index 8a65a75c0cfb9f..864311d34aca08 100644 --- a/x-pack/plugins/canvas/i18n/index.ts +++ b/x-pack/plugins/canvas/i18n/index.ts @@ -4,4 +4,16 @@ * you may not use this file except in compliance with the Elastic License. */ -export * from '../../../legacy/plugins/canvas/i18n'; +export * from './capabilities'; +export * from './components'; +export * from './constants'; +export * from './errors'; +export * from './expression_types'; +export * from './elements'; +export * from './functions'; +export * from './renderers'; +export * from './shortcuts'; +export * from './tags'; +export * from './transitions'; +export * from './ui'; +export * from './units'; diff --git a/x-pack/legacy/plugins/canvas/i18n/renderers.ts b/x-pack/plugins/canvas/i18n/renderers.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/renderers.ts rename to x-pack/plugins/canvas/i18n/renderers.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/shortcuts.ts b/x-pack/plugins/canvas/i18n/shortcuts.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/shortcuts.ts rename to x-pack/plugins/canvas/i18n/shortcuts.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/tags.ts b/x-pack/plugins/canvas/i18n/tags.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/tags.ts rename to x-pack/plugins/canvas/i18n/tags.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/templates/apply_strings.ts b/x-pack/plugins/canvas/i18n/templates/apply_strings.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/templates/apply_strings.ts rename to x-pack/plugins/canvas/i18n/templates/apply_strings.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/templates/index.ts b/x-pack/plugins/canvas/i18n/templates/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/templates/index.ts rename to x-pack/plugins/canvas/i18n/templates/index.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/templates/template_strings.test.ts b/x-pack/plugins/canvas/i18n/templates/template_strings.test.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/templates/template_strings.test.ts rename to x-pack/plugins/canvas/i18n/templates/template_strings.test.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/templates/template_strings.ts b/x-pack/plugins/canvas/i18n/templates/template_strings.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/templates/template_strings.ts rename to x-pack/plugins/canvas/i18n/templates/template_strings.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/transitions.ts b/x-pack/plugins/canvas/i18n/transitions.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/transitions.ts rename to x-pack/plugins/canvas/i18n/transitions.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/ui.ts b/x-pack/plugins/canvas/i18n/ui.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/ui.ts rename to x-pack/plugins/canvas/i18n/ui.ts diff --git a/x-pack/legacy/plugins/canvas/i18n/units.ts b/x-pack/plugins/canvas/i18n/units.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/i18n/units.ts rename to x-pack/plugins/canvas/i18n/units.ts diff --git a/x-pack/legacy/plugins/canvas/images/canvas.png b/x-pack/plugins/canvas/images/canvas.png similarity index 100% rename from x-pack/legacy/plugins/canvas/images/canvas.png rename to x-pack/plugins/canvas/images/canvas.png diff --git a/x-pack/legacy/plugins/canvas/images/canvas.svg b/x-pack/plugins/canvas/images/canvas.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/images/canvas.svg rename to x-pack/plugins/canvas/images/canvas.svg diff --git a/x-pack/legacy/plugins/canvas/images/canvas_blank.svg b/x-pack/plugins/canvas/images/canvas_blank.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/images/canvas_blank.svg rename to x-pack/plugins/canvas/images/canvas_blank.svg diff --git a/x-pack/legacy/plugins/canvas/images/icon_black.svg b/x-pack/plugins/canvas/images/icon_black.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/images/icon_black.svg rename to x-pack/plugins/canvas/images/icon_black.svg diff --git a/x-pack/legacy/plugins/canvas/images/logo.gif b/x-pack/plugins/canvas/images/logo.gif similarity index 100% rename from x-pack/legacy/plugins/canvas/images/logo.gif rename to x-pack/plugins/canvas/images/logo.gif diff --git a/x-pack/legacy/plugins/canvas/public/__tests__/setup.js b/x-pack/plugins/canvas/public/__tests__/setup.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/__tests__/setup.js rename to x-pack/plugins/canvas/public/__tests__/setup.js diff --git a/x-pack/legacy/plugins/canvas/public/application.tsx b/x-pack/plugins/canvas/public/application.tsx similarity index 94% rename from x-pack/legacy/plugins/canvas/public/application.tsx rename to x-pack/plugins/canvas/public/application.tsx index 8ee65c3386afca..284023e74d137b 100644 --- a/x-pack/legacy/plugins/canvas/public/application.tsx +++ b/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'; diff --git a/x-pack/legacy/plugins/canvas/public/apps/export/export/__tests__/__snapshots__/export_app.test.tsx.snap b/x-pack/plugins/canvas/public/apps/export/export/__tests__/__snapshots__/export_app.test.tsx.snap similarity index 100% rename from x-pack/legacy/plugins/canvas/public/apps/export/export/__tests__/__snapshots__/export_app.test.tsx.snap rename to x-pack/plugins/canvas/public/apps/export/export/__tests__/__snapshots__/export_app.test.tsx.snap diff --git a/x-pack/legacy/plugins/canvas/public/apps/export/export/__tests__/export_app.test.tsx b/x-pack/plugins/canvas/public/apps/export/export/__tests__/export_app.test.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/apps/export/export/__tests__/export_app.test.tsx rename to x-pack/plugins/canvas/public/apps/export/export/__tests__/export_app.test.tsx diff --git a/x-pack/legacy/plugins/canvas/public/apps/export/export/export_app.js b/x-pack/plugins/canvas/public/apps/export/export/export_app.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/apps/export/export/export_app.js rename to x-pack/plugins/canvas/public/apps/export/export/export_app.js diff --git a/x-pack/legacy/plugins/canvas/public/apps/export/export/export_app.scss b/x-pack/plugins/canvas/public/apps/export/export/export_app.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/apps/export/export/export_app.scss rename to x-pack/plugins/canvas/public/apps/export/export/export_app.scss diff --git a/x-pack/legacy/plugins/canvas/public/apps/export/export/index.js b/x-pack/plugins/canvas/public/apps/export/export/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/apps/export/export/index.js rename to x-pack/plugins/canvas/public/apps/export/export/index.js diff --git a/x-pack/legacy/plugins/canvas/public/apps/export/export/load_workpad.js b/x-pack/plugins/canvas/public/apps/export/export/load_workpad.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/apps/export/export/load_workpad.js rename to x-pack/plugins/canvas/public/apps/export/export/load_workpad.js diff --git a/x-pack/legacy/plugins/canvas/public/apps/export/index.js b/x-pack/plugins/canvas/public/apps/export/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/apps/export/index.js rename to x-pack/plugins/canvas/public/apps/export/index.js diff --git a/x-pack/legacy/plugins/canvas/public/apps/export/routes.js b/x-pack/plugins/canvas/public/apps/export/routes.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/apps/export/routes.js rename to x-pack/plugins/canvas/public/apps/export/routes.js diff --git a/x-pack/legacy/plugins/canvas/public/apps/home/home_app/home_app.js b/x-pack/plugins/canvas/public/apps/home/home_app/home_app.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/apps/home/home_app/home_app.js rename to x-pack/plugins/canvas/public/apps/home/home_app/home_app.js diff --git a/x-pack/legacy/plugins/canvas/public/apps/home/home_app/home_app.scss b/x-pack/plugins/canvas/public/apps/home/home_app/home_app.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/apps/home/home_app/home_app.scss rename to x-pack/plugins/canvas/public/apps/home/home_app/home_app.scss diff --git a/x-pack/legacy/plugins/canvas/public/apps/home/home_app/index.js b/x-pack/plugins/canvas/public/apps/home/home_app/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/apps/home/home_app/index.js rename to x-pack/plugins/canvas/public/apps/home/home_app/index.js diff --git a/x-pack/legacy/plugins/canvas/public/apps/home/index.js b/x-pack/plugins/canvas/public/apps/home/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/apps/home/index.js rename to x-pack/plugins/canvas/public/apps/home/index.js diff --git a/x-pack/legacy/plugins/canvas/public/apps/home/routes.js b/x-pack/plugins/canvas/public/apps/home/routes.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/apps/home/routes.js rename to x-pack/plugins/canvas/public/apps/home/routes.js diff --git a/x-pack/legacy/plugins/canvas/public/apps/index.js b/x-pack/plugins/canvas/public/apps/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/apps/index.js rename to x-pack/plugins/canvas/public/apps/index.js diff --git a/x-pack/legacy/plugins/canvas/public/apps/workpad/index.js b/x-pack/plugins/canvas/public/apps/workpad/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/apps/workpad/index.js rename to x-pack/plugins/canvas/public/apps/workpad/index.js diff --git a/x-pack/legacy/plugins/canvas/public/apps/workpad/routes.js b/x-pack/plugins/canvas/public/apps/workpad/routes.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/apps/workpad/routes.js rename to x-pack/plugins/canvas/public/apps/workpad/routes.js diff --git a/x-pack/legacy/plugins/canvas/public/apps/workpad/workpad_app/index.js b/x-pack/plugins/canvas/public/apps/workpad/workpad_app/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/apps/workpad/workpad_app/index.js rename to x-pack/plugins/canvas/public/apps/workpad/workpad_app/index.js diff --git a/x-pack/legacy/plugins/canvas/public/apps/workpad/workpad_app/load_workpad.js b/x-pack/plugins/canvas/public/apps/workpad/workpad_app/load_workpad.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/apps/workpad/workpad_app/load_workpad.js rename to x-pack/plugins/canvas/public/apps/workpad/workpad_app/load_workpad.js diff --git a/x-pack/legacy/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.js b/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.js rename to x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.js diff --git a/x-pack/legacy/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.scss b/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.scss rename to x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.scss diff --git a/x-pack/legacy/plugins/canvas/public/apps/workpad/workpad_app/workpad_telemetry.test.tsx b/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_telemetry.test.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/apps/workpad/workpad_app/workpad_telemetry.test.tsx rename to x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_telemetry.test.tsx diff --git a/x-pack/legacy/plugins/canvas/public/apps/workpad/workpad_app/workpad_telemetry.tsx b/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_telemetry.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/apps/workpad/workpad_app/workpad_telemetry.tsx rename to x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_telemetry.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/alignment_guide/alignment_guide.js b/x-pack/plugins/canvas/public/components/alignment_guide/alignment_guide.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/alignment_guide/alignment_guide.js rename to x-pack/plugins/canvas/public/components/alignment_guide/alignment_guide.js diff --git a/x-pack/legacy/plugins/canvas/public/components/alignment_guide/alignment_guide.scss b/x-pack/plugins/canvas/public/components/alignment_guide/alignment_guide.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/alignment_guide/alignment_guide.scss rename to x-pack/plugins/canvas/public/components/alignment_guide/alignment_guide.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/alignment_guide/index.js b/x-pack/plugins/canvas/public/components/alignment_guide/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/alignment_guide/index.js rename to x-pack/plugins/canvas/public/components/alignment_guide/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/app/app.js b/x-pack/plugins/canvas/public/components/app/app.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/app/app.js rename to x-pack/plugins/canvas/public/components/app/app.js diff --git a/x-pack/legacy/plugins/canvas/public/components/app/index.js b/x-pack/plugins/canvas/public/components/app/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/app/index.js rename to x-pack/plugins/canvas/public/components/app/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/app/track_route_change.js b/x-pack/plugins/canvas/public/components/app/track_route_change.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/app/track_route_change.js rename to x-pack/plugins/canvas/public/components/app/track_route_change.js diff --git a/x-pack/legacy/plugins/canvas/public/components/arg_add/arg_add.js b/x-pack/plugins/canvas/public/components/arg_add/arg_add.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/arg_add/arg_add.js rename to x-pack/plugins/canvas/public/components/arg_add/arg_add.js diff --git a/x-pack/legacy/plugins/canvas/public/components/arg_add/arg_add.scss b/x-pack/plugins/canvas/public/components/arg_add/arg_add.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/arg_add/arg_add.scss rename to x-pack/plugins/canvas/public/components/arg_add/arg_add.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/arg_add/index.js b/x-pack/plugins/canvas/public/components/arg_add/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/arg_add/index.js rename to x-pack/plugins/canvas/public/components/arg_add/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/arg_add_popover/arg_add_popover.scss b/x-pack/plugins/canvas/public/components/arg_add_popover/arg_add_popover.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/arg_add_popover/arg_add_popover.scss rename to x-pack/plugins/canvas/public/components/arg_add_popover/arg_add_popover.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/arg_add_popover/arg_add_popover.tsx b/x-pack/plugins/canvas/public/components/arg_add_popover/arg_add_popover.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/arg_add_popover/arg_add_popover.tsx rename to x-pack/plugins/canvas/public/components/arg_add_popover/arg_add_popover.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/arg_add_popover/index.ts b/x-pack/plugins/canvas/public/components/arg_add_popover/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/arg_add_popover/index.ts rename to x-pack/plugins/canvas/public/components/arg_add_popover/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/components/arg_form/advanced_failure.js b/x-pack/plugins/canvas/public/components/arg_form/advanced_failure.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/arg_form/advanced_failure.js rename to x-pack/plugins/canvas/public/components/arg_form/advanced_failure.js diff --git a/x-pack/legacy/plugins/canvas/public/components/arg_form/arg_form.js b/x-pack/plugins/canvas/public/components/arg_form/arg_form.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/arg_form/arg_form.js rename to x-pack/plugins/canvas/public/components/arg_form/arg_form.js diff --git a/x-pack/legacy/plugins/canvas/public/components/arg_form/arg_form.scss b/x-pack/plugins/canvas/public/components/arg_form/arg_form.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/arg_form/arg_form.scss rename to x-pack/plugins/canvas/public/components/arg_form/arg_form.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/arg_form/arg_label.js b/x-pack/plugins/canvas/public/components/arg_form/arg_label.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/arg_form/arg_label.js rename to x-pack/plugins/canvas/public/components/arg_form/arg_label.js diff --git a/x-pack/legacy/plugins/canvas/public/components/arg_form/arg_simple_form.tsx b/x-pack/plugins/canvas/public/components/arg_form/arg_simple_form.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/arg_form/arg_simple_form.tsx rename to x-pack/plugins/canvas/public/components/arg_form/arg_simple_form.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/arg_form/arg_template_form.js b/x-pack/plugins/canvas/public/components/arg_form/arg_template_form.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/arg_form/arg_template_form.js rename to x-pack/plugins/canvas/public/components/arg_form/arg_template_form.js diff --git a/x-pack/legacy/plugins/canvas/public/components/arg_form/index.js b/x-pack/plugins/canvas/public/components/arg_form/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/arg_form/index.js rename to x-pack/plugins/canvas/public/components/arg_form/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/arg_form/pending_arg_value.js b/x-pack/plugins/canvas/public/components/arg_form/pending_arg_value.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/arg_form/pending_arg_value.js rename to x-pack/plugins/canvas/public/components/arg_form/pending_arg_value.js diff --git a/x-pack/legacy/plugins/canvas/public/components/arg_form/simple_failure.tsx b/x-pack/plugins/canvas/public/components/arg_form/simple_failure.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/arg_form/simple_failure.tsx rename to x-pack/plugins/canvas/public/components/arg_form/simple_failure.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/asset_manager/__examples__/__snapshots__/asset.examples.storyshot b/x-pack/plugins/canvas/public/components/asset_manager/__examples__/__snapshots__/asset.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/asset_manager/__examples__/__snapshots__/asset.examples.storyshot rename to x-pack/plugins/canvas/public/components/asset_manager/__examples__/__snapshots__/asset.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/asset_manager/__examples__/__snapshots__/asset_manager.examples.storyshot b/x-pack/plugins/canvas/public/components/asset_manager/__examples__/__snapshots__/asset_manager.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/asset_manager/__examples__/__snapshots__/asset_manager.examples.storyshot rename to x-pack/plugins/canvas/public/components/asset_manager/__examples__/__snapshots__/asset_manager.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/asset_manager/__examples__/__snapshots__/asset_manager.stories.storyshot b/x-pack/plugins/canvas/public/components/asset_manager/__examples__/__snapshots__/asset_manager.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/asset_manager/__examples__/__snapshots__/asset_manager.stories.storyshot rename to x-pack/plugins/canvas/public/components/asset_manager/__examples__/__snapshots__/asset_manager.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/asset_manager/__examples__/asset.examples.tsx b/x-pack/plugins/canvas/public/components/asset_manager/__examples__/asset.examples.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/asset_manager/__examples__/asset.examples.tsx rename to x-pack/plugins/canvas/public/components/asset_manager/__examples__/asset.examples.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/asset_manager/__examples__/asset_manager.stories.tsx b/x-pack/plugins/canvas/public/components/asset_manager/__examples__/asset_manager.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/asset_manager/__examples__/asset_manager.stories.tsx rename to x-pack/plugins/canvas/public/components/asset_manager/__examples__/asset_manager.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/asset_manager/asset.tsx b/x-pack/plugins/canvas/public/components/asset_manager/asset.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/asset_manager/asset.tsx rename to x-pack/plugins/canvas/public/components/asset_manager/asset.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/asset_manager/asset_manager.scss b/x-pack/plugins/canvas/public/components/asset_manager/asset_manager.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/asset_manager/asset_manager.scss rename to x-pack/plugins/canvas/public/components/asset_manager/asset_manager.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/asset_manager/asset_manager.tsx b/x-pack/plugins/canvas/public/components/asset_manager/asset_manager.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/asset_manager/asset_manager.tsx rename to x-pack/plugins/canvas/public/components/asset_manager/asset_manager.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/asset_manager/asset_modal.tsx b/x-pack/plugins/canvas/public/components/asset_manager/asset_modal.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/asset_manager/asset_modal.tsx rename to x-pack/plugins/canvas/public/components/asset_manager/asset_modal.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/asset_manager/index.ts b/x-pack/plugins/canvas/public/components/asset_manager/index.ts similarity index 97% rename from x-pack/legacy/plugins/canvas/public/components/asset_manager/index.ts rename to x-pack/plugins/canvas/public/components/asset_manager/index.ts index 3fd34d6d2a9bb9..49894b9d874145 100644 --- a/x-pack/legacy/plugins/canvas/public/components/asset_manager/index.ts +++ b/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'; diff --git a/x-pack/legacy/plugins/canvas/public/components/asset_picker/asset_picker.scss b/x-pack/plugins/canvas/public/components/asset_picker/asset_picker.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/asset_picker/asset_picker.scss rename to x-pack/plugins/canvas/public/components/asset_picker/asset_picker.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/asset_picker/asset_picker.tsx b/x-pack/plugins/canvas/public/components/asset_picker/asset_picker.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/asset_picker/asset_picker.tsx rename to x-pack/plugins/canvas/public/components/asset_picker/asset_picker.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/asset_picker/index.ts b/x-pack/plugins/canvas/public/components/asset_picker/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/asset_picker/index.ts rename to x-pack/plugins/canvas/public/components/asset_picker/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/components/autocomplete/autocomplete.js b/x-pack/plugins/canvas/public/components/autocomplete/autocomplete.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/autocomplete/autocomplete.js rename to x-pack/plugins/canvas/public/components/autocomplete/autocomplete.js diff --git a/x-pack/legacy/plugins/canvas/public/components/autocomplete/autocomplete.scss b/x-pack/plugins/canvas/public/components/autocomplete/autocomplete.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/autocomplete/autocomplete.scss rename to x-pack/plugins/canvas/public/components/autocomplete/autocomplete.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/autocomplete/index.js b/x-pack/plugins/canvas/public/components/autocomplete/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/autocomplete/index.js rename to x-pack/plugins/canvas/public/components/autocomplete/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/border_connection/border_connection.js b/x-pack/plugins/canvas/public/components/border_connection/border_connection.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/border_connection/border_connection.js rename to x-pack/plugins/canvas/public/components/border_connection/border_connection.js diff --git a/x-pack/legacy/plugins/canvas/public/components/border_connection/border_connection.scss b/x-pack/plugins/canvas/public/components/border_connection/border_connection.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/border_connection/border_connection.scss rename to x-pack/plugins/canvas/public/components/border_connection/border_connection.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/border_connection/index.js b/x-pack/plugins/canvas/public/components/border_connection/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/border_connection/index.js rename to x-pack/plugins/canvas/public/components/border_connection/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/border_resize_handle/border_resize_handle.js b/x-pack/plugins/canvas/public/components/border_resize_handle/border_resize_handle.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/border_resize_handle/border_resize_handle.js rename to x-pack/plugins/canvas/public/components/border_resize_handle/border_resize_handle.js diff --git a/x-pack/legacy/plugins/canvas/public/components/border_resize_handle/border_resize_handle.scss b/x-pack/plugins/canvas/public/components/border_resize_handle/border_resize_handle.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/border_resize_handle/border_resize_handle.scss rename to x-pack/plugins/canvas/public/components/border_resize_handle/border_resize_handle.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/border_resize_handle/index.js b/x-pack/plugins/canvas/public/components/border_resize_handle/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/border_resize_handle/index.js rename to x-pack/plugins/canvas/public/components/border_resize_handle/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/clipboard/clipboard.scss b/x-pack/plugins/canvas/public/components/clipboard/clipboard.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/clipboard/clipboard.scss rename to x-pack/plugins/canvas/public/components/clipboard/clipboard.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/clipboard/clipboard.tsx b/x-pack/plugins/canvas/public/components/clipboard/clipboard.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/clipboard/clipboard.tsx rename to x-pack/plugins/canvas/public/components/clipboard/clipboard.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/clipboard/index.ts b/x-pack/plugins/canvas/public/components/clipboard/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/clipboard/index.ts rename to x-pack/plugins/canvas/public/components/clipboard/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/components/color_dot/__examples__/__snapshots__/color_dot.stories.storyshot b/x-pack/plugins/canvas/public/components/color_dot/__examples__/__snapshots__/color_dot.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/color_dot/__examples__/__snapshots__/color_dot.stories.storyshot rename to x-pack/plugins/canvas/public/components/color_dot/__examples__/__snapshots__/color_dot.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/color_dot/__examples__/color_dot.stories.tsx b/x-pack/plugins/canvas/public/components/color_dot/__examples__/color_dot.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/color_dot/__examples__/color_dot.stories.tsx rename to x-pack/plugins/canvas/public/components/color_dot/__examples__/color_dot.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/color_dot/color_dot.scss b/x-pack/plugins/canvas/public/components/color_dot/color_dot.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/color_dot/color_dot.scss rename to x-pack/plugins/canvas/public/components/color_dot/color_dot.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/color_dot/color_dot.tsx b/x-pack/plugins/canvas/public/components/color_dot/color_dot.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/color_dot/color_dot.tsx rename to x-pack/plugins/canvas/public/components/color_dot/color_dot.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/color_dot/index.ts b/x-pack/plugins/canvas/public/components/color_dot/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/color_dot/index.ts rename to x-pack/plugins/canvas/public/components/color_dot/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/components/color_manager/__examples__/__snapshots__/color_manager.stories.storyshot b/x-pack/plugins/canvas/public/components/color_manager/__examples__/__snapshots__/color_manager.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/color_manager/__examples__/__snapshots__/color_manager.stories.storyshot rename to x-pack/plugins/canvas/public/components/color_manager/__examples__/__snapshots__/color_manager.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/color_manager/__examples__/color_manager.stories.tsx b/x-pack/plugins/canvas/public/components/color_manager/__examples__/color_manager.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/color_manager/__examples__/color_manager.stories.tsx rename to x-pack/plugins/canvas/public/components/color_manager/__examples__/color_manager.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/color_manager/color_manager.tsx b/x-pack/plugins/canvas/public/components/color_manager/color_manager.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/color_manager/color_manager.tsx rename to x-pack/plugins/canvas/public/components/color_manager/color_manager.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/color_manager/index.ts b/x-pack/plugins/canvas/public/components/color_manager/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/color_manager/index.ts rename to x-pack/plugins/canvas/public/components/color_manager/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/components/color_palette/__examples__/__snapshots__/color_palette.stories.storyshot b/x-pack/plugins/canvas/public/components/color_palette/__examples__/__snapshots__/color_palette.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/color_palette/__examples__/__snapshots__/color_palette.stories.storyshot rename to x-pack/plugins/canvas/public/components/color_palette/__examples__/__snapshots__/color_palette.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/color_palette/__examples__/color_palette.stories.tsx b/x-pack/plugins/canvas/public/components/color_palette/__examples__/color_palette.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/color_palette/__examples__/color_palette.stories.tsx rename to x-pack/plugins/canvas/public/components/color_palette/__examples__/color_palette.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/color_palette/color_palette.scss b/x-pack/plugins/canvas/public/components/color_palette/color_palette.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/color_palette/color_palette.scss rename to x-pack/plugins/canvas/public/components/color_palette/color_palette.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/color_palette/color_palette.tsx b/x-pack/plugins/canvas/public/components/color_palette/color_palette.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/color_palette/color_palette.tsx rename to x-pack/plugins/canvas/public/components/color_palette/color_palette.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/color_palette/index.ts b/x-pack/plugins/canvas/public/components/color_palette/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/color_palette/index.ts rename to x-pack/plugins/canvas/public/components/color_palette/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/components/color_picker/__examples__/__snapshots__/color_picker.stories.storyshot b/x-pack/plugins/canvas/public/components/color_picker/__examples__/__snapshots__/color_picker.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/color_picker/__examples__/__snapshots__/color_picker.stories.storyshot rename to x-pack/plugins/canvas/public/components/color_picker/__examples__/__snapshots__/color_picker.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/color_picker/__examples__/color_picker.stories.tsx b/x-pack/plugins/canvas/public/components/color_picker/__examples__/color_picker.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/color_picker/__examples__/color_picker.stories.tsx rename to x-pack/plugins/canvas/public/components/color_picker/__examples__/color_picker.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/color_picker/color_picker.tsx b/x-pack/plugins/canvas/public/components/color_picker/color_picker.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/color_picker/color_picker.tsx rename to x-pack/plugins/canvas/public/components/color_picker/color_picker.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/color_picker/index.ts b/x-pack/plugins/canvas/public/components/color_picker/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/color_picker/index.ts rename to x-pack/plugins/canvas/public/components/color_picker/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/components/color_picker_popover/__examples__/__snapshots__/color_picker_popover.stories.storyshot b/x-pack/plugins/canvas/public/components/color_picker_popover/__examples__/__snapshots__/color_picker_popover.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/color_picker_popover/__examples__/__snapshots__/color_picker_popover.stories.storyshot rename to x-pack/plugins/canvas/public/components/color_picker_popover/__examples__/__snapshots__/color_picker_popover.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/color_picker_popover/__examples__/color_picker_popover.stories.tsx b/x-pack/plugins/canvas/public/components/color_picker_popover/__examples__/color_picker_popover.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/color_picker_popover/__examples__/color_picker_popover.stories.tsx rename to x-pack/plugins/canvas/public/components/color_picker_popover/__examples__/color_picker_popover.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/color_picker_popover/color_picker_popover.scss b/x-pack/plugins/canvas/public/components/color_picker_popover/color_picker_popover.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/color_picker_popover/color_picker_popover.scss rename to x-pack/plugins/canvas/public/components/color_picker_popover/color_picker_popover.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/color_picker_popover/color_picker_popover.tsx b/x-pack/plugins/canvas/public/components/color_picker_popover/color_picker_popover.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/color_picker_popover/color_picker_popover.tsx rename to x-pack/plugins/canvas/public/components/color_picker_popover/color_picker_popover.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/color_picker_popover/index.ts b/x-pack/plugins/canvas/public/components/color_picker_popover/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/color_picker_popover/index.ts rename to x-pack/plugins/canvas/public/components/color_picker_popover/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/components/confirm_modal/confirm_modal.tsx b/x-pack/plugins/canvas/public/components/confirm_modal/confirm_modal.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/confirm_modal/confirm_modal.tsx rename to x-pack/plugins/canvas/public/components/confirm_modal/confirm_modal.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/confirm_modal/index.ts b/x-pack/plugins/canvas/public/components/confirm_modal/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/confirm_modal/index.ts rename to x-pack/plugins/canvas/public/components/confirm_modal/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/components/custom_element_modal/__examples__/__snapshots__/custom_element_modal.examples.storyshot b/x-pack/plugins/canvas/public/components/custom_element_modal/__examples__/__snapshots__/custom_element_modal.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/custom_element_modal/__examples__/__snapshots__/custom_element_modal.examples.storyshot rename to x-pack/plugins/canvas/public/components/custom_element_modal/__examples__/__snapshots__/custom_element_modal.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/custom_element_modal/__examples__/custom_element_modal.examples.tsx b/x-pack/plugins/canvas/public/components/custom_element_modal/__examples__/custom_element_modal.examples.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/custom_element_modal/__examples__/custom_element_modal.examples.tsx rename to x-pack/plugins/canvas/public/components/custom_element_modal/__examples__/custom_element_modal.examples.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/custom_element_modal/custom_element_modal.scss b/x-pack/plugins/canvas/public/components/custom_element_modal/custom_element_modal.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/custom_element_modal/custom_element_modal.scss rename to x-pack/plugins/canvas/public/components/custom_element_modal/custom_element_modal.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/custom_element_modal/custom_element_modal.tsx b/x-pack/plugins/canvas/public/components/custom_element_modal/custom_element_modal.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/custom_element_modal/custom_element_modal.tsx rename to x-pack/plugins/canvas/public/components/custom_element_modal/custom_element_modal.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/custom_element_modal/index.tsx b/x-pack/plugins/canvas/public/components/custom_element_modal/index.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/custom_element_modal/index.tsx rename to x-pack/plugins/canvas/public/components/custom_element_modal/index.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/datasource/datasource.js b/x-pack/plugins/canvas/public/components/datasource/datasource.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/datasource/datasource.js rename to x-pack/plugins/canvas/public/components/datasource/datasource.js diff --git a/x-pack/legacy/plugins/canvas/public/components/datasource/datasource.scss b/x-pack/plugins/canvas/public/components/datasource/datasource.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/datasource/datasource.scss rename to x-pack/plugins/canvas/public/components/datasource/datasource.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/datasource/datasource_component.js b/x-pack/plugins/canvas/public/components/datasource/datasource_component.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/datasource/datasource_component.js rename to x-pack/plugins/canvas/public/components/datasource/datasource_component.js diff --git a/x-pack/legacy/plugins/canvas/public/components/datasource/datasource_preview/datasource_preview.js b/x-pack/plugins/canvas/public/components/datasource/datasource_preview/datasource_preview.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/datasource/datasource_preview/datasource_preview.js rename to x-pack/plugins/canvas/public/components/datasource/datasource_preview/datasource_preview.js diff --git a/x-pack/legacy/plugins/canvas/public/components/datasource/datasource_preview/datasource_preview.scss b/x-pack/plugins/canvas/public/components/datasource/datasource_preview/datasource_preview.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/datasource/datasource_preview/datasource_preview.scss rename to x-pack/plugins/canvas/public/components/datasource/datasource_preview/datasource_preview.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/datasource/datasource_preview/index.js b/x-pack/plugins/canvas/public/components/datasource/datasource_preview/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/datasource/datasource_preview/index.js rename to x-pack/plugins/canvas/public/components/datasource/datasource_preview/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/datasource/datasource_selector.js b/x-pack/plugins/canvas/public/components/datasource/datasource_selector.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/datasource/datasource_selector.js rename to x-pack/plugins/canvas/public/components/datasource/datasource_selector.js diff --git a/x-pack/legacy/plugins/canvas/public/components/datasource/index.js b/x-pack/plugins/canvas/public/components/datasource/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/datasource/index.js rename to x-pack/plugins/canvas/public/components/datasource/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/datasource/no_datasource.js b/x-pack/plugins/canvas/public/components/datasource/no_datasource.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/datasource/no_datasource.js rename to x-pack/plugins/canvas/public/components/datasource/no_datasource.js diff --git a/x-pack/legacy/plugins/canvas/public/components/datatable/datatable.js b/x-pack/plugins/canvas/public/components/datatable/datatable.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/datatable/datatable.js rename to x-pack/plugins/canvas/public/components/datatable/datatable.js diff --git a/x-pack/legacy/plugins/canvas/public/components/datatable/datatable.scss b/x-pack/plugins/canvas/public/components/datatable/datatable.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/datatable/datatable.scss rename to x-pack/plugins/canvas/public/components/datatable/datatable.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/datatable/index.js b/x-pack/plugins/canvas/public/components/datatable/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/datatable/index.js rename to x-pack/plugins/canvas/public/components/datatable/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/debug/__examples__/__snapshots__/debug.examples.storyshot b/x-pack/plugins/canvas/public/components/debug/__examples__/__snapshots__/debug.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/debug/__examples__/__snapshots__/debug.examples.storyshot rename to x-pack/plugins/canvas/public/components/debug/__examples__/__snapshots__/debug.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/debug/__examples__/debug.examples.tsx b/x-pack/plugins/canvas/public/components/debug/__examples__/debug.examples.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/debug/__examples__/debug.examples.tsx rename to x-pack/plugins/canvas/public/components/debug/__examples__/debug.examples.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/debug/__examples__/helpers.tsx b/x-pack/plugins/canvas/public/components/debug/__examples__/helpers.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/debug/__examples__/helpers.tsx rename to x-pack/plugins/canvas/public/components/debug/__examples__/helpers.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/debug/debug.scss b/x-pack/plugins/canvas/public/components/debug/debug.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/debug/debug.scss rename to x-pack/plugins/canvas/public/components/debug/debug.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/debug/debug.tsx b/x-pack/plugins/canvas/public/components/debug/debug.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/debug/debug.tsx rename to x-pack/plugins/canvas/public/components/debug/debug.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/debug/index.tsx b/x-pack/plugins/canvas/public/components/debug/index.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/debug/index.tsx rename to x-pack/plugins/canvas/public/components/debug/index.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/dom_preview/dom_preview.js b/x-pack/plugins/canvas/public/components/dom_preview/dom_preview.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/dom_preview/dom_preview.js rename to x-pack/plugins/canvas/public/components/dom_preview/dom_preview.js diff --git a/x-pack/legacy/plugins/canvas/public/components/dom_preview/dom_preview.scss b/x-pack/plugins/canvas/public/components/dom_preview/dom_preview.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/dom_preview/dom_preview.scss rename to x-pack/plugins/canvas/public/components/dom_preview/dom_preview.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/dom_preview/index.js b/x-pack/plugins/canvas/public/components/dom_preview/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/dom_preview/index.js rename to x-pack/plugins/canvas/public/components/dom_preview/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/download/__tests__/download.test.tsx b/x-pack/plugins/canvas/public/components/download/__tests__/download.test.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/download/__tests__/download.test.tsx rename to x-pack/plugins/canvas/public/components/download/__tests__/download.test.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/download/download.tsx b/x-pack/plugins/canvas/public/components/download/download.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/download/download.tsx rename to x-pack/plugins/canvas/public/components/download/download.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/download/index.ts b/x-pack/plugins/canvas/public/components/download/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/download/index.ts rename to x-pack/plugins/canvas/public/components/download/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/components/dragbox_annotation/dragbox_annotation.js b/x-pack/plugins/canvas/public/components/dragbox_annotation/dragbox_annotation.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/dragbox_annotation/dragbox_annotation.js rename to x-pack/plugins/canvas/public/components/dragbox_annotation/dragbox_annotation.js diff --git a/x-pack/legacy/plugins/canvas/public/components/dragbox_annotation/dragbox_annotation.scss b/x-pack/plugins/canvas/public/components/dragbox_annotation/dragbox_annotation.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/dragbox_annotation/dragbox_annotation.scss rename to x-pack/plugins/canvas/public/components/dragbox_annotation/dragbox_annotation.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/dragbox_annotation/index.js b/x-pack/plugins/canvas/public/components/dragbox_annotation/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/dragbox_annotation/index.js rename to x-pack/plugins/canvas/public/components/dragbox_annotation/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/element_card/__examples__/__snapshots__/element_card.stories.storyshot b/x-pack/plugins/canvas/public/components/element_card/__examples__/__snapshots__/element_card.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/element_card/__examples__/__snapshots__/element_card.stories.storyshot rename to x-pack/plugins/canvas/public/components/element_card/__examples__/__snapshots__/element_card.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/element_card/__examples__/__snapshots__/element_controls.examples.storyshot b/x-pack/plugins/canvas/public/components/element_card/__examples__/__snapshots__/element_controls.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/element_card/__examples__/__snapshots__/element_controls.examples.storyshot rename to x-pack/plugins/canvas/public/components/element_card/__examples__/__snapshots__/element_controls.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/element_card/__examples__/element_card.stories.tsx b/x-pack/plugins/canvas/public/components/element_card/__examples__/element_card.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/element_card/__examples__/element_card.stories.tsx rename to x-pack/plugins/canvas/public/components/element_card/__examples__/element_card.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/element_card/element_card.scss b/x-pack/plugins/canvas/public/components/element_card/element_card.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/element_card/element_card.scss rename to x-pack/plugins/canvas/public/components/element_card/element_card.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/element_card/element_card.tsx b/x-pack/plugins/canvas/public/components/element_card/element_card.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/element_card/element_card.tsx rename to x-pack/plugins/canvas/public/components/element_card/element_card.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/element_card/index.tsx b/x-pack/plugins/canvas/public/components/element_card/index.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/element_card/index.tsx rename to x-pack/plugins/canvas/public/components/element_card/index.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/element_config/element_config.js b/x-pack/plugins/canvas/public/components/element_config/element_config.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/element_config/element_config.js rename to x-pack/plugins/canvas/public/components/element_config/element_config.js diff --git a/x-pack/legacy/plugins/canvas/public/components/element_config/index.js b/x-pack/plugins/canvas/public/components/element_config/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/element_config/index.js rename to x-pack/plugins/canvas/public/components/element_config/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/element_content/element_content.js b/x-pack/plugins/canvas/public/components/element_content/element_content.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/element_content/element_content.js rename to x-pack/plugins/canvas/public/components/element_content/element_content.js diff --git a/x-pack/legacy/plugins/canvas/public/components/element_content/element_content.scss b/x-pack/plugins/canvas/public/components/element_content/element_content.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/element_content/element_content.scss rename to x-pack/plugins/canvas/public/components/element_content/element_content.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/element_content/index.js b/x-pack/plugins/canvas/public/components/element_content/index.js similarity index 92% rename from x-pack/legacy/plugins/canvas/public/components/element_content/index.js rename to x-pack/plugins/canvas/public/components/element_content/index.js index df411b6d11f1c1..3d7cca95e10b72 100644 --- a/x-pack/legacy/plugins/canvas/public/components/element_content/index.js +++ b/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 => ({ diff --git a/x-pack/legacy/plugins/canvas/public/components/element_content/invalid_element_type.js b/x-pack/plugins/canvas/public/components/element_content/invalid_element_type.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/element_content/invalid_element_type.js rename to x-pack/plugins/canvas/public/components/element_content/invalid_element_type.js diff --git a/x-pack/legacy/plugins/canvas/public/components/element_content/invalid_expression.js b/x-pack/plugins/canvas/public/components/element_content/invalid_expression.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/element_content/invalid_expression.js rename to x-pack/plugins/canvas/public/components/element_content/invalid_expression.js diff --git a/x-pack/legacy/plugins/canvas/public/components/element_share_container/element_share_container.js b/x-pack/plugins/canvas/public/components/element_share_container/element_share_container.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/element_share_container/element_share_container.js rename to x-pack/plugins/canvas/public/components/element_share_container/element_share_container.js diff --git a/x-pack/legacy/plugins/canvas/public/components/element_share_container/index.js b/x-pack/plugins/canvas/public/components/element_share_container/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/element_share_container/index.js rename to x-pack/plugins/canvas/public/components/element_share_container/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/element_wrapper/element_wrapper.js b/x-pack/plugins/canvas/public/components/element_wrapper/element_wrapper.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/element_wrapper/element_wrapper.js rename to x-pack/plugins/canvas/public/components/element_wrapper/element_wrapper.js diff --git a/x-pack/legacy/plugins/canvas/public/components/element_wrapper/index.js b/x-pack/plugins/canvas/public/components/element_wrapper/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/element_wrapper/index.js rename to x-pack/plugins/canvas/public/components/element_wrapper/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/element_wrapper/lib/handlers.js b/x-pack/plugins/canvas/public/components/element_wrapper/lib/handlers.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/element_wrapper/lib/handlers.js rename to x-pack/plugins/canvas/public/components/element_wrapper/lib/handlers.js diff --git a/x-pack/legacy/plugins/canvas/public/components/embeddable_flyout/flyout.tsx b/x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.tsx similarity index 95% rename from x-pack/legacy/plugins/canvas/public/components/embeddable_flyout/flyout.tsx rename to x-pack/plugins/canvas/public/components/embeddable_flyout/flyout.tsx index 4916a27fcbe60a..35eedde59a0146 100644 --- a/x-pack/legacy/plugins/canvas/public/components/embeddable_flyout/flyout.tsx +++ b/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; diff --git a/x-pack/legacy/plugins/canvas/public/components/embeddable_flyout/index.tsx b/x-pack/plugins/canvas/public/components/embeddable_flyout/index.tsx similarity index 97% rename from x-pack/legacy/plugins/canvas/public/components/embeddable_flyout/index.tsx rename to x-pack/plugins/canvas/public/components/embeddable_flyout/index.tsx index c13cbfd0422377..8e69396f67c2e2 100644 --- a/x-pack/legacy/plugins/canvas/public/components/embeddable_flyout/index.tsx +++ b/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) => { diff --git a/x-pack/legacy/plugins/canvas/public/components/enhance/error_boundary.tsx b/x-pack/plugins/canvas/public/components/enhance/error_boundary.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/enhance/error_boundary.tsx rename to x-pack/plugins/canvas/public/components/enhance/error_boundary.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/enhance/stateful_prop.js b/x-pack/plugins/canvas/public/components/enhance/stateful_prop.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/enhance/stateful_prop.js rename to x-pack/plugins/canvas/public/components/enhance/stateful_prop.js diff --git a/x-pack/legacy/plugins/canvas/public/components/error/error.js b/x-pack/plugins/canvas/public/components/error/error.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/error/error.js rename to x-pack/plugins/canvas/public/components/error/error.js diff --git a/x-pack/legacy/plugins/canvas/public/components/error/index.js b/x-pack/plugins/canvas/public/components/error/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/error/index.js rename to x-pack/plugins/canvas/public/components/error/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/error/show_debugging.js b/x-pack/plugins/canvas/public/components/error/show_debugging.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/error/show_debugging.js rename to x-pack/plugins/canvas/public/components/error/show_debugging.js diff --git a/x-pack/legacy/plugins/canvas/public/components/es_field_select/es_field_select.js b/x-pack/plugins/canvas/public/components/es_field_select/es_field_select.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/es_field_select/es_field_select.js rename to x-pack/plugins/canvas/public/components/es_field_select/es_field_select.js diff --git a/x-pack/legacy/plugins/canvas/public/components/es_field_select/index.js b/x-pack/plugins/canvas/public/components/es_field_select/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/es_field_select/index.js rename to x-pack/plugins/canvas/public/components/es_field_select/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/es_fields_select/es_fields_select.js b/x-pack/plugins/canvas/public/components/es_fields_select/es_fields_select.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/es_fields_select/es_fields_select.js rename to x-pack/plugins/canvas/public/components/es_fields_select/es_fields_select.js diff --git a/x-pack/legacy/plugins/canvas/public/components/es_fields_select/index.js b/x-pack/plugins/canvas/public/components/es_fields_select/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/es_fields_select/index.js rename to x-pack/plugins/canvas/public/components/es_fields_select/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/es_index_select/es_index_select.js b/x-pack/plugins/canvas/public/components/es_index_select/es_index_select.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/es_index_select/es_index_select.js rename to x-pack/plugins/canvas/public/components/es_index_select/es_index_select.js diff --git a/x-pack/legacy/plugins/canvas/public/components/es_index_select/index.js b/x-pack/plugins/canvas/public/components/es_index_select/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/es_index_select/index.js rename to x-pack/plugins/canvas/public/components/es_index_select/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/expression/element_not_selected.js b/x-pack/plugins/canvas/public/components/expression/element_not_selected.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/expression/element_not_selected.js rename to x-pack/plugins/canvas/public/components/expression/element_not_selected.js diff --git a/x-pack/legacy/plugins/canvas/public/components/expression/expression.js b/x-pack/plugins/canvas/public/components/expression/expression.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/expression/expression.js rename to x-pack/plugins/canvas/public/components/expression/expression.js diff --git a/x-pack/legacy/plugins/canvas/public/components/expression/expression.scss b/x-pack/plugins/canvas/public/components/expression/expression.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/expression/expression.scss rename to x-pack/plugins/canvas/public/components/expression/expression.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/expression/index.js b/x-pack/plugins/canvas/public/components/expression/index.js similarity index 97% rename from x-pack/legacy/plugins/canvas/public/components/expression/index.js rename to x-pack/plugins/canvas/public/components/expression/index.js index 29d22c0e1804a3..c2b559fe032300 100644 --- a/x-pack/legacy/plugins/canvas/public/components/expression/index.js +++ b/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'; diff --git a/x-pack/legacy/plugins/canvas/public/components/expression_input/__examples__/__snapshots__/expression_input.examples.storyshot b/x-pack/plugins/canvas/public/components/expression_input/__examples__/__snapshots__/expression_input.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/expression_input/__examples__/__snapshots__/expression_input.examples.storyshot rename to x-pack/plugins/canvas/public/components/expression_input/__examples__/__snapshots__/expression_input.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/expression_input/__examples__/expression_input.examples.tsx b/x-pack/plugins/canvas/public/components/expression_input/__examples__/expression_input.examples.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/expression_input/__examples__/expression_input.examples.tsx rename to x-pack/plugins/canvas/public/components/expression_input/__examples__/expression_input.examples.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/expression_input/expression_input.tsx b/x-pack/plugins/canvas/public/components/expression_input/expression_input.tsx similarity index 98% rename from x-pack/legacy/plugins/canvas/public/components/expression_input/expression_input.tsx rename to x-pack/plugins/canvas/public/components/expression_input/expression_input.tsx index faac2ae883c13f..99e12b14104be1 100644 --- a/x-pack/legacy/plugins/canvas/public/components/expression_input/expression_input.tsx +++ b/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, diff --git a/x-pack/legacy/plugins/canvas/public/components/expression_input/index.js b/x-pack/plugins/canvas/public/components/expression_input/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/expression_input/index.js rename to x-pack/plugins/canvas/public/components/expression_input/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/expression_input/reference.ts b/x-pack/plugins/canvas/public/components/expression_input/reference.ts similarity index 97% rename from x-pack/legacy/plugins/canvas/public/components/expression_input/reference.ts rename to x-pack/plugins/canvas/public/components/expression_input/reference.ts index ca3819195fcbd1..a24dacf0664757 100644 --- a/x-pack/legacy/plugins/canvas/public/components/expression_input/reference.ts +++ b/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; diff --git a/x-pack/legacy/plugins/canvas/public/components/file_upload/__snapshots__/file_upload.stories.storyshot b/x-pack/plugins/canvas/public/components/file_upload/__snapshots__/file_upload.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/file_upload/__snapshots__/file_upload.stories.storyshot rename to x-pack/plugins/canvas/public/components/file_upload/__snapshots__/file_upload.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/file_upload/file_upload.stories.tsx b/x-pack/plugins/canvas/public/components/file_upload/file_upload.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/file_upload/file_upload.stories.tsx rename to x-pack/plugins/canvas/public/components/file_upload/file_upload.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/file_upload/file_upload.tsx b/x-pack/plugins/canvas/public/components/file_upload/file_upload.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/file_upload/file_upload.tsx rename to x-pack/plugins/canvas/public/components/file_upload/file_upload.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/font_picker/__snapshots__/font_picker.stories.storyshot b/x-pack/plugins/canvas/public/components/font_picker/__snapshots__/font_picker.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/font_picker/__snapshots__/font_picker.stories.storyshot rename to x-pack/plugins/canvas/public/components/font_picker/__snapshots__/font_picker.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/font_picker/font_picker.stories.tsx b/x-pack/plugins/canvas/public/components/font_picker/font_picker.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/font_picker/font_picker.stories.tsx rename to x-pack/plugins/canvas/public/components/font_picker/font_picker.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/font_picker/font_picker.tsx b/x-pack/plugins/canvas/public/components/font_picker/font_picker.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/font_picker/font_picker.tsx rename to x-pack/plugins/canvas/public/components/font_picker/font_picker.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/font_picker/index.js b/x-pack/plugins/canvas/public/components/font_picker/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/font_picker/index.js rename to x-pack/plugins/canvas/public/components/font_picker/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/format_select/format_select.tsx b/x-pack/plugins/canvas/public/components/format_select/format_select.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/format_select/format_select.tsx rename to x-pack/plugins/canvas/public/components/format_select/format_select.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/format_select/index.ts b/x-pack/plugins/canvas/public/components/format_select/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/format_select/index.ts rename to x-pack/plugins/canvas/public/components/format_select/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/components/fullscreen/fullscreen.js b/x-pack/plugins/canvas/public/components/fullscreen/fullscreen.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/fullscreen/fullscreen.js rename to x-pack/plugins/canvas/public/components/fullscreen/fullscreen.js diff --git a/x-pack/legacy/plugins/canvas/public/components/fullscreen/fullscreen.scss b/x-pack/plugins/canvas/public/components/fullscreen/fullscreen.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/fullscreen/fullscreen.scss rename to x-pack/plugins/canvas/public/components/fullscreen/fullscreen.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/fullscreen/index.js b/x-pack/plugins/canvas/public/components/fullscreen/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/fullscreen/index.js rename to x-pack/plugins/canvas/public/components/fullscreen/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/function_form/function_form.js b/x-pack/plugins/canvas/public/components/function_form/function_form.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/function_form/function_form.js rename to x-pack/plugins/canvas/public/components/function_form/function_form.js diff --git a/x-pack/legacy/plugins/canvas/public/components/function_form/function_form.scss b/x-pack/plugins/canvas/public/components/function_form/function_form.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/function_form/function_form.scss rename to x-pack/plugins/canvas/public/components/function_form/function_form.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/function_form/function_form_component.js b/x-pack/plugins/canvas/public/components/function_form/function_form_component.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/function_form/function_form_component.js rename to x-pack/plugins/canvas/public/components/function_form/function_form_component.js diff --git a/x-pack/legacy/plugins/canvas/public/components/function_form/function_form_context_error.tsx b/x-pack/plugins/canvas/public/components/function_form/function_form_context_error.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/function_form/function_form_context_error.tsx rename to x-pack/plugins/canvas/public/components/function_form/function_form_context_error.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/function_form/function_form_context_pending.js b/x-pack/plugins/canvas/public/components/function_form/function_form_context_pending.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/function_form/function_form_context_pending.js rename to x-pack/plugins/canvas/public/components/function_form/function_form_context_pending.js diff --git a/x-pack/legacy/plugins/canvas/public/components/function_form/function_unknown.tsx b/x-pack/plugins/canvas/public/components/function_form/function_unknown.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/function_form/function_unknown.tsx rename to x-pack/plugins/canvas/public/components/function_form/function_unknown.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/function_form/index.js b/x-pack/plugins/canvas/public/components/function_form/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/function_form/index.js rename to x-pack/plugins/canvas/public/components/function_form/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/function_form_list/function_form_list.js b/x-pack/plugins/canvas/public/components/function_form_list/function_form_list.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/function_form_list/function_form_list.js rename to x-pack/plugins/canvas/public/components/function_form_list/function_form_list.js diff --git a/x-pack/legacy/plugins/canvas/public/components/function_form_list/index.js b/x-pack/plugins/canvas/public/components/function_form_list/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/function_form_list/index.js rename to x-pack/plugins/canvas/public/components/function_form_list/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/help_menu/help_menu.js b/x-pack/plugins/canvas/public/components/help_menu/help_menu.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/help_menu/help_menu.js rename to x-pack/plugins/canvas/public/components/help_menu/help_menu.js diff --git a/x-pack/legacy/plugins/canvas/public/components/help_menu/index.js b/x-pack/plugins/canvas/public/components/help_menu/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/help_menu/index.js rename to x-pack/plugins/canvas/public/components/help_menu/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/hover_annotation/hover_annotation.js b/x-pack/plugins/canvas/public/components/hover_annotation/hover_annotation.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/hover_annotation/hover_annotation.js rename to x-pack/plugins/canvas/public/components/hover_annotation/hover_annotation.js diff --git a/x-pack/legacy/plugins/canvas/public/components/hover_annotation/hover_annotation.scss b/x-pack/plugins/canvas/public/components/hover_annotation/hover_annotation.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/hover_annotation/hover_annotation.scss rename to x-pack/plugins/canvas/public/components/hover_annotation/hover_annotation.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/hover_annotation/index.js b/x-pack/plugins/canvas/public/components/hover_annotation/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/hover_annotation/index.js rename to x-pack/plugins/canvas/public/components/hover_annotation/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/item_grid/__examples__/__snapshots__/item_grid.stories.storyshot b/x-pack/plugins/canvas/public/components/item_grid/__examples__/__snapshots__/item_grid.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/item_grid/__examples__/__snapshots__/item_grid.stories.storyshot rename to x-pack/plugins/canvas/public/components/item_grid/__examples__/__snapshots__/item_grid.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/item_grid/__examples__/item_grid.stories.tsx b/x-pack/plugins/canvas/public/components/item_grid/__examples__/item_grid.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/item_grid/__examples__/item_grid.stories.tsx rename to x-pack/plugins/canvas/public/components/item_grid/__examples__/item_grid.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/item_grid/index.ts b/x-pack/plugins/canvas/public/components/item_grid/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/item_grid/index.ts rename to x-pack/plugins/canvas/public/components/item_grid/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/components/item_grid/item_grid.tsx b/x-pack/plugins/canvas/public/components/item_grid/item_grid.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/item_grid/item_grid.tsx rename to x-pack/plugins/canvas/public/components/item_grid/item_grid.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/keyboard_shortcuts_doc/__examples__/__snapshots__/keyboard_shortcuts_doc.stories.storyshot b/x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/__examples__/__snapshots__/keyboard_shortcuts_doc.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/keyboard_shortcuts_doc/__examples__/__snapshots__/keyboard_shortcuts_doc.stories.storyshot rename to x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/__examples__/__snapshots__/keyboard_shortcuts_doc.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/keyboard_shortcuts_doc/__examples__/keyboard_shortcuts_doc.stories.tsx b/x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/__examples__/keyboard_shortcuts_doc.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/keyboard_shortcuts_doc/__examples__/keyboard_shortcuts_doc.stories.tsx rename to x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/__examples__/keyboard_shortcuts_doc.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/keyboard_shortcuts_doc/index.ts b/x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/keyboard_shortcuts_doc/index.ts rename to x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/components/keyboard_shortcuts_doc/keyboard_shortcuts_doc.tsx b/x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/keyboard_shortcuts_doc.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/keyboard_shortcuts_doc/keyboard_shortcuts_doc.tsx rename to x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/keyboard_shortcuts_doc.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/link/index.js b/x-pack/plugins/canvas/public/components/link/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/link/index.js rename to x-pack/plugins/canvas/public/components/link/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/link/link.js b/x-pack/plugins/canvas/public/components/link/link.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/link/link.js rename to x-pack/plugins/canvas/public/components/link/link.js diff --git a/x-pack/legacy/plugins/canvas/public/components/loading/__tests__/loading.js b/x-pack/plugins/canvas/public/components/loading/__tests__/loading.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/loading/__tests__/loading.js rename to x-pack/plugins/canvas/public/components/loading/__tests__/loading.js diff --git a/x-pack/legacy/plugins/canvas/public/components/loading/index.ts b/x-pack/plugins/canvas/public/components/loading/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/loading/index.ts rename to x-pack/plugins/canvas/public/components/loading/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/components/loading/loading.scss b/x-pack/plugins/canvas/public/components/loading/loading.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/loading/loading.scss rename to x-pack/plugins/canvas/public/components/loading/loading.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/loading/loading.tsx b/x-pack/plugins/canvas/public/components/loading/loading.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/loading/loading.tsx rename to x-pack/plugins/canvas/public/components/loading/loading.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/navbar/index.js b/x-pack/plugins/canvas/public/components/navbar/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/navbar/index.js rename to x-pack/plugins/canvas/public/components/navbar/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/navbar/navbar.js b/x-pack/plugins/canvas/public/components/navbar/navbar.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/navbar/navbar.js rename to x-pack/plugins/canvas/public/components/navbar/navbar.js diff --git a/x-pack/legacy/plugins/canvas/public/components/navbar/navbar.scss b/x-pack/plugins/canvas/public/components/navbar/navbar.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/navbar/navbar.scss rename to x-pack/plugins/canvas/public/components/navbar/navbar.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/page_config/index.js b/x-pack/plugins/canvas/public/components/page_config/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/page_config/index.js rename to x-pack/plugins/canvas/public/components/page_config/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/page_config/page_config.js b/x-pack/plugins/canvas/public/components/page_config/page_config.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/page_config/page_config.js rename to x-pack/plugins/canvas/public/components/page_config/page_config.js diff --git a/x-pack/legacy/plugins/canvas/public/components/page_manager/index.js b/x-pack/plugins/canvas/public/components/page_manager/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/page_manager/index.js rename to x-pack/plugins/canvas/public/components/page_manager/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/page_manager/page_manager.js b/x-pack/plugins/canvas/public/components/page_manager/page_manager.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/page_manager/page_manager.js rename to x-pack/plugins/canvas/public/components/page_manager/page_manager.js diff --git a/x-pack/legacy/plugins/canvas/public/components/page_manager/page_manager.scss b/x-pack/plugins/canvas/public/components/page_manager/page_manager.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/page_manager/page_manager.scss rename to x-pack/plugins/canvas/public/components/page_manager/page_manager.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/page_preview/index.js b/x-pack/plugins/canvas/public/components/page_preview/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/page_preview/index.js rename to x-pack/plugins/canvas/public/components/page_preview/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/page_preview/page_controls.js b/x-pack/plugins/canvas/public/components/page_preview/page_controls.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/page_preview/page_controls.js rename to x-pack/plugins/canvas/public/components/page_preview/page_controls.js diff --git a/x-pack/legacy/plugins/canvas/public/components/page_preview/page_preview.js b/x-pack/plugins/canvas/public/components/page_preview/page_preview.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/page_preview/page_preview.js rename to x-pack/plugins/canvas/public/components/page_preview/page_preview.js diff --git a/x-pack/legacy/plugins/canvas/public/components/paginate/index.js b/x-pack/plugins/canvas/public/components/paginate/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/paginate/index.js rename to x-pack/plugins/canvas/public/components/paginate/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/paginate/paginate.js b/x-pack/plugins/canvas/public/components/paginate/paginate.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/paginate/paginate.js rename to x-pack/plugins/canvas/public/components/paginate/paginate.js diff --git a/x-pack/legacy/plugins/canvas/public/components/palette_picker/index.js b/x-pack/plugins/canvas/public/components/palette_picker/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/palette_picker/index.js rename to x-pack/plugins/canvas/public/components/palette_picker/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/palette_picker/palette_picker.js b/x-pack/plugins/canvas/public/components/palette_picker/palette_picker.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/palette_picker/palette_picker.js rename to x-pack/plugins/canvas/public/components/palette_picker/palette_picker.js diff --git a/x-pack/legacy/plugins/canvas/public/components/palette_picker/palette_picker.scss b/x-pack/plugins/canvas/public/components/palette_picker/palette_picker.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/palette_picker/palette_picker.scss rename to x-pack/plugins/canvas/public/components/palette_picker/palette_picker.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/palette_swatch/index.js b/x-pack/plugins/canvas/public/components/palette_swatch/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/palette_swatch/index.js rename to x-pack/plugins/canvas/public/components/palette_swatch/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/palette_swatch/palette_swatch.js b/x-pack/plugins/canvas/public/components/palette_swatch/palette_swatch.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/palette_swatch/palette_swatch.js rename to x-pack/plugins/canvas/public/components/palette_swatch/palette_swatch.js diff --git a/x-pack/legacy/plugins/canvas/public/components/palette_swatch/palette_swatch.scss b/x-pack/plugins/canvas/public/components/palette_swatch/palette_swatch.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/palette_swatch/palette_swatch.scss rename to x-pack/plugins/canvas/public/components/palette_swatch/palette_swatch.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/popover/index.ts b/x-pack/plugins/canvas/public/components/popover/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/popover/index.ts rename to x-pack/plugins/canvas/public/components/popover/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/components/popover/popover.tsx b/x-pack/plugins/canvas/public/components/popover/popover.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/popover/popover.tsx rename to x-pack/plugins/canvas/public/components/popover/popover.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/positionable/index.js b/x-pack/plugins/canvas/public/components/positionable/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/positionable/index.js rename to x-pack/plugins/canvas/public/components/positionable/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/positionable/positionable.js b/x-pack/plugins/canvas/public/components/positionable/positionable.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/positionable/positionable.js rename to x-pack/plugins/canvas/public/components/positionable/positionable.js diff --git a/x-pack/legacy/plugins/canvas/public/components/positionable/positionable.scss b/x-pack/plugins/canvas/public/components/positionable/positionable.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/positionable/positionable.scss rename to x-pack/plugins/canvas/public/components/positionable/positionable.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/render_to_dom/index.js b/x-pack/plugins/canvas/public/components/render_to_dom/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/render_to_dom/index.js rename to x-pack/plugins/canvas/public/components/render_to_dom/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/render_to_dom/render_to_dom.js b/x-pack/plugins/canvas/public/components/render_to_dom/render_to_dom.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/render_to_dom/render_to_dom.js rename to x-pack/plugins/canvas/public/components/render_to_dom/render_to_dom.js diff --git a/x-pack/legacy/plugins/canvas/public/components/render_with_fn/index.js b/x-pack/plugins/canvas/public/components/render_with_fn/index.js similarity index 92% rename from x-pack/legacy/plugins/canvas/public/components/render_with_fn/index.js rename to x-pack/plugins/canvas/public/components/render_with_fn/index.js index cc234d2287c0cc..473aaaf9d1ac6a 100644 --- a/x-pack/legacy/plugins/canvas/public/components/render_with_fn/index.js +++ b/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'; diff --git a/x-pack/legacy/plugins/canvas/public/components/render_with_fn/lib/handlers.js b/x-pack/plugins/canvas/public/components/render_with_fn/lib/handlers.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/render_with_fn/lib/handlers.js rename to x-pack/plugins/canvas/public/components/render_with_fn/lib/handlers.js diff --git a/x-pack/legacy/plugins/canvas/public/components/render_with_fn/render_with_fn.js b/x-pack/plugins/canvas/public/components/render_with_fn/render_with_fn.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/render_with_fn/render_with_fn.js rename to x-pack/plugins/canvas/public/components/render_with_fn/render_with_fn.js diff --git a/x-pack/legacy/plugins/canvas/public/components/rotation_handle/index.js b/x-pack/plugins/canvas/public/components/rotation_handle/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/rotation_handle/index.js rename to x-pack/plugins/canvas/public/components/rotation_handle/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/rotation_handle/rotation_handle.js b/x-pack/plugins/canvas/public/components/rotation_handle/rotation_handle.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/rotation_handle/rotation_handle.js rename to x-pack/plugins/canvas/public/components/rotation_handle/rotation_handle.js diff --git a/x-pack/legacy/plugins/canvas/public/components/rotation_handle/rotation_handle.scss b/x-pack/plugins/canvas/public/components/rotation_handle/rotation_handle.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/rotation_handle/rotation_handle.scss rename to x-pack/plugins/canvas/public/components/rotation_handle/rotation_handle.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/router/canvas_loading.js b/x-pack/plugins/canvas/public/components/router/canvas_loading.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/router/canvas_loading.js rename to x-pack/plugins/canvas/public/components/router/canvas_loading.js diff --git a/x-pack/legacy/plugins/canvas/public/components/router/index.ts b/x-pack/plugins/canvas/public/components/router/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/router/index.ts rename to x-pack/plugins/canvas/public/components/router/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/components/router/router.js b/x-pack/plugins/canvas/public/components/router/router.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/router/router.js rename to x-pack/plugins/canvas/public/components/router/router.js diff --git a/x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/__examples__/__snapshots__/element_controls.stories.storyshot b/x-pack/plugins/canvas/public/components/saved_elements_modal/__examples__/__snapshots__/element_controls.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/__examples__/__snapshots__/element_controls.stories.storyshot rename to x-pack/plugins/canvas/public/components/saved_elements_modal/__examples__/__snapshots__/element_controls.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/__examples__/__snapshots__/element_grid.stories.storyshot b/x-pack/plugins/canvas/public/components/saved_elements_modal/__examples__/__snapshots__/element_grid.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/__examples__/__snapshots__/element_grid.stories.storyshot rename to x-pack/plugins/canvas/public/components/saved_elements_modal/__examples__/__snapshots__/element_grid.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/__examples__/__snapshots__/saved_elements_modal.stories.storyshot b/x-pack/plugins/canvas/public/components/saved_elements_modal/__examples__/__snapshots__/saved_elements_modal.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/__examples__/__snapshots__/saved_elements_modal.stories.storyshot rename to x-pack/plugins/canvas/public/components/saved_elements_modal/__examples__/__snapshots__/saved_elements_modal.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/__examples__/element_controls.stories.tsx b/x-pack/plugins/canvas/public/components/saved_elements_modal/__examples__/element_controls.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/__examples__/element_controls.stories.tsx rename to x-pack/plugins/canvas/public/components/saved_elements_modal/__examples__/element_controls.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/__examples__/element_grid.stories.tsx b/x-pack/plugins/canvas/public/components/saved_elements_modal/__examples__/element_grid.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/__examples__/element_grid.stories.tsx rename to x-pack/plugins/canvas/public/components/saved_elements_modal/__examples__/element_grid.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/__examples__/fixtures/test_elements.tsx b/x-pack/plugins/canvas/public/components/saved_elements_modal/__examples__/fixtures/test_elements.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/__examples__/fixtures/test_elements.tsx rename to x-pack/plugins/canvas/public/components/saved_elements_modal/__examples__/fixtures/test_elements.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/__examples__/saved_elements_modal.stories.tsx b/x-pack/plugins/canvas/public/components/saved_elements_modal/__examples__/saved_elements_modal.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/__examples__/saved_elements_modal.stories.tsx rename to x-pack/plugins/canvas/public/components/saved_elements_modal/__examples__/saved_elements_modal.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/element_controls.tsx b/x-pack/plugins/canvas/public/components/saved_elements_modal/element_controls.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/element_controls.tsx rename to x-pack/plugins/canvas/public/components/saved_elements_modal/element_controls.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/element_grid.tsx b/x-pack/plugins/canvas/public/components/saved_elements_modal/element_grid.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/element_grid.tsx rename to x-pack/plugins/canvas/public/components/saved_elements_modal/element_grid.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/index.ts b/x-pack/plugins/canvas/public/components/saved_elements_modal/index.ts similarity index 98% rename from x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/index.ts rename to x-pack/plugins/canvas/public/components/saved_elements_modal/index.ts index 60d1d7462daa9f..f14fc92e028dba 100644 --- a/x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/index.ts +++ b/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'; diff --git a/x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/saved_elements_modal.tsx b/x-pack/plugins/canvas/public/components/saved_elements_modal/saved_elements_modal.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/saved_elements_modal/saved_elements_modal.tsx rename to x-pack/plugins/canvas/public/components/saved_elements_modal/saved_elements_modal.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/shape_picker/__examples__/__snapshots__/shape_picker.stories.storyshot b/x-pack/plugins/canvas/public/components/shape_picker/__examples__/__snapshots__/shape_picker.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/shape_picker/__examples__/__snapshots__/shape_picker.stories.storyshot rename to x-pack/plugins/canvas/public/components/shape_picker/__examples__/__snapshots__/shape_picker.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/shape_picker/__examples__/shape_picker.stories.tsx b/x-pack/plugins/canvas/public/components/shape_picker/__examples__/shape_picker.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/shape_picker/__examples__/shape_picker.stories.tsx rename to x-pack/plugins/canvas/public/components/shape_picker/__examples__/shape_picker.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/shape_picker/index.ts b/x-pack/plugins/canvas/public/components/shape_picker/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/shape_picker/index.ts rename to x-pack/plugins/canvas/public/components/shape_picker/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/components/shape_picker/shape_picker.scss b/x-pack/plugins/canvas/public/components/shape_picker/shape_picker.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/shape_picker/shape_picker.scss rename to x-pack/plugins/canvas/public/components/shape_picker/shape_picker.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/shape_picker/shape_picker.tsx b/x-pack/plugins/canvas/public/components/shape_picker/shape_picker.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/shape_picker/shape_picker.tsx rename to x-pack/plugins/canvas/public/components/shape_picker/shape_picker.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/shape_picker_popover/__examples__/__snapshots__/shape_picker_popover.stories.storyshot b/x-pack/plugins/canvas/public/components/shape_picker_popover/__examples__/__snapshots__/shape_picker_popover.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/shape_picker_popover/__examples__/__snapshots__/shape_picker_popover.stories.storyshot rename to x-pack/plugins/canvas/public/components/shape_picker_popover/__examples__/__snapshots__/shape_picker_popover.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/shape_picker_popover/__examples__/shape_picker_popover.stories.tsx b/x-pack/plugins/canvas/public/components/shape_picker_popover/__examples__/shape_picker_popover.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/shape_picker_popover/__examples__/shape_picker_popover.stories.tsx rename to x-pack/plugins/canvas/public/components/shape_picker_popover/__examples__/shape_picker_popover.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/shape_picker_popover/index.tsx b/x-pack/plugins/canvas/public/components/shape_picker_popover/index.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/shape_picker_popover/index.tsx rename to x-pack/plugins/canvas/public/components/shape_picker_popover/index.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/shape_picker_popover/shape_picker_popover.tsx b/x-pack/plugins/canvas/public/components/shape_picker_popover/shape_picker_popover.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/shape_picker_popover/shape_picker_popover.tsx rename to x-pack/plugins/canvas/public/components/shape_picker_popover/shape_picker_popover.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/shape_preview/__examples__/__snapshots__/shape_preview.stories.storyshot b/x-pack/plugins/canvas/public/components/shape_preview/__examples__/__snapshots__/shape_preview.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/shape_preview/__examples__/__snapshots__/shape_preview.stories.storyshot rename to x-pack/plugins/canvas/public/components/shape_preview/__examples__/__snapshots__/shape_preview.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/shape_preview/__examples__/shape_preview.stories.tsx b/x-pack/plugins/canvas/public/components/shape_preview/__examples__/shape_preview.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/shape_preview/__examples__/shape_preview.stories.tsx rename to x-pack/plugins/canvas/public/components/shape_preview/__examples__/shape_preview.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/shape_preview/index.ts b/x-pack/plugins/canvas/public/components/shape_preview/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/shape_preview/index.ts rename to x-pack/plugins/canvas/public/components/shape_preview/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/components/shape_preview/shape_preview.scss b/x-pack/plugins/canvas/public/components/shape_preview/shape_preview.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/shape_preview/shape_preview.scss rename to x-pack/plugins/canvas/public/components/shape_preview/shape_preview.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/shape_preview/shape_preview.tsx b/x-pack/plugins/canvas/public/components/shape_preview/shape_preview.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/shape_preview/shape_preview.tsx rename to x-pack/plugins/canvas/public/components/shape_preview/shape_preview.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/sidebar/__examples__/__snapshots__/group_settings.stories.storyshot b/x-pack/plugins/canvas/public/components/sidebar/__examples__/__snapshots__/group_settings.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/sidebar/__examples__/__snapshots__/group_settings.stories.storyshot rename to x-pack/plugins/canvas/public/components/sidebar/__examples__/__snapshots__/group_settings.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/sidebar/__examples__/__snapshots__/multi_element_settings.stories.storyshot b/x-pack/plugins/canvas/public/components/sidebar/__examples__/__snapshots__/multi_element_settings.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/sidebar/__examples__/__snapshots__/multi_element_settings.stories.storyshot rename to x-pack/plugins/canvas/public/components/sidebar/__examples__/__snapshots__/multi_element_settings.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/sidebar/__examples__/group_settings.stories.tsx b/x-pack/plugins/canvas/public/components/sidebar/__examples__/group_settings.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/sidebar/__examples__/group_settings.stories.tsx rename to x-pack/plugins/canvas/public/components/sidebar/__examples__/group_settings.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/sidebar/__examples__/multi_element_settings.stories.tsx b/x-pack/plugins/canvas/public/components/sidebar/__examples__/multi_element_settings.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/sidebar/__examples__/multi_element_settings.stories.tsx rename to x-pack/plugins/canvas/public/components/sidebar/__examples__/multi_element_settings.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/sidebar/element_settings/element_settings.tsx b/x-pack/plugins/canvas/public/components/sidebar/element_settings/element_settings.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/sidebar/element_settings/element_settings.tsx rename to x-pack/plugins/canvas/public/components/sidebar/element_settings/element_settings.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/sidebar/element_settings/index.tsx b/x-pack/plugins/canvas/public/components/sidebar/element_settings/index.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/sidebar/element_settings/index.tsx rename to x-pack/plugins/canvas/public/components/sidebar/element_settings/index.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/sidebar/global_config.tsx b/x-pack/plugins/canvas/public/components/sidebar/global_config.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/sidebar/global_config.tsx rename to x-pack/plugins/canvas/public/components/sidebar/global_config.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/sidebar/group_settings.tsx b/x-pack/plugins/canvas/public/components/sidebar/group_settings.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/sidebar/group_settings.tsx rename to x-pack/plugins/canvas/public/components/sidebar/group_settings.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/sidebar/index.tsx b/x-pack/plugins/canvas/public/components/sidebar/index.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/sidebar/index.tsx rename to x-pack/plugins/canvas/public/components/sidebar/index.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/sidebar/multi_element_settings.tsx b/x-pack/plugins/canvas/public/components/sidebar/multi_element_settings.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/sidebar/multi_element_settings.tsx rename to x-pack/plugins/canvas/public/components/sidebar/multi_element_settings.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/sidebar/sidebar.scss b/x-pack/plugins/canvas/public/components/sidebar/sidebar.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/sidebar/sidebar.scss rename to x-pack/plugins/canvas/public/components/sidebar/sidebar.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/sidebar/sidebar.tsx b/x-pack/plugins/canvas/public/components/sidebar/sidebar.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/sidebar/sidebar.tsx rename to x-pack/plugins/canvas/public/components/sidebar/sidebar.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/sidebar/sidebar_content.js b/x-pack/plugins/canvas/public/components/sidebar/sidebar_content.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/sidebar/sidebar_content.js rename to x-pack/plugins/canvas/public/components/sidebar/sidebar_content.js diff --git a/x-pack/legacy/plugins/canvas/public/components/sidebar/sidebar_section.js b/x-pack/plugins/canvas/public/components/sidebar/sidebar_section.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/sidebar/sidebar_section.js rename to x-pack/plugins/canvas/public/components/sidebar/sidebar_section.js diff --git a/x-pack/legacy/plugins/canvas/public/components/sidebar/sidebar_section_title.js b/x-pack/plugins/canvas/public/components/sidebar/sidebar_section_title.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/sidebar/sidebar_section_title.js rename to x-pack/plugins/canvas/public/components/sidebar/sidebar_section_title.js diff --git a/x-pack/legacy/plugins/canvas/public/components/sidebar_header/__examples__/__snapshots__/sidebar_header.stories.storyshot b/x-pack/plugins/canvas/public/components/sidebar_header/__examples__/__snapshots__/sidebar_header.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/sidebar_header/__examples__/__snapshots__/sidebar_header.stories.storyshot rename to x-pack/plugins/canvas/public/components/sidebar_header/__examples__/__snapshots__/sidebar_header.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/sidebar_header/__examples__/sidebar_header.stories.tsx b/x-pack/plugins/canvas/public/components/sidebar_header/__examples__/sidebar_header.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/sidebar_header/__examples__/sidebar_header.stories.tsx rename to x-pack/plugins/canvas/public/components/sidebar_header/__examples__/sidebar_header.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/sidebar_header/index.js b/x-pack/plugins/canvas/public/components/sidebar_header/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/sidebar_header/index.js rename to x-pack/plugins/canvas/public/components/sidebar_header/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/sidebar_header/sidebar_header.scss b/x-pack/plugins/canvas/public/components/sidebar_header/sidebar_header.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/sidebar_header/sidebar_header.scss rename to x-pack/plugins/canvas/public/components/sidebar_header/sidebar_header.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/sidebar_header/sidebar_header.tsx b/x-pack/plugins/canvas/public/components/sidebar_header/sidebar_header.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/sidebar_header/sidebar_header.tsx rename to x-pack/plugins/canvas/public/components/sidebar_header/sidebar_header.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/tag/__examples__/__snapshots__/tag.stories.storyshot b/x-pack/plugins/canvas/public/components/tag/__examples__/__snapshots__/tag.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/tag/__examples__/__snapshots__/tag.stories.storyshot rename to x-pack/plugins/canvas/public/components/tag/__examples__/__snapshots__/tag.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/tag/__examples__/tag.stories.tsx b/x-pack/plugins/canvas/public/components/tag/__examples__/tag.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/tag/__examples__/tag.stories.tsx rename to x-pack/plugins/canvas/public/components/tag/__examples__/tag.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/tag/index.tsx b/x-pack/plugins/canvas/public/components/tag/index.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/tag/index.tsx rename to x-pack/plugins/canvas/public/components/tag/index.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/tag/tag.tsx b/x-pack/plugins/canvas/public/components/tag/tag.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/tag/tag.tsx rename to x-pack/plugins/canvas/public/components/tag/tag.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/tag_list/__examples__/__snapshots__/tag_list.stories.storyshot b/x-pack/plugins/canvas/public/components/tag_list/__examples__/__snapshots__/tag_list.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/tag_list/__examples__/__snapshots__/tag_list.stories.storyshot rename to x-pack/plugins/canvas/public/components/tag_list/__examples__/__snapshots__/tag_list.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/tag_list/__examples__/tag_list.stories.tsx b/x-pack/plugins/canvas/public/components/tag_list/__examples__/tag_list.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/tag_list/__examples__/tag_list.stories.tsx rename to x-pack/plugins/canvas/public/components/tag_list/__examples__/tag_list.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/tag_list/index.tsx b/x-pack/plugins/canvas/public/components/tag_list/index.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/tag_list/index.tsx rename to x-pack/plugins/canvas/public/components/tag_list/index.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/tag_list/tag_list.tsx b/x-pack/plugins/canvas/public/components/tag_list/tag_list.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/tag_list/tag_list.tsx rename to x-pack/plugins/canvas/public/components/tag_list/tag_list.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/text_style_picker/font_sizes.js b/x-pack/plugins/canvas/public/components/text_style_picker/font_sizes.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/text_style_picker/font_sizes.js rename to x-pack/plugins/canvas/public/components/text_style_picker/font_sizes.js diff --git a/x-pack/legacy/plugins/canvas/public/components/text_style_picker/index.js b/x-pack/plugins/canvas/public/components/text_style_picker/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/text_style_picker/index.js rename to x-pack/plugins/canvas/public/components/text_style_picker/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/text_style_picker/text_style_picker.js b/x-pack/plugins/canvas/public/components/text_style_picker/text_style_picker.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/text_style_picker/text_style_picker.js rename to x-pack/plugins/canvas/public/components/text_style_picker/text_style_picker.js diff --git a/x-pack/legacy/plugins/canvas/public/components/tool_tip_shortcut/__examples__/__snapshots__/tool_tip_shortcut.stories.storyshot b/x-pack/plugins/canvas/public/components/tool_tip_shortcut/__examples__/__snapshots__/tool_tip_shortcut.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/tool_tip_shortcut/__examples__/__snapshots__/tool_tip_shortcut.stories.storyshot rename to x-pack/plugins/canvas/public/components/tool_tip_shortcut/__examples__/__snapshots__/tool_tip_shortcut.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/tool_tip_shortcut/__examples__/tool_tip_shortcut.stories.tsx b/x-pack/plugins/canvas/public/components/tool_tip_shortcut/__examples__/tool_tip_shortcut.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/tool_tip_shortcut/__examples__/tool_tip_shortcut.stories.tsx rename to x-pack/plugins/canvas/public/components/tool_tip_shortcut/__examples__/tool_tip_shortcut.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/tool_tip_shortcut/index.tsx b/x-pack/plugins/canvas/public/components/tool_tip_shortcut/index.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/tool_tip_shortcut/index.tsx rename to x-pack/plugins/canvas/public/components/tool_tip_shortcut/index.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/tool_tip_shortcut/tool_tip_shortcut.tsx b/x-pack/plugins/canvas/public/components/tool_tip_shortcut/tool_tip_shortcut.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/tool_tip_shortcut/tool_tip_shortcut.tsx rename to x-pack/plugins/canvas/public/components/tool_tip_shortcut/tool_tip_shortcut.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/toolbar/__examples__/toolbar.stories.tsx b/x-pack/plugins/canvas/public/components/toolbar/__examples__/toolbar.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/toolbar/__examples__/toolbar.stories.tsx rename to x-pack/plugins/canvas/public/components/toolbar/__examples__/toolbar.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/toolbar/index.js b/x-pack/plugins/canvas/public/components/toolbar/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/toolbar/index.js rename to x-pack/plugins/canvas/public/components/toolbar/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/toolbar/toolbar.scss b/x-pack/plugins/canvas/public/components/toolbar/toolbar.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/toolbar/toolbar.scss rename to x-pack/plugins/canvas/public/components/toolbar/toolbar.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/toolbar/toolbar.tsx b/x-pack/plugins/canvas/public/components/toolbar/toolbar.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/toolbar/toolbar.tsx rename to x-pack/plugins/canvas/public/components/toolbar/toolbar.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/toolbar/tray/index.ts b/x-pack/plugins/canvas/public/components/toolbar/tray/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/toolbar/tray/index.ts rename to x-pack/plugins/canvas/public/components/toolbar/tray/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/components/toolbar/tray/tray.scss b/x-pack/plugins/canvas/public/components/toolbar/tray/tray.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/toolbar/tray/tray.scss rename to x-pack/plugins/canvas/public/components/toolbar/tray/tray.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/toolbar/tray/tray.tsx b/x-pack/plugins/canvas/public/components/toolbar/tray/tray.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/toolbar/tray/tray.tsx rename to x-pack/plugins/canvas/public/components/toolbar/tray/tray.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/tooltip_annotation/index.js b/x-pack/plugins/canvas/public/components/tooltip_annotation/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/tooltip_annotation/index.js rename to x-pack/plugins/canvas/public/components/tooltip_annotation/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/tooltip_annotation/tooltip_annotation.js b/x-pack/plugins/canvas/public/components/tooltip_annotation/tooltip_annotation.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/tooltip_annotation/tooltip_annotation.js rename to x-pack/plugins/canvas/public/components/tooltip_annotation/tooltip_annotation.js diff --git a/x-pack/legacy/plugins/canvas/public/components/tooltip_annotation/tooltip_annotation.scss b/x-pack/plugins/canvas/public/components/tooltip_annotation/tooltip_annotation.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/tooltip_annotation/tooltip_annotation.scss rename to x-pack/plugins/canvas/public/components/tooltip_annotation/tooltip_annotation.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/tooltip_icon/index.ts b/x-pack/plugins/canvas/public/components/tooltip_icon/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/tooltip_icon/index.ts rename to x-pack/plugins/canvas/public/components/tooltip_icon/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/components/tooltip_icon/tooltip_icon.tsx b/x-pack/plugins/canvas/public/components/tooltip_icon/tooltip_icon.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/tooltip_icon/tooltip_icon.tsx rename to x-pack/plugins/canvas/public/components/tooltip_icon/tooltip_icon.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad/index.js b/x-pack/plugins/canvas/public/components/workpad/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad/index.js rename to x-pack/plugins/canvas/public/components/workpad/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad/workpad.js b/x-pack/plugins/canvas/public/components/workpad/workpad.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad/workpad.js rename to x-pack/plugins/canvas/public/components/workpad/workpad.js diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad/workpad.scss b/x-pack/plugins/canvas/public/components/workpad/workpad.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad/workpad.scss rename to x-pack/plugins/canvas/public/components/workpad/workpad.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_color_picker/index.ts b/x-pack/plugins/canvas/public/components/workpad_color_picker/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_color_picker/index.ts rename to x-pack/plugins/canvas/public/components/workpad_color_picker/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_color_picker/workpad_color_picker.tsx b/x-pack/plugins/canvas/public/components/workpad_color_picker/workpad_color_picker.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_color_picker/workpad_color_picker.tsx rename to x-pack/plugins/canvas/public/components/workpad_color_picker/workpad_color_picker.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_config/index.js b/x-pack/plugins/canvas/public/components/workpad_config/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_config/index.js rename to x-pack/plugins/canvas/public/components/workpad_config/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_config/workpad_config.js b/x-pack/plugins/canvas/public/components/workpad_config/workpad_config.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_config/workpad_config.js rename to x-pack/plugins/canvas/public/components/workpad_config/workpad_config.js diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/edit_menu/__examples__/__snapshots__/edit_menu.examples.storyshot b/x-pack/plugins/canvas/public/components/workpad_header/edit_menu/__examples__/__snapshots__/edit_menu.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/edit_menu/__examples__/__snapshots__/edit_menu.examples.storyshot rename to x-pack/plugins/canvas/public/components/workpad_header/edit_menu/__examples__/__snapshots__/edit_menu.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/edit_menu/__examples__/edit_menu.examples.tsx b/x-pack/plugins/canvas/public/components/workpad_header/edit_menu/__examples__/edit_menu.examples.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/edit_menu/__examples__/edit_menu.examples.tsx rename to x-pack/plugins/canvas/public/components/workpad_header/edit_menu/__examples__/edit_menu.examples.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/edit_menu/edit_menu.tsx b/x-pack/plugins/canvas/public/components/workpad_header/edit_menu/edit_menu.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/edit_menu/edit_menu.tsx rename to x-pack/plugins/canvas/public/components/workpad_header/edit_menu/edit_menu.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/edit_menu/index.ts b/x-pack/plugins/canvas/public/components/workpad_header/edit_menu/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/edit_menu/index.ts rename to x-pack/plugins/canvas/public/components/workpad_header/edit_menu/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/element_menu/__examples__/__snapshots__/element_menu.examples.storyshot b/x-pack/plugins/canvas/public/components/workpad_header/element_menu/__examples__/__snapshots__/element_menu.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/element_menu/__examples__/__snapshots__/element_menu.examples.storyshot rename to x-pack/plugins/canvas/public/components/workpad_header/element_menu/__examples__/__snapshots__/element_menu.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/element_menu/__examples__/element_menu.examples.tsx b/x-pack/plugins/canvas/public/components/workpad_header/element_menu/__examples__/element_menu.examples.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/element_menu/__examples__/element_menu.examples.tsx rename to x-pack/plugins/canvas/public/components/workpad_header/element_menu/__examples__/element_menu.examples.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/element_menu/element_menu.scss b/x-pack/plugins/canvas/public/components/workpad_header/element_menu/element_menu.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/element_menu/element_menu.scss rename to x-pack/plugins/canvas/public/components/workpad_header/element_menu/element_menu.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/element_menu/element_menu.tsx b/x-pack/plugins/canvas/public/components/workpad_header/element_menu/element_menu.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/element_menu/element_menu.tsx rename to x-pack/plugins/canvas/public/components/workpad_header/element_menu/element_menu.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/element_menu/index.tsx b/x-pack/plugins/canvas/public/components/workpad_header/element_menu/index.tsx similarity index 95% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/element_menu/index.tsx rename to x-pack/plugins/canvas/public/components/workpad_header/element_menu/index.tsx index 40571a9341f69c..a1227b33946785 100644 --- a/x-pack/legacy/plugins/canvas/public/components/workpad_header/element_menu/index.tsx +++ b/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'; diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/fullscreen_control/fullscreen_control.tsx b/x-pack/plugins/canvas/public/components/workpad_header/fullscreen_control/fullscreen_control.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/fullscreen_control/fullscreen_control.tsx rename to x-pack/plugins/canvas/public/components/workpad_header/fullscreen_control/fullscreen_control.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/fullscreen_control/index.js b/x-pack/plugins/canvas/public/components/workpad_header/fullscreen_control/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/fullscreen_control/index.js rename to x-pack/plugins/canvas/public/components/workpad_header/fullscreen_control/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/index.tsx b/x-pack/plugins/canvas/public/components/workpad_header/index.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/index.tsx rename to x-pack/plugins/canvas/public/components/workpad_header/index.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/refresh_control/index.ts b/x-pack/plugins/canvas/public/components/workpad_header/refresh_control/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/refresh_control/index.ts rename to x-pack/plugins/canvas/public/components/workpad_header/refresh_control/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/refresh_control/refresh_control.tsx b/x-pack/plugins/canvas/public/components/workpad_header/refresh_control/refresh_control.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/refresh_control/refresh_control.tsx rename to x-pack/plugins/canvas/public/components/workpad_header/refresh_control/refresh_control.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/__examples__/__snapshots__/pdf_panel.stories.storyshot b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/__examples__/__snapshots__/pdf_panel.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/__examples__/__snapshots__/pdf_panel.stories.storyshot rename to x-pack/plugins/canvas/public/components/workpad_header/share_menu/__examples__/__snapshots__/pdf_panel.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/__examples__/__snapshots__/share_menu.examples.storyshot b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/__examples__/__snapshots__/share_menu.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/__examples__/__snapshots__/share_menu.examples.storyshot rename to x-pack/plugins/canvas/public/components/workpad_header/share_menu/__examples__/__snapshots__/share_menu.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/__examples__/pdf_panel.stories.tsx b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/__examples__/pdf_panel.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/__examples__/pdf_panel.stories.tsx rename to x-pack/plugins/canvas/public/components/workpad_header/share_menu/__examples__/pdf_panel.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/__examples__/share_menu.examples.tsx b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/__examples__/share_menu.examples.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/__examples__/share_menu.examples.tsx rename to x-pack/plugins/canvas/public/components/workpad_header/share_menu/__examples__/share_menu.examples.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/flyout/__examples__/share_website_flyout.stories.tsx b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/__examples__/share_website_flyout.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/flyout/__examples__/share_website_flyout.stories.tsx rename to x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/__examples__/share_website_flyout.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/flyout/index.ts b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/index.ts similarity index 97% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/flyout/index.ts rename to x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/index.ts index 4377635acac881..1ed39b62cccada 100644 --- a/x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/flyout/index.ts +++ b/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; diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/flyout/runtime_step.tsx b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/runtime_step.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/flyout/runtime_step.tsx rename to x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/runtime_step.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/flyout/share_website_flyout.tsx b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/share_website_flyout.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/flyout/share_website_flyout.tsx rename to x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/share_website_flyout.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/flyout/snippets_step.tsx b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/snippets_step.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/flyout/snippets_step.tsx rename to x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/snippets_step.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/flyout/workpad_step.tsx b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/workpad_step.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/flyout/workpad_step.tsx rename to x-pack/plugins/canvas/public/components/workpad_header/share_menu/flyout/workpad_step.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/index.ts b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/index.ts similarity index 94% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/index.ts rename to x-pack/plugins/canvas/public/components/workpad_header/share_menu/index.ts index d6565f0e43db7c..9a8936ada6d1e3 100644 --- a/x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/index.ts +++ b/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'; diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/pdf_panel.tsx b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/pdf_panel.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/pdf_panel.tsx rename to x-pack/plugins/canvas/public/components/workpad_header/share_menu/pdf_panel.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/share_menu.scss b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/share_menu.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/share_menu.scss rename to x-pack/plugins/canvas/public/components/workpad_header/share_menu/share_menu.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/share_menu.tsx b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/share_menu.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/share_menu.tsx rename to x-pack/plugins/canvas/public/components/workpad_header/share_menu/share_menu.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/utils.test.ts b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/utils.test.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/utils.test.ts rename to x-pack/plugins/canvas/public/components/workpad_header/share_menu/utils.test.ts diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/utils.ts b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/utils.ts similarity index 97% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/utils.ts rename to x-pack/plugins/canvas/public/components/workpad_header/share_menu/utils.ts index dc99c0687f388e..8a3438e89e8465 100644 --- a/x-pack/legacy/plugins/canvas/public/components/workpad_header/share_menu/utils.ts +++ b/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'; diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/view_menu/__examples__/__snapshots__/view_menu.stories.storyshot b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/__examples__/__snapshots__/view_menu.stories.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/view_menu/__examples__/__snapshots__/view_menu.stories.storyshot rename to x-pack/plugins/canvas/public/components/workpad_header/view_menu/__examples__/__snapshots__/view_menu.stories.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/view_menu/__examples__/view_menu.stories.tsx b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/__examples__/view_menu.stories.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/view_menu/__examples__/view_menu.stories.tsx rename to x-pack/plugins/canvas/public/components/workpad_header/view_menu/__examples__/view_menu.stories.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/view_menu/auto_refresh_controls.tsx b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/auto_refresh_controls.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/view_menu/auto_refresh_controls.tsx rename to x-pack/plugins/canvas/public/components/workpad_header/view_menu/auto_refresh_controls.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/view_menu/custom_interval.tsx b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/custom_interval.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/view_menu/custom_interval.tsx rename to x-pack/plugins/canvas/public/components/workpad_header/view_menu/custom_interval.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/view_menu/index.ts b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/index.ts similarity index 97% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/view_menu/index.ts rename to x-pack/plugins/canvas/public/components/workpad_header/view_menu/index.ts index e1ad9782c8aef5..e561607cb101e1 100644 --- a/x-pack/legacy/plugins/canvas/public/components/workpad_header/view_menu/index.ts +++ b/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 diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/view_menu/kiosk_controls.tsx b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/kiosk_controls.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/view_menu/kiosk_controls.tsx rename to x-pack/plugins/canvas/public/components/workpad_header/view_menu/kiosk_controls.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/view_menu/lib/get_fit_zoom_scale.ts b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/lib/get_fit_zoom_scale.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/view_menu/lib/get_fit_zoom_scale.ts rename to x-pack/plugins/canvas/public/components/workpad_header/view_menu/lib/get_fit_zoom_scale.ts diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/view_menu/view_menu.scss b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/view_menu.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/view_menu/view_menu.scss rename to x-pack/plugins/canvas/public/components/workpad_header/view_menu/view_menu.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/view_menu/view_menu.tsx b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/view_menu.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/view_menu/view_menu.tsx rename to x-pack/plugins/canvas/public/components/workpad_header/view_menu/view_menu.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_header/workpad_header.tsx b/x-pack/plugins/canvas/public/components/workpad_header/workpad_header.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_header/workpad_header.tsx rename to x-pack/plugins/canvas/public/components/workpad_header/workpad_header.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_loader/index.js b/x-pack/plugins/canvas/public/components/workpad_loader/index.js similarity index 98% rename from x-pack/legacy/plugins/canvas/public/components/workpad_loader/index.js rename to x-pack/plugins/canvas/public/components/workpad_loader/index.js index 9379379e54d97b..8b190338db49e3 100644 --- a/x-pack/legacy/plugins/canvas/public/components/workpad_loader/index.js +++ b/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; diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_loader/upload_workpad.js b/x-pack/plugins/canvas/public/components/workpad_loader/upload_workpad.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_loader/upload_workpad.js rename to x-pack/plugins/canvas/public/components/workpad_loader/upload_workpad.js diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_loader/workpad_create.js b/x-pack/plugins/canvas/public/components/workpad_loader/workpad_create.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_loader/workpad_create.js rename to x-pack/plugins/canvas/public/components/workpad_loader/workpad_create.js diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_loader/workpad_dropzone/index.js b/x-pack/plugins/canvas/public/components/workpad_loader/workpad_dropzone/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_loader/workpad_dropzone/index.js rename to x-pack/plugins/canvas/public/components/workpad_loader/workpad_dropzone/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_loader/workpad_dropzone/workpad_dropzone.js b/x-pack/plugins/canvas/public/components/workpad_loader/workpad_dropzone/workpad_dropzone.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_loader/workpad_dropzone/workpad_dropzone.js rename to x-pack/plugins/canvas/public/components/workpad_loader/workpad_dropzone/workpad_dropzone.js diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_loader/workpad_dropzone/workpad_dropzone.scss b/x-pack/plugins/canvas/public/components/workpad_loader/workpad_dropzone/workpad_dropzone.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_loader/workpad_dropzone/workpad_dropzone.scss rename to x-pack/plugins/canvas/public/components/workpad_loader/workpad_dropzone/workpad_dropzone.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_loader/workpad_loader.js b/x-pack/plugins/canvas/public/components/workpad_loader/workpad_loader.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_loader/workpad_loader.js rename to x-pack/plugins/canvas/public/components/workpad_loader/workpad_loader.js diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_loader/workpad_loader.scss b/x-pack/plugins/canvas/public/components/workpad_loader/workpad_loader.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_loader/workpad_loader.scss rename to x-pack/plugins/canvas/public/components/workpad_loader/workpad_loader.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_loader/workpad_search.js b/x-pack/plugins/canvas/public/components/workpad_loader/workpad_search.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_loader/workpad_search.js rename to x-pack/plugins/canvas/public/components/workpad_loader/workpad_search.js diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_manager/index.js b/x-pack/plugins/canvas/public/components/workpad_manager/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_manager/index.js rename to x-pack/plugins/canvas/public/components/workpad_manager/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_manager/workpad_manager.js b/x-pack/plugins/canvas/public/components/workpad_manager/workpad_manager.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_manager/workpad_manager.js rename to x-pack/plugins/canvas/public/components/workpad_manager/workpad_manager.js diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_page/index.js b/x-pack/plugins/canvas/public/components/workpad_page/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_page/index.js rename to x-pack/plugins/canvas/public/components/workpad_page/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_page/integration_utils.js b/x-pack/plugins/canvas/public/components/workpad_page/integration_utils.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_page/integration_utils.js rename to x-pack/plugins/canvas/public/components/workpad_page/integration_utils.js diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_page/positioning_utils.ts b/x-pack/plugins/canvas/public/components/workpad_page/positioning_utils.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_page/positioning_utils.ts rename to x-pack/plugins/canvas/public/components/workpad_page/positioning_utils.ts diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_page/prop_types.js b/x-pack/plugins/canvas/public/components/workpad_page/prop_types.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_page/prop_types.js rename to x-pack/plugins/canvas/public/components/workpad_page/prop_types.js diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_page/utils.js b/x-pack/plugins/canvas/public/components/workpad_page/utils.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_page/utils.js rename to x-pack/plugins/canvas/public/components/workpad_page/utils.js diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_page/workpad_interactive_page/event_handlers.js b/x-pack/plugins/canvas/public/components/workpad_page/workpad_interactive_page/event_handlers.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_page/workpad_interactive_page/event_handlers.js rename to x-pack/plugins/canvas/public/components/workpad_page/workpad_interactive_page/event_handlers.js diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_page/workpad_interactive_page/index.js b/x-pack/plugins/canvas/public/components/workpad_page/workpad_interactive_page/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_page/workpad_interactive_page/index.js rename to x-pack/plugins/canvas/public/components/workpad_page/workpad_interactive_page/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_page/workpad_interactive_page/interaction_boundary.tsx b/x-pack/plugins/canvas/public/components/workpad_page/workpad_interactive_page/interaction_boundary.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_page/workpad_interactive_page/interaction_boundary.tsx rename to x-pack/plugins/canvas/public/components/workpad_page/workpad_interactive_page/interaction_boundary.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_page/workpad_interactive_page/interactive_workpad_page.js b/x-pack/plugins/canvas/public/components/workpad_page/workpad_interactive_page/interactive_workpad_page.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_page/workpad_interactive_page/interactive_workpad_page.js rename to x-pack/plugins/canvas/public/components/workpad_page/workpad_interactive_page/interactive_workpad_page.js diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_page/workpad_interactive_page/workpad_interactive_page.scss b/x-pack/plugins/canvas/public/components/workpad_page/workpad_interactive_page/workpad_interactive_page.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_page/workpad_interactive_page/workpad_interactive_page.scss rename to x-pack/plugins/canvas/public/components/workpad_page/workpad_interactive_page/workpad_interactive_page.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_page/workpad_page.scss b/x-pack/plugins/canvas/public/components/workpad_page/workpad_page.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_page/workpad_page.scss rename to x-pack/plugins/canvas/public/components/workpad_page/workpad_page.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_page/workpad_static_page/index.js b/x-pack/plugins/canvas/public/components/workpad_page/workpad_static_page/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_page/workpad_static_page/index.js rename to x-pack/plugins/canvas/public/components/workpad_page/workpad_static_page/index.js diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_page/workpad_static_page/static_workpad_page.js b/x-pack/plugins/canvas/public/components/workpad_page/workpad_static_page/static_workpad_page.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_page/workpad_static_page/static_workpad_page.js rename to x-pack/plugins/canvas/public/components/workpad_page/workpad_static_page/static_workpad_page.js diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_page/workpad_static_page/workpad_static_page.scss b/x-pack/plugins/canvas/public/components/workpad_page/workpad_static_page/workpad_static_page.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_page/workpad_static_page/workpad_static_page.scss rename to x-pack/plugins/canvas/public/components/workpad_page/workpad_static_page/workpad_static_page.scss diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_shortcuts/index.tsx b/x-pack/plugins/canvas/public/components/workpad_shortcuts/index.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_shortcuts/index.tsx rename to x-pack/plugins/canvas/public/components/workpad_shortcuts/index.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_shortcuts/workpad_shortcuts.tsx b/x-pack/plugins/canvas/public/components/workpad_shortcuts/workpad_shortcuts.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_shortcuts/workpad_shortcuts.tsx rename to x-pack/plugins/canvas/public/components/workpad_shortcuts/workpad_shortcuts.tsx diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_templates/index.js b/x-pack/plugins/canvas/public/components/workpad_templates/index.js similarity index 94% rename from x-pack/legacy/plugins/canvas/public/components/workpad_templates/index.js rename to x-pack/plugins/canvas/public/components/workpad_templates/index.js index 1890ca1f9d2d67..a17b77b74e499f 100644 --- a/x-pack/legacy/plugins/canvas/public/components/workpad_templates/index.js +++ b/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( diff --git a/x-pack/legacy/plugins/canvas/public/components/workpad_templates/workpad_templates.js b/x-pack/plugins/canvas/public/components/workpad_templates/workpad_templates.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/components/workpad_templates/workpad_templates.js rename to x-pack/plugins/canvas/public/components/workpad_templates/workpad_templates.js diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/arg.js b/x-pack/plugins/canvas/public/expression_types/arg.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/arg.js rename to x-pack/plugins/canvas/public/expression_types/arg.js diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/arg_type.js b/x-pack/plugins/canvas/public/expression_types/arg_type.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/arg_type.js rename to x-pack/plugins/canvas/public/expression_types/arg_type.js diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/color.js b/x-pack/plugins/canvas/public/expression_types/arg_types/color.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/arg_types/color.js rename to x-pack/plugins/canvas/public/expression_types/arg_types/color.js diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/__snapshots__/extended_template.examples.storyshot b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/__snapshots__/extended_template.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/__snapshots__/extended_template.examples.storyshot rename to x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/__snapshots__/extended_template.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/__snapshots__/simple_template.examples.storyshot b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/__snapshots__/simple_template.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/__snapshots__/simple_template.examples.storyshot rename to x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/__snapshots__/simple_template.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/extended_template.examples.tsx b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/extended_template.examples.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/extended_template.examples.tsx rename to x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/extended_template.examples.tsx diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/simple_template.examples.tsx b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/simple_template.examples.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/simple_template.examples.tsx rename to x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__examples__/simple_template.examples.tsx diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/container_style/appearance_form.tsx b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/appearance_form.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/arg_types/container_style/appearance_form.tsx rename to x-pack/plugins/canvas/public/expression_types/arg_types/container_style/appearance_form.tsx diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/container_style/border_form.tsx b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/border_form.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/arg_types/container_style/border_form.tsx rename to x-pack/plugins/canvas/public/expression_types/arg_types/container_style/border_form.tsx diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/container_style/extended_template.tsx b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/extended_template.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/arg_types/container_style/extended_template.tsx rename to x-pack/plugins/canvas/public/expression_types/arg_types/container_style/extended_template.tsx diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/container_style/index.ts b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/arg_types/container_style/index.ts rename to x-pack/plugins/canvas/public/expression_types/arg_types/container_style/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/container_style/simple_template.tsx b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/simple_template.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/arg_types/container_style/simple_template.tsx rename to x-pack/plugins/canvas/public/expression_types/arg_types/container_style/simple_template.tsx diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/font.js b/x-pack/plugins/canvas/public/expression_types/arg_types/font.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/arg_types/font.js rename to x-pack/plugins/canvas/public/expression_types/arg_types/font.js diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/index.js b/x-pack/plugins/canvas/public/expression_types/arg_types/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/arg_types/index.js rename to x-pack/plugins/canvas/public/expression_types/arg_types/index.js diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/__snapshots__/extended_template.examples.storyshot b/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/__snapshots__/extended_template.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/__snapshots__/extended_template.examples.storyshot rename to x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/__snapshots__/extended_template.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/__snapshots__/simple_template.examples.storyshot b/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/__snapshots__/simple_template.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/__snapshots__/simple_template.examples.storyshot rename to x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/__snapshots__/simple_template.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/extended_template.examples.tsx b/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/extended_template.examples.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/extended_template.examples.tsx rename to x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/extended_template.examples.tsx diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/simple_template.examples.tsx b/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/simple_template.examples.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/simple_template.examples.tsx rename to x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__examples__/simple_template.examples.tsx diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/extended_template.tsx b/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/extended_template.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/extended_template.tsx rename to x-pack/plugins/canvas/public/expression_types/arg_types/series_style/extended_template.tsx diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/index.ts b/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/index.ts rename to x-pack/plugins/canvas/public/expression_types/arg_types/series_style/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/simple_template.tsx b/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/simple_template.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/arg_types/series_style/simple_template.tsx rename to x-pack/plugins/canvas/public/expression_types/arg_types/series_style/simple_template.tsx diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/base_form.js b/x-pack/plugins/canvas/public/expression_types/base_form.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/base_form.js rename to x-pack/plugins/canvas/public/expression_types/base_form.js diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/datasource.js b/x-pack/plugins/canvas/public/expression_types/datasource.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/datasource.js rename to x-pack/plugins/canvas/public/expression_types/datasource.js diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/function_form.js b/x-pack/plugins/canvas/public/expression_types/function_form.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/function_form.js rename to x-pack/plugins/canvas/public/expression_types/function_form.js diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/index.js b/x-pack/plugins/canvas/public/expression_types/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/index.js rename to x-pack/plugins/canvas/public/expression_types/index.js diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/model.js b/x-pack/plugins/canvas/public/expression_types/model.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/model.js rename to x-pack/plugins/canvas/public/expression_types/model.js diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/transform.js b/x-pack/plugins/canvas/public/expression_types/transform.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/transform.js rename to x-pack/plugins/canvas/public/expression_types/transform.js diff --git a/x-pack/legacy/plugins/canvas/public/expression_types/view.js b/x-pack/plugins/canvas/public/expression_types/view.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/expression_types/view.js rename to x-pack/plugins/canvas/public/expression_types/view.js diff --git a/x-pack/legacy/plugins/canvas/public/feature_catalogue_entry.ts b/x-pack/plugins/canvas/public/feature_catalogue_entry.ts similarity index 87% rename from x-pack/legacy/plugins/canvas/public/feature_catalogue_entry.ts rename to x-pack/plugins/canvas/public/feature_catalogue_entry.ts index f610bd0299832a..41506bdd71e3c4 100644 --- a/x-pack/legacy/plugins/canvas/public/feature_catalogue_entry.ts +++ b/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', diff --git a/x-pack/legacy/plugins/canvas/public/functions/__tests__/asset.js b/x-pack/plugins/canvas/public/functions/__tests__/asset.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/functions/__tests__/asset.js rename to x-pack/plugins/canvas/public/functions/__tests__/asset.js diff --git a/x-pack/legacy/plugins/canvas/public/functions/asset.ts b/x-pack/plugins/canvas/public/functions/asset.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/functions/asset.ts rename to x-pack/plugins/canvas/public/functions/asset.ts diff --git a/x-pack/legacy/plugins/canvas/public/functions/filters.ts b/x-pack/plugins/canvas/public/functions/filters.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/functions/filters.ts rename to x-pack/plugins/canvas/public/functions/filters.ts diff --git a/x-pack/legacy/plugins/canvas/public/functions/index.ts b/x-pack/plugins/canvas/public/functions/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/functions/index.ts rename to x-pack/plugins/canvas/public/functions/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/functions/timelion.ts b/x-pack/plugins/canvas/public/functions/timelion.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/functions/timelion.ts rename to x-pack/plugins/canvas/public/functions/timelion.ts diff --git a/x-pack/legacy/plugins/canvas/public/functions/to.ts b/x-pack/plugins/canvas/public/functions/to.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/functions/to.ts rename to x-pack/plugins/canvas/public/functions/to.ts diff --git a/x-pack/legacy/plugins/canvas/public/icon.svg b/x-pack/plugins/canvas/public/icon.svg similarity index 100% rename from x-pack/legacy/plugins/canvas/public/icon.svg rename to x-pack/plugins/canvas/public/icon.svg diff --git a/x-pack/plugins/canvas/public/index.ts b/x-pack/plugins/canvas/public/index.ts index 736d5ccc0f8e59..d36f89354934ab 100644 --- a/x-pack/plugins/canvas/public/index.ts +++ b/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(); diff --git a/x-pack/legacy/plugins/canvas/public/lib/__tests__/find_expression_type.js b/x-pack/plugins/canvas/public/lib/__tests__/find_expression_type.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/__tests__/find_expression_type.js rename to x-pack/plugins/canvas/public/lib/__tests__/find_expression_type.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/__tests__/get_pretty_shortcut.test.ts b/x-pack/plugins/canvas/public/lib/__tests__/get_pretty_shortcut.test.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/__tests__/get_pretty_shortcut.test.ts rename to x-pack/plugins/canvas/public/lib/__tests__/get_pretty_shortcut.test.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/__tests__/history_provider.js b/x-pack/plugins/canvas/public/lib/__tests__/history_provider.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/__tests__/history_provider.js rename to x-pack/plugins/canvas/public/lib/__tests__/history_provider.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/__tests__/modify_path.js b/x-pack/plugins/canvas/public/lib/__tests__/modify_path.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/__tests__/modify_path.js rename to x-pack/plugins/canvas/public/lib/__tests__/modify_path.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/__tests__/readable_color.test.ts b/x-pack/plugins/canvas/public/lib/__tests__/readable_color.test.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/__tests__/readable_color.test.ts rename to x-pack/plugins/canvas/public/lib/__tests__/readable_color.test.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/__tests__/resolved_arg.js b/x-pack/plugins/canvas/public/lib/__tests__/resolved_arg.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/__tests__/resolved_arg.js rename to x-pack/plugins/canvas/public/lib/__tests__/resolved_arg.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/__tests__/time_interval.test.ts b/x-pack/plugins/canvas/public/lib/__tests__/time_interval.test.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/__tests__/time_interval.test.ts rename to x-pack/plugins/canvas/public/lib/__tests__/time_interval.test.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/aeroelastic/__fixtures__/typescript/typespec_tests.ts b/x-pack/plugins/canvas/public/lib/aeroelastic/__fixtures__/typescript/typespec_tests.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/aeroelastic/__fixtures__/typescript/typespec_tests.ts rename to x-pack/plugins/canvas/public/lib/aeroelastic/__fixtures__/typescript/typespec_tests.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/aeroelastic/common.js b/x-pack/plugins/canvas/public/lib/aeroelastic/common.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/aeroelastic/common.js rename to x-pack/plugins/canvas/public/lib/aeroelastic/common.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/aeroelastic/functional.js b/x-pack/plugins/canvas/public/lib/aeroelastic/functional.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/aeroelastic/functional.js rename to x-pack/plugins/canvas/public/lib/aeroelastic/functional.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/aeroelastic/geometry.js b/x-pack/plugins/canvas/public/lib/aeroelastic/geometry.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/aeroelastic/geometry.js rename to x-pack/plugins/canvas/public/lib/aeroelastic/geometry.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/aeroelastic/gestures.js b/x-pack/plugins/canvas/public/lib/aeroelastic/gestures.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/aeroelastic/gestures.js rename to x-pack/plugins/canvas/public/lib/aeroelastic/gestures.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/aeroelastic/index.d.ts b/x-pack/plugins/canvas/public/lib/aeroelastic/index.d.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/aeroelastic/index.d.ts rename to x-pack/plugins/canvas/public/lib/aeroelastic/index.d.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/aeroelastic/layout.js b/x-pack/plugins/canvas/public/lib/aeroelastic/layout.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/aeroelastic/layout.js rename to x-pack/plugins/canvas/public/lib/aeroelastic/layout.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/aeroelastic/layout_functions.js b/x-pack/plugins/canvas/public/lib/aeroelastic/layout_functions.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/aeroelastic/layout_functions.js rename to x-pack/plugins/canvas/public/lib/aeroelastic/layout_functions.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/aeroelastic/matrix.ts b/x-pack/plugins/canvas/public/lib/aeroelastic/matrix.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/aeroelastic/matrix.ts rename to x-pack/plugins/canvas/public/lib/aeroelastic/matrix.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/aeroelastic/matrix2d.ts b/x-pack/plugins/canvas/public/lib/aeroelastic/matrix2d.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/aeroelastic/matrix2d.ts rename to x-pack/plugins/canvas/public/lib/aeroelastic/matrix2d.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/aeroelastic/select.ts b/x-pack/plugins/canvas/public/lib/aeroelastic/select.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/aeroelastic/select.ts rename to x-pack/plugins/canvas/public/lib/aeroelastic/select.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/aeroelastic/store.ts b/x-pack/plugins/canvas/public/lib/aeroelastic/store.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/aeroelastic/store.ts rename to x-pack/plugins/canvas/public/lib/aeroelastic/store.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/aeroelastic/tsconfig.json b/x-pack/plugins/canvas/public/lib/aeroelastic/tsconfig.json similarity index 87% rename from x-pack/legacy/plugins/canvas/public/lib/aeroelastic/tsconfig.json rename to x-pack/plugins/canvas/public/lib/aeroelastic/tsconfig.json index ae5eb9321a59f2..3b61e4b414626c 100644 --- a/x-pack/legacy/plugins/canvas/public/lib/aeroelastic/tsconfig.json +++ b/x-pack/plugins/canvas/public/lib/aeroelastic/tsconfig.json @@ -15,7 +15,7 @@ "paths": { "layout/*": ["aeroelastic/*"] }, - "types": ["@kbn/x-pack/legacy/plugins/canvas/public/lib/aeroelastic"] + "types": ["@kbn/x-pack/plugins/canvas/public/lib/aeroelastic"] }, "exclude": ["node_modules", "**/*.spec.ts", "node_modules/@types/mocha"] } diff --git a/x-pack/legacy/plugins/canvas/public/lib/app_handler_creators.ts b/x-pack/plugins/canvas/public/lib/app_handler_creators.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/app_handler_creators.ts rename to x-pack/plugins/canvas/public/lib/app_handler_creators.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/app_state.ts b/x-pack/plugins/canvas/public/lib/app_state.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/app_state.ts rename to x-pack/plugins/canvas/public/lib/app_state.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/arg_helpers.js b/x-pack/plugins/canvas/public/lib/arg_helpers.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/arg_helpers.js rename to x-pack/plugins/canvas/public/lib/arg_helpers.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/breadcrumbs.ts b/x-pack/plugins/canvas/public/lib/breadcrumbs.ts similarity index 92% rename from x-pack/legacy/plugins/canvas/public/lib/breadcrumbs.ts rename to x-pack/plugins/canvas/public/lib/breadcrumbs.ts index 57b513affd7815..96412ef50c79de 100644 --- a/x-pack/legacy/plugins/canvas/public/lib/breadcrumbs.ts +++ b/x-pack/plugins/canvas/public/lib/breadcrumbs.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { ChromeBreadcrumb } from '../../../../../../src/core/public'; +import { ChromeBreadcrumb } from '../../../../../src/core/public'; import { platformService } from '../services'; export const getBaseBreadcrumb = () => ({ diff --git a/x-pack/legacy/plugins/canvas/public/lib/build_bool_array.js b/x-pack/plugins/canvas/public/lib/build_bool_array.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/build_bool_array.js rename to x-pack/plugins/canvas/public/lib/build_bool_array.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/build_embeddable_filters.test.ts b/x-pack/plugins/canvas/public/lib/build_embeddable_filters.test.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/build_embeddable_filters.test.ts rename to x-pack/plugins/canvas/public/lib/build_embeddable_filters.test.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/build_embeddable_filters.ts b/x-pack/plugins/canvas/public/lib/build_embeddable_filters.ts similarity index 92% rename from x-pack/legacy/plugins/canvas/public/lib/build_embeddable_filters.ts rename to x-pack/plugins/canvas/public/lib/build_embeddable_filters.ts index aa915d0d3d02a4..9aa7477523c9a1 100644 --- a/x-pack/legacy/plugins/canvas/public/lib/build_embeddable_filters.ts +++ b/x-pack/plugins/canvas/public/lib/build_embeddable_filters.ts @@ -7,11 +7,7 @@ import { ExpressionValueFilter } from '../../types'; // @ts-ignore Untyped Local import { buildBoolArray } from './build_bool_array'; -import { - TimeRange, - esFilters, - Filter as DataFilter, -} from '../../../../../../src/plugins/data/public'; +import { TimeRange, esFilters, Filter as DataFilter } from '../../../../../src/plugins/data/public'; export interface EmbeddableFilterInput { filters: DataFilter[]; diff --git a/x-pack/legacy/plugins/canvas/public/lib/clipboard.test.ts b/x-pack/plugins/canvas/public/lib/clipboard.test.ts similarity index 86% rename from x-pack/legacy/plugins/canvas/public/lib/clipboard.test.ts rename to x-pack/plugins/canvas/public/lib/clipboard.test.ts index 54c3000dae36ca..d10964003ed391 100644 --- a/x-pack/legacy/plugins/canvas/public/lib/clipboard.test.ts +++ b/x-pack/plugins/canvas/public/lib/clipboard.test.ts @@ -3,9 +3,9 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -jest.mock('../../../../../../src/plugins/kibana_utils/public'); +jest.mock('../../../../../src/plugins/kibana_utils/public'); -import { Storage } from '../../../../../../src/plugins/kibana_utils/public'; +import { Storage } from '../../../../../src/plugins/kibana_utils/public'; import { setClipboardData, getClipboardData } from './clipboard'; import { LOCALSTORAGE_CLIPBOARD } from '../../common/lib/constants'; import { elements } from '../../__tests__/fixtures/workpads'; diff --git a/x-pack/legacy/plugins/canvas/public/lib/clipboard.ts b/x-pack/plugins/canvas/public/lib/clipboard.ts similarity index 90% rename from x-pack/legacy/plugins/canvas/public/lib/clipboard.ts rename to x-pack/plugins/canvas/public/lib/clipboard.ts index 50c5cdd0042fd4..11755807aa5336 100644 --- a/x-pack/legacy/plugins/canvas/public/lib/clipboard.ts +++ b/x-pack/plugins/canvas/public/lib/clipboard.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { Storage } from '../../../../../../src/plugins/kibana_utils/public'; +import { Storage } from '../../../../../src/plugins/kibana_utils/public'; import { LOCALSTORAGE_CLIPBOARD } from '../../common/lib/constants'; import { getWindow } from './get_window'; diff --git a/x-pack/legacy/plugins/canvas/public/lib/clone_subgraphs.js b/x-pack/plugins/canvas/public/lib/clone_subgraphs.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/clone_subgraphs.js rename to x-pack/plugins/canvas/public/lib/clone_subgraphs.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/custom_element_service.ts b/x-pack/plugins/canvas/public/lib/custom_element_service.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/custom_element_service.ts rename to x-pack/plugins/canvas/public/lib/custom_element_service.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/doc_title.js b/x-pack/plugins/canvas/public/lib/doc_title.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/doc_title.js rename to x-pack/plugins/canvas/public/lib/doc_title.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/documentation_links.ts b/x-pack/plugins/canvas/public/lib/documentation_links.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/documentation_links.ts rename to x-pack/plugins/canvas/public/lib/documentation_links.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/dom.ts b/x-pack/plugins/canvas/public/lib/dom.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/dom.ts rename to x-pack/plugins/canvas/public/lib/dom.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/download_workpad.ts b/x-pack/plugins/canvas/public/lib/download_workpad.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/download_workpad.ts rename to x-pack/plugins/canvas/public/lib/download_workpad.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/elastic_logo.ts b/x-pack/plugins/canvas/public/lib/elastic_logo.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/elastic_logo.ts rename to x-pack/plugins/canvas/public/lib/elastic_logo.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/elastic_outline.js b/x-pack/plugins/canvas/public/lib/elastic_outline.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/elastic_outline.js rename to x-pack/plugins/canvas/public/lib/elastic_outline.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/element.ts b/x-pack/plugins/canvas/public/lib/element.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/element.ts rename to x-pack/plugins/canvas/public/lib/element.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/element_handler_creators.ts b/x-pack/plugins/canvas/public/lib/element_handler_creators.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/element_handler_creators.ts rename to x-pack/plugins/canvas/public/lib/element_handler_creators.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/elements_registry.js b/x-pack/plugins/canvas/public/lib/elements_registry.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/elements_registry.js rename to x-pack/plugins/canvas/public/lib/elements_registry.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/es_service.ts b/x-pack/plugins/canvas/public/lib/es_service.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/es_service.ts rename to x-pack/plugins/canvas/public/lib/es_service.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/extract_search.js b/x-pack/plugins/canvas/public/lib/extract_search.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/extract_search.js rename to x-pack/plugins/canvas/public/lib/extract_search.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/filters.js b/x-pack/plugins/canvas/public/lib/filters.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/filters.js rename to x-pack/plugins/canvas/public/lib/filters.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/find_existing_asset.js b/x-pack/plugins/canvas/public/lib/find_existing_asset.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/find_existing_asset.js rename to x-pack/plugins/canvas/public/lib/find_existing_asset.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/find_expression_type.js b/x-pack/plugins/canvas/public/lib/find_expression_type.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/find_expression_type.js rename to x-pack/plugins/canvas/public/lib/find_expression_type.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/flatten_panel_tree.ts b/x-pack/plugins/canvas/public/lib/flatten_panel_tree.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/flatten_panel_tree.ts rename to x-pack/plugins/canvas/public/lib/flatten_panel_tree.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/fullscreen.js b/x-pack/plugins/canvas/public/lib/fullscreen.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/fullscreen.js rename to x-pack/plugins/canvas/public/lib/fullscreen.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/get_client_platform.ts b/x-pack/plugins/canvas/public/lib/get_client_platform.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/get_client_platform.ts rename to x-pack/plugins/canvas/public/lib/get_client_platform.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/get_es_filter.js b/x-pack/plugins/canvas/public/lib/get_es_filter.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/get_es_filter.js rename to x-pack/plugins/canvas/public/lib/get_es_filter.js diff --git a/x-pack/legacy/plugins/canvas/public/legacy_register_feature.ts b/x-pack/plugins/canvas/public/lib/get_id.ts similarity index 53% rename from x-pack/legacy/plugins/canvas/public/legacy_register_feature.ts rename to x-pack/plugins/canvas/public/lib/get_id.ts index 00f788f267d4b1..0927a277f7caaf 100644 --- a/x-pack/legacy/plugins/canvas/public/legacy_register_feature.ts +++ b/x-pack/plugins/canvas/public/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()}`; +} diff --git a/x-pack/legacy/plugins/canvas/public/lib/get_pretty_shortcut.ts b/x-pack/plugins/canvas/public/lib/get_pretty_shortcut.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/get_pretty_shortcut.ts rename to x-pack/plugins/canvas/public/lib/get_pretty_shortcut.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/get_tags_filter.tsx b/x-pack/plugins/canvas/public/lib/get_tags_filter.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/get_tags_filter.tsx rename to x-pack/plugins/canvas/public/lib/get_tags_filter.tsx diff --git a/x-pack/legacy/plugins/canvas/public/lib/get_window.ts b/x-pack/plugins/canvas/public/lib/get_window.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/get_window.ts rename to x-pack/plugins/canvas/public/lib/get_window.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/history_provider.js b/x-pack/plugins/canvas/public/lib/history_provider.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/history_provider.js rename to x-pack/plugins/canvas/public/lib/history_provider.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/is_text_input.ts b/x-pack/plugins/canvas/public/lib/is_text_input.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/is_text_input.ts rename to x-pack/plugins/canvas/public/lib/is_text_input.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/keymap.ts b/x-pack/plugins/canvas/public/lib/keymap.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/keymap.ts rename to x-pack/plugins/canvas/public/lib/keymap.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/legend_options.js b/x-pack/plugins/canvas/public/lib/legend_options.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/legend_options.js rename to x-pack/plugins/canvas/public/lib/legend_options.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/load_expression_types.js b/x-pack/plugins/canvas/public/lib/load_expression_types.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/load_expression_types.js rename to x-pack/plugins/canvas/public/lib/load_expression_types.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/load_transitions.js b/x-pack/plugins/canvas/public/lib/load_transitions.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/load_transitions.js rename to x-pack/plugins/canvas/public/lib/load_transitions.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/loading_indicator.ts b/x-pack/plugins/canvas/public/lib/loading_indicator.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/loading_indicator.ts rename to x-pack/plugins/canvas/public/lib/loading_indicator.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/modify_path.js b/x-pack/plugins/canvas/public/lib/modify_path.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/modify_path.js rename to x-pack/plugins/canvas/public/lib/modify_path.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/modify_url.ts b/x-pack/plugins/canvas/public/lib/modify_url.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/modify_url.ts rename to x-pack/plugins/canvas/public/lib/modify_url.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/monaco_language_def.ts b/x-pack/plugins/canvas/public/lib/monaco_language_def.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/monaco_language_def.ts rename to x-pack/plugins/canvas/public/lib/monaco_language_def.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/parse_single_function_chain.js b/x-pack/plugins/canvas/public/lib/parse_single_function_chain.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/parse_single_function_chain.js rename to x-pack/plugins/canvas/public/lib/parse_single_function_chain.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/readable_color.ts b/x-pack/plugins/canvas/public/lib/readable_color.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/readable_color.ts rename to x-pack/plugins/canvas/public/lib/readable_color.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/resolved_arg.js b/x-pack/plugins/canvas/public/lib/resolved_arg.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/resolved_arg.js rename to x-pack/plugins/canvas/public/lib/resolved_arg.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/router_provider.js b/x-pack/plugins/canvas/public/lib/router_provider.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/router_provider.js rename to x-pack/plugins/canvas/public/lib/router_provider.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/run_interpreter.ts b/x-pack/plugins/canvas/public/lib/run_interpreter.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/run_interpreter.ts rename to x-pack/plugins/canvas/public/lib/run_interpreter.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/shortcut_manager.js b/x-pack/plugins/canvas/public/lib/shortcut_manager.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/shortcut_manager.js rename to x-pack/plugins/canvas/public/lib/shortcut_manager.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/sync_filter_expression.ts b/x-pack/plugins/canvas/public/lib/sync_filter_expression.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/sync_filter_expression.ts rename to x-pack/plugins/canvas/public/lib/sync_filter_expression.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/tag.ts b/x-pack/plugins/canvas/public/lib/tag.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/tag.ts rename to x-pack/plugins/canvas/public/lib/tag.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/tags_registry.ts b/x-pack/plugins/canvas/public/lib/tags_registry.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/tags_registry.ts rename to x-pack/plugins/canvas/public/lib/tags_registry.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/template.js b/x-pack/plugins/canvas/public/lib/template.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/template.js rename to x-pack/plugins/canvas/public/lib/template.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/template_from_react_component.tsx b/x-pack/plugins/canvas/public/lib/template_from_react_component.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/template_from_react_component.tsx rename to x-pack/plugins/canvas/public/lib/template_from_react_component.tsx diff --git a/x-pack/legacy/plugins/canvas/public/lib/templates_registry.js b/x-pack/plugins/canvas/public/lib/templates_registry.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/templates_registry.js rename to x-pack/plugins/canvas/public/lib/templates_registry.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/time_duration.ts b/x-pack/plugins/canvas/public/lib/time_duration.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/time_duration.ts rename to x-pack/plugins/canvas/public/lib/time_duration.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/time_interval.ts b/x-pack/plugins/canvas/public/lib/time_interval.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/time_interval.ts rename to x-pack/plugins/canvas/public/lib/time_interval.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/transitions_registry.js b/x-pack/plugins/canvas/public/lib/transitions_registry.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/transitions_registry.js rename to x-pack/plugins/canvas/public/lib/transitions_registry.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/ui_metric.ts b/x-pack/plugins/canvas/public/lib/ui_metric.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/ui_metric.ts rename to x-pack/plugins/canvas/public/lib/ui_metric.ts diff --git a/x-pack/legacy/plugins/canvas/public/lib/window_error_handler.js b/x-pack/plugins/canvas/public/lib/window_error_handler.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/window_error_handler.js rename to x-pack/plugins/canvas/public/lib/window_error_handler.js diff --git a/x-pack/legacy/plugins/canvas/public/lib/workpad_service.js b/x-pack/plugins/canvas/public/lib/workpad_service.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/lib/workpad_service.js rename to x-pack/plugins/canvas/public/lib/workpad_service.js diff --git a/x-pack/legacy/plugins/canvas/public/plugin.tsx b/x-pack/plugins/canvas/public/plugin.tsx similarity index 80% rename from x-pack/legacy/plugins/canvas/public/plugin.tsx rename to x-pack/plugins/canvas/public/plugin.tsx index 1e85aad6328a55..6273aebe30e656 100644 --- a/x-pack/legacy/plugins/canvas/public/plugin.tsx +++ b/x-pack/plugins/canvas/public/plugin.tsx @@ -10,20 +10,19 @@ import { Plugin, AppMountParameters, DEFAULT_APP_CATEGORIES, -} from '../../../../../src/core/public'; -import { HomePublicPluginSetup } from '../../../../../src/plugins/home/public'; +} from '../../../../src/core/public'; +import { HomePublicPluginSetup } from '../../../../src/plugins/home/public'; import { initLoadingIndicator } from './lib/loading_indicator'; import { featureCatalogueEntry } from './feature_catalogue_entry'; -import { ExpressionsSetup, ExpressionsStart } from '../../../../../src/plugins/expressions/public'; -import { DataPublicPluginSetup } from '../../../../../src/plugins/data/public'; -import { UiActionsStart } from '../../../../../src/plugins/ui_actions/public'; -import { EmbeddableStart } from '../../../../../src/plugins/embeddable/public'; -import { UsageCollectionSetup } from '../../../../../src/plugins/usage_collection/public'; -import { Start as InspectorStart } from '../../../../../src/plugins/inspector/public'; +import { ExpressionsSetup, ExpressionsStart } from '../../../../src/plugins/expressions/public'; +import { DataPublicPluginSetup } from '../../../../src/plugins/data/public'; +import { UiActionsStart } from '../../../../src/plugins/ui_actions/public'; +import { EmbeddableStart } from '../../../../src/plugins/embeddable/public'; +import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/public'; +import { Start as InspectorStart } from '../../../../src/plugins/inspector/public'; // @ts-ignore untyped local import { argTypeSpecs } from './expression_types/arg_types'; import { transitions } from './transitions'; -import { legacyRegistries } from './legacy_plugin_support'; import { getPluginApi, CanvasApi } from './plugin_api'; import { initFunctions } from './functions'; import { CanvasSrcPlugin } from '../canvas_plugin_src/plugin'; @@ -95,11 +94,6 @@ export class CanvasPlugin plugins.home.featureCatalogue.register(featureCatalogueEntry); - // Register Legacy plugin stuff - canvasApi.addFunctions(legacyRegistries.browserFunctions.getOriginalFns()); - canvasApi.addElements(legacyRegistries.elements.getOriginalFns()); - canvasApi.addTypes(legacyRegistries.types.getOriginalFns()); - // Register core canvas stuff canvasApi.addFunctions( initFunctions({ diff --git a/x-pack/legacy/plugins/canvas/public/plugin_api.ts b/x-pack/plugins/canvas/public/plugin_api.ts similarity index 97% rename from x-pack/legacy/plugins/canvas/public/plugin_api.ts rename to x-pack/plugins/canvas/public/plugin_api.ts index a7346c0b4376e4..738b319d29c0b4 100644 --- a/x-pack/legacy/plugins/canvas/public/plugin_api.ts +++ b/x-pack/plugins/canvas/public/plugin_api.ts @@ -9,7 +9,7 @@ import { RendererFactory, } from '../types'; import { ElementFactory } from '../types'; -import { ExpressionsSetup } from '../../../../../src/plugins/expressions/public'; +import { ExpressionsSetup } from '../../../../src/plugins/expressions/public'; type AddToRegistry = (add: T[]) => void; diff --git a/x-pack/legacy/plugins/canvas/public/registries.ts b/x-pack/plugins/canvas/public/registries.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/registries.ts rename to x-pack/plugins/canvas/public/registries.ts diff --git a/x-pack/legacy/plugins/canvas/public/services/index.ts b/x-pack/plugins/canvas/public/services/index.ts similarity index 96% rename from x-pack/legacy/plugins/canvas/public/services/index.ts rename to x-pack/plugins/canvas/public/services/index.ts index 17d836f1441c96..abc46beaa3e64e 100644 --- a/x-pack/legacy/plugins/canvas/public/services/index.ts +++ b/x-pack/plugins/canvas/public/services/index.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { CoreSetup, CoreStart } from '../../../../../../src/core/public'; +import { CoreSetup, CoreStart } from '../../../../../src/core/public'; import { CanvasSetupDeps, CanvasStartDeps } from '../plugin'; import { notifyServiceFactory } from './notify'; import { platformServiceFactory } from './platform'; diff --git a/x-pack/legacy/plugins/canvas/public/services/notify.ts b/x-pack/plugins/canvas/public/services/notify.ts similarity index 91% rename from x-pack/legacy/plugins/canvas/public/services/notify.ts rename to x-pack/plugins/canvas/public/services/notify.ts index 3e18e2178a8181..5454a0f87c3f06 100644 --- a/x-pack/legacy/plugins/canvas/public/services/notify.ts +++ b/x-pack/plugins/canvas/public/services/notify.ts @@ -6,8 +6,8 @@ import { get } from 'lodash'; import { CanvasServiceFactory } from '.'; -import { formatMsg } from '../../../../../../src/plugins/kibana_legacy/public'; -import { ToastInputFields } from '../../../../../../src/core/public'; +import { formatMsg } from '../../../../../src/plugins/kibana_legacy/public'; +import { ToastInputFields } from '../../../../../src/core/public'; const getToast = (err: Error | string, opts: ToastInputFields = {}) => { const errData = (get(err, 'response') || err) as Error | string; diff --git a/x-pack/legacy/plugins/canvas/public/services/platform.ts b/x-pack/plugins/canvas/public/services/platform.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/services/platform.ts rename to x-pack/plugins/canvas/public/services/platform.ts diff --git a/x-pack/legacy/plugins/canvas/public/state/actions/__tests__/elements.get_sibling_context.js b/x-pack/plugins/canvas/public/state/actions/__tests__/elements.get_sibling_context.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/actions/__tests__/elements.get_sibling_context.js rename to x-pack/plugins/canvas/public/state/actions/__tests__/elements.get_sibling_context.js diff --git a/x-pack/legacy/plugins/canvas/public/state/actions/app.js b/x-pack/plugins/canvas/public/state/actions/app.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/actions/app.js rename to x-pack/plugins/canvas/public/state/actions/app.js diff --git a/x-pack/legacy/plugins/canvas/public/state/actions/assets.js b/x-pack/plugins/canvas/public/state/actions/assets.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/actions/assets.js rename to x-pack/plugins/canvas/public/state/actions/assets.js diff --git a/x-pack/legacy/plugins/canvas/public/state/actions/elements.js b/x-pack/plugins/canvas/public/state/actions/elements.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/actions/elements.js rename to x-pack/plugins/canvas/public/state/actions/elements.js diff --git a/x-pack/legacy/plugins/canvas/public/state/actions/embeddable.ts b/x-pack/plugins/canvas/public/state/actions/embeddable.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/actions/embeddable.ts rename to x-pack/plugins/canvas/public/state/actions/embeddable.ts diff --git a/x-pack/legacy/plugins/canvas/public/state/actions/history.js b/x-pack/plugins/canvas/public/state/actions/history.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/actions/history.js rename to x-pack/plugins/canvas/public/state/actions/history.js diff --git a/x-pack/legacy/plugins/canvas/public/state/actions/pages.js b/x-pack/plugins/canvas/public/state/actions/pages.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/actions/pages.js rename to x-pack/plugins/canvas/public/state/actions/pages.js diff --git a/x-pack/legacy/plugins/canvas/public/state/actions/resolved_args.ts b/x-pack/plugins/canvas/public/state/actions/resolved_args.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/actions/resolved_args.ts rename to x-pack/plugins/canvas/public/state/actions/resolved_args.ts diff --git a/x-pack/legacy/plugins/canvas/public/state/actions/transient.js b/x-pack/plugins/canvas/public/state/actions/transient.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/actions/transient.js rename to x-pack/plugins/canvas/public/state/actions/transient.js diff --git a/x-pack/legacy/plugins/canvas/public/state/actions/workpad.js b/x-pack/plugins/canvas/public/state/actions/workpad.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/actions/workpad.js rename to x-pack/plugins/canvas/public/state/actions/workpad.js diff --git a/x-pack/legacy/plugins/canvas/public/state/defaults.js b/x-pack/plugins/canvas/public/state/defaults.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/defaults.js rename to x-pack/plugins/canvas/public/state/defaults.js diff --git a/x-pack/legacy/plugins/canvas/public/state/initial_state.js b/x-pack/plugins/canvas/public/state/initial_state.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/initial_state.js rename to x-pack/plugins/canvas/public/state/initial_state.js diff --git a/x-pack/legacy/plugins/canvas/public/state/middleware/__tests__/in_flight.test.ts b/x-pack/plugins/canvas/public/state/middleware/__tests__/in_flight.test.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/middleware/__tests__/in_flight.test.ts rename to x-pack/plugins/canvas/public/state/middleware/__tests__/in_flight.test.ts diff --git a/x-pack/legacy/plugins/canvas/public/state/middleware/__tests__/workpad_autoplay.test.ts b/x-pack/plugins/canvas/public/state/middleware/__tests__/workpad_autoplay.test.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/middleware/__tests__/workpad_autoplay.test.ts rename to x-pack/plugins/canvas/public/state/middleware/__tests__/workpad_autoplay.test.ts diff --git a/x-pack/legacy/plugins/canvas/public/state/middleware/__tests__/workpad_refresh.test.ts b/x-pack/plugins/canvas/public/state/middleware/__tests__/workpad_refresh.test.ts similarity index 99% rename from x-pack/legacy/plugins/canvas/public/state/middleware/__tests__/workpad_refresh.test.ts rename to x-pack/plugins/canvas/public/state/middleware/__tests__/workpad_refresh.test.ts index 2123c9606f1f0e..f90f570bc6ebf4 100644 --- a/x-pack/legacy/plugins/canvas/public/state/middleware/__tests__/workpad_refresh.test.ts +++ b/x-pack/plugins/canvas/public/state/middleware/__tests__/workpad_refresh.test.ts @@ -4,7 +4,6 @@ * you may not use this file except in compliance with the Elastic License. */ -jest.mock('../../../legacy'); jest.mock('ui/new_platform'); // actions/elements has some dependencies on ui/new_platform. jest.mock('../../../lib/app_state'); diff --git a/x-pack/legacy/plugins/canvas/public/state/middleware/app_ready.js b/x-pack/plugins/canvas/public/state/middleware/app_ready.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/middleware/app_ready.js rename to x-pack/plugins/canvas/public/state/middleware/app_ready.js diff --git a/x-pack/legacy/plugins/canvas/public/state/middleware/breadcrumbs.js b/x-pack/plugins/canvas/public/state/middleware/breadcrumbs.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/middleware/breadcrumbs.js rename to x-pack/plugins/canvas/public/state/middleware/breadcrumbs.js diff --git a/x-pack/legacy/plugins/canvas/public/state/middleware/element_stats.js b/x-pack/plugins/canvas/public/state/middleware/element_stats.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/middleware/element_stats.js rename to x-pack/plugins/canvas/public/state/middleware/element_stats.js diff --git a/x-pack/legacy/plugins/canvas/public/state/middleware/es_persist.js b/x-pack/plugins/canvas/public/state/middleware/es_persist.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/middleware/es_persist.js rename to x-pack/plugins/canvas/public/state/middleware/es_persist.js diff --git a/x-pack/legacy/plugins/canvas/public/state/middleware/fullscreen.js b/x-pack/plugins/canvas/public/state/middleware/fullscreen.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/middleware/fullscreen.js rename to x-pack/plugins/canvas/public/state/middleware/fullscreen.js diff --git a/x-pack/legacy/plugins/canvas/public/state/middleware/history.js b/x-pack/plugins/canvas/public/state/middleware/history.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/middleware/history.js rename to x-pack/plugins/canvas/public/state/middleware/history.js diff --git a/x-pack/legacy/plugins/canvas/public/state/middleware/in_flight.ts b/x-pack/plugins/canvas/public/state/middleware/in_flight.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/middleware/in_flight.ts rename to x-pack/plugins/canvas/public/state/middleware/in_flight.ts diff --git a/x-pack/legacy/plugins/canvas/public/state/middleware/index.js b/x-pack/plugins/canvas/public/state/middleware/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/middleware/index.js rename to x-pack/plugins/canvas/public/state/middleware/index.js diff --git a/x-pack/legacy/plugins/canvas/public/state/middleware/resolved_args.js b/x-pack/plugins/canvas/public/state/middleware/resolved_args.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/middleware/resolved_args.js rename to x-pack/plugins/canvas/public/state/middleware/resolved_args.js diff --git a/x-pack/legacy/plugins/canvas/public/state/middleware/workpad_autoplay.ts b/x-pack/plugins/canvas/public/state/middleware/workpad_autoplay.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/middleware/workpad_autoplay.ts rename to x-pack/plugins/canvas/public/state/middleware/workpad_autoplay.ts diff --git a/x-pack/legacy/plugins/canvas/public/state/middleware/workpad_refresh.ts b/x-pack/plugins/canvas/public/state/middleware/workpad_refresh.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/middleware/workpad_refresh.ts rename to x-pack/plugins/canvas/public/state/middleware/workpad_refresh.ts diff --git a/x-pack/legacy/plugins/canvas/public/state/middleware/workpad_update.js b/x-pack/plugins/canvas/public/state/middleware/workpad_update.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/middleware/workpad_update.js rename to x-pack/plugins/canvas/public/state/middleware/workpad_update.js diff --git a/x-pack/legacy/plugins/canvas/public/state/reducers/__tests__/elements.js b/x-pack/plugins/canvas/public/state/reducers/__tests__/elements.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/reducers/__tests__/elements.js rename to x-pack/plugins/canvas/public/state/reducers/__tests__/elements.js diff --git a/x-pack/legacy/plugins/canvas/public/state/reducers/__tests__/fixtures/action_creator.js b/x-pack/plugins/canvas/public/state/reducers/__tests__/fixtures/action_creator.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/reducers/__tests__/fixtures/action_creator.js rename to x-pack/plugins/canvas/public/state/reducers/__tests__/fixtures/action_creator.js diff --git a/x-pack/legacy/plugins/canvas/public/state/reducers/__tests__/resolved_args.js b/x-pack/plugins/canvas/public/state/reducers/__tests__/resolved_args.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/reducers/__tests__/resolved_args.js rename to x-pack/plugins/canvas/public/state/reducers/__tests__/resolved_args.js diff --git a/x-pack/legacy/plugins/canvas/public/state/reducers/app.js b/x-pack/plugins/canvas/public/state/reducers/app.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/reducers/app.js rename to x-pack/plugins/canvas/public/state/reducers/app.js diff --git a/x-pack/legacy/plugins/canvas/public/state/reducers/assets.js b/x-pack/plugins/canvas/public/state/reducers/assets.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/reducers/assets.js rename to x-pack/plugins/canvas/public/state/reducers/assets.js diff --git a/x-pack/legacy/plugins/canvas/public/state/reducers/elements.js b/x-pack/plugins/canvas/public/state/reducers/elements.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/reducers/elements.js rename to x-pack/plugins/canvas/public/state/reducers/elements.js diff --git a/x-pack/legacy/plugins/canvas/public/state/reducers/embeddable.ts b/x-pack/plugins/canvas/public/state/reducers/embeddable.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/reducers/embeddable.ts rename to x-pack/plugins/canvas/public/state/reducers/embeddable.ts diff --git a/x-pack/legacy/plugins/canvas/public/state/reducers/embeddables.test.ts b/x-pack/plugins/canvas/public/state/reducers/embeddables.test.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/reducers/embeddables.test.ts rename to x-pack/plugins/canvas/public/state/reducers/embeddables.test.ts diff --git a/x-pack/legacy/plugins/canvas/public/state/reducers/history.js b/x-pack/plugins/canvas/public/state/reducers/history.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/reducers/history.js rename to x-pack/plugins/canvas/public/state/reducers/history.js diff --git a/x-pack/legacy/plugins/canvas/public/state/reducers/index.js b/x-pack/plugins/canvas/public/state/reducers/index.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/reducers/index.js rename to x-pack/plugins/canvas/public/state/reducers/index.js diff --git a/x-pack/legacy/plugins/canvas/public/state/reducers/pages.js b/x-pack/plugins/canvas/public/state/reducers/pages.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/reducers/pages.js rename to x-pack/plugins/canvas/public/state/reducers/pages.js diff --git a/x-pack/legacy/plugins/canvas/public/state/reducers/resolved_args.js b/x-pack/plugins/canvas/public/state/reducers/resolved_args.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/reducers/resolved_args.js rename to x-pack/plugins/canvas/public/state/reducers/resolved_args.js diff --git a/x-pack/legacy/plugins/canvas/public/state/reducers/transient.js b/x-pack/plugins/canvas/public/state/reducers/transient.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/reducers/transient.js rename to x-pack/plugins/canvas/public/state/reducers/transient.js diff --git a/x-pack/legacy/plugins/canvas/public/state/reducers/workpad.js b/x-pack/plugins/canvas/public/state/reducers/workpad.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/reducers/workpad.js rename to x-pack/plugins/canvas/public/state/reducers/workpad.js diff --git a/x-pack/legacy/plugins/canvas/public/state/selectors/__tests__/resolved_args.js b/x-pack/plugins/canvas/public/state/selectors/__tests__/resolved_args.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/selectors/__tests__/resolved_args.js rename to x-pack/plugins/canvas/public/state/selectors/__tests__/resolved_args.js diff --git a/x-pack/legacy/plugins/canvas/public/state/selectors/__tests__/workpad.js b/x-pack/plugins/canvas/public/state/selectors/__tests__/workpad.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/selectors/__tests__/workpad.js rename to x-pack/plugins/canvas/public/state/selectors/__tests__/workpad.js diff --git a/x-pack/legacy/plugins/canvas/public/state/selectors/app.ts b/x-pack/plugins/canvas/public/state/selectors/app.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/selectors/app.ts rename to x-pack/plugins/canvas/public/state/selectors/app.ts diff --git a/x-pack/legacy/plugins/canvas/public/state/selectors/assets.ts b/x-pack/plugins/canvas/public/state/selectors/assets.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/selectors/assets.ts rename to x-pack/plugins/canvas/public/state/selectors/assets.ts diff --git a/x-pack/legacy/plugins/canvas/public/state/selectors/resolved_args.ts b/x-pack/plugins/canvas/public/state/selectors/resolved_args.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/selectors/resolved_args.ts rename to x-pack/plugins/canvas/public/state/selectors/resolved_args.ts diff --git a/x-pack/legacy/plugins/canvas/public/state/selectors/workpad.ts b/x-pack/plugins/canvas/public/state/selectors/workpad.ts similarity index 99% rename from x-pack/legacy/plugins/canvas/public/state/selectors/workpad.ts rename to x-pack/plugins/canvas/public/state/selectors/workpad.ts index 80a7c34e8bef59..ae5c0fee520620 100644 --- a/x-pack/legacy/plugins/canvas/public/state/selectors/workpad.ts +++ b/x-pack/plugins/canvas/public/state/selectors/workpad.ts @@ -16,12 +16,10 @@ import { CanvasGroup, PositionedElement, CanvasWorkpadBoundingBox, -} from '../../../types'; -import { ExpressionAstArgument, ExpressionAstFunction, ExpressionAstExpression, -} from '../../../../../../../src/plugins/expressions/common'; +} from '../../../types'; type Modify = Pick> & R; type WorkpadInfo = Modify; diff --git a/x-pack/legacy/plugins/canvas/public/state/store.js b/x-pack/plugins/canvas/public/state/store.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/state/store.js rename to x-pack/plugins/canvas/public/state/store.js diff --git a/x-pack/legacy/plugins/canvas/public/store.ts b/x-pack/plugins/canvas/public/store.ts similarity index 94% rename from x-pack/legacy/plugins/canvas/public/store.ts rename to x-pack/plugins/canvas/public/store.ts index 1460932101725b..8560e612de4dbf 100644 --- a/x-pack/legacy/plugins/canvas/public/store.ts +++ b/x-pack/plugins/canvas/public/store.ts @@ -9,7 +9,7 @@ import { createStore as createReduxStore, destroyStore as destroy } from './stat // @ts-ignore Untyped local import { getInitialState } from './state/initial_state'; -import { CoreSetup } from '../../../../../src/core/public'; +import { CoreSetup } from '../../../../src/core/public'; import { CanvasSetupDeps } from './plugin'; export async function createStore(core: CoreSetup, plugins: CanvasSetupDeps) { diff --git a/x-pack/legacy/plugins/canvas/public/style/hackery.scss b/x-pack/plugins/canvas/public/style/hackery.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/style/hackery.scss rename to x-pack/plugins/canvas/public/style/hackery.scss diff --git a/x-pack/legacy/plugins/canvas/public/style/index.scss b/x-pack/plugins/canvas/public/style/index.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/style/index.scss rename to x-pack/plugins/canvas/public/style/index.scss diff --git a/x-pack/legacy/plugins/canvas/public/style/main.scss b/x-pack/plugins/canvas/public/style/main.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/style/main.scss rename to x-pack/plugins/canvas/public/style/main.scss diff --git a/x-pack/legacy/plugins/canvas/public/transitions/fade/fade.scss b/x-pack/plugins/canvas/public/transitions/fade/fade.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/transitions/fade/fade.scss rename to x-pack/plugins/canvas/public/transitions/fade/fade.scss diff --git a/x-pack/legacy/plugins/canvas/public/transitions/fade/index.ts b/x-pack/plugins/canvas/public/transitions/fade/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/transitions/fade/index.ts rename to x-pack/plugins/canvas/public/transitions/fade/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/transitions/index.ts b/x-pack/plugins/canvas/public/transitions/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/transitions/index.ts rename to x-pack/plugins/canvas/public/transitions/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/transitions/rotate/index.ts b/x-pack/plugins/canvas/public/transitions/rotate/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/transitions/rotate/index.ts rename to x-pack/plugins/canvas/public/transitions/rotate/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/transitions/rotate/rotate.scss b/x-pack/plugins/canvas/public/transitions/rotate/rotate.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/transitions/rotate/rotate.scss rename to x-pack/plugins/canvas/public/transitions/rotate/rotate.scss diff --git a/x-pack/legacy/plugins/canvas/public/transitions/slide/index.ts b/x-pack/plugins/canvas/public/transitions/slide/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/transitions/slide/index.ts rename to x-pack/plugins/canvas/public/transitions/slide/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/transitions/slide/slide.scss b/x-pack/plugins/canvas/public/transitions/slide/slide.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/transitions/slide/slide.scss rename to x-pack/plugins/canvas/public/transitions/slide/slide.scss diff --git a/x-pack/legacy/plugins/canvas/public/transitions/transition.js b/x-pack/plugins/canvas/public/transitions/transition.js similarity index 100% rename from x-pack/legacy/plugins/canvas/public/transitions/transition.js rename to x-pack/plugins/canvas/public/transitions/transition.js diff --git a/x-pack/legacy/plugins/canvas/public/transitions/zoom/index.ts b/x-pack/plugins/canvas/public/transitions/zoom/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/public/transitions/zoom/index.ts rename to x-pack/plugins/canvas/public/transitions/zoom/index.ts diff --git a/x-pack/legacy/plugins/canvas/public/transitions/zoom/zoom.scss b/x-pack/plugins/canvas/public/transitions/zoom/zoom.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/public/transitions/zoom/zoom.scss rename to x-pack/plugins/canvas/public/transitions/zoom/zoom.scss diff --git a/x-pack/legacy/plugins/canvas/scripts/_helpers.js b/x-pack/plugins/canvas/scripts/_helpers.js similarity index 78% rename from x-pack/legacy/plugins/canvas/scripts/_helpers.js rename to x-pack/plugins/canvas/scripts/_helpers.js index dea58e90cc60be..0f4b07d9883080 100644 --- a/x-pack/legacy/plugins/canvas/scripts/_helpers.js +++ b/x-pack/plugins/canvas/scripts/_helpers.js @@ -7,19 +7,19 @@ const { resolve } = require('path'); exports.runGulpTask = function(name) { - process.chdir(resolve(__dirname, '../../../..')); + process.chdir(resolve(__dirname, '../../..')); process.argv.splice(1, 1, require.resolve('gulp/bin/gulp'), name); require('gulp/bin/gulp'); }; exports.runKibanaScript = function(name, args = []) { - process.chdir(resolve(__dirname, '../../../../..')); + process.chdir(resolve(__dirname, '../../../..')); process.argv.splice(2, 0, ...args); - require('../../../../../scripts/' + name); // eslint-disable-line import/no-dynamic-require + require('../../../../scripts/' + name); // eslint-disable-line import/no-dynamic-require }; exports.runXPackScript = function(name, args = []) { - process.chdir(resolve(__dirname, '../../../..')); + process.chdir(resolve(__dirname, '../../..')); process.argv.splice(2, 0, ...args); - require('../../../../scripts/' + name); // eslint-disable-line import/no-dynamic-require + require('../../../scripts/' + name); // eslint-disable-line import/no-dynamic-require }; diff --git a/x-pack/legacy/plugins/canvas/scripts/jest.js b/x-pack/plugins/canvas/scripts/jest.js similarity index 94% rename from x-pack/legacy/plugins/canvas/scripts/jest.js rename to x-pack/plugins/canvas/scripts/jest.js index 133f775c7192f2..b30cb02d2c99ae 100644 --- a/x-pack/legacy/plugins/canvas/scripts/jest.js +++ b/x-pack/plugins/canvas/scripts/jest.js @@ -19,9 +19,9 @@ run( if (path) { log.info(`Limiting tests to ${path}...`); - path = 'legacy/plugins/canvas/' + path; + path = 'plugins/canvas/' + path; } else { - path = 'legacy/plugins/canvas'; + path = 'plugins/canvas'; } if (coverage) { @@ -49,7 +49,7 @@ run( '--collectCoverageFrom', // Include TS/X files `${path}/**/*.ts*`, '--coverageDirectory', // Output to canvas/coverage - 'legacy/plugins/canvas/coverage', + 'plugins/canvas/coverage', ]; } // Mitigation for https://github.com/facebook/jest/issues/7267 @@ -60,7 +60,7 @@ run( if (all) { log.info('Running all available tests. This will take a while...'); } else if (storybook) { - path = 'legacy/plugins/canvas/.storybook'; + path = 'plugins/canvas/.storybook'; log.info('Running Storybook Snapshot tests...'); } else { log.info('Running tests. This does not include Storybook Snapshots...'); diff --git a/x-pack/legacy/plugins/canvas/scripts/kbn.js b/x-pack/plugins/canvas/scripts/kbn.js similarity index 100% rename from x-pack/legacy/plugins/canvas/scripts/kbn.js rename to x-pack/plugins/canvas/scripts/kbn.js diff --git a/x-pack/legacy/plugins/canvas/scripts/lint.js b/x-pack/plugins/canvas/scripts/lint.js similarity index 69% rename from x-pack/legacy/plugins/canvas/scripts/lint.js rename to x-pack/plugins/canvas/scripts/lint.js index effc654712e6cb..6d40c100ddfb53 100644 --- a/x-pack/legacy/plugins/canvas/scripts/lint.js +++ b/x-pack/plugins/canvas/scripts/lint.js @@ -4,6 +4,4 @@ * you may not use this file except in compliance with the Elastic License. */ -require('./_helpers').runKibanaScript('eslint', [ - 'x-pack/legacy/plugins/canvas/**/*.{js,jsx,ts,tsx}', -]); +require('./_helpers').runKibanaScript('eslint', ['x-pack/plugins/canvas/**/*.{js,jsx,ts,tsx}']); diff --git a/x-pack/legacy/plugins/canvas/scripts/shareable_runtime.js b/x-pack/plugins/canvas/scripts/shareable_runtime.js similarity index 100% rename from x-pack/legacy/plugins/canvas/scripts/shareable_runtime.js rename to x-pack/plugins/canvas/scripts/shareable_runtime.js diff --git a/x-pack/legacy/plugins/canvas/scripts/storybook.js b/x-pack/plugins/canvas/scripts/storybook.js similarity index 92% rename from x-pack/legacy/plugins/canvas/scripts/storybook.js rename to x-pack/plugins/canvas/scripts/storybook.js index a6369d1e72facc..c9e6c6c65436c2 100644 --- a/x-pack/legacy/plugins/canvas/scripts/storybook.js +++ b/x-pack/plugins/canvas/scripts/storybook.js @@ -37,7 +37,7 @@ run( // Ensure SASS dependencies have been built before doing anything. execa.sync(process.execPath, ['scripts/build_sass'], { - cwd: path.resolve(__dirname, '../../../../..'), + cwd: path.resolve(__dirname, '../../../..'), ...options, }); @@ -51,14 +51,14 @@ run( [ 'webpack', '--config', - 'x-pack/legacy/plugins/canvas/.storybook/webpack.dll.config.js', + 'x-pack/plugins/canvas/.storybook/webpack.dll.config.js', '--progress', '--hide-modules', '--display-entrypoints', 'false', ], { - cwd: path.resolve(__dirname, '../../../../..'), + cwd: path.resolve(__dirname, '../../../..'), stdio: ['ignore', 'inherit', 'inherit'], buffer: false, } @@ -96,7 +96,7 @@ run( // Watch the SASS sheets for changes execa(process.execPath, ['scripts/build_sass', '--watch'], { - cwd: path.resolve(__dirname, '../../../../..'), + cwd: path.resolve(__dirname, '../../../..'), ...options, }); diff --git a/x-pack/legacy/plugins/canvas/scripts/storybook_new.js b/x-pack/plugins/canvas/scripts/storybook_new.js similarity index 100% rename from x-pack/legacy/plugins/canvas/scripts/storybook_new.js rename to x-pack/plugins/canvas/scripts/storybook_new.js diff --git a/x-pack/legacy/plugins/canvas/scripts/test.js b/x-pack/plugins/canvas/scripts/test.js similarity index 100% rename from x-pack/legacy/plugins/canvas/scripts/test.js rename to x-pack/plugins/canvas/scripts/test.js diff --git a/x-pack/legacy/plugins/canvas/scripts/test_browser.js b/x-pack/plugins/canvas/scripts/test_browser.js similarity index 100% rename from x-pack/legacy/plugins/canvas/scripts/test_browser.js rename to x-pack/plugins/canvas/scripts/test_browser.js diff --git a/x-pack/legacy/plugins/canvas/scripts/test_common.js b/x-pack/plugins/canvas/scripts/test_common.js similarity index 100% rename from x-pack/legacy/plugins/canvas/scripts/test_common.js rename to x-pack/plugins/canvas/scripts/test_common.js diff --git a/x-pack/legacy/plugins/canvas/scripts/test_dev.js b/x-pack/plugins/canvas/scripts/test_dev.js similarity index 100% rename from x-pack/legacy/plugins/canvas/scripts/test_dev.js rename to x-pack/plugins/canvas/scripts/test_dev.js diff --git a/x-pack/legacy/plugins/canvas/scripts/test_plugins.js b/x-pack/plugins/canvas/scripts/test_plugins.js similarity index 100% rename from x-pack/legacy/plugins/canvas/scripts/test_plugins.js rename to x-pack/plugins/canvas/scripts/test_plugins.js diff --git a/x-pack/legacy/plugins/canvas/scripts/test_server.js b/x-pack/plugins/canvas/scripts/test_server.js similarity index 100% rename from x-pack/legacy/plugins/canvas/scripts/test_server.js rename to x-pack/plugins/canvas/scripts/test_server.js diff --git a/x-pack/plugins/canvas/server/collectors/collector.ts b/x-pack/plugins/canvas/server/collectors/collector.ts index 8e9e5ede2e7f20..88e5e43dc2af1c 100644 --- a/x-pack/plugins/canvas/server/collectors/collector.ts +++ b/x-pack/plugins/canvas/server/collectors/collector.ts @@ -6,7 +6,7 @@ import { CallCluster } from 'src/legacy/core_plugins/elasticsearch'; import { UsageCollectionSetup } from 'src/plugins/usage_collection/server'; -import { CANVAS_USAGE_TYPE } from '../../../../legacy/plugins/canvas/common/lib/constants'; +import { CANVAS_USAGE_TYPE } from '../../common/lib/constants'; import { TelemetryCollector } from '../../types'; import { workpadCollector } from './workpad_collector'; diff --git a/x-pack/plugins/canvas/server/collectors/workpad_collector.test.ts b/x-pack/plugins/canvas/server/collectors/workpad_collector.test.ts index 70bc074ff3df8b..420b785771bfed 100644 --- a/x-pack/plugins/canvas/server/collectors/workpad_collector.test.ts +++ b/x-pack/plugins/canvas/server/collectors/workpad_collector.test.ts @@ -6,7 +6,7 @@ import clonedeep from 'lodash.clonedeep'; import { summarizeWorkpads } from './workpad_collector'; -import { workpads } from '../../../../legacy/plugins/canvas/__tests__/fixtures/workpads'; +import { workpads } from '../../__tests__/fixtures/workpads'; describe('usage collector handle es response data', () => { it('should summarize workpads, pages, and elements', () => { diff --git a/x-pack/plugins/canvas/server/collectors/workpad_collector.ts b/x-pack/plugins/canvas/server/collectors/workpad_collector.ts index 9c088958c748f7..b14a35ded4781c 100644 --- a/x-pack/plugins/canvas/server/collectors/workpad_collector.ts +++ b/x-pack/plugins/canvas/server/collectors/workpad_collector.ts @@ -6,7 +6,7 @@ import { SearchParams } from 'elasticsearch'; import { sum as arraySum, min as arrayMin, max as arrayMax, get } from 'lodash'; -import { CANVAS_TYPE } from '../../../../legacy/plugins/canvas/common/lib/constants'; +import { CANVAS_TYPE } from '../../common/lib/constants'; import { collectFns } from './collector_helpers'; import { TelemetryCollector, CanvasWorkpad } from '../../types'; import { parseExpression } from '../../../../../src/plugins/expressions/common'; diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/create.test.ts b/x-pack/plugins/canvas/server/routes/custom_elements/create.test.ts index d3a69c01732fa6..c260d6ca8ac16b 100644 --- a/x-pack/plugins/canvas/server/routes/custom_elements/create.test.ts +++ b/x-pack/plugins/canvas/server/routes/custom_elements/create.test.ts @@ -11,7 +11,7 @@ import { httpServerMock, loggingServiceMock, } from 'src/core/server/mocks'; -import { CUSTOM_ELEMENT_TYPE } from '../../../../../legacy/plugins/canvas/common/lib/constants'; +import { CUSTOM_ELEMENT_TYPE } from '../../../common/lib/constants'; import { initializeCreateCustomElementRoute } from './create'; import { IRouter, diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/create.ts b/x-pack/plugins/canvas/server/routes/custom_elements/create.ts index b8828291246966..1c3b9221c52cd0 100644 --- a/x-pack/plugins/canvas/server/routes/custom_elements/create.ts +++ b/x-pack/plugins/canvas/server/routes/custom_elements/create.ts @@ -5,11 +5,8 @@ */ import { RouteInitializerDeps } from '../'; -import { - CUSTOM_ELEMENT_TYPE, - API_ROUTE_CUSTOM_ELEMENT, -} from '../../../../../legacy/plugins/canvas/common/lib/constants'; -import { getId } from '../../../../../legacy/plugins/canvas/public/lib/get_id'; +import { CUSTOM_ELEMENT_TYPE, API_ROUTE_CUSTOM_ELEMENT } from '../../../common/lib/constants'; +import { getId } from '../../../common/lib/get_id'; import { CustomElementSchema } from './custom_element_schema'; import { CustomElementAttributes } from './custom_element_attributes'; import { okResponse } from '../ok_response'; diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/custom_element_attributes.ts b/x-pack/plugins/canvas/server/routes/custom_elements/custom_element_attributes.ts index e76526eeeb27b9..772ebb1d79a5e9 100644 --- a/x-pack/plugins/canvas/server/routes/custom_elements/custom_element_attributes.ts +++ b/x-pack/plugins/canvas/server/routes/custom_elements/custom_element_attributes.ts @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { CustomElement } from '../../../../../legacy/plugins/canvas/types'; +import { CustomElement } from '../../../types'; // Exclude ID attribute for the type used for SavedObjectClient export type CustomElementAttributes = Pick> & { diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/delete.test.ts b/x-pack/plugins/canvas/server/routes/custom_elements/delete.test.ts index c108f2316db272..e70fae5d18eaf2 100644 --- a/x-pack/plugins/canvas/server/routes/custom_elements/delete.test.ts +++ b/x-pack/plugins/canvas/server/routes/custom_elements/delete.test.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { CUSTOM_ELEMENT_TYPE } from '../../../../../legacy/plugins/canvas/common/lib/constants'; +import { CUSTOM_ELEMENT_TYPE } from '../../../common/lib/constants'; import { initializeDeleteCustomElementRoute } from './delete'; import { IRouter, diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/delete.ts b/x-pack/plugins/canvas/server/routes/custom_elements/delete.ts index 5867539b95b532..b9d52ccfbac80c 100644 --- a/x-pack/plugins/canvas/server/routes/custom_elements/delete.ts +++ b/x-pack/plugins/canvas/server/routes/custom_elements/delete.ts @@ -6,10 +6,7 @@ import { schema } from '@kbn/config-schema'; import { RouteInitializerDeps } from '../'; -import { - CUSTOM_ELEMENT_TYPE, - API_ROUTE_CUSTOM_ELEMENT, -} from '../../../../../legacy/plugins/canvas/common/lib/constants'; +import { CUSTOM_ELEMENT_TYPE, API_ROUTE_CUSTOM_ELEMENT } from '../../../common/lib/constants'; import { okResponse } from '../ok_response'; import { catchErrorHandler } from '../catch_error_handler'; diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/find.ts b/x-pack/plugins/canvas/server/routes/custom_elements/find.ts index 5041ceb3e4711d..964618adf165d2 100644 --- a/x-pack/plugins/canvas/server/routes/custom_elements/find.ts +++ b/x-pack/plugins/canvas/server/routes/custom_elements/find.ts @@ -7,10 +7,7 @@ import { schema } from '@kbn/config-schema'; import { SavedObjectAttributes } from 'src/core/server'; import { RouteInitializerDeps } from '../'; -import { - CUSTOM_ELEMENT_TYPE, - API_ROUTE_CUSTOM_ELEMENT, -} from '../../../../../legacy/plugins/canvas/common/lib/constants'; +import { CUSTOM_ELEMENT_TYPE, API_ROUTE_CUSTOM_ELEMENT } from '../../../common/lib/constants'; export function initializeFindCustomElementsRoute(deps: RouteInitializerDeps) { const { router } = deps; diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/get.test.ts b/x-pack/plugins/canvas/server/routes/custom_elements/get.test.ts index 5e8d536f779a9a..03ae6048801bf2 100644 --- a/x-pack/plugins/canvas/server/routes/custom_elements/get.test.ts +++ b/x-pack/plugins/canvas/server/routes/custom_elements/get.test.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { CUSTOM_ELEMENT_TYPE } from '../../../../../legacy/plugins/canvas/common/lib/constants'; +import { CUSTOM_ELEMENT_TYPE } from '../../../common/lib/constants'; import { initializeGetCustomElementRoute } from './get'; import { IRouter, diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/get.ts b/x-pack/plugins/canvas/server/routes/custom_elements/get.ts index f092b001e141f7..bb8e320a7c1244 100644 --- a/x-pack/plugins/canvas/server/routes/custom_elements/get.ts +++ b/x-pack/plugins/canvas/server/routes/custom_elements/get.ts @@ -6,10 +6,7 @@ import { schema } from '@kbn/config-schema'; import { RouteInitializerDeps } from '../'; -import { - CUSTOM_ELEMENT_TYPE, - API_ROUTE_CUSTOM_ELEMENT, -} from '../../../../../legacy/plugins/canvas/common/lib/constants'; +import { CUSTOM_ELEMENT_TYPE, API_ROUTE_CUSTOM_ELEMENT } from '../../../common/lib/constants'; import { CustomElementAttributes } from './custom_element_attributes'; import { catchErrorHandler } from '../catch_error_handler'; diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/update.test.ts b/x-pack/plugins/canvas/server/routes/custom_elements/update.test.ts index 285a998030cf63..e67e42c26cd2b6 100644 --- a/x-pack/plugins/canvas/server/routes/custom_elements/update.test.ts +++ b/x-pack/plugins/canvas/server/routes/custom_elements/update.test.ts @@ -5,8 +5,8 @@ */ import sinon from 'sinon'; -import { CustomElement } from '../../../../../legacy/plugins/canvas/types'; -import { CUSTOM_ELEMENT_TYPE } from '../../../../../legacy/plugins/canvas/common/lib/constants'; +import { CustomElement } from '../../../types'; +import { CUSTOM_ELEMENT_TYPE } from '../../../common/lib/constants'; import { initializeUpdateCustomElementRoute } from './update'; import { IRouter, diff --git a/x-pack/plugins/canvas/server/routes/custom_elements/update.ts b/x-pack/plugins/canvas/server/routes/custom_elements/update.ts index 51c363249dd793..a65d23d8c14060 100644 --- a/x-pack/plugins/canvas/server/routes/custom_elements/update.ts +++ b/x-pack/plugins/canvas/server/routes/custom_elements/update.ts @@ -7,10 +7,7 @@ import { schema } from '@kbn/config-schema'; import { omit } from 'lodash'; import { RouteInitializerDeps } from '../'; -import { - CUSTOM_ELEMENT_TYPE, - API_ROUTE_CUSTOM_ELEMENT, -} from '../../../../../legacy/plugins/canvas/common/lib/constants'; +import { CUSTOM_ELEMENT_TYPE, API_ROUTE_CUSTOM_ELEMENT } from '../../../common/lib/constants'; import { CustomElementUpdateSchema } from './custom_element_schema'; import { CustomElementAttributes } from './custom_element_attributes'; import { okResponse } from '../ok_response'; diff --git a/x-pack/plugins/canvas/server/routes/es_fields/es_fields.ts b/x-pack/plugins/canvas/server/routes/es_fields/es_fields.ts index 5282a246de6b6a..5ebf20095bf3e5 100644 --- a/x-pack/plugins/canvas/server/routes/es_fields/es_fields.ts +++ b/x-pack/plugins/canvas/server/routes/es_fields/es_fields.ts @@ -6,7 +6,7 @@ import { mapValues, keys } from 'lodash'; import { schema } from '@kbn/config-schema'; -import { API_ROUTE } from '../../../../../legacy/plugins/canvas/common/lib'; +import { API_ROUTE } from '../../../common/lib'; import { catchErrorHandler } from '../catch_error_handler'; // @ts-ignore unconverted lib import { normalizeType } from '../../lib/normalize_type'; diff --git a/x-pack/plugins/canvas/server/routes/shareables/download.ts b/x-pack/plugins/canvas/server/routes/shareables/download.ts index 08bec1e4881aeb..3f331c1635e16b 100644 --- a/x-pack/plugins/canvas/server/routes/shareables/download.ts +++ b/x-pack/plugins/canvas/server/routes/shareables/download.ts @@ -5,9 +5,9 @@ */ import { readFileSync } from 'fs'; -import { SHAREABLE_RUNTIME_FILE } from '../../../../../legacy/plugins/canvas/shareable_runtime/constants'; +import { SHAREABLE_RUNTIME_FILE } from '../../../shareable_runtime/constants'; import { RouteInitializerDeps } from '../'; -import { API_ROUTE_SHAREABLE_RUNTIME_DOWNLOAD } from '../../../../../legacy/plugins/canvas/common/lib/constants'; +import { API_ROUTE_SHAREABLE_RUNTIME_DOWNLOAD } from '../../../common/lib/constants'; export function initializeDownloadShareableWorkpadRoute(deps: RouteInitializerDeps) { const { router } = deps; diff --git a/x-pack/plugins/canvas/server/routes/shareables/zip.test.ts b/x-pack/plugins/canvas/server/routes/shareables/zip.test.ts index edb59694a74005..63776f897a04ca 100644 --- a/x-pack/plugins/canvas/server/routes/shareables/zip.test.ts +++ b/x-pack/plugins/canvas/server/routes/shareables/zip.test.ts @@ -15,12 +15,12 @@ import { } from 'src/core/server'; import { httpServiceMock, httpServerMock, loggingServiceMock } from 'src/core/server/mocks'; import { initializeZipShareableWorkpadRoute } from './zip'; -import { API_ROUTE_SHAREABLE_ZIP } from '../../../../../legacy/plugins/canvas/common/lib'; +import { API_ROUTE_SHAREABLE_ZIP } from '../../../common/lib'; import { SHAREABLE_RUNTIME_FILE, SHAREABLE_RUNTIME_SRC, SHAREABLE_RUNTIME_NAME, -} from '../../../../../legacy/plugins/canvas/shareable_runtime/constants'; +} from '../../../shareable_runtime/constants'; const mockRouteContext = {} as RequestHandlerContext; const mockWorkpad = {}; diff --git a/x-pack/plugins/canvas/server/routes/shareables/zip.ts b/x-pack/plugins/canvas/server/routes/shareables/zip.ts index e25b96cce96ff3..99f401cd4c142b 100644 --- a/x-pack/plugins/canvas/server/routes/shareables/zip.ts +++ b/x-pack/plugins/canvas/server/routes/shareables/zip.ts @@ -5,12 +5,12 @@ */ import archiver from 'archiver'; -import { API_ROUTE_SHAREABLE_ZIP } from '../../../../../legacy/plugins/canvas/common/lib'; +import { API_ROUTE_SHAREABLE_ZIP } from '../../../common/lib'; import { SHAREABLE_RUNTIME_FILE, SHAREABLE_RUNTIME_NAME, SHAREABLE_RUNTIME_SRC, -} from '../../../../../legacy/plugins/canvas/shareable_runtime/constants'; +} from '../../../shareable_runtime/constants'; import { RenderedWorkpadSchema } from './rendered_workpad_schema'; import { RouteInitializerDeps } from '..'; diff --git a/x-pack/plugins/canvas/server/routes/workpad/create.test.ts b/x-pack/plugins/canvas/server/routes/workpad/create.test.ts index dbad1a97dc4588..02b6376ece2eda 100644 --- a/x-pack/plugins/canvas/server/routes/workpad/create.test.ts +++ b/x-pack/plugins/canvas/server/routes/workpad/create.test.ts @@ -11,7 +11,7 @@ import { httpServerMock, loggingServiceMock, } from 'src/core/server/mocks'; -import { CANVAS_TYPE } from '../../../../../legacy/plugins/canvas/common/lib/constants'; +import { CANVAS_TYPE } from '../../../common/lib/constants'; import { initializeCreateWorkpadRoute } from './create'; import { IRouter, diff --git a/x-pack/plugins/canvas/server/routes/workpad/create.ts b/x-pack/plugins/canvas/server/routes/workpad/create.ts index 1e9a320c0eeefe..5a693c05b3112a 100644 --- a/x-pack/plugins/canvas/server/routes/workpad/create.ts +++ b/x-pack/plugins/canvas/server/routes/workpad/create.ts @@ -5,12 +5,9 @@ */ import { RouteInitializerDeps } from '../'; -import { - CANVAS_TYPE, - API_ROUTE_WORKPAD, -} from '../../../../../legacy/plugins/canvas/common/lib/constants'; -import { CanvasWorkpad } from '../../../../../legacy/plugins/canvas/types'; -import { getId } from '../../../../../legacy/plugins/canvas/public/lib/get_id'; +import { CANVAS_TYPE, API_ROUTE_WORKPAD } from '../../../common/lib/constants'; +import { CanvasWorkpad } from '../../../types'; +import { getId } from '../../../common/lib/get_id'; import { WorkpadAttributes } from './workpad_attributes'; import { WorkpadSchema } from './workpad_schema'; import { okResponse } from '../ok_response'; diff --git a/x-pack/plugins/canvas/server/routes/workpad/delete.test.ts b/x-pack/plugins/canvas/server/routes/workpad/delete.test.ts index e693840826b7ab..57df4e7cffda61 100644 --- a/x-pack/plugins/canvas/server/routes/workpad/delete.test.ts +++ b/x-pack/plugins/canvas/server/routes/workpad/delete.test.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { CANVAS_TYPE } from '../../../../../legacy/plugins/canvas/common/lib/constants'; +import { CANVAS_TYPE } from '../../../common/lib/constants'; import { initializeDeleteWorkpadRoute } from './delete'; import { IRouter, diff --git a/x-pack/plugins/canvas/server/routes/workpad/delete.ts b/x-pack/plugins/canvas/server/routes/workpad/delete.ts index 8de4ea0f9a27f3..52c95c2f42d302 100644 --- a/x-pack/plugins/canvas/server/routes/workpad/delete.ts +++ b/x-pack/plugins/canvas/server/routes/workpad/delete.ts @@ -6,10 +6,7 @@ import { schema } from '@kbn/config-schema'; import { RouteInitializerDeps } from '../'; -import { - CANVAS_TYPE, - API_ROUTE_WORKPAD, -} from '../../../../../legacy/plugins/canvas/common/lib/constants'; +import { CANVAS_TYPE, API_ROUTE_WORKPAD } from '../../../common/lib/constants'; import { okResponse } from '../ok_response'; import { catchErrorHandler } from '../catch_error_handler'; diff --git a/x-pack/plugins/canvas/server/routes/workpad/find.ts b/x-pack/plugins/canvas/server/routes/workpad/find.ts index a528a756116093..ec5c068a1fa24a 100644 --- a/x-pack/plugins/canvas/server/routes/workpad/find.ts +++ b/x-pack/plugins/canvas/server/routes/workpad/find.ts @@ -7,10 +7,7 @@ import { schema } from '@kbn/config-schema'; import { SavedObjectAttributes } from 'src/core/server'; import { RouteInitializerDeps } from '../'; -import { - CANVAS_TYPE, - API_ROUTE_WORKPAD, -} from '../../../../../legacy/plugins/canvas/common/lib/constants'; +import { CANVAS_TYPE, API_ROUTE_WORKPAD } from '../../../common/lib/constants'; export function initializeFindWorkpadsRoute(deps: RouteInitializerDeps) { const { router } = deps; diff --git a/x-pack/plugins/canvas/server/routes/workpad/get.test.ts b/x-pack/plugins/canvas/server/routes/workpad/get.test.ts index a31293f572c75f..6741f2b3fc9d67 100644 --- a/x-pack/plugins/canvas/server/routes/workpad/get.test.ts +++ b/x-pack/plugins/canvas/server/routes/workpad/get.test.ts @@ -4,7 +4,7 @@ * you may not use this file except in compliance with the Elastic License. */ -import { CANVAS_TYPE } from '../../../../../legacy/plugins/canvas/common/lib/constants'; +import { CANVAS_TYPE } from '../../../common/lib/constants'; import { initializeGetWorkpadRoute } from './get'; import { IRouter, @@ -18,8 +18,8 @@ import { httpServerMock, loggingServiceMock, } from 'src/core/server/mocks'; -import { workpadWithGroupAsElement } from '../../../../../legacy/plugins/canvas/__tests__/fixtures/workpads'; -import { CanvasWorkpad } from '../../../../../legacy/plugins/canvas/types'; +import { workpadWithGroupAsElement } from '../../../__tests__/fixtures/workpads'; +import { CanvasWorkpad } from '../../../types'; const mockRouteContext = ({ core: { diff --git a/x-pack/plugins/canvas/server/routes/workpad/get.ts b/x-pack/plugins/canvas/server/routes/workpad/get.ts index d7a5e77670f6e5..7dc1252063e902 100644 --- a/x-pack/plugins/canvas/server/routes/workpad/get.ts +++ b/x-pack/plugins/canvas/server/routes/workpad/get.ts @@ -6,10 +6,7 @@ import { schema } from '@kbn/config-schema'; import { RouteInitializerDeps } from '../'; -import { - CANVAS_TYPE, - API_ROUTE_WORKPAD, -} from '../../../../../legacy/plugins/canvas/common/lib/constants'; +import { CANVAS_TYPE, API_ROUTE_WORKPAD } from '../../../common/lib/constants'; import { WorkpadAttributes } from './workpad_attributes'; import { catchErrorHandler } from '../catch_error_handler'; diff --git a/x-pack/plugins/canvas/server/routes/workpad/update.test.ts b/x-pack/plugins/canvas/server/routes/workpad/update.test.ts index de098dd9717ed0..a6b34e71651215 100644 --- a/x-pack/plugins/canvas/server/routes/workpad/update.test.ts +++ b/x-pack/plugins/canvas/server/routes/workpad/update.test.ts @@ -5,7 +5,7 @@ */ import sinon from 'sinon'; -import { CANVAS_TYPE } from '../../../../../legacy/plugins/canvas/common/lib/constants'; +import { CANVAS_TYPE } from '../../../common/lib/constants'; import { initializeUpdateWorkpadRoute, initializeUpdateWorkpadAssetsRoute } from './update'; import { IRouter, @@ -19,7 +19,7 @@ import { httpServerMock, loggingServiceMock, } from 'src/core/server/mocks'; -import { workpads } from '../../../../../legacy/plugins/canvas/__tests__/fixtures/workpads'; +import { workpads } from '../../../__tests__/fixtures/workpads'; import { okResponse } from '../ok_response'; const mockRouteContext = ({ diff --git a/x-pack/plugins/canvas/server/routes/workpad/update.ts b/x-pack/plugins/canvas/server/routes/workpad/update.ts index 64736bcd57fd5d..021ac41d88d194 100644 --- a/x-pack/plugins/canvas/server/routes/workpad/update.ts +++ b/x-pack/plugins/canvas/server/routes/workpad/update.ts @@ -13,7 +13,7 @@ import { API_ROUTE_WORKPAD, API_ROUTE_WORKPAD_STRUCTURES, API_ROUTE_WORKPAD_ASSETS, -} from '../../../../../legacy/plugins/canvas/common/lib/constants'; +} from '../../../common/lib/constants'; import { WorkpadAttributes } from './workpad_attributes'; import { WorkpadSchema, WorkpadAssetSchema } from './workpad_schema'; import { okResponse } from '../ok_response'; diff --git a/x-pack/plugins/canvas/server/routes/workpad/workpad_attributes.ts b/x-pack/plugins/canvas/server/routes/workpad/workpad_attributes.ts index 2b7b6cca4ba2bc..fd811adeebbd82 100644 --- a/x-pack/plugins/canvas/server/routes/workpad/workpad_attributes.ts +++ b/x-pack/plugins/canvas/server/routes/workpad/workpad_attributes.ts @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -import { CanvasWorkpad } from '../../../../../legacy/plugins/canvas/types'; +import { CanvasWorkpad } from '../../../types'; export type WorkpadAttributes = Pick> & { '@timestamp': string; diff --git a/x-pack/plugins/canvas/server/saved_objects/custom_element.ts b/x-pack/plugins/canvas/server/saved_objects/custom_element.ts index d26f6dd8fb16e8..5fe48e98f28da1 100644 --- a/x-pack/plugins/canvas/server/saved_objects/custom_element.ts +++ b/x-pack/plugins/canvas/server/saved_objects/custom_element.ts @@ -5,7 +5,7 @@ */ import { SavedObjectsType } from 'src/core/server'; -import { CUSTOM_ELEMENT_TYPE } from '../../../../legacy/plugins/canvas/common/lib/constants'; +import { CUSTOM_ELEMENT_TYPE } from '../../common/lib/constants'; export const customElementType: SavedObjectsType = { name: CUSTOM_ELEMENT_TYPE, diff --git a/x-pack/plugins/canvas/server/saved_objects/workpad.ts b/x-pack/plugins/canvas/server/saved_objects/workpad.ts index 2e9570b1b83be6..3c8486f3246b24 100644 --- a/x-pack/plugins/canvas/server/saved_objects/workpad.ts +++ b/x-pack/plugins/canvas/server/saved_objects/workpad.ts @@ -5,7 +5,7 @@ */ import { SavedObjectsType } from 'src/core/server'; -import { CANVAS_TYPE } from '../../../../legacy/plugins/canvas/common/lib/constants'; +import { CANVAS_TYPE } from '../../common/lib/constants'; import { removeAttributesId } from './migrations/remove_attributes_id'; export const workpadType: SavedObjectsType = { diff --git a/x-pack/plugins/canvas/server/setup_interpreter.ts b/x-pack/plugins/canvas/server/setup_interpreter.ts index 74dd8decbea697..79bc2f3c1996b7 100644 --- a/x-pack/plugins/canvas/server/setup_interpreter.ts +++ b/x-pack/plugins/canvas/server/setup_interpreter.ts @@ -5,7 +5,7 @@ */ import { ExpressionsServerSetup } from 'src/plugins/expressions/server'; -import { functions } from '../../../legacy/plugins/canvas/canvas_plugin_src/functions/server'; +import { functions } from '../canvas_plugin_src/functions/server'; export function setupInterpreter(expressions: ExpressionsServerSetup) { expressions.__LEGACY.register({ types: [], serverFunctions: functions }); diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/README.md b/x-pack/plugins/canvas/shareable_runtime/README.md similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/README.md rename to x-pack/plugins/canvas/shareable_runtime/README.md diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/__mocks__/supported_renderers.js b/x-pack/plugins/canvas/shareable_runtime/__mocks__/supported_renderers.js similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/__mocks__/supported_renderers.js rename to x-pack/plugins/canvas/shareable_runtime/__mocks__/supported_renderers.js diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/api/__tests__/__snapshots__/shareable.test.tsx.snap b/x-pack/plugins/canvas/shareable_runtime/api/__tests__/__snapshots__/shareable.test.tsx.snap similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/api/__tests__/__snapshots__/shareable.test.tsx.snap rename to x-pack/plugins/canvas/shareable_runtime/api/__tests__/__snapshots__/shareable.test.tsx.snap diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/api/__tests__/shareable.test.tsx b/x-pack/plugins/canvas/shareable_runtime/api/__tests__/shareable.test.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/api/__tests__/shareable.test.tsx rename to x-pack/plugins/canvas/shareable_runtime/api/__tests__/shareable.test.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/api/index.ts b/x-pack/plugins/canvas/shareable_runtime/api/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/api/index.ts rename to x-pack/plugins/canvas/shareable_runtime/api/index.ts diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/api/shareable.tsx b/x-pack/plugins/canvas/shareable_runtime/api/shareable.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/api/shareable.tsx rename to x-pack/plugins/canvas/shareable_runtime/api/shareable.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/__examples__/__snapshots__/canvas.examples.storyshot b/x-pack/plugins/canvas/shareable_runtime/components/__examples__/__snapshots__/canvas.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/__examples__/__snapshots__/canvas.examples.storyshot rename to x-pack/plugins/canvas/shareable_runtime/components/__examples__/__snapshots__/canvas.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/__examples__/__snapshots__/page.examples.storyshot b/x-pack/plugins/canvas/shareable_runtime/components/__examples__/__snapshots__/page.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/__examples__/__snapshots__/page.examples.storyshot rename to x-pack/plugins/canvas/shareable_runtime/components/__examples__/__snapshots__/page.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/__examples__/__snapshots__/rendered_element.examples.storyshot b/x-pack/plugins/canvas/shareable_runtime/components/__examples__/__snapshots__/rendered_element.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/__examples__/__snapshots__/rendered_element.examples.storyshot rename to x-pack/plugins/canvas/shareable_runtime/components/__examples__/__snapshots__/rendered_element.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/__examples__/canvas.examples.tsx b/x-pack/plugins/canvas/shareable_runtime/components/__examples__/canvas.examples.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/__examples__/canvas.examples.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/__examples__/canvas.examples.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/__examples__/page.examples.tsx b/x-pack/plugins/canvas/shareable_runtime/components/__examples__/page.examples.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/__examples__/page.examples.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/__examples__/page.examples.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/__examples__/rendered_element.examples.tsx b/x-pack/plugins/canvas/shareable_runtime/components/__examples__/rendered_element.examples.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/__examples__/rendered_element.examples.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/__examples__/rendered_element.examples.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/__tests__/__snapshots__/app.test.tsx.snap b/x-pack/plugins/canvas/shareable_runtime/components/__tests__/__snapshots__/app.test.tsx.snap similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/__tests__/__snapshots__/app.test.tsx.snap rename to x-pack/plugins/canvas/shareable_runtime/components/__tests__/__snapshots__/app.test.tsx.snap diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/__tests__/app.test.tsx b/x-pack/plugins/canvas/shareable_runtime/components/__tests__/app.test.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/__tests__/app.test.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/__tests__/app.test.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/__tests__/canvas.test.tsx b/x-pack/plugins/canvas/shareable_runtime/components/__tests__/canvas.test.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/__tests__/canvas.test.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/__tests__/canvas.test.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/__tests__/page.test.tsx b/x-pack/plugins/canvas/shareable_runtime/components/__tests__/page.test.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/__tests__/page.test.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/__tests__/page.test.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/app.tsx b/x-pack/plugins/canvas/shareable_runtime/components/app.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/app.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/app.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/canvas.module.scss b/x-pack/plugins/canvas/shareable_runtime/components/canvas.module.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/canvas.module.scss rename to x-pack/plugins/canvas/shareable_runtime/components/canvas.module.scss diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/canvas.tsx b/x-pack/plugins/canvas/shareable_runtime/components/canvas.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/canvas.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/canvas.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/footer.components.examples.storyshot b/x-pack/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/footer.components.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/footer.components.examples.storyshot rename to x-pack/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/footer.components.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/footer.examples.storyshot b/x-pack/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/footer.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/footer.examples.storyshot rename to x-pack/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/footer.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/page_controls.examples.storyshot b/x-pack/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/page_controls.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/page_controls.examples.storyshot rename to x-pack/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/page_controls.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/scrubber.examples.storyshot b/x-pack/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/scrubber.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/scrubber.examples.storyshot rename to x-pack/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/scrubber.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/title.examples.storyshot b/x-pack/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/title.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/title.examples.storyshot rename to x-pack/plugins/canvas/shareable_runtime/components/footer/__examples__/__snapshots__/title.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/footer.examples.tsx b/x-pack/plugins/canvas/shareable_runtime/components/footer/__examples__/footer.examples.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/footer.examples.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/footer/__examples__/footer.examples.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/page_controls.examples.tsx b/x-pack/plugins/canvas/shareable_runtime/components/footer/__examples__/page_controls.examples.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/page_controls.examples.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/footer/__examples__/page_controls.examples.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/scrubber.examples.tsx b/x-pack/plugins/canvas/shareable_runtime/components/footer/__examples__/scrubber.examples.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/scrubber.examples.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/footer/__examples__/scrubber.examples.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/title.examples.tsx b/x-pack/plugins/canvas/shareable_runtime/components/footer/__examples__/title.examples.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__examples__/title.examples.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/footer/__examples__/title.examples.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__tests__/footer.test.tsx b/x-pack/plugins/canvas/shareable_runtime/components/footer/__tests__/footer.test.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__tests__/footer.test.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/footer/__tests__/footer.test.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__tests__/page_controls.test.tsx b/x-pack/plugins/canvas/shareable_runtime/components/footer/__tests__/page_controls.test.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__tests__/page_controls.test.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/footer/__tests__/page_controls.test.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__tests__/page_preview.test.tsx b/x-pack/plugins/canvas/shareable_runtime/components/footer/__tests__/page_preview.test.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__tests__/page_preview.test.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/footer/__tests__/page_preview.test.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__tests__/scrubber.test.tsx b/x-pack/plugins/canvas/shareable_runtime/components/footer/__tests__/scrubber.test.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__tests__/scrubber.test.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/footer/__tests__/scrubber.test.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__tests__/title.test.tsx b/x-pack/plugins/canvas/shareable_runtime/components/footer/__tests__/title.test.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/__tests__/title.test.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/footer/__tests__/title.test.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/footer.module.scss b/x-pack/plugins/canvas/shareable_runtime/components/footer/footer.module.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/footer.module.scss rename to x-pack/plugins/canvas/shareable_runtime/components/footer/footer.module.scss diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/footer.tsx b/x-pack/plugins/canvas/shareable_runtime/components/footer/footer.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/footer.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/footer/footer.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/index.ts b/x-pack/plugins/canvas/shareable_runtime/components/footer/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/index.ts rename to x-pack/plugins/canvas/shareable_runtime/components/footer/index.ts diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/page_controls.tsx b/x-pack/plugins/canvas/shareable_runtime/components/footer/page_controls.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/page_controls.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/footer/page_controls.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/page_preview.module.scss b/x-pack/plugins/canvas/shareable_runtime/components/footer/page_preview.module.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/page_preview.module.scss rename to x-pack/plugins/canvas/shareable_runtime/components/footer/page_preview.module.scss diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/page_preview.tsx b/x-pack/plugins/canvas/shareable_runtime/components/footer/page_preview.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/page_preview.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/footer/page_preview.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/scrubber.module.scss b/x-pack/plugins/canvas/shareable_runtime/components/footer/scrubber.module.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/scrubber.module.scss rename to x-pack/plugins/canvas/shareable_runtime/components/footer/scrubber.module.scss diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/scrubber.tsx b/x-pack/plugins/canvas/shareable_runtime/components/footer/scrubber.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/scrubber.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/footer/scrubber.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/autoplay_settings.examples.storyshot b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/autoplay_settings.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/autoplay_settings.examples.storyshot rename to x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/autoplay_settings.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/settings.components.examples.storyshot b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/settings.components.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/settings.components.examples.storyshot rename to x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/settings.components.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/settings.examples.storyshot b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/settings.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/settings.examples.storyshot rename to x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/settings.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/toolbar_settings.examples.storyshot b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/toolbar_settings.examples.storyshot similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/toolbar_settings.examples.storyshot rename to x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/__snapshots__/toolbar_settings.examples.storyshot diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/autoplay_settings.examples.tsx b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/autoplay_settings.examples.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/autoplay_settings.examples.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/autoplay_settings.examples.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/settings.examples.tsx b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/settings.examples.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/settings.examples.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/settings.examples.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/toolbar_settings.examples.tsx b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/toolbar_settings.examples.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/toolbar_settings.examples.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__examples__/toolbar_settings.examples.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap rename to x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/autoplay_settings.test.tsx b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/autoplay_settings.test.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/autoplay_settings.test.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/autoplay_settings.test.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/settings.test.tsx b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/settings.test.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/settings.test.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/settings.test.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/toolbar_settings.test.tsx b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/toolbar_settings.test.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/toolbar_settings.test.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/toolbar_settings.test.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/autoplay_settings.tsx b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/autoplay_settings.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/autoplay_settings.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/footer/settings/autoplay_settings.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/index.ts b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/index.ts rename to x-pack/plugins/canvas/shareable_runtime/components/footer/settings/index.ts diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/settings.tsx b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/settings.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/settings.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/footer/settings/settings.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/toolbar_settings.tsx b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/toolbar_settings.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/settings/toolbar_settings.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/footer/settings/toolbar_settings.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/title.tsx b/x-pack/plugins/canvas/shareable_runtime/components/footer/title.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/footer/title.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/footer/title.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/page.module.scss b/x-pack/plugins/canvas/shareable_runtime/components/page.module.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/page.module.scss rename to x-pack/plugins/canvas/shareable_runtime/components/page.module.scss diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/page.tsx b/x-pack/plugins/canvas/shareable_runtime/components/page.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/page.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/page.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/rendered_element.module.scss b/x-pack/plugins/canvas/shareable_runtime/components/rendered_element.module.scss similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/rendered_element.module.scss rename to x-pack/plugins/canvas/shareable_runtime/components/rendered_element.module.scss diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/components/rendered_element.tsx b/x-pack/plugins/canvas/shareable_runtime/components/rendered_element.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/components/rendered_element.tsx rename to x-pack/plugins/canvas/shareable_runtime/components/rendered_element.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/constants.d.ts b/x-pack/plugins/canvas/shareable_runtime/constants.d.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/constants.d.ts rename to x-pack/plugins/canvas/shareable_runtime/constants.d.ts diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/constants.js b/x-pack/plugins/canvas/shareable_runtime/constants.js similarity index 92% rename from x-pack/legacy/plugins/canvas/shareable_runtime/constants.js rename to x-pack/plugins/canvas/shareable_runtime/constants.js index 2ac92f57a90ed9..98abc7ca5a95fa 100644 --- a/x-pack/legacy/plugins/canvas/shareable_runtime/constants.js +++ b/x-pack/plugins/canvas/shareable_runtime/constants.js @@ -7,8 +7,8 @@ const path = require('path'); const { LIBRARY_NAME, SHAREABLE_RUNTIME_NAME } = require('./constants_static'); -const KIBANA_ROOT_PATH = '../../../../..'; -const CANVAS_ROOT_PATH = 'x-pack/legacy/plugins/canvas'; +const KIBANA_ROOT_PATH = '../../../..'; +const CANVAS_ROOT_PATH = 'x-pack/plugins/canvas'; const SHAREABLE_RUNTIME_PATH = 'shareable_runtime'; const SHAREABLE_RUNTIME_OUTPUT_PATH = 'shareable_runtime/build'; const SHAREABLE_RUNTIME_FILE_PATH = 'shareable_runtime/build/kbn_canvas.js'; diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/constants_static.d.ts b/x-pack/plugins/canvas/shareable_runtime/constants_static.d.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/constants_static.d.ts rename to x-pack/plugins/canvas/shareable_runtime/constants_static.d.ts diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/constants_static.js b/x-pack/plugins/canvas/shareable_runtime/constants_static.js similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/constants_static.js rename to x-pack/plugins/canvas/shareable_runtime/constants_static.js diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/context/actions.ts b/x-pack/plugins/canvas/shareable_runtime/context/actions.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/context/actions.ts rename to x-pack/plugins/canvas/shareable_runtime/context/actions.ts diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/context/index.ts b/x-pack/plugins/canvas/shareable_runtime/context/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/context/index.ts rename to x-pack/plugins/canvas/shareable_runtime/context/index.ts diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/context/reducer.ts b/x-pack/plugins/canvas/shareable_runtime/context/reducer.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/context/reducer.ts rename to x-pack/plugins/canvas/shareable_runtime/context/reducer.ts diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/context/state.tsx b/x-pack/plugins/canvas/shareable_runtime/context/state.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/context/state.tsx rename to x-pack/plugins/canvas/shareable_runtime/context/state.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/css_modules.d.ts b/x-pack/plugins/canvas/shareable_runtime/css_modules.d.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/css_modules.d.ts rename to x-pack/plugins/canvas/shareable_runtime/css_modules.d.ts diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/index.html b/x-pack/plugins/canvas/shareable_runtime/index.html similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/index.html rename to x-pack/plugins/canvas/shareable_runtime/index.html diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/index.ts b/x-pack/plugins/canvas/shareable_runtime/index.ts similarity index 81% rename from x-pack/legacy/plugins/canvas/shareable_runtime/index.ts rename to x-pack/plugins/canvas/shareable_runtime/index.ts index 2398a348f5a31d..8b29b23c4442fe 100644 --- a/x-pack/legacy/plugins/canvas/shareable_runtime/index.ts +++ b/x-pack/plugins/canvas/shareable_runtime/index.ts @@ -5,13 +5,13 @@ */ export * from './api'; -import '../../../../../built_assets/css/plugins/kibana/index.light.css'; +import '../../../../built_assets/css/plugins/kibana/index.light.css'; import '../public/style/index.scss'; import '@elastic/eui/dist/eui_theme_light.css'; import '@kbn/ui-framework/dist/kui_light.css'; const css = require.context( - '../../../../../built_assets/css', + '../../../../built_assets/css', true, /\.\/plugins\/(?!canvas).*light\.css/ ); @@ -20,7 +20,7 @@ css.keys().forEach(filename => { }); const uiStyles = require.context( - '../../../../../src/legacy/ui/public/styles', + '../../../../src/legacy/ui/public/styles', false, /[\/\\](?!mixins|variables|_|\.|bootstrap_(light|dark))[^\/\\]+\.less/ ); diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/postcss.config.js b/x-pack/plugins/canvas/shareable_runtime/postcss.config.js similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/postcss.config.js rename to x-pack/plugins/canvas/shareable_runtime/postcss.config.js diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/supported_renderers.d.ts b/x-pack/plugins/canvas/shareable_runtime/supported_renderers.d.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/supported_renderers.d.ts rename to x-pack/plugins/canvas/shareable_runtime/supported_renderers.d.ts diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/supported_renderers.js b/x-pack/plugins/canvas/shareable_runtime/supported_renderers.js similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/supported_renderers.js rename to x-pack/plugins/canvas/shareable_runtime/supported_renderers.js diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/template.html b/x-pack/plugins/canvas/shareable_runtime/template.html similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/template.html rename to x-pack/plugins/canvas/shareable_runtime/template.html diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/test/context.tsx b/x-pack/plugins/canvas/shareable_runtime/test/context.tsx similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/test/context.tsx rename to x-pack/plugins/canvas/shareable_runtime/test/context.tsx diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/test/context_example.ts b/x-pack/plugins/canvas/shareable_runtime/test/context_example.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/test/context_example.ts rename to x-pack/plugins/canvas/shareable_runtime/test/context_example.ts diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/test/context_jest.ts b/x-pack/plugins/canvas/shareable_runtime/test/context_jest.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/test/context_jest.ts rename to x-pack/plugins/canvas/shareable_runtime/test/context_jest.ts diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/test/index.ts b/x-pack/plugins/canvas/shareable_runtime/test/index.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/test/index.ts rename to x-pack/plugins/canvas/shareable_runtime/test/index.ts diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/test/interactions.ts b/x-pack/plugins/canvas/shareable_runtime/test/interactions.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/test/interactions.ts rename to x-pack/plugins/canvas/shareable_runtime/test/interactions.ts diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/test/selectors.ts b/x-pack/plugins/canvas/shareable_runtime/test/selectors.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/test/selectors.ts rename to x-pack/plugins/canvas/shareable_runtime/test/selectors.ts diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/test/utils.ts b/x-pack/plugins/canvas/shareable_runtime/test/utils.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/test/utils.ts rename to x-pack/plugins/canvas/shareable_runtime/test/utils.ts diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/test/workpads/austin.json b/x-pack/plugins/canvas/shareable_runtime/test/workpads/austin.json similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/test/workpads/austin.json rename to x-pack/plugins/canvas/shareable_runtime/test/workpads/austin.json diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/test/workpads/hello.json b/x-pack/plugins/canvas/shareable_runtime/test/workpads/hello.json similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/test/workpads/hello.json rename to x-pack/plugins/canvas/shareable_runtime/test/workpads/hello.json diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/test/workpads/test.json b/x-pack/plugins/canvas/shareable_runtime/test/workpads/test.json similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/test/workpads/test.json rename to x-pack/plugins/canvas/shareable_runtime/test/workpads/test.json diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/types.ts b/x-pack/plugins/canvas/shareable_runtime/types.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/types.ts rename to x-pack/plugins/canvas/shareable_runtime/types.ts diff --git a/x-pack/legacy/plugins/canvas/shareable_runtime/webpack.config.js b/x-pack/plugins/canvas/shareable_runtime/webpack.config.js similarity index 100% rename from x-pack/legacy/plugins/canvas/shareable_runtime/webpack.config.js rename to x-pack/plugins/canvas/shareable_runtime/webpack.config.js diff --git a/x-pack/legacy/plugins/canvas/tasks/mocks/customElementService.js b/x-pack/plugins/canvas/tasks/mocks/customElementService.js similarity index 100% rename from x-pack/legacy/plugins/canvas/tasks/mocks/customElementService.js rename to x-pack/plugins/canvas/tasks/mocks/customElementService.js diff --git a/x-pack/legacy/plugins/canvas/tasks/mocks/downloadWorkpad.js b/x-pack/plugins/canvas/tasks/mocks/downloadWorkpad.js similarity index 100% rename from x-pack/legacy/plugins/canvas/tasks/mocks/downloadWorkpad.js rename to x-pack/plugins/canvas/tasks/mocks/downloadWorkpad.js diff --git a/x-pack/legacy/plugins/canvas/tasks/mocks/uiAbsoluteToParsedUrl.ts b/x-pack/plugins/canvas/tasks/mocks/uiAbsoluteToParsedUrl.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/tasks/mocks/uiAbsoluteToParsedUrl.ts rename to x-pack/plugins/canvas/tasks/mocks/uiAbsoluteToParsedUrl.ts diff --git a/x-pack/legacy/plugins/canvas/tasks/mocks/uiChrome.js b/x-pack/plugins/canvas/tasks/mocks/uiChrome.js similarity index 100% rename from x-pack/legacy/plugins/canvas/tasks/mocks/uiChrome.js rename to x-pack/plugins/canvas/tasks/mocks/uiChrome.js diff --git a/x-pack/legacy/plugins/canvas/tasks/mocks/uiMetric.js b/x-pack/plugins/canvas/tasks/mocks/uiMetric.js similarity index 100% rename from x-pack/legacy/plugins/canvas/tasks/mocks/uiMetric.js rename to x-pack/plugins/canvas/tasks/mocks/uiMetric.js diff --git a/x-pack/legacy/plugins/canvas/tasks/mocks/uiNotify.js b/x-pack/plugins/canvas/tasks/mocks/uiNotify.js similarity index 100% rename from x-pack/legacy/plugins/canvas/tasks/mocks/uiNotify.js rename to x-pack/plugins/canvas/tasks/mocks/uiNotify.js diff --git a/x-pack/legacy/plugins/canvas/tasks/mocks/uiNotifyFormatMsg.js b/x-pack/plugins/canvas/tasks/mocks/uiNotifyFormatMsg.js similarity index 100% rename from x-pack/legacy/plugins/canvas/tasks/mocks/uiNotifyFormatMsg.js rename to x-pack/plugins/canvas/tasks/mocks/uiNotifyFormatMsg.js diff --git a/x-pack/legacy/plugins/canvas/types/arguments.ts b/x-pack/plugins/canvas/types/arguments.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/types/arguments.ts rename to x-pack/plugins/canvas/types/arguments.ts diff --git a/x-pack/legacy/plugins/canvas/types/assets.ts b/x-pack/plugins/canvas/types/assets.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/types/assets.ts rename to x-pack/plugins/canvas/types/assets.ts diff --git a/x-pack/legacy/plugins/canvas/types/canvas.ts b/x-pack/plugins/canvas/types/canvas.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/types/canvas.ts rename to x-pack/plugins/canvas/types/canvas.ts diff --git a/x-pack/legacy/plugins/canvas/types/elements.ts b/x-pack/plugins/canvas/types/elements.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/types/elements.ts rename to x-pack/plugins/canvas/types/elements.ts diff --git a/x-pack/legacy/plugins/canvas/types/functions.ts b/x-pack/plugins/canvas/types/functions.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/types/functions.ts rename to x-pack/plugins/canvas/types/functions.ts diff --git a/x-pack/legacy/plugins/canvas/types/global.d.ts b/x-pack/plugins/canvas/types/global.d.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/types/global.d.ts rename to x-pack/plugins/canvas/types/global.d.ts diff --git a/x-pack/plugins/canvas/types/index.ts b/x-pack/plugins/canvas/types/index.ts index 014b203754a217..0799627ce9b5a1 100644 --- a/x-pack/plugins/canvas/types/index.ts +++ b/x-pack/plugins/canvas/types/index.ts @@ -4,4 +4,13 @@ * you may not use this file except in compliance with the Elastic License. */ -export * from '../../../legacy/plugins/canvas/types'; +export * from '../../../../src/plugins/expressions/common'; +export * from './assets'; +export * from './canvas'; +export * from './elements'; +export * from './functions'; +export * from './renderers'; +export * from './shortcuts'; +export * from './state'; +export * from './style'; +export * from './telemetry'; diff --git a/x-pack/legacy/plugins/canvas/types/react_moment_prototypes.d.ts b/x-pack/plugins/canvas/types/react_moment_prototypes.d.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/types/react_moment_prototypes.d.ts rename to x-pack/plugins/canvas/types/react_moment_prototypes.d.ts diff --git a/x-pack/legacy/plugins/canvas/types/renderers.ts b/x-pack/plugins/canvas/types/renderers.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/types/renderers.ts rename to x-pack/plugins/canvas/types/renderers.ts diff --git a/x-pack/legacy/plugins/canvas/types/shortcuts.ts b/x-pack/plugins/canvas/types/shortcuts.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/types/shortcuts.ts rename to x-pack/plugins/canvas/types/shortcuts.ts diff --git a/x-pack/legacy/plugins/canvas/types/state.ts b/x-pack/plugins/canvas/types/state.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/types/state.ts rename to x-pack/plugins/canvas/types/state.ts diff --git a/x-pack/legacy/plugins/canvas/types/style.ts b/x-pack/plugins/canvas/types/style.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/types/style.ts rename to x-pack/plugins/canvas/types/style.ts diff --git a/x-pack/legacy/plugins/canvas/types/telemetry.ts b/x-pack/plugins/canvas/types/telemetry.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/types/telemetry.ts rename to x-pack/plugins/canvas/types/telemetry.ts diff --git a/x-pack/legacy/plugins/canvas/types/transforms.ts b/x-pack/plugins/canvas/types/transforms.ts similarity index 100% rename from x-pack/legacy/plugins/canvas/types/transforms.ts rename to x-pack/plugins/canvas/types/transforms.ts diff --git a/x-pack/plugins/siem/scripts/optimize_tsconfig/tsconfig.json b/x-pack/plugins/siem/scripts/optimize_tsconfig/tsconfig.json index fb89c0e0fc3e24..fb838d82f14ed3 100644 --- a/x-pack/plugins/siem/scripts/optimize_tsconfig/tsconfig.json +++ b/x-pack/plugins/siem/scripts/optimize_tsconfig/tsconfig.json @@ -3,7 +3,7 @@ "typings/**/*", "plugins/siem/**/*", "plugins/apm/typings/numeral.d.ts", - "legacy/plugins/canvas/types/webpack.d.ts", + "plugins/canvas/types/webpack.d.ts", "plugins/triggers_actions_ui/**/*" ], "exclude": [ diff --git a/x-pack/tasks/build.ts b/x-pack/tasks/build.ts index ca03e1c9fd2834..38ebb0bad4bdc7 100644 --- a/x-pack/tasks/build.ts +++ b/x-pack/tasks/build.ts @@ -30,7 +30,7 @@ async function cleanBuildTask() { await del(BUILD_DIR); fancyLog('[canvas] Deleting Shareable Runtime'); - await del(resolve(XPACK_DIR, 'legacy/plugins/canvas/shareable_runtime/build')); + await del(resolve(XPACK_DIR, 'plugins/canvas/shareable_runtime/build')); } async function reportTask() { @@ -50,7 +50,7 @@ async function pluginHelpersBuild() { } async function buildCanvasShareableRuntime() { - await execa(process.execPath, ['legacy/plugins/canvas/scripts/shareable_runtime'], { + await execa(process.execPath, ['plugins/canvas/scripts/shareable_runtime'], { cwd: XPACK_DIR, stdio: ['ignore', 'inherit', 'inherit'], // @ts-ignore Incorrect @types - execa supports `buffer`