removing references to visTypes uiExports (#58337)

elastic · Mar 2, 2020 · c81e0da · c81e0da
1 parent e9abe73
commit c81e0da
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 18 deletions.
diff --git a/src/legacy/core_plugins/kibana/public/kibana.js b/src/legacy/core_plugins/kibana/public/kibana.js
@@ -26,8 +26,6 @@ import { npSetup } from 'ui/new_platform';
 
 // import the uiExports that we want to "use"
 import 'uiExports/home';
-import 'uiExports/visTypes';
-
 import 'uiExports/visualize';
 import 'uiExports/savedObjectTypes';
 import 'uiExports/fieldFormatEditors';

diff --git a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/legacy.ts b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/legacy.ts
@@ -28,8 +28,6 @@ import 'ui/autoload/all';
 // Used to run esaggs queries
 import 'uiExports/fieldFormats';
 import 'uiExports/search';
-import 'uiExports/visRequestHandlers';
-import 'uiExports/visResponseHandlers';
 // Used for kibana_context function
 
 import 'uiExports/savedObjectTypes';

diff --git a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/index.js b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/index.js
@@ -20,7 +20,7 @@
 export default function(kibana) {
   return new kibana.Plugin({
     uiExports: {
-      visTypes: ['plugins/kbn_tp_custom_visualizations/self_changing_vis/self_changing_vis'],
+      hacks: ['plugins/kbn_tp_custom_visualizations/self_changing_vis/self_changing_vis'],
     },
   });
 }
diff --git a/x-pack/legacy/plugins/canvas/public/legacy_start.ts b/x-pack/legacy/plugins/canvas/public/legacy_start.ts
@@ -8,9 +8,6 @@
 // Import the uiExports that the application uses
 // These will go away as these plugins are converted to NP
 import 'ui/autoload/all';
-import 'uiExports/visTypes';
-import 'uiExports/visResponseHandlers';
-import 'uiExports/visRequestHandlers';
 import 'uiExports/savedObjectTypes';
 import 'uiExports/spyModes';
 import 'uiExports/embeddableFactories';

diff --git a/x-pack/legacy/plugins/dashboard_mode/public/dashboard_viewer.js b/x-pack/legacy/plugins/dashboard_mode/public/dashboard_viewer.js
@@ -15,9 +15,7 @@ import { uiModules } from 'ui/modules';
 
 // import the uiExports that we want to "use"
 import 'uiExports/contextMenuActions';
-import 'uiExports/visTypes';
-import 'uiExports/visResponseHandlers';
-import 'uiExports/visRequestHandlers';
+
 import 'uiExports/inspectorViews';
 import 'uiExports/interpreter';
 import 'uiExports/savedObjectTypes';

diff --git a/x-pack/legacy/plugins/lens/index.ts b/x-pack/legacy/plugins/lens/index.ts
@@ -33,7 +33,6 @@ export const lens: LegacyPluginInitializer = kibana => {
       embeddableFactories: [`plugins/${PLUGIN_ID}/legacy`],
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
       mappings,
-      visTypes: ['plugins/lens/register_vis_type_alias'],
       savedObjectsManagement: {
         lens: {
           defaultSearchField: 'title',

diff --git a/x-pack/legacy/plugins/lens/public/legacy.ts b/x-pack/legacy/plugins/lens/public/legacy.ts
@@ -5,12 +5,15 @@
  */
 
 import { npSetup, npStart } from 'ui/new_platform';
-import { getFormat } from './legacy_imports';
+import { getFormat, visualizations } from './legacy_imports';
 
 export * from './types';
 
 import { plugin } from './index';
 
 const pluginInstance = plugin();
-pluginInstance.setup(npSetup.core, { ...npSetup.plugins, __LEGACY: { formatFactory: getFormat } });
+pluginInstance.setup(npSetup.core, {
+  ...npSetup.plugins,
+  __LEGACY: { formatFactory: getFormat, visualizations },
+});
 pluginInstance.start(npStart.core, npStart.plugins);
diff --git a/x-pack/legacy/plugins/lens/public/legacy_imports.ts b/x-pack/legacy/plugins/lens/public/legacy_imports.ts
@@ -5,3 +5,5 @@
  */
 
 export { getFormat, FormatFactory } from 'ui/visualize/loader/pipeline_helpers/utilities';
+export { setup as visualizations } from '../../../../../src/legacy/core_plugins/visualizations/public/np_ready/public/legacy';
+export { VisualizationsSetup } from '../../../../../src/legacy/core_plugins/visualizations/public';
diff --git a/x-pack/legacy/plugins/lens/public/plugin.tsx b/x-pack/legacy/plugins/lens/public/plugin.tsx
@@ -38,6 +38,8 @@ import {
 import { FormatFactory } from './legacy_imports';
 import { IEmbeddableSetup, IEmbeddableStart } from '../../../../../src/plugins/embeddable/public';
 import { EditorFrameStart } from './types';
+import { getLensAliasConfig } from './vis_type_alias';
+import { VisualizationsSetup } from './legacy_imports';
 
 export interface LensPluginSetupDependencies {
   kibanaLegacy: KibanaLegacySetup;
@@ -46,6 +48,7 @@ export interface LensPluginSetupDependencies {
   embeddable: IEmbeddableSetup;
   __LEGACY: {
     formatFactory: FormatFactory;
+    visualizations: VisualizationsSetup;
   };
 }
 
@@ -81,7 +84,7 @@ export class LensPlugin {
       expressions,
       data,
       embeddable,
-      __LEGACY: { formatFactory },
+      __LEGACY: { formatFactory, visualizations },
     }: LensPluginSetupDependencies
   ) {
     const editorFrameSetupInterface = this.editorFrameService.setup(core, {
@@ -100,6 +103,8 @@ export class LensPlugin {
     this.datatableVisualization.setup(core, dependencies);
     this.metricVisualization.setup(core, dependencies);
 
+    visualizations.types.registerAlias(getLensAliasConfig());
+
     kibanaLegacy.registerLegacyApp({
       id: 'lens',
       title: NOT_INTERNATIONALIZED_PRODUCT_NAME,

diff --git a/...ns/lens/public/register_vis_type_alias.ts → ...acy/plugins/lens/public/vis_type_alias.ts b/...ns/lens/public/register_vis_type_alias.ts → ...acy/plugins/lens/public/vis_type_alias.ts
@@ -5,10 +5,10 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { setup as visualizations } from '../../../../../src/legacy/core_plugins/visualizations/public/np_ready/public/legacy';
 import { getBasePath, getEditPath } from '../../../../plugins/lens/common';
+import { VisTypeAlias } from '../../../../../src/legacy/core_plugins/visualizations/public/np_ready/public/vis_types';
 
-visualizations.types.registerAlias({
+export const getLensAliasConfig = (): VisTypeAlias => ({
   aliasUrl: getBasePath(),
   name: 'lens',
   promotion: {

diff --git a/x-pack/legacy/plugins/maps/index.js b/x-pack/legacy/plugins/maps/index.js
@@ -78,7 +78,7 @@ export function maps(kibana) {
       },
       mappings,
       migrations,
-      visTypes: ['plugins/maps/register_vis_type_alias'],
+      hacks: ['plugins/maps/register_vis_type_alias'],
     },
     config(Joi) {
       return Joi.object({