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: open AI Control upgrade link on new tab #37629

Merged

Conversation

lhkowalski
Copy link
Contributor

@lhkowalski lhkowalski commented May 29, 2024

Part of #37458.

Proposed changes:

  • Add support for upgradeUrl on the AI Control component (mainly the Extension AI Control), so we can provide an upgrade URL for the upgrade link, that will open on a new tab
  • Change the extension code to provide the checkout URL as upgradeUrl on the Extension AI Control, so the upgrade link on the extension will open on a new tab
  • Remove the "free" word from the AI Control upgrade message, because we are showing it even on paid plans

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:

  • Run this branch on your testing site, open the editor and add some text to a paragraph
  • Click the extension icon to open the AI extension on the paragraph:
Screenshot 2024-05-29 at 17 06 52
  • On the footer of the assistant
    • confirm the message is not mentioning "free" requests
    • confirm the upgrade link will open on a new tab

Testing the upgrade link on the error message:

  • Sandbox the public-api so we can simulate a quota exceeded error
  • On the first line of the run_query method of the Jetpack AI Query class, add this line:
return new \WP_Error( 'error_quota_exceeded', __( 'You exceeded your current quota, please check your plan details', 'jetpack' ), array( 'status' => 429 ) );
  • Go back to the editor, open the AI extension on the paragraph, then type some prompt there (example, "add emoji on the end")
  • Since we added the simulated error, you will see this message:
Screenshot 2024-05-29 at 17 39 31
  • Confirm the upgrade link will open on a new tab

@lhkowalski lhkowalski requested a review from a team May 29, 2024 20:34
@lhkowalski lhkowalski self-assigned this May 29, 2024
@github-actions github-actions bot added [Block] AI Assistant [JS Package] AI Client [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Status] In Progress RNA labels May 29, 2024
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 June 4, 2024 (scheduled code freeze on June 3, 2024).

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

Copy link
Contributor

github-actions bot commented May 29, 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 update/jetpack-ai-open-ai-control-upgrades-on-new-tab branch.

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

    bin/jetpack-downloader test jetpack update/jetpack-ai-open-ai-control-upgrades-on-new-tab
    

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

@@ -134,11 +137,16 @@ export function UpgradeMessage( {
<span>
{ sprintf(
// translators: %1$d: number of requests remaining
__( 'You have %1$d free requests remaining.', 'jetpack-ai-client' ),
__( 'You have %1$d requests remaining.', 'jetpack-ai-client' ),
Copy link
Contributor

Choose a reason for hiding this comment

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

:oof3:

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

2024-05-29_19-38-11

@lhkowalski lhkowalski merged commit 4fd4214 into trunk May 30, 2024
59 checks passed
@lhkowalski lhkowalski deleted the update/jetpack-ai-open-ai-control-upgrades-on-new-tab branch May 30, 2024 13:03
@github-actions github-actions bot added this to the jetpack/13.5 milestone May 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Block] AI Assistant [JS Package] AI Client [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ RNA
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants