Skip to content

WPCOMSH: Added missing WPCOM feature checks on theme API functions on Atomic #45413

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 7 commits into
base: trunk
Choose a base branch
from
Open

WPCOMSH: Added missing WPCOM feature checks on theme API functions on Atomic #45413

wants to merge 7 commits into from
+32 −20

Conversation

Copons
Copy link
Contributor

@Copons Copons commented Oct 8, 2025 •
edited
Loading

Fixes DOTTHEM-94, DOTTHEM-98

Proposed changes:

  • Add WPCOM_Features checks on Dotcom themes, so that only those allowed on a site will be listed in theme-install.php.
  • Stop showing Dotorg themes on sites without the COMMUNITY_THEMES feature.

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:

  • Create a Dotcom site on the Personal plan.
  • Install the Jetpack Beta plugin.
  • Enter Jetpack → Jetpack Beta, select WordPress.com Site Helper, and enable the dotthem-98-theme-tiers-exclude-unavailable-dotcom-themes-from-the-wp branch.
  • Navigate to Appearance → Themes.
  • Confirm that there are no Dotorg themes (Community tier) in the list.
    • Try searching for Astra.
  • Confirm that there are no Dotcom themes unavailable to the Personal plan (no themes of tier Premium, Partner, WooCommerce, Sensei).
    • Try searching for Patisserie (Premium theme).
    • Try searching for SolarOne (Partner theme).
    • Try searching for Tsubaki (WooCommerce theme).
    • Try searching for Course (Sensei theme).
  • Repeat the test on a Business site.
  • Confirm that Dotorg themes (Community tier) are listed.
  • Confirm that all Dotcom themes are listed, with the exception of Partner themes, which can only be purchased on the Calypso Theme Showcase.

@Copons Copons self-assigned this Oct 8, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Oct 8, 2025 •
edited
Loading

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 WoA dev 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 (WordPress.com Site Helper), and enable the dotthem-98-theme-tiers-exclude-unavailable-dotcom-themes-from-the-wp branch.

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
Copy link
Contributor

github-actions bot commented Oct 8, 2025 •
edited
Loading

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 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 🤖

Follow this PR Review Process:

  1. Ensure all required checks appearing at the bottom of this PR are passing.
  2. Make sure to test your changes on all platforms that it applies to. You're responsible for the quality of the code you ship.
  3. You can use GitHub's Reviewers functionality to request a review.
  4. When it's reviewed and merged, you will be pinged in Slack to deploy the changes to WordPress.com simple once the build is done.

If you have questions about anything, reach out in #jetpack-developers for guidance!

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 need more details from you. This label will be auto-added until the PR meets all requirements. label Oct 8, 2025
@jp-launch-control JP Launch Control
Copy link

jp-launch-control bot commented Oct 8, 2025 •
edited
Loading

Code Coverage Summary

Coverage changed in 2 files.

File Coverage Δ% Δ Uncovered
projects/plugins/wpcomsh/wpcom-themes/themes.php 0/86 (0.00%) 0.00% 5 💔
projects/plugins/wpcomsh/wpcom-themes/includes/class-wpcom-themes-service.php 0/38 (0.00%) 0.00% 1 ❤️‍🩹

Full summary · PHP report

If appropriate, add one of these labels to override the failing coverage check: Covered by non-unit tests Use to ignore the Code coverage requirement check when E2Es or other non-unit tests cover the code Coverage tests to be added later Use to ignore the Code coverage requirement check when tests will be added in a follow-up PR I don't care about code coverage for this PR Use this label to ignore the check for insufficient code coveage.

rcrdortiz
rcrdortiz reviewed Oct 8, 2025
View reviewed changes
projects/plugins/wpcomsh/wpcom-themes/themes.php
Comment on lines +44 to +47
if ( ! wpcom_site_has_feature( WPCOM_Features::COMMUNITY_THEMES ) ) {
$res->info['results'] = 0;
$res->themes = array();
}
Copy link
Contributor

Choose a reason for hiding this comment

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

We just clear the themes and count on the response from the API so that everything continues to work as expected.

@Copons Copons marked this pull request as ready for review October 8, 2025 17:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rcrdortiz rcrdortiz rcrdortiz left review comments

Assignees

@Copons Copons

Labels
[Plugin] Wpcomsh [Status] In Progress [Status] Needs Author Reply We need more details from you. This label will be auto-added until the PR meets all requirements.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Copons @rcrdortiz