Merge branch 'trunk' into update/stats_set_last_xxx_days_end_yesterday

Automattic · Nov 28, 2024 · 7a3ed16 · 7a3ed16
2 parents d71ea24 + 3db330b
commit 7a3ed16
Show file tree

Hide file tree

Showing 33 changed files with 1,028 additions and 501 deletions.
diff --git a/client/components/panel/style.scss b/client/components/panel/style.scss
@@ -18,6 +18,10 @@
 		padding: 0;
 	}
 
+	.upsell-nudge {
+		width: 100%;
+	}
+
 	// TODO: remove after the untangling/hosting-menu flag is enabled
 	#primary > & {
 		margin-left: auto;

diff --git a/client/hosting/deployments/index.tsx b/client/hosting/deployments/index.tsx
@@ -1,4 +1,5 @@
-import page from '@automattic/calypso-router';
+import { isEnabled } from '@automattic/calypso-config';
+import page, { type Context } from '@automattic/calypso-router';
 import {
 	makeLayout,
 	render as clientRender,
@@ -18,51 +19,70 @@ import {
 export default function () {
 	page( '/github-deployments', siteSelection, sites, makeLayout, clientRender );
 
-	page(
-		'/github-deployments/:site',
-		siteSelection,
-		redirectToHostingPromoIfNotAtomic,
-		redirectHomeIfIneligible,
-		navigation,
-		deploymentsList,
-		siteDashboard( DOTCOM_GITHUB_DEPLOYMENTS ),
-		makeLayout,
-		clientRender
-	);
+	if ( isEnabled( 'untangling/hosting-menu' ) ) {
+		page( '/github-deployments/:site', ( context: Context ) => {
+			page.redirect( `/sites/tools/deployments/${ context.params.site }` );
+		} );
+		page( '/github-deployments/:site/create', ( context: Context ) => {
+			page.redirect( `/sites/tools/deployments/${ context.params.site }/create` );
+		} );
+		page( '/github-deployments/:site/manage/:deploymentId', ( context: Context ) => {
+			page.redirect(
+				`/sites/tools/deployments/${ context.params.site }/manage/${ context.params.deploymentId }`
+			);
+		} );
+		page( '/github-deployments/:site/logs/:deploymentId', ( context: Context ) => {
+			page.redirect(
+				`/sites/tools/deployments/${ context.params.site }/logs/${ context.params.deploymentId }`
+			);
+		} );
+	} else {
+		page(
+			'/github-deployments/:site',
+			siteSelection,
+			redirectToHostingPromoIfNotAtomic,
+			redirectHomeIfIneligible,
+			navigation,
+			deploymentsList,
+			siteDashboard( DOTCOM_GITHUB_DEPLOYMENTS ),
+			makeLayout,
+			clientRender
+		);
 
-	page(
-		'/github-deployments/:site/create',
-		siteSelection,
-		redirectToHostingPromoIfNotAtomic,
-		redirectHomeIfIneligible,
-		navigation,
-		deploymentCreation,
-		siteDashboard( DOTCOM_GITHUB_DEPLOYMENTS ),
-		makeLayout,
-		clientRender
-	);
+		page(
+			'/github-deployments/:site/create',
+			siteSelection,
+			redirectToHostingPromoIfNotAtomic,
+			redirectHomeIfIneligible,
+			navigation,
+			deploymentCreation,
+			siteDashboard( DOTCOM_GITHUB_DEPLOYMENTS ),
+			makeLayout,
+			clientRender
+		);
 
-	page(
-		'/github-deployments/:site/manage/:deploymentId',
-		siteSelection,
-		redirectToHostingPromoIfNotAtomic,
-		redirectHomeIfIneligible,
-		navigation,
-		deploymentManagement,
-		siteDashboard( DOTCOM_GITHUB_DEPLOYMENTS ),
-		makeLayout,
-		clientRender
-	);
+		page(
+			'/github-deployments/:site/manage/:deploymentId',
+			siteSelection,
+			redirectToHostingPromoIfNotAtomic,
+			redirectHomeIfIneligible,
+			navigation,
+			deploymentManagement,
+			siteDashboard( DOTCOM_GITHUB_DEPLOYMENTS ),
+			makeLayout,
+			clientRender
+		);
 
-	page(
-		'/github-deployments/:site/logs/:deploymentId',
-		siteSelection,
-		redirectToHostingPromoIfNotAtomic,
-		redirectHomeIfIneligible,
-		navigation,
-		deploymentRunLogs,
-		siteDashboard( DOTCOM_GITHUB_DEPLOYMENTS ),
-		makeLayout,
-		clientRender
-	);
+		page(
+			'/github-deployments/:site/logs/:deploymentId',
+			siteSelection,
+			redirectToHostingPromoIfNotAtomic,
+			redirectHomeIfIneligible,
+			navigation,
+			deploymentRunLogs,
+			siteDashboard( DOTCOM_GITHUB_DEPLOYMENTS ),
+			makeLayout,
+			clientRender
+		);
+	}
 }
diff --git a/client/hosting/hosting-features/index.tsx b/client/hosting/hosting-features/index.tsx
@@ -1,3 +1,4 @@
+import { isEnabled } from '@automattic/calypso-config';
 import page, { Context as PageJSContext } from '@automattic/calypso-router';
 import { addQueryArgs } from '@wordpress/url';
 import { makeLayout, render as clientRender, redirectIfP2 } from 'calypso/controller';
@@ -18,15 +19,22 @@ const redirectForNonSimpleSite = ( context: PageJSContext, next: () => void ) =>
 
 export default function () {
 	page( '/hosting-features', siteSelection, sites, makeLayout, clientRender );
-	page(
-		'/hosting-features/:site',
-		siteSelection,
-		navigation,
-		redirectForNonSimpleSite,
-		redirectIfP2,
-		hostingFeatures,
-		siteDashboard( DOTCOM_HOSTING_FEATURES ),
-		makeLayout,
-		clientRender
-	);
+
+	if ( isEnabled( 'untangling/hosting-menu' ) ) {
+		page( '/hosting-features/:site', ( context: PageJSContext ) => {
+			page.redirect( `/sites/tools/${ context.params.site }` );
+		} );
+	} else {
+		page(
+			'/hosting-features/:site',
+			siteSelection,
+			navigation,
+			redirectForNonSimpleSite,
+			redirectIfP2,
+			hostingFeatures,
+			siteDashboard( DOTCOM_HOSTING_FEATURES ),
+			makeLayout,
+			clientRender
+		);
+	}
 }
diff --git a/client/hosting/logs/index.tsx b/client/hosting/logs/index.tsx
@@ -1,4 +1,5 @@
-import page, { type Callback } from '@automattic/calypso-router';
+import { isEnabled } from '@automattic/calypso-config';
+import page, { type Callback, type Context } from '@automattic/calypso-router';
 import {
 	makeLayout,
 	render as clientRender,
@@ -16,31 +17,40 @@ import { phpErrorLogs, webServerLogs } from './controller';
 export default function () {
 	page( '/site-logs', siteSelection, sites, makeLayout, clientRender );
 
-	const redirectSiteLogsToPhp: Callback = ( context ) => {
-		context.page.replace( `/site-logs/${ context.params.site }/php` );
-	};
-	page( '/site-logs/:site', redirectSiteLogsToPhp );
+	if ( isEnabled( 'untangling/hosting-menu' ) ) {
+		page( '/site-logs/:site', ( context: Context ) => {
+			page.redirect( `/sites/tools/logs/${ context.params.site }` );
+		} );
+		page( '/site-logs/:site/:type', ( context: Context ) => {
+			page.redirect( `/sites/tools/logs/${ context.params.site }/${ context.params.type }` );
+		} );
+	} else {
+		const redirectSiteLogsToPhp: Callback = ( context ) => {
+			context.page.replace( `/site-logs/${ context.params.site }/php` );
+		};
+		page( '/site-logs/:site', redirectSiteLogsToPhp );
 
-	page(
-		'/site-logs/:site/php',
-		siteSelection,
-		redirectToHostingPromoIfNotAtomic,
-		redirectHomeIfIneligible,
-		navigation,
-		phpErrorLogs,
-		siteDashboard( DOTCOM_LOGS_PHP ),
-		makeLayout,
-		clientRender
-	);
-	page(
-		'/site-logs/:site/web',
-		siteSelection,
-		redirectToHostingPromoIfNotAtomic,
-		redirectHomeIfIneligible,
-		navigation,
-		webServerLogs,
-		siteDashboard( DOTCOM_LOGS_WEB ),
-		makeLayout,
-		clientRender
-	);
+		page(
+			'/site-logs/:site/php',
+			siteSelection,
+			redirectToHostingPromoIfNotAtomic,
+			redirectHomeIfIneligible,
+			navigation,
+			phpErrorLogs,
+			siteDashboard( DOTCOM_LOGS_PHP ),
+			makeLayout,
+			clientRender
+		);
+		page(
+			'/site-logs/:site/web',
+			siteSelection,
+			redirectToHostingPromoIfNotAtomic,
+			redirectHomeIfIneligible,
+			navigation,
+			webServerLogs,
+			siteDashboard( DOTCOM_LOGS_WEB ),
+			makeLayout,
+			clientRender
+		);
+	}
 }
diff --git a/client/hosting/monitoring/index.tsx b/client/hosting/monitoring/index.tsx
@@ -1,4 +1,5 @@
-import page from '@automattic/calypso-router';
+import { isEnabled } from '@automattic/calypso-config';
+import page, { type Context } from '@automattic/calypso-router';
 import {
 	makeLayout,
 	render as clientRender,
@@ -12,15 +13,21 @@ import { redirectHomeIfIneligible, siteMonitoring } from './controller';
 export default function () {
 	page( '/site-monitoring', siteSelection, sites, makeLayout, clientRender );
 
-	page(
-		'/site-monitoring/:site',
-		siteSelection,
-		redirectToHostingPromoIfNotAtomic,
-		redirectHomeIfIneligible,
-		navigation,
-		siteMonitoring,
-		siteDashboard( DOTCOM_MONITORING ),
-		makeLayout,
-		clientRender
-	);
+	if ( isEnabled( 'untangling/hosting-menu' ) ) {
+		page( '/site-monitoring/:site', ( context: Context ) => {
+			page.redirect( `/sites/tools/monitoring/${ context.params.site }` );
+		} );
+	} else {
+		page(
+			'/site-monitoring/:site',
+			siteSelection,
+			redirectToHostingPromoIfNotAtomic,
+			redirectHomeIfIneligible,
+			navigation,
+			siteMonitoring,
+			siteDashboard( DOTCOM_MONITORING ),
+			makeLayout,
+			clientRender
+		);
+	}
 }
diff --git a/client/hosting/overview/index.tsx b/client/hosting/overview/index.tsx
@@ -1,4 +1,5 @@
-import page from '@automattic/calypso-router';
+import { isEnabled } from '@automattic/calypso-config';
+import page, { Context as PageJSContext } from '@automattic/calypso-router';
 import {
 	makeLayout,
 	render as clientRender,
@@ -18,50 +19,63 @@ import { hostingOverview, hostingConfiguration, hostingActivate } from './contro
 
 export default function () {
 	page( '/overview', siteSelection, sites, makeLayout, clientRender );
-	page(
-		'/overview/:site',
-		siteSelection,
-		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-		// @ts-ignore
-		redirectIfCurrentUserCannot( 'manage_options' ),
-		redirectIfP2,
-		redirectIfJetpackNonAtomic,
-		navigation,
-		hostingOverview,
-		siteDashboard( DOTCOM_OVERVIEW ),
-		makeLayout,
-		clientRender
-	);
+
+	if ( isEnabled( 'untangling/hosting-menu' ) ) {
+		page( '/overview/:site', ( context: PageJSContext ) => {
+			page.redirect( `/sites/overview/${ context.params.site }` );
+		} );
+	} else {
+		page(
+			'/overview/:site',
+			siteSelection,
+			// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+			// @ts-ignore
+			redirectIfCurrentUserCannot( 'manage_options' ),
+			redirectIfP2,
+			redirectIfJetpackNonAtomic,
+			navigation,
+			hostingOverview,
+			siteDashboard( DOTCOM_OVERVIEW ),
+			makeLayout,
+			clientRender
+		);
+	}
 
 	page( '/hosting-config', siteSelection, sites, makeLayout, clientRender );
 
-	page(
-		'/hosting-config/:site_id',
-		siteSelection,
-		navigation,
-		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-		// @ts-ignore
-		redirectIfCurrentUserCannot( 'manage_options' ),
-		redirectToHostingPromoIfNotAtomic,
-		handleHostingPanelRedirect,
-		hostingConfiguration,
-		siteDashboard( DOTCOM_HOSTING_CONFIG ),
-		makeLayout,
-		clientRender
-	);
+	if ( isEnabled( 'untangling/hosting-menu' ) ) {
+		page( '/hosting-config/:site', ( context: PageJSContext ) => {
+			page.redirect( `/sites/tools/${ context.params.site }` );
+		} );
+	} else {
+		page(
+			'/hosting-config/:site_id',
+			siteSelection,
+			navigation,
+			// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+			// @ts-ignore
+			redirectIfCurrentUserCannot( 'manage_options' ),
+			redirectToHostingPromoIfNotAtomic,
+			handleHostingPanelRedirect,
+			hostingConfiguration,
+			siteDashboard( DOTCOM_HOSTING_CONFIG ),
+			makeLayout,
+			clientRender
+		);
 
-	page(
-		'/hosting-config/activate/:site_id',
-		siteSelection,
-		navigation,
-		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-		// @ts-ignore
-		redirectIfCurrentUserCannot( 'manage_options' ),
-		redirectToHostingPromoIfNotAtomic,
-		handleHostingPanelRedirect,
-		hostingActivate,
-		siteDashboard( DOTCOM_HOSTING_CONFIG ),
-		makeLayout,
-		clientRender
-	);
+		page(
+			'/hosting-config/activate/:site_id',
+			siteSelection,
+			navigation,
+			// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+			// @ts-ignore
+			redirectIfCurrentUserCannot( 'manage_options' ),
+			redirectToHostingPromoIfNotAtomic,
+			handleHostingPanelRedirect,
+			hostingActivate,
+			siteDashboard( DOTCOM_HOSTING_CONFIG ),
+			makeLayout,
+			clientRender
+		);
+	}
 }