Unify masterbars in Simple and Atomic Default sites (take 3) #38419

fushar · 2024-07-19T03:17:33Z

Related to:

https://github.com/Automattic/dotcom-forge/issues/8314
Admin Bar: Replace the wp-admin url with the calypso ones for the default interface #38377 (comment)
Admin Bar: Make it consistent between Calypso and WP Admin regardless of the value of Admin Interface Style (take two) #38399
Admin Bar: Make it consistent between Calypso and WP Admin regardless of the value of Admin Interface Style #38362

Proposed changes:

For Simple sites: this fixes hamburger menu on mobile view on Simple Default on wp-admin pages.
- It was not working because we added an unnecessary JS file.
For Atomic sites: this actually shows the Core masterbar on Atomic Default wp-admin pages.
- It was not working because we reordered the wpcom-admin-bar feature in Hide wpcom features when site is agency-managed or user is local #38364, which contains the WPCOM_ADMIN_BAR_UNIFICATION.
- (in other words, it's a "logical merge conflict")
For both Simple and Atomic sites:
- Fix the W logo not doing anything on wp-admin pages.

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:

Test all (yes, ALL) possible combinations of the following (there are 2 x 2 x 3 x 2):

Simple / Atomic
Default / Classic
Calypso page / wp-admin page / site frontend page
Desktop / mobile views

In each case:

You should see Core / "Core-like" admin bar.

When testing mobile view on wp-admin/site frontend:

REFRESH the page first before testing (to make sure your browser actually treat it as mobile)
Test whether the hamburger icon can toggle the sidebar (in /wp-admin)
Test whether the W logo can be clickable to /sites

When testing Calypso page:

Test whether the sidebar menu is still correct (conforming to Default or Classic)

github-actions · 2024-07-19T03:18:21Z

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 feat/unify-masterbar-3 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 feat/unify-masterbar-3

bin/jetpack-downloader test jetpack-mu-wpcom-plugin feat/unify-masterbar-3

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 · 2024-07-19T03:18:28Z

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.

Jetpack plugin:

The Jetpack plugin has different release cadences depending on the platform:

WordPress.com Simple releases happen daily.
WoA releases happen weekly.
Releases to self-hosted sites happen monthly. The next release is scheduled for August 6, 2024 (scheduled code freeze on August 5, 2024).

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

Mu Wpcom plugin:

Next scheduled release: August 6, 2024.
Scheduled code freeze: July 29, 2024.

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

Wpcomsh plugin:

Next scheduled release: August 6, 2024.
Scheduled code freeze: July 29, 2024.

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

fushar · 2024-07-19T04:19:06Z

wp-admin page: Clicking the W icon does not take me to /sites. Is this expected?

No, that's what I've been trying to debug, it's not ready to review actually, sorry for false alarm 😂

okmttdhr · 2024-07-19T05:16:11Z

Re-tested;

Atomic
- Classic
  - Desktop ✅
  - Mobile
    - wp-admin page: Clicking the W icon took me to /sites ✅
    - /overview page: Do we need 🏠 & ➕ ? 🏠 can take us back to dashboard.
    - frontend: seems ✅
- Default
  - Desktop
    - wp-admin page: the same as Classic ✅
    - /overview page: the same as Classic ✅
    - frontend: the same as Classic ✅
  - Mobile
    - wp-admin page: the same as Classic ✅
    - /overview page: Do we need 🏠 & ➕ ?
    - frontend: the same as Classic ✅

fushar · 2024-07-19T05:45:26Z

/overview page: Do we need 🏠 & ➕ ?

As this is a Calypso page, we can follow-up with it later :)

okmttdhr · 2024-07-19T05:53:30Z

Simple
- Classic
  - Desktop
    - wp-admin page ✅
    - /overview page ✅
    - frontend ✅
  - Mobile
    - wp-admin page ✅
    - /overview page: the same as Atomic
    - frontend ✅

okmttdhr · 2024-07-19T06:01:08Z

