Switch to core application service

docs/api/features.asciidoc

@@ -29,7 +29,7 @@ The API returns the following:
     "id": "discover",
     "name": "Discover",
     "icon": "discoverApp",
-    "navLinkId": "kibana:discover",
+    "navLinkId": "discover",
     "app": [
       "kibana"
     ],
@@ -74,7 +74,7 @@ The API returns the following:
     "id": "visualize",
     "name": "Visualize",
     "icon": "visualizeApp",
-    "navLinkId": "kibana:visualize",
+    "navLinkId": "visualize",
     "app": [
       "kibana"
     ],
@@ -121,7 +121,7 @@ The API returns the following:
     "id": "dashboard",
     "name": "Dashboard",
     "icon": "dashboardApp",
-    "navLinkId": "kibana:dashboard",
+    "navLinkId": "dashboards",
     "app": [
       "kibana"
     ],
@@ -173,7 +173,7 @@ The API returns the following:
     "id": "dev_tools",
     "name": "Dev Tools",
     "icon": "devToolsApp",
-    "navLinkId": "kibana:dev_tools",
+    "navLinkId": "dev_tools",
     "app": [
       "kibana"
     ],

docs/developer/plugin/development-plugin-feature-registration.asciidoc

@@ -153,7 +153,7 @@ init(server) {
       defaultMessage: 'Dev Tools',
     }),
     icon: 'devToolsApp',
-    navLinkId: 'kibana:dev_tools',
+    navLinkId: 'dev_tools',
     app: ['kibana'],
     catalogue: ['console', 'searchprofiler', 'grokdebugger'],
     privileges: {
@@ -216,7 +216,7 @@ init(server) {
       }),
       order: 100,
       icon: 'discoverApp',
