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

Fix/self hosted product redirect #40840

Open
wants to merge 4 commits into
base: trunk
Choose a base branch
from

Conversation

valterlorran
Copy link
Contributor

@valterlorran valterlorran commented Jan 3, 2025

Fixes Automattic/wp-calypso#72429

Proposed changes:

  • We noticed that the "Products" button was not working on self-hosted sites connected with Jetpack and had the SSO enabled. The problem was the user was being redirected to https://wordpress.com/types/product/{site} as opposed to /wp-admin/edit.php?post_type=product.
  • I updated the check on the class-jetpack-admin-menu.php file, which is responsible for generating the link we use in Calypso.
  • I'm not convinced that this is the best approach, but I believe we shouldn't disable the show_in_rest prop on the Product type.

For more context, please visit Automattic/wp-calypso#72429

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:

  • We need a self-hosted site to test this. I used a Jurassic Ninja site for that and applied the changes manually.
  • Install WooCommerce on your self-hosted site and connect Jetpack.
  • Don't enable the SSO just yet.
  • Now access your site on WordPress.com
  • Click on the Products link, and you should be redirected to the WP Admin page of your site.
  • Now enable the SSO, and go back to WordPress.com
  • Click again on the Products link and you should be redirected to the WP Admin page again.
  • You can also remove the changes and test the wrong behavior.

Copy link
Contributor

github-actions bot commented Jan 3, 2025

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 fix/self-hosted-product-redirect 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 fix/self-hosted-product-redirect
    
    bin/jetpack-downloader test jetpack-mu-wpcom-plugin fix/self-hosted-product-redirect
    

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

@valterlorran valterlorran requested review from myhro and fgiannar January 3, 2025 16:06
@valterlorran valterlorran self-assigned this Jan 3, 2025
@github-actions github-actions bot added [Feature] Masterbar WordPress.com Toolbar and Dashboard customizations [Package] Masterbar labels Jan 3, 2025
Copy link
Contributor

github-actions bot commented Jan 3, 2025

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 a "[Type]" label (Bug, Enhancement, Janitorial, Task).
  • ✅ 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.


Follow this PR Review Process:

  1. Ensure all required checks appearing at the bottom of this PR are passing.
  2. Choose a review path based on your changes:
    • A. Team Review: add the "[Status] Needs Team Review" label
      • For most changes, including minor cross-team impacts.
      • Example: Updating a team-specific component or a small change to a shared library.
    • B. Crew Review: add the "[Status] Needs Review" label
      • For significant changes to core functionality.
      • Example: Major updates to a shared library or complex features.
    • C. Both: Start with Team, then request Crew
      • For complex changes or when you need extra confidence.
      • Example: Refactor affecting multiple systems.
  3. Get at least one approval before merging.

Still unsure? Reach out in #jetpack-developers for guidance!

@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 Jan 3, 2025
@valterlorran valterlorran added Groundskeeping Worked on by Dotcom Groundskeeping 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] Masterbar WordPress.com Toolbar and Dashboard customizations [Package] Masterbar labels Jan 3, 2025
@github-actions github-actions bot added [Feature] Masterbar WordPress.com Toolbar and Dashboard customizations [Package] Masterbar [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! labels Jan 3, 2025
*
* @return bool Whether the site is a self-hosted site.
*/
private function is_self_hosted_site() {
Copy link
Contributor

Choose a reason for hiding this comment

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

There's a similar check in the comments module, where we basically check if the Host.is_wpcom_platform() method returns false:

// Not allow it to run on self-hosted or simple sites
if ( ! ( new Host() )->is_wpcom_platform() || ( new Host() )->is_wpcom_simple() ) {
	$tracking_event = 'hidden_self_hosted';
}

I'm not sure if it works perfectly in this case, given it checks if the site is either a Simple Site or Atomic, but maybe we can use a similar check? This way we may not need to add a new method with a different logic.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Feature] Masterbar WordPress.com Toolbar and Dashboard customizations Groundskeeping Worked on by Dotcom Groundskeeping [Package] Masterbar [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you!
Projects
None yet
2 participants