Simple
- Default
  - Desktop
    - wp-admin page: the same as Simple Classic✅
    - /overview page: the same as Simple Classic✅
    - frontend: the same as Simple Classic✅
  - Mobile
    - wp-admin page: the same as Simple Classic✅
    - /overview page: the same as Atomic
    - frontend: the same as Simple Classic✅

okmttdhr · 2024-07-19T06:24:57Z

projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-bar/wpcom-admin-bar.scss

@@ -17,7 +17,13 @@
 /**
 * WP logo menu
 */
-#wpadminbar #wp-admin-bar-wp-logo>.ab-item .ab-icon:before {
+#wpadminbar #wp-admin-bar-wpcom-logo>.ab-item .ab-icon {
+	width: 15px;


took style from https://github.com/WordPress/wordpress-develop/blob/5a30482419f1b0bcc713a7fdee3a14afd67a1bca/src/wp-includes/css/admin-bar.css#L493 to resolve the broken CSS layout of the wpcom logo

okmttdhr · 2024-07-19T06:25:33Z

projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-bar/wpcom-admin-bar.scss

@@ -27,6 +33,7 @@
 	mask-image: url("data:image/svg+xml;base64,PHN2ZyBjbGFzcz0iZ3JpZGljb24gZ3JpZGljb25zLW15LXNpdGVzIiBoZWlnaHQ9IjI0IiB3aWR0aD0iMjQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDI0IDI0Ij48Zz48cGF0aCBkPSJNMTIgMkM2LjQ3NyAyIDIgNi40NzcgMiAxMnM0LjQ3NyAxMCAxMCAxMCAxMC00LjQ3NyAxMC0xMFMxNy41MjMgMiAxMiAyek0zLjUgMTJjMC0xLjIzMi4yNjQtMi40MDIuNzM2LTMuNDU5TDguMjkxIDE5LjY1QTguNSA4LjUgMCAwMTMuNSAxMnptOC41IDguNTAxYy0uODM0IDAtMS42NC0uMTIyLTIuNDAxLS4zNDZsMi41NTEtNy40MTEgMi42MTMgNy4xNThhLjcxOC43MTggMCAwMC4wNjEuMTE3IDguNDk3IDguNDk3IDAgMDEtMi44MjQuNDgyem0xLjE3Mi0xMi40ODZjLjUxMi0uMDI3Ljk3My0uMDgxLjk3My0uMDgxLjQ1OC0uMDU0LjQwNC0uNzI3LS4wNTQtLjcwMSAwIDAtMS4zNzcuMTA4LTIuMjY2LjEwOC0uODM1IDAtMi4yMzktLjEwOC0yLjIzOS0uMTA4LS40NTktLjAyNi0uNTEyLjY3NC0uMDU0LjcwMSAwIDAgLjQzNC4wNTQuODkyLjA4MWwxLjMyNCAzLjYyOS0xLjg2IDUuNTc5LTMuMDk2LTkuMjA4Yy41MTItLjAyNy45NzMtLjA4MS45NzMtLjA4MS40NTgtLjA1NC40MDMtLjcyNy0uMDU1LS43MDEgMCAwLTEuMzc2LjEwOC0yLjI2NS4xMDgtLjE2IDAtLjM0Ny0uMDA0LS41NDctLjAxQTguNDkxIDguNDkxIDAgMDExMiAzLjVjMi4yMTMgMCA0LjIyOC44NDYgNS43NCAyLjIzMi0uMDM3LS4wMDItLjA3Mi0uMDA3LS4xMS0uMDA3LS44MzUgMC0xLjQyNy43MjctMS40MjcgMS41MDkgMCAuNzAxLjQwNCAxLjI5My44MzUgMS45OTQuMzIzLjU2Ni43MDEgMS4yOTMuNzAxIDIuMzQ0IDAgLjcyNy0uMjggMS41NzItLjY0NyAyLjc0OGwtLjg0OCAyLjgzMy0zLjA3Mi05LjEzOHptMy4xMDEgMTEuMzMybDIuNTk2LTcuNTA2Yy40ODUtMS4yMTMuNjQ2LTIuMTgyLjY0Ni0zLjA0NSAwLS4zMTMtLjAyMS0uNjAzLS4wNTctLjg3NEE4LjQ1NSA4LjQ1NSAwIDAxMjAuNSAxMmE4LjQ5MyA4LjQ5MyAwIDAxLTQuMjI3IDcuMzQ3eiIvPjwvZz48L3N2Zz4=");
 	mask-position: center;
 	mask-repeat: no-repeat;
