updating visualizations plugin

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

@@ -26,23 +26,8 @@
 // @ts-ignore Used only by tsvb, vega, input control vis
 export { defaultFeedbackMessage } from 'ui/vis/default_feedback_message';
 // @ts-ignore
-export { visFactory } from 'ui/np_ready/public/legacy/vis_factory';
-// @ts-ignore
 export { DefaultEditorSize } from 'ui/vis/editor_size';
 
-/**
- * Legacy types which haven't been moved to this plugin yet, but
- * should be eventually.
- *
- * @public
- */
-import * as types from 'ui/np_ready/public/legacy/vis';
-export type Vis = types.Vis;
-export type VisParams = types.VisParams;
-export type VisState = types.VisState;
-export { VisualizationController } from 'ui/np_ready/public/types/vis_type';
-export { Status } from 'ui/np_ready/public/legacy/update_status';
-
 /**
  * Static np-ready code, re-exported here so consumers can import from
  * `src/legacy/core_plugins/visualizations/public`

src/legacy/core_plugins/visualizations/public/np_ready/public/filters/brush_event.js

@@ -19,7 +19,7 @@
 
 import _ from 'lodash';
 import moment from 'moment';
-import { esFilters } from '../../../../../../../plugins/data/public';
+import { esFilters } from 'src/plugins/data/public';
 
 export function onBrushEvent(event) {
   const isNumber = event.data.ordered;

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

@@ -17,4 +17,4 @@
  * under the License.
  */
 
-export * from './filters_service';
+export * from './vis_filters';

src/legacy/core_plugins/visualizations/public/np_ready/public/filters/vis_filters.js

@@ -17,10 +17,9 @@
  * under the License.
  */
 
-import _ from 'lodash';
 import { pushFilterBarFilters } from '../../../../../../ui/public/vis/push_filters';
 import { onBrushEvent } from './brush_event';
-import { uniqFilters, esFilters } from '../../../../../../../plugins/data/public';
+import { esFilters } from '../../../../../../../plugins/data/public';
 
 /**
  * For terms aggregations on `__other__` buckets, this assembles a list of applicable filter
@@ -104,20 +103,4 @@ const createFiltersFromEvent = (event) => {
   return filters;
 };
 
-const VisFiltersProvider = (getAppState, $timeout) => {
-
-  const pushFilters = (filters, simulate) => {
-    const appState = getAppState();
-    if (filters.length && !simulate) {
-      pushFilterBarFilters(appState, uniqFilters(filters));
-      // to trigger angular digest cycle, we can get rid of this once we have either new filterManager or actions API
-      $timeout(_.noop, 0);
-    }
-  };
-
-  return {
-    pushFilters,
-  };
-};
-
-export { VisFiltersProvider, createFilter, createFiltersFromEvent, onBrushEvent };
+export { createFilter, createFiltersFromEvent, onBrushEvent };

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

@@ -43,4 +43,9 @@ export function plugin(initializerContext: PluginInitializerContext) {
 }
 
 /** @public static code */
-// TODO once items are moved from ui/vis into this service
+export { visFactory } from './vis_factory';
+export { Vis, VisParams, VisState } from './vis';
+export * from './filters';
+
+export { Status } from './legacy/update_status';
+export { buildPipeline } from './legacy/build_pipeline';

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

@@ -26,7 +26,7 @@ import {
   SchemaConfig,
   Schemas,
 } from './build_pipeline';
-import { Vis, VisState } from 'ui/vis';
+import { Vis, VisState } from '..';
 import { AggConfig } from 'ui/agg_types/agg_config';
 import { searchSourceMock } from 'ui/courier/search_source/mocks';
 

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

@@ -19,13 +19,13 @@
 
 import { cloneDeep, get } from 'lodash';
 // @ts-ignore
-import { setBounds } from 'src/legacy/ui/public/agg_types';
+import { AggConfig, setBounds } from 'src/legacy/ui/public/agg_types';
 import { SearchSource } from 'src/legacy/ui/public/courier';
-import { AggConfig, Vis, VisParams, VisState } from 'src/legacy/ui/public/vis';
 import { isDateHistogramBucketAggConfig } from 'src/legacy/ui/public/agg_types/buckets/date_histogram';
 import moment from 'moment';
 import { SerializedFieldFormat } from 'src/plugins/expressions/public';
 import { createFormat } from '../../../../../../ui/public/visualize/loader/pipeline_helpers/utilities';
