jetpack icon indicating copy to clipboard operation
jetpack copied to clipboard
verified publisher icon Automattic

Jetpack mu and wpcomsh - hide wpcom items for non wpcom site users

Open Addison-Stavlo opened this issue 1 year ago • 2 comments

Fixes # Automattic/dotcom-forge#7892

Proposed changes:

Hides various wpcom items in wp-admin when the current user is not connected to wpcom:

  • Hosting card on the dashboard Screenshot 2024-07-02 at 2 54 33 PM

  • WPcom command palette Screenshot 2024-07-02 at 2 54 56 PM

  • Themes banner (seen at themes -> add new) Screenshot 2024-07-02 at 2 55 19 PM

  • themes showcase sidebar link. Screenshot 2024-07-02 at 2 55 31 PM

  • plugins marketplace sidebar link Screenshot 2024-07-02 at 2 55 47 PM

  • plugins banner under 'add plugins' Screenshot 2024-07-02 at 2 55 57 PM

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:

  • Set up a woa dev blog.
  • install the jetpack beta tester plugin and ensure your test site has the JETPACK_MU_WPCOM_LOAD_VIA_BETA_PLGUIN constant defined (both noted in github-actions comment below).
  • In the jetpack beta tester plugin's settings, find "jetpack beta tester" and activate the "bleeding edge" version. This is necessary to activate this branch on wpcomsh here.
  • Next, activate this branch in both "WordPress.com Features" and "WordPress.com Site Helper" sections of the jetpack beta tester plugin.
  • Verify all of the above items shown in the description still show up as expected in wp-admin.
  • Visit Users-> add new user. Create a new user and password for the site, do not invite them to wpcom.
  • Open wp-admin for this site in an incognito tab. Instead of logging in via wordpress.com, login via the new site user/pw combo you created.
  • In wp-admin, verify the above items are not visible.

Addison-Stavlo avatar Jul 02 '24 14:07 Addison-Stavlo

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/hide-wpcom-wpadmin-items-from-non-wpcom-users 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/hide-wpcom-wpadmin-items-from-non-wpcom-users

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

github-actions[bot] avatar Jul 02 '24 14:07 github-actions[bot]

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

  • :white_check_mark: Include a description of your PR changes.
  • :white_check_mark: Add a "[Status]" label (In Progress, Needs Team Review, ...).
  • :white_check_mark: Add testing instructions.
  • :white_check_mark: Specify whether this PR includes any changes to data or privacy.
  • :white_check_mark: 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 :robot:

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.

github-actions[bot] avatar Jul 02 '24 14:07 github-actions[bot]

I resolved the merge conflicts with version numbers that started blocking this at some point after the approval. Now merging is blocked again for another review. 😞

Addison-Stavlo avatar Jul 03 '24 12:07 Addison-Stavlo

enabling auto-merge this time so that doesnt happen again...

Addison-Stavlo avatar Jul 03 '24 12:07 Addison-Stavlo

Im pushing another small change here (9533bc5). Eric pointed out that we have no role check on the site management card. So I am adding a commit to handle that as well.

To test this you can add a wpcom connected user with any role less than 'administrator'. Log into wp-admin with that wpcom user and verify the management card is visible on the dashboard.

Addison-Stavlo avatar Jul 03 '24 14:07 Addison-Stavlo