Remove unused theme infrastructure from FluxC #15011

wzieba · 2025-11-21T14:15:06Z

Related to: AINFRA-548: Migrate ThemeModel

Description

Woo mobile app only uses 4 theme actions (fetch WP.com themes, fetch current theme, activate, install). This PR removes the unused theme infrastructure including starter designs, installed themes management, and database operations that aren't needed by the app and were inherited with FluxC vendoring.

Test Steps

Smoke test theme functionality:

Open the app and navigate to Settings → Site Settings → Themes
Verify the current theme is displayed correctly
Browse available themes and verify they load with names and preview images
Select a different theme and activate it
Verify the theme activation succeeds and the new theme is shown as active

I have considered if this change warrants release notes and have added them to RELEASE-NOTES.txt if necessary. Use the "[Internal]" label for non-user-facing changes.

dangermattic · 2025-11-21T14:16:00Z

	2 Warnings
⚠️	This PR is larger than 300 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.
⚠️	This PR is assigned to the milestone 23.8. This milestone is due in less than 2 days. Please make sure to get it merged by then or assign it to a milestone with a later deadline.

Generated by 🚫 Danger

wpmobilebot · 2025-11-21T14:24:13Z

📲 You can test the changes from this Pull Request in WooCommerce-Wear Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce-Wear Android
	Platform	⌚️ Wear OS
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`66cad90`
	Direct Download	`woocommerce-wear-prototype-build-pr15011-66cad90.apk`

wpmobilebot · 2025-11-21T14:34:21Z

📲 You can test the changes from this Pull Request in WooCommerce Android by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce Android
	Platform	📱 Mobile
	Flavor	Jalapeno
	Build Type	Debug
	Commit	`66cad90`
	Direct Download	`woocommerce-prototype-build-pr15011-66cad90.apk`

It's unused in Woo

Woo uses "fetch wpcom themes" action only

They're not used in Woo

`resultsLimit` is always specified in `ThemeRepository#fetchThemes`

It was used only in tests

Copilot

Pull request overview

This PR removes unused theme infrastructure from FluxC to simplify the codebase, retaining only the 4 theme actions needed by the Woo mobile app: fetch WP.com themes, fetch current theme, activate theme, and install theme.

Key changes:

Removed starter designs functionality and related API endpoints
Removed installed themes management for Jetpack sites
Simplified ThemeModel by removing unused fields (description, slug, version, author, screenshot URL, pricing, etc.)
Cleaned up database operations and removed delete/remove theme actions

Reviewed changes

Copilot reviewed 7 out of 7 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
ThemeStore.java	Removed unused payload classes, event handlers, and public methods for starter designs, installed themes, and theme deletion
ThemeSqlUtils.java	Removed database operations for installed themes management and mobile-friendly theme queries
ThemeRestClient.java	Removed API methods for starter designs, Jetpack installed themes, and theme deletion; simplified theme model creation
ThemeModel.java	Removed unused fields and simplified constructors to only include essential properties
ThemeAction.java	Removed action enums for starter designs, installed themes, theme deletion, and site themes removal
StarterDesignsResponse.kt	Deleted entire file as starter designs feature is removed
ThemeStoreUnitTest.java	Updated tests to use parameterized methods and direct SQL access where needed

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/ThemeModel.java

wzieba · 2025-11-21T16:27:29Z

hi @JorgeMucientes 👋 I'm trying to round-robin review requests that, I think, are closer to Kiwi's scope. Are you available for doing reviews, or should I request other team members? :)

It's not used anywhere

JorgeMucientes · 2025-11-24T09:46:21Z

Hey @wzieba feel free to add me to PR reviews whenever. I may just not be as fast as other folks to get the review done, but I'm definitely part of the pool of reviewers :).
I'll give a look at it this week

JorgeMucientes

Thanks for working on this code clean up @wzieba.

Removed code looks safe and theme feature works as expected!

JorgeMucientes · 2025-11-26T16:05:57Z

libs/fluxc-tests/src/test/java/org/wordpress/android/fluxc/theme/ThemeStoreUnitTest.java

        final SiteModel site = SiteUtils.generateWPComSite();
        TestSiteSqlUtils.INSTANCE.getSiteSqlUtils().insertOrUpdateSite(site);
-        assertNull(mThemeStore.getActiveThemeForSite(site));
+        assertEquals(0, ThemeSqlUtils.getActiveThemeForSite(site).size());


Super minor np, a potentially a matter of preference but I think this style is more readable?

Suggested change

assertEquals(0, ThemeSqlUtils.getActiveThemeForSite(site).size());

