Pass uiSettings to all data plugin services

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

@@ -31,20 +31,19 @@ import {
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import classNames from 'classnames';
 import React, { Component } from 'react';
-import chrome from 'ui/chrome';
+import { UiSettingsClientContract } from 'src/core/public';
 import { IndexPattern } from '../../index_patterns';
 import { FilterEditor } from './filter_editor';
 import { FilterItem } from './filter_item';
 import { FilterOptions } from './filter_options';
 
-const config = chrome.getUiSettingsClient();
-
 interface Props {
   filters: Filter[];
   onFiltersUpdated: (filters: Filter[]) => void;
   className: string;
   indexPatterns: IndexPattern[];
   intl: InjectedIntl;
+  uiSettings: UiSettingsClientContract;
 }
 
 interface State {
@@ -103,13 +102,14 @@ class FilterBarUI extends Component<Props, State> {
           onUpdate={newFilter => this.onUpdate(i, newFilter)}
           onRemove={() => this.onRemove(i)}
           indexPatterns={this.props.indexPatterns}
+          uiSettings={this.props.uiSettings}
         />
       </EuiFlexItem>
     ));
   }
 
   private renderAddFilter() {
-    const isPinned = config.get('filters:pinnedByDefault');
+    const isPinned = this.props.uiSettings.get('filters:pinnedByDefault');
     const [indexPattern] = this.props.indexPatterns;
     const index = indexPattern && indexPattern.id;
     const newFilter = buildEmptyFilter(isPinned, index);
@@ -144,6 +144,7 @@ class FilterBarUI extends Component<Props, State> {
                 onSubmit={this.onAdd}
                 onCancel={this.onCloseAddFilterPopover}
                 key={JSON.stringify(newFilter)}
+                uiSettings={this.props.uiSettings}
               />
             </div>
           </EuiFlexItem>

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

@@ -36,6 +36,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import { get } from 'lodash';
 import React, { Component } from 'react';
+import { UiSettingsClientContract } from 'src/core/public';
 import { Field, IndexPattern } from '../../../index_patterns';
 import { GenericComboBox, GenericComboBoxProps } from './generic_combo_box';
 import {
@@ -61,6 +62,7 @@ interface Props {
   onSubmit: (filter: Filter) => void;
   onCancel: () => void;
   intl: InjectedIntl;
+  uiSettings: UiSettingsClientContract;
 }
 
 interface State {
@@ -327,6 +329,7 @@ class FilterEditorUI extends Component<Props, State> {
             value={this.state.params}
             onChange={this.onParamsChange}
             data-test-subj="phraseValueInput"
+            uiSettings={this.props.uiSettings}
           />
         );
       case 'phrases':
@@ -336,6 +339,7 @@ class FilterEditorUI extends Component<Props, State> {
             field={this.state.selectedField}
             values={this.state.params}
             onChange={this.onParamsChange}
+            uiSettings={this.props.uiSettings}
           />
         );
       case 'range':

src/legacy/core_plugins/data/public/filter/filter_bar/filter_editor/phrase_suggestor.tsx

@@ -18,14 +18,14 @@
  */
 
 import { Component } from 'react';
-import chrome from 'ui/chrome';
 import { getSuggestions } from 'ui/value_suggestions';
+import { UiSettingsClientContract } from 'src/core/public';
 import { Field, IndexPattern } from '../../../index_patterns';
-const config = chrome.getUiSettingsClient();
 
 export interface PhraseSuggestorProps {
   indexPattern: IndexPattern;
   field?: Field;
+  uiSettings: UiSettingsClientContract;
 }
 
 export interface PhraseSuggestorState {
@@ -52,7 +52,7 @@ export class PhraseSuggestor<T extends PhraseSuggestorProps> extends Component<
   }
 
   protected isSuggestingValues() {
-    const shouldSuggestValues = config.get('filterEditor:suggestValues');
+    const shouldSuggestValues = this.props.uiSettings.get('filterEditor:suggestValues');
     const { field } = this.props;
     return shouldSuggestValues && field && field.aggregatable && field.type === 'string';
   }

src/legacy/core_plugins/data/public/filter/filter_bar/filter_item.tsx

@@ -28,6 +28,7 @@ import {
 import { InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import classNames from 'classnames';
 import React, { Component } from 'react';
+import { UiSettingsClientContract } from 'src/core/public';
 import { IndexPattern } from '../../index_patterns';
 import { FilterEditor } from './filter_editor';
 import { FilterView } from './filter_view';
@@ -40,6 +41,7 @@ interface Props {
   onUpdate: (filter: Filter) => void;
   onRemove: () => void;
   intl: InjectedIntl;
+  uiSettings: UiSettingsClientContract;
 }
 
 interface State {
@@ -169,6 +171,7 @@ class FilterItemUI extends Component<Props, State> {
               indexPatterns={this.props.indexPatterns}
               onSubmit={this.onSubmit}
               onCancel={this.closePopover}
+              uiSettings={this.props.uiSettings}
             />
           </div>
         ),

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

@@ -32,35 +32,20 @@ import { StubIndexPatterns } from './test_helpers/stub_index_pattern';
 import { StubState } from './test_helpers/stub_state';
 import { getFiltersArray } from './test_helpers/get_filters_array';
 
-jest.mock(
-  'ui/chrome',
-  () => ({
-    getBasePath: jest.fn(() => 'path'),
-    getUiSettingsClient: jest.fn(() => {
-      return {
-        get: () => true,
-      };
-    }),
-  }),
-  { virtual: true }
-);
-
-jest.mock('ui/new_platform', () => ({
-  npStart: {
-    core: {
-      chrome: {
-        recentlyAccessed: false,
-      },
-    },
-  },
-  npSetup: {
-    core: {
-      uiSettings: {
-        get: () => true,
-      },
+import { coreMock } from '../../../../../../core/public/mocks';
+const setupMock = coreMock.createSetup();
+
+setupMock.uiSettings.get.mockImplementation((key: string) => {
+  return true;
+});
+
+jest.mock('ui/timefilter', () => {
+  return {
+    timefilter: {
+      setTime: jest.fn(),
     },
-  },
-}));
+  };
+});
 
 describe('filter_manager', () => {
   let appStateStub: StubState;
@@ -79,7 +64,7 @@ describe('filter_manager', () => {
     appStateStub = new StubState();
     globalStateStub = new StubState();
     indexPatterns = new StubIndexPatterns();
-    filterManager = new FilterManager(indexPatterns as IndexPatterns);
+    filterManager = new FilterManager(indexPatterns as IndexPatterns, setupMock.uiSettings);
     readyFilters = getFiltersArray();
 
     // FilterStateManager is tested indirectly.

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

@@ -22,8 +22,7 @@ import { Filter, isFilterPinned, FilterStateStore } from '@kbn/es-query';
 import _ from 'lodash';
 import { Subject } from 'rxjs';
 
-import { npSetup } from 'ui/new_platform';
-
+import { UiSettingsClientContract } from 'src/core/public';
 // @ts-ignore
 import { compareFilters } from './lib/compare_filters';
 // @ts-ignore
@@ -46,9 +45,11 @@ export class FilterManager {
   private filters: Filter[] = [];
   private updated$: Subject<void> = new Subject();
   private fetch$: Subject<void> = new Subject();
+  private uiSettings: UiSettingsClientContract;
 
-  constructor(indexPatterns: IndexPatterns) {
+  constructor(indexPatterns: IndexPatterns, uiSettings: UiSettingsClientContract) {
     this.indexPatterns = indexPatterns;
+    this.uiSettings = uiSettings;
   }
 
   private mergeIncomingFilters(partitionedFilters: PartitionedFilters): Filter[] {
@@ -144,9 +145,8 @@ export class FilterManager {
       return;
     }
 
-    const { uiSettings } = npSetup.core;
     if (pinFilterStatus === undefined) {
-      pinFilterStatus = uiSettings.get('filters:pinnedByDefault');
+      pinFilterStatus = this.uiSettings.get('filters:pinnedByDefault');
     }
 
     // Set the store of all filters. For now.

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

@@ -28,22 +28,20 @@ import { getFilter } from './test_helpers/get_stub_filter';
 import { FilterManager } from './filter_manager';
 import { StubIndexPatterns } from './test_helpers/stub_index_pattern';
 
-jest.mock('ui/new_platform', () => ({
-  npStart: {
-    core: {
-      chrome: {
-        recentlyAccessed: false,
-      },
-    },
-  },
-  npSetup: {
-    core: {
-      uiSettings: {
-        get: () => true,
-      },
+import { coreMock } from '../../../../../../core/public/mocks';
+const setupMock = coreMock.createSetup();
+
+setupMock.uiSettings.get.mockImplementation((key: string) => {
+  return true;
+});
+
+jest.mock('ui/timefilter', () => {
+  return {
+    timefilter: {
+      setTime: jest.fn(),
     },
-  },
-}));
+  };
+});
 
 describe('filter_state_manager', () => {
   let appStateStub: StubState;
@@ -55,7 +53,7 @@ describe('filter_state_manager', () => {
     appStateStub = new StubState();
     globalStateStub = new StubState();
     const indexPatterns = new StubIndexPatterns();
-    filterManager = new FilterManager(indexPatterns as IndexPatterns);
+    filterManager = new FilterManager(indexPatterns as IndexPatterns, setupMock.uiSettings);
   });
 
   describe('app_state_undefined', () => {

src/legacy/core_plugins/data/public/filter/filter_service.ts

@@ -17,6 +17,7 @@
  * under the License.
  */
 
+import { UiSettingsClientContract } from 'src/core/public';
 import { IndexPatterns } from '../index_patterns';
 import { FilterManager } from './filter_manager';
 /**
@@ -26,11 +27,12 @@ import { FilterManager } from './filter_manager';
 
 export interface FilterServiceDependencies {
   indexPatterns: IndexPatterns;
+  uiSettings: UiSettingsClientContract;
 }
 
 export class FilterService {
-  public setup({ indexPatterns }: FilterServiceDependencies) {
-    const filterManager = new FilterManager(indexPatterns);
+  public setup({ indexPatterns, uiSettings }: FilterServiceDependencies) {
+    const filterManager = new FilterManager(indexPatterns, uiSettings);
 
     return {
       filterManager,

src/legacy/core_plugins/data/public/index_patterns/index_patterns_service.ts

@@ -16,8 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import chrome from 'ui/chrome';
 // @ts-ignore
 import { mockFields, mockIndexPattern } from 'ui/index_patterns/fixtures';
 // @ts-ignore
@@ -35,9 +33,15 @@ import { isFilterable, getFromSavedObject } from 'ui/index_patterns/static_utils
 
 // IndexPattern, StaticIndexPattern, Field
 import * as types from 'ui/index_patterns';
+import { SavedObjectsClient } from 'ui/saved_objects';
+
+import { UiSettingsClientContract } from 'src/core/public';
+
+export interface IndexPatternDependencies {
+  uiSettings: UiSettingsClientContract;
+  savedObjectsClient: SavedObjectsClient;
+}
 
-const config = chrome.getUiSettingsClient();
-const savedObjectsClient = chrome.getSavedObjectsClient();
 /**
  * Index Patterns Service
  *
@@ -50,9 +54,9 @@ const savedObjectsClient = chrome.getSavedObjectsClient();
  * @internal
  */
 export class IndexPatternsService {
-  public setup() {
+  public setup({ uiSettings, savedObjectsClient }: IndexPatternDependencies) {
     return {
-      indexPatterns: new IndexPatterns(config, savedObjectsClient),
+      indexPatterns: new IndexPatterns(uiSettings, savedObjectsClient),
     };
   }
 

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

@@ -68,13 +68,20 @@ export class DataPlugin implements Plugin<DataSetup, void, DataPluginSetupDepend
   private readonly search: SearchService = new SearchService();
 
   public setup(core: CoreSetup, { __LEGACY, interpreter }: DataPluginSetupDependencies): DataSetup {
-    const indexPatternsService = this.indexPatterns.setup();
+    const { uiSettings } = core;
+    const savedObjectsClient = __LEGACY.savedObjectsClient;
+
+    const indexPatternsService = this.indexPatterns.setup({
+      uiSettings,
+      savedObjectsClient,
+    });
     return {
       expressions: this.expressions.setup({
         interpreter,
       }),
       indexPatterns: indexPatternsService,
       filter: this.filter.setup({
+        uiSettings,
         indexPatterns: indexPatternsService.indexPatterns,
       }),
       query: this.query.setup(),