Revert "Add highestSetupStepReached() method to next buttons"

This reverts commit b7cdd1e.

app/ghostery-browser-hub/Views/OnboardingView/OnboardingViewContainer.jsx

@@ -44,7 +44,6 @@ class OnboardingViewContainer extends Component {
 		this.state = {
 			sendMountActions: false,
 		};
-		console.log('props container: ', props);
 
 		const { history } = this.props;
 		history.push(`/${ONBOARDING}/${WELCOME}`);
@@ -57,8 +56,6 @@ class OnboardingViewContainer extends Component {
 		const { actions, setup } = this.props;
 		actions.setSetupStep({ setup_step: 7, origin: ONBOARDING });
 		actions.initSetupProps(setup);
-		actions.setHighestSetupStepReached({ setup_step: SUCCESS });
-		console.log('props after setup: ', props);
 
 		// TODO modify this as needed
 		const { origin, pathname, hash } = window.location;

app/ghostery-browser-hub/Views/OnboardingView/index.js

@@ -19,8 +19,7 @@ import OnboardingViewContainer from './OnboardingViewContainer';
 import {
 	initSetupProps,
 	setSetupStep,
-	setSetupComplete,
-	setHighestSetupStepReached
+	setSetupComplete
 } from '../../../shared-hub/actions/SetupLifecycleActions';
 import {
 	setAdBlock,
@@ -35,7 +34,6 @@ export default withRouter(buildReduxHOC(
 		initSetupProps,
 		setSetupStep,
 		setSetupComplete,
-		setHighestSetupStepReached,
 
 		setBlockingPolicy,
 

app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/WelcomeView.jsx

@@ -13,7 +13,7 @@
 
 import React from 'react';
 import { NavLink } from 'react-router-dom';
-import { LOGIN, WELCOME, BLOCK_SETTINGS } from '../../OnboardingView/OnboardingConstants';
+import { LOGIN, WELCOME } from '../../OnboardingView/OnboardingConstants';
 
 /**
  * A Functional React component for rendering the Browser Welcome View
@@ -22,19 +22,13 @@ import { LOGIN, WELCOME, BLOCK_SETTINGS } from '../../OnboardingView/OnboardingC
  */
 const WelcomeView = (props) => {
 	const { actions } = props;
-	const { setSetupStep, setHighestSetupStepReached } = actions;
-
-	const handleSetupStep = () => {
-		setSetupStep({ setup_step: LOGIN, origin: WELCOME });
-		setHighestSetupStepReached({ setup_step: BLOCK_SETTINGS });
-	};
-
+	const { setSetupStep } = actions;
 	return (
 		<div className="WelcomeView__container">
 			<div className="WelcomeView__title">{t('ghostery_browser_hub_onboarding_welcome')}</div>
 			<div className="WelcomeView__subtitle">{t('ghostery_browser_hub_onboarding_lets_begin')}</div>
 			<img className="WelcomeView__rocketShip" src="/app/images/hub/welcome/rocketShip.png" />
-			<NavLink className="WelcomeView__ctaButton" to="/onboarding/1" onClick={() => handleSetupStep()}>
+			<NavLink className="WelcomeView__ctaButton" to="/onboarding/1" onClick={() => setSetupStep({ setup_step: LOGIN, origin: WELCOME })}>
 				<span>{t('ghostery_browser_hub_onboarding_lets_do_this')}</span>
 			</NavLink>
 		</div>

app/ghostery-browser-hub/Views/OnboardingViews/Step0_WelcomeView/index.js

@@ -13,11 +13,10 @@
 
 import { buildReduxHOC } from '../../../../shared-hub/utils';
 import WelcomeView from './WelcomeView';
-import { setSetupStep, setHighestSetupStepReached } from '../../../../shared-hub/actions/SetupLifecycleActions';
+import { setSetupStep } from '../../../../shared-hub/actions/SetupLifecycleActions';
 
 const actionCreators = {
 	setSetupStep,
-	setHighestSetupStepReached
 };
 
 export default buildReduxHOC([], actionCreators, WelcomeView);

app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountView/Step1_CreateAccountView.jsx

@@ -18,7 +18,7 @@ import ClassNames from 'classnames';
 import Step1_LogInForm from '../Step1_LogInForm';
 import Step1_CreateAccountForm from '../Step1_CreateAccountForm';
 import globals from '../../../../../src/classes/Globals';
-import { LOGIN, ONBOARDING, BLOCK_SETTINGS } from '../../OnboardingView/OnboardingConstants';
+import { LOGIN, ONBOARDING } from '../../OnboardingView/OnboardingConstants';
 
 const SIGN_IN = 'SIGN_IN';
 const CREATE_ACCOUNT = 'CREATE_ACCOUNT';
@@ -70,7 +70,7 @@ const renderFAQListItem = (icon, label, description) => (
  */
 const Step1_CreateAccountView = (props) => {
 	const { user, actions } = props;
-	const { setSetupStep, setHighestSetupStepReached } = actions;
+	const { setSetupStep } = actions;
 	const email = user && user.email;
 
 	const [expanded, setExpanded] = useState(false);
@@ -91,16 +91,11 @@ const Step1_CreateAccountView = (props) => {
 		setExpanded(!expanded);
 	};
 
-	const handleSetupStep = () => {
-		setSetupStep({ setup_step: LOGIN, origin: ONBOARDING });
-		setHighestSetupStepReached({ setup_step: BLOCK_SETTINGS });
-	};
-
 	const renderSkipLink = () => (
 		<div className="row align-center-middle">
 			<div className="columns small-10 medium-6" />
 			<div className="columns small-10 medium-6">
-				<NavLink className="Step1_CreateAccountView__skip" to="/onboarding/2" onClick={() => handleSetupStep()}>
+				<NavLink className="Step1_CreateAccountView__skip" to="/onboarding/2" onClick={() => setSetupStep({ setup_step: LOGIN, origin: ONBOARDING })}>
 					<span>{t('ghostery_browser_hub_onboarding_skip')}</span>
 				</NavLink>
 			</div>
@@ -112,7 +107,7 @@ const Step1_CreateAccountView = (props) => {
 			<div className="Step1_CreateAccountView__title">{t('ghostery_browser_hub_onboarding_you_are_signed_in_as')}</div>
 			<div className="Step1_CreateAccountView__email">{email}</div>
 			<div className="Step1_CreateAccountView__ctaButtonContainer">
-				<NavLink className="Step1_CreateAccountView__ctaButton" to="/onboarding/2" onClick={() => handleSetupStep()}>
+				<NavLink className="Step1_CreateAccountView__ctaButton" to="/onboarding/2" onClick={() => setSetupStep({ setup_step: LOGIN, origin: ONBOARDING })}>
 					<span>{t('next')}</span>
 				</NavLink>
 			</div>

app/ghostery-browser-hub/Views/OnboardingViews/Step1_CreateAccountView/index.js

@@ -14,11 +14,10 @@
 import { withRouter } from 'react-router-dom';
 import { buildReduxHOC } from '../../../../shared-hub/utils';
 import Step1_CreateAccountView from './Step1_CreateAccountView';
-import { setSetupStep, setHighestSetupStepReached } from '../../../../shared-hub/actions/SetupLifecycleActions';
+import { setSetupStep } from '../../../../shared-hub/actions/SetupLifecycleActions';
 
 const actionCreators = {
 	setSetupStep,
-	setHighestSetupStepReached
 };
 
 export default withRouter(buildReduxHOC(['account'], actionCreators, Step1_CreateAccountView));

app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/BlockSettingsView.jsx

@@ -69,7 +69,7 @@ class BlockSettingsView extends Component {
 		if (blockAds !== null && kindsOfTrackers !== null && antiTracking !== null && smartBrowsing !== null) {
 			const { actions } = this.props;
 			const {
-				setAdBlock, setAntiTracking, setSmartBlocking, setBlockingPolicy, setSetupStep, setHighestSetupStepReached
+				setAdBlock, setAntiTracking, setSmartBlocking, setBlockingPolicy, setSetupStep
 			} = actions;
 			const { history } = this.props;
 
@@ -93,7 +93,6 @@ class BlockSettingsView extends Component {
 			}
 			setBlockingPolicy({ blockingPolicy });
 			setSetupStep({ setup_step: CHOOSE_DEFAULT_SEARCH, origin: ONBOARDING });
-			setHighestSetupStepReached({ setup_step: CHOOSE_DEFAULT_SEARCH });
 			history.push('/onboarding/3');
 		} else {
 			const { setToast } = this.props;

app/ghostery-browser-hub/Views/OnboardingViews/Step2_BlockSettingsView/index.js

@@ -17,7 +17,7 @@ import { logout } from '../../../../Account/AccountActions';
 import { setAntiTracking, setAdBlock, setSmartBlocking } from '../../../../shared-hub/actions/AntiSuiteActions';
 import setBlockingPolicy from '../../../../shared-hub/actions/BlockingPolicyActions';
 import setToast from '../../../../shared-hub/actions/ToastActions';
-import { setSetupStep, setHighestSetupStepReached } from '../../../../shared-hub/actions/SetupLifecycleActions';
+import { setSetupStep } from '../../../../shared-hub/actions/SetupLifecycleActions';
 
 const actionCreators = {
 	logout,
@@ -27,7 +27,6 @@ const actionCreators = {
 	setBlockingPolicy,
 	setToast,
 	setSetupStep,
-	setHighestSetupStepReached,
 };
 
 export default buildReduxHOC(null, actionCreators, BlockSettingsView);

app/ghostery-browser-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/ChooseDefaultSearchView.jsx

@@ -35,10 +35,9 @@ class ChooseDefaultSearchView extends Component {
 
 	handleSubmit = () => {
 		const { actions, history } = this.props;
-		const { setSetupStep, setHighestSetupStepReached } = actions;
+		const { setSetupStep } = actions;
 
 		setSetupStep({ setup_step: CHOOSE_PLAN, origin: ONBOARDING });
-		setHighestSetupStepReached({ setup_step: CHOOSE_PLAN });
 
 		history.push(`/${ONBOARDING}/${CHOOSE_PLAN}`);
 	}

app/ghostery-browser-hub/Views/OnboardingViews/Step3_ChooseDefaultSearchView/index.js

@@ -13,11 +13,10 @@
 
 import ChooseDefaultSearchView from './ChooseDefaultSearchView';
 import { buildReduxHOC } from '../../../../shared-hub/utils';
-import { setSetupStep, setHighestSetupStepReached } from '../../../../shared-hub/actions/SetupLifecycleActions';
+import { setSetupStep } from '../../../../shared-hub/actions/SetupLifecycleActions';
 
 const actionCreators = {
 	setSetupStep,
-	setHighestSetupStepReached
 };
 
 export default buildReduxHOC(null, actionCreators, ChooseDefaultSearchView);

app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/ChoosePlanView.jsx

@@ -18,7 +18,7 @@ import PropTypes from 'prop-types';
 import RadioButton from '../../../../shared-components/RadioButton';
 import globals from '../../../../../src/classes/Globals';
 import { BASIC, PLUS, PREMIUM } from '../../../../hub/Views/UpgradePlanView/UpgradePlanViewConstants';
-import { CHOOSE_PLAN, ONBOARDING, SUCCESS } from '../../OnboardingView/OnboardingConstants';
+import { CHOOSE_PLAN, ONBOARDING } from '../../OnboardingView/OnboardingConstants';
 
 const plusCheckoutLink = `${globals.CHECKOUT_BASE_URL}/en/plus`;
 const premiumCheckoutLink = `${globals.CHECKOUT_BASE_URL}/en/premium`;
@@ -218,13 +218,6 @@ class ChoosePlanView extends React.Component {
 		return t('ghostery_browser_hub_onboarding_choose_an_option');
 	};
 
-	handleSetupStep = () => {
-		const { actions } = this.props;
-		const { setSetupStep, setHighestSetupStepReached } = actions;
-		setSetupStep({ setup_step: CHOOSE_PLAN, origin: ONBOARDING });
-		setHighestSetupStepReached({ setup_step: SUCCESS });
-	}
-
 	plusCard = (checked, handleClick, showCTAButton = false) => {
 		const { actions } = this.props;
 		const { setSetupStep } = actions;

app/ghostery-browser-hub/Views/OnboardingViews/Step4_ChoosePlanView/index.jsx

@@ -13,11 +13,10 @@
 
 import { buildReduxHOC } from '../../../../shared-hub/utils';
 import ChoosePlanView from './ChoosePlanView';
-import { setSetupStep, setHighestSetupStepReached } from '../../../../shared-hub/actions/SetupLifecycleActions';
+import { setSetupStep } from '../../../../shared-hub/actions/SetupLifecycleActions';
 
 const actionCreators = {
 	setSetupStep,
-	setHighestSetupStepReached
 };
 
 export default buildReduxHOC(['account'], actionCreators, ChoosePlanView);

app/ghostery-browser-hub/Views/OnboardingViews/StepProgressBar/StepProgressBar.jsx

@@ -53,8 +53,7 @@ const steps = [
  * @memberof HubComponents
  */
 const StepProgressBar = (props) => {
-	const { currentStep, setup } = props;
-	console.log('setup: ', props);
+	const { currentStep } = props;
 	const totalSteps = steps.length;
 
 	const logoutIfStepOne = (stepId) => {

app/ghostery-browser-hub/Views/OnboardingViews/StepProgressBar/index.js

@@ -15,9 +15,8 @@ import StepProgressBar from './StepProgressBar';
 import { buildReduxHOC } from '../../../../shared-hub/utils';
 import { logout } from '../../../../Account/AccountActions';
 
-const stateSlices = ['setup'];
 const actionCreators = {
 	logout
 };
 
-export default buildReduxHOC(stateSlices, actionCreators, StepProgressBar);
+export default buildReduxHOC(null, actionCreators, StepProgressBar);

app/shared-hub/actions/SetupLifecycleActions.js

@@ -15,8 +15,7 @@ import { makeDeferredDispatcher } from '../utils';
 import {
 	INIT_SETUP_PROPS,
 	SET_SETUP_STEP,
-	SET_SETUP_COMPLETE,
-	SET_HIGHEST_SETUP_STEP_REACHED
+	SET_SETUP_COMPLETE
 } from '../constants/SetupLifecycleConstants';
 
 export function initSetupProps(data) {
@@ -31,10 +30,3 @@ export const setSetupStep =
 
 export const setSetupComplete =
 	actionData => makeDeferredDispatcher(SET_SETUP_COMPLETE, actionData);
-
-export function setHighestSetupStepReached(data) {
-	return {
-		type: SET_HIGHEST_SETUP_STEP_REACHED,
-		data,
-	};
-}

app/shared-hub/constants/SetupLifecycleConstants.js

@@ -14,4 +14,3 @@
 export const INIT_SETUP_PROPS = 'INIT_SETUP_PROPS';
 export const SET_SETUP_STEP = 'SET_SETUP_STEP';
 export const SET_SETUP_COMPLETE = 'SET_SETUP_COMPLETE';
-export const SET_HIGHEST_SETUP_STEP_REACHED = 'SET_HIGHEST_SETUP_STEP_REACHED';

app/shared-hub/reducers/SetupLifecycleReducer.js

@@ -12,15 +12,10 @@
  */
 
 import {
-	INIT_SETUP_PROPS,
-	SET_HIGHEST_SETUP_STEP_REACHED
+	INIT_SETUP_PROPS
 } from '../constants/SetupLifecycleConstants';
 
-const initialState = {
-	setup_step: 0 // To be used in <StepProgressBar /> only. Prevents the user from navigating to a page they have not yet completed the previous steps for
-};
-
-// const initialState = {};
+const initialState = {};
 
 function SetupLifecycleReducer(state = initialState, action) {
 	switch (action.type) {
@@ -39,15 +34,6 @@ function SetupLifecycleReducer(state = initialState, action) {
 					enable_anti_tracking,
 					enable_ad_block,
 					enable_smart_block,
-					setup_step: 0
-				}
-			};
-		}
-		case SET_HIGHEST_SETUP_STEP_REACHED: {
-			return {
-				...state,
-				setup: {
-					...{ setup_step: action.data }
 				}
 			};
 		}

src/classes/Metrics.js

@@ -407,6 +407,7 @@ class Metrics {
 	 * @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'