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.

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

Site Migration: Show the correct landing page when users ask for help #98092

Merged
merged 3 commits into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { recordTracksEvent } from '@automattic/calypso-analytics';
import { useLocale } from '@automattic/i18n-utils';
import { StepContainer } from '@automattic/onboarding';
import { translate, useTranslate } from 'i18n-calypso';
import { useMemo, useEffect } from 'react';
import { useSearchParams } from 'react-router-dom';
import FormattedHeader from 'calypso/components/formatted-header';
import { useSiteSlugParam } from 'calypso/landing/stepper/hooks/use-site-slug-param';
Expand All @@ -9,8 +11,8 @@ import { useSelector } from 'calypso/state';
import { getCurrentUser } from 'calypso/state/current-user/selectors';
import FlowCard from '../components/flow-card';
import { redirect } from '../import/util';
import { useSubmitMigrationTicket } from '../importer-migrate-message/hooks/use-submit-migration-ticket';
Copy link
Contributor

@andres-blanco andres-blanco Jan 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we extract this hook to a more general location? we might end up using it in different contexts, for example: p1737039155741989-slack-C0Q664T29

Copy link
Contributor

@andres-blanco andres-blanco Jan 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be tackled in a new PR so we can submit the fix faster.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR #98502

import type { Step } from '../../types';

import './style.scss';

const StepContent = () => {
Expand Down Expand Up @@ -42,35 +44,56 @@ export const SiteMigrationSupportInstructions: Step = ( { stepName } ) => {
const user = useSelector( getCurrentUser ) as UserData;
const [ query ] = useSearchParams();
const variation = query.get( 'variation' ) || 'default';
const siteSlug = query.get( 'siteSlug' ) || '';
const fromUrl = query.get( 'from' ) || '';
const locale = useLocale();

const contentVariation = {
default: translate(
'We apologize for the problems you’re running into. Our Happiness Engineers will reach out to you shortly at {{strong}}%(email)s{{/strong}} to help you figure out your next steps together.',
{
args: {
email: user.email!,
},
components: {
strong: <strong />,
},
}
),
goals_shared: translate(
'Thanks for sharing your goals. Our Happiness Engineers will reach out to you shortly at {{strong}}%(email)s{{/strong}} to help you figure out your next steps together.',
{
args: {
email: user.email!,
},
components: {
strong: <strong />,
},
}
),
};
const contentVariation = useMemo(
() => ( {
default: translate(
'We apologize for the problems you’re running into. Our Happiness Engineers will reach out to you shortly at {{strong}}%(email)s{{/strong}} to help you figure out your next steps together.',
{
args: {
email: user.email!,
},
components: {
strong: <strong />,
},
}
),
goals_shared: translate(
'Thanks for sharing your goals. Our Happiness Engineers will reach out to you shortly at {{strong}}%(email)s{{/strong}} to help you figure out your next steps together.',
{
args: {
email: user.email!,
},
components: {
strong: <strong />,
},
}
),
} ),
[ user.email, translate ]
);

const content =
contentVariation[ variation as keyof typeof contentVariation ] ?? contentVariation.default;

const { sendTicket } = useSubmitMigrationTicket();

useEffect( () => {
recordTracksEvent( 'wpcom_support_free_migration_request_click', {
path: window.location.pathname,
automated_migration: true,
} );

sendTicket( {
locale,
blog_url: siteSlug,
from_url: fromUrl,
} );
}, [ sendTicket, locale, siteSlug, fromUrl ] );

return (
<StepContainer
stepName={ stepName }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ const siteMigration: Flow = {
STEPS.SITE_MIGRATION_ALREADY_WPCOM,
STEPS.SITE_MIGRATION_OTHER_PLATFORM_DETECTED_IMPORT,
STEPS.SITE_MIGRATION_APPLICATION_PASSWORD_AUTHORIZATION,
STEPS.SITE_MIGRATION_SUPPORT_INSTRUCTIONS,
];

const hostedVariantSteps = isHostedSiteMigrationFlow( this.variantSlug ?? FLOW_NAME )
Expand Down Expand Up @@ -516,7 +517,7 @@ const siteMigration: Flow = {
return navigate(
addQueryArgs(
{ siteId, from: fromQueryParam, siteSlug },
STEPS.SITE_MIGRATION_ASSISTED_MIGRATION.slug
STEPS.SITE_MIGRATION_SUPPORT_INSTRUCTIONS.slug
)
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ describe( 'Site Migration Flow', () => {
expect( getFlowLocation() ).toEqual( {
path: addQueryArgs(
{ siteId: 123, from: 'oldsite.com', siteSlug: 'example.wordpress.com' },
`/${ STEPS.SITE_MIGRATION_ASSISTED_MIGRATION.slug }`
`/${ STEPS.SITE_MIGRATION_SUPPORT_INSTRUCTIONS.slug }`
),
state: null,
} );
Expand Down
Loading