- {plusCard(this.isPlusPlanChecked(), this.selectPlusPlan, isPlus)}
+ {this.plusCard(this.isPlusPlanChecked(), this.selectPlusPlan, isPlus)}
{t('ghostery_browser_hub_onboarding_or')}
@@ -323,7 +329,7 @@ class ChoosePlanView extends React.Component {
)}
{!isPremium && (
- {plusCard(this.isPlusPlanChecked(), this.selectPlusPlan)}
+ {this.plusCard(this.isPlusPlanChecked(), this.selectPlusPlan)}
)}
{premiumCard(this.isPremiumPlanChecked(), this.selectPremiumPlan)}
@@ -332,8 +338,9 @@ class ChoosePlanView extends React.Component {
{(isBasic && (
{(selectedPlan === BASIC) && (
- // Change to route to next page
-
+
setSetupStep({ setup_step: CHOOSE_PLAN, origin: ONBOARDING })}>
+ {t('next')}
+
)}
{selectedPlan === PLUS && (
{t('next')}
@@ -344,8 +351,9 @@ class ChoosePlanView extends React.Component {
))}
{isPremium && (
- // Change to route to next page
-
+
setSetupStep({ setup_step: CHOOSE_PLAN, origin: ONBOARDING })}>
+ {t('next')}
+
)}
)}
diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/index.jsx b/app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/index.jsx
index 402d19108..397a0ab66 100644
--- a/app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/index.jsx
+++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/index.jsx
@@ -12,7 +12,11 @@
*/
import { buildReduxHOC } from '../../../../shared-hub/utils';
-
import ChoosePlanView from './ChoosePlanView';
+import { setSetupStep } from '../../../../shared-hub/actions/SetupLifecycleActions';
+
+const actionCreators = {
+ setSetupStep,
+};
-export default buildReduxHOC(['account'], null, ChoosePlanView);
+export default buildReduxHOC(['account'], actionCreators, ChoosePlanView);
diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step5_SuccessView/SuccessView.jsx b/app/ghostery-browser-hub/Views/OnboardingViews/Step5_SuccessView/SuccessView.jsx
index 815e60463..c1a87cc37 100644
--- a/app/ghostery-browser-hub/Views/OnboardingViews/Step5_SuccessView/SuccessView.jsx
+++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step5_SuccessView/SuccessView.jsx
@@ -18,13 +18,17 @@ import React from 'react';
* @return {JSX} JSX for rendering the Browser Success View of the Hub app
* @memberof HubComponents
*/
-const SuccessView = () => (
-
-
{t('ghostery_browser_hub_onboarding_yay_youre_all_set')}
-
{`${t('ghostery_browser_hub_onboarding_start_browsing_the_web_with')} Ghostery`}
-
-
-
-);
+const SuccessView = (props) => {
+ const { actions } = props;
+ const { sendPing } = actions;
+ return (
+
+
{t('ghostery_browser_hub_onboarding_yay_youre_all_set')}
+
{`${t('ghostery_browser_hub_onboarding_start_browsing_the_web_with')} Ghostery`}
+
+
+
+ );
+};
export default SuccessView;
diff --git a/app/ghostery-browser-hub/Views/OnboardingViews/Step5_SuccessView/index.js b/app/ghostery-browser-hub/Views/OnboardingViews/Step5_SuccessView/index.js
index cdcea8832..9b5cf3814 100644
--- a/app/ghostery-browser-hub/Views/OnboardingViews/Step5_SuccessView/index.js
+++ b/app/ghostery-browser-hub/Views/OnboardingViews/Step5_SuccessView/index.js
@@ -12,5 +12,11 @@
*/
import SuccessView from './SuccessView';
+import { buildReduxHOC } from '../../../../shared-hub/utils';
+import sendPing from '../../../../shared-hub/actions/MetricsActions';
-export default SuccessView;
+const actionCreators = {
+ sendPing
+};
+
+export default buildReduxHOC(null, actionCreators, SuccessView);
diff --git a/app/shared-hub/utils/index.js b/app/shared-hub/utils/index.js
index 693a05465..55f478196 100644
--- a/app/shared-hub/utils/index.js
+++ b/app/shared-hub/utils/index.js
@@ -20,6 +20,7 @@ import {
bindActionCreators
} from 'redux';
import { connect } from 'react-redux';
+import { withRouter } from 'react-router-dom';
// Imports utilities from elsewhere in the codebase to reduce duplicate code
import { log } from '../../../src/utils/common';
@@ -106,7 +107,7 @@ function buildReduxHOC(stateKeys, actionCreators, baseComponent) {
actions: bindActionCreators(actionCreators, dispatch)
});
- return connect(mapStateToProps, mapDispatchToProps)(baseComponent);
+ return withRouter(connect(mapStateToProps, mapDispatchToProps)(baseComponent));
}
export {
diff --git a/src/background.js b/src/background.js
index 64c6fb206..89e7f08c4 100644
--- a/src/background.js
+++ b/src/background.js
@@ -557,6 +557,11 @@ function handleGhosteryHub(name, message, callback) {
} else {
({ setup_step } = setup_step);
}
+ const origin = message.origin || '';
+ if (origin === 'onboarding') {
+ conf.setup_step = message.setup_step;
+ metrics.ping('gb_onboarding');
+ }
callback({ setup_step });
break;
}
diff --git a/src/classes/Metrics.js b/src/classes/Metrics.js
index 0a4d7c16d..3f7280635 100644
--- a/src/classes/Metrics.js
+++ b/src/classes/Metrics.js
@@ -184,6 +184,12 @@ class Metrics {
this._sendReq(type, ['all']);
break;
+ // Ghostery Browser Hub - Ghostery 8.5.5+
+ case 'gb_onboarding':
+ case 'gb_onboarding_success':
+ this._sendReq(type, ['all']);
+ break;
+
// Uncaught Pings
default:
log(`metrics ping() error: ping name ${type} not found`);
@@ -285,7 +291,7 @@ class Metrics {
// Antitracking state
this._buildQueryPair('at', conf.enable_anti_tracking ? '1' : '0') +
// The deepest setup page reached by user during setup
- this._buildQueryPair('ss', (conf.metrics.install_complete_all || type === 'install_complete') ? conf.setup_step.toString() : '-1') +
+ this._buildQueryPair('ss', Metrics._getSetupStep(type).toString()) +
// The number of times the user has gone through setup
this._buildQueryPair('sl', conf.setup_number.toString()) +
// Type of blocking selected during setup
@@ -393,6 +399,22 @@ class Metrics {
return 'gbe';
}
+ /**
+ * Get the Setup step
+ *
+ * @private
+ *
+ * @return {number} The deepest setup page reached by user during setup
+ */
+ static _getSetupStep(type) {
+ console.log('conf.setup_step', conf.setup_step);
+ if (conf.metrics.install_complete_all
+ || type === 'install_complete'
+ || type === 'gb_onboarding'
+ || type === 'gb_onboarding_success') return conf.setup_step;
+ return -1;
+ }
+
/**
* Calculate days since the last daily active ping.
*
-