Kibana property config migrations

src/core/server/kibana_config.ts

@@ -25,9 +25,7 @@ export const config = {
   path: 'kibana',
   schema: schema.object({
     enabled: schema.boolean({ defaultValue: true }),
-    defaultAppId: schema.string({ defaultValue: 'home' }),
     index: schema.string({ defaultValue: '.kibana' }),
-    disableWelcomeScreen: schema.boolean({ defaultValue: false }),
     autocompleteTerminateAfter: schema.duration({ defaultValue: 100000 }),
     autocompleteTimeout: schema.duration({ defaultValue: 1000 }),
   }),

src/core/server/mocks.ts

@@ -43,7 +43,7 @@ import { uuidServiceMock } from './uuid/uuid_service.mock';
 
 export function pluginInitializerContextConfigMock<T>(config: T) {
   const globalConfig: SharedGlobalConfig = {
-    kibana: { defaultAppId: 'home-mocks', index: '.kibana-tests' },
+    kibana: { index: '.kibana-tests' },
     elasticsearch: {
       shardTimeout: duration('30s'),
       requestTimeout: duration('30s'),

src/core/server/plugins/plugin_context.test.ts

@@ -75,7 +75,7 @@ describe('Plugin Context', () => {
       .pipe(first())
       .toPromise();
     expect(configObject).toStrictEqual({
-      kibana: { defaultAppId: 'home', index: '.kibana' },
+      kibana: { index: '.kibana' },
       elasticsearch: {
         shardTimeout: duration(30, 's'),
         requestTimeout: duration(30, 's'),

src/core/server/plugins/types.ts

@@ -214,7 +214,7 @@ export interface Plugin<
 
 export const SharedGlobalConfigKeys = {
   // We can add more if really needed
-  kibana: ['defaultAppId', 'index'] as const,
+  kibana: ['index'] as const,
   elasticsearch: ['shardTimeout', 'requestTimeout', 'pingTimeout', 'startupTimeout'] as const,
   path: ['data'] as const,
 };

src/legacy/core_plugins/kibana/index.js

@@ -42,9 +42,7 @@ export default function(kibana) {
     config: function(Joi) {
       return Joi.object({
         enabled: Joi.boolean().default(true),
-        defaultAppId: Joi.string().default('home'),
         index: Joi.string().default('.kibana'),
-        disableWelcomeScreen: Joi.boolean().default(false),
         autocompleteTerminateAfter: Joi.number()
           .integer()
           .min(1)

src/legacy/core_plugins/kibana/inject_vars.js

@@ -28,8 +28,6 @@ export function injectVars(server) {
   );
 
   return {
-    kbnDefaultAppId: serverConfig.get('kibana.defaultAppId'),
-    disableWelcomeScreen: serverConfig.get('kibana.disableWelcomeScreen'),
     importAndExportableTypes,
     autocompleteTerminateAfter: serverConfig.get('kibana.autocompleteTerminateAfter'),
     autocompleteTimeout: serverConfig.get('kibana.autocompleteTimeout'),

src/legacy/core_plugins/kibana/public/dashboard/np_ready/application.ts

@@ -49,6 +49,7 @@ import { IEmbeddableStart } from '../../../../../../plugins/embeddable/public';
 import { NavigationPublicPluginStart as NavigationStart } from '../../../../../../plugins/navigation/public';
 import { DataPublicPluginStart as NpDataStart } from '../../../../../../plugins/data/public';
 import { SharePluginStart } from '../../../../../../plugins/share/public';
+import { KibanaLegacyStart } from '../../../../../../plugins/kibana_legacy/public';
 
 export interface RenderDeps {
   core: LegacyCoreStart;
@@ -65,6 +66,7 @@ export interface RenderDeps {
   embeddables: IEmbeddableStart;
   localStorage: Storage;
   share: SharePluginStart;
+  config: KibanaLegacyStart['config'];
 }
 
 let angularModuleInstance: IModule | null = null;

src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app.tsx

@@ -88,7 +88,6 @@ export interface DashboardAppScope extends ng.IScope {
 export function initDashboardAppDirective(app: any, deps: RenderDeps) {
   app.directive('dashboardApp', function($injector: IInjector) {
     const confirmModal = $injector.get<ConfirmModalFn>('confirmModal');
-    const config = deps.uiSettings;
 
     return {
       restrict: 'E',
@@ -106,7 +105,6 @@ export function initDashboardAppDirective(app: any, deps: RenderDeps) {
           $route,
           $scope,
           $routeParams,
-          config,
           confirmModal,
           indexPatterns: deps.npDataStart.indexPatterns,
           kbnUrlStateStorage,

src/legacy/core_plugins/kibana/public/dashboard/np_ready/dashboard_app_controller.tsx

@@ -90,7 +90,6 @@ export interface DashboardAppControllerDependencies extends RenderDeps {
   $routeParams: any;
   indexPatterns: IndexPatternsContract;
   dashboardConfig: any;
-  config: any;
   confirmModal: ConfirmModalFn;
   history: History;
   kbnUrlStateStorage: IKbnUrlStateStorage;
@@ -109,7 +108,6 @@ export class DashboardAppController {
     dashboardConfig,
     localStorage,
     indexPatterns,
-    config,
     confirmModal,
     savedQueryService,
     embeddables,
@@ -376,7 +374,7 @@ export class DashboardAppController {
       dashboardStateManager.getQuery() || {
         query: '',
         language:
-          localStorage.get('kibana.userQueryLanguage') || config.get('search:queryLanguage'),
+          localStorage.get('kibana.userQueryLanguage') || uiSettings.get('search:queryLanguage'),
       },
       queryFilter.getFilters()
     );
@@ -493,7 +491,7 @@ export class DashboardAppController {
         {
           query: '',
           language:
-            localStorage.get('kibana.userQueryLanguage') || config.get('search:queryLanguage'),
+            localStorage.get('kibana.userQueryLanguage') || uiSettings.get('search:queryLanguage'),
         },
         queryFilter.getGlobalFilters()
       );

src/legacy/core_plugins/kibana/public/dashboard/np_ready/legacy_app.js

@@ -251,10 +251,10 @@ export function initDashboardApp(app, deps) {
         },
       })
       .when(`dashboard/:tail*?`, {
-        redirectTo: `/${deps.core.injectedMetadata.getInjectedVar('kbnDefaultAppId')}`,
+        redirectTo: `/${deps.config.defaultAppId}`,
       })
       .when(`dashboards/:tail*?`, {
-        redirectTo: `/${deps.core.injectedMetadata.getInjectedVar('kbnDefaultAppId')}`,
+        redirectTo: `/${deps.config.defaultAppId}`,
       });
   });
 }

src/legacy/core_plugins/kibana/public/dashboard/plugin.ts

@@ -107,6 +107,7 @@ export class DashboardPlugin implements Plugin {
           chrome: contextCore.chrome,
           addBasePath: contextCore.http.basePath.prepend,
           uiSettings: contextCore.uiSettings,
+          config: kibana_legacy.config,
           savedQueryService: npDataStart.query.savedQueries,
           embeddables,
           dashboardCapabilities: contextCore.application.capabilities.dashboard,

src/legacy/core_plugins/kibana/public/home/kibana_services.ts

@@ -29,7 +29,12 @@ import {
   UiSettingsState,
 } from 'kibana/public';
 import { UiStatsMetricType } from '@kbn/analytics';
-import { Environment, FeatureCatalogueEntry } from '../../../../../plugins/home/public';
+import {
+  Environment,
+  FeatureCatalogueEntry,
+  HomePublicPluginSetup,
+} from '../../../../../plugins/home/public';
+import { KibanaLegacySetup } from '../../../../../plugins/kibana_legacy/public';
 
 export interface HomeKibanaServices {
   indexPatternService: any;
@@ -51,6 +56,8 @@ export interface HomeKibanaServices {
   chrome: ChromeStart;
   telemetryOptInProvider: any;
   uiSettings: IUiSettingsClient;
+  config: KibanaLegacySetup['config'];
+  homeConfig: HomePublicPluginSetup['config'];
   http: HttpStart;
   savedObjectsClient: SavedObjectsClientContract;
   toastNotifications: NotificationsSetup['toasts'];

src/legacy/core_plugins/kibana/public/home/np_ready/components/home.js

@@ -48,7 +48,7 @@ export class Home extends Component {
     super(props);
 
     const isWelcomeEnabled = !(
-      getServices().getInjected('disableWelcomeScreen') ||
+      getServices().homeConfig.disableWelcomeScreen ||
       props.localStorage.getItem(KEY_ENABLE_WELCOME) === 'false'
     );
     const currentOptInStatus = this.props.getOptInStatus();

src/legacy/core_plugins/kibana/public/home/np_ready/components/home.test.js

@@ -30,6 +30,7 @@ jest.mock('../../kibana_services', () => ({
   getServices: () => ({
     getBasePath: () => 'path',
     getInjected: () => '',
+    homeConfig: { disableWelcomeScreen: false },
   }),
 }));
 

src/legacy/core_plugins/kibana/public/home/np_ready/components/home_app.js

@@ -30,7 +30,7 @@ import { replaceTemplateStrings } from './tutorial/replace_template_strings';
 import { getServices } from '../../kibana_services';
 export function HomeApp({ directories }) {
   const {
-    getInjected,
+    config,
     savedObjectsClient,
     getBasePath,
     addBasePath,
@@ -41,7 +41,7 @@ export function HomeApp({ directories }) {
   const mlEnabled = environment.ml;
   const apmUiEnabled = environment.apmUi;
 
-  const defaultAppId = getInjected('kbnDefaultAppId', 'discover');
+  const defaultAppId = config.defaultAppId || 'discover';
 
   const renderTutorialDirectory = props => {
     return (

src/legacy/core_plugins/kibana/public/home/plugin.ts

@@ -27,6 +27,7 @@ import {
   Environment,
   FeatureCatalogueEntry,
   HomePublicPluginStart,
+  HomePublicPluginSetup,
 } from '../../../../../plugins/home/public';
 
 export interface LegacyAngularInjectedDependencies {
@@ -59,6 +60,7 @@ export interface HomePluginSetupDependencies {
   };
   usageCollection: UsageCollectionSetup;
   kibana_legacy: KibanaLegacySetup;
+  home: HomePublicPluginSetup;
 }
 
 export class HomePlugin implements Plugin {
@@ -69,6 +71,7 @@ export class HomePlugin implements Plugin {
   setup(
     core: CoreSetup,
     {
+      home,
       kibana_legacy,
       usageCollection,
       __LEGACY: { getAngularDependencies, ...legacyServices },
@@ -95,6 +98,8 @@ export class HomePlugin implements Plugin {
           getBasePath: core.http.basePath.get,
           indexPatternService: this.dataStart!.indexPatterns,
           environment: this.environment!,
+          config: kibana_legacy.config,
+          homeConfig: home.config,
           ...angularDependencies,
         });
         const { renderApp } = await import('./np_ready/application');

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

@@ -20,7 +20,6 @@
 // autoloading
 
 // preloading (for faster webpack builds)
-import chrome from 'ui/chrome';
 import routes from 'ui/routes';
 import { uiModules } from 'ui/modules';
 import { npSetup } from 'ui/new_platform';
@@ -64,8 +63,9 @@ localApplicationService.attachToAngular(routes);
 
 routes.enable();
 
+const { config } = npSetup.plugins.kibana_legacy;
 routes.otherwise({
-  redirectTo: `/${chrome.getInjected('kbnDefaultAppId', 'discover')}`,
+  redirectTo: `/${config.defaultAppId || 'discover'}`,
 });
 
 uiModules.get('kibana').run(showAppRedirectNotification);

src/legacy/core_plugins/kibana/public/visualize/kibana_services.ts

@@ -34,6 +34,7 @@ import { VisualizationsStart } from '../../../visualizations/public';
 import { SavedVisualizations } from './np_ready/types';
 import { UsageCollectionSetup } from '../../../../../plugins/usage_collection/public';
 import { Chrome } from './legacy_imports';
+import { KibanaLegacyStart } from '../../../../../plugins/kibana_legacy/public';
 
 export interface VisualizeKibanaServices {
   addBasePath: (url: string) => string;
@@ -52,6 +53,7 @@ export interface VisualizeKibanaServices {
   savedVisualizations: SavedVisualizations;
   share: SharePluginStart;
   uiSettings: IUiSettingsClient;
+  config: KibanaLegacyStart['config'];
   visualizeCapabilities: any;
   visualizations: VisualizationsStart;
   usageCollection?: UsageCollectionSetup;

src/legacy/core_plugins/kibana/public/visualize/np_ready/legacy_app.js

@@ -173,7 +173,7 @@ export function initVisualizeApp(app, deps) {
         },
       })
       .when(`visualize/:tail*?`, {
-        redirectTo: `/${deps.core.injectedMetadata.getInjectedVar('kbnDefaultAppId')}`,
+        redirectTo: `/${deps.config.defaultAppId}`,
       });
   });
 }

src/legacy/core_plugins/kibana/public/visualize/plugin.ts

@@ -108,6 +108,7 @@ export class VisualizePlugin implements Plugin {
           share,
           toastNotifications: contextCore.notifications.toasts,
           uiSettings: contextCore.uiSettings,
+          config: kibana_legacy.config,
           visualizeCapabilities: contextCore.application.capabilities.visualize,
           visualizations,
           usageCollection,

src/legacy/ui/public/new_platform/__mocks__/helpers.ts

@@ -27,6 +27,7 @@ import { inspectorPluginMock } from '../../../../../plugins/inspector/public/moc
 import { uiActionsPluginMock } from '../../../../../plugins/ui_actions/public/mocks';
 import { managementPluginMock } from '../../../../../plugins/management/public/mocks';
 import { usageCollectionPluginMock } from '../../../../../plugins/usage_collection/public/mocks';
+import { kibanaLegacyPluginMock } from '../../../../../plugins/kibana_legacy/public/mocks';
 import { chartPluginMock } from '../../../../../plugins/charts/public/mocks';
 /* eslint-enable @kbn/eslint/no-restricted-paths */
 
@@ -40,6 +41,7 @@ export const pluginsMock = {
     expressions: expressionsPluginMock.createSetupContract(),
     uiActions: uiActionsPluginMock.createSetupContract(),
     usageCollection: usageCollectionPluginMock.createSetupContract(),
+    kibana_legacy: kibanaLegacyPluginMock.createSetupContract(),
   }),
   createStart: () => ({
     data: dataPluginMock.createStartContract(),
@@ -50,6 +52,7 @@ export const pluginsMock = {
     expressions: expressionsPluginMock.createStartContract(),
     uiActions: uiActionsPluginMock.createStartContract(),
     management: managementPluginMock.createStartContract(),
+    kibana_legacy: kibanaLegacyPluginMock.createStartContract(),
   }),
 };
 

src/legacy/ui/public/new_platform/new_platform.karma_mock.js

@@ -119,6 +119,9 @@ export const npSetup = {
     kibana_legacy: {
       registerLegacyApp: () => {},
       forwardApp: () => {},
+      config: {
+        defaultAppId: 'home',
+      },
     },
     inspector: {
       registerView: () => undefined,
@@ -140,6 +143,9 @@ export const npSetup = {
       environment: {
         update: sinon.fake(),
       },
+      config: {
+        disableWelcomeScreen: false,
+      },
     },
     charts: {
       theme: {
@@ -196,6 +202,9 @@ export const npStart = {
     kibana_legacy: {
       getApps: () => [],
       getForwards: () => [],
+      config: {
+        defaultAppId: 'home',
+      },
     },
     data: {
       autocomplete: {
@@ -297,6 +306,9 @@ export const npStart = {
       environment: {
         get: sinon.fake(),
       },
+      config: {
+        disableWelcomeScreen: false,
+      },
     },
     navigation: {
       ui: {

src/plugins/home/config.ts

@@ -0,0 +1,26 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { schema, TypeOf } from '@kbn/config-schema';
+
+export const configSchema = schema.object({
+  disableWelcomeScreen: schema.boolean({ defaultValue: false }),
+});
+
+export type ConfigSchema = TypeOf<typeof configSchema>;

src/plugins/home/public/index.ts

@@ -17,6 +17,8 @@
  * under the License.
  */
 
+import { PluginInitializerContext } from 'kibana/public';
+
 export {
   FeatureCatalogueSetup,
   FeatureCatalogueStart,
@@ -26,4 +28,5 @@ export {
 export { FeatureCatalogueEntry, FeatureCatalogueCategory, Environment } from './services';
 import { HomePublicPlugin } from './plugin';
 
-export const plugin = () => new HomePublicPlugin();
+export const plugin = (initializerContext: PluginInitializerContext) =>
+  new HomePublicPlugin(initializerContext);