CMM-1936: Add Insights tab to new stats screen

[adalpari]

Description

Note: This is the result of multiple individual PRs merged into this Feature branch.

Adds the Insights tab to the new stats screen with the following cards:

• Year in Review — 2x2 grid showing posts, words, likes, and comments per year, with a detail screen for all years
• All-Time Stats — total posts, views, visitors, and best views day
• Most Popular Day — day of the week with highest average views
• Most Popular Time — hour of the day with highest average views (bar chart)
• Tags & Categories — top tags/categories by views, with expandable groups and a detail screen

Also includes:

• Centralized data fetching via InsightsViewModel coordinating StatsSummaryUseCase, StatsInsightsUseCase, and StatsTagsUseCase
• Card configuration (add/remove/reorder) via InsightsCardsConfigurationRepository persisted in AppPrefs
• Pull-to-refresh, no-connection handling, and add-card bottom sheet for the Insights tab
• Generic AddCardBottomSheet<T> extracted to deduplicate three identical bottom sheet implementations
• Error handling fix in StatsTagsUseCase for in-flight request coalescing
• Comprehensive unit tests for all new ViewModels, use cases, and repositories

Testing instructions

Smoke tests the whole new stats Insights tab.

[dangermattic]

	2 Warnings
⚠️	This PR is larger than 300 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.
⚠️	PR is not assigned to a milestone.

Generated by 🚫 Danger

[wpmobilebot]

Project manifest changes for WordPress

The following changes in the WordPress's merged AndroidManifest.xml file were detected (build variant: jetpackRelease):

--- ./build/reports/diff_manifest/WordPress/jetpackRelease/base_manifest.txt	2026-03-19 15:50:43.007665376 +0000
+++ ./build/reports/diff_manifest/WordPress/jetpackRelease/head_manifest.txt	2026-03-19 15:50:50.807648389 +0000
@@ -397,6 +397,14 @@
             android:exported="false"
             android:theme="@style/WordPress.NoActionBar" />
         <activity
+            android:name="org.wordpress.android.ui.newstats.yearinreview.YearInReviewDetailActivity"
+            android:exported="false"
+            android:theme="@style/WordPress.NoActionBar" />
+        <activity
+            android:name="org.wordpress.android.ui.newstats.tagsandcategories.TagsAndCategoriesDetailActivity"
+            android:exported="false"
+            android:theme="@style/WordPress.NoActionBar" />
+        <activity
             android:name="org.wordpress.android.ui.newstats.subscribers.subscriberslist.SubscribersListDetailActivity"
             android:exported="false"
             android:theme="@style/WordPress.NoActionBar" />

Go to https://buildkite.com/automattic/wordpress-android/builds/25570/canvas?sid=019d06c6-2658-4133-8a2d-29971c6d7ebe, click on the Artifacts tab and audit the files.

[wpmobilebot]

Project manifest changes for WordPress

The following changes in the WordPress's merged AndroidManifest.xml file were detected (build variant: wordpressRelease):

--- ./build/reports/diff_manifest/WordPress/wordpressRelease/base_manifest.txt	2026-03-19 15:51:24.200876723 +0000
+++ ./build/reports/diff_manifest/WordPress/wordpressRelease/head_manifest.txt	2026-03-19 15:51:33.210936020 +0000
@@ -205,6 +205,14 @@
             android:exported="false"
             android:theme="@style/WordPress.NoActionBar" />
         <activity
+            android:name="org.wordpress.android.ui.newstats.yearinreview.YearInReviewDetailActivity"
+            android:exported="false"
+            android:theme="@style/WordPress.NoActionBar" />
+        <activity
+            android:name="org.wordpress.android.ui.newstats.tagsandcategories.TagsAndCategoriesDetailActivity"
+            android:exported="false"
+            android:theme="@style/WordPress.NoActionBar" />
+        <activity
             android:name="org.wordpress.android.ui.newstats.subscribers.subscriberslist.SubscribersListDetailActivity"
             android:exported="false"
             android:theme="@style/WordPress.NoActionBar" />

