[Table Vis] Shim new platform (elastic#40732)

* [Table Vis] Shim new platform * fix mocha tests * fix mocha tests * fix _agg_config test * cleanup * remove setup.ts * Set the correct type for the "Data" dependency
alexwizp · Jul 24, 2019 · e6913a7 · e6913a7
1 parent a8cbd1f
commit e6913a7
Show file tree

Hide file tree

Showing 22 changed files with 611 additions and 419 deletions.
diff --git a/src/legacy/core_plugins/table_vis/index.js → src/legacy/core_plugins/table_vis/index.ts b/src/legacy/core_plugins/table_vis/index.js → src/legacy/core_plugins/table_vis/index.ts
@@ -18,17 +18,27 @@
  */
 
 import { resolve } from 'path';
+import { Legacy } from 'kibana';
 
-export default function (kibana) {
+import { LegacyPluginApi, LegacyPluginInitializer } from '../../../../src/legacy/types';
 
-  return new kibana.Plugin({
+const tableVisPluginInitializer: LegacyPluginInitializer = ({ Plugin }: LegacyPluginApi) =>
+  new Plugin({
+    id: 'table_vis',
+    require: ['kibana', 'elasticsearch', 'visualizations', 'interpreter', 'data'],
+    publicDir: resolve(__dirname, 'public'),
     uiExports: {
-      visTypes: [
-        'plugins/table_vis/table_vis'
-      ],
-      interpreter: ['plugins/table_vis/table_vis_fn'],
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
+      hacks: [resolve(__dirname, 'public/legacy')],
+      injectDefaultVars: server => ({}),
     },
-  });
+    init: (server: Legacy.Server) => ({}),
+    config(Joi: any) {
+      return Joi.object({
+        enabled: Joi.boolean().default(true),
+      }).default();
+    },
+  } as Legacy.PluginSpecOptions);
 
-}
+// eslint-disable-next-line import/no-default-export
+export default tableVisPluginInitializer;
diff --git a/...public/__tests__/_table_vis_controller.js → .../public/__tests__/table_vis_controller.js b/...public/__tests__/_table_vis_controller.js → .../public/__tests__/table_vis_controller.js
@@ -22,11 +22,15 @@ import expect from '@kbn/expect';
 import ngMock from 'ng_mock';
 import { legacyResponseHandlerProvider } from 'ui/vis/response_handlers/legacy';
 import { VisProvider } from 'ui/vis';
+import { VisFactoryProvider } from 'ui/vis/vis_factory';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 import { AppStateProvider } from 'ui/state_management/app_state';
 import { tabifyAggResponse } from 'ui/agg_response/tabify';
 
-describe('Table Vis Controller', function () {
+import { createTableVisTypeDefinition } from '../table_vis_type';
+import { visualizations } from '../../../visualizations/public';
+
+describe('Table Vis - Controller', async function () {
   let $rootScope;
   let $compile;
   let Private;
@@ -37,10 +41,20 @@ describe('Table Vis Controller', function () {
   let AppState;
   let tableAggResponse;
   let tabifiedResponse;
+  let legacyDependencies;
 
   beforeEach(ngMock.module('kibana', 'kibana/table_vis'));
   beforeEach(ngMock.inject(function ($injector) {
     Private = $injector.get('Private');
+    legacyDependencies = {
+      // eslint-disable-next-line new-cap
+      createAngularVisualization: VisFactoryProvider(Private).createAngularVisualization
+    };
+
+    visualizations.types.VisTypesRegistryProvider.register(() =>
+      createTableVisTypeDefinition(legacyDependencies)
+    );
+
     $rootScope = $injector.get('$rootScope');
     $compile = $injector.get('$compile');
     fixtures = require('fixtures/fake_hierarchical_data');

diff --git a/..._vis/public/agg_table/__tests__/_table.js → ...s/public/agg_table/__tests__/agg_table.js b/..._vis/public/agg_table/__tests__/_table.js → ...s/public/agg_table/__tests__/agg_table.js
@@ -29,14 +29,19 @@ import { VisProvider } from 'ui/vis';
 import { tabifyAggResponse } from 'ui/agg_response/tabify';
 import { round } from 'lodash';
 
-describe('AggTable Directive', function () {
+import { VisFactoryProvider } from 'ui/vis/vis_factory';
+import { createTableVisTypeDefinition } from '../../table_vis_type';
+import { visualizations } from '../../../../visualizations/public';
+
+describe('Table Vis - AggTable Directive', function () {
 
   let $rootScope;
   let $compile;
   let Vis;
   let indexPattern;
   let settings;
   let tableAggResponse;
+  let legacyDependencies;
   const tabifiedData = {};
 
   const init = () => {
@@ -82,6 +87,15 @@ describe('AggTable Directive', function () {
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function ($injector, Private, config) {
+    legacyDependencies = {
+      // eslint-disable-next-line new-cap
+      createAngularVisualization: VisFactoryProvider(Private).createAngularVisualization
+    };
+
+    visualizations.types.VisTypesRegistryProvider.register(() =>
+      createTableVisTypeDefinition(legacyDependencies)
+    );
+
     tableAggResponse = legacyResponseHandlerProvider().handler;
     indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
     Vis = Private(VisProvider);

diff --git a/..._vis/public/agg_table/__tests__/_group.js → ...ic/agg_table/__tests__/agg_table_group.js b/..._vis/public/agg_table/__tests__/_group.js → ...ic/agg_table/__tests__/agg_table_group.js
@@ -26,13 +26,17 @@ import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logsta
 import { VisProvider } from 'ui/vis';
 import { tabifyAggResponse } from 'ui/agg_response/tabify';
 
-describe('AggTableGroup Directive', function () {
+import { VisFactoryProvider } from 'ui/vis/vis_factory';
+import { createTableVisTypeDefinition } from '../../table_vis_type';
+import { visualizations } from '../../../../visualizations/public';
 
+describe('Table Vis - AggTableGroup Directive', function () {
   let $rootScope;
   let $compile;
   let Vis;
   let indexPattern;
   let tableAggResponse;
+  let legacyDependencies;
   const tabifiedData = {};
 
   const init = () => {
@@ -56,6 +60,15 @@ describe('AggTableGroup Directive', function () {
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function ($injector, Private) {
+    legacyDependencies = {
+      // eslint-disable-next-line new-cap
+      createAngularVisualization: VisFactoryProvider(Private).createAngularVisualization
+    };
+
+    visualizations.types.VisTypesRegistryProvider.register(() =>
+      createTableVisTypeDefinition(legacyDependencies)
+    );
+
     tableAggResponse = legacyResponseHandlerProvider().handler;
     indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
     Vis = Private(VisProvider);