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

Plan Overhaul revert #64370

Merged
merged 29 commits into from
Jul 20, 2022
Merged

Plan Overhaul revert #64370

merged 29 commits into from
Jul 20, 2022

Conversation

claudiucelfilip
Copy link
Contributor

@claudiucelfilip claudiucelfilip commented Jun 6, 2022

Proposed Changes

Addresses 779-gh-Automattic/martech

  • Opens a branch to merge other Plan overhaul revert changes
  • Disables the plans/pro-plan and plans/starter-plan flags for all environments

Testing Instructions

  • Go to /start/plans
  • You should see the Legacy plans (ie. Personal, Premium, Business, Ecommerce)
  • Go to /plans/[siteid]
  • You should see the Legacy plans (ie. Personal, Premium, Business, Ecommerce)

TODO

  • Confirm any paid plans, Pro plan or Starter plan mentions are rolled back to the previous texts (ex. Business plan)
  • Update/roll back failing e2e tests
  • Remove legacy plan notice from the /plans page

@github-actions
Copy link

github-actions bot commented Jun 6, 2022

@matticbot
Copy link
Contributor

matticbot commented Jun 6, 2022

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

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

name                   parsed_size           gzip_size
entry-main                  +941 B  (+0.1%)     +138 B  (+0.0%)
entry-stepper               +623 B  (+0.0%)     +203 B  (+0.0%)
entry-login                 +207 B  (+0.0%)      +80 B  (+0.0%)
entry-gutenboarding         +207 B  (+0.0%)      +80 B  (+0.0%)
entry-browsehappy           +207 B  (+0.2%)      +80 B  (+0.3%)
entry-domains-landing       +196 B  (+0.0%)      +74 B  (+0.0%)

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

Sections (~2722 bytes added 📈 [gzipped])

name                            parsed_size           gzip_size
media                              -38116 B  (-1.9%)   -10521 B  (-2.0%)
migrate                              +718 B  (+0.2%)     +298 B  (+0.3%)
settings-performance                 -711 B  (-0.1%)      +19 B  (+0.0%)
backup                               -697 B  (-0.1%)      -34 B  (-0.0%)
scan                                 -687 B  (-0.1%)      -54 B  (-0.0%)
hosting                              -635 B  (-0.1%)      +66 B  (+0.0%)
themes                               -603 B  (-0.1%)      +80 B  (+0.0%)
home                                 +603 B  (+0.1%)     +224 B  (+0.1%)
signup                               +534 B  (+0.1%)      +23 B  (+0.0%)
accept-invite                        +534 B  (+0.1%)      +23 B  (+0.0%)
earn                                 +477 B  (+0.1%)     +226 B  (+0.1%)
plugins                              -472 B  (-0.1%)     +100 B  (+0.0%)
jetpack-connect                      +465 B  (+0.0%)      -56 B  (-0.0%)
domains                              -305 B  (-0.0%)     +198 B  (+0.0%)
google-my-business                   +196 B  (+0.0%)     +871 B  (+0.7%)
jetpack-social                       -172 B  (-0.0%)     -574 B  (-0.5%)
activity                             -169 B  (-0.0%)      +24 B  (+0.0%)
settings-security                    -163 B  (-0.0%)      -69 B  (-0.1%)
settings-writing                     -157 B  (-0.0%)     -283 B  (-0.1%)
marketplace                          -152 B  (-0.0%)      +59 B  (+0.0%)
settings                             -147 B  (-0.0%)     -121 B  (-0.1%)
settings-jetpack                     -144 B  (-0.0%)     -619 B  (-0.6%)
gutenberg-editor                     +130 B  (+0.0%)      +53 B  (+0.0%)
marketing                            -110 B  (-0.0%)      +53 B  (+0.0%)
stats                                 +84 B  (+0.0%)      -15 B  (-0.0%)
plans                                 +69 B  (+0.0%)      +29 B  (+0.0%)
theme                                 +64 B  (+0.0%)      -22 B  (-0.0%)
checkout                              +56 B  (+0.0%)      +63 B  (+0.0%)
site-purchases                        -55 B  (-0.0%)      -14 B  (-0.0%)
settings-discussion                   -55 B  (-0.0%)     -806 B  (-0.8%)
purchases                             -55 B  (-0.0%)      -14 B  (-0.0%)
purchase-product                      -55 B  (-0.0%)      -14 B  (-0.0%)
jetpack-cloud-pricing                 -55 B  (-0.0%)      -83 B  (-0.1%)
jetpack-cloud-agency-dashboard        +54 B  (+0.0%)      +24 B  (+0.0%)
posts-custom                          +47 B  (+0.0%)      +65 B  (+0.0%)
posts                                 +47 B  (+0.0%)      +65 B  (+0.0%)
reader                                +40 B  (+0.0%)      +19 B  (+0.0%)
preview                               +40 B  (+0.0%)      +22 B  (+0.0%)
pages                                 +40 B  (+0.0%)     +207 B  (+0.1%)
people                                +38 B  (+0.0%)      -21 B  (-0.0%)
devdocs                               -36 B  (-0.0%)       -1 B  (-0.0%)
jetpack-search                        -31 B  (-0.0%)     +336 B  (+0.3%)
import                                +24 B  (+0.0%)     +353 B  (+0.3%)
export                                +24 B  (+0.0%)     +349 B  (+0.4%)
comments                              +24 B  (+0.0%)       +1 B  (+0.0%)
jetpack-cloud-settings                +14 B  (+0.0%)     +193 B  (+0.1%)
jetpack-cloud-partner-portal          +14 B  (+0.0%)       -2 B  (-0.0%)
help                                  +14 B  (+0.0%)       -2 B  (-0.0%)
email                                 +14 B  (+0.0%)       -2 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 (~16120 bytes added 📈 [gzipped])

