`;
-
-exports[`should render a Welcome screen with the telemetry disclaimer 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-`;
-
-exports[`should render a Welcome screen with the telemetry disclaimer when optIn is false 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-`;
-
-exports[`should render a Welcome screen with the telemetry disclaimer when optIn is true 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-`;
-
-exports[`should render a Welcome screen without the opt in/out link when user cannot change optIn status 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-`;
diff --git a/src/plugins/home/public/application/components/home.test.tsx b/src/plugins/home/public/application/components/home.test.tsx
index 9983afa3d4d611..f27a286488c2b1 100644
--- a/src/plugins/home/public/application/components/home.test.tsx
+++ b/src/plugins/home/public/application/components/home.test.tsx
@@ -12,7 +12,6 @@ import type { HomeProps } from './home';
import { Home } from './home';
import { FeatureCatalogueCategory } from '../../services';
-import { telemetryPluginMock } from '../../../../telemetry/public/mocks';
import { Welcome } from './welcome';
let mockHasIntegrationsPermission = true;
@@ -57,7 +56,6 @@ describe('home', () => {
setItem: jest.fn(),
},
urlBasePath: 'goober',
- telemetry: telemetryPluginMock.createStartContract(),
addBasePath(url) {
return `base_path/${url}`;
},
diff --git a/src/plugins/home/public/application/components/home.tsx b/src/plugins/home/public/application/components/home.tsx
index fdf04ea5806538..1fb0b3c790ab7e 100644
--- a/src/plugins/home/public/application/components/home.tsx
+++ b/src/plugins/home/public/application/components/home.tsx
@@ -10,7 +10,6 @@ import React, { Component } from 'react';
import { FormattedMessage } from '@kbn/i18n-react';
import { METRIC_TYPE } from '@kbn/analytics';
import { i18n } from '@kbn/i18n';
-import type { TelemetryPluginStart } from 'src/plugins/telemetry/public';
import { KibanaPageTemplate, OverviewPageFooter } from '../../../../kibana_react/public';
import { HOME_APP_BASE_PATH } from '../../../common/constants';
import type { FeatureCatalogueEntry, FeatureCatalogueSolution } from '../../services';
@@ -29,7 +28,6 @@ export interface HomeProps {
solutions: FeatureCatalogueSolution[];
localStorage: Storage;
urlBasePath: string;
- telemetry: TelemetryPluginStart;
hasUserDataView: () => Promise
;
}
@@ -175,13 +173,7 @@ export class Home extends Component {
}
private renderWelcome() {
- return (
- this.skipWelcome()}
- urlBasePath={this.props.urlBasePath}
- telemetry={this.props.telemetry}
- />
- );
+ return this.skipWelcome()} urlBasePath={this.props.urlBasePath} />;
}
public render() {
diff --git a/src/plugins/home/public/application/components/home_app.js b/src/plugins/home/public/application/components/home_app.js
index 62df479ecbfdf6..a634573aaf21ec 100644
--- a/src/plugins/home/public/application/components/home_app.js
+++ b/src/plugins/home/public/application/components/home_app.js
@@ -26,7 +26,6 @@ export function HomeApp({ directories, solutions }) {
getBasePath,
addBasePath,
environmentService,
- telemetry,
dataViewsService,
} = getServices();
const environment = environmentService.getEnvironment();
@@ -75,7 +74,6 @@ export function HomeApp({ directories, solutions }) {
solutions={solutions}
localStorage={localStorage}
urlBasePath={getBasePath()}
- telemetry={telemetry}
hasUserDataView={() => dataViewsService.hasUserDataView()}
/>
diff --git a/src/plugins/home/public/application/components/welcome.test.mocks.ts b/src/plugins/home/public/application/components/welcome.test.mocks.ts
new file mode 100644
index 00000000000000..fc9854bae31990
--- /dev/null
+++ b/src/plugins/home/public/application/components/welcome.test.mocks.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { welcomeServiceMock } from '../../services/welcome/welcome_service.mocks';
+
+jest.doMock('../kibana_services', () => ({
+ getServices: () => ({
+ addBasePath: (path: string) => `root${path}`,
+ trackUiMetric: () => {},
+ welcomeService: welcomeServiceMock.create(),
+ }),
+}));
diff --git a/src/plugins/home/public/application/components/welcome.test.tsx b/src/plugins/home/public/application/components/welcome.test.tsx
index b042a91e58c9d2..3400b4bfcdb75f 100644
--- a/src/plugins/home/public/application/components/welcome.test.tsx
+++ b/src/plugins/home/public/application/components/welcome.test.tsx
@@ -8,58 +8,11 @@
import React from 'react';
import { shallow } from 'enzyme';
+import './welcome.test.mocks';
import { Welcome } from './welcome';
-import { telemetryPluginMock } from '../../../../telemetry/public/mocks';
-jest.mock('../kibana_services', () => ({
- getServices: () => ({
- addBasePath: (path: string) => `root${path}`,
- trackUiMetric: () => {},
- }),
-}));
-
-test('should render a Welcome screen with the telemetry disclaimer', () => {
- const telemetry = telemetryPluginMock.createStartContract();
- const component = shallow( {}} telemetry={telemetry} />);
-
- expect(component).toMatchSnapshot();
-});
-
-test('should render a Welcome screen with the telemetry disclaimer when optIn is true', () => {
- const telemetry = telemetryPluginMock.createStartContract();
- telemetry.telemetryService.getIsOptedIn = jest.fn().mockReturnValue(true);
- const component = shallow( {}} telemetry={telemetry} />);
-
- expect(component).toMatchSnapshot();
-});
-
-test('should render a Welcome screen with the telemetry disclaimer when optIn is false', () => {
- const telemetry = telemetryPluginMock.createStartContract();
- telemetry.telemetryService.getIsOptedIn = jest.fn().mockReturnValue(false);
- const component = shallow( {}} telemetry={telemetry} />);
-
- expect(component).toMatchSnapshot();
-});
-
-test('should render a Welcome screen with no telemetry disclaimer', () => {
+test('should render a Welcome screen', () => {
const component = shallow( {}} />);
expect(component).toMatchSnapshot();
});
-
-test('should render a Welcome screen without the opt in/out link when user cannot change optIn status', () => {
- const telemetry = telemetryPluginMock.createStartContract();
- telemetry.telemetryService.getCanChangeOptInStatus = jest.fn().mockReturnValue(false);
- const component = shallow( {}} telemetry={telemetry} />);
-
- expect(component).toMatchSnapshot();
-});
-
-test('fires opt-in seen when mounted', () => {
- const telemetry = telemetryPluginMock.createStartContract();
- const mockSetOptedInNoticeSeen = jest.fn();
- telemetry.telemetryNotifications.setOptedInNoticeSeen = mockSetOptedInNoticeSeen;
- shallow( {}} telemetry={telemetry} />);
-
- expect(mockSetOptedInNoticeSeen).toHaveBeenCalled();
-});
diff --git a/src/plugins/home/public/application/components/welcome.tsx b/src/plugins/home/public/application/components/welcome.tsx
index 1a6251ebdca118..9efa6d356d9716 100644
--- a/src/plugins/home/public/application/components/welcome.tsx
+++ b/src/plugins/home/public/application/components/welcome.tsx
@@ -12,27 +12,17 @@
* in Elasticsearch.
*/
-import React, { Fragment } from 'react';
-import {
- EuiLink,
- EuiTextColor,
- EuiTitle,
- EuiSpacer,
- EuiFlexGroup,
- EuiFlexItem,
- EuiIcon,
- EuiPortal,
-} from '@elastic/eui';
+import React from 'react';
+import { EuiTitle, EuiSpacer, EuiFlexGroup, EuiFlexItem, EuiIcon, EuiPortal } from '@elastic/eui';
import { METRIC_TYPE } from '@kbn/analytics';
import { FormattedMessage } from '@kbn/i18n-react';
import { getServices } from '../kibana_services';
-import { TelemetryPluginStart } from '../../../../telemetry/public';
import { SampleDataCard } from './sample_data';
+
interface Props {
urlBasePath: string;
onSkip: () => void;
- telemetry?: TelemetryPluginStart;
}
/**
@@ -47,7 +37,7 @@ export class Welcome extends React.Component {
}
};
- private redirecToAddData() {
+ private redirectToAddData() {
this.services.application.navigateToApp('integrations', { path: '/browse' });
}
@@ -58,68 +48,23 @@ export class Welcome extends React.Component {
private onSampleDataConfirm = () => {
this.services.trackUiMetric(METRIC_TYPE.CLICK, 'sampleDataConfirm');
- this.redirecToAddData();
+ this.redirectToAddData();
};
componentDidMount() {
- const { telemetry } = this.props;
+ const { welcomeService } = this.services;
this.services.trackUiMetric(METRIC_TYPE.LOADED, 'welcomeScreenMount');
- if (telemetry?.telemetryService.userCanChangeSettings) {
- telemetry.telemetryNotifications.setOptedInNoticeSeen();
- }
document.addEventListener('keydown', this.hideOnEsc);
+ welcomeService.onRendered();
}
componentWillUnmount() {
document.removeEventListener('keydown', this.hideOnEsc);
}
- private renderTelemetryEnabledOrDisabledText = () => {
- const { telemetry } = this.props;
- if (
- !telemetry ||
- !telemetry.telemetryService.userCanChangeSettings ||
- !telemetry.telemetryService.getCanChangeOptInStatus()
- ) {
- return null;
- }
-
- const isOptedIn = telemetry.telemetryService.getIsOptedIn();
- if (isOptedIn) {
- return (
-
-
-
-
-
-
- );
- } else {
- return (
-
-
-
-
-
-
- );
- }
- };
-
render() {
- const { urlBasePath, telemetry } = this.props;
+ const { urlBasePath } = this.props;
+ const { welcomeService } = this.services;
return (
@@ -146,28 +91,7 @@ export class Welcome extends React.Component
{
onDecline={this.onSampleDataDecline}
/>
- {!!telemetry && (
-
-
-
-
-
-
- {this.renderTelemetryEnabledOrDisabledText()}
-
-
-
- )}
+ {welcomeService.renderTelemetryNotice()}