wip

src/legacy/core_plugins/visualizations/index.ts

@@ -24,7 +24,7 @@ export const visualizations: LegacyPluginInitializer = kibana =>
   new kibana.Plugin({
     id: 'visualizations',
     publicDir: resolve(__dirname, 'public'),
-    require: ['vis_default_editor'],
+    require: [],
     uiExports: {
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
     },

src/legacy/core_plugins/visualizations/public/np_ready/kibana.json

@@ -3,5 +3,5 @@
   "version": "kibana",
   "server": false,
   "ui": true,
-  "requiredPlugins": ["data", "search", "expressions", "uiActions"]
+  "requiredPlugins": ["data", "expressions", "uiActions", "embeddable", "usageCollection"]
 }

src/legacy/core_plugins/visualizations/public/np_ready/public/legacy.ts

@@ -19,6 +19,7 @@
 
 /* eslint-disable @kbn/eslint/no-restricted-paths */
 import { npSetup, npStart } from 'ui/new_platform';
+import { start as legacyDataStart } from '../../../../data/public/legacy';
 /* eslint-enable @kbn/eslint/no-restricted-paths */
 
 import { PluginInitializerContext } from '../../../../../../core/public';
@@ -28,4 +29,9 @@ import { plugin } from '.';
 const pluginInstance = plugin({} as PluginInitializerContext);
 
 export const setup = pluginInstance.setup(npSetup.core, npSetup.plugins);
-export const start = pluginInstance.start(npStart.core, npStart.plugins);
+export const start = pluginInstance.start(npStart.core, {
+  ...npStart.plugins,
+  __LEGACY: {
+    aggs: legacyDataStart.search.aggs,
+  },
+});

src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.test.ts

@@ -27,9 +27,9 @@ import {
   Schemas,
 } from './build_pipeline';
 import { Vis } from '..';
-import { IAggConfig } from '../../../legacy_imports';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { searchSourceMock } from '../../../../../../../plugins/data/public/search/search_source/mocks';
+import { IAggConfig } from '../../../../../data/public';
 
 jest.mock('ui/new_platform');
 

src/legacy/core_plugins/visualizations/public/np_ready/public/legacy/build_pipeline.ts

@@ -21,8 +21,8 @@ import { cloneDeep, get } from 'lodash';
 import moment from 'moment';
 import { SerializedFieldFormat } from '../../../../../../../plugins/expressions/public';
 import { fieldFormats, ISearchSource } from '../../../../../../../plugins/data/public';
-import { IAggConfig, setBounds, isDateHistogramBucketAggConfig } from '../../../legacy_imports';
 import { Vis, VisParams } from '../types';
+import { IAggConfig, isDateHistogramBucketAggConfig, setBounds } from '../../../../../data/public';
 
 interface SchemaConfigParams {
   precision?: number;

src/legacy/core_plugins/visualizations/public/np_ready/public/mocks.ts

@@ -67,6 +67,11 @@ const createInstance = async () => {
       data: dataPluginMock.createStartContract(),
       expressions: expressionsPluginMock.createStartContract(),
       uiActions: uiActionsPluginMock.createStartContract(),
+      __LEGACY: {
+        aggs: {
+          createAggConfigs: jest.fn(),
+        } as any,
+      },
     });
 
   return {

src/legacy/core_plugins/visualizations/public/np_ready/public/plugin.ts

@@ -38,6 +38,7 @@ import {
   setUiActions,
   setSavedVisualizationsLoader,
   setTimeFilter,
+  setAggs,
 } from './services';
 import { VISUALIZE_EMBEDDABLE_TYPE, VisualizeEmbeddableFactory } from './embeddable';
 import { ExpressionsSetup, ExpressionsStart } from '../../../../../../plugins/expressions/public';
@@ -53,6 +54,7 @@ import { createSavedVisLoader, SavedVisualizationsLoader } from './saved_visuali
 import { VisImpl, VisImplConstructor } from './vis_impl';
 import { showNewVisModal } from './wizard';
 import { UiActionsStart } from '../../../../../../plugins/ui_actions/public';
+import { DataStart as LegacyDataStart } from '../../../../data/public';
 
 /**
  * Interface for this plugin's returned setup/start contracts.
@@ -81,6 +83,9 @@ export interface VisualizationsStartDeps {
   data: DataPublicPluginStart;
   expressions: ExpressionsStart;
   uiActions: UiActionsStart;
+  __LEGACY: {
+    aggs: LegacyDataStart['search']['aggs'];
+  };
 }
 
 /**
@@ -123,7 +128,7 @@ export class VisualizationsPlugin
 
   public start(
     core: CoreStart,
-    { data, expressions, uiActions }: VisualizationsStartDeps
+    { data, expressions, uiActions, __LEGACY: { aggs } }: VisualizationsStartDeps
   ): VisualizationsStart {
     const types = this.types.start();
     setI18n(core.i18n);
@@ -136,6 +141,7 @@ export class VisualizationsPlugin
     setExpressions(expressions);
     setUiActions(uiActions);
     setTimeFilter(data.query.timefilter.timefilter);
+    setAggs(aggs);
     const savedVisualizationsLoader = createSavedVisLoader({
       savedObjectsClient: core.savedObjects.client,
       indexPatterns: data.indexPatterns,

src/legacy/core_plugins/visualizations/public/np_ready/public/services.ts

@@ -35,6 +35,7 @@ import { UsageCollectionSetup } from '../../../../../../plugins/usage_collection
 import { ExpressionsStart } from '../../../../../../plugins/expressions/public';
 import { UiActionsStart } from '../../../../../../plugins/ui_actions/public';
 import { SavedVisualizationsLoader } from './saved_visualizations';
+import { DataStart as LegacyDataStart } from '../../../../data/public';
 
 export const [getUISettings, setUISettings] = createGetterSetter<IUiSettingsClient>('UISettings');
 
@@ -71,3 +72,7 @@ export const [getUiActions, setUiActions] = createGetterSetter<UiActionsStart>('
 export const [getSavedVisualizationsLoader, setSavedVisualizationsLoader] = createGetterSetter<
   SavedVisualizationsLoader
 >('SavedVisualisationsLoader');
+
+export const [getAggs, setAggs] = createGetterSetter<LegacyDataStart['search']['aggs']>(
+  'AggConfigs'
+);

src/legacy/core_plugins/visualizations/public/np_ready/public/vis.ts

@@ -18,8 +18,8 @@
  */
 
 import { VisType } from './vis_types';
-import { IAggConfigs } from '../../legacy_imports';
 import { Status } from './legacy/update_status';
+import { IAggConfigs } from '../../../../data/public';
 
 export interface Vis {
   type: VisType;

src/legacy/core_plugins/visualizations/public/np_ready/public/vis_impl.js

@@ -30,9 +30,8 @@
 import { EventEmitter } from 'events';
 import _ from 'lodash';
 import { PersistedState } from '../../../../../../../src/plugins/visualizations/public';
-import { createAggConfigs } from '../../legacy_imports';
 import { updateVisualizationConfig } from './legacy/vis_update';
-import { getTypes } from './services';
+import { getTypes, getAggs } from './services';
 
 class VisImpl extends EventEmitter {
   constructor(indexPattern, visState) {
@@ -83,7 +82,7 @@ class VisImpl extends EventEmitter {
     updateVisualizationConfig(state.params, this.params);
 
     if (state.aggs || !this.aggs) {
-      this.aggs = createAggConfigs(
+      this.aggs = getAggs().createAggConfigs(
         this.indexPattern,
         state.aggs ? state.aggs.aggs || state.aggs : [],
         this.type.schemas.all
@@ -125,7 +124,7 @@ class VisImpl extends EventEmitter {
 
   copyCurrentState(includeDisabled = false) {
     const state = this.getCurrentState(includeDisabled);
-    state.aggs = createAggConfigs(
+    state.aggs = getAggs().createAggConfigs(
       this.indexPattern,
       state.aggs.aggs || state.aggs,
       this.type.schemas.all