+	top: 2px;


took style from https://github.com/WordPress/wordpress-develop/blob/5a30482419f1b0bcc713a7fdee3a14afd67a1bca/src/wp-includes/css/admin-bar.css#L505 to resolve the broken CSS layout of the wpcom logo

fushar · 2024-07-19T06:33:49Z

Does top: 2px work on mobile view? Just wanted to make sure

…

On Fri, Jul 19, 2024, 13:26 okmttdhr, tada ***@***.***> wrote: ***@***.**** commented on this pull request. ------------------------------ In projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-bar/wpcom-admin-bar.scss <#38419 (comment)>: > @@ -17,7 +17,13 @@ /** * WP logo menu */ -#wpadminbar #wp-admin-bar-wp-logo>.ab-item .ab-icon:before { +#wpadminbar #wp-admin-bar-wpcom-logo>.ab-item .ab-icon { + width: 15px; took style from https://github.com/WordPress/wordpress-develop/blob/5a30482419f1b0bcc713a7fdee3a14afd67a1bca/src/wp-includes/css/admin-bar.css#L493 to resolve the broken CSS layout of the wpcom logo ------------------------------ In projects/packages/jetpack-mu-wpcom/src/features/wpcom-admin-bar/wpcom-admin-bar.scss <#38419 (comment)>: > @@ -27,6 +33,7 @@ mask-image: url("data:image/svg+xml;base64,PHN2ZyBjbGFzcz0iZ3JpZGljb24gZ3JpZGljb25zLW15LXNpdGVzIiBoZWlnaHQ9IjI0IiB3aWR0aD0iMjQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDI0IDI0Ij48Zz48cGF0aCBkPSJNMTIgMkM2LjQ3NyAyIDIgNi40NzcgMiAxMnM0LjQ3NyAxMCAxMCAxMCAxMC00LjQ3NyAxMC0xMFMxNy41MjMgMiAxMiAyek0zLjUgMTJjMC0xLjIzMi4yNjQtMi40MDIuNzM2LTMuNDU5TDguMjkxIDE5LjY1QTguNSA4LjUgMCAwMTMuNSAxMnptOC41IDguNTAxYy0uODM0IDAtMS42NC0uMTIyLTIuNDAxLS4zNDZsMi41NTEtNy40MTEgMi42MTMgNy4xNThhLjcxOC43MTggMCAwMC4wNjEuMTE3IDguNDk3IDguNDk3IDAgMDEtMi44MjQuNDgyem0xLjE3Mi0xMi40ODZjLjUxMi0uMDI3Ljk3My0uMDgxLjk3My0uMDgxLjQ1OC0uMDU0LjQwNC0uNzI3LS4wNTQtLjcwMSAwIDAtMS4zNzcuMTA4LTIuMjY2LjEwOC0uODM1IDAtMi4yMzktLjEwOC0yLjIzOS0uMTA4LS40NTktLjAyNi0uNTEyLjY3NC0uMDU0LjcwMSAwIDAgLjQzNC4wNTQuODkyLjA4MWwxLjMyNCAzLjYyOS0xLjg2IDUuNTc5LTMuMDk2LTkuMjA4Yy41MTItLjAyNy45NzMtLjA4MS45NzMtLjA4MS40NTgtLjA1NC40MDMtLjcyNy0uMDU1LS43MDEgMCAwLTEuMzc2LjEwOC0yLjI2NS4xMDgtLjE2IDAtLjM0Ny0uMDA0LS41NDctLjAxQTguNDkxIDguNDkxIDAgMDExMiAzLjVjMi4yMTMgMCA0LjIyOC44NDYgNS43NCAyLjIzMi0uMDM3LS4wMDItLjA3Mi0uMDA3LS4xMS0uMDA3LS44MzUgMC0xLjQyNy43MjctMS40MjcgMS41MDkgMCAuNzAxLjQwNCAxLjI5My44MzUgMS45OTQuMzIzLjU2Ni43MDEgMS4yOTMuNzAxIDIuMzQ0IDAgLjcyNy0uMjggMS41NzItLjY0NyAyLjc0OGwtLjg0OCAyLjgzMy0zLjA3Mi05LjEzOHptMy4xMDEgMTEuMzMybDIuNTk2LTcuNTA2Yy40ODUtMS4yMTMuNjQ2LTIuMTgyLjY0Ni0zLjA0NSAwLS4zMTMtLjAyMS0uNjAzLS4wNTctLjg3NEE4LjQ1NSA4LjQ1NSAwIDAxMjAuNSAxMmE4LjQ5MyA4LjQ5MyAwIDAxLTQuMjI3IDcuMzQ3eiIvPjwvZz48L3N2Zz4="); mask-position: center; mask-repeat: no-repeat; + top: 2px; took style from https://github.com/WordPress/wordpress-develop/blob/5a30482419f1b0bcc713a7fdee3a14afd67a1bca/src/wp-includes/css/admin-bar.css#L505 to resolve the broken CSS layout of the wpcom logo — Reply to this email directly, view it on GitHub <#38419 (review)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AALUOTGJF5HHFWNI4O3XEXDZNCWQJAVCNFSM6AAAAABLDY3USWVHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMZDCOBXGQZDGOBSGQ> . You are receiving this because you authored the thread.Message ID: ***@***.***>

