[Telemetry] Remove telemetry splash page and add conditional messaging

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

@@ -228,10 +228,6 @@ 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}
       />
     );
   }
@@ -254,10 +250,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">

src/legacy/core_plugins/kibana/public/home/components/welcome.tsx

@@ -25,6 +25,8 @@
 
 import React from 'react';
 import {
+  EuiLink,
+  EuiTextColor,
   EuiTitle,
   EuiSpacer,
   EuiFlexGroup,
@@ -37,29 +39,17 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { getServices } from '../kibana_services';
 
 import { SampleDataCard } from './sample_data';
-import { TelemetryOptInCard } from './telemetry_opt_in';
 
 interface Props {
   urlBasePath: string;
   onSkip: () => {};
-  fetchTelemetry: () => Promise<any[]>;
-  setOptIn: (enabled: boolean) => Promise<boolean>;
-  getTelemetryBannerId: () => string;
-  shouldShowTelemetryOptIn: boolean;
-}
-
-interface State {
-  step: number;
 }
 
 /**
  * Shows a full-screen welcome page that gives helpful quick links to beginners.
  */
-export class Welcome extends React.PureComponent<Props, State> {
+export class Welcome extends React.Component<Props> {
   private services = getServices();
-  public readonly state: State = {
-    step: 0,
-  };
 
   private hideOnEsc = (e: KeyboardEvent) => {
     if (e.key === 'Escape') {
@@ -72,32 +62,18 @@ export class Welcome extends React.PureComponent<Props, State> {
     window.location.href = path;
   }
 
-  private async handleTelemetrySelection(confirm: boolean) {
-    const metricName = `telemetryOptIn${confirm ? 'Confirm' : 'Decline'}`;
-    this.services.trackUiMetric(this.services.METRIC_TYPE.CLICK, metricName);
-    await this.props.setOptIn(confirm);
-    const bannerId = this.props.getTelemetryBannerId();
-    this.services.banners.remove(bannerId);
-    this.setState(() => ({ step: 1 }));
-  }
-
   private onSampleDataDecline = () => {
     this.services.trackUiMetric(this.services.METRIC_TYPE.CLICK, 'sampleDataDecline');
     this.props.onSkip();
   };
+
   private onSampleDataConfirm = () => {
     this.services.trackUiMetric(this.services.METRIC_TYPE.CLICK, 'sampleDataConfirm');
     this.redirecToSampleData();
   };
 
   componentDidMount() {
     this.services.trackUiMetric(this.services.METRIC_TYPE.LOADED, 'welcomeScreenMount');
-    if (this.props.shouldShowTelemetryOptIn) {
-      this.services.trackUiMetric(
-        this.services.METRIC_TYPE.COUNT,
-        'welcomeScreenWithTelemetryOptIn'
-      );
-    }
     document.addEventListener('keydown', this.hideOnEsc);
   }
 
@@ -106,8 +82,7 @@ export class Welcome extends React.PureComponent<Props, State> {
   }
 
   render() {
-    const { urlBasePath, shouldShowTelemetryOptIn, fetchTelemetry } = this.props;
-    const { step } = this.state;
+    const { urlBasePath } = this.props;
 
     return (
       <EuiPortal>
@@ -137,21 +112,34 @@ export class Welcome extends React.PureComponent<Props, State> {
           <div className="homWelcome__content homWelcome-body">
             <EuiFlexGroup gutterSize="l">
               <EuiFlexItem>
-                {shouldShowTelemetryOptIn && step === 0 && (
-                  <TelemetryOptInCard
-                    urlBasePath={urlBasePath}
-                    fetchTelemetry={fetchTelemetry}
-                    onConfirm={this.handleTelemetrySelection.bind(this, true)}
-                    onDecline={this.handleTelemetrySelection.bind(this, false)}
+                <SampleDataCard
+                  urlBasePath={urlBasePath}
+                  onConfirm={this.onSampleDataConfirm}
+                  onDecline={this.onSampleDataDecline}
+                />
+                <EuiSpacer size="s" />
+                <EuiTextColor className="euiText--small" color="subdued">
+                  <FormattedMessage
+                    id="kbn.home.dataManagementDisclaimerPrivacy"
+                    defaultMessage="To learn about how usage data helps us manage and improve our products and services, see our "
                   />
-                )}
-                {(!shouldShowTelemetryOptIn || step === 1) && (
-                  <SampleDataCard
-                    urlBasePath={urlBasePath}
-                    onConfirm={this.onSampleDataConfirm}
-                    onDecline={this.onSampleDataDecline}
+                  <EuiLink href="#">
+                    <FormattedMessage
+                      id="kbn.home.dataManagementDisclaimerPrivacyLink"
+                      defaultMessage="Privacy Policy."
+                    />
+                  </EuiLink>
+                  <FormattedMessage
+                    id="kbn.home.dataManagementDisableCollection"
+                    defaultMessage=" To disable collection, "
                   />
-                )}
+                  <EuiLink href="#">
+                    <FormattedMessage
+                      id="kbn.home.dataManagementDisableCollectionLink"
+                      defaultMessage="click here."
+                    />
+                  </EuiLink>
+                </EuiTextColor>
                 <EuiSpacer size="xs" />
               </EuiFlexItem>
             </EuiFlexGroup>