[NP] Move visTypeXy plugin (elastic#63449) (elastic#63606)

* Move vis_type_xy into NP * Substitute usage in vis_type_vislib * Disable plugin by default # Conflicts: # .github/CODEOWNERS
tsullivan · Apr 15, 2020 · 6ab2d32 · 6ab2d32
1 parent cd97cc4
commit 6ab2d32
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 93 deletions.
diff --git a/src/legacy/core_plugins/vis_type_vislib/public/legacy.ts b/src/legacy/core_plugins/vis_type_vislib/public/legacy.ts
@@ -30,6 +30,7 @@ const setupPlugins: Readonly<VisTypeVislibPluginSetupDependencies> = {
   expressions: npSetup.plugins.expressions,
   visualizations: npSetup.plugins.visualizations,
   charts: npSetup.plugins.charts,
+  visTypeXy: npSetup.plugins.visTypeXy,
 };
 
 const startPlugins: Readonly<VisTypeVislibPluginStartDependencies> = {

diff --git a/src/legacy/core_plugins/vis_type_vislib/public/plugin.ts b/src/legacy/core_plugins/vis_type_vislib/public/plugin.ts
@@ -24,6 +24,7 @@ import {
   PluginInitializerContext,
 } from 'kibana/public';
 
+import { VisTypeXyPluginSetup } from 'src/plugins/vis_type_xy/public';
 import { Plugin as ExpressionsPublicPlugin } from '../../../../plugins/expressions/public';
 import { VisualizationsSetup } from '../../../../plugins/visualizations/public';
 import { createVisTypeVislibVisFn } from './vis_type_vislib_vis_fn';
@@ -39,7 +40,6 @@ import {
   createGoalVisTypeDefinition,
 } from './vis_type_vislib_vis_types';
 import { ChartsPluginSetup } from '../../../../plugins/charts/public';
-import { ConfigSchema as VisTypeXyConfigSchema } from '../../vis_type_xy';
 import { DataPublicPluginStart } from '../../../../plugins/data/public';
 import { setFormatService, setDataActions } from './services';
 
@@ -53,6 +53,7 @@ export interface VisTypeVislibPluginSetupDependencies {
   expressions: ReturnType<ExpressionsPublicPlugin['setup']>;
   visualizations: VisualizationsSetup;
   charts: ChartsPluginSetup;
+  visTypeXy?: VisTypeXyPluginSetup;
 }
 
 /** @internal */
@@ -68,7 +69,7 @@ export class VisTypeVislibPlugin implements Plugin<void, void> {
 
   public async setup(
     core: VisTypeVislibCoreSetup,
-    { expressions, visualizations, charts }: VisTypeVislibPluginSetupDependencies
+    { expressions, visualizations, charts, visTypeXy }: VisTypeVislibPluginSetupDependencies
   ) {
     const visualizationDependencies: Readonly<VisTypeVislibDependencies> = {
       uiSettings: core.uiSettings,
@@ -86,12 +87,8 @@ export class VisTypeVislibPlugin implements Plugin<void, void> {
     ];
     const vislibFns = [createVisTypeVislibVisFn(), createPieVisFn()];
 
-    const visTypeXy = core.injectedMetadata.getInjectedVar('visTypeXy') as
-      | VisTypeXyConfigSchema['visTypeXy']
-      | undefined;
-
     // if visTypeXy plugin is disabled it's config will be undefined
-    if (!visTypeXy || !visTypeXy.enabled) {
+    if (!visTypeXy) {
       const convertedTypes: any[] = [];
       const convertedFns: any[] = [];
 

diff --git a/src/legacy/core_plugins/vis_type_xy/index.ts b/src/legacy/core_plugins/vis_type_xy/index.ts
diff --git a/src/legacy/core_plugins/vis_type_xy/package.json b/src/legacy/core_plugins/vis_type_xy/package.json
diff --git a/src/legacy/ui/public/new_platform/new_platform.ts b/src/legacy/ui/public/new_platform/new_platform.ts
@@ -22,6 +22,7 @@ import { IScope } from 'angular';
 import { UiActionsStart, UiActionsSetup } from 'src/plugins/ui_actions/public';
 import { EmbeddableStart, EmbeddableSetup } from 'src/plugins/embeddable/public';
 import { createBrowserHistory } from 'history';
+import { VisTypeXyPluginSetup } from 'src/plugins/vis_type_xy/public';
 import { DashboardStart } from '../../../../plugins/dashboard/public';
 import { setSetupServices, setStartServices } from './set_services';
 import {
@@ -93,6 +94,7 @@ export interface PluginsSetup {
   savedObjectsManagement: SavedObjectsManagementPluginSetup;
   mapsLegacy: MapsLegacyPluginSetup;
   indexPatternManagement: IndexPatternManagementSetup;
+  visTypeXy?: VisTypeXyPluginSetup;
 }
 
 export interface PluginsStart {

diff --git a/src/plugins/vis_type_xy/kibana.json b/src/plugins/vis_type_xy/kibana.json
@@ -0,0 +1,7 @@
+{
+  "id": "visTypeXy",
+  "version": "kibana",
+  "server": true,
+  "ui": true,
+  "requiredPlugins": ["charts", "expressions", "visualizations"]
+}
diff --git a/.../core_plugins/vis_type_xy/public/index.ts → src/plugins/vis_type_xy/public/index.ts b/.../core_plugins/vis_type_xy/public/index.ts → src/plugins/vis_type_xy/public/index.ts
@@ -17,9 +17,11 @@
  * under the License.
  */
 
-import { PluginInitializerContext } from '../../../../core/public';
+import { PluginInitializerContext } from '../../../core/public';
 import { VisTypeXyPlugin as Plugin } from './plugin';
 
+export { VisTypeXyPluginSetup } from './plugin';
+
 export function plugin(initializerContext: PluginInitializerContext) {
   return new Plugin(initializerContext);
 }
diff --git a/...core_plugins/vis_type_xy/public/plugin.ts → src/plugins/vis_type_xy/public/plugin.ts b/...core_plugins/vis_type_xy/public/plugin.ts → src/plugins/vis_type_xy/public/plugin.ts
@@ -25,18 +25,18 @@ import {
   PluginInitializerContext,
 } from 'kibana/public';
 
-import { Plugin as ExpressionsPublicPlugin } from '../../../../plugins/expressions/public';
-import {
-  VisualizationsSetup,
-  VisualizationsStart,
-} from '../../../../plugins/visualizations/public';
-import { ChartsPluginSetup } from '../../../../plugins/charts/public';
+import { Plugin as ExpressionsPublicPlugin } from '../../expressions/public';
+import { VisualizationsSetup, VisualizationsStart } from '../../visualizations/public';
+import { ChartsPluginSetup } from '../../charts/public';
 
 export interface VisTypeXyDependencies {
   uiSettings: IUiSettingsClient;
   charts: ChartsPluginSetup;
 }
 
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface VisTypeXyPluginSetup {}
+
 /** @internal */
 export interface VisTypeXyPluginSetupDependencies {
   expressions: ReturnType<ExpressionsPublicPlugin['setup']>;
@@ -53,7 +53,7 @@ export interface VisTypeXyPluginStartDependencies {
 type VisTypeXyCoreSetup = CoreSetup<VisTypeXyPluginStartDependencies, void>;
 
 /** @internal */
-export class VisTypeXyPlugin implements Plugin<void, void> {
+export class VisTypeXyPlugin implements Plugin<VisTypeXyPluginSetup, void> {
   constructor(public initializerContext: PluginInitializerContext) {}
 
   public async setup(
@@ -77,6 +77,8 @@ export class VisTypeXyPlugin implements Plugin<void, void> {
     visTypeDefinitions.forEach((vis: any) =>
       visualizations.createBaseVisualization(vis(visualizationDependencies))
     );
+
+    return {};
   }
 
   public start(core: CoreStart, deps: VisTypeXyPluginStartDependencies) {

diff --git a/...core_plugins/vis_type_xy/public/legacy.ts → src/plugins/vis_type_xy/server/index.ts b/...core_plugins/vis_type_xy/public/legacy.ts → src/plugins/vis_type_xy/server/index.ts
@@ -17,24 +17,13 @@
  * under the License.
  */
 
-import { npSetup, npStart } from 'ui/new_platform';
-import { PluginInitializerContext } from 'kibana/public';
+import { schema } from '@kbn/config-schema';
 
-import { plugin } from '.';
-import { VisTypeXyPluginSetupDependencies, VisTypeXyPluginStartDependencies } from './plugin';
-
-const setupPlugins: Readonly<VisTypeXyPluginSetupDependencies> = {
-  expressions: npSetup.plugins.expressions,
-  visualizations: npSetup.plugins.visualizations,
-  charts: npSetup.plugins.charts,
-};
-
-const startPlugins: Readonly<VisTypeXyPluginStartDependencies> = {
-  expressions: npStart.plugins.expressions,
-  visualizations: npStart.plugins.visualizations,
+export const config = {
+  schema: schema.object({ enabled: schema.boolean({ defaultValue: false }) }),
 };
 
-const pluginInstance = plugin({} as PluginInitializerContext);
-
-export const setup = pluginInstance.setup(npSetup.core, setupPlugins);
-export const start = pluginInstance.start(npStart.core, startPlugins);
+export const plugin = () => ({
+  setup() {},
+  start() {},
+});