Move angular and services over. Some additional top-level files

elastic · Apr 16, 2020 · 049b216 · 049b216
1 parent 4dc4831
commit 049b216
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 45 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
@@ -60,10 +60,10 @@ import {
 } from '../../../../../plugins/maps/public/selectors/map_selectors';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { getInspectorAdapters } from '../../../../../plugins/maps/public/reducers/non_serializable_instances';
-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 { getInitialLayers } from '../../../../../plugins/maps/public/angular/get_initial_layers';
+import { getInitialQuery } from '../../../../../plugins/maps/public/angular/get_initial_query';
+import { getInitialTimeFilters } from '../../../../../plugins/maps/public/angular/get_initial_time_filters';
+import { getInitialRefreshConfig } from '../../../../../plugins/maps/public/angular/get_initial_refresh_config';
 import { MAP_SAVED_OBJECT_TYPE, MAP_APP_PATH } from '../../common/constants';
 import { npSetup, npStart } from 'ui/new_platform';
 import { esFilters } from '../../../../../../src/plugins/data/public';

diff --git a/x-pack/legacy/plugins/maps/public/index.ts b/x-pack/legacy/plugins/maps/public/index.ts
@@ -16,7 +16,7 @@ import 'uiExports/embeddableActions';
 import 'ui/autoload/all';
 import 'react-vis/dist/style.css';
 
-import './angular/services/gis_map_saved_object_loader';
+import '../../../../plugins/maps/public/angular/services/gis_map_saved_object_loader';
 import './angular/map_controller';
 import './routes';
 // @ts-ignore

diff --git a/x-pack/legacy/plugins/maps/public/routes.js b/x-pack/legacy/plugins/maps/public/routes.js
@@ -6,15 +6,15 @@
 
 import { i18n } from '@kbn/i18n';
 import routes from 'ui/routes';
-import listingTemplate from './angular/listing_ng_wrapper.html';
-import mapTemplate from './angular/map.html';
+import listingTemplate from '../../../../plugins/maps/public/angular/listing_ng_wrapper.html';
+import mapTemplate from '../../../../plugins/maps/public/angular/map.html';
 import {
   getSavedObjectsClient,
   getCoreChrome,
   getMapsCapabilities,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 } from '../../../../plugins/maps/public/kibana_services';
-import { getMapsSavedObjectLoader } from './angular/services/gis_map_saved_object_loader';
+import { getMapsSavedObjectLoader } from '../../../../plugins/maps/public/angular/services/gis_map_saved_object_loader';
 
 routes.enable();
 

