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.

Sign up for GitHub

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

Jump to bottom

Better handling on My Jetpack product interstitials if site already has prodcut #36570

Merged
merged 9 commits into from
Mar 27, 2024
Merged

Better handling on My Jetpack product interstitials if site already has prodcut #36570

merged 9 commits into from
Mar 27, 2024

Conversation

jboland88
Copy link
Contributor

@jboland88 jboland88 commented Mar 25, 2024 •
edited

Proposed changes:

  • This diff improves the behavior of the product interstitial pages in My Jetpack if the site already has a product.
  • Most notably, the table style interstitial now shows an "install" button and omits the price and any free offering if the site already has the product in question

Does this pull request change what data or activity we track or use?

No

Testing instructions:

  • Make sure your test site does not have any boost purchases to start with
  • With this PR applied, navigate to wp-admin/admin.php?page=my-jetpack/#add-boost
  • Note that, without a boost purchase, you should see both paid and free options:
    Screenshot 2024-03-26 at 3 49 14 PM
  • Purchase a Jetpack Boost plan
  • After the purchase, navigate again to wp-admin/admin.php?page=my-jetpack/#add-boost
  • Now, the page should only show the benefits of the boost product with an "Install Jetpack Boost" CTA
    Screenshot 2024-03-26 at 3 50 29 PM
  • Clicking the "Install Jetpack Boost" CTA should take you to the boost plugin page

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Mar 25, 2024 •
edited

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

  • To test on WoA, go to the Plugins menu on a WordPress.com Simple site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin, and enable the update/redirect-from-interstitial-if-product-active branch.

    • For jetpack-mu-wpcom changes, also add define( 'JETPACK_MU_WPCOM_LOAD_VIA_BETA_PLUGIN', true ); to your wp-config.php file.

  • To test on Simple, run the following command on your sandbox:

    bin/jetpack-downloader test jetpack update/redirect-from-interstitial-if-product-active

    bin/jetpack-downloader test jetpack-mu-wpcom-plugin update/redirect-from-interstitial-if-product-active

Interested in more tips and information?

  • In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
  • Read more about our development workflow here: PCYsg-eg0-p2
  • Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Mar 25, 2024 •
edited

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

  • ✅ Include a description of your PR changes.
  • ✅ Add a "[Status]" label (In Progress, Needs Team Review, ...).
  • ✅ Add testing instructions.
  • ✅ Specify whether this PR includes any changes to data or privacy.
  • ✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖

The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available.

Once your PR is ready for review, check one last time that all required checks appearing at the bottom of this PR are passing or skipped.
Then, add the "[Status] Needs Team Review" label and ask someone from your team review the code. Once reviewed, it can then be merged.
If you need an extra review from someone familiar with the codebase, you can update the labels from "[Status] Needs Team Review" to "[Status] Needs Review", and in that case Jetpack Approvers will do a final review of your PR.

Jetpack plugin:

The Jetpack plugin has different release cadences depending on the platform:

  • WordPress.com Simple releases happen daily.
  • WoA releases happen weekly.
  • Releases to self-hosted sites happen monthly. The next release is scheduled for April 2, 2024 (scheduled code freeze on April 1, 2024).

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

Backup plugin:

  • Next scheduled release: April 2, 2024.
  • Scheduled code freeze: March 25, 2024.

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

Boost plugin:

  • Next scheduled release: April 2, 2024.
  • Scheduled code freeze: March 25, 2024.

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

Search plugin:

  • Next scheduled release: April 2, 2024.
  • Scheduled code freeze: March 25, 2024.

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

Social plugin:

  • Next scheduled release: April 2, 2024.
  • Scheduled code freeze: March 25, 2024.

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

Starter Plugin plugin:

  • Next scheduled release: April 2, 2024.
  • Scheduled code freeze: March 25, 2024.

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

Protect plugin:

  • Next scheduled release: April 2, 2024.
  • Scheduled code freeze: March 25, 2024.

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

Videopress plugin:

  • Next scheduled release: April 2, 2024.
  • Scheduled code freeze: March 25, 2024.

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

Migration plugin:

  • Next scheduled release: April 2, 2024.
  • Scheduled code freeze: March 25, 2024.

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

@jboland88 jboland88 marked this pull request as ready for review March 26, 2024 19:55
@jboland88 jboland88 added the [Status] Needs Review To request a review from Crew. Label will be renamed soon. label Mar 26, 2024
elliottprogrammer
elliottprogrammer previously approved these changes Mar 27, 2024
View reviewed changes
Copy link
Contributor

@elliottprogrammer elliottprogrammer left a comment

Choose a reason for hiding this comment

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

Tested, works good! Just as described/expected. Code looks all good, I don't see any issues.
LGTM! 👍

projects/packages/my-jetpack/_inc/components/product-detail-table/index.jsx
customCallToAction ||
( isFree
? __( 'Start for Free', 'jetpack-my-jetpack' )
const productMoniker = name && preferProductName ? name : title;
Copy link
Contributor

Choose a reason for hiding this comment

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

Haha, I had to lookup what the meaning/definition of Moniker is... I never heard that term before! 😆
Anyway... makes sense. 👍

@github-actions github-actions bot added [Plugin] Backup A plugin that allows users to save every change and get back online quickly with one-click restores. [Plugin] Boost A feature to speed up the site and improve performance. [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Plugin] Migration [Plugin] Protect A plugin with features to protect a site: brute force protection, security scanning, and a WAF. [Plugin] Search A plugin to add an instant search modal to your site to help visitors find content faster. [Plugin] Social Issues about the Jetpack Social plugin [Plugin] Starter Plugin [Plugin] VideoPress A standalone plugin to add high-quality VideoPress videos to your site. labels Mar 27, 2024
@jboland88 jboland88 merged commit 8d7171a into trunk Mar 27, 2024
66 of 68 checks passed
@jboland88 jboland88 deleted the update/redirect-from-interstitial-if-product-active branch March 27, 2024 21:28
@github-actions github-actions bot removed the [Status] Needs Review To request a review from Crew. Label will be renamed soon. label Mar 27, 2024
elliottprogrammer
elliottprogrammer approved these changes Mar 27, 2024
View reviewed changes
Copy link
Contributor

@elliottprogrammer elliottprogrammer left a comment

Choose a reason for hiding this comment

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

LGTM!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@elliottprogrammer elliottprogrammer elliottprogrammer approved these changes

@CodeyGuyDylan CodeyGuyDylan CodeyGuyDylan approved these changes

Assignees
No one assigned
Labels
[Package] My Jetpack [Plugin] Backup A plugin that allows users to save every change and get back online quickly with one-click restores. [Plugin] Boost A feature to speed up the site and improve performance. [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Plugin] Migration [Plugin] Protect A plugin with features to protect a site: brute force protection, security scanning, and a WAF. [Plugin] Search A plugin to add an instant search modal to your site to help visitors find content faster. [Plugin] Social Issues about the Jetpack Social plugin [Plugin] Starter Plugin [Plugin] VideoPress A standalone plugin to add high-quality VideoPress videos to your site.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jboland88 @elliottprogrammer @CodeyGuyDylan