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

elastic · Apr 16, 2020 · 75fa8b3 · 75fa8b3
1 parent 7303e71
commit 75fa8b3
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 22 deletions.
diff --git a/x-pack/legacy/plugins/maps/index.js b/x-pack/legacy/plugins/maps/index.js
@@ -52,7 +52,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': {

diff --git a/x-pack/legacy/plugins/maps/public/index.ts b/x-pack/legacy/plugins/maps/public/index.ts
@@ -20,10 +20,9 @@ import '../../../../plugins/maps/public/angular/services/gis_map_saved_object_lo
 import './angular/map_controller';
 import './routes';
 // @ts-ignore
-import { PluginInitializerContext } from 'kibana/public';
 import { MapsPlugin } from './plugin';
 
-export const plugin = (initializerContext: PluginInitializerContext) => {
+export const plugin = () => {
   return new MapsPlugin();
 };
 

diff --git a/x-pack/legacy/plugins/maps/public/legacy_register_feature.ts b/x-pack/legacy/plugins/maps/public/legacy_register_feature.ts
diff --git a/x-pack/legacy/plugins/maps/public/plugin.ts b/x-pack/legacy/plugins/maps/public/plugin.ts
@@ -25,7 +25,6 @@ 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 '../../../../plugins/maps/public/feature_catalogue_entry';
 import {
   DataPublicPluginSetup,
   DataPublicPluginStart,
@@ -64,8 +63,6 @@ export class MapsPlugin implements Plugin<MapsPluginSetup, MapsPluginStart> {
       });
 
     bindNpSetupCoreAndPlugins(core, np);
-
-    np.home.featureCatalogue.register(featureCatalogueEntry);
   }
 
   public start(core: CoreStart, plugins: MapsPluginStartDependencies) {

diff --git a/x-pack/plugins/maps/kibana.json b/x-pack/plugins/maps/kibana.json
@@ -3,6 +3,13 @@
   "version": "8.0.0",
   "kibanaVersion": "kibana",
   "configPath": ["xpack", "maps"],
-  "requiredPlugins": ["inspector"],
+  "requiredPlugins": [
+    "inspector",
+    "home",
+    "data",
+    "fileUpload",
+    "uiActions",
+    "navigation"
+  ],
   "ui": true
 }
diff --git a/x-pack/plugins/maps/public/plugin.ts b/x-pack/plugins/maps/public/plugin.ts
@@ -33,6 +33,7 @@ import {
   setVisualizations,
   // @ts-ignore
 } from './kibana_services';
+import { featureCatalogueEntry } from './feature_catalogue_entry';
 
 export interface MapsPluginSetupDependencies {
   inspector: InspectorSetupContract;
@@ -92,8 +93,13 @@ export class MapsPlugin
       MapsPluginStartDependencies
     > {
   public setup(core: CoreSetup, plugins: MapsPluginSetupDependencies) {
+    bindSetupCoreAndPlugins(core, plugins);
+
     plugins.inspector.registerView(MapView);
+    plugins.home.featureCatalogue.register(featureCatalogueEntry);
   }
 
-  public start(core: CoreStart, plugins: any) {}
+  public start(core: CoreStart, plugins: any) {
+    bindStartCoreAndPlugins(core, plugins);
+  }
 }