Update isEligibleForProPlan selector to check if siteId is Pro as well #64457

claudiucelfilip · 2022-06-08T15:52:43Z

Proposed Changes

This allows the isEligibleForProPlan to return true if the user is on Pro plan, event if the plans/pro-plan flag is disabled.
Without this, we can get inconsistent behavior and content with the current Pro plan.

Addresses #64450

Testing Instructions

Go to the Plugins page on a Pro plan site
Select a Plugin (ex. Yoast)
You should see Premium support mentions on the right side

Go to the /plans/[siteId] page
You should be redirected to the My Plan page

Fixes #64450

github-actions · 2022-06-08T15:53:00Z

Calypso Live (direct link)

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

Jetpack Cloud live (direct link)

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

matticbot · 2022-06-08T15:57:26Z

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

App Entrypoints (~97 bytes added 📈 [gzipped])

name           parsed_size           gzip_size
entry-stepper       +455 B  (+0.0%)      +97 B  (+0.0%)

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

Sections (~411 bytes added 📈 [gzipped])

name                  parsed_size           gzip_size
migrate                    +609 B  (+0.2%)     +154 B  (+0.1%)
home                       +609 B  (+0.1%)     +136 B  (+0.1%)
themes                     +455 B  (+0.1%)      +77 B  (+0.0%)
settings-performance       +455 B  (+0.1%)      +77 B  (+0.1%)
scan                       +455 B  (+0.1%)     +107 B  (+0.1%)
plugins                    +455 B  (+0.1%)      +77 B  (+0.0%)
media                      +455 B  (+0.0%)     +115 B  (+0.0%)
hosting                    +455 B  (+0.1%)      +77 B  (+0.1%)
earn                       +455 B  (+0.1%)      +82 B  (+0.1%)
backup                     +455 B  (+0.1%)     +107 B  (+0.0%)
plans                      +225 B  (+0.0%)      +52 B  (+0.0%)
marketplace                +225 B  (+0.0%)      +52 B  (+0.0%)
domains                    +225 B  (+0.0%)      +52 B  (+0.0%)
checkout                   +225 B  (+0.0%)      +52 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 (~133 bytes added 📈 [gzipped])

name                                               parsed_size           gzip_size
async-load-design-blocks                                +455 B  (+0.0%)      +70 B  (+0.0%)
async-load-calypso-post-editor-media-modal              +455 B  (+0.0%)     +115 B  (+0.0%)
async-load-calypso-post-editor-editor-media-modal       +455 B  (+0.0%)     +115 B  (+0.0%)
async-load-signup-steps-plans                           +225 B  (+0.1%)      +52 B  (+0.1%)
async-load-signup-steps-import-from                     +225 B  (+0.0%)      +52 B  (+0.0%)
async-load-signup-steps-domains                         +225 B  (+0.1%)      +52 B  (+0.0%)
async-load-calypso-my-sites-checkout-modal              +225 B  (+0.0%)      +52 B  (+0.0%)
async-load-calypso-blocks-editor-checkout-modal         +225 B  (+0.0%)      +52 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.

cpapazoglou

The implementation works OK for me!

I left one minor comment regarding the selectedSite

cpapazoglou · 2022-06-09T13:07:04Z

client/my-sites/plans-comparison/is-eligible-for-pro-plan.ts

 	if (
 		siteId &&
 		( ( isJetpackSite( state, siteId ) && ! isAtomicSite( state, siteId ) ) ||
 			isSiteWPForTeams( state, siteId ) )
 	) {
 		return false;
 	}
+	siteId = siteId || getSelectedSiteId( state );
+	const selectedSite = getSite( state, siteId || '' );


Is siteId || '' really needed? And if '' is used for the siteId would the selectedSite return what we expect to?

This was needed to reconcile the type differences of the optional siteId argument; isJetpackSite, isAtomicSite both expect number | null whereas getSite expects string | number.

There may be other ways to address this, but I thought this was more descriptive. Also, in case '' is passed, then selectedSite becomes null and currentPlan will be undefined - which should safely jump over to the Pro plan check.

gmovr

Code looks good -- and I've done several manual tests. 🟢

#64457) * Add plan check to the Pro plan eligibility checker * Add server-friendly plan check * Remove unnecessary and faulty current plan fetch

