Skip to content

Commit cbcf601

Browse files
author
Joel Griffith
authored
[7.x] [Telemetry] Remove telemetry splash page and add conditional messaging (#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
1 parent 57ab6e7 commit cbcf601

File tree

10 files changed

+284
-172
lines changed

10 files changed

+284
-172
lines changed

src/legacy/core_plugins/kibana/public/home/components/__snapshots__/home.test.js.snap

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/legacy/core_plugins/kibana/public/home/components/__snapshots__/welcome.test.tsx.snap

Lines changed: 188 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ export class Home extends Component {
5151
getServices().getInjected('disableWelcomeScreen') ||
5252
props.localStorage.getItem(KEY_ENABLE_WELCOME) === 'false'
5353
);
54+
const showTelemetryDisclaimer = getServices().getInjected('allowChangingOptInStatus');
5455

5556
this.state = {
5657
// If welcome is enabled, we wait for loading to complete
@@ -60,6 +61,7 @@ export class Home extends Component {
6061
isLoading: isWelcomeEnabled,
6162
isNewKibanaInstance: false,
6263
isWelcomeEnabled,
64+
showTelemetryDisclaimer,
6365
};
6466
}
6567

@@ -228,10 +230,7 @@ export class Home extends Component {
228230
<Welcome
229231
onSkip={this.skipWelcome}
230232
urlBasePath={this.props.urlBasePath}
231-
shouldShowTelemetryOptIn={this.props.shouldShowTelemetryOptIn}
232-
fetchTelemetry={this.props.fetchTelemetry}
233-
setOptIn={this.props.setOptIn}
234-
getTelemetryBannerId={this.props.getTelemetryBannerId}
233+
showTelemetryDisclaimer={this.state.showTelemetryDisclaimer}
235234
/>
236235
);
237236
}
@@ -254,10 +253,6 @@ export class Home extends Component {
254253

255254
Home.propTypes = {
256255
addBasePath: PropTypes.func.isRequired,
257-
fetchTelemetry: PropTypes.func.isRequired,
258-
getTelemetryBannerId: PropTypes.func.isRequired,
259-
setOptIn: PropTypes.func.isRequired,
260-
shouldShowTelemetryOptIn: PropTypes.bool,
261256
directories: PropTypes.arrayOf(
262257
PropTypes.shape({
263258
id: PropTypes.string.isRequired,

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ import { getServices } from '../kibana_services';
3131

3232
export function HomeApp({ directories }) {
3333
const {
34-
telemetryOptInProvider,
35-
shouldShowTelemetryOptIn,
3634
getInjected,
3735
savedObjectsClient,
3836
getBasePath,
@@ -85,10 +83,6 @@ export function HomeApp({ directories }) {
8583
find={savedObjectsClient.find}
8684
localStorage={localStorage}
8785
urlBasePath={getBasePath()}
88-
shouldShowTelemetryOptIn={shouldShowTelemetryOptIn}
89-
setOptIn={telemetryOptInProvider.setOptIn}
90-
fetchTelemetry={telemetryOptInProvider.fetchExample}
91-
getTelemetryBannerId={telemetryOptInProvider.getBannerId}
9286
/>
9387
</Route>
9488
<Route path="/home">

src/legacy/core_plugins/kibana/public/home/components/telemetry_opt_in/index.ts

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/legacy/core_plugins/kibana/public/home/components/telemetry_opt_in/telemetry_opt_in_card.tsx

Lines changed: 0 additions & 81 deletions
This file was deleted.

0 commit comments

Comments
 (0)