-      navLinkId: 'kibana:discover',
+      navLinkId: 'discover',
       app: ['kibana'],
       catalogue: ['discover'],
       privileges: {

docs/user/dashboard.asciidoc

@@ -174,7 +174,7 @@ to view an embedded dashboard.
 * Generate a PNG report
 
 TIP: To create a link to a dashboard by title, use: +
-`${domain}/${basepath?}/app/kibana#/dashboards?title=${yourdashboardtitle}`
+`${domain}/${basepath?}/app/dashboards#/list?title=${yourdashboardtitle}`
 
 TIP: When sharing a link to a dashboard snapshot, use the *Short URL*. Snapshot
 URLs are long and can be problematic for Internet Explorer and other

src/core/public/chrome/chrome_service.tsx

@@ -192,7 +192,7 @@ export class ChromeService {
             forceAppSwitcherNavigation$={navLinks.getForceAppSwitcherNavigation$()}
             helpExtension$={helpExtension$.pipe(takeUntil(this.stop$))}
             helpSupportUrl$={helpSupportUrl$.pipe(takeUntil(this.stop$))}
-            homeHref={http.basePath.prepend('/app/kibana#/home')}
+            homeHref={http.basePath.prepend('/app/home')}
             isVisible$={this.isVisible$}
             kibanaVersion={injectedMetadata.getKibanaVersion()}
             legacyMode={injectedMetadata.getLegacyMode()}

src/core/public/chrome/ui/header/header.tsx

@@ -247,6 +247,7 @@ export class Header extends Component<HeaderProps, State> {
                 href={this.props.homeHref}
                 forceNavigation={this.state.forceNavigation}
                 navLinks={navLinks}
+                navigateToApp={this.props.application.navigateToApp}
               />
             </EuiHeaderSectionItem>
 

src/core/public/chrome/ui/header/header_logo.tsx

@@ -41,7 +41,8 @@ function findClosestAnchor(element: HTMLElement): HTMLAnchorElement | void {
 function onClick(
   event: React.MouseEvent<HTMLAnchorElement>,
   forceNavigation: boolean,
-  navLinks: NavLink[]
+  navLinks: NavLink[],
+  navigateToApp: (appId: string) => void
 ) {
   const anchor = findClosestAnchor((event as any).nativeEvent.target);
   if (!anchor) {
@@ -54,6 +55,12 @@ function onClick(
     return;
   }
 
+  if (!forceNavigation && !event.altKey && !event.metaKey && !event.ctrlKey) {
+    navigateToApp('home');
+    event.preventDefault();
+    return;
+  }
+
   if (
     !forceNavigation ||
     event.isDefaultPrevented() ||
@@ -87,14 +94,15 @@ interface Props {
   href: string;
   navLinks: NavLink[];
   forceNavigation: boolean;
+  navigateToApp: (appId: string) => void;
 }
 
-export function HeaderLogo({ href, forceNavigation, navLinks }: Props) {
+export function HeaderLogo({ href, forceNavigation, navLinks, navigateToApp }: Props) {
   return (
     <EuiHeaderLogo
       data-test-subj="logo"
       iconType="logoElastic"
-      onClick={e => onClick(e, forceNavigation, navLinks)}
+      onClick={e => onClick(e, forceNavigation, navLinks, navigateToApp)}
       href={href}
       aria-label={i18n.translate('core.ui.chrome.headerGlobalNav.goHomePageIconAriaLabel', {
         defaultMessage: 'Go to home page',

src/core/server/core_app/integration_tests/default_route_provider_config.test.ts

@@ -49,7 +49,7 @@ describe('default route provider', () => {
 
     expect(status).toEqual(302);
     expect(header).toMatchObject({
-      location: '/hello/app/kibana',
+      location: '/hello/app/home',
     });
   });
 
@@ -71,7 +71,7 @@ describe('default route provider', () => {
     const { status, header } = await kbnTestServer.request.get(root, '/');
     expect(status).toEqual(302);
     expect(header).toMatchObject({
-      location: '/hello/app/kibana',
+      location: '/hello/app/home',
     });
   });
 

src/legacy/core_plugins/kibana/index.js

@@ -53,7 +53,6 @@ export default function(kibana) {
     },
 
     uiExports: {
-      hacks: ['plugins/kibana/dev_tools'],
       app: {
         id: 'kibana',
         title: 'Kibana',
@@ -62,49 +61,6 @@ export default function(kibana) {
       },
       styleSheetPaths: resolve(__dirname, 'public/index.scss'),
       links: [
-        {
-          id: 'kibana:discover',
-          title: i18n.translate('kbn.discoverTitle', {
-            defaultMessage: 'Discover',
-          }),
-          order: 2000,
-          url: `${kbnBaseUrl}#/discover`,
-          euiIconType: 'discoverApp',
-          disableSubUrlTracking: true,
-          category: DEFAULT_APP_CATEGORIES.kibana,
-        },
-        {
-          id: 'kibana:visualize',
-          title: i18n.translate('kbn.visualizeTitle', {
-            defaultMessage: 'Visualize',
-          }),
-          order: 7000,
-          url: `${kbnBaseUrl}#/visualize`,
-          euiIconType: 'visualizeApp',
-          disableSubUrlTracking: true,
-          category: DEFAULT_APP_CATEGORIES.kibana,
-        },
-        {
-          id: 'kibana:dashboard',
-          title: i18n.translate('kbn.dashboardTitle', {
-            defaultMessage: 'Dashboard',
-          }),
-          order: 1000,
-          url: `${kbnBaseUrl}#/dashboards`,
-          euiIconType: 'dashboardApp',
-          disableSubUrlTracking: true,
-          category: DEFAULT_APP_CATEGORIES.kibana,
-        },
-        {
-          id: 'kibana:dev_tools',
-          title: i18n.translate('kbn.devToolsTitle', {
-            defaultMessage: 'Dev Tools',
-          }),
-          order: 9001,
-          url: '/app/kibana#/dev_tools',
-          euiIconType: 'devToolsApp',
-          category: DEFAULT_APP_CATEGORIES.management,
-        },
         {
           id: 'kibana:stack_management',
           title: i18n.translate('kbn.managementTitle', {

src/legacy/core_plugins/kibana/public/__tests__/discover/doc_table.js

@@ -24,6 +24,8 @@ import 'ui/private';
 import { pluginInstance } from './legacy';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 import hits from 'fixtures/real_hits';
+import { setScopedHistory } from '../../../../../../plugins/discover/public/kibana_services';
+import { createBrowserHistory } from 'history';
 
 let $parentScope;
 
@@ -58,6 +60,7 @@ const destroy = function() {
 describe('docTable', function() {
   let $elem;
 
+  before(() => setScopedHistory(createBrowserHistory()));
   beforeEach(() => pluginInstance.initializeInnerAngular());
   beforeEach(() => pluginInstance.initializeServices());
   beforeEach(ngMock.module('app/discover'));

src/legacy/core_plugins/kibana/public/__tests__/discover/row_headers.js

@@ -25,6 +25,8 @@ import { getFakeRow, getFakeRowVals } from 'fixtures/fake_row';
 import $ from 'jquery';
 import { pluginInstance } from './legacy';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
+import { setScopedHistory } from '../../../../../../plugins/discover/public/kibana_services';
+import { createBrowserHistory } from 'history';
 
 describe('Doc Table', function() {
   let $parentScope;
@@ -37,6 +39,7 @@ describe('Doc Table', function() {
   let stubFieldFormatConverter;
   beforeEach(() => pluginInstance.initializeServices());
   beforeEach(() => pluginInstance.initializeInnerAngular());
+  before(() => setScopedHistory(createBrowserHistory()));
   beforeEach(ngMock.module('app/discover'));
   beforeEach(
     ngMock.inject(function($rootScope, Private) {

src/legacy/core_plugins/kibana/public/index.scss

@@ -11,9 +11,6 @@
 // bad cascading in the Editor layout
 @import '../../../../plugins/maps_legacy/public/index';
 
-// Home styles
-@import '../../../../plugins/home/public/application/index';
-
 // Management styles
 @import './management/index';
 

src/legacy/core_plugins/kibana/public/kibana.js

@@ -21,19 +21,15 @@
 
 // preloading (for faster webpack builds)
 import routes from 'ui/routes';
-import { uiModules } from 'ui/modules';
 import { npSetup } from 'ui/new_platform';
 
 // import the uiExports that we want to "use"
-import 'uiExports/home';
-import 'uiExports/visualize';
 import 'uiExports/savedObjectTypes';
 import 'uiExports/fieldFormatEditors';
 import 'uiExports/navbarExtensions';
 import 'uiExports/contextMenuActions';
 import 'uiExports/managementSections';
 import 'uiExports/indexManagement';
-import 'uiExports/docViews';
 import 'uiExports/embeddableFactories';
 import 'uiExports/embeddableActions';
 import 'uiExports/inspectorViews';
@@ -43,8 +39,6 @@ import 'uiExports/interpreter';
 
 import 'ui/autoload/all';
 import './management';
-import './dev_tools';
-import { showAppRedirectNotification } from '../../../../plugins/kibana_legacy/public';
 import { localApplicationService } from './local_application_service';
 
 npSetup.plugins.kibanaLegacy.registerLegacyAppAlias('doc', 'discover', { keepPrefix: true });
@@ -58,7 +52,3 @@ const { config } = npSetup.plugins.kibanaLegacy;
 routes.otherwise({
   redirectTo: `/${config.defaultAppId || 'discover'}`,
 });
-
-uiModules
-  .get('kibana')
-  .run($location => showAppRedirectNotification($location, npSetup.core.notifications.toasts));

src/legacy/core_plugins/kibana/public/local_application_service/local_application_service.ts

@@ -106,7 +106,9 @@ export class LocalApplicationService {
         template: '<span></span>',
         controller($location: ILocationService) {
           const newPath = forwardDefinition.rewritePath($location.url());
-          npStart.core.application.navigateToApp(forwardDefinition.newAppId, { path: newPath });
+          window.location.replace(
+            npStart.core.http.basePath.prepend(`/app/${forwardDefinition.newAppId}/${newPath}`)
+          );
         },
       });
     });

src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/empty_state/empty_state.test.tsx

@@ -24,7 +24,7 @@ import sinon from 'sinon';
 
 describe('EmptyState', () => {
   it('should render normally', () => {
-    const component = shallow(<EmptyState onRefresh={() => {}} />);
+    const component = shallow(<EmptyState onRefresh={() => {}} prependBasePath={x => x} />);
 
     expect(component).toMatchSnapshot();
   });
@@ -34,7 +34,9 @@ describe('EmptyState', () => {
       it('is called when refresh button is clicked', () => {
         const onRefreshHandler = sinon.stub();
 
-        const component = shallow(<EmptyState onRefresh={onRefreshHandler} />);
+        const component = shallow(
+          <EmptyState onRefresh={onRefreshHandler} prependBasePath={x => x} />
+        );
 
         component.find('[data-test-subj="refreshIndicesButton"]').simulate('click');
 

src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/components/empty_state/empty_state.tsx

@@ -22,8 +22,15 @@ import React from 'react';
 import { EuiCallOut, EuiTextColor, EuiLink, EuiButton } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n/react';
+import { IBasePath } from 'kibana/public';
 
-export const EmptyState = ({ onRefresh }: { onRefresh: () => void }) => (
+export const EmptyState = ({
+  onRefresh,
+  prependBasePath,
+}: {
+  onRefresh: () => void;
+  prependBasePath: IBasePath['prepend'];
+}) => (
   <div>
     <EuiCallOut
       color="warning"
@@ -48,15 +55,15 @@ export const EmptyState = ({ onRefresh }: { onRefresh: () => void }) => (
               </EuiTextColor>
             ),
             learnHowLink: (
-              <EuiLink href="#/home/tutorial_directory">
+              <EuiLink href={prependBasePath('/app/home#/tutorial_directory')}>
                 <FormattedMessage
                   id="kbn.management.createIndexPattern.emptyStateLabel.learnHowLink"
                   defaultMessage="Learn how"
                 />
               </EuiLink>
             ),
             getStartedLink: (
-              <EuiLink href="#/home/tutorial_directory/sampleData">
+              <EuiLink href={prependBasePath('/app/home#/tutorial_directory/sampleData')}>
                 <FormattedMessage
                   id="kbn.management.createIndexPattern.emptyStateLabel.getStartedLink"
                   defaultMessage="get started with some sample data sets."

src/legacy/core_plugins/kibana/public/management/sections/index_patterns/create_index_pattern_wizard/create_index_pattern_wizard.test.tsx

@@ -57,6 +57,7 @@ const services = {
   changeUrl: jest.fn(),
   openConfirm: overlays.openConfirm,
   indexPatternCreationType: mockIndexPatternCreationType,
+  prependBasePath: jest.fn(x => x),
 };
 
 describe('CreateIndexPatternWizard', () => {