Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stepper: Do not clear flowName in step-route tracker #97369

Merged
merged 9 commits into from
Dec 18, 2024
+31 −24
Merged

Stepper: Do not clear flowName in step-route tracker #97369

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bc1363d
Do not clear flowName in step-route tracker
alshakero Dec 11, 2024
79c815e
Merge branch 'trunk' into fix/#97077
alshakero Dec 11, 2024
f67d062
Merge branch 'trunk' into fix/#97077
alshakero Dec 12, 2024
364bc32
Update tests
alshakero Dec 12, 2024
e46a70f
Merge branch 'fix/#97077' of github.com:Automattic/wp-calypso into fi…
alshakero Dec 12, 2024
b0fe3d0
Merge branch 'trunk' into fix/#97077
alshakero Dec 12, 2024
0ee5829
Merge branch 'trunk' into fix/#97077
alshakero Dec 12, 2024
701c392
Fix contradiction with the domain step
alshakero Dec 12, 2024
793f503
Merge branch 'trunk' into fix/#97077
alshakero Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .../declarative-flow/internals/components/step-route/hooks/use-step-route-tracking/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import kebabCase from 'calypso/landing/stepper/utils/kebabCase';
import useSnakeCasedKeys from 'calypso/landing/stepper/utils/use-snake-cased-keys';
import { recordPageView } from 'calypso/lib/analytics/page-view';
import {
getSignupCompleteFlowNameAndClear,
getSignupCompleteFlowName,
getSignupCompleteStepNameAndClear,
} from 'calypso/signup/storageUtils';
import { useSelector } from 'calypso/state';
Expand Down Expand Up @@ -78,7 +78,7 @@ export const useStepRouteTracking = ( { flow, stepSlug, skipStepRender }: Props
return;
}

const signupCompleteFlowName = getSignupCompleteFlowNameAndClear();
const signupCompleteFlowName = getSignupCompleteFlowName();
const signupCompleteStepName = getSignupCompleteStepNameAndClear();
const isReEnteringStepAfterSignupComplete =
signupCompleteFlowName === flowName && signupCompleteStepName === stepSlug;
Expand Down
10 changes: 5 additions & 5 deletions client/landing/stepper/declarative-flow/internals/components/step-route/test/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { useIntent } from 'calypso/landing/stepper/hooks/use-intent';
import { useSelectedDesign } from 'calypso/landing/stepper/hooks/use-selected-design';
import { recordPageView } from 'calypso/lib/analytics/page-view';
import {
getSignupCompleteFlowNameAndClear,
getSignupCompleteFlowName,
getSignupCompleteStepNameAndClear,
} from 'calypso/signup/storageUtils';
import { isUserLoggedIn } from 'calypso/state/current-user/selectors';
Expand Down Expand Up @@ -171,7 +171,7 @@ describe( 'StepRoute', () => {
} );

it( 'records recordStepStart with additional props when the step is re-entered', () => {
( getSignupCompleteFlowNameAndClear as jest.Mock ).mockReturnValue( 'some-flow' );
( getSignupCompleteFlowName as jest.Mock ).mockReturnValue( 'some-flow' );
( getSignupCompleteStepNameAndClear as jest.Mock ).mockReturnValue( 'some-step-slug' );

render( { step: regularStep } );
Expand All @@ -187,7 +187,7 @@ describe( 'StepRoute', () => {
} );

it( 'records step-complete when the step is unmounted and step-start was previously recorded', () => {
( getSignupCompleteFlowNameAndClear as jest.Mock ).mockReturnValue( 'some-other-flow' );
( getSignupCompleteFlowName as jest.Mock ).mockReturnValue( 'some-other-flow' );
( getSignupCompleteStepNameAndClear as jest.Mock ).mockReturnValue( 'some-other-step-slug' );
const { unmount } = render( { step: regularStep } );

Expand All @@ -206,7 +206,7 @@ describe( 'StepRoute', () => {

it( 'records skip_step_render on start, complete and page view when the login is required and the user is not logged in', async () => {
( isUserLoggedIn as jest.Mock ).mockReturnValue( false );
( getSignupCompleteFlowNameAndClear as jest.Mock ).mockReturnValue( 'some-other-flow' );
( getSignupCompleteFlowName as jest.Mock ).mockReturnValue( 'some-other-flow' );
( getSignupCompleteStepNameAndClear as jest.Mock ).mockReturnValue( 'some-other-step-slug' );

const { unmount } = render( { step: requiresLoginStep } );
Expand Down Expand Up @@ -241,7 +241,7 @@ describe( 'StepRoute', () => {
} );

it( 'records skip_step_render on start, complete and page view when renderStep returns null', async () => {
( getSignupCompleteFlowNameAndClear as jest.Mock ).mockReturnValue( 'some-other-flow' );
( getSignupCompleteFlowName as jest.Mock ).mockReturnValue( 'some-other-flow' );
( getSignupCompleteStepNameAndClear as jest.Mock ).mockReturnValue( 'some-other-step-slug' );
const { unmount } = render( { step: regularStep, renderStep: () => null } );

Expand Down
Loading