Restricting fetchModuleList calls to Atomic sites only #91170

paulopmt1 · 2024-05-27T18:37:18Z

Related to #90758

Proposed Changes

We're restricting whether to make the fetchmoduleList call for Atomic sites only

Here's more context to it.

Why are these changes being made?

This isn't a fix for the issue, but instead, a performance improvement since we're avoiding a couple of unnecessary calls with it (fetchModuleList + JetpackHealthCheck).

Testing Instructions

Be on this branch and select a simple site
Go to Home on that simple site and clear your Network requests
Go to Pages -> All pages
Ensure you won't see a /rest/v1.1/jetpack-blogs API call

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-05-27T18:37:31Z

Calypso Live (direct link)

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

Jetpack Cloud live (direct link)

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

Automattic for Agencies live (direct link)

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

matticbot · 2024-05-27T18:42:38Z

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

Sections (~451 bytes added 📈 [gzipped])

name                  parsed_size           gzip_size
stats                      +145 B  (+0.0%)      +38 B  (+0.0%)
settings-writing           +145 B  (+0.0%)      +59 B  (+0.0%)
settings-security          +145 B  (+0.0%)      +45 B  (+0.0%)
settings-performance       +145 B  (+0.0%)      +45 B  (+0.0%)
settings-newsletter        +145 B  (+0.0%)      +50 B  (+0.0%)
settings-discussion        +145 B  (+0.0%)      +48 B  (+0.0%)
posts-custom               +145 B  (+0.0%)      +31 B  (+0.0%)
posts                      +145 B  (+0.0%)      +31 B  (+0.0%)
people                     +145 B  (+0.0%)      +36 B  (+0.0%)
pages                      +145 B  (+0.0%)      +31 B  (+0.0%)
media                      +145 B  (+0.0%)      +43 B  (+0.0%)
marketing                  +145 B  (+0.0%)      +43 B  (+0.0%)
jetpack-social             +145 B  (+0.0%)      +43 B  (+0.0%)
jetpack-search             +145 B  (+0.0%)      +37 B  (+0.0%)
hosting                    +145 B  (+0.0%)      +19 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.

Async-loaded Components (~43 bytes added 📈 [gzipped])

name                                               parsed_size           gzip_size
async-load-calypso-post-editor-media-modal              +145 B  (+0.0%)      +43 B  (+0.0%)
async-load-calypso-post-editor-editor-media-modal       +145 B  (+0.0%)      +43 B  (+0.0%)

React components that are loaded lazily, when a certain part of UI is displayed for the first time.

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.

vykes-mac

Change seem reasonable and the extra call is not made.

tyxla

I believe we need to consider non-Atomic Jetpack sites in the equation as well.

tyxla · 2024-05-28T09:12:47Z

