import from core

flash1293 · Apr 27, 2020 · fe40d88 · fe40d88
1 parent 6e016f7
commit fe40d88
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 24 deletions.
diff --git a/src/plugins/dashboard/public/plugin.tsx b/src/plugins/dashboard/public/plugin.tsx
@@ -30,6 +30,7 @@ import {
  PluginInitializerContext,
  Plugin,
  SavedObjectsClientContract,
+ DEFAULT_APP_CATEGORIES,
 } from 'src/core/public';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
 import {
@@ -220,6 +221,7 @@ export class DashboardPlugin
  title: 'Dashboard',
  order: -1001,
  euiIconType: 'dashboardApp',
+ category: DEFAULT_APP_CATEGORIES.analyze,
  mount: async (params: AppMountParameters) => {
  const [coreStart, pluginsStart, dashboardStart] = await core.getStartServices();
  appMounted();

diff --git a/src/plugins/dev_tools/public/plugin.ts b/src/plugins/dev_tools/public/plugin.ts
@@ -18,7 +18,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { App, CoreSetup, Plugin } from 'kibana/public';
+import { App, CoreSetup, DEFAULT_APP_CATEGORIES, Plugin } from 'kibana/public';
 import { sortBy } from 'lodash';
 import { KibanaLegacySetup } from '../../kibana_legacy/public';
 
@@ -105,12 +105,7 @@ export class DevToolsPlugin implements Plugin<DevToolsSetup, DevToolsStart> {
  }),
  euiIconType: 'devToolsApp',
  order: 9001,
- category: {
- label: i18n.translate('core.ui.managementNavList.label', {
- defaultMessage: 'Management',
- }),
- euiIconType: 'managementApp',
- },
+ category: DEFAULT_APP_CATEGORIES.management,
  mount: async (appMountContext, params) => {
  if (!this.getSortedDevTools) {
  throw new Error('not started yet');

diff --git a/src/plugins/discover/public/plugin.ts b/src/plugins/discover/public/plugin.ts
@@ -41,6 +41,7 @@ import { Start as InspectorPublicPluginStart } from 'src/plugins/inspector/publi
 import { DataPublicPluginStart, DataPublicPluginSetup, esFilters } from '../../data/public';
 import { SavedObjectLoader, SavedObjectKibanaServices } from '../../saved_objects/public';
 import { createKbnUrlTracker } from '../../kibana_utils/public';
+import { DEFAULT_APP_CATEGORIES } from '../../../core/public';
 
 import { DocViewInput, DocViewInputFn } from './application/doc_views/doc_views_types';
 import { DocViewsRegistry } from './application/doc_views/doc_views_registry';
@@ -193,12 +194,7 @@ export class DiscoverPlugin
  updater$: this.appStateUpdater.asObservable(),
  order: -1004,
  euiIconType: 'discoverApp',
- category: {
- label: i18n.translate('core.ui.analyzeNavList.label', {
- defaultMessage: 'Analyze',
- }),
- order: 1000,
- },
+ category: DEFAULT_APP_CATEGORIES.analyze,
  mount: async (params: AppMountParameters) => {
  if (!this.initializeServices) {
  throw Error('Discover plugin method initializeServices is undefined');

diff --git a/src/plugins/home/public/plugin.ts b/src/plugins/home/public/plugin.ts
@@ -40,6 +40,7 @@ import { DataPublicPluginStart } from '../../data/public';
 import { TelemetryPluginStart } from '../../telemetry/public';
 import { UsageCollectionSetup } from '../../usage_collection/public';
 import { KibanaLegacySetup, KibanaLegacyStart } from '../../kibana_legacy/public';
+import { AppNavLinkStatus } from '../../../core/public';
 
 export interface HomePluginStartDependencies {
  data: DataPublicPluginStart;
@@ -68,7 +69,7 @@ export class HomePublicPlugin
  core.application.register({
  id: 'home',
  title: 'Home',
- navLinkStatus: 3, // TODO should be fetched by enum
+ navLinkStatus: AppNavLinkStatus.hidden,
  mount: async (params: AppMountParameters) => {
  const trackUiMetric = usageCollection
  ? usageCollection.reportUiStats.bind(usageCollection, 'Kibana_home')

diff --git a/src/plugins/kibana_legacy/public/forward_app/forward_app.ts b/src/plugins/kibana_legacy/public/forward_app/forward_app.ts
@@ -17,16 +17,18 @@
  * under the License.
  */
 
-import { AppMountParameters, CoreSetup } from 'kibana/public';
+import { App, AppMountParameters, CoreSetup } from 'kibana/public';
+import { AppNavLinkStatus } from '../../../../core/public';
 import { navigateToLegacyKibanaUrl } from './navigate_to_legacy_kibana_url';
 import { ForwardDefinition } from '../plugin';
 
 export const createLegacyUrlForwardApp = (
  core: CoreSetup<{}, { getForwards: () => ForwardDefinition[] }>
-) => ({
+): App => ({
  id: 'url_migrate',
  chromeless: true,
  title: 'Legacy URL migration',
+ navLinkStatus: AppNavLinkStatus.hidden,
  async mount(params: AppMountParameters) {
  const hash = params.history.location.hash.substr(1);
 

diff --git a/src/plugins/visualize/public/plugin.ts b/src/plugins/visualize/public/plugin.ts
@@ -25,6 +25,7 @@ import {
  AppMountParameters,
  CoreSetup,
  CoreStart,
+ DEFAULT_APP_CATEGORIES,
  Plugin,
  PluginInitializerContext,
 } from 'kibana/public';
@@ -102,12 +103,7 @@ export class VisualizePlugin
  title: 'Visualize',
  order: -1002,
  euiIconType: 'visualizeApp',
- category: {
- label: i18n.translate('core.ui.analyzeNavList.label', {
- defaultMessage: 'Analyze',
- }),
- order: 1000,
- },
+ category: DEFAULT_APP_CATEGORIES.analyze,
  updater$: this.appStateUpdater.asObservable(),
  // remove all references to visualize
  mount: async (params: AppMountParameters) => {

diff --git a/x-pack/plugins/lens/public/plugin.tsx b/x-pack/plugins/lens/public/plugin.tsx
@@ -10,7 +10,7 @@ import { HashRouter, Route, RouteComponentProps, Switch } from 'react-router-dom
 import { render, unmountComponentAtNode } from 'react-dom';
 import { i18n } from '@kbn/i18n';
 
-import { AppMountParameters, CoreSetup, CoreStart } from 'kibana/public';
+import { AppMountParameters, AppNavLinkStatus, CoreSetup, CoreStart } from 'kibana/public';
 import { DataPublicPluginSetup, DataPublicPluginStart } from 'src/plugins/data/public';
 import { EmbeddableSetup, EmbeddableStart } from 'src/plugins/embeddable/public';
 import { ExpressionsSetup, ExpressionsStart } from 'src/plugins/expressions/public';
@@ -100,7 +100,7 @@ export class LensPlugin {
 
  core.application.register({
  id: 'lens',
- navLinkStatus: 3, // TODO should be fetched by enum
+ navLinkStatus: AppNavLinkStatus.hidden,
  title: NOT_INTERNATIONALIZED_PRODUCT_NAME,
  mount: async (params: AppMountParameters) => {
  const [coreStart, startDependencies] = await core.getStartServices();