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

…emes, send them to classic view (wp-admin)

…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

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 would need you to make some changes or provide some more details about your PR. Thank you! 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

scruffian and others added 14 commits February 7, 2025 15:40

Add Theme Install page

aec7d11

changelog

3415864

add theme-install.php

259aae7

add theme-install.php

1d7d077

Make theme-install load

ffec564

add js file

3edc01a

don't send simple site users to calypso for installed or activated th…

971a845

…emes, send them to classic view (wp-admin)

changelog

0c67014

Use the page load hook to enqueue script

6a10604

Ensure the custom JS is loaded after the core theme JS

8342b7e

Update the router to use the custom page URL

6b1d85e

remove the theme showcase banner and link

ebbbef4

Copy over atomic theme api customization

1be87f1

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

89d9ba1

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

ryelle and others added 13 commits February 7, 2025 15:41

Fix the URLs passed to the router

2331013

Replace the ajax request for the favorites username with patched version

e16a87d

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

0013535

…ions

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

cf77993

Use the correct theme slug for each environment

81d3c17

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

405cbb0

Add filters to the theme templates

8884b04

Add (unstyled) theme tier label

9a83d3d

Remove the tier check at the API level

db48ebf

Conditional theme activate button text depending of the user plan

b76f129

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

39c2f50

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

47e5bca

…ton text is replaced

Fix duplicate ampersand in URL

f5f6f49

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

ryelle added 3 commits February 7, 2025 16:45

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

2ccf4b2

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

189c9a9

Apply the install button fix on preview too

a25b393

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

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

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