Some file moves. Move styles over to NP

elastic · Apr 16, 2020 · 7303e71 · 7303e71
1 parent 049b216
commit 7303e71
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 23 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
@@ -29,7 +29,7 @@ import {
 import { createMapStore } from '../../../../../plugins/maps/public/reducers/store';
 import { Provider } from 'react-redux';
 import { GisMap } from '../../../../../plugins/maps/public/connected_components/gis_map';
-import { addHelpMenuToAppChrome } from '../help_menu_util';
+import { addHelpMenuToAppChrome } from '../../../../../plugins/maps/public/help_menu_util';
 import {
   setSelectedLayer,
   setRefreshConfig,

diff --git a/x-pack/legacy/plugins/maps/public/index.scss b/x-pack/legacy/plugins/maps/public/index.scss
@@ -1,17 +1,3 @@
-// Import the EUI global scope so we can use EUI constants
-@import 'src/legacy/ui/public/styles/_styling_constants';
-
 /* GIS plugin styles */
 
-// Prefix all styles with "map" to avoid conflicts.
-// Examples
-//   mapChart
-//   mapChart__legend
-//   mapChart__legend--small
-//   mapChart__legend-isLoading
-
-@import './main';
-@import './mapbox_hacks';
-@import '../../../../plugins/maps/public/connected_components/index';
-@import '../../../../plugins/maps/public/components/index';
-@import '../../../../plugins/maps/public/layers/index';
+@import '../../../../plugins/maps/public/index';
diff --git a/x-pack/legacy/plugins/maps/public/legacy_register_feature.ts b/x-pack/legacy/plugins/maps/public/legacy_register_feature.ts
@@ -5,7 +5,7 @@
  */
 
 import { npSetup } from 'ui/new_platform';
-import { featureCatalogueEntry } from './feature_catalogue_entry';
+import { featureCatalogueEntry } from '../../../../plugins/maps/public/feature_catalogue_entry';
 
 const {
   plugins: { home },

diff --git a/x-pack/legacy/plugins/maps/public/plugin.ts b/x-pack/legacy/plugins/maps/public/plugin.ts
@@ -25,7 +25,7 @@ import {
 } from '../../../../plugins/maps/public/plugin'; // eslint-disable-line @kbn/eslint/no-restricted-paths
 import { HomePublicPluginSetup } from '../../../../../src/plugins/home/public';
 import { LicensingPluginSetup } from '../../../../plugins/licensing/public';
-import { featureCatalogueEntry } from './feature_catalogue_entry';
+import { featureCatalogueEntry } from '../../../../plugins/maps/public/feature_catalogue_entry';
 import {
   DataPublicPluginSetup,
   DataPublicPluginStart,

diff --git a/x-pack/legacy/plugins/maps/public/_main.scss → x-pack/plugins/maps/public/_main.scss b/x-pack/legacy/plugins/maps/public/_main.scss → x-pack/plugins/maps/public/_main.scss
diff --git a/...cy/plugins/maps/public/_mapbox_hacks.scss → ...ck/plugins/maps/public/_mapbox_hacks.scss b/...cy/plugins/maps/public/_mapbox_hacks.scss → ...ck/plugins/maps/public/_mapbox_hacks.scss
diff --git a/x-pack/plugins/maps/public/components/map_listing.js b/x-pack/plugins/maps/public/components/map_listing.js
@@ -27,7 +27,7 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { addHelpMenuToAppChrome } from '../../../../legacy/plugins/maps/public/help_menu_util';
+import { addHelpMenuToAppChrome } from '../help_menu_util';
 
 export const EMPTY_FILTER = '';
 

diff --git a/...ns/maps/public/feature_catalogue_entry.ts → ...ns/maps/public/feature_catalogue_entry.ts b/...ns/maps/public/feature_catalogue_entry.ts → ...ns/maps/public/feature_catalogue_entry.ts
@@ -4,9 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 import { i18n } from '@kbn/i18n';
-import { APP_ID, APP_ICON } from '../common/constants';
-import { getAppTitle } from '../common/i18n_getters';
-import { FeatureCatalogueCategory } from '../../../../../src/plugins/home/public';
+import { APP_ID, APP_ICON } from '../../../legacy/plugins/maps/common/constants';
+import { getAppTitle } from '../../../legacy/plugins/maps/common/i18n_getters';
+import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
 
 export const featureCatalogueEntry = {
   id: APP_ID,

diff --git a/...acy/plugins/maps/public/help_menu_util.js → x-pack/plugins/maps/public/help_menu_util.js b/...acy/plugins/maps/public/help_menu_util.js → x-pack/plugins/maps/public/help_menu_util.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 { getDocLinks, getCoreChrome } from '../../../../plugins/maps/public/kibana_services';
+import { getDocLinks, getCoreChrome } from './kibana_services';
 
 export function addHelpMenuToAppChrome() {
   const { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } = getDocLinks();

diff --git a/x-pack/plugins/maps/public/index.scss b/x-pack/plugins/maps/public/index.scss
@@ -0,0 +1,17 @@
+/* GIS plugin styles */
+
+// Import the EUI global scope so we can use EUI constants
+@import 'src/legacy/ui/public/styles/_styling_constants';
+
+// Prefix all styles with "map" to avoid conflicts.
+// Examples
+//   mapChart
+//   mapChart__legend
+//   mapChart__legend--small
+//   mapChart__legend-isLoading
+
+@import 'main';
+@import 'mapbox_hacks';
+@import 'connected_components/index';
+@import 'components/index';
+@import 'layers/index';