Domain management: Update generate path logic (#98620)

Automattic · Jan 22, 2025 · 693a3cd · 693a3cd
1 parent a16d015
commit 693a3cd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/...nt/my-sites/checkout/checkout-thank-you/redesign-v2/products/google-workspace-product.tsx b/...nt/my-sites/checkout/checkout-thank-you/redesign-v2/products/google-workspace-product.tsx
@@ -1,7 +1,9 @@
 import { Button } from '@wordpress/components';
 import { useTranslate } from 'i18n-calypso';
+import { useSelector } from 'react-redux';
 import ThankYouProduct from 'calypso/components/thank-you-v2/product';
 import { getEmailManagementPath } from 'calypso/my-sites/email/paths';
+import getCurrentRoute from 'calypso/state/selectors/get-current-route';
 
 export type ThankYouGoogleWorkspaceProductProps = {
 	productFamily: string;
@@ -17,7 +19,8 @@ export function ThankYouGoogleWorkspaceProduct( {
 	siteSlug,
 }: ThankYouGoogleWorkspaceProductProps ) {
 	const translate = useTranslate();
-	const emailManagementPath = getEmailManagementPath( siteSlug, domainName );
+	const currentRoute = useSelector( getCurrentRoute );
+	const emailManagementPath = getEmailManagementPath( siteSlug, domainName, currentRoute );
 
 	let details;
 	if ( numberOfMailboxesPurchased && numberOfMailboxesPurchased > 1 ) {

diff --git a/client/my-sites/email/paths.ts b/client/my-sites/email/paths.ts
@@ -1,3 +1,4 @@
+import { isEnabled } from '@automattic/calypso-config';
 import { stringify } from 'qs';
 import {
 	isUnderDomainManagementAll,
@@ -25,6 +26,10 @@ export function isUnderEmailManagementAll( path?: string | null ) {
 	return path?.startsWith( emailManagementAllSitesPrefix + '/' );
 }
 
+export function isUnderCheckoutRoute( path?: string | null ) {
+	return path?.startsWith( '/checkout' );
+}
+
 // Builds a URL query string from an object. Handles null values.
 const buildQueryString = ( parameters?: QueryStringParameters ) =>
 	parameters ? stringify( parameters, { addQueryPrefix: true, skipNulls: true } ) : '';
@@ -173,7 +178,11 @@ export const getEmailManagementPath: EmailPathUtilityFunction = (
 	urlParameters = {},
 	inSiteContext = false
 ) => {
-	if ( inSiteContext || isUnderDomainManagementAll( relativeTo ) ) {
+	if (
+		inSiteContext ||
+		isUnderDomainManagementAll( relativeTo ) ||
+		( isUnderCheckoutRoute( relativeTo ) && isEnabled( 'calypso/all-domain-management' ) )
+	) {
 		const prefix =
 			inSiteContext || isUnderDomainSiteContext( relativeTo )
 				? emailSiteContextPrefix