name                                                              parsed_size           gzip_size
async-load-calypso-post-editor-media-modal                           -38143 B  (-2.3%)   -10484 B  (-2.5%)
async-load-calypso-post-editor-editor-media-modal                    -38010 B  (-2.1%)    -9660 B  (-2.2%)
async-load-design-blocks                                             -34646 B  (-1.5%)    -9696 B  (-1.6%)
async-load-signup-steps-domains                                       -1401 B  (-0.3%)     -114 B  (-0.1%)
async-load-signup-steps-plans                                         +1161 B  (+0.4%)     +454 B  (+0.5%)
async-load-calypso-components-web-preview-component                    -374 B  (-0.1%)     -739 B  (-0.4%)
async-load-calypso-my-sites-checkout-modal                             +290 B  (+0.0%)     +131 B  (+0.0%)
async-load-calypso-reader-sidebar                                      -256 B  (-0.2%)     -881 B  (-2.4%)
async-load-calypso-my-sites-current-site-notice                        -256 B  (-0.3%)     -839 B  (-3.2%)
async-load-calypso-blocks-jitm-templates-sidebar-banner                -256 B  (-0.3%)     -566 B  (-2.6%)
async-load-calypso-blocks-jitm-templates-notice                        -256 B  (-0.3%)     -539 B  (-2.4%)
async-load-calypso-blocks-jitm-templates-default                       -256 B  (-0.3%)     -553 B  (-2.5%)
async-load-calypso-blocks-editor-checkout-modal                        +235 B  (+0.0%)     +111 B  (+0.0%)
async-load-calypso-blocks-jitm                                         +120 B  (+1.2%)      +21 B  (+0.6%)
async-load-signup-steps-design-picker                                  +105 B  (+0.1%)      +56 B  (+0.1%)
async-load-calypso-layout-masterbar-checkout-tsx                        +83 B  (+0.0%)      +16 B  (+0.0%)
async-load-calypso-layout-masterbar-checkout                            +83 B  (+0.0%)      +16 B  (+0.0%)
async-load-calypso-blocks-inline-help-popover                           +83 B  (+0.0%)      +16 B  (+0.0%)
async-load-calypso-my-sites-site-settings-seo-settings-form             -74 B  (-0.0%)       -9 B  (-0.0%)
async-load-signup-steps-plans-atomic-store                              -63 B  (-0.0%)       -8 B  (-0.0%)
async-load-calypso-my-sites-sidebar                                     +40 B  (+0.0%)      +26 B  (+0.1%)
async-load-calypso-components-jetpack-sidebar                           +40 B  (+0.0%)      +26 B  (+0.1%)
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%)       +3 B  (+0.0%)
async-load-masterbar-cart-masterbar-cart-wrapper                        +14 B  (+0.0%)       -2 B  (-0.0%)
async-load-calypso-my-sites-current-site-stale-cart-items-notice        +14 B  (+0.0%)       -2 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 6, 2022

@chickee0311 Could you test this via the live link -- and map out any references to Pro/Starter?

@gmovr gmovr requested a review from WunderBart as a code owner June 7, 2022 08:52
@matticbot matticbot added [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. labels Jun 7, 2022
@gmovr gmovr removed the request for review from WunderBart June 7, 2022 08:53
@gmovr
Copy link
Contributor

gmovr commented Jun 7, 2022

Merged in #64400

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

This PR modifies the release build for editing-toolkit

To test your changes on WordPress.com, run install-plugin.sh editing-toolkit update/plan-overhaul-revert on your sandbox.

To deploy your changes after merging, see the documentation: PCYsg-mMA-p2

@claudiucelfilip claudiucelfilip requested review from a team as code owners June 10, 2022 10:09
@claudiucelfilip claudiucelfilip force-pushed the update/plan-overhaul-revert branch 2 times, most recently from 10f3ed3 to fb548d2 Compare June 16, 2022 07:48
@claudiucelfilip claudiucelfilip force-pushed the update/plan-overhaul-revert branch from fb548d2 to 1fa13d4 Compare July 18, 2022 09:52
@gmovr gmovr added the [Status] String Freeze Add the [Status] String Freeze label to your PR to ensure new strings are translated before merging label Jul 18, 2022
Copy link
Contributor

@worldomonation worldomonation left a comment

Choose a reason for hiding this comment

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

Looks to be good from KitKat perspective, with one minor suggestion.

@@ -19,7 +19,11 @@ import { apiDeleteSite } from '../shared';

declare const browser: Browser;

describe(
/**
Copy link
Contributor

Choose a reason for hiding this comment

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

suggestion: @claudiucelfilip another way to disable a test without having to disable waking rules are to simply remove the "@group" from the JSDoc header.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

suggestion: @claudiucelfilip another way to disable a test without having to disable waking rules are to simply remove the "@group" from the JSDoc header.

Thanks for this!

@gmovr gmovr mentioned this pull request Jul 18, 2022
5 tasks
@claudiucelfilip claudiucelfilip force-pushed the update/plan-overhaul-revert branch from dc5e519 to b07dbb3 Compare July 19, 2022 07:52
claudiucelfilip and others added 3 commits July 19, 2022 11:12
* 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>
@claudiucelfilip claudiucelfilip force-pushed the update/plan-overhaul-revert branch from b07dbb3 to 8ee8e49 Compare July 19, 2022 08:14
gmovr and others added 5 commits July 19, 2022 10:59
…ss 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
@claudiucelfilip claudiucelfilip merged commit c2d28f5 into trunk Jul 20, 2022
@claudiucelfilip claudiucelfilip deleted the update/plan-overhaul-revert branch July 20, 2022 12:00
@github-actions github-actions bot removed [Status] Needs Review The PR is ready for review. This also triggers e2e canary tests and wp-desktop tests automatically. [Status] String Freeze Add the [Status] String Freeze label to your PR to ensure new strings are translated before merging labels Jul 20, 2022
@claudiucelfilip claudiucelfilip restored the update/plan-overhaul-revert branch July 20, 2022 12:32
claudiucelfilip added a commit that referenced this pull request Jul 20, 2022
@a8ci18n
Copy link

a8ci18n commented Jul 20, 2022

This Pull Request is now available for translation here: https://translate.wordpress.com/deliverables/7450970

Hi @claudiucelfilip, could you please edit the description of this PR and add a screenshot for our translators? Ideally it'd include this string: With your plan, all WordPress.com advertising has been removed from your site. You can upgrade to a Business plan to also remove the WordPress.com footer credit.

Thank you in advance!

claudiucelfilip added a commit that referenced this pull request Jul 20, 2022
@a8ci18n
Copy link

a8ci18n commented Jul 20, 2022

Translation for this Pull Request has now been finished.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants