CIAB domain purchasing fixes (#107439)

* Update so WOO_HOSTED trial plans aren't flagged as free

We want to allow users with the ciab trial to perform all domain
operations. This is controlled by a feature flag in case product wants
to change it.

* Update so /ciab respects redirect_to when purchasing a domain

* Fix rebase issue

* Linting

Author: markbiek

client/dashboard/domains/add-domain-button.tsx

@@ -7,9 +7,11 @@ import { wpcomLink } from '../utils/link';
 export function AddDomainButton( {
 	siteSlug,
 	domainConnectionSetupUrl,
+	redirectTo,
 }: {
 	siteSlug?: string;
 	domainConnectionSetupUrl?: string;
+	redirectTo?: string;
 } ) {
 	const buildQueryArgs = () => {
 		const queryArgs: Record< string, string > = {};
@@ -19,6 +21,9 @@ export function AddDomainButton( {
 		if ( domainConnectionSetupUrl ) {
 			queryArgs.domainConnectionSetupUrl = domainConnectionSetupUrl;
 		}
+		if ( redirectTo ) {
+			queryArgs.redirect_to = redirectTo;
+		}
 		return queryArgs;
 	};
 

client/dashboard/sites/domains/index.tsx

@@ -5,6 +5,7 @@ import { filterSortAndPaginate } from '@wordpress/dataviews';
 import { createInterpolateElement } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
 import { useAuth } from '../../app/auth';
+import { useAppContext } from '../../app/context';
 import { usePersistentView } from '../../app/hooks/use-persistent-view';
 import { domainConnectionSetupRoute } from '../../app/router/domains';
 import { siteRoute, siteDomainsRoute, siteSettingsRedirectRoute } from '../../app/router/sites';
@@ -67,6 +68,8 @@ function SiteDomains() {
 		domainConnectionSetupUrlRelativePath,
 		window.location.origin
 	).href;
+	const { basePath } = useAppContext();
+	const redirectTo = `${ basePath }/sites/${ site.slug }/domains`;
 
 	return (
 		<PageLayout
@@ -77,6 +80,7 @@ function SiteDomains() {
 						<AddDomainButton
 							siteSlug={ site.slug }
 							domainConnectionSetupUrl={ domainConnectionSetupUrl }
+							redirectTo={ redirectTo }
 						/>
 					}
 				/>

client/landing/stepper/declarative-flow/flows/domain/domain.ts

@@ -100,9 +100,11 @@ const domain: FlowV2< typeof initialize > = {
 			const hasOnlyDomainConnection =
 				domainCartItems && domainCartItems.length === 1 && isDomainMapping( domainCartItems[ 0 ] );
 
-			let destination = `/v2/sites/${ siteSlug }/domains`;
+			// Use the redirect_to query param if provided, otherwise fall back to v2 domains
+			let destination = redirectTo || `/v2/sites/${ siteSlug }/domains`;
 
-			if ( hasOnlyDomainConnection ) {
+			// But send domain-only connects to domain-connection-setup.
+			if ( ! redirectTo && hasOnlyDomainConnection ) {
 				const domain = domainCartItems[ 0 ].meta;
 				if ( domain ) {
 					destination = `/v2/domains/${ domain }/domain-connection-setup`;
@@ -114,8 +116,10 @@ const domain: FlowV2< typeof initialize > = {
 				addQueryArgs( `/checkout/${ encodeURIComponent( siteSlug ) }`, {
 					redirect_to: destination,
 					signup: 1,
-					cancel_to: new URL( addQueryArgs( '/setup/domain', { siteSlug } ), window.location.href )
-						.href,
+					cancel_to: new URL(
+						addQueryArgs( '/setup/domain', { siteSlug, redirect_to: redirectTo } ),
+						window.location.href
+					).href,
 				} )
 			);
 		};

config/dashboard-development.json

@@ -14,6 +14,7 @@
 	"site_name": "Hosting Dashboard",
 	"features": {
 		"always_use_logout_url": true,
+		"ciab/allow-domain-features": true,
 		"cookie-banner": false,
 		"dashboard": true,
 		"dashboard/v2": false,

config/dashboard-horizon.json

@@ -11,6 +11,7 @@
 	"wpcom_login_url": "https://wordpress.com/log-in",
 	"site_name": "Hosting Dashboard",
 	"features": {
+		"ciab/allow-domain-features": true,
 		"cookie-banner": false,
 		"dashboard": true,
 		"dashboard/v2": false,

config/dashboard-production.json

@@ -11,6 +11,7 @@
 	"wpcom_login_url": "https://wordpress.com/log-in",
 	"site_name": "Hosting Dashboard",
 	"features": {
+		"ciab/allow-domain-features": true,
 		"cookie-banner": true,
 		"dashboard": false,
 		"dashboard/v2": false

config/dashboard-stage.json

@@ -11,6 +11,7 @@
 	"wpcom_login_url": "https://wordpress.com/log-in",
 	"site_name": "Hosting Dashboard",
 	"features": {
+		"ciab/allow-domain-features": true,
 		"cookie-banner": false,
 		"dashboard": true,
 		"dashboard/v2": false

config/development.json

@@ -45,6 +45,7 @@
 		"calypso/domains-dataviews": true,
 		"cancellation-offers": true,
 		"checkout/checkout-version": true,
+		"ciab/allow-domain-features": true,
 		"checkout/ebanx-pix": true,
 		"checkout/google-pay": true,
 		"checkout/razorpay": true,

config/horizon.json

@@ -20,6 +20,7 @@
 		"cancellation-offers": true,
 		"catch-js-errors": true,
 		"checkout/checkout-version": false,
+		"ciab/allow-domain-features": true,
 		"checkout/ebanx-pix": true,
 		"checkout/google-pay": true,
 		"checkout/razorpay": true,

config/production.json

@@ -32,6 +32,7 @@
 		"cancellation-offers": true,
 		"catch-js-errors": true,
 		"checkout/checkout-version": false,
+		"ciab/allow-domain-features": true,
 		"checkout/ebanx-pix": true,
 		"checkout/google-pay": true,
 		"checkout/razorpay": false,