Add upsell to Advanced Tools tab #96609

madhusudhand · 2024-11-21T09:19:41Z

Fixes: https://github.com/Automattic/dotcom-forge/issues/9866

Proposed Changes

Add a new route /sites/tools/:site
Re-use the contents of Hosting features in advanced tools

Why are these changes being made?

Part of untangling hosting menu

Testing Instructions

Pre-merge Checklist

Has the general commit checklist been followed? (PCYsg-hS-p2)
Have you written new tests for your changes?
Have you tested the feature in Simple (P9HQHe-k8-p2), Atomic (P9HQHe-jW-p2), and self-hosted Jetpack sites (PCYsg-g6b-p2)?
Have you checked for TypeScript, React or other console errors?
Have you used memoizing on expensive computations? More info in Memoizing with create-selector and Using memoizing selectors and Our Approach to Data
Have we added the "[Status] String Freeze" label as soon as any new strings were ready for translation (p4TIVU-5Jq-p2)?
For changes affecting Jetpack: Have we added the "[Status] Needs Privacy Updates" label if this pull request changes what data or activity we track or use (p4TIVU-aUh-p2)?

github-actions · 2024-11-21T09:19:56Z

Calypso Live (direct link)

	https://calypso.live?image=registry.a8c.com/calypso/app:build-125556

Jetpack Cloud live (direct link)

	https://calypso.live?image=registry.a8c.com/calypso/app:build-125556&env=jetpack

Automattic for Agencies live (direct link)

	https://calypso.live?image=registry.a8c.com/calypso/app:build-125556&env=a8c-for-agencies

matticbot · 2024-11-21T09:26:29Z

This PR modifies the release build for the following Calypso Apps:

For info about this notification, see here: PCYsg-OT6-p2

notifications
wpcom-block-editor

To test WordPress.com changes, run install-plugin.sh $pluginSlug feature/advanced-tools on your sandbox.

matticbot · 2024-11-21T09:29:04Z

Here is how your PR affects size of JS and CSS bundles shipped to the user's browser:

App Entrypoints (~87 bytes removed 📉 [gzipped])

name                   parsed_size           gzip_size
entry-subscriptions         -141 B  (-0.0%)      -48 B  (-0.0%)
entry-login                 -141 B  (-0.0%)      -48 B  (-0.0%)
entry-domains-landing       -141 B  (-0.0%)      -48 B  (-0.0%)
entry-browsehappy           -141 B  (-0.1%)      -48 B  (-0.1%)
entry-stepper               -129 B  (-0.0%)      -87 B  (-0.0%)
entry-main                  -129 B  (-0.0%)      -87 B  (-0.0%)

Common code that is always downloaded and parsed every time the app is loaded, no matter which route is used.

Sections (~8167 bytes added 📈 [gzipped])

name                parsed_size           gzip_size
site-tools             +47592 B  (+2.8%)   +14622 B  (+3.0%)
hosting-features        +1163 B  (+0.1%)     +153 B  (+0.0%)
staging-site             +239 B  (+0.0%)      +33 B  (+0.0%)
sites-dashboard          +239 B  (+0.0%)      +33 B  (+0.0%)
site-settings            +239 B  (+0.0%)      +33 B  (+0.0%)
site-performance         +239 B  (+0.0%)      +33 B  (+0.0%)
site-marketing           +239 B  (+0.0%)      +33 B  (+0.0%)
hosting                  +239 B  (+0.0%)      +33 B  (+0.0%)
github-deployments       +239 B  (+0.0%)      +42 B  (+0.0%)
site-monitoring          +192 B  (+0.0%)     +216 B  (+0.1%)
site-logs                +192 B  (+0.0%)      +33 B  (+0.0%)

Sections contain code specific for a given set of routes. Is downloaded and parsed only when a particular route is navigated to.

Legend

What is parsed and gzip size?

Parsed Size: Uncompressed size of the JS and CSS files. This much code needs to be parsed and stored in memory.
Gzip Size: Compressed size of the JS and CSS files. This much data needs to be downloaded over network.

Generated by performance advisor bot at iscalypsofastyet.com.

client/sites/components/site-preview-pane/constants.ts

fushar · 2024-11-21T09:37:55Z

client/sites/tools/controller.tsx

@@ -50,6 +51,11 @@ export function ToolsSidebar() {
 	);
 }

