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

Admin Bar: Fix the order of the top-right items on Atomic sites #38533

Merged
merged 2 commits into from
Jul 29, 2024

Conversation

fushar
Copy link
Contributor

@fushar fushar commented Jul 25, 2024

Fixes https://github.com/Automattic/dotcom-forge/issues/8443

Proposed changes:

Timeline of events:

  1. We updated WordPress on Simple Sites to 6.6.
  2. It contains a bug which messed up the admin bar menus.
  3. We hotfixed that here.
  4. Core released a "fix" here.
    • the fix does not fully restore the original behavior seen in older versions.
  5. We updated WordPress on Atomic sites to 6.6.1, containing the above Core fix.
  6. Our hotfix from before does not apply, so we need to actually fix the order of items (in this PR).
    • we need to hotfix our previous hotfix on Simple class to ensure that the help center icon is in correct location.
Type Before After
Simple image image
Atomic image image

Note

I did not try to fix the order of the Debug menu, as it comes from our internal company proxy plugin...

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:

  1. Test all the scenarios above.
  2. Verify that you can still see the help center icon!
  3. Test also site frontend; make sure the search icon is still at the top-rightmost (ignoring the Debug menu).

Copy link
Contributor

github-actions bot commented Jul 25, 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-admin-bar-order 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-admin-bar-order
    

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

github-actions bot commented Jul 25, 2024

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.

@fushar fushar self-assigned this Jul 25, 2024
@fushar fushar marked this pull request as ready for review July 25, 2024 07:41
@fushar fushar requested review from a team July 25, 2024 07:41
Comment on lines -86 to -87
// Crazy high number to prevent Jetpack removing it
// https://github.com/Automattic/jetpack/blob/30213ee594cd06ca27199f73b2658236fda24622/projects/plugins/jetpack/modules/masterbar/masterbar/class-masterbar.php#L196.
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This comment shouldn't be relevant anymore, as we no longer load the masterbar class in #38419...

@github-actions github-actions bot added the [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! label Jul 25, 2024
@fushar fushar force-pushed the fix-admin-bar-order branch from 74be76c to 63fde5f Compare July 25, 2024 11:56
DustyReagan
DustyReagan previously approved these changes Jul 25, 2024
Copy link
Member

@DustyReagan DustyReagan left a comment

Choose a reason for hiding this comment

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

Looks good!
Simple site with this PR:
Screenshot 2024-07-25 at 11 18 06 AM

Atomic sites

Before After
Screenshot 2024-07-25 at 11 17 34 AM Screenshot 2024-07-25 at 11 17 41 AM

@fushar fushar force-pushed the fix-admin-bar-order branch from 7f15d1c to 7fbe8e4 Compare July 29, 2024 06:55
@fushar fushar merged commit 4a18455 into trunk Jul 29, 2024
54 checks passed
@fushar fushar deleted the fix-admin-bar-order branch July 29, 2024 07:07
@github-actions github-actions bot removed the [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! label Jul 29, 2024
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.

3 participants