Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Pro plan from top storage plan list #64657

Conversation

claudiucelfilip
Copy link
Contributor

Proposed Changes

This is a follow-up change for the Excessive disk space message changes added in #64388.
With reversion of the legacy plans, we'll want to allow users to upgrade from Pro plan, to other higher storage plans (ie. Business, eCommerce).
This PR removes the Pro plan from the top storage plan list.

Testing Instructions

  • Have a Pro plan site
  • Sandbox API and hack the sandbox to think that all sites have excessive disk usage
diff --git a/wp-content/lib/atomic/woa.php b/wp-content/lib/atomic/woa.php
index 987f3b35a..accb4928e 100644
--- a/wp-content/lib/atomic/woa.php
+++ b/wp-content/lib/atomic/woa.php
@@ -2269,6 +2269,7 @@ function woa_unsuspend( $blog_id ) {
  * @return bool If disk usage is excessive and the site should not be transferred.
  */
 function woa_is_space_used_excessive( $blog_id ) {
+       return true;
        // The value returned by get_space_used_bytes() excludes transcoded media files, but includes the original media.
        $disk_space_used = get_space_used_bytes( $blog_id );
        if ( $disk_space_used > 150 * GB_IN_BYTES ) {
  • Visit http://calypso.localhost:3000/hosting-config/activate/<site> and try to transfer to atomic
  • You should see this image, nugding you to purchase a plan with additional storage:

Screenshot on 2022-06-15 at 15-11-55

  • Repeat this for a Business/eCommerce site
  • You should see this image, telling you to contact support:

Screenshot on 2022-06-15 at 15-22-15

@claudiucelfilip claudiucelfilip self-assigned this Jun 15, 2022
@claudiucelfilip claudiucelfilip requested a review from mmtr June 15, 2022 12:23
@matticbot 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 15, 2022
@claudiucelfilip claudiucelfilip requested a review from gmovr June 15, 2022 12:23
@matticbot
Copy link
Contributor

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

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

name                   parsed_size           gzip_size
entry-main                  +979 B  (+0.1%)      +45 B  (+0.0%)
entry-stepper               +578 B  (+0.0%)     +225 B  (+0.0%)
entry-login                 +149 B  (+0.0%)       +6 B  (+0.0%)
entry-gutenboarding         +149 B  (+0.0%)       +6 B  (+0.0%)
entry-domains-landing       +149 B  (+0.0%)       +6 B  (+0.0%)
entry-browsehappy           +149 B  (+0.2%)       +6 B  (+0.0%)

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

Sections (~5643 bytes removed 📉 [gzipped])

name                            parsed_size           gzip_size
media                              -41200 B  (-2.1%)   -11581 B  (-2.3%)
signup                               +871 B  (+0.2%)      +13 B  (+0.0%)
jetpack-connect                      +871 B  (+0.1%)      -39 B  (-0.0%)
accept-invite                        +871 B  (+0.2%)      +13 B  (+0.0%)
home                                 +722 B  (+0.1%)     +360 B  (+0.2%)
migrate                              +711 B  (+0.2%)     +332 B  (+0.3%)
backup                               +427 B  (+0.0%)     +250 B  (+0.1%)
scan                                 +417 B  (+0.1%)     +251 B  (+0.1%)
earn                                 +402 B  (+0.1%)     +212 B  (+0.1%)
themes                               +374 B  (+0.1%)     +215 B  (+0.1%)
settings-performance                 +319 B  (+0.1%)     +190 B  (+0.1%)
checkout                             +314 B  (+0.0%)     +124 B  (+0.0%)
hosting                              +303 B  (+0.1%)     +171 B  (+0.1%)
plugins                              +293 B  (+0.0%)     +171 B  (+0.1%)
domains                              -265 B  (-0.0%)      +82 B  (+0.0%)
settings-writing                     -216 B  (-0.0%)      -53 B  (-0.0%)
marketing                            -193 B  (-0.0%)    -1539 B  (-0.8%)
marketplace                          +192 B  (+0.0%)     +182 B  (+0.1%)
stats                                -144 B  (-0.0%)      -28 B  (-0.0%)
settings-security                    -135 B  (-0.0%)      -63 B  (-0.0%)
posts-custom                         -135 B  (-0.0%)     -107 B  (-0.1%)
posts                                -135 B  (-0.0%)     -107 B  (-0.1%)
activity                             -135 B  (-0.0%)      -15 B  (-0.0%)
gutenberg-editor                     +130 B  (+0.0%)      +63 B  (+0.0%)
settings                             -123 B  (-0.0%)     +852 B  (+0.4%)
theme                                -114 B  (-0.0%)      -42 B  (-0.0%)
plans                                +105 B  (+0.0%)       +8 B  (+0.0%)
devdocs                               -43 B  (-0.0%)      -16 B  (-0.0%)
people                                +41 B  (+0.0%)     -419 B  (-0.3%)
site-purchases                        -21 B  (-0.0%)       -7 B  (-0.0%)
purchases                             -21 B  (-0.0%)       -7 B  (-0.0%)
purchase-product                      -21 B  (-0.0%)       -7 B  (-0.0%)
jetpack-search                        -21 B  (-0.0%)      +55 B  (+0.0%)
jetpack-cloud-settings                -21 B  (-0.0%)       -7 B  (-0.0%)
jetpack-cloud-pricing                 -21 B  (-0.0%)      -86 B  (-0.1%)
jetpack-cloud-partner-portal          -21 B  (-0.0%)       -7 B  (-0.0%)
jetpack-cloud-agency-dashboard        -21 B  (-0.0%)       -7 B  (-0.0%)
help                                  -21 B  (-0.0%)       -7 B  (-0.0%)
email                                 -21 B  (-0.0%)       +4 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 (~1328 bytes removed 📉 [gzipped])

name                                                              parsed_size           gzip_size
async-load-calypso-post-editor-editor-media-modal                    -41290 B  (-2.3%)   -11639 B  (-2.6%)
async-load-calypso-post-editor-media-modal                           -41065 B  (-2.4%)   -11546 B  (-2.8%)
async-load-design-blocks                                             -39936 B  (-1.7%)   -11322 B  (-1.9%)
async-load-signup-steps-domains                                       -1377 B  (-0.3%)      -84 B  (-0.1%)
async-load-signup-steps-plans                                          +848 B  (+0.3%)     +416 B  (+0.5%)
async-load-calypso-my-sites-checkout-modal                             +359 B  (+0.0%)     +139 B  (+0.0%)
async-load-signup-steps-import-from                                    +348 B  (+0.0%)     +239 B  (+0.1%)
async-load-calypso-blocks-editor-checkout-modal                        +269 B  (+0.0%)     +119 B  (+0.0%)
async-load-calypso-components-web-preview-component                    -253 B  (-0.0%)     -112 B  (-0.1%)
async-load-calypso-reader-sidebar                                      -135 B  (-0.1%)      -57 B  (-0.2%)
async-load-calypso-my-sites-current-site-notice                        -135 B  (-0.1%)      -54 B  (-0.2%)
async-load-calypso-blocks-jitm-templates-sidebar-banner                -135 B  (-0.2%)      -58 B  (-0.3%)
async-load-calypso-blocks-jitm-templates-notice                        -135 B  (-0.2%)      -60 B  (-0.3%)
async-load-calypso-blocks-jitm-templates-default                       -135 B  (-0.2%)      -58 B  (-0.3%)
async-load-calypso-my-sites-site-settings-seo-settings-form            -114 B  (-0.0%)      -27 B  (-0.0%)
async-load-signup-steps-design-picker                                   +65 B  (+0.0%)      +31 B  (+0.1%)
async-load-calypso-layout-masterbar-checkout-tsx                        +48 B  (+0.0%)       +6 B  (+0.0%)
async-load-calypso-layout-masterbar-checkout                            +48 B  (+0.0%)       +6 B  (+0.0%)
async-load-calypso-blocks-inline-help-popover                           +48 B  (+0.0%)       +6 B  (+0.0%)
async-load-masterbar-cart-masterbar-cart-wrapper                        -21 B  (-0.0%)       -7 B  (-0.0%)
async-load-calypso-my-sites-current-site-stale-cart-items-notice        -21 B  (-0.0%)       -7 B  (-0.0%)
async-load-signup-steps-theme-selection                                 +16 B  (+0.0%)       +7 B  (+0.0%)
async-load-calypso-blocks-product-purchase-features-list                +15 B  (+0.0%)       +1 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.

@gmovr
Copy link
Contributor

gmovr commented Jun 15, 2022

This works well - LGTM!

Did the above party trick with my sandbox. Then I tested on a Pro plan site, and upgraded a Free to Business, and then tried to activate hosting. One thing I saw is that if I go to this screen /hosting-config/activate/ on a site that already has hosting activated, it shows a message that it's installing. Though users won't reach that screen if they have hosting activated already.
Screenshot 2022-06-15 at 14 43 31
Screenshot 2022-06-15 at 15 00 38

Screenshot 2022-06-15 at 15 04 03

Copy link
Contributor

@gmovr gmovr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ref my above comment -- the same happens on WordPress.com prod, so that seems unrelated. LGTM! 🚢

@claudiucelfilip claudiucelfilip merged this pull request into update/plan-overhaul-revert Jun 15, 2022
@claudiucelfilip claudiucelfilip deleted the update/excessive-disk-space-remove-pro-plan branch June 15, 2022 13:47
@github-actions 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 15, 2022
claudiucelfilip added a commit that referenced this pull request Jul 20, 2022
* 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>
claudiucelfilip added a commit that referenced this pull request Jul 21, 2022
* 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants