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

Hide wpcom features when site is agency-managed or user is local #38364

Merged
merged 1 commit into from
Jul 17, 2024

Conversation

fushar
Copy link
Contributor

@fushar fushar commented Jul 17, 2024

Fixes https://github.com/Automattic/dotcom-forge/issues/8197

Proposed changes:

This PR disables the following wpcom-only features if the site is fully agency-managed, or if the user is a local user (not connected to WordPress.com).

It works by consolidating the scattered is_agency_managed() checks as follows:

Feature Screenshot
WP.com masterbar logo pointing to /sites image
Reader masterbar icon image
Help center masterbar icon image
Howdy menu -> My Account image
Hosting menu image
Sidebar upsell image
Site management panel widget image
Appearance -> Theme Showcase image
Appearance -> Themes -> Add New Theme banner image
Plugins -> {Marketplace, Scheduled Updates} image
Command palette (cmd-K) image
Settings -> General -> Admin Interface Style image
Settings -> Reading -> Site Visibility link image
Settings -> Writing -> Update Services image

Note

It looks like Plugin Marketplace banner is still shown to non-wpcom user. I asked for clarification here: https://github.com/Automattic/jetpack/pull/38241/files#r1680796660 cc: @Addison-Stavlo

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:

Test the following scenarios:

  • Simple site (Default and Classic)
  • Atomic site, wpcom user (Default and Classic)
  • Atomic site, local user (Classic)
  • Atomic site, wpcom user (Classic) but is_fully_managed_agency_site option is 1 on that site

Copy link
Contributor

github-actions bot commented Jul 17, 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 fully-agency-check 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 fully-agency-check
    

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

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.

@fushar fushar force-pushed the fully-agency-check branch 2 times, most recently from 2756596 to 6eba014 Compare July 17, 2024 09:17
@fushar fushar requested review from a team and mmtr July 17, 2024 09:56
@fushar fushar self-assigned this Jul 17, 2024
@fushar fushar marked this pull request as ready for review July 17, 2024 09:59
Copy link
Contributor

@davemart-in davemart-in left a comment

Choose a reason for hiding this comment

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

Went through each scenario. Everything checks out. Nicely done!

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