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

Masterbar Site Menu - Tell Calypso the current site via ?origin_site_id= #38401

Merged
merged 13 commits into from
Jul 18, 2024

Conversation

okmttdhr
Copy link
Member

@okmttdhr okmttdhr commented Jul 18, 2024

Related to

Proposed changes:

This PR adds the origin_site_id URL param to the links in the masterbar.

Screenshot 2024-07-18 at 15 37 36

This is complemented by Automattic/wp-calypso#92777: It initializes the selected site by reading origin_site_id.

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:

Copy link
Contributor

github-actions bot commented Jul 18, 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 add/populate-site-from-wp-admin branch.

    • For jetpack-mu-wpcom changes, also add define( 'JETPACK_MU_WPCOM_LOAD_VIA_BETA_PLUGIN', true ); to your wp-config.php file.
  • To test on Simple, run the following command on your sandbox:

    bin/jetpack-downloader test jetpack-mu-wpcom-plugin add/populate-site-from-wp-admin
    

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

github-actions bot commented Jul 18, 2024

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.


Mu Wpcom plugin:

  • Next scheduled release: August 6, 2024.
  • Scheduled code freeze: July 29, 2024.

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


Wpcomsh plugin:

  • Next scheduled release: August 6, 2024.
  • Scheduled code freeze: July 29, 2024.

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

@okmttdhr okmttdhr changed the title Masterbar Site Menu - Tell Calypso the current site via origin_site_id Masterbar Site Menu - Tell Calypso the current site via ?origin_site_id= Jul 18, 2024
@okmttdhr okmttdhr marked this pull request as ready for review July 18, 2024 06:41
@okmttdhr okmttdhr self-assigned this Jul 18, 2024
@okmttdhr okmttdhr requested a review from a team July 18, 2024 07:10
@okmttdhr okmttdhr requested a review from a team July 18, 2024 07:31
fushar
fushar previously approved these changes Jul 18, 2024
Addison-Stavlo
Addison-Stavlo previously approved these changes Jul 18, 2024
Copy link
Contributor

@Addison-Stavlo Addison-Stavlo left a comment

Choose a reason for hiding this comment

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

This tests great on my end as well!

@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 Jul 18, 2024
@Addison-Stavlo Addison-Stavlo dismissed stale reviews from fushar and themself via 3e407b1 July 18, 2024 13:30
Addison-Stavlo
Addison-Stavlo previously approved these changes Jul 18, 2024
Copy link
Contributor

@Addison-Stavlo Addison-Stavlo left a comment

Choose a reason for hiding this comment

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

re-approve

@github-actions github-actions bot added the [Plugin] mu wpcom jetpack-mu-wpcom plugin label Jul 18, 2024
Addison-Stavlo
Addison-Stavlo previously approved these changes Jul 18, 2024
Copy link
Contributor

@Addison-Stavlo Addison-Stavlo left a comment

Choose a reason for hiding this comment

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

yup...

Copy link
Contributor

@Addison-Stavlo Addison-Stavlo left a comment

Choose a reason for hiding this comment

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

I had to run the various helper commands the linter check gave me one after another. Updating version numbers, composer locks, adding changlog files, etc. from jetpack-mu-wpcom, to mu-wpcom-plugin, then to wpcomsh. The checks are finally happy.

@Addison-Stavlo Addison-Stavlo merged commit 15f7929 into trunk Jul 18, 2024
54 checks passed
@Addison-Stavlo Addison-Stavlo deleted the add/populate-site-from-wp-admin branch July 18, 2024 14:03
@github-actions github-actions bot removed the [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! label Jul 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants