Skip to content

Commit 65fb3a8

Browse files
authored
removing references to visTypes uiExports (#58337) (#59061)
1 parent f626539 commit 65fb3a8

File tree

11 files changed

+18
-18
lines changed

11 files changed

+18
-18
lines changed

src/legacy/core_plugins/kibana/public/kibana.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ import { npSetup } from 'ui/new_platform';
2626

2727
// import the uiExports that we want to "use"
2828
import 'uiExports/home';
29-
import 'uiExports/visTypes';
30-
3129
import 'uiExports/visualize';
3230
import 'uiExports/savedObjectTypes';
3331
import 'uiExports/fieldFormatEditors';

test/interpreter_functional/plugins/kbn_tp_run_pipeline/public/legacy.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ import 'ui/autoload/all';
2828
// Used to run esaggs queries
2929
import 'uiExports/fieldFormats';
3030
import 'uiExports/search';
31-
import 'uiExports/visRequestHandlers';
32-
import 'uiExports/visResponseHandlers';
3331
// Used for kibana_context function
3432

3533
import 'uiExports/savedObjectTypes';

test/plugin_functional/plugins/kbn_tp_custom_visualizations/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
export default function(kibana) {
2121
return new kibana.Plugin({
2222
uiExports: {
23-
visTypes: ['plugins/kbn_tp_custom_visualizations/self_changing_vis/self_changing_vis'],
23+
hacks: ['plugins/kbn_tp_custom_visualizations/self_changing_vis/self_changing_vis'],
2424
},
2525
});
2626
}

x-pack/legacy/plugins/canvas/public/legacy_start.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
// Import the uiExports that the application uses
99
// These will go away as these plugins are converted to NP
1010
import 'ui/autoload/all';
11-
import 'uiExports/visTypes';
12-
import 'uiExports/visResponseHandlers';
13-
import 'uiExports/visRequestHandlers';
1411
import 'uiExports/savedObjectTypes';
1512
import 'uiExports/spyModes';
1613
import 'uiExports/embeddableFactories';

x-pack/legacy/plugins/dashboard_mode/public/dashboard_viewer.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ import { uiModules } from 'ui/modules';
1515

1616
// import the uiExports that we want to "use"
1717
import 'uiExports/contextMenuActions';
18-
import 'uiExports/visTypes';
19-
import 'uiExports/visResponseHandlers';
20-
import 'uiExports/visRequestHandlers';
18+
2119
import 'uiExports/inspectorViews';
2220
import 'uiExports/interpreter';
2321
import 'uiExports/savedObjectTypes';

x-pack/legacy/plugins/lens/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ export const lens: LegacyPluginInitializer = kibana => {
3333
embeddableFactories: [`plugins/${PLUGIN_ID}/legacy`],
3434
styleSheetPaths: resolve(__dirname, 'public/index.scss'),
3535
mappings,
36-
visTypes: ['plugins/lens/register_vis_type_alias'],
3736
savedObjectsManagement: {
3837
lens: {
3938
defaultSearchField: 'title',

x-pack/legacy/plugins/lens/public/legacy.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,15 @@
55
*/
66

77
import { npSetup, npStart } from 'ui/new_platform';
8-
import { getFormat } from './legacy_imports';
8+
import { getFormat, visualizations } from './legacy_imports';
99

1010
export * from './types';
1111

1212
import { plugin } from './index';
1313

1414
const pluginInstance = plugin();
15-
pluginInstance.setup(npSetup.core, { ...npSetup.plugins, __LEGACY: { formatFactory: getFormat } });
15+
pluginInstance.setup(npSetup.core, {
16+
...npSetup.plugins,
17+
__LEGACY: { formatFactory: getFormat, visualizations },
18+
});
1619
pluginInstance.start(npStart.core, npStart.plugins);

x-pack/legacy/plugins/lens/public/legacy_imports.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@
55
*/
66

77
export { getFormat, FormatFactory } from 'ui/visualize/loader/pipeline_helpers/utilities';
8+
export { setup as visualizations } from '../../../../../src/legacy/core_plugins/visualizations/public/np_ready/public/legacy';
9+
export { VisualizationsSetup } from '../../../../../src/legacy/core_plugins/visualizations/public';

x-pack/legacy/plugins/lens/public/plugin.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ import {
3838
import { FormatFactory } from './legacy_imports';
3939
import { IEmbeddableSetup, IEmbeddableStart } from '../../../../../src/plugins/embeddable/public';
4040
import { EditorFrameStart } from './types';
41+
import { getLensAliasConfig } from './vis_type_alias';
42+
import { VisualizationsSetup } from './legacy_imports';
4143

4244
export interface LensPluginSetupDependencies {
4345
kibanaLegacy: KibanaLegacySetup;
@@ -46,6 +48,7 @@ export interface LensPluginSetupDependencies {
4648
embeddable: IEmbeddableSetup;
4749
__LEGACY: {
4850
formatFactory: FormatFactory;
51+
visualizations: VisualizationsSetup;
4952
};
5053
}
5154

@@ -81,7 +84,7 @@ export class LensPlugin {
8184
expressions,
8285
data,
8386
embeddable,
84-
__LEGACY: { formatFactory },
87+
__LEGACY: { formatFactory, visualizations },
8588
}: LensPluginSetupDependencies
8689
) {
8790
const editorFrameSetupInterface = this.editorFrameService.setup(core, {
@@ -100,6 +103,8 @@ export class LensPlugin {
100103
this.datatableVisualization.setup(core, dependencies);
101104
this.metricVisualization.setup(core, dependencies);
102105

106+
visualizations.types.registerAlias(getLensAliasConfig());
107+
103108
kibanaLegacy.registerLegacyApp({
104109
id: 'lens',
105110
title: NOT_INTERNATIONALIZED_PRODUCT_NAME,

x-pack/legacy/plugins/lens/public/register_vis_type_alias.ts renamed to x-pack/legacy/plugins/lens/public/vis_type_alias.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
*/
66

77
import { i18n } from '@kbn/i18n';
8-
import { setup as visualizations } from '../../../../../src/legacy/core_plugins/visualizations/public/np_ready/public/legacy';
98
import { getBasePath, getEditPath } from '../../../../plugins/lens/common';
9+
import { VisTypeAlias } from '../../../../../src/legacy/core_plugins/visualizations/public/np_ready/public/vis_types';
1010

11-
visualizations.types.registerAlias({
11+
export const getLensAliasConfig = (): VisTypeAlias => ({
1212
aliasUrl: getBasePath(),
1313
name: 'lens',
1414
promotion: {

0 commit comments

Comments
 (0)