Import flows: Update logic for generating importer URL (unified impor…

…ters) (#85150) * Import flows: Update logic for generating importer URL (unified importers) * Remove unnecessary param
Automattic · Dec 13, 2023 · 589b890 · 589b890
1 parent 2f6c9b9
commit 589b890
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 36 deletions.
diff --git a/...anding/stepper/declarative-flow/internals/steps-repository/import-ready-preview/index.tsx b/...anding/stepper/declarative-flow/internals/steps-repository/import-ready-preview/index.tsx
@@ -2,7 +2,6 @@ import { useSelect } from '@wordpress/data';
 import React, { useEffect } from 'react';
 import { ReadyPreviewStep } from 'calypso/blocks/import/ready';
 import { Step } from 'calypso/landing/stepper/declarative-flow/internals/types';
-import { useSite } from 'calypso/landing/stepper/hooks/use-site';
 import { useSiteSlugParam } from 'calypso/landing/stepper/hooks/use-site-slug-param';
 import { ONBOARD_STORE } from 'calypso/landing/stepper/stores';
 import { recordTracksEvent } from 'calypso/lib/analytics/tracks';
@@ -16,8 +15,6 @@ import type { OnboardSelect } from '@automattic/data-stores';
 const ImportReadyPreview: Step = function ImportStep( props ) {
 	const { navigation } = props;
 	const siteSlug = useSiteSlugParam();
-	const site = useSite();
-	const isAtomicSite = !! site?.options?.is_automated_transfer;
 	const urlData = useSelector( getUrlData );
 	const isMigrateFromWp = useSelect(
 		( select ) => ( select( ONBOARD_STORE ) as OnboardSelect ).getIsMigrateFromWp(),
@@ -51,12 +48,7 @@ const ImportReadyPreview: Step = function ImportStep( props ) {
 			return;
 		}
 
-		const url = getFinalImporterUrl(
-			siteSlug as string,
-			urlData.url,
-			urlData.platform,
-			isAtomicSite
-		);
+		const url = getFinalImporterUrl( siteSlug as string, urlData.url, urlData.platform );
 
 		navigation.submit?.( { url } );
 	}

diff --git a/client/landing/stepper/declarative-flow/internals/steps-repository/import-ready/index.tsx b/client/landing/stepper/declarative-flow/internals/steps-repository/import-ready/index.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import { ReadyStep } from 'calypso/blocks/import/ready';
 import { Step } from 'calypso/landing/stepper/declarative-flow/internals/types';
-import { useSite } from 'calypso/landing/stepper/hooks/use-site';
 import { useSiteSlugParam } from 'calypso/landing/stepper/hooks/use-site-slug-param';
 import { recordTracksEvent } from 'calypso/lib/analytics/tracks';
 import { useSelector } from 'calypso/state';
@@ -13,8 +12,6 @@ import { getFinalImporterUrl } from '../import/helper';
 const ImportReady: Step = function ImportStep( props ) {
 	const { navigation } = props;
 	const siteSlug = useSiteSlugParam();
-	const site = useSite();
-	const isAtomicSite = !! site?.options?.is_automated_transfer;
 	const urlData = useSelector( getUrlData );
 
 	/**
@@ -29,12 +26,7 @@ const ImportReady: Step = function ImportStep( props ) {
 	 ↓ Methods
 	 */
 	const goToImporterPage = () => {
-		const url = getFinalImporterUrl(
-			siteSlug as string,
-			urlData.url,
-			urlData.platform,
-			isAtomicSite
-		);
+		const url = getFinalImporterUrl( siteSlug as string, urlData.url, urlData.platform );
 
 		navigation.submit?.( { url, platform: urlData.platform } );
 	};

diff --git a/client/landing/stepper/declarative-flow/internals/steps-repository/import/helper.ts b/client/landing/stepper/declarative-flow/internals/steps-repository/import/helper.ts
@@ -13,33 +13,24 @@ import { BASE_ROUTE } from './config';
 export function getFinalImporterUrl(
 	targetSlug: string,
 	fromSite: string,
-	platform: ImporterPlatform,
-	isAtomicSite: boolean | null
+	platform: ImporterPlatform
 ) {
 	let importerUrl;
 	const encodedFromSite = encodeURIComponent( fromSite );
-	// Escape WordPress, has two sub-flows "Import everything" and "Content only"
-	// firstly show import type chooser screen and then decide about importer url
-	if ( isAtomicSite && platform !== 'wordpress' ) {
-		importerUrl = getWpOrgImporterUrl( targetSlug, platform );
-	} else if (
-		[ 'blogger', 'medium', 'squarespace', 'wix', 'wordpress' ].some( ( targetPlatform ) => {
-			return (
-				platform === targetPlatform && isEnabled( `onboarding/import-from-${ targetPlatform }` )
-			);
-		} )
-	) {
-		importerUrl = getWpComOnboardingUrl( targetSlug, platform, encodedFromSite );
+	const productImporters = [ 'blogger', 'medium', 'substack', 'squarespace', 'wix', 'wordpress' ];
+
+	if ( productImporters.includes( platform ) ) {
+		importerUrl = isEnabled( `onboarding/import-from-${ platform }` )
+			? getWpComOnboardingUrl( targetSlug, platform, encodedFromSite )
+			: getImporterUrl( targetSlug, platform, encodedFromSite );
 
-		if ( platform === 'wordpress' && ! fromSite && isAtomicSite ) {
-			importerUrl = getWpOrgImporterUrl( targetSlug, platform );
-		} else if ( platform === 'wordpress' && ! fromSite ) {
+		if ( platform === 'wordpress' && ! fromSite ) {
 			importerUrl = addQueryArgs( importerUrl, {
 				option: WPImportOption.CONTENT_ONLY,
 			} );
 		}
 	} else {
-		importerUrl = getImporterUrl( targetSlug, platform, encodedFromSite );
+		importerUrl = getWpOrgImporterUrl( targetSlug, platform );
 	}
 
 	return importerUrl;