Remove kibana.defaultAppId setting

docs/setup/settings.asciidoc

@@ -295,12 +295,6 @@ is an alternative to `elasticsearch.username` and `elasticsearch.password`.
 | `interpreter.enableInVisualize`
   | Enables use of interpreter in Visualize. *Default: `true`*
 
-| `kibana.defaultAppId:`
- | deprecated:[7.9.0,This setting will be removed in Kibana 8.0.]
- Instead, use the <<defaultroute,`defaultRoute` advanced setting>>.
- +
- The default application to load. *Default: `"home"`*
-
 |[[kibana-index]] `kibana.index:`
  | deprecated:[7.11.0,This setting will be removed in 8.0.] Multitenancy by
  changing `kibana.index` will not be supported starting in 8.0. See

src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker

@@ -76,7 +76,6 @@ kibana_vars=(
     interpreter.enableInVisualize
     kibana.autocompleteTerminateAfter
     kibana.autocompleteTimeout
-    kibana.defaultAppId
     kibana.index
     logging.appenders
     logging.appenders.console

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": "Vis Editors",

src/plugins/kibana_legacy/public/index.ts

@@ -9,11 +9,9 @@
 // TODO: https://github.com/elastic/kibana/issues/110891
 /* eslint-disable @kbn/eslint/no_export_all */
 
-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": "Vis Editors",
     "githubTeam": "kibana-vis-editors"
-  },
-  "requiredPlugins": ["kibanaLegacy"]
+  }
 }

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

@@ -0,0 +1,54 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import type { Location } from 'history';
+import type { AppMountParameters, CoreSetup, ScopedHistory } from 'kibana/public';
+import { coreMock } from '../../../../core/public/mocks';
+import type { UrlForwardingStart } from '../plugin';
+import { createLegacyUrlForwardApp } from './forward_app';
+
+function createAppMountParams(hash: string): AppMountParameters {
+  return {
+    history: {
+      location: {
+        hash,
+      } as Location<unknown>,
+    } as ScopedHistory,
+  } as AppMountParameters;
+}
+
+describe('forward_app', () => {
+  let coreSetup: CoreSetup<{}, UrlForwardingStart>;
+  let coreStart: ReturnType<typeof coreMock['createStart']>;
+
+  beforeEach(() => {
+    coreSetup = coreMock.createSetup({ basePath: '/base/path' });
+    coreStart = coreMock.createStart({ basePath: '/base/path' });
+    coreSetup.getStartServices = () => Promise.resolve([coreStart, {}, {} as any]);
+  });
+
+  it('should forward to defaultRoute if hash is not a known redirect', async () => {
+    coreStart.uiSettings.get.mockImplementation((key) => {
+      if (key === 'defaultRoute') return '/app/defaultApp';
+      throw new Error('Mock implementation missing');
+    });
+
+    const app = createLegacyUrlForwardApp(coreSetup, [
+      { legacyAppId: 'discover', newAppId: 'discover', rewritePath: (p) => p },
+    ]);
+    await app.mount(createAppMountParams('#/foobar'));
+    expect(coreStart.application.navigateToUrl).toHaveBeenCalledWith('/base/path/app/defaultApp');
+  });
+
+  it('should not forward to defaultRoute if hash path is a known redirect', async () => {
+    const app = createLegacyUrlForwardApp(coreSetup, [
+      { legacyAppId: 'discover', newAppId: 'discover', rewritePath: (p) => p },
+    ]);
+    await app.mount(createAppMountParams('#/discover'));
+    expect(coreStart.application.navigateToUrl).not.toHaveBeenCalled();
+  });
+});

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

@@ -23,23 +23,18 @@ 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,
+        uiSettings,
         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) {
+      const defaultRoute = uiSettings.get<string>('defaultRoute');
+      application.navigateToUrl(basePath.prepend(defaultRoute));
     }
 
     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(),
 });