client/components/data/query-jetpack-modules/index.jsx


 const request = ( siteId ) => ( dispatch, getState ) => {
-	if ( siteId && ! isFetchingJetpackModules( getState(), siteId ) ) {
+	const isAtomic = isSiteWpcomAtomic( getState(), siteId );


What about non-atomic Jetpack sites? From what I recall, Jetpack sites (which aren't necessarily Atomic sites) also used the module data - extensively in site settings (but not only there).

Good catch @tyxla! Adding support to Jetpack non-Atomic sites here: 2e34bb3

tyxla · 2024-05-28T09:15:44Z

client/components/data/query-jetpack-modules/index.jsx

-	if ( siteId && ! isFetchingJetpackModules( getState(), siteId ) ) {
+	const isAtomic = isSiteWpcomAtomic( getState(), siteId );
+
+	if ( siteId && ! isFetchingJetpackModules( getState(), siteId ) && isAtomic ) {


It can be convenient to add this site type limitation here, but it also means we have to test every combination of the following:

Area/component where the QueryJetpackModules query component is used

Site type that supports (or doesn't support) Jetpack modules - Atomic sites, non-Atomic Jetpack sites, simple sites, etc.

Area/component where the QueryJetpackModules query component is used

I tested it on its usages, and they are working as expected:

Pages -> All pages

Settings -> Newsletter

Tools -> Marketing

Jetpack modules - Atomic sites, non-Atomic Jetpack sites, simple sites, etc.

Atomic sites and non-Atomic Jetpack sites are working as expected after this change.

Simple site is not calling it as expected.

matticbot · 2024-05-28T17:43:13Z

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

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

wpcom-block-editor

To test WordPress.com changes, run install-plugin.sh $pluginSlug fix/remove-unnecessary-jetpack-call on your sandbox.

tyxla

Left a couple more nits on the unit tests, but nothing critical - this looks good to go 🚀

tyxla · 2024-05-29T12:18:46Z

client/components/data/query-jetpack-modules/test/query-jetpack-modules.jsx

 		isWpcomAtomic = true;
+		isJetpack = false;


Doesn't seem like a valid scenario. AFAIK there can't be a working Atomic site that isn't a Jetpack site under the hood.

That makes sense, updated it here @tyxla.

tyxla · 2024-05-29T12:19:27Z

client/components/data/query-jetpack-modules/test/query-jetpack-modules.jsx

@@ -49,6 +51,9 @@ function getStore() {

 describe( 'fetchModuleList', () => {
 	test( "Ensure we're NOT calling fetchModuleList for simple sites", async () => {
+		isWpcomAtomic = false;
+		isJetpack = false;


If we always declare these in the beginning of the test, we might as well remove the let call and move them here as consts?

I'm not sure if I understood your suggestion since we're using these variables inside mockStore, and if we declare them constants, we can't change them on other tests.

I see, that makes sense. Let's leave them as they are then 👍

Making fetchModuleList calls only for Atomic sites

10eefe7

paulopmt1 changed the title ~~Making fetchModuleList calls only for Atomic sites~~ Restricting fetchModuleList calls to Atomic sites only May 27, 2024

paulopmt1 self-assigned this May 27, 2024

paulopmt1 requested a review from tyxla May 27, 2024 18:41

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

paulopmt1 requested a review from a team May 27, 2024 18:42

paulopmt1 added 2 commits May 27, 2024 15:51

Test added to ensure we're calling fetchModuleList only for Atomic sites

57a7ce9

Improved test readability

69c9c80

vykes-mac approved these changes May 27, 2024

View reviewed changes

tyxla requested changes May 28, 2024

View reviewed changes

Supporting Jetpack non-atomic sites as well

2e34bb3

paulopmt1 requested a review from tyxla May 28, 2024 17:50

tyxla approved these changes May 29, 2024

View reviewed changes

Updated test scenario

ef93cca

paulopmt1 merged commit 2f7e74e into trunk May 29, 2024
11 checks passed

paulopmt1 deleted the fix/remove-unnecessary-jetpack-call branch May 29, 2024 13:55

github-actions bot removed the [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. label May 29, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Restricting fetchModuleList calls to Atomic sites only #91170

Restricting fetchModuleList calls to Atomic sites only #91170

paulopmt1 commented May 27, 2024 •

edited

Loading

github-actions bot commented May 27, 2024 •

edited by matticbot

Loading

matticbot commented May 27, 2024 •

edited

Loading

vykes-mac left a comment

tyxla left a comment

tyxla May 28, 2024

paulopmt1 May 28, 2024

tyxla May 28, 2024

paulopmt1 May 28, 2024

matticbot commented May 28, 2024

tyxla left a comment

tyxla May 29, 2024

paulopmt1 May 29, 2024

tyxla May 29, 2024

paulopmt1 May 29, 2024

tyxla May 29, 2024

Restricting fetchModuleList calls to Atomic sites only #91170

Restricting fetchModuleList calls to Atomic sites only #91170

Conversation

paulopmt1 commented May 27, 2024 • edited Loading

Proposed Changes

Why are these changes being made?

Testing Instructions

Pre-merge Checklist

github-actions bot commented May 27, 2024 • edited by matticbot Loading

matticbot commented May 27, 2024 • edited Loading

vykes-mac left a comment

Choose a reason for hiding this comment

tyxla left a 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

matticbot commented May 28, 2024

tyxla left a 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

paulopmt1 commented May 27, 2024 •

edited

Loading

github-actions bot commented May 27, 2024 •

edited by matticbot

Loading

matticbot commented May 27, 2024 •

edited

Loading