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 missing "Theme Showcase" sub menu item on Simple Classic site Calyspo pages #38698

Merged
merged 2 commits into from
Aug 5, 2024

Conversation

DustyReagan
Copy link
Member

@DustyReagan DustyReagan commented Aug 2, 2024

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

Proposed changes:

  • This PR fixes a bug so the "Theme Showcase" menu appears on Simple Classic site Calypso pages under the "Appearance" menu.
  • In this PR we move the "Classic site gate" inside the hook callback function. This fixes the issue because Calypso gets the menu data via an API call. That API call user does not have the "Classic site option" enabled. Eventually, the API call switches to the calling user. At that point, we can accurately check for the wpcom_admin_interface site option. By the time the admin_menu action is called, the API has switched to the correct user, and things work as expected.
Before After
Screenshot 2024-08-02 at 4 36 10 PM Screenshot 2024-08-02 at 4 35 32 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?

Testing instructions:

  • Load this PR on your sandbox using the instructions in the comment below.
  • Go to a Simple classic site Calypso page like /plans/[site] and view the "Theme Showcase" under the "Appearance" menu.
  • Go to /wp-admin/themes.php and ensure the banner still displays on Classic sites.

Copy link
Contributor

github-actions bot commented Aug 2, 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/simple-theme-showcase-menu 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/simple-theme-showcase-menu
    

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 Aug 2, 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 Aug 2, 2024
@DustyReagan DustyReagan requested review from mmtr and a team August 2, 2024 21:46
@DustyReagan DustyReagan self-assigned this Aug 2, 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 Aug 2, 2024
@DustyReagan DustyReagan changed the title Fix/simple theme showcase menu Fix missing "Theme Showcase" sub menu item on Simple Classic site Calyspo pages Aug 2, 2024
Copy link
Contributor

@fushar fushar left a comment

Choose a reason for hiding this comment

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

I see... innocent bug. I think I broke it on #38364 🤦‍♂️

This fixes the issue for me, thanks!

image

@fushar fushar merged commit 1d43aff into trunk Aug 5, 2024
62 of 64 checks passed
@fushar fushar deleted the fix/simple-theme-showcase-menu branch August 5, 2024 03:48
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