okmttdhr · 2024-07-19T06:37:33Z

Does top: 2px work on mobile view? Just wanted to make sure

It's overridden on mobile and positioning seems to work fine:

okmttdhr

Looks good to me now ✅

/overview page: Do we need 🏠 & ➕ ? 🏠 can take us back to dashboard.

As a follow-up, let's display 🏠 & ➕ and hide ❓& 🔔 on mobile.

fushar · 2024-07-19T06:48:04Z

Thank you! Feel free to merge if we're confident.

…

On Fri, Jul 19, 2024, 13:43 okmttdhr, tada ***@***.***> wrote: ***@***.**** approved this pull request. Looks good to me now ✅ /overview page: Do we need 🏠 & ➕ ? 🏠 can take us back to dashboard. As a follow-up, let's display 🏠 & ➕ and hide ❓& 🔔 on mobile. — Reply to this email directly, view it on GitHub <#38419 (review)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AALUOTE4HKFXFWUNCI44EWTZNCYRTAVCNFSM6AAAAABLDY3USWVHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMZDCOBXGQ2TKMJZGA> . You are receiving this because you authored the thread.Message ID: ***@***.***>

fushar mentioned this pull request Jul 19, 2024

Admin Bar: Replace the wp-admin url with the calypso ones for the default interface #38377

Merged

3 tasks

github-actions bot added [Feature] Masterbar WordPress.com Toolbar and Dashboard customizations [Package] Jetpack mu wpcom WordPress.com Features [Package] Masterbar [Status] In Progress labels Jul 19, 2024

fushar force-pushed the feat/unify-masterbar-3 branch from fe9b982 to 4cd81ce Compare July 19, 2024 03:20

github-actions bot added [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Plugin] mu wpcom jetpack-mu-wpcom plugin [Plugin] Wpcomsh labels Jul 19, 2024

fushar marked this pull request as ready for review July 19, 2024 03:29

Unify masterbars in Simple and Atomic Default sites (take 3)

f42892f

fushar force-pushed the feat/unify-masterbar-3 branch from 4cd81ce to 14059df Compare July 19, 2024 03:56

