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

Point "Howdy" link to /me on Default sites #39113

Merged
merged 4 commits into from
Aug 28, 2024
Merged

Conversation

okmttdhr
Copy link
Member

@okmttdhr okmttdhr commented Aug 28, 2024

Fixes p1724826862520339-slack-C07GQ1Q0L6B

Proposed changes:

This PR reverts the change in https://github.com/Automattic/jetpack/pull/38530/files#diff-c783f4c3c1add4e348657440ae37d16ca5a04bed0467458c8e7d8aa55fa03fa9 since it affects Simple Default sites. On Simple Default sites, it should point to /me (until the Site-Level Profile lands).

This PR fixes the "Howdy" link on the Simple Default site to point to /me instead of /wp-admin/profile.php.

Screenshot 2024-08-28 at 17 47 54

This looks dirty, so I plan to refactor to move this code around here:

function wpcom_maybe_replace_edit_profile_menu_to_me( $wp_admin_bar ) {
$edit_profile_node = $wp_admin_bar->get_node( 'user-info' );
if ( $edit_profile_node ) {
// If one of the following is true:
// - the user is not a member of the current site
// - the current site uses Default admin interface
//
// Then, the Edit Profile menu should point to /me, instead of the site's profile.php.
if ( ! is_user_member_of_blog() || get_option( 'wpcom_admin_interface' ) !== 'wp-admin' ) {
// Temporarily point to wpcalypso.wordpress.com for testing purposes.
$url = 'https://wordpress.com/me';
if ( get_option( 'wpcom_site_level_user_profile' ) === '1' ) {
$url = 'https://wpcalypso.wordpress.com/me';
}
$edit_profile_node->href = maybe_add_origin_site_id_to_url( $url );
$wp_admin_bar->add_node( (array) $edit_profile_node );
}
}
}
add_action( 'admin_bar_menu', 'wpcom_maybe_replace_edit_profile_menu_to_me', 1 );
/**
* Adds (Profile) -> My Account menu pointing to /me/account.
*
* @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar core object.
*/
function wpcom_add_my_account_item_to_profile_menu( $wp_admin_bar ) {
$logout_node = $wp_admin_bar->get_node( 'logout' );
if ( $logout_node ) {
// Adds the 'My Account' menu item before 'Log Out'.
$wp_admin_bar->remove_node( 'logout' );
}
// Temporarily point to wpcalypso.wordpress.com for testing purposes.
$url = 'https://wordpress.com/me/account';
if ( get_option( 'wpcom_site_level_user_profile' ) === '1' ) {
$url = 'https://wpcalypso.wordpress.com/me/account';
}
$wp_admin_bar->add_node(
array(
'id' => 'wpcom-profile',
'parent' => 'user-actions',
'title' => __( 'My Account', 'jetpack-mu-wpcom' ),
'href' => maybe_add_origin_site_id_to_url( $url ),
)
);
if ( $logout_node ) {
$wp_admin_bar->add_node( (array) $logout_node );
}
}
add_action( 'admin_bar_menu', 'wpcom_add_my_account_item_to_profile_menu' );
when working on this issue: https://github.com/Automattic/dotcom-forge/issues/8697.

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:

  • Prepare a Simple Default site
  • Go to /wp-admin/options-media.php
  • Observe the "Howdy" link pointing to /me

Copy link
Contributor

github-actions bot commented Aug 28, 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 fix/howdy-link 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 fix/howdy-link
    

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.


Follow this PR Review Process:

  1. Ensure all required checks appearing at the bottom of this PR are passing.
  2. Choose a review path based on your changes:
    • A. Team Review: add the "[Status] Needs Team Review" label
      • For most changes, including minor cross-team impacts.
      • Example: Updating a team-specific component or a small change to a shared library.
    • B. Crew Review: add the "[Status] Needs Review" label
      • For significant changes to core functionality.
      • Example: Major updates to a shared library or complex features.
    • C. Both: Start with Team, then request Crew
      • For complex changes or when you need extra confidence.
      • Example: Refactor affecting multiple systems.
  3. Get at least one approval before merging.

Still unsure? Reach out in #jetpack-developers for guidance!

@okmttdhr okmttdhr marked this pull request as ready for review August 28, 2024 08:42
@@ -60,6 +60,17 @@ public function add_node( $args ) {
return;
}

if ( $args['id'] === 'my-account' ) {
if ( ! is_user_member_of_blog() || get_option( 'wpcom_admin_interface' ) !== 'wp-admin' ) {
Copy link
Member Author

Choose a reason for hiding this comment

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

I extracted the logic from here:

if ( ! is_user_member_of_blog() || get_option( 'wpcom_admin_interface' ) !== 'wp-admin' ) {
since it should be the same.

@okmttdhr okmttdhr changed the title Always rewrite profile.php to /me on Default sites Point "Howdy" link to /me on Default sites Aug 28, 2024
@okmttdhr okmttdhr self-assigned this Aug 28, 2024
@okmttdhr okmttdhr requested a review from a team August 28, 2024 08:44
Copy link
Contributor

@miksansegundo miksansegundo left a comment

Choose a reason for hiding this comment

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

Working as expected 🚀

Before

Screen.Recording.2567-08-28.at.16.13.19.mov

After

Screen.Recording.2567-08-28.at.16.12.15.mov

@miksansegundo miksansegundo merged commit 1bc5900 into trunk Aug 28, 2024
59 of 61 checks passed
@miksansegundo miksansegundo deleted the fix/howdy-link branch August 28, 2024 09:16
gogdzl pushed a commit that referenced this pull request Oct 25, 2024
* Always rewrite profile.php to /me on Default sites

* changelog

* Point "Howdy" link to /me on Default sites

* Remove profile menu link mapping to wp-admin/profile.php
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants