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

Search: hide search menu for atomic sites #21565

Merged
merged 5 commits into from
Oct 31, 2021
Merged

Search: hide search menu for atomic sites #21565

merged 5 commits into from
Oct 31, 2021

Conversation

kangzj
Copy link
Contributor

@kangzj kangzj commented Oct 28, 2021 •
edited
Loading

Fixes #21443
The issue is also reported in Automattic/wp-calypso#56741.

Changes proposed in this Pull Request:

  • Hide Calypso search menu for Atomic sites

Jetpack product discussion

n/a

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

no

Testing instructions:

  • Go to mc: /atomic/ephemeral-sites/
  • Create a ephemeral site and connect Jetpack
  • SSH to the site and apply the change from the branch (any better ways?)
  • Visit https://wordpress.com/view/ephemeral-xxxxx.atomicsites.blog
  • Ensure there is only one Search submenu under Jetpack
  • Ensure the Calypso search menu is still available for Simple sites.
    image

@kangzj kangzj requested a review from a team October 28, 2021 03:55
@kangzj kangzj self-assigned this Oct 28, 2021
@matticbot
Copy link
Contributor

Caution: This PR has changes that must be merged to WordPress.com
Hello kangzj! These changes need to be synced to WordPress.com - If you 're an a11n, please commandeer and confirm D69159-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 github-actions bot added [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Feature] Masterbar WordPress.com Toolbar and Dashboard customizations labels Oct 28, 2021
@github-actions
Copy link
Contributor

github-actions bot commented Oct 28, 2021 •
edited
Loading

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.

Jetpack plugin:

  • Next scheduled release: November 2, 2021.
  • Scheduled code freeze: October 25, 2021.

@github-actions github-actions bot added the [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! label Oct 28, 2021
@kangzj kangzj added [Status] Needs Team Review and removed [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! [Feature] Calypsoify labels Oct 28, 2021
@jsnmoon
Copy link
Member

jsnmoon commented Oct 28, 2021

@kangzj: I'm not having much luck with this change, unfortunately. Here's what I did:

  1. Spun up an ephemeral atomic site via the MC tool you mentioned above.
  2. Connected the site to my WPCOM account and purchased a search subscription.
  3. Using the Jetpack Beta plugin, switched to this PR branch.
  4. Navigated to WordPress.com and selected the atomic site in step 1 in the site selector.

This is what I see:

Screen Shot 2021-10-28 at 4 28 13 PM

What do you advise?

@kangzj
Copy link
Contributor Author

kangzj commented Oct 29, 2021

Thanks for you test and detailed steps @jsnmoon
I don't know why it worked when I tested. Just found the issue and had it fixed. Could you please have another look? Cheers.

jsnmoon
jsnmoon approved these changes Oct 29, 2021
View reviewed changes
Copy link
Member

@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.

👍 It works!

I just needed to flush site cache data for WPCOM to ensure it freshly fetched the correct submenus from the atomic site.

@jsnmoon jsnmoon added [Status] Ready to Merge Go ahead, you can push that green button! and removed [Status] Needs Team Review labels Oct 29, 2021
@kangzj
Copy link
Contributor Author

kangzj commented Oct 31, 2021

🚢 r234220-wpcom

@kangzj kangzj merged commit ce8cdf0 into master Oct 31, 2021
@kangzj kangzj deleted the fix/hide-search-menu-for-atomic-sites branch October 31, 2021 20:22
@github-actions github-actions bot added this to the jetpack/10.3 milestone Oct 31, 2021
@github-actions
Copy link
Contributor

Great news! One last step: head over to your WordPress.com diff, D69159-code, and commit it.
Once you've done so, come back to this PR and add a comment with your changeset ID.

Thank you!

@github-actions github-actions bot removed the [Status] Ready to Merge Go ahead, you can push that green button! label Oct 31, 2021
davidlonjon added a commit that referenced this pull request Nov 2, 2021
@davidlonjon
[not verified] Merge branch 'master' into fix/boost-and-general-linti…
cf79f69 
…ng-formatting

* master:
  docker: Add script to create "fake" translations for testing i18n (#21407)
  Add webpack-config package (#21482)
  Update dependency composer/semver to v3.2.6 (#21608)
  Update dependency eslint-plugin-import to v2.25.2 (#21607)
  Update JS unit testing packages (#21605)
  Admin page: Fix pricing/currency displayed on the upgrade page (#21594)
  Update dependency @rollup/plugin-node-resolve to v13.0.6 (#21599)
  Publicize: Add new publicize icon toggle component (#20957)
  Search: hide search menu for atomic sites (#21565)
  Allow /wp/v2/sites/1234/batch endpoint to process widget updates (#21549)
  tooling: Add `.mjs` as a JavaScript extension (#21589)
  Jetpack: PHPCS src/class-tracking (#21583)
  Publicize: make the default social media message blank (#21477)
davidlonjon added a commit that referenced this pull request Nov 2, 2021
@davidlonjon
Merge branch 'master' into add/boost-e2e-ci-integration
515610a 
* master:
  docker: Add script to create "fake" translations for testing i18n (#21407)
  Add webpack-config package (#21482)
  Update dependency composer/semver to v3.2.6 (#21608)
  Update dependency eslint-plugin-import to v2.25.2 (#21607)
  Update JS unit testing packages (#21605)
  Admin page: Fix pricing/currency displayed on the upgrade page (#21594)
  Update dependency @rollup/plugin-node-resolve to v13.0.6 (#21599)
  Publicize: Add new publicize icon toggle component (#20957)
  Search: hide search menu for atomic sites (#21565)
  Allow /wp/v2/sites/1234/batch endpoint to process widget updates (#21549)
  tooling: Add `.mjs` as a JavaScript extension (#21589)
  Jetpack: PHPCS src/class-tracking (#21583)
  Publicize: make the default social media message blank (#21477)
davidlonjon added a commit that referenced this pull request Nov 2, 2021
@davidlonjon
Merge branch 'master' into fix/explicitly-hide-admin-bar
8c032d9 
* master: (40 commits)
  docker: Add script to create "fake" translations for testing i18n (#21407)
  Add webpack-config package (#21482)
  Update dependency composer/semver to v3.2.6 (#21608)
  Update dependency eslint-plugin-import to v2.25.2 (#21607)
  Update JS unit testing packages (#21605)
  Admin page: Fix pricing/currency displayed on the upgrade page (#21594)
  Update dependency @rollup/plugin-node-resolve to v13.0.6 (#21599)
  Publicize: Add new publicize icon toggle component (#20957)
  Search: hide search menu for atomic sites (#21565)
  Allow /wp/v2/sites/1234/batch endpoint to process widget updates (#21549)
  tooling: Add `.mjs` as a JavaScript extension (#21589)
  Jetpack: PHPCS src/class-tracking (#21583)
  Publicize: make the default social media message blank (#21477)
  Photon: do not serve Wikipedia images from CDN. (#21572)
  Publicize: update endpoint (#21510)
  [Plugin] Backup: Update initial backup screen (#21559)
  RNA Connect Screen: Remove unused files (#21570)
  RNA Connection: Add ConnectScreenRequiredPlan Component (#21521)
  Update PHPUnit coverage configs (#21557)
  cli: Fix skeleton phpunit config (#21555)
  ...
@jeherve jeherve modified the milestones: jetpack/10.3, jetpack/10.4 Nov 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jsnmoon jsnmoon jsnmoon approved these changes

Assignees

@kangzj kangzj

Labels
[Feature] Masterbar WordPress.com Toolbar and Dashboard customizations [Feature] Search For all things related to Search [Feature] WPCOM API [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ Touches WP.com Files
Projects
None yet
Milestone
jetpack/10.4
Development

Successfully merging this pull request may close these issues.

Jetpack Search: Duplicate "Search" menu item on Atomic sites
4 participants
@kangzj @matticbot @jsnmoon @jeherve