+export function advancedTools( context: PageJSContext, next: () => void ) {
+	context.primary = <HostingFeatures />;


Can we also move/rename client/hosting/hosting-features/components => client/sites/components/hosting-features? This way, when we clean up later, we don't need to touch the old location anymore.

fixed in 2e41f39

Ah, can we drop /tools/ from the patch, i.e. move it up one level, under client/sites/? The subtab upsells might need to extract some shared utils from it. Hosting features are across tabs/subtabs, not just tools.

The subtab upsells might need to extract some shared utils from it.

See: #96660

Moved here 5d023b7

client/sites/tools/controller.tsx

fushar · 2024-11-22T02:36:33Z

client/sites/components/site-preview-pane/dotcom-preview-pane.tsx

@@ -97,7 +98,7 @@ const DotcomPreviewPane = ( {
 						<HostingFeaturesIcon />
 					</span>
 				),
-				enabled: isSimpleSite || isPlanExpired,
+				enabled: areHostingFeaturesSupported( site ),


I believe this should be

Suggested change

enabled: areHostingFeaturesSupported( site ),

enabled: ( isSimpleSite || isPlanExpired ) && ! config.isEnabled( 'untangling/hosting-menu' ),

because we want to still show this when the feature flag is not enabled.

fixed in 6c57e7f

fushar · 2024-11-22T02:39:11Z

client/sites/components/site-preview-pane/dotcom-preview-pane.tsx

 				enabled:
-					areHostingFeaturesSupported( site ) && config.isEnabled( 'untangling/hosting-menu' ),
+					! areHostingFeaturesSupported( site ) && config.isEnabled( 'untangling/hosting-menu' ),


Oh, I think there is a small misunderstanding here. We still want to show the original Advanced Tools tab when the hosting features are supported, so we should add the tab instead of modifying this.

So there will be two tabs configured:

Advanced Tools => original, shown where areHostingFeaturesSupported( site )

Advanced Tools => the new one, containing upsell, shown where ! areHostingFeaturesSupported( site )

Thanks for the clarification. Introduced new tab here 6c57e7f

client/sites/tools/controller.tsx

fushar

Nicely done, thanks 👍

fushar · 2024-11-25T09:07:42Z

Found a small issue, we can follow-up later: https://github.com/Automattic/dotcom-forge/issues/9938

madhusudhand requested a review from fushar November 21, 2024 09:19

matticbot added the [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. label Nov 21, 2024

fushar reviewed Nov 21, 2024

View reviewed changes

madhusudhand marked this pull request as ready for review November 21, 2024 11:48

madhusudhand self-assigned this Nov 21, 2024

fushar reviewed Nov 22, 2024

View reviewed changes

madhusudhand added 5 commits November 25, 2024 11:39

add hosting features content to advanced tools tab

fde8fc3

update route conditions

15b2218

move hosting features components to sites/tools directory

4b81414

add translations for advanced tools

bdd8a95

address feedback

6c57e7f

madhusudhand force-pushed the feature/advanced-tools branch from 4ae4e46 to 6c57e7f Compare November 25, 2024 06:46

move hosting-feature components one level up

5d023b7

fushar approved these changes Nov 25, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add upsell to Advanced Tools tab #96609

Add upsell to Advanced Tools tab #96609

madhusudhand commented Nov 21, 2024 •

edited

Loading

github-actions bot commented Nov 21, 2024 •

edited by matticbot

Loading

matticbot commented Nov 21, 2024 •

edited

Loading

matticbot commented Nov 21, 2024 •

edited

Loading

fushar Nov 21, 2024

madhusudhand Nov 21, 2024

fushar Nov 22, 2024

fushar Nov 22, 2024

madhusudhand Nov 25, 2024

fushar Nov 22, 2024

madhusudhand Nov 25, 2024

fushar Nov 22, 2024

madhusudhand Nov 25, 2024

fushar left a comment

fushar commented Nov 25, 2024

	enabled: areHostingFeaturesSupported( site ),
	enabled: ( isSimpleSite \|\| isPlanExpired ) && ! config.isEnabled( 'untangling/hosting-menu' ),

Add upsell to Advanced Tools tab #96609

Are you sure you want to change the base?

Add upsell to Advanced Tools tab #96609

Conversation

madhusudhand commented Nov 21, 2024 • edited Loading

Proposed Changes

Why are these changes being made?

Testing Instructions

Pre-merge Checklist

github-actions bot commented Nov 21, 2024 • edited by matticbot Loading

matticbot commented Nov 21, 2024 • edited Loading

matticbot commented Nov 21, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

fushar left a comment

Choose a reason for hiding this comment

fushar commented Nov 25, 2024

madhusudhand commented Nov 21, 2024 •

edited

Loading

github-actions bot commented Nov 21, 2024 •

edited by matticbot

Loading

matticbot commented Nov 21, 2024 •

edited

Loading

matticbot commented Nov 21, 2024 •

edited

Loading