Skip to content

Conversation

@dognose24
Copy link
Contributor

@dognose24 dognose24 commented Sep 23, 2022

Fixes #25915

Changes proposed in this Pull Request:

  • Expose the offset option of the IconTooltip component to the Popover component and fix the relative position
  • Modify PricingTable component styles adapting to the design and refactor the type of tooltipInfo to ReactNode for HTML syntax
  • Introduce PricingTable to complete the upsell page for the new pricing change
    -------------------------------------- updated --------------------------------------
  • Introduce the URL parameter new_pricing_202208=1 to determine when the new pricing table shows.

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?

Jetpack product discussion

p1HpG7-hEH-p2

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

N/A

Testing instructions:

  • Go to a site with Jetpack connected but did not purchase Jetpack Search
  • Navigate to the url /wp-admin/admin.php?page=jetpack-search
  • Ensure there is the existing upsell page with a pricing card
  • Navigate to the url /wp-admin/admin.php?page=jetpack-search&new_pricing_202208=1
  • Ensure there is a brand new upsell page
Before After
截圖 2022-09-24 上午5 05 00 截圖 2022-09-24 上午5 22 08
  • Ensure the new upsell page conforms to the design

截圖 2022-09-24 上午5 08 32

@matticbot
Copy link
Contributor

Caution: This PR has changes that must be merged to WordPress.com
Hello dognose24! These changes need to be synced to WordPress.com - If you 're an a11n, please commandeer and confirm D88440-code works as expected before merging this PR. Once this PR is merged, please commit the changes to WP.com. Thank you!
This revision will be updated with each commit to this PR

@github-actions
Copy link
Contributor

github-actions bot commented Sep 23, 2022

Are you an Automattician? You can now test your Pull Request on WordPress.com. On your sandbox, run bin/jetpack-downloader test jetpack update/upsell_page to get started. More details: p9dueE-5Nn-p2

@dognose24 dognose24 added the [Package] Search Contains core Search functionality for Jetpack and Search plugins label Sep 23, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Sep 23, 2022

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.
  • ✅ All commits were linted before commit.
  • ✅ 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 (other than "Required review") 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 you’ve done so, switch to the "[Status] Needs Review" label; someone from Jetpack Crew will then review this PR and merge it to be included in the next Jetpack release.


Search plugin:

  • Next scheduled release: October 4, 2022.
  • Scheduled code freeze: September 26, 2022.

@github-actions github-actions bot added the [Status] Needs Author Reply We need more details from you. This label will be auto-added until the PR meets all requirements. label Sep 23, 2022
@dognose24 dognose24 added [Plugin] Search A plugin to add an instant search modal to your site to help visitors find content faster. [Feature] Search For all things related to Search [Status] Needs Team Review Obsolete. Use Needs Review instead. and removed [Status] Needs Author Reply We need more details from you. This label will be auto-added until the PR meets all requirements. labels Sep 23, 2022
Copy link
Contributor

@jsnmoon jsnmoon left a comment

Choose a reason for hiding this comment

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

Unfortunately, this PR removes the existing upsell interface before the new pricing tier goes live. I commented inline on how to ship this code while preserving our current onboarding flow.

],
};

const pricingTable = (
Copy link
Contributor

Choose a reason for hiding this comment

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

We can spin this off into a functional component (e.g. SearchPricingTable) in this file. Let's tackle this in a follow-up PR.

@jsnmoon jsnmoon added [Status] Needs Author Reply We need more details from you. This label will be auto-added until the PR meets all requirements. and removed [Status] Needs Team Review Obsolete. Use Needs Review instead. labels Sep 23, 2022
@dognose24 dognose24 requested a review from jsnmoon September 26, 2022 08:12
@dognose24 dognose24 removed the [Status] Needs Author Reply We need more details from you. This label will be auto-added until the PR meets all requirements. label Sep 26, 2022
@dognose24 dognose24 added the [Status] Needs Team Review Obsolete. Use Needs Review instead. label Sep 26, 2022
Copy link
Contributor

@jsnmoon jsnmoon left a comment

Choose a reason for hiding this comment

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

Works as described.

I noticed that the links within the tooltips aren't clickable since the tooltips despawn when we stop mousing over the icon. Let's address this in a follow-up PR 🙂

Copy link
Contributor

@oskosk oskosk left a comment

Choose a reason for hiding this comment

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

Approving again to see if it stops being stuck

@jsnmoon jsnmoon merged commit a96a700 into trunk Sep 26, 2022
@jsnmoon jsnmoon deleted the update/upsell_page branch September 26, 2022 20:16
@github-actions github-actions bot removed the [Status] Needs Team Review Obsolete. Use Needs Review instead. label Sep 26, 2022
@github-actions github-actions bot added this to the search/1.3.0 milestone Sep 26, 2022
@github-actions
Copy link
Contributor

Great news! One last step: head over to your WordPress.com diff, D88440-code, and deploy it.
Once you've done so, come back to this PR and add a comment with your SVN changeset ID (e.g. r12345-wpcom).

Thank you!

@jsnmoon
Copy link
Contributor

jsnmoon commented Sep 26, 2022

🚢 r253223-wpcom

@jsnmoon
Copy link
Contributor

jsnmoon commented Sep 26, 2022

I noticed that the links within the tooltips aren't clickable since the tooltips despawn when we stop mousing over the icon. Let's address this in a follow-up PR 🙂

Fix for this tooltip bug is proposed here.

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

Labels

[Feature] Search For all things related to Search [JS Package] Components [Package] Search Contains core Search functionality for Jetpack and Search plugins [Plugin] Search A plugin to add an instant search modal to your site to help visitors find content faster. RNA Touches WP.com Files

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Search Plugin: Add plans view page

5 participants