Merge remote-tracking branch 'upstream/master' into newsfeed_system_ui

package.json

@@ -360,7 +360,7 @@
     "chance": "1.0.18",
     "cheerio": "0.22.0",
     "chokidar": "3.2.1",
-    "chromedriver": "^78.0.1",
+    "chromedriver": "^77.0.0",
     "classnames": "2.2.6",
     "dedent": "^0.7.0",
     "delete-empty": "^2.0.0",

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

@@ -51,6 +51,7 @@ export class Home extends Component {
       getServices().getInjected('disableWelcomeScreen') ||
       props.localStorage.getItem(KEY_ENABLE_WELCOME) === 'false'
     );
+    const showTelemetryDisclaimer = getServices().getInjected('allowChangingOptInStatus');
 
     this.state = {
       // If welcome is enabled, we wait for loading to complete
@@ -60,6 +61,7 @@ export class Home extends Component {
       isLoading: isWelcomeEnabled,
       isNewKibanaInstance: false,
       isWelcomeEnabled,
+      showTelemetryDisclaimer,
     };
   }
 
@@ -228,10 +230,7 @@ export class Home extends Component {
       <Welcome
         onSkip={this.skipWelcome}
         urlBasePath={this.props.urlBasePath}
-        shouldShowTelemetryOptIn={this.props.shouldShowTelemetryOptIn}
-        fetchTelemetry={this.props.fetchTelemetry}
-        setOptIn={this.props.setOptIn}
-        getTelemetryBannerId={this.props.getTelemetryBannerId}
+        showTelemetryDisclaimer={this.state.showTelemetryDisclaimer}
       />
     );
   }
@@ -254,10 +253,6 @@ export class Home extends Component {
 
 Home.propTypes = {
   addBasePath: PropTypes.func.isRequired,
-  fetchTelemetry: PropTypes.func.isRequired,
-  getTelemetryBannerId: PropTypes.func.isRequired,
-  setOptIn: PropTypes.func.isRequired,
-  shouldShowTelemetryOptIn: PropTypes.bool,
   directories: PropTypes.arrayOf(
     PropTypes.shape({
       id: PropTypes.string.isRequired,

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

@@ -31,8 +31,6 @@ import { getServices } from '../kibana_services';
 
 export function HomeApp({ directories }) {
   const {
-    telemetryOptInProvider,
-    shouldShowTelemetryOptIn,
     getInjected,
     savedObjectsClient,
     getBasePath,
@@ -85,10 +83,6 @@ export function HomeApp({ directories }) {
               find={savedObjectsClient.find}
               localStorage={localStorage}
               urlBasePath={getBasePath()}
-              shouldShowTelemetryOptIn={shouldShowTelemetryOptIn}
-              setOptIn={telemetryOptInProvider.setOptIn}
-              fetchTelemetry={telemetryOptInProvider.fetchExample}
-              getTelemetryBannerId={telemetryOptInProvider.getBannerId}
             />
           </Route>
           <Route path="/home">