Skip to content

Display the plans modal in the pull an existing site creation flow #2197

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

Merged
sejas merged 2 commits into from
Dec 5, 2025
Merged

Display the plans modal in the pull an existing site creation flow #2197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
191bcaf
Make selectedSite optional in NoWpcomSitesModal and CreateButton
sejas Dec 5, 2025
7d48c4f
Add purchase plan modal in pull remote site
sejas Dec 5, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/modules/add-site/components/pull-remote-site.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
} from '@wordpress/components';
import { check, Icon } from '@wordpress/icons';
import { useI18n } from '@wordpress/react-i18n';
import { PropsWithChildren } from 'react';
import { PropsWithChildren, useState } from 'react';
import { ArrowIcon } from 'src/components/arrow-icon';
import Button from 'src/components/button';
import offlineIcon from 'src/components/offline-icon';
Expand All @@ -13,6 +13,7 @@ import { useAuth } from 'src/hooks/use-auth';
import { useOffline } from 'src/hooks/use-offline';
import { useSiteDetails } from 'src/hooks/use-site-details';
import { getIpcApi } from 'src/lib/get-ipc-api';
import { NoWpcomSitesModal } from 'src/modules/sync/components/no-wpcom-sites-modal';
import { SitesListContent } from 'src/modules/sync/components/sync-sites-modal-selector';
import { SyncTabImage } from 'src/modules/sync/components/sync-tab-image';
import { useGetConnectedSitesForLocalSiteQuery } from 'src/stores/sync/connected-sites';
Expand Down Expand Up @@ -120,14 +121,19 @@ export function PullRemoteSite( {
} ) {
const { __ } = useI18n();
const { isAuthenticated, user } = useAuth();
const [ isNoWpcomSitesModalClosed, setIsNoWpcomSitesModalClosed ] = useState( false );

const { selectedSite } = useSiteDetails();
const { data: connectedSites = [] } = useGetConnectedSitesForLocalSiteQuery( {
localSiteId: selectedSite?.id,
userId: user?.id,
} );
const connectedSiteIds = connectedSites.map( ( { id } ) => id );
const { data: syncSites = [], isLoading } = useGetWpComSitesQuery(
const {
data: syncSites = [],
isLoading,
isSuccess,
} = useGetWpComSitesQuery(
{
connectedSiteIds,
userId: user?.id,
Expand All @@ -153,6 +159,13 @@ export function PullRemoteSite( {
selectedSiteId={ selectedRemoteSite?.id || null }
onSelectSite={ handleSiteSelect }
/>

{ syncSites.length === 0 && isSuccess && ! isLoading && ! isNoWpcomSitesModalClosed && (
<NoWpcomSitesModal
onRequestClose={ () => setIsNoWpcomSitesModalClosed( true ) }
selectedSite={ undefined }
/>
) }
</VStack>
) : (
<NoAuthPullRemoteSiteView />
Expand Down
31 changes: 22 additions & 9 deletions src/modules/sync/components/create-button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { getIpcApi } from 'src/lib/get-ipc-api';

interface CreateButtonProps {
variant: ButtonVariant;
selectedSite: SiteDetails;
selectedSite?: SiteDetails;
text?: string;
className?: string;
onClick?: () => void;
Expand All @@ -24,6 +24,25 @@ export const CreateButton = ( {
onClick,
}: CreateButtonProps ) => {
const isOffline = useOffline();
function generateCheckoutUrl( selectedSite?: SiteDetails ): string {
const url = new URL(
'https://wordpress.com/setup/new-hosted-site?ref=studio&section=studio-sync&showDomainStep'
);

if ( ! selectedSite ) {
return url.toString();
}

const suggestedName = selectedSite.customDomain
? selectedSite.customDomain.replace( DEFAULT_CUSTOM_DOMAIN_SUFFIX, '' )
: selectedSite.name;

url.searchParams.set( 'studioSiteId', String( selectedSite.id ) );
url.searchParams.set( 'new', suggestedName );

return url.toString();
}

return (
<Tooltip
disabled={ ! isOffline }
Expand All @@ -34,14 +53,8 @@ export const CreateButton = ( {
<Button
onClick={ () => {
onClick?.();
const suggestedName = selectedSite.customDomain
? selectedSite.customDomain.replace( DEFAULT_CUSTOM_DOMAIN_SUFFIX, '' )
: selectedSite.name;
getIpcApi().openURL(
`https://wordpress.com/setup/new-hosted-site?ref=studio&section=studio-sync&showDomainStep&studioSiteId=${
selectedSite.id
}&new=${ encodeURIComponent( suggestedName ) }`
);

getIpcApi().openURL( generateCheckoutUrl( selectedSite ) );
} }
variant={ variant }
className={ cx( ! isOffline && className ) }
Expand Down
2 changes: 1 addition & 1 deletion src/modules/sync/components/no-wpcom-sites-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { CreateButton } from 'src/modules/sync/components/create-button';

interface NoWpcomSitesModalProps {
onRequestClose: () => void;
selectedSite: SiteDetails;
selectedSite?: SiteDetails;
}

export function NoWpcomSitesModal( { onRequestClose, selectedSite }: NoWpcomSitesModalProps ) {
Expand Down