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

Fix/nav upsell RTL padding #37125

Merged
merged 10 commits into from
May 1, 2024
Merged

Fix/nav upsell RTL padding #37125

merged 10 commits into from
May 1, 2024

Conversation

DustyReagan
Copy link
Member

@DustyReagan DustyReagan commented Apr 29, 2024

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

Proposed changes:

  • This PR fixes the RTL padding for the domain upsell both when the sidebar is open and "folded"
  • It also fixes the RTL notification close button margin.

Open

Before After
jetpack-before jetpack-after

Folded

Before After
Screenshot 2024-04-29 at 6 23 16 PM Screenshot 2024-04-29 at 6 34 46 PM

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:

To test on Simple sites

  • Apply a RTL language to your profile at wordpress.com/me
  • Visit a Classic-early-release test site and observer the spacing concerns mentioned above. To create a Classic-early-release simple site, you need to apply the site options below to it using wpsh on your sandbox.

switch_to_blog($blog_id);
add_option('wpcom_classic_early_release', 1);
add_option('wpcom_admin_interface', 'wp-admin');

  • Apply this PR to your Sandbox with the command bin/jetpack-downloader test jetpack-mu-wpcom-plugin fix/nav-upsell-rtl-padding Fix/nav upsell RTL padding #37125 (comment)
  • Sandbox your Classic-early-release test site.
  • Observe the spacing concerns mentioned above are corrected.
  • Switch your language back to a LTR language like English and make sure there are no regressions.

To test on Atomic sites

  • Apply a RTL language to your profile at /wp-admin/profile.php
  • Visit an Atomic Classic-early-release test site and observer the spacing concerns mentioned above. To create a Classic-early-release Atomic site, you need to apply the site options below to it using /_cli

wp option add wpcom_classic_early_release 1

  • Set your site to the Classic admin interface in https://wordpress.com/hosting-config/
  • Apply this PR to your test site using the Jetpack Beta plugin. Select this PR for jetpack-mu-wpcom and be sure you've added define( 'JETPACK_MU_WPCOM_LOAD_VIA_BETA_PLUGIN', true ); to your wp-config.php file. Fix/nav upsell RTL padding #37125 (comment)
  • Hard refresh
  • Observe the spacing concerns mentioned above are corrected.
  • Switch your language back to a LTR language like English and make sure there are no regressions.

Copy link
Contributor

github-actions bot commented Apr 29, 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-upsell-rtl-padding 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/nav-upsell-rtl-padding
    

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 Apr 29, 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.

@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 Apr 29, 2024
@DustyReagan DustyReagan requested review from a team and mmtr April 29, 2024 22:56
@DustyReagan DustyReagan self-assigned this Apr 29, 2024
@DustyReagan DustyReagan added [Status] Needs Team Review and removed [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! labels Apr 29, 2024
@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 Apr 29, 2024
@DustyReagan DustyReagan changed the title Fix/nav upsell rtl padding Fix/nav upsell RTL padding Apr 29, 2024
@DustyReagan DustyReagan 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 Apr 30, 2024
@roo2
Copy link
Contributor

roo2 commented May 1, 2024

just for testing, how do I get the domain upsell to appear? Also how do I enrol a site for early access to classic early release, (or PM me that in slack :)

@roo2
Copy link
Contributor

roo2 commented May 1, 2024

I was looking to regression test this on a WoA jetpack site

I saw two issues, which I believe might be unrelated, but worth bringing to your attention while you're looking at this:

  1. the wpcomsh-notice has white text on a white background. This notice is supposed to be a plan expiry warning.

  2. The site name and homepage icon looks a bit strange, I'm not sure if it is intentional.

Screenshot 2024-05-01 at 10 40 32 am

English page for refrerence:
Screenshot 2024-05-01 at 10 40 14 am

@DustyReagan
Copy link
Member Author

DustyReagan commented May 1, 2024

Nice finds!

  • the wpcomsh-notice has white text on a white background. This notice is supposed to be a plan expiry warning.

This needs to be fixed in wpcomsh. I'll open up another PR for it.

  • The site name and homepage icon looks a bit strange, I'm not sure if it is intentional.

I see this too. It's happening on RTL Classic sites with the "early release option" off. I'll create a new issue for it. In theory this problem should go away when we remove the "early release" flag, but it'd be good to look into what's causing this.

I updated the testing instructions on how to create a Classic early-release site. ☺️

Copy link
Member

@allilevine allilevine left a comment

Choose a reason for hiding this comment

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

I tested on Simple and Atomic and this PR fixes the mentioned issues! ✅

Simple:
Screen Shot 2024-05-01 at 4 27 18 PM

Screen Shot 2024-05-01 at 4 27 27 PM

Atomic:
Screen Shot 2024-05-01 at 4 44 06 PM
Screen Shot 2024-05-01 at 4 44 17 PM

@allilevine
Copy link
Member

I noticed another unrelated issue in my screenshot, there's something going on with the triangle tip icon. Looks like it's trying to show up in both directions.

Screen Shot 2024-05-01 at 4 54 47 PM

@DustyReagan DustyReagan merged commit 3e9adbe into trunk May 1, 2024
58 of 60 checks passed
@DustyReagan DustyReagan deleted the fix/nav-upsell-rtl-padding branch May 1, 2024 21:12
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.

4 participants