-
Notifications
You must be signed in to change notification settings - Fork 800
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
Move Jetpack menu position for atomic wp-admin #35154
Conversation
Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.
Interested in more tips and information?
|
Thank you for your PR! When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:
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. Jetpack plugin: The Jetpack plugin has different release cadences depending on the platform:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. |
* @param bool $seperator Whether to add a separator before the menu item. | ||
*/ | ||
public function add_jetpack_menu( $position = 2, $seperator = false ) { | ||
if ( get_option( 'wpcom_admin_interface' ) === 'wp-admin' ) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems to return false even if I set to Classic view.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems like something was broken with my test site: p1706004199390829/1706004045.925339-slack-C06DN6QQVAQ
if ( get_option( 'wpcom_admin_interface' ) === 'wp-admin' ) { | ||
parent::add_jetpack_menu( $position, $seperator ); | ||
} else { | ||
parent::add_jetpack_menu(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will need to change this line to parent::add_jetpack_menu( $position, $seperator );
to see the changes mentioned in the PR description.
Update: I've completely changed the approach as modifying the parameters as mentioned in the strikethrough will also mean a change is needed for https://github.com/Automattic/wc-calypso-bridge/blob/master/includes/class-wc-calypso-bridge-ecommerce-admin-menu.php
|
b25fbc2
to
b180548
Compare
178237e
to
cfb513c
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It works great and nothing is broken outside wp-admin interface.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Works great!
Just throwing out an option to consider: we could create a new public method in the parent class that takes the position as a parameter to reduce duplicated code. Then we'd call that method in the base parent method and in our method override, so our override would look something like:
public function add_jetpack_menu() {
// This is supposed to be the same as class-admin-menu but with a different position specified for the Jetpack menu.
if ( get_option( 'wpcom_admin_interface' ) === 'wp-admin' ) {
parent::create_jetpack_menu( 2 );
} else {
parent::add_jetpack_menu();
}
}
I'm not sure if we want to do that; I'm just always looking for ways to dedupe code. 😂
a85317d
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixes https://github.com/Automattic/dotcom-forge/issues/5272
Proposed changes:
Self-hosted site Jetpack menu position
Other information:
Jetpack product discussion
Does this pull request change what data or activity we track or use?
No
Testing instructions: