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

Fixes scrollbar issue if upsell nudge is loaded in sidebar #38170

Merged
merged 3 commits into from
Jul 5, 2024

Conversation

candy02058912
Copy link
Contributor

@candy02058912 candy02058912 commented Jul 3, 2024

Fixes https://github.com/Automattic/dotcom-forge/issues/7936
The bug details and reproduction video are in the original issue.

Before

Nav.scroll.issue.mp4

After

CleanShot.2024-07-03.at.19.35.41.mp4

Proposed changes:

  • Trigger a resize event when the upsell nudge is loaded to make WP aware that the nav sidebar has to be scrollable.

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?

No

Testing instructions:

What is being fixed with this PR:

  • With a Simple Default site
  • Go to /wp-admin
  • After the upsell nudge shows, the nav bar is still scrollable

Note

Test for WoA and Jetpack sites to make sure nothing is broken due to this PR

Copy link
Contributor

github-actions bot commented Jul 3, 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/nav-classic-default-/wp-admin 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 fix/nav-classic-default-/wp-admin
    
    bin/jetpack-downloader test jetpack-mu-wpcom-plugin fix/nav-classic-default-/wp-admin
    

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 bot added [Feature] Masterbar WordPress.com Toolbar and Dashboard customizations [Package] Masterbar [Status] In Progress labels Jul 3, 2024
Copy link
Contributor

github-actions bot commented Jul 3, 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.

@candy02058912 candy02058912 requested review from a team July 3, 2024 10:09
@candy02058912 candy02058912 changed the title Fix/nav classic default /wp admin Fixes scrollbar issue if upsell nudge is loaded in sidebar Jul 3, 2024
@candy02058912 candy02058912 marked this pull request as ready for review July 3, 2024 11:48
Copy link
Contributor

@Addison-Stavlo Addison-Stavlo left a comment

Choose a reason for hiding this comment

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

This fixes the issue on my end!

My first thought was why we are applying this fix separately from the jitm code itself, but I think that makes sense considering the mutation observer needs to be in place first.

Aside, Im unsure why but I needed to run the mu-wpcom install script as well to test this even though all the file changes seem to be in the masterbar package. 😕 Either way running both install commands for simple tests well.

@candy02058912
Copy link
Contributor Author

Aside, Im unsure why but I needed to run the mu-wpcom install script as well to test this even though all the file changes seem to be in the masterbar package.

The one that is actually being used on simple sites when I was testing was the file under fbhepr%2Skers%2Sjcpbz%2Sjc%2Qpbagrag%2Szh%2Qcyhtvaf%2Swrgcnpx%2Qzh%2Qjcpbz%2Qcyhtva%2Sfha%2Siraqbe%2Snhgbznggvp%2Swrgcnpx%2Qznfgreone%2Sfep%2Snqzva%2Qzrah%2Spynff%2Qnqzva%2Qzrah.cuc%3Se%3Q399n5258-og, so it's bin/jetpack-downloader test jetpack-mu-wpcom-plugin fix/nav-classic-default-/wp-admin that gives us the relative files from this PR to test.

@candy02058912 candy02058912 force-pushed the fix/nav-classic-default-/wp-admin branch from 98fbf2d to 25791c3 Compare July 5, 2024 09:31
@candy02058912 candy02058912 merged commit 6675a6d into trunk Jul 5, 2024
56 checks passed
@candy02058912 candy02058912 deleted the fix/nav-classic-default-/wp-admin branch July 5, 2024 09:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Feature] Masterbar WordPress.com Toolbar and Dashboard customizations [Package] Masterbar
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants