Signup: remove removeUnneededSteps (Automattic#35461)

sirino · Aug 28, 2019 · fc3b5c6 · fc3b5c6
1 parent 4b4f323
commit fc3b5c6
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 20 deletions.
diff --git a/client/lib/signup/flow-controller.ts b/client/lib/signup/flow-controller.ts
@@ -32,12 +32,7 @@ import { ProgressState } from 'state/signup/progress/schema';
 import { getSignupProgress } from 'state/signup/progress/selectors';
 import { getSignupDependencyStore } from 'state/signup/dependency-store/selectors';
 import { resetSignup, updateDependencies } from 'state/signup/actions';
-import {
-	completeSignupStep,
-	invalidateStep,
-	processStep,
-	removeUnneededSteps,
-} from 'state/signup/progress/actions';
+import { completeSignupStep, invalidateStep, processStep } from 'state/signup/progress/actions';
 
 interface Dependencies {
 	[other: string]: any;
@@ -359,6 +354,5 @@ export default class SignupFlowController {
 		flows.resetExcludedSteps();
 		this._flowName = flowName;
 		this._flow = flows.getFlow( flowName );
-		this._reduxStore.dispatch( removeUnneededSteps( this._flowName ) );
 	}
 }
diff --git a/client/signup/main.jsx b/client/signup/main.jsx
@@ -57,7 +57,7 @@ import {
 import isUserRegistrationDaysWithinRange from 'state/selectors/is-user-registration-days-within-range';
 import { getSignupDependencyStore } from 'state/signup/dependency-store/selectors';
 import { getSignupProgress } from 'state/signup/progress/selectors';
-import { removeUnneededSteps, submitSignupStep } from 'state/signup/progress/actions';
+import { submitSignupStep } from 'state/signup/progress/actions';
 import { setSurvey } from 'state/signup/steps/survey/actions';
 import { submitSiteType } from 'state/signup/steps/site-type/actions';
 import { submitSiteVertical } from 'state/signup/steps/site-vertical/actions';
@@ -452,7 +452,6 @@ class Signup extends React.Component {
 		const nextStepSection = ( nextProgressItem && nextProgressItem.stepSectionName ) || '';
 
 		if ( nextFlowName !== this.props.flowName ) {
-			this.props.removeUnneededSteps( nextFlowName );
 			this.setState( { previousFlowName: this.props.flowName } );
 		}
 
@@ -634,6 +633,5 @@ export default connect(
 		submitSiteVertical,
 		submitSignupStep,
 		loadTrackingTool,
-		removeUnneededSteps,
 	}
 )( Signup );
diff --git a/client/state/action-types.js b/client/state/action-types.js
@@ -938,7 +938,6 @@ export const SIGNUP_OPTIONAL_DEPENDENCY_SUGGESTED_USERNAME_SET =
 export const SIGNUP_PROGRESS_COMPLETE_STEP = 'SIGNUP_PROGRESS_COMPLETE_STEP';
 export const SIGNUP_PROGRESS_INVALIDATE_STEP = 'SIGNUP_PROGRESS_INVALIDATE_STEP';
 export const SIGNUP_PROGRESS_PROCESS_STEP = 'SIGNUP_PROGRESS_PROCESS_STEP';
-export const SIGNUP_PROGRESS_REMOVE_UNNEEDED_STEPS = 'SIGNUP_PROGRESS_REMOVE_UNNEEDED_STEPS';
 export const SIGNUP_PROGRESS_RESUME_AFTER_LOGIN_SET = 'SIGNUP_PROGRESS_RESUME_AFTER_LOGIN_SET';
 export const SIGNUP_PROGRESS_SAVE_STEP = 'SIGNUP_PROGRESS_SAVE_STEP';
 export const SIGNUP_PROGRESS_SUBMIT_STEP = 'SIGNUP_PROGRESS_SUBMIT_STEP';

diff --git a/client/state/signup/progress/actions.js b/client/state/signup/progress/actions.js
@@ -12,7 +12,6 @@ import {
 	SIGNUP_PROGRESS_COMPLETE_STEP,
 	SIGNUP_PROGRESS_PROCESS_STEP,
 	SIGNUP_PROGRESS_INVALIDATE_STEP,
-	SIGNUP_PROGRESS_REMOVE_UNNEEDED_STEPS,
 	SIGNUP_PROGRESS_RESUME_AFTER_LOGIN_SET,
 } from 'state/action-types';
 import { assertValidDependencies } from 'lib/signup/asserts';
@@ -130,13 +129,6 @@ export function invalidateStep( step, errors ) {
 	};
 }
 
-export function removeUnneededSteps( flowName ) {
-	return {
-		type: SIGNUP_PROGRESS_REMOVE_UNNEEDED_STEPS,
-		flowName,
-	};
-}
-
 export function setResumeAfterLogin( step ) {
 	const lastUpdated = Date.now();
 	return {

diff --git a/client/state/signup/progress/test/reducer.js b/client/state/signup/progress/test/reducer.js
@@ -14,7 +14,7 @@ import {
 	SIGNUP_PROGRESS_SUBMIT_STEP,
 } from 'state/action-types';
 
-// Mock necessary for testing removeUnneededSteps
+// Mock necessary for testing certain utils
 jest.mock( 'signup/config/flows-pure', () => ( {
 	'new-flow': {
 		steps: [ 'something', 'everything' ],