My Sites: Fix Jetpack sites' listing on the "My Home" (`/home`) page #57952

ivan-ottinger · 2021-11-11T10:22:29Z

Sites displayed on the "My Home" page (/home) are filtered based on the following rule:

wp-calypso/client/my-sites/sites/index.jsx

Lines 59 to 62 in b019e58

    
           // Supported on Simple and Atomic Sites 
        
           if ( /^\/home/.test( path ) ) { 
        
           	return ! site.is_vip && ! ( site.jetpack && ! site.options.is_automated_transfer ); 
        
           }

It looks like the rule was originally added to filter out VIP sites only, but it is filtering out all Jetpack-connected sites as well (issue reported in #57295).

To add more specificity, the condition ! site.is_vip && ! ( site.jetpack && ! site.options.is_automated_transfer ) returns false for every Jetpack-connected site. This results in each Jetpack-connected site to be left out from the sites array that is then rendered in the Site Selector component:

wp-calypso/client/components/site-selector/index.jsx

Lines 279 to 281 in b019e58

    
           if ( this.props.filter ) { 
        
           	sites = sites.filter( this.props.filter ); 
        
           }

Changes proposed in this Pull Request

Remove part of the condition (! ( site.jetpack && ! site.options.is_automated_transfer )) to make sure only VIP sites are filtered out.

Hey @gwwar and @kwight 👋🏼 I am tagging you here in case there's something I might have missed in relation to VIP sites (as the filter was originally added in #39090). I don't think the change would have any effect on VIP sites, just wanted to double-check with you.

Screenshots

Before:

After:

Testing instructions

It shouldn't be possible to reproduce #57295.

In steps:

Create a WPORG site. You can use https://jurassic.ninja/
Connect it to your WordPress.com account.
The Jetpack-connected site should show up in the list under "My Sites" https://wordpress.com/home - in the same way as it is showing up on other similar pages, e.g. https://wordpress.com/media and https://wordpress.com/settings/general

Related to #57295

Sites displayed on the "My Home" page (`/home`) are filtered based on certain rules. This commit removes filter condition that prevents Jetpack-connected sites from loading.

github-actions · 2021-11-11T10:22:47Z

Link to Calypso live: https://calypso.live?image=registry.a8c.com/calypso/app:commit-f428a1ec60bdb39aa94a96d0c4f8f1b996042612
Link to Jetpack Cloud live: https://calypso.live?image=registry.a8c.com/calypso/app:commit-f428a1ec60bdb39aa94a96d0c4f8f1b996042612&env=jetpack
(These links may take a few minutes to be available)

matticbot · 2021-11-11T10:23:29Z

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

Sections (~34 bytes removed 📉 [gzipped])

name                      parsed_size           gzip_size
woocommerce-installation        -47 B  (-0.0%)      -11 B  (-0.0%)
woocommerce                     -47 B  (-0.0%)      -11 B  (-0.0%)
themes                          -47 B  (-0.0%)      -11 B  (-0.0%)
theme                           -47 B  (-0.0%)      -11 B  (-0.0%)
stats                           -47 B  (-0.0%)      -11 B  (-0.0%)
sites                           -47 B  (-0.0%)      -11 B  (-0.0%)
site-purchases                  -47 B  (-0.0%)      -12 B  (-0.0%)
settings-writing                -47 B  (-0.0%)      -11 B  (-0.0%)
settings-security               -47 B  (-0.0%)      -11 B  (-0.0%)
settings-performance            -47 B  (-0.0%)      -11 B  (-0.0%)
settings-jetpack                -47 B  (-0.0%)      -11 B  (-0.0%)
settings-discussion             -47 B  (-0.0%)      -11 B  (-0.0%)
settings                        -47 B  (-0.0%)      -11 B  (-0.0%)
scan                            -47 B  (-0.0%)      -11 B  (-0.0%)
purchases                       -47 B  (-0.0%)      -12 B  (-0.0%)
preview                         -47 B  (-0.0%)      -11 B  (-0.0%)
posts-custom                    -47 B  (-0.0%)      -11 B  (-0.0%)
posts                           -47 B  (-0.0%)      -11 B  (-0.0%)
plugins                         -47 B  (-0.0%)      -11 B  (-0.0%)
plans                           -47 B  (-0.0%)      -11 B  (-0.0%)
people                          -47 B  (-0.0%)      -11 B  (-0.0%)
pages                           -47 B  (-0.0%)      -11 B  (-0.0%)
migrate                         -47 B  (-0.0%)      -11 B  (-0.0%)
media                           -47 B  (-0.0%)      -11 B  (-0.0%)
marketplace                     -47 B  (-0.0%)      -11 B  (-0.0%)
marketing                       -47 B  (-0.0%)      -11 B  (-0.0%)
jetpack-search                  -47 B  (-0.0%)      -11 B  (-0.0%)
jetpack-connect                 -47 B  (-0.0%)      -11 B  (-0.0%)
jetpack-cloud-settings          -47 B  (-0.0%)      -11 B  (-0.0%)
jetpack-cloud-pricing           -47 B  (-0.0%)      -11 B  (-0.0%)
jetpack-cloud                   -47 B  (-0.0%)      -11 B  (-0.0%)
import                          -47 B  (-0.0%)      -11 B  (-0.0%)
hosting                         -47 B  (-0.0%)      -11 B  (-0.0%)
home                            -47 B  (-0.0%)      -11 B  (-0.0%)
gutenberg-editor                -47 B  (-0.0%)      -11 B  (-0.0%)
google-my-business              -47 B  (-0.0%)      -11 B  (-0.0%)
export                          -47 B  (-0.0%)      -11 B  (-0.0%)
email                           -47 B  (-0.0%)      -11 B  (-0.0%)
earn                            -47 B  (-0.0%)      -11 B  (-0.0%)
domains                         -47 B  (-0.0%)      -12 B  (-0.0%)
customize                       -47 B  (-0.0%)      -11 B  (-0.0%)
concierge                       -47 B  (-0.0%)      -11 B  (-0.0%)
comments                        -47 B  (-0.0%)      -11 B  (-0.0%)
checkout                        -47 B  (-0.0%)      -12 B  (-0.0%)
backup                          -47 B  (-0.0%)      -11 B  (-0.0%)
activity                        -47 B  (-0.0%)      -11 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.

arcangelini

It works for me, I am glad you tagged someone familiar with VIP. I would want to make sure this doesn't adversely affect any VIP sites? 🤷‍♂️

simison · 2021-11-22T13:44:44Z

How does this affect https://cloud.jetpack.com/ ? (It also runs on Calypso)

ivan-ottinger · 2021-11-22T14:05:40Z

How does this affect https://cloud.jetpack.com/ ? (It also runs on Calypso)

Thanks for your comment Mikael. The code change shouldn't affect https://cloud.jetpack.com/ as /home is not available there: https://cloud.jetpack.com/home and the site filter touched in this PR only applies to that one specific /home path.

alshakero

Reviewed and tested. LGTM.

ivan-ottinger · 2021-11-22T16:08:11Z

Thank you so much for your feedback folks! 🙇🏼 I will deploy the change tomorrow morning since I am at the end of the day for today.

ivan-ottinger · 2021-11-23T09:06:43Z

Successfully merged and deployed to production.

Sites displayed on the "My Home" page (`/home`) are filtered based on certain rules. This PR removes filter condition that prevents Jetpack-connected sites from loading on the `/home` page.

Fix Jetpack sites' listing on the "My Home" page

f428a1e

Sites displayed on the "My Home" page (`/home`) are filtered based on certain rules. This commit removes filter condition that prevents Jetpack-connected sites from loading.

ivan-ottinger self-assigned this Nov 11, 2021

ivan-ottinger linked an issue Nov 11, 2021 that may be closed by this pull request

Jetpack linked sites are not showing up in some views on Calypso dashboard #57295

Closed

ivan-ottinger requested review from arcangelini and alshakero November 11, 2021 10:25

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 11, 2021

arcangelini approved these changes Nov 11, 2021

View reviewed changes

alshakero approved these changes Nov 22, 2021

View reviewed changes

ivan-ottinger merged commit a837da9 into trunk Nov 23, 2021

ivan-ottinger deleted the fix/jetpack-site-listing branch November 23, 2021 08:27

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 Nov 23, 2021

ivan-ottinger mentioned this pull request Nov 23, 2021

Jetpack linked sites are not showing up in some views on Calypso dashboard #57295

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

My Sites: Fix Jetpack sites' listing on the "My Home" (`/home`) page #57952

My Sites: Fix Jetpack sites' listing on the "My Home" (`/home`) page #57952

ivan-ottinger commented Nov 11, 2021

github-actions bot commented Nov 11, 2021

matticbot commented Nov 11, 2021

arcangelini left a comment

simison commented Nov 22, 2021 •

edited

Loading

ivan-ottinger commented Nov 22, 2021

alshakero left a comment

ivan-ottinger commented Nov 22, 2021

ivan-ottinger commented Nov 23, 2021

	// Supported on Simple and Atomic Sites
	if ( /^\/home/.test( path ) ) {
	return ! site.is_vip && ! ( site.jetpack && ! site.options.is_automated_transfer );
	}

	if ( this.props.filter ) {
	sites = sites.filter( this.props.filter );
	}

My Sites: Fix Jetpack sites' listing on the "My Home" (/home) page #57952

My Sites: Fix Jetpack sites' listing on the "My Home" (/home) page #57952

Conversation

ivan-ottinger commented Nov 11, 2021

Changes proposed in this Pull Request

Screenshots

Testing instructions

github-actions bot commented Nov 11, 2021

matticbot commented Nov 11, 2021

arcangelini left a comment

Choose a reason for hiding this comment

simison commented Nov 22, 2021 • edited Loading

ivan-ottinger commented Nov 22, 2021

alshakero left a comment

Choose a reason for hiding this comment

ivan-ottinger commented Nov 22, 2021

ivan-ottinger commented Nov 23, 2021

My Sites: Fix Jetpack sites' listing on the "My Home" (`/home`) page #57952

My Sites: Fix Jetpack sites' listing on the "My Home" (`/home`) page #57952

simison commented Nov 22, 2021 •

edited

Loading