Migrate vis_type_table to kibana/new platform (#63105)

* Move vis_type_table to Kibana Platform * Adapt mocha tests * Adapt CODEOWNERS * Adapt SCSS
elastic · Apr 21, 2020 · 2f363ba · 2f363ba
1 parent 46f6f87
commit 2f363ba
Show file tree

Hide file tree

Showing 48 changed files with 354 additions and 323 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -13,6 +13,7 @@
 /src/legacy/core_plugins/kibana/public/dev_tools/ @elastic/kibana-app
 /src/legacy/core_plugins/vis_type_vislib/ @elastic/kibana-app
 /src/plugins/vis_type_xy/ @elastic/kibana-app
+/src/plugins/vis_type_table/ @elastic/kibana-app
 /src/plugins/kibana_legacy/ @elastic/kibana-app
 /src/plugins/vis_type_timelion/ @elastic/kibana-app
 /src/plugins/dashboard/ @elastic/kibana-app

diff --git a/.i18nrc.json b/.i18nrc.json
@@ -48,7 +48,7 @@
     "visDefaultEditor": "src/plugins/vis_default_editor",
     "visTypeMarkdown": "src/plugins/vis_type_markdown",
     "visTypeMetric": "src/plugins/vis_type_metric",
-    "visTypeTable": "src/legacy/core_plugins/vis_type_table",
+    "visTypeTable": "src/plugins/vis_type_table",
     "visTypeTagCloud": "src/legacy/core_plugins/vis_type_tagcloud",
     "visTypeTimeseries": ["src/legacy/core_plugins/vis_type_timeseries", "src/plugins/vis_type_timeseries"],
     "visTypeVega": "src/legacy/core_plugins/vis_type_vega",

diff --git a/...e/public/agg_table/__tests__/agg_table.js → ...lic/__tests__/vis_type_table/agg_table.js b/...e/public/agg_table/__tests__/agg_table.js → ...lic/__tests__/vis_type_table/agg_table.js
@@ -22,19 +22,27 @@ import moment from 'moment';
 import ngMock from 'ng_mock';
 import expect from '@kbn/expect';
 import sinon from 'sinon';
-import { npStart } from '../../legacy_imports';
+import './legacy';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { npStart } from 'ui/new_platform';
 import { round } from 'lodash';
-import { getAngularModule } from '../../get_inner_angular';
-import { initTableVisLegacyModule } from '../../table_vis_legacy_module';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { getInnerAngular } from '../../../../../../plugins/vis_type_table/public/get_inner_angular';
+
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { initTableVisLegacyModule } from '../../../../../../plugins/vis_type_table/public/table_vis_legacy_module';
 import { tabifiedData } from './tabified_data';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { configureAppAngularModule } from '../../../../../../plugins/kibana_legacy/public/angular';
 
 describe('Table Vis - AggTable Directive', function() {
   let $rootScope;
   let $compile;
   let settings;
 
   const initLocalAngular = () => {
-    const tableVisModule = getAngularModule('kibana/table_vis', npStart.core);
+    const tableVisModule = getInnerAngular('kibana/table_vis', npStart.core);
+    configureAppAngularModule(tableVisModule, npStart.core, true);
     initTableVisLegacyModule(tableVisModule);
   };
 

diff --git a/...ic/agg_table/__tests__/agg_table_group.js → ...tests__/vis_type_table/agg_table_group.js b/...ic/agg_table/__tests__/agg_table_group.js → ...tests__/vis_type_table/agg_table_group.js
@@ -20,17 +20,24 @@
 import $ from 'jquery';
 import ngMock from 'ng_mock';
 import expect from '@kbn/expect';
-import { npStart } from '../../legacy_imports';
-import { getAngularModule } from '../../get_inner_angular';
-import { initTableVisLegacyModule } from '../../table_vis_legacy_module';
+import './legacy';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { getInnerAngular } from '../../../../../../plugins/vis_type_table/public/get_inner_angular';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { initTableVisLegacyModule } from '../../../../../../plugins/vis_type_table/public/table_vis_legacy_module';
 import { tabifiedData } from './tabified_data';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { npStart } from 'ui/new_platform';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { configureAppAngularModule } from '../../../../../../plugins/kibana_legacy/public/angular';
 
 describe('Table Vis - AggTableGroup Directive', function() {
   let $rootScope;
   let $compile;
 
   const initLocalAngular = () => {
-    const tableVisModule = getAngularModule('kibana/table_vis', npStart.core);
+    const tableVisModule = getInnerAngular('kibana/table_vis', npStart.core);
+    configureAppAngularModule(tableVisModule, npStart.core, true);
     initTableVisLegacyModule(tableVisModule);
   };
 

diff --git a/...e_plugins/vis_type_table/public/legacy.ts → ...public/__tests__/vis_type_table/legacy.ts b/...e_plugins/vis_type_table/public/legacy.ts → ...public/__tests__/vis_type_table/legacy.ts
@@ -16,19 +16,23 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 import { PluginInitializerContext } from 'kibana/public';
-import { npSetup, npStart } from './legacy_imports';
-import { plugin } from '.';
-
-import { TablePluginSetupDependencies } from './plugin';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { npStart, npSetup } from 'ui/new_platform';
+import {
+  TableVisPlugin,
+  TablePluginSetupDependencies,
+  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
+} from '../../../../../../plugins/vis_type_table/public/plugin';
 
 const plugins: Readonly<TablePluginSetupDependencies> = {
   expressions: npSetup.plugins.expressions,
   visualizations: npSetup.plugins.visualizations,
 };
 
-const pluginInstance = plugin({} as PluginInitializerContext);
+const pluginInstance = new TableVisPlugin({} as PluginInitializerContext);
 
 export const setup = pluginInstance.setup(npSetup.core, plugins);
-export const start = pluginInstance.start(npStart.core, { data: npStart.plugins.data });
+export const start = pluginInstance.start(npStart.core, {
+  data: npStart.plugins.data,
+});
diff --git a/...blic/agg_table/__tests__/tabified_data.js → ...__tests__/vis_type_table/tabified_data.js b/...blic/agg_table/__tests__/tabified_data.js → ...__tests__/vis_type_table/tabified_data.js
diff --git a/src/legacy/core_plugins/vis_type_table/index.ts b/src/legacy/core_plugins/vis_type_table/index.ts
diff --git a/src/legacy/core_plugins/vis_type_table/package.json b/src/legacy/core_plugins/vis_type_table/package.json
diff --git a/src/legacy/core_plugins/vis_type_table/public/agg_table/_index.scss b/src/legacy/core_plugins/vis_type_table/public/agg_table/_index.scss
diff --git a/src/legacy/core_plugins/vis_type_table/public/paginated_table/_index.scss b/src/legacy/core_plugins/vis_type_table/public/paginated_table/_index.scss
diff --git a/src/legacy/core_plugins/vis_type_table/public/table_vis_type.ts b/src/legacy/core_plugins/vis_type_table/public/table_vis_type.ts
diff --git a/src/legacy/core_plugins/vis_type_table/public/vis_controller.ts b/src/legacy/core_plugins/vis_type_table/public/vis_controller.ts
diff --git a/src/plugins/kibana_legacy/public/angular/angular_config.tsx b/src/plugins/kibana_legacy/public/angular/angular_config.tsx
@@ -92,9 +92,9 @@ export const configureAppAngularModule = (
 ) => {
   const core = 'core' in newPlatform ? newPlatform.core : newPlatform;
   const packageInfo =
-    'injectedMetadata' in newPlatform
-      ? newPlatform.injectedMetadata.getLegacyMetadata()
-      : newPlatform.env.packageInfo;
+    'env' in newPlatform
+      ? newPlatform.env.packageInfo
+      : newPlatform.injectedMetadata.getLegacyMetadata();
 
   if ('injectedMetadata' in newPlatform) {
     forOwn(newPlatform.injectedMetadata.getInjectedVars(), (val, name) => {

diff --git a/...s/vis_type_table/public/legacy_imports.ts → src/plugins/vis_type_table/config.ts b/...s/vis_type_table/public/legacy_imports.ts → src/plugins/vis_type_table/config.ts
@@ -17,4 +17,10 @@
  * under the License.
  */
 
-export { npSetup, npStart } from 'ui/new_platform';
+import { schema, TypeOf } from '@kbn/config-schema';
+
+export const configSchema = schema.object({
+  enabled: schema.boolean({ defaultValue: true }),
+});
+
+export type ConfigSchema = TypeOf<typeof configSchema>;