Ignore temp imports from NP. Clean up of changes unrelated to this PR

x-pack/legacy/plugins/maps/index.js

@@ -52,7 +52,6 @@ export function maps(kibana) {
         };
       },
       embeddableFactories: ['plugins/maps/embeddable/map_embeddable_factory'],
-      inspectorViews: ['plugins/maps/inspector/views/register_views'],
       home: ['plugins/maps/legacy_register_feature'],
       styleSheetPaths: `${__dirname}/public/index.scss`,
       savedObjectSchemas: {

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

@@ -19,12 +19,14 @@ import {
   getOpenTooltips,
   getQuery,
 } from '../selectors/map_selectors';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { FLYOUT_STATE } from '../../../../../plugins/maps/public/reducers/ui';
 import {
   cancelRequest,
   registerCancelCallback,
   unregisterCancelCallback,
   getEventHandlers,
+  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 } from '../../../../../plugins/maps/public/reducers/non_serializable_instances';
 import { updateFlyout } from '../actions/ui_actions';
 import {

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

@@ -16,6 +16,7 @@ import { render, unmountComponentAtNode } from 'react-dom';
 import { uiModules } from 'ui/modules';
 import { timefilter } from 'ui/timefilter';
 import { Provider } from 'react-redux';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { createMapStore } from '../../../../../plugins/maps/public/reducers/store';
 import { GisMap } from '../connected_components/gis_map';
 import { addHelpMenuToAppChrome } from '../help_menu_util';
@@ -30,6 +31,7 @@ import {
 import {
   DEFAULT_IS_LAYER_TOC_OPEN,
   FLYOUT_STATE,
+  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 } from '../../../../../plugins/maps/public/reducers/ui';
 import {
   enableFullScreen,
@@ -39,12 +41,14 @@ import {
   setOpenTOCDetails,
 } from '../actions/ui_actions';
 import { getIsFullScreen } from '../selectors/ui_selectors';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { copyPersistentState } from '../../../../../plugins/maps/public/reducers/util';
 import {
   getQueryableUniqueIndexPatternIds,
   hasDirtyState,
   getLayerListRaw,
 } 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 { indexPatternService, getInspector } from '../kibana_services';

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

@@ -18,6 +18,7 @@ import {
 } from '../../selectors/map_selectors';
 import { getIsLayerTOCOpen, getOpenTOCDetails } from '../../selectors/ui_selectors';
 import { convertMapExtentToPolygon } from '../../elasticsearch_geo_utils';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { copyPersistentState } from '../../../../../../plugins/maps/public/reducers/util';
 import { extractReferences, injectReferences } from '../../../common/migrations/references';
 import { MAP_SAVED_OBJECT_TYPE } from '../../../common/constants';

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

@@ -6,6 +6,7 @@
 
 import { connect } from 'react-redux';
 import { GisMap } from './view';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { FLYOUT_STATE } from '../../../../../../plugins/maps/public/reducers/ui';
 import { exitFullScreen } from '../../actions/ui_actions';
 import { getFlyoutDisplay, getIsFullScreen } from '../../selectors/ui_selectors';

x-pack/legacy/plugins/maps/public/connected_components/layer_addpanel/import_editor/index.js

@@ -6,7 +6,9 @@
 
 import { connect } from 'react-redux';
 import { ImportEditor } from './view';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { getInspectorAdapters } from '../../../../../../../plugins/maps/public/reducers/non_serializable_instances';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { INDEXING_STAGE } from '../../../../../../../plugins/maps/public/reducers/ui';
 import { updateIndexingStage } from '../../../actions/ui_actions';
 import { getIndexingStage } from '../../../selectors/ui_selectors';

x-pack/legacy/plugins/maps/public/connected_components/layer_addpanel/index.js

@@ -6,10 +6,12 @@
 
 import { connect } from 'react-redux';
 import { AddLayerPanel } from './view';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { FLYOUT_STATE, INDEXING_STAGE } from '../../../../../../plugins/maps/public/reducers/ui';
 import { updateFlyout, updateIndexingStage } from '../../actions/ui_actions';
 import { getFlyoutDisplay, getIndexingStage } from '../../selectors/ui_selectors';
 import { getMapColors } from '../../selectors/map_selectors';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { getInspectorAdapters } from '../../../../../../plugins/maps/public/reducers/non_serializable_instances';
 import {
   setTransientLayer,

x-pack/legacy/plugins/maps/public/connected_components/layer_addpanel/source_editor/index.js

@@ -6,6 +6,7 @@
 
 import { connect } from 'react-redux';
 import { SourceEditor } from './view';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { getInspectorAdapters } from '../../../../../../../plugins/maps/public/reducers/non_serializable_instances';
 
 function mapStateToProps(state = {}) {

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

@@ -6,6 +6,7 @@
 
 import { connect } from 'react-redux';
 import { FlyoutFooter } from './view';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { FLYOUT_STATE } from '../../../../../../../plugins/maps/public/reducers/ui';
 import { updateFlyout } from '../../../actions/ui_actions';
 import { hasDirtyState } from '../../../selectors/map_selectors';

x-pack/legacy/plugins/maps/public/connected_components/map/mb/index.js

@@ -24,6 +24,7 @@ import {
   isTooltipControlDisabled,
   isViewControlHidden,
 } from '../../../selectors/map_selectors';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { getInspectorAdapters } from '../../../../../../../plugins/maps/public/reducers/non_serializable_instances';
 
 function mapStateToProps(state = {}) {

x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/layer_control/index.js

@@ -6,6 +6,7 @@
 
 import { connect } from 'react-redux';
 import { LayerControl } from './view';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { FLYOUT_STATE } from '../../../../../../../plugins/maps/public/reducers/ui.js';
 import { updateFlyout, setIsLayerTOCOpen } from '../../../actions/ui_actions';
 import { setSelectedLayer } from '../../../actions/map_actions';

x-pack/legacy/plugins/maps/public/connected_components/widget_overlay/layer_control/layer_toc/toc_entry/index.js

@@ -7,6 +7,7 @@
 import _ from 'lodash';
 import { connect } from 'react-redux';
 import { TOCEntry } from './view';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { FLYOUT_STATE } from '../../../../../../../../../plugins/maps/public/reducers/ui.js';
 import { updateFlyout, hideTOCDetails, showTOCDetails } from '../../../../../actions/ui_actions';
 import { getIsReadOnly, getOpenTOCDetails } from '../../../../../selectors/ui_selectors';

x-pack/legacy/plugins/maps/public/embeddable/map_embeddable.js

@@ -19,6 +19,7 @@ import { esFilters } from '../../../../../../src/plugins/data/public';
 import { I18nContext } from 'ui/i18n';
 
 import { GisMap } from '../connected_components/gis_map';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { createMapStore } from '../../../../../plugins/maps/public/reducers/store';
 import { npStart } from 'ui/new_platform';
 import {
@@ -39,6 +40,7 @@ import { getIsLayerTOCOpen, getOpenTOCDetails } from '../selectors/ui_selectors'
 import {
   getInspectorAdapters,
   setEventHandlers,
+  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 } from '../../../../../plugins/maps/public/reducers/non_serializable_instances';
 import { getMapCenter, getMapZoom, getHiddenLayerIds } from '../selectors/map_selectors';
 import { MAP_SAVED_OBJECT_TYPE } from '../../common/constants';

x-pack/legacy/plugins/maps/public/embeddable/map_embeddable_factory.js

@@ -17,6 +17,7 @@ import { MapEmbeddable } from './map_embeddable';
 import { indexPatternService } from '../kibana_services';
 
 import { createMapPath, MAP_SAVED_OBJECT_TYPE, APP_ICON } from '../../common/constants';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { createMapStore } from '../../../../../plugins/maps/public/reducers/store';
 import { addLayerWithoutDataSync } from '../actions/map_actions';
 import { getQueryableUniqueIndexPatternIds } from '../selectors/map_selectors';

x-pack/legacy/plugins/maps/public/embeddable/merge_input_with_saved_map.js

@@ -5,6 +5,7 @@
  */
 
 import _ from 'lodash';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { DEFAULT_IS_LAYER_TOC_OPEN } from '../../../../../plugins/maps/public/reducers/ui';
 
 const MAP_EMBEDDABLE_INPUT_KEYS = [

x-pack/legacy/plugins/maps/public/layers/layer.js

@@ -14,6 +14,7 @@ import {
   SOURCE_DATA_ID_ORIGIN,
 } from '../../common/constants';
 import uuid from 'uuid/v4';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { copyPersistentState } from '../../../../../plugins/maps/public/reducers/util.js';
 import { i18n } from '@kbn/i18n';
 

x-pack/legacy/plugins/maps/public/layers/sources/es_source.js

@@ -17,6 +17,7 @@ import _ from 'lodash';
 import { AggConfigs } from 'ui/agg_types';
 import { i18n } from '@kbn/i18n';
 import uuid from 'uuid/v4';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { copyPersistentState } from '../../../../../../plugins/maps/public/reducers/util';
 import { ES_GEO_FIELD_TYPE, METRIC_TYPE } from '../../../common/constants';
 import { DataRequestAbortError } from '../util/data_request';

x-pack/legacy/plugins/maps/public/layers/sources/source.js

@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { copyPersistentState } from '../../../../../../plugins/maps/public/reducers/util';
 
 export class AbstractSource {

x-pack/legacy/plugins/maps/public/plugin.ts

@@ -10,6 +10,8 @@ import { wrapInI18nContext } from 'ui/i18n';
 import { MapListing } from './components/map_listing';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { setInjectedVarFunc } from '../../../../plugins/maps/public/kibana_services';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
+import { MapView } from '../../../../plugins/maps/public/inspector/views/map_view';
 import { setLicenseId, setInspector } from './kibana_services';
 import { HomePublicPluginSetup } from '../../../../../src/plugins/home/public';
 import { LicensingPluginSetup } from '../../../../plugins/licensing/public';
@@ -31,11 +33,6 @@ interface MapsPluginSetupDependencies {
   };
 }
 
-// This function will grow as more pieces are migrated to NP
-function initializeNewPlatformCode(getInjectedVar: any) {
-  setInjectedVarFunc(getInjectedVar);
-}
-
 /** @internal */
 export class MapsPlugin implements Plugin<MapsPluginSetup, MapsPluginStart> {
   public setup(core: any, { __LEGACY: { uiModules }, np }: MapsPluginSetupDependencies) {
@@ -50,7 +47,9 @@ export class MapsPlugin implements Plugin<MapsPluginSetup, MapsPluginStart> {
     }
     np.home.featureCatalogue.register(featureCatalogueEntry);
 
-    initializeNewPlatformCode(core.injectedMetadata.getInjectedVar);
+    // NP setup
+    setInjectedVarFunc(core.injectedMetadata.getInjectedVar);
+    np.inspector.registerView(MapView);
   }
 
   public start(core: CoreStart, plugins: any) {

x-pack/legacy/plugins/maps/public/selectors/map_selectors.js

@@ -12,10 +12,12 @@ import { VectorLayer } from '../layers/vector_layer';
 import { HeatmapLayer } from '../layers/heatmap_layer';
 import { ALL_SOURCES } from '../layers/sources/all_sources';
 import { timefilter } from 'ui/timefilter';
+// eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { getInspectorAdapters } from '../../../../../plugins/maps/public/reducers/non_serializable_instances';
 import {
   copyPersistentState,
   TRACKED_LAYER_DESCRIPTOR,
+  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 } from '../../../../../plugins/maps/public/reducers/util';
 
 function createLayerInstance(layerDescriptor, inspectorAdapters) {

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

@@ -4,8 +4,6 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import {getDataFilters} from "../../../../legacy/plugins/maps/public/selectors/map_selectors";
-
 export const SET_SELECTED_LAYER = 'SET_SELECTED_LAYER';
 export const SET_TRANSIENT_LAYER = 'SET_TRANSIENT_LAYER';
 export const UPDATE_LAYER_ORDER = 'UPDATE_LAYER_ORDER';