diff --git a/...ps/public/angular/get_initial_layers.d.ts → ...ps/public/angular/get_initial_layers.d.ts b/...ps/public/angular/get_initial_layers.d.ts → ...ps/public/angular/get_initial_layers.d.ts
diff --git a/...maps/public/angular/get_initial_layers.js → ...maps/public/angular/get_initial_layers.js b/...maps/public/angular/get_initial_layers.js → ...maps/public/angular/get_initial_layers.js
@@ -6,28 +6,28 @@
 import _ from 'lodash';
 // Import each layer type, even those not used, to init in registry
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import '../../../../../plugins/maps/public/layers/sources/wms_source';
+import '../layers/sources/wms_source';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import '../../../../../plugins/maps/public/layers/sources/ems_file_source';
+import '../layers/sources/ems_file_source';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import '../../../../../plugins/maps/public/layers/sources/es_search_source';
+import '../layers/sources/es_search_source';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import '../../../../../plugins/maps/public/layers/sources/es_pew_pew_source/es_pew_pew_source';
+import '../layers/sources/es_pew_pew_source/es_pew_pew_source';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import '../../../../../plugins/maps/public/layers/sources/kibana_regionmap_source';
+import '../layers/sources/kibana_regionmap_source';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import '../../../../../plugins/maps/public/layers/sources/es_geo_grid_source';
+import '../layers/sources/es_geo_grid_source';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import '../../../../../plugins/maps/public/layers/sources/xyz_tms_source';
+import '../layers/sources/xyz_tms_source';
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { KibanaTilemapSource } from '../../../../../plugins/maps/public/layers/sources/kibana_tilemap_source';
+import { KibanaTilemapSource } from '../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 { EMSTMSSource } from '../layers/sources/ems_tms_source';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { getInjectedVarFunc } from '../../../../../plugins/maps/public/kibana_services';
+import { getInjectedVarFunc } from '../kibana_services';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { getKibanaTileMap } from '../../../../../plugins/maps/public/meta';
+import { getKibanaTileMap } from '../meta';
 
 export function getInitialLayers(layerListJSON, initialLayers = []) {
   if (layerListJSON) {

diff --git a/...public/angular/get_initial_layers.test.js → ...public/angular/get_initial_layers.test.js b/...public/angular/get_initial_layers.test.js → ...public/angular/get_initial_layers.test.js
@@ -4,19 +4,18 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-jest.mock('../../../../../plugins/maps/public/meta', () => {
+jest.mock('../meta', () => {
   return {};
 });
-jest.mock('../../../../../plugins/maps/public/kibana_services');
+jest.mock('../kibana_services');
 
 import { getInitialLayers } from './get_initial_layers';
 
 const layerListNotProvided = undefined;
 
 describe('Saved object has layer list', () => {
   beforeEach(() => {
-    require('../../../../../plugins/maps/public/kibana_services').getInjectedVarFunc = () =>
-      jest.fn();
+    require('../kibana_services').getInjectedVarFunc = () => jest.fn();
   });
 
   it('Should get initial layers from saved object', () => {
@@ -33,7 +32,7 @@ describe('Saved object has layer list', () => {
 
 describe('kibana.yml configured with map.tilemap.url', () => {
   beforeAll(() => {
-    require('../../../../../plugins/maps/public/meta').getKibanaTileMap = () => {
+    require('../meta').getKibanaTileMap = () => {
       return {
         url: 'myTileUrl',
       };
@@ -63,10 +62,10 @@ describe('kibana.yml configured with map.tilemap.url', () => {
 
 describe('EMS is enabled', () => {
   beforeAll(() => {
-    require('../../../../../plugins/maps/public/meta').getKibanaTileMap = () => {
+    require('../meta').getKibanaTileMap = () => {
       return null;
     };
-    require('../../../../../plugins/maps/public/kibana_services').getInjectedVarFunc = () => key => {
+    require('../kibana_services').getInjectedVarFunc = () => key => {
       switch (key) {
         case 'emsTileLayerId':
           return {
@@ -107,11 +106,11 @@ describe('EMS is enabled', () => {
 
 describe('EMS is not enabled', () => {
   beforeAll(() => {
-    require('../../../../../plugins/maps/public/meta').getKibanaTileMap = () => {
+    require('../meta').getKibanaTileMap = () => {
       return null;
     };
 
-    require('../../../../../plugins/maps/public/kibana_services').getInjectedVarFunc = () => key => {
+    require('../kibana_services').getInjectedVarFunc = () => key => {
       switch (key) {
         case 'isEmsEnabled':
           return false;

diff --git a/.../maps/public/angular/get_initial_query.js → .../maps/public/angular/get_initial_query.js b/.../maps/public/angular/get_initial_query.js → .../maps/public/angular/get_initial_query.js
@@ -5,7 +5,7 @@
  */
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { getUiSettings } from '../../../../../plugins/maps/public/kibana_services';
+import { getUiSettings } from '../kibana_services';
 
 export function getInitialQuery({ mapStateJSON, appState = {}, userQueryLanguage }) {
   const settings = getUiSettings();

diff --git a/...lic/angular/get_initial_refresh_config.js → ...lic/angular/get_initial_refresh_config.js b/...lic/angular/get_initial_refresh_config.js → ...lic/angular/get_initial_refresh_config.js
@@ -4,7 +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 { getUiSettings } from '../../../../../plugins/maps/public/kibana_services';
+import { getUiSettings } from '../kibana_services';
 
 export function getInitialRefreshConfig({ mapStateJSON, globalState = {} }) {
   const uiSettings = getUiSettings();

diff --git a/...ublic/angular/get_initial_time_filters.js → ...ublic/angular/get_initial_time_filters.js b/...ublic/angular/get_initial_time_filters.js → ...ublic/angular/get_initial_time_filters.js
@@ -4,7 +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 { getUiSettings } from '../../../../../plugins/maps/public/kibana_services';
+import { getUiSettings } from '../kibana_services';
 
 export function getInitialTimeFilters({ mapStateJSON, globalState = {} }) {
   if (mapStateJSON) {

diff --git a/...ps/public/angular/listing_ng_wrapper.html → ...ps/public/angular/listing_ng_wrapper.html b/...ps/public/angular/listing_ng_wrapper.html → ...ps/public/angular/listing_ng_wrapper.html
diff --git a/...gacy/plugins/maps/public/angular/map.html → x-pack/plugins/maps/public/angular/map.html b/...gacy/plugins/maps/public/angular/map.html → x-pack/plugins/maps/public/angular/map.html
diff --git a/...r/services/gis_map_saved_object_loader.js → ...r/services/gis_map_saved_object_loader.js b/...r/services/gis_map_saved_object_loader.js → ...r/services/gis_map_saved_object_loader.js
@@ -6,15 +6,15 @@
 
 import _ from 'lodash';
 import { createSavedGisMapClass } from './saved_gis_map';
-import { SavedObjectLoader } from '../../../../../../../src/plugins/saved_objects/public';
+import { SavedObjectLoader } from '../../../../../../src/plugins/saved_objects/public';
 import {
   getCoreChrome,
   getSavedObjectsClient,
   getIndexPatternService,
   getCoreOverlays,
   getData,
   // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../../../plugins/maps/public/kibana_services';
+} from '../../kibana_services';
 
 export const getMapsSavedObjectLoader = _.once(function() {
   const services = {

diff --git a/.../public/angular/services/saved_gis_map.js → .../public/angular/services/saved_gis_map.js b/.../public/angular/services/saved_gis_map.js → .../public/angular/services/saved_gis_map.js
@@ -5,7 +5,7 @@
  */
 
 import _ from 'lodash';
-import { createSavedObjectClass } from '../../../../../../../src/plugins/saved_objects/public';
+import { createSavedObjectClass } from '../../../../../../src/plugins/saved_objects/public';
 import {
   getTimeFilters,
   getMapZoom,
@@ -15,17 +15,17 @@ import {
   getRefreshConfig,
   getQuery,
   getFilters,
-} from '../../../../../../plugins/maps/public/selectors/map_selectors';
-import {
-  getIsLayerTOCOpen,
-  getOpenTOCDetails,
-} from '../../../../../../plugins/maps/public/selectors/ui_selectors';
+} from '../../selectors/map_selectors';
+import { getIsLayerTOCOpen, getOpenTOCDetails } from '../../selectors/ui_selectors';
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { convertMapExtentToPolygon } from '../../../../../../plugins/maps/public/elasticsearch_geo_utils';
+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';
+import { copyPersistentState } from '../../reducers/util';
+import {
+  extractReferences,
+  injectReferences,
+} from '../../../../../legacy/plugins/maps/common/migrations/references';
+import { MAP_SAVED_OBJECT_TYPE } from '../../../../../legacy/plugins/maps/common/constants';
 
 export function createSavedGisMapClass(services) {
   const SavedObjectClass = createSavedObjectClass(services);

diff --git a/x-pack/plugins/maps/public/embeddable/map_embeddable_factory.ts b/x-pack/plugins/maps/public/embeddable/map_embeddable_factory.ts
@@ -8,7 +8,7 @@ import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { IIndexPattern } from 'src/plugins/data/public';
 // @ts-ignore
-import { getMapsSavedObjectLoader } from '../../../../legacy/plugins/maps/public/angular/services/gis_map_saved_object_loader';
+import { getMapsSavedObjectLoader } from '../angular/services/gis_map_saved_object_loader';
 import { MapEmbeddable, MapEmbeddableInput } from './map_embeddable';
 import {
   getIndexPatternService,
@@ -26,7 +26,7 @@ import { createMapPath, MAP_SAVED_OBJECT_TYPE, APP_ICON } from '../../common/con
 import { createMapStore } from '../reducers/store';
 import { addLayerWithoutDataSync } from '../actions/map_actions';
 import { getQueryableUniqueIndexPatternIds } from '../selectors/map_selectors';
-import { getInitialLayers } from '../../../../legacy/plugins/maps/public/angular/get_initial_layers';
+import { getInitialLayers } from '../angular/get_initial_layers';
 import { mergeInputWithSavedMap } from './merge_input_with_saved_map';
 
 export class MapEmbeddableFactory implements EmbeddableFactoryDefinition {

diff --git a/x-pack/legacy/plugins/maps/public/icon.svg → x-pack/plugins/maps/public/icon.svg b/x-pack/legacy/plugins/maps/public/icon.svg → x-pack/plugins/maps/public/icon.svg