Go to https://buildkite.com/automattic/wordpress-android/builds/25570/canvas?sid=019d06c6-2657-4f0d-bcb9-a189e186ad69, click on the Artifacts tab and audit the files.

[wpmobilebot]

Project dependencies changes

list

! Upgraded Dependencies
rs.wordpress.api:android:trunk-262a778ead5f163f3450d62adfac21fb32048714, (changed from trunk-502e9561f2a68294f0065867bab9214cc9a6b78c)
rs.wordpress.api:kotlin:trunk-262a778ead5f163f3450d62adfac21fb32048714, (changed from trunk-502e9561f2a68294f0065867bab9214cc9a6b78c)

tree

 +--- project :libs:fluxc
-|    \--- rs.wordpress.api:android:trunk-502e9561f2a68294f0065867bab9214cc9a6b78c
-|         +--- com.squareup.okhttp3:okhttp:5.3.2 (*)
-|         +--- com.squareup.okhttp3:okhttp-tls:5.3.2
-|         |    +--- com.squareup.okhttp3:okhttp:5.3.2 (*)
-|         |    +--- com.squareup.okio:okio:3.16.4 (*)
-|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:2.2.21 -> 2.3.10 (*)
-|         +--- net.java.dev.jna:jna:5.18.1
-|         +--- rs.wordpress.api:kotlin:trunk-502e9561f2a68294f0065867bab9214cc9a6b78c
-|         |    +--- com.squareup.okhttp3:okhttp:5.3.2 (*)
-|         |    +--- com.squareup.okhttp3:okhttp-tls:5.3.2 (*)
-|         |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2 (*)
-|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.21 -> 2.3.10 (*)
-|         \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.21 -> 2.3.10 (*)
+|    \--- rs.wordpress.api:android:trunk-262a778ead5f163f3450d62adfac21fb32048714
+|         +--- com.squareup.okhttp3:okhttp:5.3.2 (*)
+|         +--- com.squareup.okhttp3:okhttp-tls:5.3.2
+|         |    +--- com.squareup.okhttp3:okhttp:5.3.2 (*)
+|         |    +--- com.squareup.okio:okio:3.16.4 (*)
+|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:2.2.21 -> 2.3.10 (*)
+|         +--- net.java.dev.jna:jna:5.18.1
+|         +--- rs.wordpress.api:kotlin:trunk-262a778ead5f163f3450d62adfac21fb32048714
+|         |    +--- com.squareup.okhttp3:okhttp:5.3.2 (*)
+|         |    +--- com.squareup.okhttp3:okhttp-tls:5.3.2 (*)
+|         |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2 (*)
+|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.21 -> 2.3.10 (*)
+|         \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.21 -> 2.3.10 (*)
-\--- rs.wordpress.api:android:trunk-502e9561f2a68294f0065867bab9214cc9a6b78c (*)
+\--- rs.wordpress.api:android:trunk-262a778ead5f163f3450d62adfac21fb32048714 (*)

[wpmobilebot]

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

	App Name	Jetpack Android
	Build Type	Debug
	Version	pr22711-e22b613
	Build Number	1487
	Application ID	com.jetpack.android.prealpha
	Commit	e22b613
	Installation URL	6b19m5ku41smg

Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

[wpmobilebot]

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

	App Name	WordPress Android
	Build Type	Debug
	Version	pr22711-e22b613
	Build Number	1487
	Application ID	org.wordpress.android.prealpha
	Commit	e22b613
	Installation URL	5gpjs4ek3elhg

Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

[codecov]

Codecov Report

❌ Patch coverage is 28.48189% with 2054 lines in your changes missing coverage. Please review.
✅ Project coverage is 37.34%. Comparing base (2bd4f59) to head (e22b613).

