[TSVB] Shim new platform

src/legacy/core_plugins/metrics/index.js → src/legacy/core_plugins/metrics/index.ts

@@ -18,34 +18,36 @@
  */
 
 import { resolve } from 'path';
+import { Legacy } from 'kibana';
+import { PluginInitializerContext } from 'src/core/server';
+import { InternalCoreSetup } from 'src/core/server';
+import { metricsPlugin } from './server/np/';
 
-import { fieldsRoutes } from './server/routes/fields';
-import { visDataRoutes } from './server/routes/vis';
-import { SearchStrategiesRegister } from './server/lib/search_strategies/search_strategies_register';
-
-export default function(kibana) {
+// eslint-disable-next-line import/no-default-export
+export default function(kibana: any) {
   return new kibana.Plugin({
-    require: ['kibana', 'elasticsearch'],
+    id: 'metrics',
+
+    require: ['kibana', 'elasticsearch', 'visualizations', 'data'],
 
     uiExports: {
-      visTypes: ['plugins/metrics/kbn_vis_types'],
-      interpreter: ['plugins/metrics/tsvb_fn'],
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
+      hacks: ['plugins/metrics/'],
     },
 
-    config(Joi) {
+    config(Joi: any) {
       return Joi.object({
         enabled: Joi.boolean().default(true),
         chartResolution: Joi.number().default(150),
         minimumBucketSize: Joi.number().default(10),
       }).default();
     },
 
-    init(server) {
-      fieldsRoutes(server);
-      visDataRoutes(server);
+    init(server: Legacy.Server) {
+      const initializerContext = {} as PluginInitializerContext;
+      const core = { http: { server } } as InternalCoreSetup;
 
-      SearchStrategiesRegister.init(server);
+      metricsPlugin(initializerContext).setup(core);
     },
   });
 }

src/legacy/core_plugins/metrics/public/kbn_vis_types/editor_controller.js → src/legacy/core_plugins/metrics/public/editor_controller.js

@@ -21,7 +21,7 @@ import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { I18nContext } from 'ui/i18n';
 import chrome from 'ui/chrome';
-import { fetchIndexPatternFields } from '../lib/fetch_fields';
+import { fetchIndexPatternFields } from './lib/fetch_fields';
 
 function ReactEditorControllerProvider(config) {
   class ReactEditorController {

src/legacy/core_plugins/metrics/public/index.ts

@@ -0,0 +1,51 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+// @ts-ignore
+import { functionsRegistry } from 'plugins/interpreter/registries';
+// @ts-ignore
+import { tsvb } from './tsvb_fn';
+// @ts-ignore
+import { MetricsVis } from './kbn_vis_type';
+import { visualizations } from '../../visualizations/public';
+
+export class Plugin {
+  // @ts-ignore
+  public setup(core, plugins) {
+    plugins.data.expressions.functionsRegistry.register(tsvb);
+    // register the provider with the visTypes registry so that other know it exists
+    plugins.visualizations.types.VisTypesRegistryProvider.register(MetricsVis);
+  }
+
+  public start() {}
+
+  public stop() {}
+}
+
+const core = {};
+const plugins = {
+  data: {
+    expressions: {
+      functionsRegistry,
+    },
+  },
+  visualizations,
+};
+
+new Plugin().setup(core, plugins);

src/legacy/core_plugins/metrics/public/kbn_vis_types/index.js → src/legacy/core_plugins/metrics/public/kbn_vis_type.js

@@ -17,24 +17,22 @@
  * under the License.
  */
 
+import chrome from 'ui/chrome';
 import { MetricsRequestHandlerProvider } from './request_handler';
 import { i18n } from '@kbn/i18n';
 import { ReactEditorControllerProvider } from './editor_controller';
-import { VisFactoryProvider } from 'ui/vis/vis_factory';
 import { defaultFeedbackMessage } from 'ui/vis/default_feedback_message';
+import { visFactory } from '../../visualizations/public';
 
-import { PANEL_TYPES } from '../../common/panel_types';
+import { PANEL_TYPES } from '../common/panel_types';
 
-// register the provider with the visTypes registry so that other know it exists
-import { VisTypesRegistryProvider } from 'ui/registry/vis_types';
-VisTypesRegistryProvider.register(MetricsVisProvider);
+const uiSettings = chrome.getUiSettingsClient();
 
-export function MetricsVisProvider(Private) {
-  const VisFactory = Private(VisFactoryProvider);
-  const ReactEditorController = Private(ReactEditorControllerProvider).handler;
-  const metricsRequestHandler = Private(MetricsRequestHandlerProvider).handler;
+export function MetricsVis() {
+  const ReactEditorController = new ReactEditorControllerProvider(uiSettings).handler;
+  const metricsRequestHandler = new MetricsRequestHandlerProvider(uiSettings).handler;
 
-  return VisFactory.createReactVisualization({
+  return visFactory.createReactVisualization({
     name: 'metrics',
     title: i18n.translate('tsvb.kbnVisTypes.metricsTitle', { defaultMessage: 'TSVB' }),
     description: i18n.translate('tsvb.kbnVisTypes.metricsDescription', {
@@ -76,11 +74,11 @@ export function MetricsVisProvider(Private) {
         show_legend: 1,
         show_grid: 1,
       },
-      component: require('../components/vis_editor').VisEditor,
+      component: require('./components/vis_editor').VisEditor,
     },
     editor: ReactEditorController,
     editorConfig: {
-      component: require('../components/vis_editor').VisEditor,
+      component: require('./components/vis_editor').VisEditor,
     },
     options: {
       showQueryBar: false,

src/legacy/core_plugins/metrics/public/kbn_vis_types/request_handler.js → src/legacy/core_plugins/metrics/public/request_handler.js

@@ -17,13 +17,13 @@
  * under the License.
  */
 
-import { validateInterval } from '../lib/validate_interval';
+import { validateInterval } from './lib/validate_interval';
 import { timezoneProvider } from 'ui/vis/lib/timezone';
 import { timefilter } from 'ui/timefilter';
 import { kfetch } from 'ui/kfetch';
 
-const MetricsRequestHandlerProvider = function(Private, config) {
-  const timezone = Private(timezoneProvider)();
+const MetricsRequestHandlerProvider = function(config) {
+  const timezone = timezoneProvider();
 
   return {
     name: 'metrics',

src/legacy/core_plugins/metrics/public/tsvb_fn.js

@@ -17,10 +17,9 @@
  * under the License.
  */
 
-import { functionsRegistry } from 'plugins/interpreter/registries';
 import { get } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { MetricsRequestHandlerProvider } from './kbn_vis_types/request_handler';
+import { MetricsRequestHandlerProvider } from './request_handler';
 import { PersistedState } from 'ui/persisted_state';
 
 import chrome from 'ui/chrome';
@@ -75,5 +74,3 @@ export const tsvb = () => ({
     };
   },
 });
-
-functionsRegistry.register(tsvb);

src/legacy/core_plugins/metrics/server/np/index.ts

@@ -0,0 +1,25 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { PluginInitializerContext } from 'src/core/server';
+import { MetricsPlugin } from './plugin';
+
+export function metricsPlugin(initializerContext: PluginInitializerContext) {
+  return new MetricsPlugin();
+}

src/legacy/core_plugins/metrics/server/np/plugin.ts

@@ -0,0 +1,36 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { InternalCoreSetup } from 'kibana/server';
+// @ts-ignore
+import { fieldsRoutes } from '../routes/fields';
+// @ts-ignore
+import { visDataRoutes } from '../routes/vis';
+// @ts-ignore
+import { SearchStrategiesRegister } from '../lib/search_strategies/search_strategies_register';
+
+export class MetricsPlugin {
+  public setup(core: InternalCoreSetup) {
+    const { http } = core;
+    fieldsRoutes(http.server);
+    visDataRoutes(http.server);
+
+    SearchStrategiesRegister.init(http.server);
+  }
+}