fushar removed the [Status] In Progress label Jul 19, 2024

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 19, 2024

This comment was marked as outdated.

Sign in to view

fushar force-pushed the feat/unify-masterbar-3 branch from 14059df to c2cf3bf Compare July 19, 2024 04:33

github-actions bot added the [mu wpcom Feature] Wpcom Admin Bar label Jul 19, 2024

Add wpcom logo instead

3d6a606

fushar force-pushed the feat/unify-masterbar-3 branch from c2cf3bf to 3d6a606 Compare July 19, 2024 04:54

fushar requested a review from okmttdhr July 19, 2024 04:56

fushar assigned KokkieH and okmttdhr and unassigned KokkieH Jul 19, 2024

fushar requested review from a team July 19, 2024 05:48

fushar requested a review from a team July 19, 2024 05:48

Adjust the position of the WP logo menu icon

a8cf9b6

okmttdhr reviewed Jul 19, 2024

View reviewed changes

okmttdhr approved these changes Jul 19, 2024

View reviewed changes

okmttdhr merged commit b7fffcc into trunk Jul 19, 2024
56 checks passed

okmttdhr deleted the feat/unify-masterbar-3 branch July 19, 2024 06:52

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 19, 2024

okmttdhr mentioned this pull request Jul 19, 2024

Masterbar menu - Display "🏠 & ➕" and hide "❓& 🔔" on mobile Automattic/wp-calypso#92819

Merged

7 tasks

fushar mentioned this pull request Jul 25, 2024

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

Merged

3 tasks

phcp mentioned this pull request Aug 7, 2024

Load Scheduled_Updates for non-wpcom users #38772

Merged

3 tasks

okmttdhr mentioned this pull request Aug 22, 2024

Sync Calypso locale to Atomic Classic & Atomic Default #39009

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Unify masterbars in Simple and Atomic Default sites (take 3) #38419

Unify masterbars in Simple and Atomic Default sites (take 3) #38419

fushar commented Jul 19, 2024 •

edited by okmttdhr

Loading

github-actions bot commented Jul 19, 2024 •

edited

Loading

github-actions bot commented Jul 19, 2024 •

edited

Loading

This comment was marked as outdated.

fushar commented Jul 19, 2024

okmttdhr commented Jul 19, 2024

fushar commented Jul 19, 2024

okmttdhr commented Jul 19, 2024

okmttdhr commented Jul 19, 2024

okmttdhr Jul 19, 2024

okmttdhr Jul 19, 2024

fushar commented Jul 19, 2024 via email

okmttdhr commented Jul 19, 2024 •

edited

Loading

okmttdhr left a comment

fushar commented Jul 19, 2024 via email

Unify masterbars in Simple and Atomic Default sites (take 3) #38419

Unify masterbars in Simple and Atomic Default sites (take 3) #38419

Conversation

fushar commented Jul 19, 2024 • edited by okmttdhr Loading

Proposed changes:

Other information:

Jetpack product discussion

Does this pull request change what data or activity we track or use?

Testing instructions:

github-actions bot commented Jul 19, 2024 • edited Loading

github-actions bot commented Jul 19, 2024 • edited Loading

This comment was marked as outdated.

fushar commented Jul 19, 2024

okmttdhr commented Jul 19, 2024

fushar commented Jul 19, 2024

okmttdhr commented Jul 19, 2024

okmttdhr commented Jul 19, 2024

okmttdhr Jul 19, 2024

Choose a reason for hiding this comment

okmttdhr Jul 19, 2024

Choose a reason for hiding this comment

fushar commented Jul 19, 2024 via email

okmttdhr commented Jul 19, 2024 • edited Loading

okmttdhr left a comment

Choose a reason for hiding this comment

fushar commented Jul 19, 2024 via email

fushar commented Jul 19, 2024 •

edited by okmttdhr

Loading

github-actions bot commented Jul 19, 2024 •

edited

Loading

github-actions bot commented Jul 19, 2024 •

edited

Loading

okmttdhr commented Jul 19, 2024 •

edited

Loading