Files with missing lines	Patch %	Lines
.../wordpress/android/ui/newstats/NewStatsActivity.kt	0.00%	268 Missing ⚠️
...d/ui/newstats/mostpopularday/MostPopularDayCard.kt	0.00%	265 Missing ⚠️
...ewstats/tagsandcategories/TagsAndCategoriesCard.kt	0.00%	253 Missing ⚠️
...droid/ui/newstats/yearinreview/YearInReviewCard.kt	0.00%	243 Missing ⚠️
...droid/ui/newstats/alltimestats/AllTimeStatsCard.kt	0.00%	208 Missing ⚠️
...ui/newstats/mostpopulartime/MostPopularTimeCard.kt	0.00%	189 Missing ⚠️
...gsandcategories/TagsAndCategoriesDetailActivity.kt	0.00%	166 Missing ⚠️
...s/tagsandcategories/TagsAndCategoriesComponents.kt	0.00%	126 Missing ⚠️
...ewstats/yearinreview/YearInReviewDetailActivity.kt	0.00%	123 Missing ⚠️
...roid/ui/newstats/datasource/StatsDataSourceImpl.kt	0.00%	103 Missing ⚠️
... and 17 more

Additional details and impacted files

@@            Coverage Diff             @@
##            trunk   #22711      +/-   ##
==========================================
- Coverage   37.52%   37.34%   -0.19%     
==========================================
  Files        2286     2314      +28     
  Lines      120570   123367    +2797     
  Branches    16514    16693     +179     
==========================================
+ Hits        45244    46066     +822     
- Misses      71651    73600    +1949     
- Partials     3675     3701      +26     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
• 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

[adalpari]

@claude

[claude]

Claude finished @adalpari's task in 3m 2s —— View job

---

Code Review: CMM-1936 — Insights Tab

• Read and analyze key source files
• Review architecture and data flow
• Check error handling and edge cases
• Review testing coverage and quality
• Check for security and performance concerns
• Post comprehensive review feedback

---

This is a well-structured PR. The architecture follows established patterns in the codebase and the test coverage for the new ViewModels and use cases is solid. Below are the issues I found, ordered by severity.

---

Bugs

1. StatsTagsUseCase — CancellationException resolves deferred with an error instead of cancelling it

StatsTagsUseCase.kt:84-90

} catch (e: CancellationException) {
    mutex.withLock { inFlight = null }
    deferred.complete(TagsResult.Error("Request cancelled"))  // ← problem
    throw e
}

Any concurrent caller waiting on deferred.await() when the owner's coroutine is cancelled will receive TagsResult.Error("Request cancelled") rather than having their own coroutine cancelled. This means the detail screen and the card screen (which use different ViewModels with their own scopes) could show an error state after the user triggers a pull-to-refresh that cancels an in-flight request. The non-cancellation path on line 94 correctly uses completeExceptionally(e) — the cancellation path should use deferred.cancel(e) or deferred.completeExceptionally(e) (and not re-throw, since await() will then rethrow for waiters).

Fix this →

---

2. InsightsViewModel.updateFromConfiguration — newly-added card may never load

InsightsViewModel.kt:263-279

private fun updateFromConfiguration(config: InsightsCardsConfiguration) {
    ...
    val needsNewFetch = (cards.needsSummary() && !summaryFetched.get()) || ...
    _cardsToLoad.value = config.visibleCards
    if (needsNewFetch) {
        isDataLoaded.set(false)
        loadDataIfNeeded()
    }
}

If a user adds a card while a fetch is already in progress (isDataLoading = true), loadDataIfNeeded() returns immediately because compareAndSet(false, true) fails. The fetch that's already running uses the old _cardsToLoad.value. After the fetch completes the finally block sets isDataLoading.set(false) and isDataLoaded.set(true) — but the newly required data was never fetched. The card will stay in its Loading state until the user manually pulls to refresh.

---

3. MostPopularTimeViewModel — || in NoData guard hides partial data

MostPopularTimeViewModel.kt:60-63

if (data.highestDayPercent == 0.0 || data.highestHourPercent == 0.0) {
    return MostPopularTimeCardUiState.NoData
}

Using || means the card returns NoData when either value is zero, even if the other contains valid data. A new site where the highest hour has 0% traffic would show NoData for the whole card. && would be the appropriate guard if the intent is "no useful data in either field".

---

Performance

4. StatsSummaryUseCase / StatsInsightsUseCase — mutex held for entire network call duration

