From 2c537cef555701c47cd0fb02fa5fe00cd373cf01 Mon Sep 17 00:00:00 2001
From: Aaron Caldwell <aaron.caldwell@elastic.co>
Date: Fri, 17 Apr 2020 08:49:14 -0600
Subject: [PATCH] Move vis registration to NP

---
 x-pack/legacy/plugins/maps/index.js           |  1 -
 .../maps/public/register_vis_type_alias.js    | 49 -------------------
 x-pack/plugins/maps/kibana.json               |  3 +-
 .../maps/public/maps_vis_type_alias.js        | 46 +++++++++++++++++
 x-pack/plugins/maps/public/plugin.ts          |  2 +
 5 files changed, 50 insertions(+), 51 deletions(-)
 delete mode 100644 x-pack/legacy/plugins/maps/public/register_vis_type_alias.js
 create mode 100644 x-pack/plugins/maps/public/maps_vis_type_alias.js

diff --git a/x-pack/legacy/plugins/maps/index.js b/x-pack/legacy/plugins/maps/index.js
index 223bd50f88518..0d5f0f60fa36b 100644
--- a/x-pack/legacy/plugins/maps/index.js
+++ b/x-pack/legacy/plugins/maps/index.js
@@ -76,7 +76,6 @@ export function maps(kibana) {
       },
       mappings,
       migrations,
-      hacks: ['plugins/maps/register_vis_type_alias'],
     },
     config(Joi) {
       return Joi.object({
diff --git a/x-pack/legacy/plugins/maps/public/register_vis_type_alias.js b/x-pack/legacy/plugins/maps/public/register_vis_type_alias.js
deleted file mode 100644
index 9dc07bcb5dc0e..0000000000000
--- a/x-pack/legacy/plugins/maps/public/register_vis_type_alias.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License;
- * you may not use this file except in compliance with the Elastic License.
- */
-
-import { i18n } from '@kbn/i18n';
-import { APP_ID, APP_ICON, MAP_BASE_URL } from '../common/constants';
-import {
-  getInjectedVarFunc,
-  getVisualizations,
-  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../plugins/maps/public/kibana_services';
-import { npSetup } from 'ui/new_platform';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { bindSetupCoreAndPlugins } from '../../../../plugins/maps/public/plugin';
-
-bindSetupCoreAndPlugins(npSetup.core, npSetup.plugins);
-
-const showMapVisualizationTypes = getInjectedVarFunc()('showMapVisualizationTypes', false);
-
-const description = i18n.translate('xpack.maps.visTypeAlias.description', {
-  defaultMessage: 'Create and style maps with multiple layers and indices.',
-});
-
-const legacyMapVisualizationWarning = i18n.translate(
-  'xpack.maps.visTypeAlias.legacyMapVizWarning',
-  {
-    defaultMessage: `Use the Maps app instead of Coordinate Map and Region Map.
-The Maps app offers more functionality and is easier to use.`,
-  }
-);
-
-getVisualizations().registerAlias({
-  aliasUrl: MAP_BASE_URL,
-  name: APP_ID,
-  title: i18n.translate('xpack.maps.visTypeAlias.title', {
-    defaultMessage: 'Maps',
-  }),
-  description: showMapVisualizationTypes
-    ? `${description} ${legacyMapVisualizationWarning}`
-    : description,
-  icon: APP_ICON,
-  stage: 'production',
-});
-
-if (!showMapVisualizationTypes) {
-  getVisualizations().hideTypes(['region_map', 'tile_map']);
-}
diff --git a/x-pack/plugins/maps/kibana.json b/x-pack/plugins/maps/kibana.json
index 59684977792a3..00c5e70ad6b8d 100644
--- a/x-pack/plugins/maps/kibana.json
+++ b/x-pack/plugins/maps/kibana.json
@@ -9,7 +9,8 @@
     "data",
     "fileUpload",
     "uiActions",
-    "navigation"
+    "navigation",
+    "visualizations"
   ],
   "ui": true
 }
diff --git a/x-pack/plugins/maps/public/maps_vis_type_alias.js b/x-pack/plugins/maps/public/maps_vis_type_alias.js
new file mode 100644
index 0000000000000..a2ca0ba8cdffd
--- /dev/null
+++ b/x-pack/plugins/maps/public/maps_vis_type_alias.js
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { APP_ID, APP_ICON, MAP_BASE_URL } from '../../../legacy/plugins/maps/common/constants';
+import {
+  getInjectedVarFunc,
+  getVisualizations,
+} from './kibana_services';
+
+export function getMapsVisTypeAlias() {
+  const showMapVisualizationTypes = getInjectedVarFunc()('showMapVisualizationTypes', false);
+  if (!showMapVisualizationTypes) {
+    getVisualizations().hideTypes(['region_map', 'tile_map']);
+  }
+
+  const description = i18n.translate('xpack.maps.visTypeAlias.description', {
+    defaultMessage: 'Create and style maps with multiple layers and indices.',
+  });
+
+  const legacyMapVisualizationWarning = i18n.translate(
+    'xpack.maps.visTypeAlias.legacyMapVizWarning',
+    {
+      defaultMessage: `Use the Maps app instead of Coordinate Map and Region Map.
+The Maps app offers more functionality and is easier to use.`,
+    }
+  );
+
+  return ({
+    aliasUrl: MAP_BASE_URL,
+    name: APP_ID,
+    title: i18n.translate('xpack.maps.visTypeAlias.title', {
+      defaultMessage: 'Maps',
+    }),
+    description: showMapVisualizationTypes
+      ? `${description} ${legacyMapVisualizationWarning}`
+      : description,
+    icon: APP_ICON,
+    stage: 'production',
+  });
+
+}
+
diff --git a/x-pack/plugins/maps/public/plugin.ts b/x-pack/plugins/maps/public/plugin.ts
index 4e387245c1653..e5bad6e3f123c 100644
--- a/x-pack/plugins/maps/public/plugin.ts
+++ b/x-pack/plugins/maps/public/plugin.ts
@@ -34,6 +34,7 @@ import {
   // @ts-ignore
 } from './kibana_services';
 import { featureCatalogueEntry } from './feature_catalogue_entry';
+import { getMapsVisTypeAlias } from './maps_vis_type_alias';
 
 export interface MapsPluginSetupDependencies {
   inspector: InspectorSetupContract;
@@ -97,6 +98,7 @@ export class MapsPlugin
 
     plugins.inspector.registerView(MapView);
     plugins.home.featureCatalogue.register(featureCatalogueEntry);
+    plugins.visualizations.registerAlias(getMapsVisTypeAlias());
   }
 
   public start(core: CoreStart, plugins: any) {