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

Duplicate views: Use Calypso admin menu for untangled WP-Admin screens #40479

Merged
merged 20 commits into from
Dec 10, 2024

Conversation

BogdanUngureanu
Copy link
Contributor

@BogdanUngureanu BogdanUngureanu commented Dec 5, 2024

Integrate the navigation experiment for Simple and WoA sites - users part of the treatment will now receive the Core WP-Admin interface but with the Calypso admin menu.

Proposed changes:

  • Enable wpcom_admin_interface option for screens in an allowlist
  • Keep the Calypso navigation for them

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:

  • Use the Jetpack downloader instructions to test the changes on Simple and Atomic sites
  • Enable the experiment treatment on your user: 22124-explat-experiment
  • Go to a Simple Site and make sure it's using Calypso for Posts
  • Sandbox it and make sure that the admin menu is still Calypso
  • Click on Posts and make sure that Calypso admin menu is used but the page is WP-Admin
  • Make sure that the untangling changes are applied on the page (e.g. there's no Classic Editor in the post quick links)
  • Repeat the steps for an Atomic site
  • Since we don't have untangling changes there, just make sure that /edit.php loads and we still use Calypso admin menu

@BogdanUngureanu BogdanUngureanu self-assigned this Dec 5, 2024
Copy link
Contributor

github-actions bot commented Dec 5, 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 add/pre-option-filter-duplicate-views 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 add/pre-option-filter-duplicate-views
    
    bin/jetpack-downloader test jetpack-mu-wpcom-plugin add/pre-option-filter-duplicate-views
    

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 Dec 5, 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 a "[Type]" label (Bug, Enhancement, Janitorial, Task).
  • ✅ 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!


Jetpack plugin:

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

  • WordPress.com Simple releases happen semi-continuously (PCYsg-Jjm-p2).
  • WoA releases happen weekly.
  • Releases to self-hosted sites happen monthly. The next release is scheduled for January 7, 2025 (scheduled code freeze on undefined).

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


Mu Wpcom plugin:

  • Next scheduled release: WordPress.com Simple releases happen semi-continuously (PCYsg-Jjm-p2).

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


Wpcomsh plugin:

  • Next scheduled release: Atomic deploys happen twice daily on weekdays (p9o2xV-2EN-p2).

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

@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 Dec 5, 2024
@github-actions github-actions bot added [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Plugin] mu wpcom jetpack-mu-wpcom plugin labels Dec 6, 2024
@BogdanUngureanu BogdanUngureanu changed the title Add/pre option filter duplicate views Duplicate views: Use Calypso admin menu for untangled WP-Admin screens Dec 6, 2024
@BogdanUngureanu BogdanUngureanu requested review from mmtr and a team December 6, 2024 14:42
@BogdanUngureanu BogdanUngureanu 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 Dec 6, 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 Dec 6, 2024
@BogdanUngureanu BogdanUngureanu added [Type] Task 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 Dec 6, 2024
@mmtr
Copy link
Member

mmtr commented Dec 6, 2024

I'm getting an error on Atomic sites when applying the changes to wpcomsh:

[06-Dec-2024 16:31:44 UTC] PHP Fatal error:  Uncaught Error: Call to undefined function wpcom_is_using_default_admin_menu() in /srv/htdocs/wp-content/mu-plugins/wpcomsh-dev/feature-plugins/masterbar.php:96
Stack trace:
#0 /srv/htdocs/wp-content/mu-plugins/wpcomsh-dev/vendor/automattic/wc-calypso-bridge/class-wc-calypso-bridge-shared.php(53): wpcomsh_activate_nav_unification()
#1 /srv/htdocs/wp-content/mu-plugins/wpcomsh-dev/vendor/automattic/wc-calypso-bridge/class-wc-calypso-bridge-shared.php(30): WC_Calypso_Bridge_Shared->__construct()
#2 /srv/htdocs/wp-content/mu-plugins/wpcomsh-dev/vendor/automattic/wc-calypso-bridge/class-wc-calypso-bridge-shared.php(221): WC_Calypso_Bridge_Shared::instance()
#3 /srv/htdocs/wp-content/mu-plugins/wpcomsh-dev/vendor/automattic/wc-calypso-bridge/class-wc-calypso-bridge.php(129): require_once('/srv/htdocs/wp-...')
#4 /srv/htdocs/wp-content/mu-plugins/wpcomsh-dev/vendor/automattic/wc-calypso-bridge/class-wc-calypso-bridge.php(104): WC_Calypso_Bridge->includes()
#5 /srv/htdocs/__wp__/wp-includes/class-wp-hook.php(324): WC_Calypso_Bridge->initialize('')
#6 /srv/htdocs/__wp__/wp-includes/class-wp-hook.php(348): WP_Hook->apply_filters(NULL, Array)
#7 /srv/htdocs/__wp__/wp-includes/plugin.php(517): WP_Hook->do_action(Array)
#8 /srv/htdocs/__wp__/wp-settings.php(559): do_action('plugins_loaded')
#9 /srv/htdocs/wp-config.php(87): require_once('/srv/htdocs/__w...')
#10 /srv/htdocs/__wp__/wp-load.php(55): require_once('/srv/htdocs/wp-...')
#11 /srv/htdocs/__wp__/wp-admin/admin.php(34): require_once('/srv/htdocs/__w...')
#12 {main}

Before applying the changes to wpcomsh, I applied them to Jetpack and jetpack-mu-wpcom to make sure that the wpcom_is_using_default_admin_menu was defined, but somehow wpcomsh cannot locate it

@mmtr
Copy link
Member

mmtr commented Dec 9, 2024

I get a different error now on Atomic:

PHP Fatal error:  Uncaught TypeError: call_user_func_array(): Argument #1 ($callback) must be a valid callback, function "wpcom_admin_interface_pre_get_option" not found or invalid function name in /srv/htdocs/__wp__/wp-includes/class-wp-hook.php:326
Stack trace:
#0 /srv/htdocs/__wp__/wp-includes/plugin.php(205): WP_Hook->apply_filters('calypso', Array)
#1 /srv/htdocs/__wp__/wp-includes/option.php(132): apply_filters('pre_option_wpco...', false, 'wpcom_admin_int...', false)
#2 /srv/htdocs/wp-content/mu-plugins/wpcomsh-dev/feature-plugins/class-theme-homepage-switcher.php(44): get_option('wpcom_admin_int...')
#3 /srv/htdocs/__wp__/wp-includes/class-wp-hook.php(324): Theme_Homepage_Switcher->register_hooks('')
#4 /srv/htdocs/__wp__/wp-includes/class-wp-hook.php(348): WP_Hook->apply_filters(NULL, Array)
#5 /srv/htdocs/__wp__/wp-includes/plugin.php(517): WP_Hook->do_action(Array)
#6 /srv/htdocs/__wp__/wp-settings.php(559): do_action('plugins_loaded')
#7 /srv/htdocs/wp-config.php(87): require_once('/srv/htdocs/__w...')
#8 /srv/htdocs/__wp__/wp-load.php(55): require_once('/srv/htdocs/wp-...')
#9 /srv/htdocs/__wp__/wp-admin/admin.php(34): require_once('/srv/htdocs/__w...')
#10 {main}
  thrown in /srv/htdocs/__wp__/wp-includes/class-wp-hook.php on line 326

@mmtr
Copy link
Member

mmtr commented Dec 9, 2024

Seems that the errors were specific to my old dev Atomic sites – cannot replicate on a new site.

mmtr
mmtr previously approved these changes Dec 9, 2024
Copy link
Member

@mmtr mmtr left a comment

Choose a reason for hiding this comment

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

This tests well for me.

This stops pointing the "Add a new post" link to the iframed editor, which is unwanted, but can be fixed in a follow-up.

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