Untangle theme screens #41374

scruffian · 2025-01-28T22:15:59Z

Fixes #

Proposed changes:

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:

Go to '..'

github-actions · 2025-01-28T22:16:54Z

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:

Ensure all required checks appearing at the bottom of this PR are passing.
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.
Get at least one approval before merging.

Still unsure? Reach out in #jetpack-developers for guidance!

github-actions · 2025-01-28T22:17:00Z

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/theme-install 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/theme-install

bin/jetpack-downloader test jetpack-mu-wpcom-plugin add/theme-install

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 · 2025-01-28T22:33:45Z

Code Coverage Summary

Cannot generate coverage summary while tests are failing. 🤐

Please fix the tests, or re-run the Code coverage job if it was something being flaky.

Full summary · PHP report · JS report

jeryj · 2025-01-29T21:02:19Z

projects/packages/jetpack-mu-wpcom/src/features/wpcom-themes/wpcom-themes.php

-/**
- * Displays a banner before the theme browser that links to the WP.com Theme Showcase.
- */
-function wpcom_themes_show_banner() {


We can't remove this function until it's removed from being called on WPCOM: fbhepr%2Skers%2Sjcpbz%2Sjc%2Qpbagrag%2Snqzva%2Qcyhtvaf%2Sjcpbz%2Qgurzrf.cuc%3Se%3Q04155113%23176%2Q179-og

ryelle · 2025-01-29T21:24:12Z

In 02fe4c2 I copied over the files from wpcomsh (the code used for Atomic themes), but this doesn't remove those original files yet. Then in 32b4963, I forked the core wp_ajax_query_themes handler, because it first checks for install_themes permissions. I don't like this approach, copying more core code, so I'm open to better solutions — but this at least lets the existing wpcom API functions hook into the correct results.

ryelle · 2025-01-31T18:38:00Z

There are now wrapper filters on the template code — wpcom_themes_tmpl_theme for the card template & wpcom_themes_tmpl_theme_preview for the full-screen customizer preview. I've then added in the theme tier, passed back from the wpcom endpoint, and added it next to the theme name. It's not styled, probably needs to go somewhere else, but it's starting point.

Screenshot:

Maybe this should replace the "Installed" banner?

ryelle · 2025-02-04T23:21:08Z

ryelle · 2025-02-11T18:43:06Z

Eventually we'll need to figure out how to roll this out - not that it's ready yet, but to think about:

All the packages/jetpack-mu-wpcom/src/features/wpcom-themes/includes/* files are simply copied from plugins/wpcomsh/wpcom-themes/includes/; but they should live in one unified place, for both Atomic and Simple
The modified theme-install.php file is based on a core file. How will we handle that? Even if the filters we added are merged into core, Simple sites can't use it directly. So does it actually live forever as a forked file? Not that I see this as a file likely to change often, but still.
wpcom_themes_ajax_query_themes and wpcom_themes_ajax_save_wporg_username are forked from the core functions wp_ajax_query_themes and wp_ajax_save_wporg_username — this should be more clear, since any updates to those functions will require merging back into here.

scruffian · 2025-02-11T20:31:58Z

So does it actually live forever as a forked file?

I would think so yes. We'd need to copy/paste it every time we merge core in.

scruffian · 2025-02-12T12:30:09Z

projects/packages/jetpack-mu-wpcom/src/features/wpcom-themes/wpcom-themes.php

+ * @param object $theme The theme object.
+ * @return object The theme object.
+ */
+function wpcom_themes_api_theme_object( $theme ) {


Should this get added to the endpoint itself?

I left it as a filter (in wpcom_themes_ajax_query_themes) because that function is copied from core, and our code here needs to run after the body of that function runs.

The alternative would be updating the endpoint, but then we would need to alter the wpcom_themes_ajax_query_themes more, which could be harder to merge later if there are core changes. I added a note about that to my how to merge comment.

scruffian · 2025-02-12T14:26:23Z

...ects/packages/jetpack-mu-wpcom/src/features/wpcom-themes/includes/class-wpcom-themes-api.php

+	 *
+	 * @return array<stdClass> An array with all the WPCom themes.
+	 */
+	protected function fetch_themes( string $cache_key, array $params = array() ): array {


This function calls the API through HTTP. On Simple sites we can call the code directly, which means that we don't need to wait for an HTTP request. I think we can do this using Client::wpcom_json_api_request_as_blog

Done in 458df77 - we should now be able to modify the API and see the results when testing.

I reverted this because it was broken, but it should give you an idea how to do it!

scruffian · 2025-02-12T14:53:48Z

All the packages/jetpack-mu-wpcom/src/features/wpcom-themes/includes/* files are simply copied from plugins/wpcomsh/wpcom-themes/includes/; but they should live in one unified place, for both Atomic and Simple

I think the first step here could be to open a separate PR to move those files from wpcomsh to here. That will also make the diff easier to grok.

jeryj · 2025-02-12T19:59:53Z

I think the first step here could be to open a separate PR to move those files from wpcomsh to here. That will also make the diff easier to grok.

I can do this if no one else has yet.

jeryj · 2025-02-12T21:19:54Z

PR for moving files in the works: https://github.com/Automattic/jetpack/pull/41770/files

…missions # Conflicts: # projects/packages/jetpack-mu-wpcom/src/features/wpcom-themes/wpcom-themes.php

…ions

On simple sites, the `stylesheet` includes the path (e.g., `pub/`), while atomic sites don't use this folder structure, so the "installed" theme would not match. In this case, the `id` value is the correct slug.

…ton text is replaced

…er needs to upgrade to another plan

Installed themes on wpcom have prefixed slugs like `pub/*` or `premium/*` due to the file structure, but wporg expects just the theme name (e.g. psychedeli).

jp-launch-control · 2025-02-17T22:39:56Z

Code Coverage Summary

Cannot generate coverage summary while tests are failing. 🤐

Please fix the tests, or re-run the Code coverage job if it was something being flaky.

Full summary · PHP report · JS report

ryelle · 2025-02-17T22:50:02Z

The commits in f188246 & 6d58cde fix some API merge issues. The first ensures there are no duplicates in the results, so you can search for "Layover" or "Videomaker" and you won't see the community option. The second commit prevents wpcomsh_feature_filter_wpcom_themes_api_result from running over the "Block Themes" tab, since it's already running wpcomsh_block_themes_wpcom_themes_api_result. According to that function, it should merge the resulting themes by release date, but since both functions ran, the general filter result was merging with wpcom themes first. Now it's back to just using release date. Is this actually the preferred behavior?

There is an interesting … glitch? i guess — the merge_by_release_date function filters out any theme released after the first wporg theme, so right now on Latest, you'll see "Omega Food Delivery" as the most recent, even though technically "Booknest" was released more recently. I assume it's to handle paginated requests, but it should probably not apply to the first page of results.

These both change the WPCom_Themes* functions — should I move those over to #41770 or do we want to have a separate PR for changes to those files?

scruffian · 2025-02-18T16:19:20Z

These both change the WPCom_Themes* functions — should I move those over to #41770 or do we want to have a separate PR for changes to those files?

I think let's keep #41770 just for the file moving, so we can assess the impact of the changes we're making more carefully.

github-actions bot added [mu wpcom Feature] Wpcom Themes [Package] Jetpack mu wpcom WordPress.com Features [Status] In Progress labels Jan 28, 2025

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 Jan 28, 2025

draganescu changed the title ~~Add/theme install~~ Untangle theme screens Jan 29, 2025

github-actions bot added [Feature] Masterbar WordPress.com Toolbar and Dashboard customizations [Package] Masterbar labels Jan 29, 2025

jeryj reviewed Jan 29, 2025

View reviewed changes

ryelle force-pushed the add/theme-install branch from 32e9c8e to 563f07a Compare February 4, 2025 20:28

Copons mentioned this pull request Feb 5, 2025

Untangling Themes Automattic/wp-calypso#95651

Open

ryelle force-pushed the add/theme-install branch from 30611da to f5f6f49 Compare February 7, 2025 20:42

draganescu assigned draganescu and unassigned draganescu Feb 10, 2025

scruffian commented Feb 12, 2025

View reviewed changes

scruffian force-pushed the add/theme-install branch from 458df77 to 26b7e86 Compare February 12, 2025 15:10

jeryj mentioned this pull request Feb 12, 2025

Move WordPress.com themes api into jetpack-mu-wpcom package #41770

Open

3 tasks

scruffian changed the base branch from trunk to update/move-wpcom-themes-api February 17, 2025 17:55

scruffian changed the base branch from update/move-wpcom-themes-api to trunk February 17, 2025 17:56

ryelle and others added 25 commits February 17, 2025 14:28

Copy over atomic theme api customization

ac65285

Fork the core admin-ajax response to return regardless of install per…

e7f79f9

…missions # Conflicts: # projects/packages/jetpack-mu-wpcom/src/features/wpcom-themes/wpcom-themes.php

Fix the URLs passed to the router

1a67bf2

Replace the ajax request for the favorites username with patched version

9f24a4d

Update comments to explicitly call out patched sections of ajax funct…

52af62b

…ions

Add filter to update the theme object before returning in ajax response

394df5d

Use the correct theme slug for each environment

f511b0e

On simple sites, the `stylesheet` includes the path (e.g., `pub/`), while atomic sites don't use this folder structure, so the "installed" theme would not match. In this case, the `id` value is the correct slug.

Add patched notes and remove hardcoded changes

6278b95

Add filters to the theme templates

b50c58f

Add (unstyled) theme tier label

ec3aa1e

Remove the tier check at the API level

fe9f1d0

Conditional theme activate button text depending of the user plan

e121a9c

Update "Activate" and "Install" URLs to use checkout if necessary

68e1d0c

Update "Install" button text to "Upgrade to install", ensure only but…

47b6f10

…ton text is replaced

Fix duplicate ampersand in URL

24e6756

Fix CSS on custom page by injected theme-install-php class

eaef847

Switch installTheme handler to a noop, to prevent AJAX install request

25cdac5

Apply the install button fix on preview too

3e9c9c9

Display a text saying if the theme is available on the plan or the us…

ce1e40a

…er needs to upgrade to another plan

copying badge styles from Gutenberg's Badge component

43f2e83

add an upload button

f78c2a6

fix a couple of PHP warnings

12afc65

Switch to the marketplace install URL

6fa1ee2

WPCom Theme merge: Merge by actual theme slug, not wpcom theme slug

f188246

Installed themes on wpcom have prefixed slugs like `pub/*` or `premium/*` due to the file structure, but wporg expects just the theme name (e.g. psychedeli).

WPCom Theme API: Prevent duplicate overrides on block themes request

6d58cde

ryelle force-pushed the add/theme-install branch from f3bd032 to 6d58cde Compare February 17, 2025 22:31

ryelle mentioned this pull request Feb 18, 2025

Marketplace installation: Support externally managed themes Automattic/wp-calypso#99761

Open

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Untangle theme screens #41374

Untangle theme screens #41374

scruffian commented Jan 28, 2025

github-actions bot commented Jan 28, 2025 •

edited

Loading

github-actions bot commented Jan 28, 2025 •

edited

Loading

github-actions bot commented Jan 28, 2025 •

edited

Loading

jeryj Jan 29, 2025

ryelle commented Jan 29, 2025

ryelle commented Jan 31, 2025 •

edited

Loading

ryelle commented Feb 4, 2025 •

edited

Loading

ryelle commented Feb 11, 2025 •

edited

Loading

scruffian commented Feb 11, 2025

scruffian Feb 12, 2025

ryelle Feb 12, 2025

scruffian Feb 12, 2025

scruffian Feb 12, 2025

scruffian Feb 12, 2025

scruffian commented Feb 12, 2025

jeryj commented Feb 12, 2025

jeryj commented Feb 12, 2025

jp-launch-control bot commented Feb 17, 2025

ryelle commented Feb 17, 2025

scruffian commented Feb 18, 2025

Untangle theme screens #41374

Are you sure you want to change the base?

Untangle theme screens #41374

Conversation

scruffian commented Jan 28, 2025

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 Jan 28, 2025 • edited Loading

github-actions bot commented Jan 28, 2025 • edited Loading

github-actions bot commented Jan 28, 2025 • edited Loading

Code Coverage Summary

jeryj Jan 29, 2025

Choose a reason for hiding this comment

ryelle commented Jan 29, 2025

ryelle commented Jan 31, 2025 • edited Loading

ryelle commented Feb 4, 2025 • edited Loading

ryelle commented Feb 11, 2025 • edited Loading

scruffian commented Feb 11, 2025

scruffian Feb 12, 2025

Choose a reason for hiding this comment

ryelle Feb 12, 2025

Choose a reason for hiding this comment

scruffian Feb 12, 2025

Choose a reason for hiding this comment

scruffian Feb 12, 2025

Choose a reason for hiding this comment

scruffian Feb 12, 2025

Choose a reason for hiding this comment

scruffian commented Feb 12, 2025

jeryj commented Feb 12, 2025

jeryj commented Feb 12, 2025

jp-launch-control bot commented Feb 17, 2025

Code Coverage Summary

ryelle commented Feb 17, 2025

scruffian commented Feb 18, 2025

github-actions bot commented Jan 28, 2025 •

edited

Loading

github-actions bot commented Jan 28, 2025 •

edited

Loading

github-actions bot commented Jan 28, 2025 •

edited

Loading

ryelle commented Jan 31, 2025 •

edited

Loading

ryelle commented Feb 4, 2025 •

edited

Loading

ryelle commented Feb 11, 2025 •

edited

Loading