Move generateFilters ⇒ NP

src/legacy/core_plugins/kibana/public/dashboard/dashboard_app.tsx

@@ -26,9 +26,6 @@ import { IInjector } from 'ui/chrome';
 // @ts-ignore
 import * as filterActions from 'plugins/kibana/discover/doc_table/actions/filter';
 
-// @ts-ignore
-import { getFilterGenerator } from 'ui/filter_manager';
-
 import {
   AppStateClass as TAppStateClass,
   AppState as TAppState,

src/legacy/core_plugins/kibana/public/discover/angular/context/api/__tests__/_stubs.js

@@ -26,7 +26,8 @@ export function createIndexPatternsStub() {
     get: sinon.spy(indexPatternId =>
       Promise.resolve({
         id: indexPatternId,
-        isTimeNanosBased: () => false
+        isTimeNanosBased: () => false,
+        popularizeField: () => {},
       })
     ),
   };

src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/__tests__/action_add_filter.js

@@ -19,32 +19,33 @@
 
 import expect from '@kbn/expect';
 import ngMock from 'ng_mock';
-import sinon from 'sinon';
 import { getServices } from '../../../../kibana_services';
 import { createStateStub } from './_utils';
 import { QueryParameterActionsProvider } from '../actions';
-
+import { createIndexPatternsStub } from '../../api/__tests__/_stubs';
+import { npStart } from 'ui/new_platform';
 
 describe('context app', function () {
   beforeEach(ngMock.module('kibana'));
 
+  beforeEach(ngMock.module(function createServiceStubs($provide) {
+    $provide.value('indexPatterns', createIndexPatternsStub());
+  }));
+
   describe('action addFilter', function () {
-    let filterManagerStub;
     let addFilter;
 
     beforeEach(ngMock.inject(function createPrivateStubs(Private) {
-      filterManagerStub = createQueryFilterStub();
-      Private.stub(getServices().FilterBarQueryFilterProvider, filterManagerStub);
-
+      Private.stub(getServices().FilterBarQueryFilterProvider);
       addFilter = Private(QueryParameterActionsProvider).addFilter;
     }));
 
     it('should pass the given arguments to the filterManager', function () {
       const state = createStateStub();
+      const filterManagerAddStub = npStart.plugins.data.query.filterManager.addFilters;
 
       addFilter(state)('FIELD_NAME', 'FIELD_VALUE', 'FILTER_OPERATION');
 
-      const filterManagerAddStub = filterManagerStub.addFilters;
       //get the generated filter
       const generatedFilter = filterManagerAddStub.firstCall.args[0][0];
       const queryKeys = Object.keys(generatedFilter.query.match_phrase);
@@ -55,20 +56,12 @@ describe('context app', function () {
 
     it('should pass the index pattern id to the filterManager', function () {
       const state = createStateStub();
+      const filterManagerAddStub = npStart.plugins.data.query.filterManager.addFilters;
 
       addFilter(state)('FIELD_NAME', 'FIELD_VALUE', 'FILTER_OPERATION');
 
-      const filterManagerAddStub = filterManagerStub.addFilters;
       const generatedFilter = filterManagerAddStub.firstCall.args[0][0];
-      expect(filterManagerAddStub.calledOnce).to.be(true);
       expect(generatedFilter.meta.index).to.eql('INDEX_PATTERN_ID');
     });
   });
 });
-
-function createQueryFilterStub() {
-  return {
-    addFilters: sinon.stub(),
-    getAppFilters: sinon.stub(),
-  };
-}

src/legacy/core_plugins/kibana/public/discover/angular/context/query_parameters/actions.js

@@ -18,7 +18,8 @@
  */
 
 import _ from 'lodash';
-import { getServices, getFilterGenerator } from '../../../kibana_services';
+import { generateFilters } from '../../../../../../../../plugins/data/public';
+import { npStart } from 'ui/new_platform';
 
 import {
   MAX_CONTEXT_SIZE,
@@ -27,9 +28,8 @@ import {
 } from './constants';
 
 
-export function QueryParameterActionsProvider(indexPatterns, Private) {
-  const queryFilter = Private(getServices().FilterBarQueryFilterProvider);
-  const filterGen = getFilterGenerator(queryFilter);
+export function QueryParameterActionsProvider(indexPatterns) {
+  const { filterManager } = npStart.plugins.data.query;
 
   const setPredecessorCount = (state) => (predecessorCount) => (
     state.queryParameters.predecessorCount = clamp(
@@ -55,13 +55,13 @@ export function QueryParameterActionsProvider(indexPatterns, Private) {
   );
 
   const updateFilters = () => filters => {
-    queryFilter.setFilters(filters);
+    filterManager.setFilters(filters);
   };
 
   const addFilter = (state) => async (field, values, operation) => {
     const indexPatternId = state.queryParameters.indexPatternId;
-    const newFilters = filterGen.generate(field, values, operation, indexPatternId);
-    queryFilter.addFilters(newFilters);
+    const newFilters = generateFilters(filterManager, field, values, operation, indexPatternId);
+    filterManager.addFilters(newFilters);
     const indexPattern = await indexPatterns.get(indexPatternId);
     indexPattern.popularizeField(field.name, 1);
   };

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

@@ -31,7 +31,6 @@ import './doc_table';
 import { getSort } from './doc_table/lib/get_sort';
 import { getSortForSearchSource } from './doc_table/lib/get_sort_for_search_source';
 import * as columnActions from './doc_table/actions/columns';
-import * as filterActions from './doc_table/actions/filter';
 
 import indexTemplate from './discover.html';
 import { showOpenSearchPanel } from '../top_nav/show_open_search_panel';
@@ -41,7 +40,6 @@ import { getPainlessError } from './get_painless_error';
 import {
   angular,
   buildVislibDimensions,
-  getFilterGenerator,
   getRequestInspectorStats,
   getResponseInspectorStats,
   getServices,
@@ -76,7 +74,7 @@ const {
 import { getRootBreadcrumbs, getSavedSearchBreadcrumbs } from '../breadcrumbs';
 import { extractTimeFilter, changeTimeFilter } from '../../../../data/public';
 import { start as data } from '../../../../data/public/legacy';
-
+import { generateFilters } from '../../../../../../plugins/data/public';
 
 const { savedQueryService } = data.search.services;
 
@@ -196,7 +194,6 @@ function discoverController(
   const shareContextMenuExtensions = Private(ShareContextMenuExtensionsRegistryProvider);
 
   const queryFilter = Private(FilterBarQueryFilterProvider);
-  const filterGen = getFilterGenerator(queryFilter);
 
   const inspectorAdapters = {
     requests: new RequestAdapter()
@@ -901,7 +898,8 @@ function discoverController(
   // TODO: On array fields, negating does not negate the combination, rather all terms
   $scope.filterQuery = function (field, values, operation) {
     $scope.indexPattern.popularizeField(field, 1);
-    filterActions.addFilter(field, values, operation, $scope.indexPattern.id, $scope.state, filterGen);
+    const newFilters = generateFilters(queryFilter, field, values, operation, $scope.indexPattern.id);
+    return queryFilter.addFilters(newFilters);
   };
 
   $scope.addColumn = function addColumn(columnName) {

src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable.ts

@@ -25,7 +25,9 @@ import { npStart } from 'ui/new_platform';
 import {
   esFilters,
   TimeRange,
+  FilterManager,
   onlyDisabledFiltersChanged,
+  generateFilters,
   getTime,
 } from '../../../../../../plugins/data/public';
 import { Query } from '../../../../data/public';
@@ -43,7 +45,6 @@ import { getSortForSearchSource } from '../angular/doc_table/lib/get_sort_for_se
 import {
   Adapters,
   angular,
-  getFilterGenerator,
   getRequestInspectorStats,
   getResponseInspectorStats,
   getServices,
@@ -72,18 +73,6 @@ interface SearchScope extends ng.IScope {
   isLoading?: boolean;
 }
 
-export interface FilterManager {
-  generate: (
-    field: {
-      name: string;
-      scripted: boolean;
-    },
-    values: string | string[],
-    operation: string,
-    index: number
-  ) => esFilters.Filter[];
-}
-
 interface SearchEmbeddableConfig {
   $rootScope: ng.IRootScopeService;
   $compile: ng.ICompileService;
@@ -107,7 +96,7 @@ export class SearchEmbeddable extends Embeddable<SearchInput, SearchOutput>
   private autoRefreshFetchSubscription?: Subscription;
   private subscription?: Subscription;
   public readonly type = SEARCH_EMBEDDABLE_TYPE;
-  private filterGen: FilterManager;
+  private filterManager: FilterManager;
   private abortController?: AbortController;
 
   private prevTimeRange?: TimeRange;
@@ -134,7 +123,7 @@ export class SearchEmbeddable extends Embeddable<SearchInput, SearchOutput>
       parent
     );
 
-    this.filterGen = getFilterGenerator(queryFilter);
+    this.filterManager = queryFilter as FilterManager;
     this.savedSearch = savedSearch;
     this.$rootScope = $rootScope;
     this.$compile = $compile;
@@ -251,7 +240,7 @@ export class SearchEmbeddable extends Embeddable<SearchInput, SearchOutput>
     };
 
     searchScope.filter = async (field, value, operator) => {
-      let filters = this.filterGen.generate(field, value, operator, indexPattern.id);
+      let filters = generateFilters(this.filterManager, field, value, operator, indexPattern.id);
       filters = filters.map(filter => ({
         ...filter,
         $state: { store: esFilters.FilterStateStore.APP_STATE },

src/legacy/core_plugins/kibana/public/discover/kibana_services.ts

@@ -84,8 +84,6 @@ export { angular };
 export { buildVislibDimensions } from 'ui/visualize/loader/pipeline_helpers/build_pipeline';
 // @ts-ignore
 export { callAfterBindingsWorkaround } from 'ui/compat';
-// @ts-ignore
-export { getFilterGenerator } from 'ui/filter_manager';
 export {
   getRequestInspectorStats,
   getResponseInspectorStats,