* Disable Pro and Starter config flags * Removing this check for now in the renew spec-- as the legacy plan notice will be removed (#64400) * Fix/pro plan reference in etk (#64476) * Disable Pro and Starter config flags * Removing this check for now in the renew spec-- as the legacy plan notice will be removed (#64400) * Swapping out the copy for pro plan in editing toolkit Co-authored-by: Claudiu Filip <claudiucelfilip@gmail.com> Co-authored-by: Even Tobiesen <52675688+gmovr@users.noreply.github.com> * Show upgrade button on the /plans/<site> for Starter and Pro plans (#64481) * Add Starter and Pro plan Business and Ecommerce upgrade whitelists * Add Pro plan to Business upgrade whitelist * Swapping out some text in the FAQ section that mentions the Pro plan (#64475) * Update isEligibleForProPlan selector to check if siteId is Pro as well (#64457) * Add plan check to the Pro plan eligibility checker * Add server-friendly plan check * Remove unnecessary and faulty current plan fetch * Plans: show notice for sites on unsupported plans (#64478) * Update plan references in Marketing (#64470) * Updated pro reference for Cloudflare UpsellNudge * Updated the UpsellNudge title with Premium plan * Updated reference from Pro in the SEO upsell. Note that the findFirstSimilarPlanKey() gives the wrong URL -- which is the same for these other upsells. * Updated reference from Pro plan in Facebook block in Marketing>Tools * Remove an extra space in copy * Updated test for the seo-settings form * Update link in UpsellNudge (#64496) * Updating the CTA urls to go to the plans page, as they used to do * Updating the specific UpsellNudge in the Settings > General form * Updating a test assertion for form-general.jsx to expect Business * Removing the check for the eligibleForProPlan here, as this will return false and we won't enter the conditional. (#64511) * Update/plan overhaul revert seo upsell preview (#64502) * Updating this nudge to Business Plan * Updating test for SEO preview upgrade nudge * Update plans references in upgrade nudges and CTAs (#64484) * Revert copy and plan in domain-to-plan-nudge to legacy (Personal) * Update copy in admin-sections in inline-help * Update contextual help texts from Pro to legacy * Changing the advertising-removed to reflect legacy plans (Business CTA) * Update reference to Personal plan required in DomainProductPrice, renderFreeWithPlanText * Update reference from Pro to Personal on domain search results domain mapping * Update copy in transfer domain step to legacy * Update theme upsell popover heading from Pro to legacy * Update backup upsell card from Pro to legacy * Update PurchaseDetail on thank you view from Pro to legacy/Business * Change Business plan upsell nudge (checkout) back to Business from Pro * Change upsell CTA in AdsWrapper to Business * Updated payment blocks/membership nudge from Pro to Personal * Updated CTA/nudge for hosting features from Pro to Business * Updated upgrade prompt on plugin install page to refer to Business plan * Fixed upgrade prompts/nudges in media-library from Pro to legacy * Updated footer card for migration confirmation step from Pro to Business * Updated reference to Business from Pro for mention on import or migrate step * Updated reference on migration upsell from Pro to Business * Updated reference to Business from Pro plan in scan/wpcom-upsell.tsx * Update upsell reference to Business instead of Pro * Updated reference from Pro to Personal in site-settings/podcasting-details * Changed text in UpsellNudge in stats-module under my-sites * Updated plans references in UpsellNudge(s) under themes * Updated title in upsellBanner for Jetpack * Updated reference in footer for blocks>import>ready * Updated plan reference in CTA for store intent * Updated strings in store features * Updated CTAs in focused launch * Reverting to existing strings for i18n * Added namespaced classname to button for lint * swapping out text for pro plan references in Settings --> Performance (#64564) * Change Pro plan mention on domain search (#64615) * Use starter plan copy overrides in all sitations * Mention paid annual plans instead of just paid * Fix: Upgrade now (to plans page) sometimes takes the user back to my-plan (#64606) * Remove unnecessary redirect and Plans navigations tab hide * Remove overhauled plans grid from the Plans page * Roll back domain search copy before Pro plan overhaul (#64618) * Restore old copy versions * Ensure transfer price is not shown for new annual plans copy * Remove Pro plan from top storage plan list (#64657) * Plans overhaul: revert Pro upsell in posts list (#64659) * Remove tos-related files * Remove unused variable * Small lint fix * Add previous admin section copy changes to new file * Skip Free to Pro test suite * User better method to disable Free to Pro upgrade test * Updated the tooltip/description for live chat support to not set a specific day/time range for more flexibility (#65721) * Starter can upgrade to Premium, and Pro Monthly can upgrade to Business or Ecommerce Monthly (#65724) * Starter can upgrade to Premium. Pro monthly can upgrade to Business or eCommerce monthly * Monthly Pro plan can upgrade to higher annual and bi-annual plans * Wrap legacy notice text in translation check * Plan Overhaul revert: Do not offer Starter plan to install premium plugins (#65772) * Use the Goals URL when declining Business Upsell (#65773) Co-authored-by: Even Tobiesen <52675688+gmovr@users.noreply.github.com> Co-authored-by: Jessie Harris <jessie.harris@automattic.com> Co-authored-by: Taegon Kim <gonom9@gmail.com> Co-authored-by: Christos <chriskmnds@gmail.com> Co-authored-by: Miguel Torres <miguel.torres@automattic.com>

#64457) * Add plan check to the Pro plan eligibility checker * Add server-friendly plan check * Remove unnecessary and faulty current plan fetch

* Disable Pro and Starter config flags * Removing this check for now in the renew spec-- as the legacy plan notice will be removed (#64400) * Fix/pro plan reference in etk (#64476) * Disable Pro and Starter config flags * Removing this check for now in the renew spec-- as the legacy plan notice will be removed (#64400) * Swapping out the copy for pro plan in editing toolkit Co-authored-by: Claudiu Filip <claudiucelfilip@gmail.com> Co-authored-by: Even Tobiesen <52675688+gmovr@users.noreply.github.com> * Show upgrade button on the /plans/<site> for Starter and Pro plans (#64481) * Add Starter and Pro plan Business and Ecommerce upgrade whitelists * Add Pro plan to Business upgrade whitelist * Swapping out some text in the FAQ section that mentions the Pro plan (#64475) * Update isEligibleForProPlan selector to check if siteId is Pro as well (#64457) * Add plan check to the Pro plan eligibility checker * Add server-friendly plan check * Remove unnecessary and faulty current plan fetch * Plans: show notice for sites on unsupported plans (#64478) * Update plan references in Marketing (#64470) * Updated pro reference for Cloudflare UpsellNudge * Updated the UpsellNudge title with Premium plan * Updated reference from Pro in the SEO upsell. Note that the findFirstSimilarPlanKey() gives the wrong URL -- which is the same for these other upsells. * Updated reference from Pro plan in Facebook block in Marketing>Tools * Remove an extra space in copy * Updated test for the seo-settings form * Update link in UpsellNudge (#64496) * Updating the CTA urls to go to the plans page, as they used to do * Updating the specific UpsellNudge in the Settings > General form * Updating a test assertion for form-general.jsx to expect Business * Removing the check for the eligibleForProPlan here, as this will return false and we won't enter the conditional. (#64511) * Update/plan overhaul revert seo upsell preview (#64502) * Updating this nudge to Business Plan * Updating test for SEO preview upgrade nudge * Update plans references in upgrade nudges and CTAs (#64484) * Revert copy and plan in domain-to-plan-nudge to legacy (Personal) * Update copy in admin-sections in inline-help * Update contextual help texts from Pro to legacy * Changing the advertising-removed to reflect legacy plans (Business CTA) * Update reference to Personal plan required in DomainProductPrice, renderFreeWithPlanText * Update reference from Pro to Personal on domain search results domain mapping * Update copy in transfer domain step to legacy * Update theme upsell popover heading from Pro to legacy * Update backup upsell card from Pro to legacy * Update PurchaseDetail on thank you view from Pro to legacy/Business * Change Business plan upsell nudge (checkout) back to Business from Pro * Change upsell CTA in AdsWrapper to Business * Updated payment blocks/membership nudge from Pro to Personal * Updated CTA/nudge for hosting features from Pro to Business * Updated upgrade prompt on plugin install page to refer to Business plan * Fixed upgrade prompts/nudges in media-library from Pro to legacy * Updated footer card for migration confirmation step from Pro to Business * Updated reference to Business from Pro for mention on import or migrate step * Updated reference on migration upsell from Pro to Business * Updated reference to Business from Pro plan in scan/wpcom-upsell.tsx * Update upsell reference to Business instead of Pro * Updated reference from Pro to Personal in site-settings/podcasting-details * Changed text in UpsellNudge in stats-module under my-sites * Updated plans references in UpsellNudge(s) under themes * Updated title in upsellBanner for Jetpack * Updated reference in footer for blocks>import>ready * Updated plan reference in CTA for store intent * Updated strings in store features * Updated CTAs in focused launch * Reverting to existing strings for i18n * Added namespaced classname to button for lint * swapping out text for pro plan references in Settings --> Performance (#64564) * Change Pro plan mention on domain search (#64615) * Use starter plan copy overrides in all sitations * Mention paid annual plans instead of just paid * Fix: Upgrade now (to plans page) sometimes takes the user back to my-plan (#64606) * Remove unnecessary redirect and Plans navigations tab hide * Remove overhauled plans grid from the Plans page * Roll back domain search copy before Pro plan overhaul (#64618) * Restore old copy versions * Ensure transfer price is not shown for new annual plans copy * Remove Pro plan from top storage plan list (#64657) * Plans overhaul: revert Pro upsell in posts list (#64659) * Remove tos-related files * Remove unused variable * Small lint fix * Add previous admin section copy changes to new file * Skip Free to Pro test suite * User better method to disable Free to Pro upgrade test * Updated the tooltip/description for live chat support to not set a specific day/time range for more flexibility (#65721) * Starter can upgrade to Premium, and Pro Monthly can upgrade to Business or Ecommerce Monthly (#65724) * Starter can upgrade to Premium. Pro monthly can upgrade to Business or eCommerce monthly * Monthly Pro plan can upgrade to higher annual and bi-annual plans * Wrap legacy notice text in translation check * Plan Overhaul revert: Do not offer Starter plan to install premium plugins (#65772) * Use the Goals URL when declining Business Upsell (#65773) * Disable Starter plan testsuite Co-authored-by: Even Tobiesen <52675688+gmovr@users.noreply.github.com> Co-authored-by: Jessie Harris <jessie.harris@automattic.com> Co-authored-by: Taegon Kim <gonom9@gmail.com> Co-authored-by: Christos <chriskmnds@gmail.com> Co-authored-by: Miguel Torres <miguel.torres@automattic.com>

claudiucelfilip self-assigned this Jun 8, 2022

claudiucelfilip force-pushed the update/add-current-pro-plan-check branch from bd4ac0e to f344a76 Compare June 8, 2022 15:53

claudiucelfilip requested a review from WunderBart as a code owner June 8, 2022 15:53

claudiucelfilip requested a review from a team June 8, 2022 15:53

claudiucelfilip requested a review from a team as a code owner June 8, 2022 15:53

claudiucelfilip requested a review from a team June 8, 2022 15:53

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

claudiucelfilip force-pushed the update/plan-overhaul-revert branch from 77f42a2 to 8a4243d Compare June 8, 2022 15:54

claudiucelfilip added 2 commits June 8, 2022 18:56

Add plan check to the Pro plan eligibility checker

887ead4

Add server-friendly plan check

ead04bb

claudiucelfilip force-pushed the update/add-current-pro-plan-check branch from f344a76 to ead04bb Compare June 8, 2022 15:56

claudiucelfilip requested review from cpapazoglou and gmovr June 8, 2022 15:57

claudiucelfilip mentioned this pull request Jun 8, 2022

Update isEligibleForProPlan selector to check if siteId is Pro as well #64450

Closed

sirbrillig removed the request for review from a team June 8, 2022 16:34

claudiucelfilip force-pushed the update/add-current-pro-plan-check branch from 3024d34 to ead04bb Compare June 9, 2022 08:55

Remove unnecessary and faulty current plan fetch

78cd85c

cpapazoglou approved these changes Jun 9, 2022

View reviewed changes

gmovr approved these changes Jun 9, 2022

View reviewed changes

claudiucelfilip merged commit 62b4915 into update/plan-overhaul-revert Jun 10, 2022

claudiucelfilip deleted the update/add-current-pro-plan-check branch June 10, 2022 08:06

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 Jun 10, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update isEligibleForProPlan selector to check if siteId is Pro as well #64457

Update isEligibleForProPlan selector to check if siteId is Pro as well #64457

claudiucelfilip commented Jun 8, 2022 •

edited by chriskmnds

Loading

github-actions bot commented Jun 8, 2022 •

edited by matticbot

Loading

matticbot commented Jun 8, 2022 •

edited

Loading

cpapazoglou left a comment

cpapazoglou Jun 9, 2022

claudiucelfilip Jun 9, 2022

gmovr left a comment

Update isEligibleForProPlan selector to check if siteId is Pro as well #64457

Update isEligibleForProPlan selector to check if siteId is Pro as well #64457

Conversation

claudiucelfilip commented Jun 8, 2022 • edited by chriskmnds Loading

Proposed Changes

Testing Instructions

github-actions bot commented Jun 8, 2022 • edited by matticbot Loading

matticbot commented Jun 8, 2022 • edited Loading

cpapazoglou left a comment

Choose a reason for hiding this comment

cpapazoglou Jun 9, 2022

Choose a reason for hiding this comment

claudiucelfilip Jun 9, 2022

Choose a reason for hiding this comment

gmovr left a comment

Choose a reason for hiding this comment

claudiucelfilip commented Jun 8, 2022 •

edited by chriskmnds

Loading

github-actions bot commented Jun 8, 2022 •

edited by matticbot

Loading

matticbot commented Jun 8, 2022 •

edited

Loading