assertTrue(ThemeSqlUtils.getActiveThemeForSite(site).isEmpty());

No need to change :)

It is, thanks! Actually, I like assertj assertions the most, so I went with

assertThat(ThemeSqlUtils.getActiveThemeForSite(site)).isEmpty();

in 66cad90 🙂

wzieba marked this pull request as draft November 21, 2025 14:17

wzieba added 10 commits November 21, 2025 15:53

Remove REMOVE_SITE_THEMES

e0523c1

It's unused in Woo

Remove "delete theme" feature from ThemeStore

ea9c013

It's unused in Woo

Remove "fetch installed themes" actions from ThemeStore

b5a9d49

Woo uses "fetch wpcom themes" action only

Remove "fetch starter designs" actions from ThemeStore

38e1a3d

They're not used in Woo

Remove redundant initializer

65a482e

`resultsLimit` is always specified in `ThemeRepository#fetchThemes`

Remove remaining unused methods from ThemeStore

84a63ad

Remove remaining unused methods from ThemeRestClient

c83b337

Remove unused methods from ThemeSqlUtils

6b7a119

Remove ThemeStore#getWpComThemes

a582725

It was used only in tests

Remove ThemeStore#getActiveThemeForSite

68ed834

It was used only in tests

wzieba force-pushed the clean_up_theme_model branch from 63da930 to 68ed834 Compare November 21, 2025 15:50

Remove all unused properties of ThemeModel

5435df6

wzieba added the type: technical debt Represents or solves tech debt of the project. label Nov 21, 2025

wzieba added this to the 23.8 milestone Nov 21, 2025

wzieba requested a review from Copilot November 21, 2025 16:14

Copilot started reviewing on behalf of wzieba November 21, 2025 16:14 View session

Copilot finished reviewing on behalf of wzieba November 21, 2025 16:17

Copilot AI reviewed Nov 21, 2025

View reviewed changes

libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/ThemeModel.java Show resolved Hide resolved

wzieba requested a review from AdamGrzybkowski November 21, 2025 16:25

wzieba marked this pull request as ready for review November 21, 2025 16:25

wzieba requested review from JorgeMucientes and removed request for AdamGrzybkowski November 21, 2025 16:25

Remove getWpComThemes from ThemeSqlUtils

98ac694

It's not used anywhere

JorgeMucientes self-assigned this Nov 24, 2025

JorgeMucientes approved these changes Nov 26, 2025

View reviewed changes

Use assertj assertion for clarity

66cad90

wzieba enabled auto-merge November 27, 2025 16:02

wzieba merged commit 0342f46 into trunk Nov 27, 2025
18 checks passed

wzieba deleted the clean_up_theme_model branch November 27, 2025 16:02

wzieba mentioned this pull request Dec 4, 2025

Migrate ThemeModel to Room #15045

Open

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Remove unused theme infrastructure from FluxC #15011

Remove unused theme infrastructure from FluxC #15011

Uh oh!

wzieba commented Nov 21, 2025 •

edited

Loading

Uh oh!

dangermattic commented Nov 21, 2025 •

edited

Loading

Uh oh!

wpmobilebot commented Nov 21, 2025 •

edited

Loading

Uh oh!

wpmobilebot commented Nov 21, 2025 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

wzieba commented Nov 21, 2025

Uh oh!

JorgeMucientes commented Nov 24, 2025

Uh oh!

JorgeMucientes left a comment

Uh oh!

JorgeMucientes Nov 26, 2025

Uh oh!

wzieba Nov 27, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

	assertEquals(0, ThemeSqlUtils.getActiveThemeForSite(site).size());
	assertTrue(ThemeSqlUtils.getActiveThemeForSite(site).isEmpty());

Remove unused theme infrastructure from FluxC #15011

Remove unused theme infrastructure from FluxC #15011

Uh oh!

Conversation

wzieba commented Nov 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Test Steps

Uh oh!

dangermattic commented Nov 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Nov 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Nov 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

wzieba commented Nov 21, 2025

Uh oh!

JorgeMucientes commented Nov 24, 2025

Uh oh!

JorgeMucientes left a comment

Choose a reason for hiding this comment

Uh oh!

JorgeMucientes Nov 26, 2025

Choose a reason for hiding this comment

Uh oh!

wzieba Nov 27, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

wzieba commented Nov 21, 2025 •

edited

Loading

dangermattic commented Nov 21, 2025 •

edited

Loading

wpmobilebot commented Nov 21, 2025 •

edited

Loading

wpmobilebot commented Nov 21, 2025 •

edited

Loading