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

My Jetpack: handle AI is_upgradable #39074

Merged
merged 7 commits into from
Aug 26, 2024

Conversation

CGastrell
Copy link
Contributor

@CGastrell CGastrell commented Aug 26, 2024

This PR addresses some mishaps on the filters and methods involved in the AI class for My Jetpack card to reflect the status properly

Works with D159278-code

See copy edits: p1724199104422529/1724085510.340989-slack-C02TQF5VAJD

Fixes #39075

Proposed changes:

Fix a wee glitch with Date constructor when attempting to show remaining days until count reset.
Use helper data to properly determine when to show the "Upgrade" button.

Other information:

  • Have you written new tests for your changes, if applicable?
  • Have you checked the E2E test CI results, and verified that your changes do not break them?
  • Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

p1724085510340989-slack-C02TQF5VAJD

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

No

Testing instructions:

Follow the instructions on D159278-code to setup scenarios on your sandbox. Then test them against this PR.
With tiers disabled, only upgradable cases should show the "Upgrade" button. "View" button should always be there.

Enabling tier plans should get things back to normal (both "Upgrade" and "View" buttons are visible)

@CGastrell CGastrell added [Status] Needs Team Review [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Package] My Jetpack labels Aug 26, 2024
@CGastrell CGastrell self-assigned this Aug 26, 2024
Copy link
Contributor

github-actions bot commented Aug 26, 2024

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 change/my-jetpack-disabled-tiers-handle branch.

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

    bin/jetpack-downloader test jetpack change/my-jetpack-disabled-tiers-handle
    

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

Copy link
Contributor

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.


Follow this PR Review Process:

  1. Ensure all required checks appearing at the bottom of this PR are passing.
  2. Choose a review path based on your changes:
    • A. Team Review: add the "[Status] Needs Team Review" label
      • For most changes, including minor cross-team impacts.
      • Example: Updating a team-specific component or a small change to a shared library.
    • B. Crew Review: add the "[Status] Needs Review" label
      • For significant changes to core functionality.
      • Example: Major updates to a shared library or complex features.
    • C. Both: Start with Team, then request Crew
      • For complex changes or when you need extra confidence.
      • Example: Refactor affecting multiple systems.
  3. Get at least one approval before merging.

Still unsure? Reach out in #jetpack-developers for guidance!


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 September 3, 2024 (scheduled code freeze on September 2, 2024).

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

@CGastrell CGastrell requested a review from a team August 26, 2024 15:06
lhkowalski
lhkowalski previously approved these changes Aug 26, 2024
Copy link
Contributor

@lhkowalski lhkowalski left a comment

Choose a reason for hiding this comment

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

Got the changes on the My Jetpack AI card:

  • with tiers disabled, only free plans can see the "Upgrade" button
  • with tiers enabled, everything works as usual

Cliking the "Upgrade" button with tiers disabled, I see the product interstitial with the new list of features:

  • Generate text, tables, lists, and forms
  • Easily refine content to your liking
  • Make your content easier to read
  • Generate images with one-click
  • Optimize your titles for better performance
  • Priority support

We may need to tweak it since it mentions "unlimited requests", that we will probably avoid saying, as mentioned by William on our call today.

I don't see pricing, though, but I think it will only happen when the store changes are in place, right?

lhkowalski
lhkowalski previously approved these changes Aug 26, 2024
@CGastrell CGastrell enabled auto-merge (squash) August 26, 2024 19:22
@CGastrell CGastrell merged commit c2b8665 into trunk Aug 26, 2024
71 checks passed
@CGastrell CGastrell deleted the change/my-jetpack-disabled-tiers-handle branch August 26, 2024 19:34
@github-actions github-actions bot added this to the jetpack/13.8 milestone Aug 26, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Package] My Jetpack [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/
Projects
None yet
Development

Successfully merging this pull request may close these issues.

MyJetpack: review product class output for interstitial
2 participants