[Maps] Update remaining client dependencies to NP

x-pack/legacy/plugins/maps/public/actions/map_actions.test.js

@@ -5,7 +5,7 @@
  */
 
 jest.mock('../selectors/map_selectors', () => ({}));
-jest.mock('../kibana_services', () => ({}));
+jest.mock('../../../../../plugins/maps/public/kibana_services', () => ({}));
 
 import { mapExtentChanged, setMouseCoordinates } from './map_actions';
 

x-pack/legacy/plugins/maps/public/angular/get_initial_layers.js

@@ -8,7 +8,8 @@ import _ from 'lodash';
 import { KibanaTilemapSource } from '../../../../../plugins/maps/public/layers/sources/kibana_tilemap_source';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { EMSTMSSource } from '../../../../../plugins/maps/public/layers/sources/ems_tms_source';
-import { getInjectedVarFunc } from '../kibana_services';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { getInjectedVarFunc } from '../../../../../plugins/maps/public/kibana_services';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { getKibanaTileMap } from '../../../../../plugins/maps/public/meta';
 

x-pack/legacy/plugins/maps/public/angular/get_initial_layers.test.js

@@ -7,15 +7,16 @@
 jest.mock('../../../../../plugins/maps/public/meta', () => {
   return {};
 });
-jest.mock('../kibana_services');
+jest.mock('../../../../../plugins/maps/public/kibana_services');
 
 import { getInitialLayers } from './get_initial_layers';
 
 const layerListNotProvided = undefined;
 
 describe('Saved object has layer list', () => {
   beforeEach(() => {
-    require('../kibana_services').getInjectedVarFunc = () => jest.fn();
+    require('../../../../../plugins/maps/public/kibana_services').getInjectedVarFunc = () =>
+      jest.fn();
   });
 
   it('Should get initial layers from saved object', () => {
@@ -65,7 +66,7 @@ describe('EMS is enabled', () => {
     require('../../../../../plugins/maps/public/meta').getKibanaTileMap = () => {
       return null;
     };
-    require('../kibana_services').getInjectedVarFunc = () => key => {
+    require('../../../../../plugins/maps/public/kibana_services').getInjectedVarFunc = () => key => {
       switch (key) {
         case 'emsTileLayerId':
           return {
@@ -110,7 +111,7 @@ describe('EMS is not enabled', () => {
       return null;
     };
 
-    require('../kibana_services').getInjectedVarFunc = () => key => {
+    require('../../../../../plugins/maps/public/kibana_services').getInjectedVarFunc = () => key => {
       switch (key) {
         case 'isEmsEnabled':
           return false;

x-pack/legacy/plugins/maps/public/angular/get_initial_query.js

@@ -4,11 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import chrome from 'ui/chrome';
-
-const settings = chrome.getUiSettingsClient();
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { getUiSettings } from '../../../../../plugins/maps/public/kibana_services';
 
 export function getInitialQuery({ mapStateJSON, appState = {}, userQueryLanguage }) {
+  const settings = getUiSettings();
+
   if (appState.query) {
     return appState.query;
   }

x-pack/legacy/plugins/maps/public/angular/get_initial_refresh_config.js

@@ -3,11 +3,12 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import chrome from 'ui/chrome';
-
-const uiSettings = chrome.getUiSettingsClient();
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { getUiSettings } from '../../../../../plugins/maps/public/kibana_services';
 
 export function getInitialRefreshConfig({ mapStateJSON, globalState = {} }) {
+  const uiSettings = getUiSettings();
+
   if (mapStateJSON) {
     const mapState = JSON.parse(mapStateJSON);
     if (mapState.refreshConfig) {

x-pack/legacy/plugins/maps/public/angular/get_initial_time_filters.js

@@ -3,9 +3,8 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-import chrome from 'ui/chrome';
-
-const uiSettings = chrome.getUiSettingsClient();
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { getUiSettings } from '../../../../../plugins/maps/public/kibana_services';
 
 export function getInitialTimeFilters({ mapStateJSON, globalState = {} }) {
   if (mapStateJSON) {
@@ -15,6 +14,6 @@ export function getInitialTimeFilters({ mapStateJSON, globalState = {} }) {
     }
   }
 
-  const defaultTime = uiSettings.get('timepicker:timeDefaults');
+  const defaultTime = getUiSettings().get('timepicker:timeDefaults');
   return { ...defaultTime, ...globalState.time };
 }

x-pack/legacy/plugins/maps/public/angular/map_controller.js

@@ -5,20 +5,29 @@
  */
 
 import _ from 'lodash';
-import chrome from 'ui/chrome';
 import rison from 'rison-node';
 import 'ui/directives/listen';
 import 'ui/directives/storage';
 import React from 'react';
 import { I18nProvider } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import { capabilities } from 'ui/capabilities';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { uiModules } from 'ui/modules';
-import { getTimeFilter, getIndexPatternService, getInspector } from '../kibana_services';
-import { Provider } from 'react-redux';
+import {
+  getTimeFilter,
+  getIndexPatternService,
+  getInspector,
+  getNavigation,
+  getData,
+  getCoreI18n,
+  getCoreChrome,
+  getMapsCapabilities,
+  getToasts,
+  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
+} from '../../../../../plugins/maps/public/kibana_services';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { createMapStore } from '../../../../../plugins/maps/public/reducers/store';
+import { Provider } from 'react-redux';
 import { GisMap } from '../connected_components/gis_map';
 import { addHelpMenuToAppChrome } from '../help_menu_util';
 import {
@@ -51,29 +60,33 @@ import {
 } from '../selectors/map_selectors';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { getInspectorAdapters } from '../../../../../plugins/maps/public/reducers/non_serializable_instances';
-import { docTitle } from 'ui/doc_title';
-
-import { toastNotifications } from 'ui/notify';
 import { getInitialLayers } from './get_initial_layers';
 import { getInitialQuery } from './get_initial_query';
 import { getInitialTimeFilters } from './get_initial_time_filters';
 import { getInitialRefreshConfig } from './get_initial_refresh_config';
 import { MAP_SAVED_OBJECT_TYPE, MAP_APP_PATH } from '../../common/constants';
-import { npStart } from 'ui/new_platform';
+import { npSetup, npStart } from 'ui/new_platform';
 import { esFilters } from '../../../../../../src/plugins/data/public';
 import {
   SavedObjectSaveModal,
   showSaveModal,
 } from '../../../../../../src/plugins/saved_objects/public';
 import { loadKbnTopNavDirectives } from '../../../../../../src/plugins/kibana_legacy/public';
-loadKbnTopNavDirectives(npStart.plugins.navigation.ui);
-
-const savedQueryService = npStart.plugins.data.query.savedQueries;
+import {
+  bindSetupCoreAndPlugins as bindNpSetupCoreAndPlugins,
+  bindStartCoreAndPlugins as bindNpStartCoreAndPlugins,
+} from '../../../../../plugins/maps/public/plugin'; // eslint-disable-line @kbn/eslint/no-restricted-paths
 
 const REACT_ANCHOR_DOM_ELEMENT_ID = 'react-maps-root';
 
 const app = uiModules.get(MAP_APP_PATH, []);
 
+// Init required services. Necessary while in legacy
+bindNpSetupCoreAndPlugins(npSetup.core, npSetup.plugins);
+bindNpStartCoreAndPlugins(npStart.core, npStart.plugins);
+
+loadKbnTopNavDirectives(getNavigation().ui);
+
 function getInitialLayersFromUrlParam() {
   const locationSplit = window.location.href.split('?');
   if (locationSplit.length <= 1) {
@@ -87,7 +100,7 @@ function getInitialLayersFromUrlParam() {
   try {
     return rison.decode_array(mapAppParams.get('initialLayers'));
   } catch (e) {
-    toastNotifications.addWarning({
+    getToasts().addWarning({
       title: i18n.translate('xpack.maps.initialLayers.unableToParseTitle', {
         defaultMessage: `Inital layers not added to map`,
       }),
@@ -103,7 +116,8 @@ function getInitialLayersFromUrlParam() {
 app.controller(
   'GisMapController',
   ($scope, $route, kbnUrl, localStorage, AppState, globalState) => {
-    const { filterManager } = npStart.plugins.data.query;
+    const savedQueryService = getData().query.savedQueries;
+    const { filterManager } = getData().query;
     const savedMap = $route.current.locals.map;
     $scope.screenTitle = savedMap.title;
     let unsubscribe;
@@ -169,10 +183,10 @@ app.controller(
     });
 
     /* Saved Queries */
-    $scope.showSaveQuery = capabilities.get().maps.saveQuery;
+    $scope.showSaveQuery = getMapsCapabilities().saveQuery;
 
     $scope.$watch(
-      () => capabilities.get().maps.saveQuery,
+      () => getMapsCapabilities().saveQuery,
       newCapability => {
         $scope.showSaveQuery = newCapability;
       }
@@ -342,7 +356,7 @@ app.controller(
       // clear old UI state
       store.dispatch(setSelectedLayer(null));
       store.dispatch(updateFlyout(FLYOUT_STATE.NONE));
-      store.dispatch(setReadOnly(!capabilities.get().maps.save));
+      store.dispatch(setReadOnly(!getMapsCapabilities().save));
 
       handleStoreChanges(store);
       unsubscribe = store.subscribe(() => {
@@ -457,7 +471,7 @@ app.controller(
     });
 
     const updateBreadcrumbs = () => {
-      chrome.breadcrumbs.set([
+      getCoreChrome().setBreadcrumbs([
         {
           text: i18n.translate('xpack.maps.mapController.mapsBreadcrumbLabel', {
             defaultMessage: 'Maps',
@@ -482,7 +496,7 @@ app.controller(
     };
     updateBreadcrumbs();
 
-    addHelpMenuToAppChrome(chrome);
+    addHelpMenuToAppChrome();
 
     async function doSave(saveOptions) {
       await store.dispatch(clearTransientLayerStateAndCloseFlyout());
@@ -491,9 +505,9 @@ app.controller(
 
       try {
         id = await savedMap.save(saveOptions);
-        docTitle.change(savedMap.title);
+        getCoreChrome().docTitle.change(savedMap.title);
       } catch (err) {
-        toastNotifications.addDanger({
+        getToasts().addDanger({
           title: i18n.translate('xpack.maps.mapController.saveErrorMessage', {
             defaultMessage: `Error on saving '{title}'`,
             values: { title: savedMap.title },
@@ -505,7 +519,7 @@ app.controller(
       }
 
       if (id) {
-        toastNotifications.addSuccess({
+        getToasts().addSuccess({
           title: i18n.translate('xpack.maps.mapController.saveSuccessMessage', {
             defaultMessage: `Saved '{title}'`,
             values: { title: savedMap.title },
@@ -556,7 +570,7 @@ app.controller(
           getInspector().open(inspectorAdapters, {});
         },
       },
-      ...(capabilities.get().maps.save
+      ...(getMapsCapabilities().save
         ? [
             {
               id: 'save',
@@ -611,7 +625,7 @@ app.controller(
                     showDescription={false}
                   />
                 );
-                showSaveModal(saveModal, npStart.core.i18n.Context);
+                showSaveModal(saveModal, getCoreI18n().Context);
               },
             },
           ]

x-pack/legacy/plugins/maps/public/angular/services/gis_map_saved_object_loader.js

@@ -4,24 +4,27 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+import _ from 'lodash';
 import { createSavedGisMapClass } from './saved_gis_map';
-import { uiModules } from 'ui/modules';
 import { SavedObjectLoader } from '../../../../../../../src/plugins/saved_objects/public';
-import { npStart } from '../../../../../../../src/legacy/ui/public/new_platform';
+import {
+  getCoreChrome,
+  getSavedObjectsClient,
+  getIndexPatternService,
+  getCoreOverlays,
+  getData,
+  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
+} from '../../../../../../plugins/maps/public/kibana_services';
 
-const module = uiModules.get('app/maps');
-
-// This is the only thing that gets injected into controllers
-module.service('gisMapSavedObjectLoader', function() {
-  const savedObjectsClient = npStart.core.savedObjects.client;
+export const getMapsSavedObjectLoader = _.once(function() {
   const services = {
-    savedObjectsClient,
-    indexPatterns: npStart.plugins.data.indexPatterns,
-    search: npStart.plugins.data.search,
-    chrome: npStart.core.chrome,
-    overlays: npStart.core.overlays,
+    savedObjectsClient: getSavedObjectsClient(),
+    indexPatterns: getIndexPatternService(),
+    search: getData().search,
+    chrome: getCoreChrome(),
+    overlays: getCoreOverlays(),
   };
   const SavedGisMap = createSavedGisMapClass(services);
 
-  return new SavedObjectLoader(SavedGisMap, npStart.core.savedObjects.client, npStart.core.chrome);
+  return new SavedObjectLoader(SavedGisMap, getSavedObjectsClient(), getCoreChrome());
 });

x-pack/legacy/plugins/maps/public/components/map_listing.js

@@ -7,7 +7,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import _ from 'lodash';
-import { toastNotifications } from 'ui/notify';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { getToasts } from '../../../../../plugins/maps/public/kibana_services';
 import {
   EuiTitle,
   EuiFieldSearch,
@@ -27,7 +28,6 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { addHelpMenuToAppChrome } from '../help_menu_util';
-import chrome from 'ui/chrome';
 
 export const EMPTY_FILTER = '';
 
@@ -55,7 +55,7 @@ export class MapListing extends React.Component {
 
   componentDidMount() {
     this.fetchItems();
-    addHelpMenuToAppChrome(chrome);
+    addHelpMenuToAppChrome();
   }
 
   debouncedFetch = _.debounce(async filter => {
@@ -91,7 +91,7 @@ export class MapListing extends React.Component {
     try {
       await this.props.delete(this.state.selectedIds);
     } catch (error) {
-      toastNotifications.addDanger({
+      getToasts().addDanger({
         title: i18n.translate('xpack.maps.mapListing.unableToDeleteToastTitle', {
           defaultMessage: `Unable to delete map(s)`,
         }),

x-pack/legacy/plugins/maps/public/connected_components/gis_map/view.js

@@ -12,7 +12,8 @@ import { ToolbarOverlay } from '../toolbar_overlay/index';
 import { LayerPanel } from '../layer_panel/index';
 import { AddLayerPanel } from '../layer_addpanel/index';
 import { EuiFlexGroup, EuiFlexItem, EuiCallOut } from '@elastic/eui';
-import { ExitFullScreenButton } from 'ui/exit_full_screen';
+import { ExitFullScreenButton } from '../../../../../../../src/plugins/kibana_react/public';
+
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { getIndexPatternsFromIds } from '../../../../../../plugins/maps/public/index_pattern_util';
 import { ES_GEO_FIELD_TYPE } from '../../../common/constants';

x-pack/legacy/plugins/maps/public/connected_components/layer_panel/filter_editor/filter_editor.js

@@ -20,12 +20,14 @@ import {
 
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import { getIndexPatternService } from '../../../kibana_services';
+import {
+  getIndexPatternService,
+  getUiSettings,
+  getData,
+  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
+} from '../../../../../../../plugins/maps/public/kibana_services';
 import { GlobalFilterCheckbox } from '../../../components/global_filter_checkbox';
 
-import { npStart } from 'ui/new_platform';
-const { SearchBar } = npStart.plugins.data.ui;
-
 export class FilterEditor extends Component {
   state = {
     isPopoverOpen: false,
@@ -84,7 +86,8 @@ export class FilterEditor extends Component {
 
   _renderQueryPopover() {
     const layerQuery = this.props.layer.getQuery();
-    const { uiSettings } = npStart.core;
+    const uiSettings = getUiSettings();
+    const { SearchBar } = getData().ui;
 
     return (
       <EuiPopover