StatsSummaryUseCase.kt:30-45, StatsInsightsUseCase.kt:30-45

Both use cases hold the mutex across the full statsRepository.fetch*() call:

return mutex.withLock {
    ...
    val result = statsRepository.fetchStatsSummary(siteId) // network call inside lock
    ...
}

This serialises all callers for the entire round-trip (vs StatsTagsUseCase which correctly releases the lock before the network call). While not incorrect for correctness, it means the coroutineScope { launch { fetchSummary(...) }; launch { fetchInsights(...) } } parallel execution in InsightsViewModel provides no benefit — both fetches block each other on their respective mutex.

---

Code Quality

5. YearInReviewViewModel — Calendar.getInstance() inconsistency

YearInReviewViewModel.kt:77

val currentYear = Calendar.getInstance().get(Calendar.YEAR).toString()

All other date/time handling in this PR uses java.time. This should use java.time.Year.now().value.toString() for consistency and to remove the Calendar import.

Fix this →

---

6. BaseTagsAndCategoriesViewModel — empty success result renders an empty card

BaseTagsAndCategoriesViewModel.kt:109-118

When the API returns a successful empty list, the state transitions to Loaded(items = emptyList(), maxViewsForBar = 1L). This will render a card with no rows, giving users no feedback. Adding a NoData check — consistent with how MostPopularDayViewModel handles a blank viewsBestDay — would be more user-friendly:

if (items.isEmpty()) return TagsAndCategoriesCardUiState.NoData

---

7. StatsDataSourceImpl.init() — non-atomic check-then-set on @Volatile fields

StatsDataSourceImpl.kt:78-83

override fun init(accessToken: String) {
    if (this.accessToken != accessToken) {
        this.accessToken = accessToken
        wpComApiClient = null
    }
}

The read-check-write sequence on accessToken/wpComApiClient is not atomic. Two concurrent init() calls with the same token could both pass the if check, and one could null out a client that was just created. Since init() is called from the use cases before each fetch, this is a real concurrent path. @Synchronized or a synchronized(this) block should be used here (the existing getOrCreateClient() already uses @Synchronized).

---

8. NewStatsActivity — period selector shown on the Insights tab

NewStatsActivity.kt:176-225

if (currentTab != StatsTab.SUBSCRIBERS) { /* show period menu */ }

The period selector is shown when on the Insights tab, but none of the Insights cards (Year in Review, All-Time Stats, Most Popular Day/Time, Tags & Categories) are time-range filtered. This may mislead users into thinking changing the period affects Insights data.

---

9. AddCardItem — missing accessibility content description

AddStatsCardBottomSheet.kt:122-147

The AddCardItem Row is clickable but has no contentDescription. Screen readers will announce the Text content but not communicate that the element is a button or what action it performs. A semantics { contentDescription = "Add $label" } modifier on the Row would help.

---

Minor Observations

• InsightsCardsConfigurationRepository.isValidConfiguration (line 288–293): The @Suppress("USELESS_CAST") and the cast to List<Any?> for a null check is a fragile pattern. The comment at line 313-317 indicates this is for JSON migration (the EnumWithFallbackValueTypeAdapterFactory may deserialise unknown enum values as null). This is fine, but worth a brief comment explaining why null can appear in a typed list.

• MostPopularDayViewModel.parseBestDay (line 82–108): Silently falls back to raw bestDay string on parse failure. Consider logging the parse error at DEBUG level so unusual date formats from the API don't go unnoticed.

• TagsAndCategoriesDetailViewModel has no refresh() method (unlike TagsAndCategoriesViewModel which has one). The detail screen presumably can't be refreshed, which may be intentional — but worth confirming.

---

| Branch

[sonarqubecloud]

Quality Gate passed

Issues
16 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
3.2% Duplication on New Code

See analysis details on SonarQube Cloud

[nbradbury]

@adalpari This all tested fine, but Claude found some critical issues that may need to be addressed. If you'd rather tackle those separately, just let me know and I'll approve this PR as-is.

review-pr-22711-insights-tab-2026-03-19.pdf