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

Jetpack AI: Handle "Contact Us" upgrade on the usage panel for Simple sites #34273

Merged

Conversation

lhkowalski
Copy link
Contributor

@lhkowalski lhkowalski commented Nov 23, 2023

Fixes #34219.

Proposed changes:

  • Change the upgrade button on the usage panel when the site is on the last tier and is a Simple or Atomic site
  • In this case, the upgrade path is to send a message asking for more requests
    • for Jetpack sites, this details is handled by the My Jetpack interstitial
    • for Simple and Atomic, there is no interstitial and therefore we need to do everything on the usage panel itself

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

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

Testing instructions:

  • Apply this branch to your sandbox using the command that will be provided below (or rsync it):
bin/jetpack-downloader test jetpack update/jetpack-ai-handle-contact-us-upgrade-on-simple-sites
  • Sandbox a Simple site for testing
  • Go to the block editor and open the usage panel on the Jetpack sidebar
  • Open the browser console and dispatch the following action:
wp.data.dispatch( 'wordpress-com/plans' ).storeAiAssistantFeature( {
    "hasFeature": true,
    "isOverLimit": false,
    "requestsCount": 0,
    "requestsLimit": 20,
    "requireUpgrade": false,
    "upgradeType": "default",
    "usagePeriod": {
        "currentStart": "2023-11-01 00:00:00",
        "nextStart": "2023-12-01 00:00:00",
        "requestsCount": 0
    },
    "currentTier": {
        "slug": "jetpack_ai_yearly:-q-1000",
        "limit": 1000,
        "value": 1000
    },
    "nextTier": null,
    "tier-plans-enabled":true
} );
  • Confirm that you see:
    • a new text saying "Need more requests?"
    • a button saying "Contact Us"
  • Confirm the URL of the button is the following:
Screenshot 2023-11-23 at 15 02 38
  • Confirm that, when you click the button, your email client is prompted to open
  • The expected UI:
Screenshot 2023-11-23 at 15 00 09
  • Do the same test for a Jetpack site
  • Confirm that, for the Jetpack site, you see:
    • No text saying "Need more requests?"
    • a button saying "Get more requests"
  • Confirm that in this case the link goes to the Jetpack interstitial
  • The expected UI:
Screenshot 2023-11-23 at 15 30 26
  • Do the same test again for the Simple and the Jetpack sites, but now dispatching the following action (that will set the current plan as the 500 one):
wp.data.dispatch( 'wordpress-com/plans' ).storeAiAssistantFeature( {
    "hasFeature": true,
    "isOverLimit": false,
    "requestsCount": 0,
    "requestsLimit": 20,
    "requireUpgrade": false,
    "upgradeType": "default",
    "usagePeriod": {
        "currentStart": "2023-11-01 00:00:00",
        "nextStart": "2023-12-01 00:00:00",
        "requestsCount": 0
    },
    "currentTier": {
        "slug": "jetpack_ai_yearly:-q-500",
        "limit": 500,
        "value": 500
    },
    "nextTier": {
        "slug": "jetpack_ai_yearly:-q-750",
        "limit": 750,
        "value": 750
    },
    "tier-plans-enabled":true
} );
  • In this case, confirm that the button on the Simple site:
    • Says "Get 750 requests" (meaning it is showing the value of the next plan, as before)
    • Leads you to the checkout page
  • In this case, confirm that the button on the Jetpack site:
    • Says "Get 750 requests" (meaning it is showing the value of the next plan, as before)
    • Leads you to the interstitial page
  • This is to make sure the previous behavior is not broken

@lhkowalski lhkowalski added [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Extension] AI Assistant Plugin labels Nov 23, 2023
@lhkowalski lhkowalski requested a review from a team November 23, 2023 18:10
@lhkowalski lhkowalski self-assigned this Nov 23, 2023
Copy link
Contributor

github-actions bot commented Nov 23, 2023

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/jetpack-ai-handle-contact-us-upgrade-on-simple-sites branch.

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

    bin/jetpack-downloader test jetpack update/jetpack-ai-handle-contact-us-upgrade-on-simple-sites
    

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.


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 December 5, 2023 (scheduled code freeze on November 28, 2023).

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

@lhkowalski lhkowalski requested review from CGastrell and a team November 24, 2023 13:32
Copy link
Contributor

@dhasilva dhasilva left a comment

Choose a reason for hiding this comment

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

LGTM

@lhkowalski lhkowalski merged commit a20bd92 into trunk Nov 24, 2023
52 checks passed
@lhkowalski lhkowalski deleted the update/jetpack-ai-handle-contact-us-upgrade-on-simple-sites branch November 24, 2023 18:28
@github-actions github-actions bot added this to the jetpack/12.9 milestone Nov 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Extension] AI Assistant Plugin [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.

AI Tiered Plans: Update upgrade button from Usage Panel to support tiered plans
3 participants