+import { Vis, VisParams, VisState } from '..';
 
 interface SchemaConfigParams {
   precision?: number;

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

@@ -17,29 +17,14 @@
  * under the License.
  */
 import { PluginInitializerContext, CoreSetup, CoreStart, Plugin } from 'src/core/public';
-
-import { FiltersService, FiltersSetup } from './filters';
 import { TypesService, TypesSetup, TypesStart } from './types';
 
-/**
- * Interface for any dependencies on other plugins' contracts.
- *
- * @internal
- */
-interface VisualizationsPluginSetupDependencies {
-  __LEGACY: {
-    VisFiltersProvider: any;
-    createFilter: any;
-  };
-}
-
 /**
  * Interface for this plugin's returned setup/start contracts.
  *
  * @public
  */
 export interface VisualizationsSetup {
-  filters: FiltersSetup;
   types: TypesSetup;
 }
 
@@ -58,20 +43,14 @@ export interface VisualizationsStart {
  */
 export class VisualizationsPlugin
   implements
-    Plugin<VisualizationsSetup, VisualizationsStart, VisualizationsPluginSetupDependencies> {
-  private readonly filters: FiltersService = new FiltersService();
+    Plugin<VisualizationsSetup, VisualizationsStart> {
   private readonly types: TypesService = new TypesService();
 
   constructor(initializerContext: PluginInitializerContext) {}
 
-  public setup(core: CoreSetup, { __LEGACY }: VisualizationsPluginSetupDependencies) {
-    const { VisFiltersProvider, createFilter } = __LEGACY;
+  public setup(core: CoreSetup) {
 
     return {
-      filters: this.filters.setup({
-        VisFiltersProvider,
-        createFilter,
-      }),
       types: this.types.setup(),
     };
   }
@@ -83,7 +62,6 @@ export class VisualizationsPlugin
   }
 
   public stop() {
-    this.filters.stop();
     this.types.stop();
   }
 }

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

@@ -18,3 +18,7 @@
  */
 
 export * from './types_service';
+// @ts-ignore
+export { BaseVisType } from './base_vis_type';
+// @ts-ignore
+export { ReactVisType } from './react_vis_type';

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

@@ -19,6 +19,7 @@
 
 import { VisType } from './types/vis_type';
 import { AggConfigs } from '../../../../../ui/public/agg_types/agg_configs';
+import { Status } from './legacy/update_status';
 
 export interface Vis {
   type: VisType;
@@ -40,3 +41,10 @@ export interface VisState {
   params: VisParams;
   aggs: AggConfigs;
 }
+
+export declare class VisualizationController {
+  constructor(element: HTMLElement, vis: Vis);
+  public render(visData: any, visParams: any, update: { [key in Status]: boolean }): Promise<void>;
+  public destroy(): void;
+  public isLoaded?(): Promise<void> | void;
+}

src/legacy/core_plugins/visualizations/public/np_ready/public/vis_factory.js → src/legacy/core_plugins/visualizations/public/np_ready/public/vis_factory.ts

@@ -17,19 +17,13 @@
  * under the License.
  */
 
-import { BaseVisType, ReactVisType } from '../../../../../ui/public/vis/vis_types';
+import { BaseVisType, ReactVisType } from './types';
 
 export const visFactory = {
-  createBaseVisualization: (config) => {
+  createBaseVisualization: (config: any) => {
     return new BaseVisType(config);
   },
-  createReactVisualization: (config) => {
+  createReactVisualization: (config: any) => {
     return new ReactVisType(config);
   },
 };
-
-export const VisFactoryProvider = () => {
-  return {
-    ...visFactory,
-  };
-};

src/legacy/ui/public/vis/index.d.ts

@@ -18,5 +18,4 @@
  */
 
 export { AggConfig } from '../agg_types/agg_config';
-export { Vis, VisParams, VisState } from '../../../core_plugins/visualizations/public/np_ready/public/vis';
-export { VisualizationController, VisType } from '../../../core_plugins/visualizations/public/np_ready/public/types/vis_type';
+export { Vis, VisParams, VisState, VisType } from '../../../core_plugins/visualizations/public';