Move some kibana services init to NP. Some cleaning

elastic · Feb 14, 2020 · 989b682 · 989b682
1 parent 11c6cc9
commit 989b682
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 47 deletions.
diff --git a/x-pack/legacy/plugins/maps/public/angular/map_controller.js b/x-pack/legacy/plugins/maps/public/angular/map_controller.js
@@ -27,7 +27,10 @@ import {
   setQuery,
   clearTransientLayerStateAndCloseFlyout,
 } from '../actions/map_actions';
-import { DEFAULT_IS_LAYER_TOC_OPEN, FLYOUT_STATE } from '../../../../../plugins/maps/public/reducers/ui';
+import {
+  DEFAULT_IS_LAYER_TOC_OPEN,
+  FLYOUT_STATE,
+} from '../../../../../plugins/maps/public/reducers/ui';
 import {
   enableFullScreen,
   updateFlyout,

diff --git a/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/layer_control/index.js b/x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/layer_control/index.js
@@ -6,7 +6,7 @@
 
 import { connect } from 'react-redux';
 import { LayerControl } from './view';
-import { FLYOUT_STATE } from '../../../../../../../plugins/maps/public/reducers/ui.js'
+import { FLYOUT_STATE } from '../../../../../../../plugins/maps/public/reducers/ui.js';
 import { updateFlyout, setIsLayerTOCOpen } from '../../../actions/ui_actions';
 import { setSelectedLayer } from '../../../actions/map_actions';
 import {

diff --git a/x-pack/legacy/plugins/maps/public/embeddable/map_embeddable.js b/x-pack/legacy/plugins/maps/public/embeddable/map_embeddable.js
@@ -36,7 +36,10 @@ import {
 } from '../actions/map_actions';
 import { setReadOnly, setIsLayerTOCOpen, setOpenTOCDetails } from '../actions/ui_actions';
 import { getIsLayerTOCOpen, getOpenTOCDetails } from '../selectors/ui_selectors';
-import { getInspectorAdapters, setEventHandlers } from '../../../../../plugins/maps/public/reducers/non_serializable_instances';
+import {
+  getInspectorAdapters,
+  setEventHandlers,
+} from '../../../../../plugins/maps/public/reducers/non_serializable_instances';
 import { getMapCenter, getMapZoom, getHiddenLayerIds } from '../selectors/map_selectors';
 import { MAP_SAVED_OBJECT_TYPE } from '../../common/constants';
 

diff --git a/x-pack/legacy/plugins/maps/public/kibana_services.js b/x-pack/legacy/plugins/maps/public/kibana_services.js
@@ -15,18 +15,6 @@ export const SPATIAL_FILTER_TYPE = esFilters.FILTERS.SPATIAL_FILTER;
 export { SearchSource } from '../../../../../src/plugins/data/public';
 export const indexPatternService = npStart.plugins.data.indexPatterns;
 
-let licenseId;
-export const setLicenseId = latestLicenseId => (licenseId = latestLicenseId);
-export const getLicenseId = () => {
-  return licenseId;
-};
-
-let inspector;
-export const setInspector = newInspector => (inspector = newInspector);
-export const getInspector = () => {
-  return inspector;
-};
-
 export async function fetchSearchSourceAndRecordWithInspector({
   searchSource,
   requestId,

diff --git a/x-pack/legacy/plugins/maps/public/layers/layer.js b/x-pack/legacy/plugins/maps/public/layers/layer.js
@@ -14,7 +14,7 @@ import {
   SOURCE_DATA_ID_ORIGIN,
 } from '../../common/constants';
 import uuid from 'uuid/v4';
-import { copyPersistentState } from '../../../../../plugins/maps/public/reducers/util.js'
+import { copyPersistentState } from '../../../../../plugins/maps/public/reducers/util.js';
 import { i18n } from '@kbn/i18n';
 
 export class AbstractLayer {

diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/source.js b/x-pack/legacy/plugins/maps/public/layers/sources/source.js
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { copyPersistentState } from '../../../../../../plugins/maps/public/reducers';
+import { copyPersistentState } from '../../../../../../plugins/maps/public/reducers/util';
 
 export class AbstractSource {
   static isIndexingSource = false;

diff --git a/x-pack/legacy/plugins/maps/public/meta.js b/x-pack/legacy/plugins/maps/public/meta.js
@@ -13,7 +13,7 @@ import {
 import chrome from 'ui/chrome';
 import { i18n } from '@kbn/i18n';
 import { EMSClient } from '@elastic/ems-client';
-import { getLicenseId } from './kibana_services';
+import { getLicenseId } from '../../../../plugins/maps/public/kibana_services';
 import fetch from 'node-fetch';
 
 const GIS_API_RELATIVE = `../${GIS_API_PATH}`;

diff --git a/x-pack/legacy/plugins/maps/public/plugin.ts b/x-pack/legacy/plugins/maps/public/plugin.ts
@@ -10,7 +10,7 @@ import { wrapInI18nContext } from 'ui/i18n';
 // @ts-ignore
 import { MapListing } from './components/map_listing';
 // @ts-ignore
-import { setLicenseId, setInspector } from './kibana_services';
+import { setLicenseId, setInspector, setInjectedVarFunc } from '../../../../plugins/maps/public/kibana_services';
 import { HomePublicPluginSetup } from '../../../../../src/plugins/home/public';
 import { LicensingPluginSetup } from '../../../../plugins/licensing/public';
 import { featureCatalogueEntry } from './feature_catalogue_entry';
@@ -43,6 +43,7 @@ export class MapsPlugin implements Plugin<MapsPluginSetup, MapsPluginStart> {
         return reactDirective(wrapInI18nContext(MapListing));
       });
 
+    setInjectedVarFunc(core.injectedMetadata.getInjectedVar);
     if (licensing) {
       licensing.license$.subscribe(({ uid }) => setLicenseId(uid));
     }

diff --git a/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js b/x-pack/legacy/plugins/maps/public/selectors/map_selectors.js
@@ -13,7 +13,10 @@ import { HeatmapLayer } from '../layers/heatmap_layer';
 import { ALL_SOURCES } from '../layers/sources/all_sources';
 import { timefilter } from 'ui/timefilter';
 import { getInspectorAdapters } from '../../../../../plugins/maps/public/reducers/non_serializable_instances';
-import { copyPersistentState, TRACKED_LAYER_DESCRIPTOR } from '../../../../../plugins/maps/public/reducers/util';
+import {
+  copyPersistentState,
+  TRACKED_LAYER_DESCRIPTOR,
+} from '../../../../../plugins/maps/public/reducers/util';
 
 function createLayerInstance(layerDescriptor, inspectorAdapters) {
   const source = createSourceInstance(layerDescriptor.sourceDescriptor, inspectorAdapters);

diff --git a/x-pack/plugins/maps/public/kibana_services.js b/x-pack/plugins/maps/public/kibana_services.js
@@ -7,7 +7,23 @@
 export let indexPatternService;
 export let timeFilter;
 
-export const initKibanaServices = ({ data }) => {
+let licenseId;
+export const setLicenseId = latestLicenseId => (licenseId = latestLicenseId);
+export const getLicenseId = () => {
+  return licenseId;
+};
+
+let inspector;
+export const setInspector = newInspector => (inspector = newInspector);
+export const getInspector = () => {
+  return inspector;
+};
+
+let getInjectedVar;
+export const setInjectedVarFunc = getInjectedVarFunc => (getInjectedVar = getInjectedVarFunc);
+export const getInjectedVarFunc = () => getInjectedVar;
+
+export const initKibanaServices = ({ injectedMetadata }, { data }) => {
   indexPatternService = data.indexPatterns;
-  timeFilter: data.query.timefilter
+  timeFilter = data.query.timefilter;
 };
diff --git a/x-pack/plugins/maps/public/plugin.ts b/x-pack/plugins/maps/public/plugin.ts
@@ -4,18 +4,16 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {
-  Plugin,
-  CoreSetup,
-  CoreStart, AppMountParameters,
-} from 'src/core/public';
+import { Plugin, CoreSetup, CoreStart } from 'src/core/public';
+import { Setup as InspectorSetupContract } from 'src/plugins/inspector/public';
 import { DataPublicPluginSetup } from '../../../../src/plugins/data/public';
-import { initKibanaServices } from './kibana_services';
-import { i18n } from '@kbn/i18n';
+// @ts-ignore
+import { initKibanaServices, setInspector, setInjectedVarFunc } from './kibana_services';
 
 // eslint-disable-line @typescript-eslint/no-empty-interface
 export interface MapsPluginSetupDependencies {
-  data: DataPublicPluginSetup
+  data: DataPublicPluginSetup;
+  inspector: InspectorSetupContract;
 }
 // eslint-disable-line @typescript-eslint/no-empty-interface
 export interface MapsPluginStartDependencies {}
@@ -37,9 +35,10 @@ export class MapsPlugin
       MapsPluginSetupDependencies,
       MapsPluginStartDependencies
     > {
-
   public setup(core: CoreSetup, plugins: MapsPluginSetupDependencies) {
     initKibanaServices(core, plugins);
+    setInspector(plugins.inspector);
+    setInjectedVarFunc(core.injectedMetadata.getInjectedVar);
     // core.application.register({
     //   id: 'maps',
     //   title: i18n.translate('xpack.maps.pluginTitle', {
@@ -52,9 +51,8 @@ export class MapsPlugin
     //   },
     // });
     return {
-      maps: 'testing'
-    }
-
+      maps: 'testing',
+    };
   }
 
   public start(core: CoreStart, plugins: any) {}

diff --git a/x-pack/plugins/maps/public/reducers/non_serializable_instances.js b/x-pack/plugins/maps/public/reducers/non_serializable_instances.js
@@ -4,11 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { RequestAdapter} from '../../../../../src/plugins/inspector/public/adapters/request';
+import { RequestAdapter } from '../../../../../src/plugins/inspector/common/adapters/request';
 import { MapAdapter } from '../inspector/adapters/map_adapter';
-
-// TODO
-import chrome from 'ui/chrome';
+import { getInjectedVarFunc } from '../kibana_services';
 
 const REGISTER_CANCEL_CALLBACK = 'REGISTER_CANCEL_CALLBACK';
 const UNREGISTER_CANCEL_CALLBACK = 'UNREGISTER_CANCEL_CALLBACK';
@@ -18,7 +16,7 @@ function createInspectorAdapters() {
   const inspectorAdapters = {
     requests: new RequestAdapter(),
   };
-  if (chrome.getInjected('showMapsInspectorAdapter', false)) {
+  if (getInjectedVarFunc()('showMapsInspectorAdapter', false)) {
     inspectorAdapters.map = new MapAdapter();
   }
   return inspectorAdapters;

diff --git a/x-pack/plugins/maps/public/reducers/store.js b/x-pack/plugins/maps/public/reducers/store.js
@@ -10,15 +10,13 @@ import { ui } from './ui';
 import { map } from './map';
 import { nonSerializableInstances } from './non_serializable_instances';
 
-const rootReducer = combineReducers({
-  map,
-  ui,
-  nonSerializableInstances,
-});
-
-const enhancers = [applyMiddleware(thunk)];
-
 export function createMapStore() {
+  const enhancers = [applyMiddleware(thunk)];
+  const rootReducer = combineReducers({
+    map,
+    ui,
+    nonSerializableInstances,
+  });
   const storeConfig = {};
   return createStore(rootReducer, storeConfig, compose(...enhancers));
 }