Sidebar menu: Register "plugin install" route on sites with the default interface #37686

mmtr · 2024-06-03T15:07:01Z

Proposed changes:

In #37521 we added a new "Add New Plugin" submenu which is only registered on sites with the classic admin interface so we could redirect from /wp-admin/plugin-install.php to the route of that submenu (/wp-admin/plugins.php?page=wpcom-install-plugin).

However, for that redirect to work, we need the new route to be working on all Simple sites, including sites with the default admin interface (see pMz3w-k1d-p2#comment-119194).

Since we don't want the "Add New Plugin" submenu to be visible on sites with the default admin interface, this PR implements a workaround in which it registers the menu (on all sites) and then hides it (on sites with the default interface).

To simplify the workaround, the existing logic that registers the Plugins parent menu from Nav Unification to the jetpack-mu-wpcom package.

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

N/A

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

No

Testing instructions:

Apply these changes to your WP.com simple site
With the classic admin interface, make sure you get the same behavior as before (3 submenus: Plugins > Installed Plugins, Plugins > Add New Plugin, Plugins > Marketplace)
With the default admin interface:
- Make sure Plugins still links to the Marketplace
- Make sure there are no submenus
- Make sure you can visit /wp-admin/plugins.php?page=wpcom-install-plugin

github-actions · 2024-06-03T15:07:54Z

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 update/plugins-menu 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 update/plugins-menu

bin/jetpack-downloader test jetpack-mu-wpcom-plugin update/plugins-menu

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 · 2024-06-03T15:08:08Z

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.

Jetpack plugin:

The Jetpack plugin has different release cadences depending on the platform:

WordPress.com Simple releases happen daily.
WoA releases happen weekly.
Releases to self-hosted sites happen monthly. The next release is scheduled for July 2, 2024 (scheduled code freeze on June 24, 2024).

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

Mu Wpcom plugin:

Next scheduled release: July 2, 2024.
Scheduled code freeze: June 24, 2024.

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

mmtr · 2024-06-03T15:11:27Z

projects/packages/masterbar/src/admin-menu/class-wpcom-admin-menu.php

-		if ( ! is_multisite() && current_user_can( 'update_plugins' ) ) {
-			$update_data = wp_get_update_data();
-			$count       = sprintf(
-				'<span class="update-plugins count-%s"><span class="plugin-count">%s</span></span>',
-				$update_data['counts']['plugins'],
-				number_format_i18n( $update_data['counts']['plugins'] )
-			);
-		}


This is some logic that we copy/pasted from a file that was shared between Simple and Atomic sites. For Simple sites, we don't need this logic (is_multisite always returns true), which is why I didn't incorporated into the jetpack-mu-wpcom package.

mmtr · 2024-06-03T15:11:42Z

projects/plugins/jetpack/modules/masterbar/admin-menu/class-wpcom-admin-menu.php

-		if ( ! is_multisite() && current_user_can( 'update_plugins' ) ) {
-			$update_data = wp_get_update_data();
-			$count       = sprintf(
-				'<span class="update-plugins count-%s"><span class="plugin-count">%s</span></span>',
-				$update_data['counts']['plugins'],
-				number_format_i18n( $update_data['counts']['plugins'] )
-			);
-		}


This is some logic that we copy/pasted from a file that was shared between Simple and Atomic sites. For Simple sites, we don't need this logic (is_multisite always returns true), which is why I didn't incorporated into the jetpack-mu-wpcom package.

…lt interface

rcrdortiz · 2024-06-04T10:55:15Z

Since we don't want the "Add New Plugin" submenu to be visible on sites with the default admin interface, this PR implements a workaround in which it registers the menu (on all sites) and then hides it (on sites with the default interface).

Are we 100% sure about this? What are the cons and pros of hiding the add new plugin page on the default admin interface?

dsas

Works as described, lets answer Richard's question before merging though.

rcrdortiz · 2024-06-04T11:15:09Z

Would it make sense to highlight the Plugins menu on sites that use the Default interface?

With the current implementation, it looks like this:

rcrdortiz

Changes work as described.

mmtr · 2024-06-04T11:21:12Z

Are we 100% sure about this? What are the cons and pros of hiding the add new plugin page on the default admin interface?

Not 100% sure, but it is what we decided when we launched Nav Unification a few years ago, so I just wanted to avoid revisiting that decision.

Would it make sense to highlight the Plugins menu on sites that use the Default interface?

It makes total sense, but unfortunately it's not-so-trivial technically if the submenu remains hidden.

mmtr self-assigned this Jun 3, 2024

mmtr added the [Status] Needs Team Review label Jun 3, 2024

mmtr commented Jun 3, 2024

View reviewed changes

mmtr requested a review from a team June 3, 2024 15:12

Sidebar menu: Register "plugin install" route on sites with the defau…

867f25f

…lt interface

mmtr force-pushed the update/plugins-menu branch from 39e88f1 to 867f25f Compare June 3, 2024 15:48

mmtr added 2 commits June 4, 2024 11:42

Merge remote-tracking branch 'origin/trunk' into update/plugins-menu

622ca8f

Bump versions

c7e7cab

github-actions bot added the [Plugin] mu wpcom jetpack-mu-wpcom plugin label Jun 4, 2024

dsas approved these changes Jun 4, 2024

View reviewed changes

rcrdortiz approved these changes Jun 4, 2024

View reviewed changes

mmtr merged commit fa24d75 into trunk Jun 4, 2024
57 checks passed

mmtr deleted the update/plugins-menu branch June 4, 2024 11:25

github-actions bot removed the [Status] Needs Team Review label Jun 4, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sidebar menu: Register "plugin install" route on sites with the default interface #37686

Sidebar menu: Register "plugin install" route on sites with the default interface #37686

mmtr commented Jun 3, 2024 •

edited

Loading

github-actions bot commented Jun 3, 2024 •

edited

Loading

github-actions bot commented Jun 3, 2024 •

edited

Loading

mmtr Jun 3, 2024

mmtr Jun 3, 2024

rcrdortiz commented Jun 4, 2024

dsas left a comment

rcrdortiz commented Jun 4, 2024

rcrdortiz left a comment

mmtr commented Jun 4, 2024

Sidebar menu: Register "plugin install" route on sites with the default interface #37686

Sidebar menu: Register "plugin install" route on sites with the default interface #37686

Conversation

mmtr commented Jun 3, 2024 • edited Loading

Proposed changes:

Other information:

Jetpack product discussion

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

Testing instructions:

github-actions bot commented Jun 3, 2024 • edited Loading

github-actions bot commented Jun 3, 2024 • edited Loading

mmtr Jun 3, 2024

Choose a reason for hiding this comment

mmtr Jun 3, 2024

Choose a reason for hiding this comment

rcrdortiz commented Jun 4, 2024

dsas left a comment

Choose a reason for hiding this comment

rcrdortiz commented Jun 4, 2024

rcrdortiz left a comment

Choose a reason for hiding this comment

mmtr commented Jun 4, 2024

mmtr commented Jun 3, 2024 •

edited

Loading

github-actions bot commented Jun 3, 2024 •

edited

Loading

github-actions bot commented Jun 3, 2024 •

edited

Loading