From 77d602fa1350b34e223b47768c2ae2bdf84785ac Mon Sep 17 00:00:00 2001 From: nicknak Date: Wed, 9 Jan 2019 09:21:19 -0500 Subject: [PATCH] Core plugin/to legacy move (#28284) * Move new ems_utils to legacy/core_plugins. * Readjust ems_utils paths for legacy/core_plugins. --- src/{ => legacy}/core_plugins/ems_util/common/ems_client.js | 2 +- src/{ => legacy}/core_plugins/ems_util/common/file_layer.js | 0 src/{ => legacy}/core_plugins/ems_util/common/origin.js | 0 src/{ => legacy}/core_plugins/ems_util/common/tms_service.js | 0 src/legacy/core_plugins/region_map/public/region_map_vis.js | 2 +- .../core_plugins/region_map/public/region_map_vis_params.js | 2 +- src/legacy/core_plugins/region_map/public/util.js | 2 +- src/ui/public/vis/__tests__/map/ems_client.js | 2 +- src/ui/public/vis/__tests__/map/service_settings.js | 2 +- src/ui/public/vis/map/service_settings.js | 4 ++-- 10 files changed, 8 insertions(+), 8 deletions(-) rename src/{ => legacy}/core_plugins/ems_util/common/ems_client.js (99%) rename src/{ => legacy}/core_plugins/ems_util/common/file_layer.js (100%) rename src/{ => legacy}/core_plugins/ems_util/common/origin.js (100%) rename src/{ => legacy}/core_plugins/ems_util/common/tms_service.js (100%) diff --git a/src/core_plugins/ems_util/common/ems_client.js b/src/legacy/core_plugins/ems_util/common/ems_client.js similarity index 99% rename from src/core_plugins/ems_util/common/ems_client.js rename to src/legacy/core_plugins/ems_util/common/ems_client.js index 9e6a771727963..0298230eeba59 100644 --- a/src/core_plugins/ems_util/common/ems_client.js +++ b/src/legacy/core_plugins/ems_util/common/ems_client.js @@ -19,7 +19,7 @@ import MarkdownIt from 'markdown-it'; import _ from 'lodash'; -import { modifyUrl } from '../../../core/public/utils'; +import { modifyUrl } from '../../../../core/public/utils'; import { TMSService } from './tms_service'; import { FileLayer } from './file_layer'; diff --git a/src/core_plugins/ems_util/common/file_layer.js b/src/legacy/core_plugins/ems_util/common/file_layer.js similarity index 100% rename from src/core_plugins/ems_util/common/file_layer.js rename to src/legacy/core_plugins/ems_util/common/file_layer.js diff --git a/src/core_plugins/ems_util/common/origin.js b/src/legacy/core_plugins/ems_util/common/origin.js similarity index 100% rename from src/core_plugins/ems_util/common/origin.js rename to src/legacy/core_plugins/ems_util/common/origin.js diff --git a/src/core_plugins/ems_util/common/tms_service.js b/src/legacy/core_plugins/ems_util/common/tms_service.js similarity index 100% rename from src/core_plugins/ems_util/common/tms_service.js rename to src/legacy/core_plugins/ems_util/common/tms_service.js diff --git a/src/legacy/core_plugins/region_map/public/region_map_vis.js b/src/legacy/core_plugins/region_map/public/region_map_vis.js index e22de43a3222c..c885ebe9df8ac 100644 --- a/src/legacy/core_plugins/region_map/public/region_map_vis.js +++ b/src/legacy/core_plugins/region_map/public/region_map_vis.js @@ -25,7 +25,7 @@ import { truncatedColorMaps } from 'ui/vislib/components/color/truncated_colorma import { mapToLayerWithId } from './util'; import { RegionMapsVisualizationProvider } from './region_map_visualization'; import { Status } from 'ui/vis/update_status'; -import { ORIGIN } from '../../../../core_plugins/ems_util/common/origin'; +import { ORIGIN } from '../../ems_util/common/origin'; VisTypesRegistryProvider.register(function RegionMapProvider(Private, regionmapsConfig, config, i18n) { diff --git a/src/legacy/core_plugins/region_map/public/region_map_vis_params.js b/src/legacy/core_plugins/region_map/public/region_map_vis_params.js index 4d2b859ad0153..2e99753e37905 100644 --- a/src/legacy/core_plugins/region_map/public/region_map_vis_params.js +++ b/src/legacy/core_plugins/region_map/public/region_map_vis_params.js @@ -22,7 +22,7 @@ import { toastNotifications } from 'ui/notify'; import regionMapVisParamsTemplate from './region_map_vis_params.html'; import { mapToLayerWithId } from './util'; import '../../tile_map/public/editors/wms_options'; -import { ORIGIN } from '../../../../core_plugins/ems_util/common/origin'; +import { ORIGIN } from '../../ems_util/common/origin'; uiModules.get('kibana/region_map') .directive('regionMapVisParams', function (serviceSettings, regionmapsConfig) { diff --git a/src/legacy/core_plugins/region_map/public/util.js b/src/legacy/core_plugins/region_map/public/util.js index 3c71df377708b..191e726a4ff73 100644 --- a/src/legacy/core_plugins/region_map/public/util.js +++ b/src/legacy/core_plugins/region_map/public/util.js @@ -18,7 +18,7 @@ */ import _ from 'lodash'; -import { ORIGIN } from '../../../../core_plugins/ems_util/common/origin'; +import { ORIGIN } from '../../ems_util/common/origin'; export function mapToLayerWithId(prefix, layer) { const clonedLayer = _.cloneDeep(layer); diff --git a/src/ui/public/vis/__tests__/map/ems_client.js b/src/ui/public/vis/__tests__/map/ems_client.js index 9c62f851099ec..a7646455d2dff 100644 --- a/src/ui/public/vis/__tests__/map/ems_client.js +++ b/src/ui/public/vis/__tests__/map/ems_client.js @@ -23,7 +23,7 @@ import EMS_FILES from './ems_mocks/sample_files_6.6.json'; import EMS_TILES from './ems_mocks/sample_tiles_6.6.json'; -import { EMSClientV66 } from '../../../../../core_plugins/ems_util/common/ems_client'; +import { EMSClientV66 } from '../../../../../legacy/core_plugins/ems_util/common/ems_client'; describe('ems_client', () => { diff --git a/src/ui/public/vis/__tests__/map/service_settings.js b/src/ui/public/vis/__tests__/map/service_settings.js index 643faaee3ce75..9fba2833aa4e8 100644 --- a/src/ui/public/vis/__tests__/map/service_settings.js +++ b/src/ui/public/vis/__tests__/map/service_settings.js @@ -24,7 +24,7 @@ import url from 'url'; import EMS_CATALOGUE from './ems_mocks/sample_manifest_6.6.json'; import EMS_FILES from './ems_mocks/sample_files_6.6.json'; import EMS_TILES from './ems_mocks/sample_tiles_6.6.json'; -import { ORIGIN } from '../../../../../core_plugins/ems_util/common/origin'; +import { ORIGIN } from '../../../../../legacy/core_plugins/ems_util/common/origin'; describe('service_settings (FKA tilemaptest)', function () { diff --git a/src/ui/public/vis/map/service_settings.js b/src/ui/public/vis/map/service_settings.js index 49d5862573811..86f8c48b86a26 100644 --- a/src/ui/public/vis/map/service_settings.js +++ b/src/ui/public/vis/map/service_settings.js @@ -20,8 +20,8 @@ import { uiModules } from '../../modules'; import _ from 'lodash'; import MarkdownIt from 'markdown-it'; -import { ORIGIN } from '../../../../core_plugins/ems_util/common/origin'; -import { EMSClientV66 } from '../../../../core_plugins/ems_util/common/ems_client'; +import { ORIGIN } from '../../../../legacy/core_plugins/ems_util/common/origin'; +import { EMSClientV66 } from '../../../../legacy/core_plugins/ems_util/common/ems_client'; const markdownIt = new MarkdownIt({ html: false,