Merge branch '7.x' into backport/7.x/pr-56676

.i18nrc.json

@@ -26,6 +26,7 @@
       "src/legacy/core_plugins/management",
       "src/plugins/management"
     ],
+    "advancedSettings": "src/plugins/advanced_settings",
     "kibana_react": "src/legacy/core_plugins/kibana_react",
     "kibana-react": "src/plugins/kibana_react",
     "kibana_utils": "src/plugins/kibana_utils",

docs/setup/upgrade.asciidoc

@@ -51,7 +51,7 @@ instructions.
 [[upgrade-6x]]
 === Upgrading from 6.x
 
-The recommended path is to upgrade to 6.7 before upgrading to 7.0. This makes it 
+The recommended path is to upgrade to 6.8 before upgrading to 7.0. This makes it 
 easier to identify the required changes, and enables you to use the Upgrade 
 Assistant to prepare for your upgrade to 7.0.
 
@@ -60,11 +60,11 @@ dashboards is supported.
 
 [float]
 [[upgrade-67]]
-=== Upgrading from 6.7
-To help you prepare for your upgrade to 7.0, 6.7 includes an https://www.elastic.co/guide/en/kibana/6.7/upgrade-assistant.html[Upgrade Assistant] 
-To access the assistant, go to *Management > 7.0 Upgrade Assistant*. 
+=== Upgrading from 6.8
+To help you prepare for your upgrade to 7.0, 6.8 includes an https://www.elastic.co/guide/en/kibana/6.8/upgrade-assistant.html[Upgrade Assistant] 
+To access the assistant, go to *Management > 7.0 Upgrade Assistant*.
 
-After you have addressed any issues that were identified by the Upgrade 
+After you have addressed any issues that were identified by the Upgrade
 Assistant, <<upgrade-standard,upgrade to 7.0>>.
 
 [float]

src/legacy/core_plugins/kibana/public/management/sections/settings/advanced_settings.test.tsx

@@ -27,7 +27,9 @@ import {
   UiSettingsType,
 } from '../../../../../../../core/public';
 import { FieldSetting } from './types';
+
 import { AdvancedSettings } from './advanced_settings';
+jest.mock('ui/new_platform');
 
 jest.mock('ui/new_platform', () => ({
   npStart: mockConfig(),
@@ -215,6 +217,22 @@ function mockConfig() {
     core: {
       uiSettings: config,
     },
+    plugins: {
+      advancedSettings: {
+        component: {
+          register: jest.fn(),
+          get: () => {
+            const foo: React.ComponentType = () => <div>Hello</div>;
+            foo.displayName = 'foo_component';
+            return foo;
+          },
+          componentType: {
+            PAGE_TITLE_COMPONENT: 'page_title_component',
+            PAGE_SUBTITLE_COMPONENT: 'page_subtitle_component',
+          },
+        },
+      },
+    },
   };
 }
 

src/legacy/core_plugins/kibana/public/management/sections/settings/advanced_settings.tsx

@@ -31,14 +31,6 @@ import { getAriaName, toEditableConfig, DEFAULT_CATEGORY } from './lib';
 
 import { FieldSetting, IQuery } from './types';
 
-import {
-  registerDefaultComponents,
-  PAGE_TITLE_COMPONENT,
-  PAGE_SUBTITLE_COMPONENT,
-  PAGE_FOOTER_COMPONENT,
-} from './components/default_component_registry';
-import { getSettingsComponent } from './components/component_registry';
-
 interface AdvancedSettingsProps {
   queryText: string;
   enableSaving: boolean;
@@ -75,8 +67,6 @@ export class AdvancedSettings extends Component<AdvancedSettingsProps, AdvancedS
       footerQueryMatched: false,
       filteredSettings: this.mapSettings(Query.execute(parsedQuery, this.settings)),
     };
-
-    registerDefaultComponents();
   }
 
   init(config: IUiSettingsClient) {
@@ -166,10 +156,13 @@ export class AdvancedSettings extends Component<AdvancedSettingsProps, AdvancedS
 
   render() {
     const { filteredSettings, query, footerQueryMatched } = this.state;
+    const componentRegistry = npStart.plugins.advancedSettings.component;
 
-    const PageTitle = getSettingsComponent(PAGE_TITLE_COMPONENT);
-    const PageSubtitle = getSettingsComponent(PAGE_SUBTITLE_COMPONENT);
-    const PageFooter = getSettingsComponent(PAGE_FOOTER_COMPONENT);
+    const PageTitle = componentRegistry.get(componentRegistry.componentType.PAGE_TITLE_COMPONENT);
+    const PageSubtitle = componentRegistry.get(
+      componentRegistry.componentType.PAGE_SUBTITLE_COMPONENT
+    );
+    const PageFooter = componentRegistry.get(componentRegistry.componentType.PAGE_FOOTER_COMPONENT);
 
     return (
       <div>