Skip to content

Commit 82cdebd

Browse files
taipeicodertaipeicoder
committed
Rename designSetup step to design-setup
1 parent 640a867 commit 82cdebd

File tree

22 files changed

+38
-37
lines changed

22 files changed

+38
-37
lines changed

‎client/blocks/importer/blogger/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export const BloggerImporter: React.FunctionComponent< ImporterBaseProps > = ( p
8787
function onSiteViewClick() {
8888
if ( isEnabled( 'onboarding/import-redirect-to-themes' ) ) {
8989
recordTracksEvent( 'calypso_site_importer_pick_a_design' );
90-
stepNavigator?.navigate?.( 'designSetup' );
90+
stepNavigator?.navigate?.( 'design-setup' );
9191
} else {
9292
recordTracksEvent( 'calypso_site_importer_view_site' );
9393
stepNavigator?.goToSiteViewPage?.();

‎client/blocks/importer/medium/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export const MediumImporter: React.FunctionComponent< ImporterBaseProps > = ( pr
8787
function onSiteViewClick() {
8888
if ( isEnabled( 'onboarding/import-redirect-to-themes' ) ) {
8989
recordTracksEvent( 'calypso_site_importer_pick_a_design' );
90-
stepNavigator?.navigate?.( 'designSetup' );
90+
stepNavigator?.navigate?.( 'design-setup' );
9191
} else {
9292
recordTracksEvent( 'calypso_site_importer_view_site' );
9393
stepNavigator?.goToSiteViewPage?.();

‎client/blocks/importer/squarespace/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export const SquarespaceImporter: React.FunctionComponent< ImporterBaseProps > =
8787
function onSiteViewClick() {
8888
if ( isEnabled( 'onboarding/import-redirect-to-themes' ) ) {
8989
recordTracksEvent( 'calypso_site_importer_pick_a_design' );
90-
stepNavigator?.navigate?.( 'designSetup' );
90+
stepNavigator?.navigate?.( 'design-setup' );
9191
} else {
9292
recordTracksEvent( 'calypso_site_importer_view_site' );
9393
stepNavigator?.goToSiteViewPage?.();

‎client/blocks/importer/wix/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ export const WixImporter: React.FunctionComponent< Props > = ( props ) => {
121121
function onSiteViewClick() {
122122
if ( isEnabled( 'onboarding/import-redirect-to-themes' ) ) {
123123
recordTracksEvent( 'calypso_site_importer_pick_a_design' );
124-
stepNavigator?.navigate?.( 'designSetup' );
124+
stepNavigator?.navigate?.( 'design-setup' );
125125
} else {
126126
recordTracksEvent( 'calypso_site_importer_view_site' );
127127
stepNavigator?.goToSiteViewPage?.();

‎client/blocks/importer/wordpress/import-content-only/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ const ImportContentOnly: React.FunctionComponent< Props > = ( props ) => {
113113
job?.importerFileType !== 'playground' &&
114114
isEnabled( 'onboarding/import-redirect-to-themes' )
115115
) {
116-
stepNavigator?.navigate?.( 'designSetup' );
116+
stepNavigator?.navigate?.( 'design-setup' );
117117
} else {
118118
stepNavigator?.goToSiteViewPage?.();
119119
}

‎client/landing/stepper/declarative-flow/design-first.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ const designFirst: Flow = {
124124
] );
125125

126126
return window.location.assign(
127-
addQueryArgs( `/setup/update-design/designSetup`, {
127+
addQueryArgs( `/setup/update-design/design-setup`, {
128128
siteSlug: providedDependencies?.siteSlug,
129129
flowToReturnTo: DESIGN_FIRST_FLOW,
130130
theme: getQueryArg( window.location.href, 'theme' ),
@@ -163,7 +163,7 @@ const designFirst: Flow = {
163163
}
164164

165165
return window.location.assign(
166-
addQueryArgs( `/setup/update-design/designSetup`, {
166+
addQueryArgs( `/setup/update-design/design-setup`, {
167167
siteSlug: siteSlug,
168168
flowToReturnTo: flowName,
169169
theme: getQueryArg( window.location.href, 'theme' ),

‎client/landing/stepper/declarative-flow/helpers/get-step-old-slug.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
export const getStepOldSlug = ( stepSlug: string ): string | undefined => {
55
const stepSlugMap: Record< string, string > = {
66
'create-site': 'site-creation-step',
7+
'design-setup': 'designSetup',
78
};
89

910
return stepSlugMap[ stepSlug ];

‎client/landing/stepper/declarative-flow/import-flow.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ const importFlow: Flow = {
169169
}
170170
}
171171

172-
case 'designSetup': {
172+
case 'design-setup': {
173173
return navigate( 'processing' );
174174
}
175175

@@ -305,7 +305,7 @@ const importFlow: Flow = {
305305
case 'importReadyNot':
306306
case 'importReadyWpcom':
307307
case 'importReadyPreview':
308-
case 'designSetup':
308+
case 'design-setup':
309309
return navigate( `import?siteSlug=${ siteSlugParam }` );
310310

311311
case 'verifyEmail':

‎client/landing/stepper/declarative-flow/internals/steps-repository/blogger-starting-point/starting-points.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const useStartingPoints = () => {
2626
title: translate( 'Choose a design' ),
2727
description: <p>{ translate( 'Make your blog feel like home' ) }</p>,
2828
icon: design,
29-
value: 'designSetup',
29+
value: 'design-setup',
3030
actionText: translate( 'View designs' ),
3131
},
3232
];

‎client/landing/stepper/declarative-flow/internals/steps-repository/design-choices/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ const DesignChoicesStep: Step = ( { navigation, flow, stepName } ) => {
138138
title={ translate( 'Choose a theme' ) }
139139
description={ translate( 'Choose one of our professionally designed themes.' ) }
140140
imageSrc={ themesIllustrationImage }
141-
destination="designSetup"
141+
destination="design-setup"
142142
onSelect={ handleSubmit }
143143
/>
144144
) : (
@@ -148,7 +148,7 @@ const DesignChoicesStep: Step = ( { navigation, flow, stepName } ) => {
148148
'Choose a professionally designed theme and make it yours.'
149149
) }
150150
fgImageSrc={ themeChoiceFg }
151-
destination="designSetup"
151+
destination="design-setup"
152152
onSelect={ handleSubmit }
153153
/>
154154
) }

‎client/landing/stepper/declarative-flow/internals/steps-repository/design-setup/test/unified-design-picker.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ const renderComponent = ( component, initialState = {} ) => {
101101
...initialState,
102102
} );
103103

104-
const initialEntries = [ `/setup/site-setup/designSetup?siteSlug=test.wordpress.com` ];
104+
const initialEntries = [ `/setup/site-setup/design-setup?siteSlug=test.wordpress.com` ];
105105

106106
return render(
107107
<Provider store={ store }>

‎client/landing/stepper/declarative-flow/internals/steps-repository/import-light/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ const ImportLight: Step = function ImportStep( props ) {
112112
return (
113113
<Summary
114114
colorsNum={ colors.length }
115-
onContinueClick={ () => navigation.goToStep?.( 'designSetup' ) }
115+
onContinueClick={ () => navigation.goToStep?.( 'design-setup' ) }
116116
/>
117117
);
118118

‎client/landing/stepper/declarative-flow/internals/steps.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export const STEPS = {
2929
},
3030

3131
DESIGN_SETUP: {
32-
slug: 'designSetup',
32+
slug: 'design-setup',
3333
asyncComponent: () => import( './steps-repository/design-setup' ),
3434
},
3535

‎client/landing/stepper/declarative-flow/onboarding.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,12 +222,12 @@ const onboarding: Flow = {
222222
if ( isDesignChoicesStepEnabled ) {
223223
return navigate( 'design-choices' );
224224
}
225-
return navigate( 'designSetup' );
225+
return navigate( 'design-setup' );
226226
}
227227
}
228228
}
229229

230-
case 'designSetup': {
230+
case 'design-setup': {
231231
return navigate( 'domains' );
232232
}
233233

@@ -424,9 +424,9 @@ const onboarding: Flow = {
424424
if ( isBigSkyBeforePlansExperiment && createWithBigSky ) {
425425
return navigate( 'design-choices' );
426426
}
427-
return navigate( 'designSetup' );
427+
return navigate( 'design-setup' );
428428
}
429-
case 'designSetup':
429+
case 'design-setup':
430430
if ( isDesignChoicesStepEnabled ) {
431431
return navigate( 'design-choices' );
432432
}

‎client/landing/stepper/declarative-flow/site-setup-flow.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -260,12 +260,12 @@ const siteSetupFlow: FlowV1 = {
260260
*
261261
* Instead of having the user manually choose between "Start simple" and "More power", we let them select a theme and use the theme choice to determine which path to take.
262262
*/
263-
return navigate( 'designSetup' );
263+
return navigate( 'design-setup' );
264264
}
265265
return navigate( 'bloggerStartingPoint' );
266266
}
267267

268-
case 'designSetup': {
268+
case 'design-setup': {
269269
return navigate( 'processing' );
270270
}
271271

@@ -344,7 +344,7 @@ const siteSetupFlow: FlowV1 = {
344344
if ( isDesignChoicesStepEnabled ) {
345345
return navigate( 'design-choices' );
346346
}
347-
return navigate( 'designSetup' );
347+
return navigate( 'design-setup' );
348348
}
349349
}
350350
}
@@ -368,7 +368,7 @@ const siteSetupFlow: FlowV1 = {
368368
return exitFlow( `https://wordpress.com/home/${ siteId ?? siteSlug }` );
369369
}
370370
case 'build': {
371-
return navigate( 'designSetup' );
371+
return navigate( 'design-setup' );
372372
}
373373
case 'sell': {
374374
return navigate( 'options' );
@@ -497,7 +497,7 @@ const siteSetupFlow: FlowV1 = {
497497
case 'courses':
498498
return navigate( 'bloggerStartingPoint' );
499499

500-
case 'designSetup':
500+
case 'design-setup':
501501
if ( intent === SiteIntent.DIFM ) {
502502
return navigate( 'difmStartingPoint' );
503503
}
@@ -580,7 +580,7 @@ const siteSetupFlow: FlowV1 = {
580580
switch ( currentStep ) {
581581
case 'options':
582582
if ( intent === 'sell' ) {
583-
return navigate( 'designSetup' );
583+
return navigate( 'design-setup' );
584584
}
585585
return navigate( 'bloggerStartingPoint' );
586586

@@ -591,7 +591,7 @@ const siteSetupFlow: FlowV1 = {
591591
return navigate( 'importList' );
592592

593593
case 'difmStartingPoint':
594-
return navigate( 'designSetup' );
594+
return navigate( 'design-setup' );
595595

596596
default:
597597
return navigate( 'intent' );

‎client/landing/stepper/declarative-flow/test/onboarding-flow.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ describe( 'Onboarding Flow', () => {
7878
expect( getFlowLocation().path ).toBe( '/difmStartingPoint' );
7979
} );
8080

81-
it( 'should navigate to designSetup step for other intents', async () => {
81+
it( 'should navigate to design-setup step for other intents', async () => {
8282
const { runUseStepNavigationSubmit } = renderFlow( onboarding );
8383

8484
runUseStepNavigationSubmit( {
@@ -88,7 +88,7 @@ describe( 'Onboarding Flow', () => {
8888
},
8989
} );
9090

91-
expect( getFlowLocation().path ).toBe( '/designSetup' );
91+
expect( getFlowLocation().path ).toBe( '/design-setup' );
9292
} );
9393
} );
9494
} );

‎client/landing/stepper/declarative-flow/update-design.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ const updateDesign: Flow = {
7979
} )
8080
);
8181

82-
case 'designSetup':
82+
case 'design-setup':
8383
if ( providedDependencies?.goToCheckout ) {
8484
const destination = `/setup/${ flowToReturnTo }/launchpad?siteSlug=${ providedDependencies.siteSlug }`;
8585
persistSignupDestination( destination );

‎client/my-sites/customer-home/cards/launchpad/test/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ const DEFAULT_TAKS_RESPONSE = {
8383
subtitle: '',
8484
badge_text: '',
8585
isLaunchTask: false,
86-
calypso_path: '/setup/update-design/designSetup?siteSlug=gabrielcaires0.wordpress.com',
86+
calypso_path: '/setup/update-design/design-setup?siteSlug=gabrielcaires0.wordpress.com',
8787
},
8888
],
8989
is_enabled: false,

‎client/my-sites/themes/theme-options.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ function getAllThemeOptions( { translate, isFSEActive, isGlobalStylesOnPersonal
191191
const slug = getSiteSlug( state, siteId );
192192

193193
const redirectTo = encodeURIComponent(
194-
addQueryArgs( `${ origin }/setup/site-setup/designSetup`, {
194+
addQueryArgs( `${ origin }/setup/site-setup/design-setup`, {
195195
siteSlug: slug,
196196
theme: themeId,
197197
style_variation: options?.styleVariationSlug,

‎client/signup/config/flows.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ function getWithThemeDestination( {
145145
! cartItems &&
146146
[ DOT_ORG_THEME, PREMIUM_THEME, MARKETPLACE_THEME, BUNDLED_THEME ].includes( themeType )
147147
) {
148-
return `/setup/site-setup/designSetup?siteSlug=${ siteSlug }`;
148+
return `/setup/site-setup/design-setup?siteSlug=${ siteSlug }`;
149149
}
150150

151151
if ( DOT_ORG_THEME === themeType ) {
@@ -158,7 +158,7 @@ function getWithThemeDestination( {
158158
return `/marketplace/thank-you/${ siteSlug }?onboarding=&themes=${ themeParameter }${ style }`;
159159
}
160160

161-
return `/setup/site-setup/designSetup?siteSlug=${ siteSlug }&theme=${ themeParameter }${ style }`;
161+
return `/setup/site-setup/design-setup?siteSlug=${ siteSlug }&theme=${ themeParameter }${ style }`;
162162
}
163163

164164
function getWithPluginDestination( { siteSlug, pluginParameter, pluginBillingPeriod } ) {

‎packages/calypso-e2e/src/lib/flows/start-site-flow.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export type StepName =
99
| 'goals'
1010
| 'vertical'
1111
| 'intent'
12-
| 'designSetup'
12+
| 'design-setup'
1313
| 'options'
1414
| 'designChoices';
1515
type WriteActions = 'Start writing' | 'Start learning' | 'View designs';
@@ -79,7 +79,7 @@ export class StartSiteFlow {
7979
return 'intent';
8080
}
8181
if ( ( await this.page.locator( selectors.themePickerContainer ).count() ) > 0 ) {
82-
return 'designSetup';
82+
return 'design-setup';
8383
}
8484
if ( ( await this.page.locator( selectors.optionsStepContainer ).count() ) > 0 ) {
8585
return 'options';
@@ -165,7 +165,7 @@ export class StartSiteFlow {
165165
await this.page.waitForURL( /setup\/site-setup\/courses/ );
166166
}
167167
if ( action === 'View designs' ) {
168-
await this.page.waitForURL( /setup\/site-setup\/designSetup/ );
168+
await this.page.waitForURL( /setup\/site-setup\/design-setup/ );
169169
}
170170
}
171171

‎packages/launchpad/src/msw/setup-free.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export default {
3636
subtitle: '',
3737
badge_text: '',
3838
isLaunchTask: false,
39-
calypso_path: '/setup/update-design/designSetup?siteSlug=site62798.wordpress.com',
39+
calypso_path: '/setup/update-design/design-setup?siteSlug=site62798.wordpress.com',
4040
},
4141
{
4242
id: 'domain_upsell',

0 commit comments

Comments
 (0)