From 7303e71b153b062fde3e6125290c234eb1d32821 Mon Sep 17 00:00:00 2001 From: Aaron Caldwell Date: Thu, 16 Apr 2020 16:05:40 -0600 Subject: [PATCH] Some file moves. Move styles over to NP --- .../maps/public/angular/map_controller.js | 2 +- x-pack/legacy/plugins/maps/public/index.scss | 16 +--------------- .../maps/public/legacy_register_feature.ts | 2 +- x-pack/legacy/plugins/maps/public/plugin.ts | 2 +- .../{legacy => }/plugins/maps/public/_main.scss | 0 .../plugins/maps/public/_mapbox_hacks.scss | 0 .../maps/public/components/map_listing.js | 2 +- .../maps/public/feature_catalogue_entry.ts | 6 +++--- .../plugins/maps/public/help_menu_util.js | 2 +- x-pack/plugins/maps/public/index.scss | 17 +++++++++++++++++ 10 files changed, 26 insertions(+), 23 deletions(-) rename x-pack/{legacy => }/plugins/maps/public/_main.scss (100%) rename x-pack/{legacy => }/plugins/maps/public/_mapbox_hacks.scss (100%) rename x-pack/{legacy => }/plugins/maps/public/feature_catalogue_entry.ts (72%) rename x-pack/{legacy => }/plugins/maps/public/help_menu_util.js (88%) create mode 100644 x-pack/plugins/maps/public/index.scss diff --git a/x-pack/legacy/plugins/maps/public/angular/map_controller.js b/x-pack/legacy/plugins/maps/public/angular/map_controller.js index 76779c447d918..4368351796d81 100644 --- 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 index dce8772290feb..b2a228f01b921 100644 --- 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 index 00f788f267d4b..e6358e1f404a9 100644 --- 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 index d544210e167e6..9be8c01089e27 100644 --- 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 b/x-pack/plugins/maps/public/_main.scss similarity index 100% rename from x-pack/legacy/plugins/maps/public/_main.scss rename to x-pack/plugins/maps/public/_main.scss diff --git a/x-pack/legacy/plugins/maps/public/_mapbox_hacks.scss b/x-pack/plugins/maps/public/_mapbox_hacks.scss similarity index 100% rename from x-pack/legacy/plugins/maps/public/_mapbox_hacks.scss rename to x-pack/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 index a4dc4c2b019e6..009923b149155 100644 --- 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/x-pack/legacy/plugins/maps/public/feature_catalogue_entry.ts b/x-pack/plugins/maps/public/feature_catalogue_entry.ts similarity index 72% rename from x-pack/legacy/plugins/maps/public/feature_catalogue_entry.ts rename to x-pack/plugins/maps/public/feature_catalogue_entry.ts index fdda76b4e1212..2cedebce5cbea 100644 --- a/x-pack/legacy/plugins/maps/public/feature_catalogue_entry.ts +++ b/x-pack/plugins/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/x-pack/legacy/plugins/maps/public/help_menu_util.js b/x-pack/plugins/maps/public/help_menu_util.js similarity index 88% rename from x-pack/legacy/plugins/maps/public/help_menu_util.js rename to x-pack/plugins/maps/public/help_menu_util.js index 70b9340b562cd..d166a267f8c4f 100644 --- a/x-pack/legacy/plugins/maps/public/help_menu_util.js +++ b/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 new file mode 100644 index 0000000000000..8b2f6d3cb6156 --- /dev/null +++ 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';