Skip to content

Commit

Permalink
[Maps] Migrate remaining maps client files to NP (except routi… (elas…
Browse files Browse the repository at this point in the history
…tic#63859)

* Move actions over

* Move connected components over

* Move components over

* Move selectors over

* Move embeddables over. Set up legacy presence to keep legacy maps embeddables working

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

* Some file moves. Move styles over to NP

* Handle feature catalogue entry in NP. Add plugin deps to kibana.json

* Move vis registration to NP

* Clean up linting comments. Add linting comments to route controller. Move common to NP

* Add back in i18n context for embeddable

* Fix jest test paths. Fix TS lint errors

Co-authored-by: Elastic Machine <[email protected]>
  • Loading branch information
Aaron Caldwell and elasticmachine committed Apr 21, 2020
1 parent 197b7a5 commit 5021cd7
Show file tree
Hide file tree
Showing 209 changed files with 1,603 additions and 1,746 deletions.
8 changes: 0 additions & 8 deletions x-pack/legacy/plugins/maps/common/constants.ts

This file was deleted.

8 changes: 0 additions & 8 deletions x-pack/legacy/plugins/maps/common/descriptor_types.ts

This file was deleted.

8 changes: 0 additions & 8 deletions x-pack/legacy/plugins/maps/common/get_join_key.ts

This file was deleted.

8 changes: 0 additions & 8 deletions x-pack/legacy/plugins/maps/common/i18n_getters.ts

This file was deleted.

8 changes: 0 additions & 8 deletions x-pack/legacy/plugins/maps/common/parse_xml_string.js

This file was deleted.

11 changes: 7 additions & 4 deletions x-pack/legacy/plugins/maps/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,14 @@ import mappings from './mappings.json';
import { i18n } from '@kbn/i18n';
import { resolve } from 'path';
import { migrations } from './migrations';
import { getAppTitle } from './common/i18n_getters';
import { getAppTitle } from '../../../plugins/maps/common/i18n_getters';
import { MapPlugin } from './server/plugin';
import { APP_ID, APP_ICON, createMapPath, MAP_SAVED_OBJECT_TYPE } from './common/constants';
import {
APP_ID,
APP_ICON,
createMapPath,
MAP_SAVED_OBJECT_TYPE,
} from '../../../plugins/maps/common/constants';
import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/utils';

export function maps(kibana) {
Expand Down Expand Up @@ -52,7 +57,6 @@ export function maps(kibana) {
};
},
embeddableFactories: ['plugins/maps/embeddable/map_embeddable_factory'],
home: ['plugins/maps/legacy_register_feature'],
styleSheetPaths: `${__dirname}/public/index.scss`,
savedObjectSchemas: {
'maps-telemetry': {
Expand All @@ -77,7 +81,6 @@ export function maps(kibana) {
},
mappings,
migrations,
hacks: ['plugins/maps/register_vis_type_alias'],
},
config(Joi) {
return Joi.object({
Expand Down
16 changes: 8 additions & 8 deletions x-pack/legacy/plugins/maps/migrations.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
* you may not use this file except in compliance with the Elastic License.
*/

import { extractReferences } from './common/migrations/references';
import { emsRasterTileToEmsVectorTile } from './common/migrations/ems_raster_tile_to_ems_vector_tile';
import { topHitsTimeToSort } from './common/migrations/top_hits_time_to_sort';
import { moveApplyGlobalQueryToSources } from './common/migrations/move_apply_global_query';
import { addFieldMetaOptions } from './common/migrations/add_field_meta_options';
import { migrateSymbolStyleDescriptor } from './common/migrations/migrate_symbol_style_descriptor';
import { migrateUseTopHitsToScalingType } from './common/migrations/scaling_type';
import { migrateJoinAggKey } from './common/migrations/join_agg_key';
import { extractReferences } from '../../../plugins/maps/common/migrations/references';
import { emsRasterTileToEmsVectorTile } from '../../../plugins/maps/common/migrations/ems_raster_tile_to_ems_vector_tile';
import { topHitsTimeToSort } from '../../../plugins/maps/common/migrations/top_hits_time_to_sort';
import { moveApplyGlobalQueryToSources } from '../../../plugins/maps/common/migrations/move_apply_global_query';
import { addFieldMetaOptions } from '../../../plugins/maps/common/migrations/add_field_meta_options';
import { migrateSymbolStyleDescriptor } from '../../../plugins/maps/common/migrations/migrate_symbol_style_descriptor';
import { migrateUseTopHitsToScalingType } from '../../../plugins/maps/common/migrations/scaling_type';
import { migrateJoinAggKey } from '../../../plugins/maps/common/migrations/join_agg_key';

export const migrations = {
map: {
Expand Down
8 changes: 0 additions & 8 deletions x-pack/legacy/plugins/maps/public/actions/map_actions.d.ts

This file was deleted.

Loading

0 comments on commit 5021cd7

Please sign in to comment.