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.

Sign up for GitHub

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

Jump to bottom

Nav Redesign: Improve Plugins menu consistency #37521

Merged
merged 8 commits into from
May 30, 2024
Merged

Nav Redesign: Improve Plugins menu consistency #37521

merged 8 commits into from
May 30, 2024

Conversation

dsas
Copy link
Contributor

@dsas dsas commented May 23, 2024 •
edited by mmtr

Fixes https://github.com/Automattic/dotcom-forge/issues/6940 (see also pfsHM7-YW-p2)

Proposed changes:

In order to improve the consistency menu of the Plugins menu for Simple and Atomic sites, this PR:

  • Registers a "Plugins > Marketplace" menu for both Simple and Atomic that links to the /plugins/:site
  • Register a "Add New Plugin" menu for Simple sites that links to plugins.php?page=wpcom-install-plugin. In the future, plugin-install.php might redirect here (see pMz3w-k1d-p2).
Screenshot 2024-05-29 at 13 18 59

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 classic site
  • Go to either Calypso or WP Admin for that site
  • Check the Plugins menu
  • Make sure there is a new "Plugins Marketplace" submenu that links to /plugins/:site
  • For Simple sites, make sure there is a "Add New Plugin" submenu that links to plugins.php?page=wpcom-install-plugin and check the splash screen is displayed
  • Make sure the rest of the submenus work as expected

dsas added 2 commits May 23, 2024 20:24
@dsas
Plugins menu for untangled sites
bd73f8d 
All sites should now get these plugin menu items:
 * Installed plugins (plugins.php)
 * Add New Plugin (plugin-install.php)
 * Plugin Marketplace (wordpress.com/plugins/:site)

Additionally, atomic sites also get "Scheduled Updates"
(wordpress.com/plugins/scheduled-updates/:site).

This means that sites have consistency across simple and
WoA environments, and the plugin marketplace is accessible.

This is a WIP, this commit contains some TODOs.
@dsas
changelog
dc589f0
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented May 23, 2024 •
edited

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/plugin-menu2 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 update/plugin-menu2

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 GitHub Actions
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.

mmtr
mmtr reviewed May 28, 2024
View reviewed changes
projects/packages/jetpack-mu-wpcom/src/features/wpcom-site-menu/wpcom-site-menu.php Outdated
$found_plugin_install_submenu = false;
foreach ( $menu as &$menu_item ) {
if ( 'plugins.php' === $menu_item[2] ) {
$found_plugin_menu = true;
Copy link
Member

Choose a reason for hiding this comment

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

I'm failing to see under which circumstances this menu can exist for Simple sites, so I'm considering to simplify the logic here (and have something similar to what we had before).

@mmtr mmtr mentioned this pull request May 28, 2024
Merged
7 tasks
@mmtr mmtr changed the title Plugin menu consistency Nav Redesign: Register "Plugins Marketplace" menu May 28, 2024
@mmtr mmtr self-assigned this May 28, 2024
@mmtr mmtr marked this pull request as ready for review May 28, 2024 13:03
@fushar fushar mentioned this pull request May 29, 2024
Merged
7 tasks
@mmtr mmtr changed the title Nav Redesign: Register "Plugins Marketplace" menu Nav Redesign: Register "Plugins > Marketplace" menu May 29, 2024
@mmtr mmtr changed the title Nav Redesign: Register "Plugins > Marketplace" menu Nav Redesign: Improve Plugins menu consistency May 29, 2024
@mmtr
Copy link
Member

mmtr commented May 29, 2024 •
edited

Tests / Static analysis (pull_request) Failing after 4m

Updated the stubs in D150355-code but they are not updated in Jetpack. Asked in p1716983860931499-slack-CDLH4C1UZ

EDIT: Solved

taipeicoder
taipeicoder approved these changes May 30, 2024
View reviewed changes
Copy link
Contributor

@taipeicoder taipeicoder left a comment

Choose a reason for hiding this comment

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

Works as intended 👍

Simple Classic Atomic Classic
Screenshot 2024-05-30 at 11 11 29 AM Screenshot 2024-05-30 at 11 10 47 AM

Simple Classic:

  • Install Plugins links to /wp-admin/plugins.php (SA-only)
  • Add New Plugin links to /wp-admin/plugins.php?page=wpcom-install-plugin
  • Marketplace links to https://wordpress.com/plugins/:site

Atomic Classic

@taipeicoder taipeicoder merged commit 7fa528d into trunk May 30, 2024
54 checks passed
@taipeicoder taipeicoder deleted the update/plugin-menu2 branch May 30, 2024 03:15
@mmtr mmtr mentioned this pull request Jun 3, 2024
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mmtr mmtr mmtr left review comments

@taipeicoder taipeicoder taipeicoder approved these changes

Assignees

@dsas dsas

@mmtr mmtr

Labels
[mu wpcom Feature] Wpcom Site Menu [Package] Jetpack mu wpcom WordPress.com Features
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@dsas @mmtr @taipeicoder