Skip to content

Commit

Permalink
Core plugin/to legacy move (#28284)
Browse files Browse the repository at this point in the history
* Move new ems_utils to legacy/core_plugins.

* Readjust ems_utils paths for legacy/core_plugins.
  • Loading branch information
njd5475 authored Jan 9, 2019
1 parent aafab73 commit 77d602f
Show file tree
Hide file tree
Showing 10 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion src/legacy/core_plugins/region_map/public/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/vis/__tests__/map/ems_client.js
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {

Expand Down
2 changes: 1 addition & 1 deletion src/ui/public/vis/__tests__/map/service_settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 () {

Expand Down
4 changes: 2 additions & 2 deletions src/ui/public/vis/map/service_settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 77d602f

Please sign in to comment.