Skip to content

Commit

Permalink
[7.5] [Telemetry] Remove telemetry splash page and add conditional me…
Browse files Browse the repository at this point in the history
…ssaging (#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
  • Loading branch information
Joel Griffith authored Nov 13, 2019
1 parent 180d7fc commit e9c34c4
Show file tree
Hide file tree
Showing 10 changed files with 283 additions and 167 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.

12 changes: 3 additions & 9 deletions src/legacy/core_plugins/kibana/public/home/components/home.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export class Home extends Component {
super(props);

const isWelcomeEnabled = !(chrome.getInjected('disableWelcomeScreen') || props.localStorage.getItem(KEY_ENABLE_WELCOME) === 'false');

const showTelemetryDisclaimer = chrome.getInjected('allowChangingOptInStatus');
this.state = {
// If welcome is enabled, we wait for loading to complete
// before rendering. This prevents an annoying flickering
Expand All @@ -57,6 +57,7 @@ export class Home extends Component {
isLoading: isWelcomeEnabled,
isNewKibanaInstance: false,
isWelcomeEnabled,
showTelemetryDisclaimer,
};
}

Expand Down Expand Up @@ -225,10 +226,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 @@ -251,10 +249,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 @@ -30,7 +30,7 @@ import {
} from 'react-router-dom';
import { getTutorial } from '../load_tutorials';
import { replaceTemplateStrings } from './tutorial/replace_template_strings';
import { telemetryOptInProvider, shouldShowTelemetryOptIn } from '../kibana_services';
import { shouldShowTelemetryOptIn } from '../kibana_services';
import chrome from 'ui/chrome';

export function HomeApp({ directories }) {
Expand Down Expand Up @@ -93,9 +93,6 @@ export function HomeApp({ directories }) {
localStorage={localStorage}
urlBasePath={chrome.getBasePath()}
shouldShowTelemetryOptIn={shouldShowTelemetryOptIn}
setOptIn={telemetryOptInProvider.setOptIn}
fetchTelemetry={telemetryOptInProvider.fetchExample}
getTelemetryBannerId={telemetryOptInProvider.getBannerId}
/>
</Route>
</Switch>
Expand Down

This file was deleted.

This file was deleted.

Loading

0 comments on commit e9c34c4

Please sign in to comment.