Skip to content

Commit e9c34c4

Browse files
author
Joel Griffith
authored
[7.5] [Telemetry] Remove telemetry splash page and add conditional messaging (#50189) (#50430)
* [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 * Fixing broken telemetry updates * [ML] Removes ChartTooltip component, artefact from backport gone wrong. (#50300) * [7.5] [ML] Skip advanced wizard categorization test (#50141) (#50156) * [ML] Skip advanced wizard categorization test (#50141) * Re-enable other advanced tests * [DOCS] Adds link to 7.5 breaking changes doc (#50496) * Fixing mock interface in jest
1 parent 180d7fc commit e9c34c4

File tree

10 files changed

+283
-167
lines changed

10 files changed

+283
-167
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 & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export class Home extends Component {
4848
super(props);
4949

5050
const isWelcomeEnabled = !(chrome.getInjected('disableWelcomeScreen') || props.localStorage.getItem(KEY_ENABLE_WELCOME) === 'false');
51-
51+
const showTelemetryDisclaimer = chrome.getInjected('allowChangingOptInStatus');
5252
this.state = {
5353
// If welcome is enabled, we wait for loading to complete
5454
// before rendering. This prevents an annoying flickering
@@ -57,6 +57,7 @@ export class Home extends Component {
5757
isLoading: isWelcomeEnabled,
5858
isNewKibanaInstance: false,
5959
isWelcomeEnabled,
60+
showTelemetryDisclaimer,
6061
};
6162
}
6263

@@ -225,10 +226,7 @@ export class Home extends Component {
225226
<Welcome
226227
onSkip={this.skipWelcome}
227228
urlBasePath={this.props.urlBasePath}
228-
shouldShowTelemetryOptIn={this.props.shouldShowTelemetryOptIn}
229-
fetchTelemetry={this.props.fetchTelemetry}
230-
setOptIn={this.props.setOptIn}
231-
getTelemetryBannerId={this.props.getTelemetryBannerId}
229+
showTelemetryDisclaimer={this.state.showTelemetryDisclaimer}
232230
/>
233231
);
234232
}
@@ -251,10 +249,6 @@ export class Home extends Component {
251249

252250
Home.propTypes = {
253251
addBasePath: PropTypes.func.isRequired,
254-
fetchTelemetry: PropTypes.func.isRequired,
255-
getTelemetryBannerId: PropTypes.func.isRequired,
256-
setOptIn: PropTypes.func.isRequired,
257-
shouldShowTelemetryOptIn: PropTypes.bool,
258252
directories: PropTypes.arrayOf(
259253
PropTypes.shape({
260254
id: PropTypes.string.isRequired,

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import {
3030
} from 'react-router-dom';
3131
import { getTutorial } from '../load_tutorials';
3232
import { replaceTemplateStrings } from './tutorial/replace_template_strings';
33-
import { telemetryOptInProvider, shouldShowTelemetryOptIn } from '../kibana_services';
33+
import { shouldShowTelemetryOptIn } from '../kibana_services';
3434
import chrome from 'ui/chrome';
3535

3636
export function HomeApp({ directories }) {
@@ -93,9 +93,6 @@ export function HomeApp({ directories }) {
9393
localStorage={localStorage}
9494
urlBasePath={chrome.getBasePath()}
9595
shouldShowTelemetryOptIn={shouldShowTelemetryOptIn}
96-
setOptIn={telemetryOptInProvider.setOptIn}
97-
fetchTelemetry={telemetryOptInProvider.fetchExample}
98-
getTelemetryBannerId={telemetryOptInProvider.getBannerId}
9996
/>
10097
</Route>
10198
</Switch>

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)