[7.x] [Canvas] move files from legacy/plugins to plugins (elastic#65283…

…) (elastic#65406)

* [Canvas] move files from legacy/plugins to plugins (elastic#65283)

* Moves the files

* Rename legacy/plugins/canvas paths

* Correct paths

* Fix shareable_runtime and storybook

* ESLint Fixes

* Fix jest test and paths
# Conflicts:
#	.github/CODEOWNERS
#	test/scripts/jenkins_xpack.sh
#	x-pack/legacy/plugins/canvas/index.js
#	x-pack/plugins/canvas/canvas_plugin_src/expression_types/embeddable_types.ts

* Remove CODEOWNERS that was added by merge conflict

* Removes some files that were hanging around in legacy/plugins/canvas

.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

.eslintrc.js

@@ -95,7 +95,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',
@@ -897,7 +897,7 @@ module.exports = {
      * Canvas overrides
      */
     {
-      files: ['x-pack/legacy/plugins/canvas/**/*.js'],
+      files: ['x-pack/plugins/canvas/**/*.js'],
       rules: {
         radix: 'error',
 
@@ -941,12 +941,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': [
@@ -959,7 +959,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': [
@@ -971,13 +971,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,
       },

.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

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",

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',
     ];
 

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',

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',

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",

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
 }