Remove kibana.defaultAppId setting

src/plugins/discover/public/application/apps/not_found/not_found_route.tsx

@@ -28,10 +28,7 @@ export function NotFoundRoute(props: NotFoundRouteProps) {
   useEffect(() => {
     const path = window.location.hash.substr(1);
     getUrlTracker().restorePreviousUrl();
-    const { navigated } = urlForwarding.navigateToLegacyKibanaUrl(path);
-    if (!navigated) {
-      urlForwarding.navigateToDefaultApp();
-    }
+    urlForwarding.navigateToLegacyKibanaUrl(path);
 
     const bannerMessage = i18n.translate('discover.noMatchRoute.bannerTitleText', {
       defaultMessage: 'Page not found',

src/plugins/home/public/application/components/home_app.js

@@ -12,19 +12,10 @@ import PropTypes from 'prop-types';
 import { Home } from './home';
 import { TutorialDirectory } from './tutorial_directory';
 import { Tutorial } from './tutorial/tutorial';
-import { HashRouter as Router, Switch, Route } from 'react-router-dom';
+import { HashRouter as Router, Switch, Route, Redirect } from 'react-router-dom';
 import { getTutorial } from '../load_tutorials';
 import { replaceTemplateStrings } from './tutorial/replace_template_strings';
 import { getServices } from '../kibana_services';
-import useMount from 'react-use/lib/useMount';
-
-const RedirectToDefaultApp = () => {
-  useMount(() => {
-    const { urlForwarding } = getServices();
-    urlForwarding.navigateToDefaultApp();
-  });
-  return null;
-};
 
 export function HomeApp({ directories, solutions }) {
   const {
@@ -78,7 +69,7 @@ export function HomeApp({ directories, solutions }) {
               hasUserIndexPattern={() => indexPatternService.hasUserIndexPattern()}
             />
           </Route>
-          <Route path="*" exact={true} component={RedirectToDefaultApp} />
+          <Redirect to="/" />
         </Switch>
       </Router>
     </I18nProvider>

src/plugins/home/public/plugin.ts

@@ -14,7 +14,6 @@ import {
   PluginInitializerContext,
 } from 'kibana/public';
 import { i18n } from '@kbn/i18n';
-import { first } from 'rxjs/operators';
 
 import {
   EnvironmentService,
@@ -137,27 +136,9 @@ export class HomePublicPlugin
     };
   }
 
-  public start(
-    { application: { capabilities, currentAppId$ }, http }: CoreStart,
-    { urlForwarding }: HomePluginStartDependencies
-  ) {
+  public start({ application: { capabilities } }: CoreStart) {
     this.featuresCatalogueRegistry.start({ capabilities });
 
-    // If the home app is the initial location when loading Kibana...
-    if (
-      window.location.pathname === http.basePath.prepend(HOME_APP_BASE_PATH) &&
-      window.location.hash === ''
-    ) {
-      // ...wait for the app to mount initially and then...
-      currentAppId$.pipe(first()).subscribe((appId) => {
-        if (appId === 'home') {
-          // ...navigate to default app set by `kibana.defaultAppId`.
-          // This doesn't do anything as along as the default settings are kept.
-          urlForwarding.navigateToDefaultApp({ overwriteHash: false });
-        }
-      });
-    }
-
     return { featureCatalogue: this.featuresCatalogueRegistry };
   }
 }

src/plugins/kibana_legacy/kibana.json

@@ -1,7 +1,7 @@
 {
   "id": "kibanaLegacy",
   "version": "kibana",
-  "server": true,
+  "server": false,
   "ui": true,
   "owner": {
     "name": "Kibana App",

src/plugins/kibana_legacy/public/index.ts

@@ -6,11 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext } from 'kibana/public';
 import { KibanaLegacyPlugin } from './plugin';
 
-export const plugin = (initializerContext: PluginInitializerContext) =>
-  new KibanaLegacyPlugin(initializerContext);
+export const plugin = () => new KibanaLegacyPlugin();
 
 export * from './plugin';
 

src/plugins/kibana_legacy/public/mocks.ts

@@ -14,9 +14,6 @@ export type Start = jest.Mocked<ReturnType<KibanaLegacyPlugin['start']>>;
 const createSetupContract = (): Setup => ({});
 
 const createStartContract = (): Start => ({
-  config: {
-    defaultAppId: 'home',
-  },
   loadFontAwesome: jest.fn(),
   loadAngularBootstrap: jest.fn(),
 });

src/plugins/kibana_legacy/public/plugin.ts

@@ -6,18 +6,15 @@
  * Side Public License, v 1.
  */
 
-import { PluginInitializerContext, CoreStart, CoreSetup } from 'kibana/public';
-import { ConfigSchema } from '../config';
+import { CoreStart, CoreSetup } from 'kibana/public';
 import { injectHeaderStyle } from './utils/inject_header_style';
 
 export class KibanaLegacyPlugin {
-  constructor(private readonly initializerContext: PluginInitializerContext<ConfigSchema>) {}
-
   public setup(core: CoreSetup<{}, KibanaLegacyStart>) {
     return {};
   }
 
-  public start({ application, http: { basePath }, uiSettings }: CoreStart) {
+  public start({ uiSettings }: CoreStart) {
     injectHeaderStyle(uiSettings);
     return {
       /**
@@ -35,11 +32,6 @@ export class KibanaLegacyPlugin {
         const { initAngularBootstrap } = await import('./angular_bootstrap');
         initAngularBootstrap();
       },
-      /**
-       * @deprecated
-       * Just exported for wiring up with dashboard mode, should not be used.
-       */
-      config: this.initializerContext.config.get(),
     };
   }
 }

src/plugins/url_forwarding/kibana.json

@@ -6,6 +6,5 @@
   "owner": {
     "name": "Kibana App",
     "githubTeam": "kibana-app"
-  },
-  "requiredPlugins": ["kibanaLegacy"]
+  }
 }

src/plugins/url_forwarding/public/forward_app/forward_app.ts

@@ -23,23 +23,16 @@ export const createLegacyUrlForwardApp = (
   async mount(params: AppMountParameters) {
     const hash = params.history.location.hash.substr(1);
 
-    if (!hash) {
-      const [, , kibanaLegacyStart] = await core.getStartServices();
-      kibanaLegacyStart.navigateToDefaultApp();
-    }
-
     const [
       {
         application,
         http: { basePath },
       },
     ] = await core.getStartServices();
 
-    const result = await navigateToLegacyKibanaUrl(hash, forwards, basePath, application);
-
-    if (!result.navigated) {
-      const [, , kibanaLegacyStart] = await core.getStartServices();
-      kibanaLegacyStart.navigateToDefaultApp();
+    const { navigated } = navigateToLegacyKibanaUrl(hash, forwards, basePath, application);
+    if (!navigated) {
+      application.navigateToUrl('/');
     }
 
     return () => {};

src/plugins/url_forwarding/public/mocks.ts

@@ -17,7 +17,6 @@ const createSetupContract = (): Setup => ({
 
 const createStartContract = (): Start => ({
   getForwards: jest.fn(),
-  navigateToDefaultApp: jest.fn(),
   navigateToLegacyKibanaUrl: jest.fn(),
 });
 

src/plugins/url_forwarding/public/plugin.ts

@@ -7,9 +7,6 @@
  */
 
 import { CoreStart, CoreSetup } from 'kibana/public';
-import { KibanaLegacyStart } from 'src/plugins/kibana_legacy/public';
-import { Subscription } from 'rxjs';
-import { navigateToDefaultApp } from './navigate_to_default_app';
 import { createLegacyUrlForwardApp } from './forward_app';
 import { navigateToLegacyKibanaUrl } from './forward_app/navigate_to_legacy_kibana_url';
 
@@ -21,8 +18,6 @@ export interface ForwardDefinition {
 
 export class UrlForwardingPlugin {
   private forwardDefinitions: ForwardDefinition[] = [];
-  private currentAppId: string | undefined;
-  private currentAppIdSubscription: Subscription | undefined;
 
   public setup(core: CoreSetup<{}, UrlForwardingStart>) {
     core.application.register(createLegacyUrlForwardApp(core, this.forwardDefinitions));
@@ -71,30 +66,8 @@ export class UrlForwardingPlugin {
     };
   }
 
-  public start(
-    { application, http: { basePath }, uiSettings }: CoreStart,
-    { kibanaLegacy }: { kibanaLegacy: KibanaLegacyStart }
-  ) {
-    this.currentAppIdSubscription = application.currentAppId$.subscribe((currentAppId) => {
-      this.currentAppId = currentAppId;
-    });
+  public start({ application, http: { basePath } }: CoreStart) {
     return {
-      /**
-       * Navigates to the app defined as kibana.defaultAppId.
-       * This takes redirects into account and uses the right mechanism to navigate.
-       */
-      navigateToDefaultApp: (
-        { overwriteHash }: { overwriteHash: boolean } = { overwriteHash: true }
-      ) => {
-        navigateToDefaultApp(
-          kibanaLegacy.config.defaultAppId,
-          this.forwardDefinitions,
-          application,
-          basePath,
-          this.currentAppId,
-          overwriteHash
-        );
-      },
       /**
        * Resolves the provided hash using the registered forwards and navigates to the target app.
        * If a navigation happened, `{ navigated: true }` will be returned.
@@ -111,12 +84,6 @@ export class UrlForwardingPlugin {
       getForwards: () => this.forwardDefinitions,
     };
   }
-
-  public stop() {
-    if (this.currentAppIdSubscription) {
-      this.currentAppIdSubscription.unsubscribe();
-    }
-  }
 }
 
 export type UrlForwardingSetup = ReturnType<UrlForwardingPlugin['setup']>;

test/functional/apps/home/_home.js

@@ -26,7 +26,7 @@ export default function ({ getService, getPageObjects }) {
     });
 
     it('clicking on console on homepage should take you to console app', async () => {
-      await PageObjects.common.navigateToUrl('home');
+      await PageObjects.common.navigateToApp('home');
       await testSubjects.click('homeDevTools');
       const url = await browser.getCurrentUrl();
       expect(url.includes('/app/dev_tools#/console')).to.be(true);