Merge remote-tracking branch 'upstream/master' into newplatform/misc/…

…storage

src/legacy/core_plugins/data/public/filter/action/apply_filter_action.ts

@@ -25,8 +25,8 @@ import {
   createAction,
   IncompatibleActionError,
 } from '../../../../../../plugins/ui_actions/public';
-import { changeTimeFilter, extractTimeFilter, FilterManager } from '../filter_manager';
-import { TimefilterContract } from '../../timefilter';
+import { FilterManager } from '../../../../../../plugins/data/public';
+import { TimefilterContract, changeTimeFilter, extractTimeFilter } from '../../timefilter';
 import { applyFiltersPopover } from '../apply_filters/apply_filters_popover';
 import { IndexPatternsStart } from '../../index_patterns';
 export const GLOBAL_APPLY_FILTER_ACTION = 'GLOBAL_APPLY_FILTER_ACTION';

src/legacy/core_plugins/data/public/filter/apply_filters/apply_filter_popover_content.tsx

@@ -33,7 +33,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import React, { Component } from 'react';
 import { IndexPattern } from '../../index_patterns';
 import { getFilterDisplayText } from '../filter_bar/filter_editor/lib/get_filter_display_text';
-import { mapAndFlattenFilters } from '../filter_manager/lib/map_and_flatten_filters';
+import { mapAndFlattenFilters } from '../../../../../../plugins/data/public';
 import { getDisplayValueFromFilter } from '../filter_bar/filter_editor/lib/get_display_value';
 
 interface Props {

src/legacy/core_plugins/data/public/filter/filter_manager/filter_state_manager.test.ts

@@ -24,7 +24,7 @@ import { FilterStateManager } from './filter_state_manager';
 
 import { StubState } from './test_helpers/stub_state';
 import { getFilter } from './test_helpers/get_stub_filter';
-import { FilterManager } from './filter_manager';
+import { FilterManager } from '../../../../../../plugins/data/public';
 
 import { coreMock } from '../../../../../../core/public/mocks';
 const setupMock = coreMock.createSetup();
@@ -101,25 +101,29 @@ describe('filter_state_manager', () => {
     });
 
     test('should update filter manager global filters', done => {
-      const f1 = getFilter(FilterStateStore.GLOBAL_STATE, false, false, 'age', 34);
-      globalStateStub.filters.push(f1);
-
-      setTimeout(() => {
+      const updateSubscription = filterManager.getUpdates$().subscribe(() => {
         expect(filterManager.getGlobalFilters()).toHaveLength(1);
+        if (updateSubscription) {
+          updateSubscription.unsubscribe();
+        }
         done();
-      }, 100);
+      });
+
+      const f1 = getFilter(FilterStateStore.GLOBAL_STATE, true, true, 'age', 34);
+      globalStateStub.filters.push(f1);
     });
 
-    test('should update filter manager app filters', done => {
-      expect(filterManager.getAppFilters()).toHaveLength(0);
+    test('should update filter manager app filter', done => {
+      const updateSubscription = filterManager.getUpdates$().subscribe(() => {
+        expect(filterManager.getAppFilters()).toHaveLength(1);
+        if (updateSubscription) {
+          updateSubscription.unsubscribe();
+        }
+        done();
+      });
 
       const f1 = getFilter(FilterStateStore.APP_STATE, false, false, 'age', 34);
       appStateStub.filters.push(f1);
-
-      setTimeout(() => {
-        expect(filterManager.getAppFilters()).toHaveLength(1);
-        done();
-      }, 100);
     });
 
     test('should update URL when filter manager filters are set', () => {

src/legacy/core_plugins/data/public/filter/filter_manager/filter_state_manager.ts

@@ -21,7 +21,7 @@ import { FilterStateStore } from '@kbn/es-query';
 
 import _ from 'lodash';
 import { State } from 'ui/state_management/state';
-import { FilterManager } from './filter_manager';
+import { FilterManager } from '../../../../../../plugins/data/public';
 
 type GetAppStateFunc = () => State | undefined | null;
 

src/legacy/core_plugins/data/public/filter/filter_manager/index.ts

@@ -17,10 +17,4 @@
  * under the License.
  */
 
-export { FilterManager } from './filter_manager';
 export { FilterStateManager } from './filter_state_manager';
-
-export { uniqFilters } from './lib/uniq_filters';
-export { extractTimeFilter } from './lib/extract_time_filter';
-export { changeTimeFilter } from './lib/change_time_filter';
-export { onlyDisabledFiltersChanged } from './lib/only_disabled';

src/legacy/core_plugins/data/public/filter/index.tsx

@@ -17,8 +17,6 @@
  * under the License.
  */
 
-export * from './filter_service';
-
 export { FilterBar } from './filter_bar';
 
 export { ApplyFiltersPopover } from './apply_filters';

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

@@ -43,14 +43,7 @@ export { SearchBar, SearchBarProps, SavedQueryAttributes, SavedQuery } from './s
 
 /** @public static code */
 export * from '../common';
-export {
-  FilterManager,
-  FilterStateManager,
-  uniqFilters,
-  extractTimeFilter,
-  changeTimeFilter,
-  onlyDisabledFiltersChanged,
-} from './filter/filter_manager';
+export { FilterStateManager } from './filter/filter_manager';
 export {
   CONTAINS_SPACES,
   getFromSavedObject,
@@ -69,4 +62,11 @@ export {
   mockIndexPattern,
 } from './index_patterns';
 
-export { TimeHistoryContract, TimefilterContract, getTime, InputTimeRange } from './timefilter';
+export {
+  TimeHistoryContract,
+  TimefilterContract,
+  getTime,
+  InputTimeRange,
+  extractTimeFilter,
+  changeTimeFilter,
+} from './timefilter';

src/legacy/core_plugins/data/public/mocks.ts

@@ -17,14 +17,12 @@
  * under the License.
  */
 
-import { filterServiceMock } from './filter/filter_service.mock';
 import { indexPatternsServiceMock } from './index_patterns/index_patterns_service.mock';
 import { queryServiceMock } from './query/query_service.mock';
 import { timefilterServiceMock } from './timefilter/timefilter_service.mock';
 
 function createDataSetupMock() {
   return {
-    filter: filterServiceMock.createSetupContract(),
     indexPatterns: indexPatternsServiceMock.createSetupContract(),
     query: queryServiceMock.createSetupContract(),
     timefilter: timefilterServiceMock.createSetupContract(),

src/legacy/core_plugins/data/public/plugin.ts

@@ -20,7 +20,6 @@
 import { CoreSetup, CoreStart, Plugin } from 'kibana/public';
 import { SearchService, SearchStart, createSearchBar, StatetfulSearchBarProps } from './search';
 import { QueryService, QuerySetup } from './query';
-import { FilterService, FilterSetup, FilterStart } from './filter';
 import { TimefilterService, TimefilterSetup } from './timefilter';
 import { IndexPatternsService, IndexPatternsSetup, IndexPatternsStart } from './index_patterns';
 import { Storage, IStorageWrapper } from '../../../../../src/plugins/kibana_utils/public';
@@ -47,7 +46,6 @@ export interface DataSetup {
   query: QuerySetup;
   timefilter: TimefilterSetup;
   indexPatterns: IndexPatternsSetup;
-  filter: FilterSetup;
 }
 
 /**
@@ -59,7 +57,6 @@ export interface DataStart {
   query: QuerySetup;
   timefilter: TimefilterSetup;
   indexPatterns: IndexPatternsStart;
-  filter: FilterStart;
   search: SearchStart;
   ui: {
     SearchBar: React.ComponentType<StatetfulSearchBarProps>;
@@ -77,9 +74,8 @@ export interface DataStart {
  * in the setup/start interfaces. The remaining items exported here are either types,
  * or static code.
  */
+
 export class DataPlugin implements Plugin<DataSetup, DataStart, {}, DataPluginStartDependencies> {
-  // Exposed services, sorted alphabetically
-  private readonly filter: FilterService = new FilterService();
   private readonly indexPatterns: IndexPatternsService = new IndexPatternsService();
   private readonly query: QueryService = new QueryService();
   private readonly search: SearchService = new SearchService();
@@ -97,14 +93,10 @@ export class DataPlugin implements Plugin<DataSetup, DataStart, {}, DataPluginSt
       uiSettings,
       storage: this.storage,
     });
-    const filterService = this.filter.setup({
-      uiSettings,
-    });
     this.setupApi = {
       indexPatterns: this.indexPatterns.setup(),
       query: this.query.setup(),
       timefilter: timefilterService,
-      filter: filterService,
     };
 
     return this.setupApi;
@@ -127,12 +119,11 @@ export class DataPlugin implements Plugin<DataSetup, DataStart, {}, DataPluginSt
       data,
       storage: this.storage,
       timefilter: this.setupApi.timefilter,
-      filterManager: this.setupApi.filter.filterManager,
     });
 
     uiActions.registerAction(
       createFilterAction(
-        this.setupApi.filter.filterManager,
+        data.query.filterManager,
         this.setupApi.timefilter.timefilter,
         indexPatternsService
       )
@@ -152,7 +143,6 @@ export class DataPlugin implements Plugin<DataSetup, DataStart, {}, DataPluginSt
 
   public stop() {
     this.indexPatterns.stop();
-    this.filter.stop();
     this.query.stop();
     this.search.stop();
     this.timefilter.stop();

src/legacy/core_plugins/data/public/search/search_bar/components/create_search_bar.tsx

@@ -25,24 +25,23 @@ import { DataPublicPluginStart } from 'src/plugins/data/public';
 import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { KibanaContextProvider } from '../../../../../../../../src/plugins/kibana_react/public';
 import { TimefilterSetup } from '../../../timefilter';
-import { FilterManager, SearchBar } from '../../../';
+import { SearchBar } from '../../../';
 import { SearchBarOwnProps } from '.';
 
 interface StatefulSearchBarDeps {
   core: CoreStart;
   data: DataPublicPluginStart;
   storage: IStorageWrapper;
   timefilter: TimefilterSetup;
-  filterManager: FilterManager;
 }
 
 export type StatetfulSearchBarProps = SearchBarOwnProps & {
   appName: string;
 };
 
-const defaultFiltersUpdated = (filterManager: FilterManager) => {
+const defaultFiltersUpdated = (data: DataPublicPluginStart) => {
   return (filters: Filter[]) => {
-    filterManager.setFilters(filters);
+    data.query.filterManager.setFilters(filters);
   };
 };
 
@@ -55,16 +54,11 @@ const defaultOnRefreshChange = (timefilter: TimefilterSetup) => {
   };
 };
 
-export function createSearchBar({
-  core,
-  storage,
-  timefilter,
-  filterManager,
-  data,
-}: StatefulSearchBarDeps) {
+export function createSearchBar({ core, storage, timefilter, data }: StatefulSearchBarDeps) {
   // App name should come from the core application service.
   // Until it's available, we'll ask the user to provide it for the pre-wired component.
   return (props: StatetfulSearchBarProps) => {
+    const { filterManager } = data.query;
     const tfRefreshInterval = timefilter.timefilter.getRefreshInterval();
     const fmFilters = filterManager.getFilters();
     const [refreshInterval, setRefreshInterval] = useState(tfRefreshInterval.value);
@@ -124,7 +118,7 @@ export function createSearchBar({
           refreshInterval={refreshInterval}
           isRefreshPaused={refreshPaused}
           filters={filters}
-          onFiltersUpdated={defaultFiltersUpdated(filterManager)}
+          onFiltersUpdated={defaultFiltersUpdated(data)}
           onRefreshChange={defaultOnRefreshChange(timefilter)}
           {...props}
         />

src/legacy/core_plugins/data/public/shim/legacy_module.ts

@@ -25,9 +25,6 @@ import { wrapInI18nContext } from 'ui/i18n';
 import { uiModules } from 'ui/modules';
 import { npStart } from 'ui/new_platform';
 import { FilterBar, ApplyFiltersPopover } from '../filter';
-
-// @ts-ignore
-import { mapAndFlattenFilters } from '../filter/filter_manager/lib/map_and_flatten_filters';
 import { IndexPatterns } from '../index_patterns/index_patterns';
 
 /** @internal */

src/legacy/core_plugins/data/public/timefilter/index.ts

@@ -23,3 +23,5 @@ export * from './types';
 export { Timefilter, TimefilterContract } from './timefilter';
 export { TimeHistory, TimeHistoryContract } from './time_history';
 export { getTime } from './get_time';
+export { changeTimeFilter } from './lib/change_time_filter';
+export { extractTimeFilter } from './lib/extract_time_filter';

src/legacy/core_plugins/data/public/filter/filter_manager/lib/change_time_filter.test.ts → src/legacy/core_plugins/data/public/timefilter/lib/change_time_filter.test.ts

@@ -19,7 +19,7 @@
 import { RangeFilter } from '@kbn/es-query';
 import { changeTimeFilter } from './change_time_filter';
 import { TimeRange } from 'src/plugins/data/public';
-import { timefilterServiceMock } from '../../../timefilter/timefilter_service.mock';
+import { timefilterServiceMock } from '../timefilter_service.mock';
 
 const timefilterMock = timefilterServiceMock.createSetupContract();
 const timefilter = timefilterMock.timefilter;

src/legacy/core_plugins/data/public/filter/filter_manager/lib/change_time_filter.ts → src/legacy/core_plugins/data/public/timefilter/lib/change_time_filter.ts

@@ -20,7 +20,7 @@
 import moment from 'moment';
 import { keys } from 'lodash';
 import { RangeFilter } from '@kbn/es-query';
-import { TimefilterContract } from '../../../timefilter';
+import { TimefilterContract } from '../timefilter';
 
 export function convertRangeFilterToTimeRange(filter: RangeFilter) {
   const key = keys(filter.range)[0];

src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.js

@@ -26,6 +26,7 @@ import {
 import { PhraseFilterManager } from './filter_manager/phrase_filter_manager';
 import { createSearchSource } from './create_search_source';
 import { i18n } from '@kbn/i18n';
+import { npStart } from 'ui/new_platform';
 import chrome from 'ui/chrome';
 import { start as data } from '../../../../core_plugins/data/public/legacy';
 
@@ -187,9 +188,10 @@ export async function listControlFactory(controlParams, useTimeFilter, SearchSou
     // ignore not found error and return control so it can be displayed in disabled state.
   }
 
+  const { filterManager } = npStart.plugins.data.query;
   return new ListControl(
     controlParams,
-    new PhraseFilterManager(controlParams.id, controlParams.fieldName, indexPattern, data.filter.filterManager),
+    new PhraseFilterManager(controlParams.id, controlParams.fieldName, indexPattern, filterManager),
     useTimeFilter,
     SearchSource,
   );

src/legacy/core_plugins/input_control_vis/public/control/list_control_factory.test.js

@@ -24,6 +24,28 @@ jest.mock('ui/timefilter', () => ({
   createFilter: jest.fn(),
 }));
 
+jest.mock('ui/new_platform', () => ({
+  npStart: {
+    plugins: {
+      data: {
+        query: {
+          filterManager: {
+            fieldName: 'myNumberField',
+            getIndexPattern: () => ({
+              fields: { getByName: name => {
+                const fields = { myField: { name: 'myField' } };
+                return fields[name];
+              } }
+            }),
+            getAppFilters: jest.fn().mockImplementation(() => ([])),
+            getGlobalFilters: jest.fn().mockImplementation(() => ([])),
+          }
+        }
+      }
+    },
+  },
+}));
+
 jest.mock('../../../../core_plugins/data/public/legacy', () => ({
   start: {
     indexPatterns: {
@@ -36,19 +58,6 @@ jest.mock('../../../../core_plugins/data/public/legacy', () => ({
         }),
       }
     },
-    filter: {
-      filterManager: {
-        fieldName: 'myNumberField',
-        getIndexPattern: () => ({
-          fields: { getByName: name => {
-            const fields = { myField: { name: 'myField' } };
-            return fields[name];
-          } }
-        }),
-        getAppFilters: jest.fn().mockImplementation(() => ([])),
-        getGlobalFilters: jest.fn().mockImplementation(() => ([])),
-      }
-    }
   }
 }));
 

src/legacy/core_plugins/input_control_vis/public/control/range_control_factory.js

@@ -27,6 +27,7 @@ import { RangeFilterManager } from './filter_manager/range_filter_manager';
 import { createSearchSource } from './create_search_source';
 import { i18n } from '@kbn/i18n';
 import { start as data } from '../../../../core_plugins/data/public/legacy';
+import { npStart } from 'ui/new_platform';
 
 const minMaxAgg = (field) => {
   const aggBody = {};
@@ -106,9 +107,10 @@ export async function rangeControlFactory(controlParams, useTimeFilter, SearchSo
   } catch (err) {
     // ignore not found error and return control so it can be displayed in disabled state.
   }
+  const { filterManager } = npStart.plugins.data.query;
   return new RangeControl(
     controlParams,
-    new RangeFilterManager(controlParams.id, controlParams.fieldName, indexPattern, data.filter.filterManager),
+    new RangeFilterManager(controlParams.id, controlParams.fieldName, indexPattern, filterManager),
     useTimeFilter,
     SearchSource,
   );