Skip to content

Commit

Permalink
[7.x] [Telemetry] Remove telemetry splash page and add conditional me…
Browse files Browse the repository at this point in the history
…ssaging (#50189) (#50429)

* [Telemetry] Remove telemetry splash page and add conditional messaging (#50189)

* Removing tel splash page in UI layer

* Removing more components

* New disclaimer text

* Removing telemetry i18n text

* More i18n text removals

* Snapshot updates

* Snapshot tests + quick links for tel opt-out when possible

* Fixing TS issues in test

* i18n updates
  • Loading branch information
Joel Griffith authored Nov 13, 2019
1 parent 57ab6e7 commit cbcf601
Show file tree
Hide file tree
Showing 10 changed files with 284 additions and 172 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 3 additions & 8 deletions src/legacy/core_plugins/kibana/public/home/components/home.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -60,6 +61,7 @@ export class Home extends Component {
isLoading: isWelcomeEnabled,
isNewKibanaInstance: false,
isWelcomeEnabled,
showTelemetryDisclaimer,
};
}

Expand Down Expand Up @@ -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}
/>
);
}
Expand All @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ import { getServices } from '../kibana_services';

export function HomeApp({ directories }) {
const {
telemetryOptInProvider,
shouldShowTelemetryOptIn,
getInjected,
savedObjectsClient,
getBasePath,
Expand Down Expand Up @@ -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">
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit cbcf601

Please sign in to comment.