CMM-1990: Add UTM stats card to new Stats Traffic tab

WordPress/src/main/AndroidManifest.xml

@@ -127,6 +127,11 @@
             android:theme="@style/WordPress.NoActionBar"
             android:exported="false" />
 
+        <activity
+            android:name=".ui.newstats.utm.UtmDetailActivity"
+            android:theme="@style/WordPress.NoActionBar"
+            android:exported="false" />
+
         <activity
             android:name=".ui.newstats.yearinreview.YearInReviewDetailActivity"
             android:theme="@style/WordPress.NoActionBar"

WordPress/src/main/java/org/wordpress/android/ui/mysite/items/listitem/SiteCapabilityChecker.kt

@@ -5,6 +5,7 @@ import org.wordpress.android.fluxc.network.rest.wpapi.rs.WpApiClientProvider
 import org.wordpress.android.fluxc.utils.AppLogWrapper
 import org.wordpress.android.util.AppLog
 import rs.wordpress.api.kotlin.WpRequestResult
+import uniffi.wp_api.UserCapability
 import javax.inject.Inject
 import javax.inject.Singleton
 
@@ -47,9 +48,8 @@ class SiteCapabilityChecker @Inject constructor(
             }
             when (response) {
                 is WpRequestResult.Success -> {
-                    response.response.data.capabilities.entries.any { (key, value) ->
-                        key.toString().equals("edit_theme_options", ignoreCase = true) && value
-                    }
+                    response.response.data.capabilities
+                        .hasCap(UserCapability.EditThemeOptions)
                 }
                 else -> false
             }

WordPress/src/main/java/org/wordpress/android/ui/newstats/NewStatsActivity.kt

@@ -87,6 +87,10 @@ import org.wordpress.android.ui.newstats.clicks.ClicksViewModel
 import org.wordpress.android.ui.newstats.devices.DevicesCard
 import org.wordpress.android.ui.newstats.devices.DevicesCardUiState
 import org.wordpress.android.ui.newstats.devices.DevicesViewModel
+import org.wordpress.android.ui.newstats.utm.UtmCard
+import org.wordpress.android.ui.newstats.utm.UtmCardUiState
+import org.wordpress.android.ui.newstats.utm.UtmDetailActivity
+import org.wordpress.android.ui.newstats.utm.UtmViewModel
 import org.wordpress.android.ui.newstats.filedownloads.FileDownloadsViewModel
 import org.wordpress.android.ui.newstats.locations.LocationsCardUiState
 import org.wordpress.android.ui.newstats.searchterms.SearchTermsViewModel
@@ -396,6 +400,7 @@ private fun TrafficTabContent(
     videoPlaysViewModel: VideoPlaysViewModel = viewModel(),
     fileDownloadsViewModel: FileDownloadsViewModel = viewModel(),
     devicesViewModel: DevicesViewModel = viewModel(),
+    utmViewModel: UtmViewModel = viewModel(),
     newStatsViewModel: NewStatsViewModel = viewModel()
 ) {
     val context = LocalContext.current
@@ -412,6 +417,8 @@ private fun TrafficTabContent(
     val fileDownloadsUiState by fileDownloadsViewModel.uiState.collectAsState()
     val devicesUiState by devicesViewModel.uiState.collectAsState()
     val selectedDeviceType by devicesViewModel.selectedDeviceType.collectAsState()
+    val utmUiState by utmViewModel.uiState.collectAsState()
+    val selectedUtmCategory by utmViewModel.selectedCategory.collectAsState()
     val selectedPeriod by viewsStatsViewModel.selectedPeriod.collectAsState()
     val isTodaysStatsRefreshing by todaysStatsViewModel.isRefreshing.collectAsState()
     val isViewsStatsRefreshing by viewsStatsViewModel.isRefreshing.collectAsState()
@@ -429,13 +436,14 @@ private fun TrafficTabContent(
     val isFileDownloadsRefreshing by fileDownloadsViewModel
         .isRefreshing.collectAsState()
     val isDevicesRefreshing by devicesViewModel.isRefreshing.collectAsState()
+    val isUtmRefreshing by utmViewModel.isRefreshing.collectAsState()
     val isRefreshing = listOf(
         isTodaysStatsRefreshing, isViewsStatsRefreshing,
         isMostViewedPostsRefreshing, isMostViewedReferrersRefreshing,
         isLocationsRefreshing, isAuthorsRefreshing,
         isClicksRefreshing, isSearchTermsRefreshing,
         isVideoPlaysRefreshing, isFileDownloadsRefreshing,
-        isDevicesRefreshing
+        isDevicesRefreshing, isUtmRefreshing
     ).any { it }
     val pullToRefreshState = rememberPullToRefreshState()
 
@@ -486,6 +494,9 @@ private fun TrafficTabContent(
             },
             onDevices = {
                 devicesViewModel.onPeriodChanged(selectedPeriod)
+            },
+            onUtm = {
+                utmViewModel.onPeriodChanged(selectedPeriod)
             }
         )
     }
@@ -519,7 +530,8 @@ private fun TrafficTabContent(
             onSearchTerms = { searchTermsViewModel.loadData() },
             onVideoPlays = { videoPlaysViewModel.loadData() },
             onFileDownloads = { fileDownloadsViewModel.loadData() },
-            onDevices = { devicesViewModel.loadData() }
+            onDevices = { devicesViewModel.loadData() },
+            onUtm = { utmViewModel.loadData() }
         )
     }
 
@@ -570,7 +582,8 @@ private fun TrafficTabContent(
                 onFileDownloads = {
                     fileDownloadsViewModel.refresh()
                 },
-                onDevices = { devicesViewModel.refresh() }
+                onDevices = { devicesViewModel.refresh() },
+                onUtm = { utmViewModel.refresh() }
             )
         },
         indicator = {
@@ -739,6 +752,43 @@ private fun TrafficTabContent(
                             context = context
                         )
                     )
+                    StatsCardType.UTM -> UtmCard(
+                        uiState = utmUiState,
+                        selectedCategory = selectedUtmCategory,
+                        onCategoryChanged = utmViewModel::onCategoryChanged,
+                        onShowAllClick = {
+                            UtmDetailActivity.start(
+                                context = context,
+                                category =
+                                    selectedUtmCategory,
+                                period = selectedPeriod
+                            )
+                        },
+                        onRetry = utmViewModel::onRetry,
+                        onRemoveCard = {
+                            newStatsViewModel.removeCard(cardType)
+                        },
+                        cardPosition = cardPosition,
+                        onMoveUp = {
+                            newStatsViewModel.moveCardUp(cardType)
+                        },
+                        onMoveToTop = {
+                            newStatsViewModel.moveCardToTop(cardType)
+                        },
+                        onMoveDown = {
+                            newStatsViewModel.moveCardDown(cardType)
+                        },
+                        onMoveToBottom = {
+                            newStatsViewModel.moveCardToBottom(cardType)
+                        },
+                        onOpenWpAdmin = buildOpenWpAdminAction(
+                            isAuthError = (utmUiState as?
+                                UtmCardUiState.Error)
+                                ?.isAuthError == true,
+                            getAdminUrl = utmViewModel::getAdminUrl,
+                            context = context
+                        )
+                    )
                     StatsCardType.AUTHORS -> AuthorsCard(
                         uiState = authorsUiState,
                         onShowAllClick = {
@@ -975,7 +1025,8 @@ private fun List<StatsCardType>.dispatchToVisibleCards(
     onSearchTerms: () -> Unit,
     onVideoPlays: () -> Unit,
     onFileDownloads: () -> Unit,
-    onDevices: () -> Unit
+    onDevices: () -> Unit,
+    onUtm: () -> Unit
 ) {
     if (StatsCardType.TODAYS_STATS in this) onTodaysStats()
     if (StatsCardType.VIEWS_STATS in this) onViewsStats()
@@ -992,6 +1043,7 @@ private fun List<StatsCardType>.dispatchToVisibleCards(
     if (StatsCardType.VIDEO_PLAYS in this) onVideoPlays()
     if (StatsCardType.FILE_DOWNLOADS in this) onFileDownloads()
     if (StatsCardType.DEVICES in this) onDevices()
+    if (StatsCardType.UTM in this) onUtm()
 }
 
 @OptIn(ExperimentalMaterial3Api::class)

WordPress/src/main/java/org/wordpress/android/ui/newstats/StatsCardType.kt

@@ -20,7 +20,8 @@ enum class StatsCardType(
     SEARCH_TERMS(R.string.stats_search_terms),
     VIDEO_PLAYS(R.string.stats_videos),
     FILE_DOWNLOADS(R.string.stats_file_downloads),
-    DEVICES(R.string.stats_devices_title);
+    DEVICES(R.string.stats_devices_title),
+    UTM(R.string.stats_utm_title);
 
     companion object {
         /**
@@ -33,7 +34,8 @@ enum class StatsCardType(
             MOST_VIEWED_REFERRERS,
             LOCATIONS,
             AUTHORS,
-            DEVICES
+            DEVICES,
+            UTM
         )
     }
 }

WordPress/src/main/java/org/wordpress/android/ui/newstats/StatsPeriod.kt

@@ -16,7 +16,23 @@ sealed class StatsPeriod(@StringRes val labelResId: Int) {
     data class Custom(val startDate: LocalDate, val endDate: LocalDate) :
         StatsPeriod(R.string.stats_period_custom)
 
+    fun toTypeString(): String = when (this) {
+        is Today -> PERIOD_TODAY
+        is Last7Days -> PERIOD_LAST_7_DAYS
+        is Last30Days -> PERIOD_LAST_30_DAYS
+        is Last6Months -> PERIOD_LAST_6_MONTHS
+        is Last12Months -> PERIOD_LAST_12_MONTHS
+        is Custom -> PERIOD_CUSTOM
+    }
+
     companion object {
+        private const val PERIOD_TODAY = "today"
+        private const val PERIOD_LAST_7_DAYS = "last_7_days"
+        private const val PERIOD_LAST_30_DAYS = "last_30_days"
+        private const val PERIOD_LAST_6_MONTHS = "last_6_months"
+        private const val PERIOD_LAST_12_MONTHS = "last_12_months"
+        private const val PERIOD_CUSTOM = "custom"
+
         /**
          * Returns all preset periods (excluding Custom which requires dates).
          */
@@ -27,5 +43,34 @@ sealed class StatsPeriod(@StringRes val labelResId: Int) {
             Last6Months,
             Last12Months
         )
+
+        fun fromTypeString(
+            type: String,
+            customStartEpochDay: Long? = null,
+            customEndEpochDay: Long? = null
+        ): StatsPeriod = when (type) {
+            PERIOD_TODAY -> Today
+            PERIOD_LAST_7_DAYS -> Last7Days
+            PERIOD_LAST_30_DAYS -> Last30Days
+            PERIOD_LAST_6_MONTHS -> Last6Months
+            PERIOD_LAST_12_MONTHS -> Last12Months
+            PERIOD_CUSTOM -> {
+                if (customStartEpochDay != null &&
+                    customEndEpochDay != null
+                ) {
+                    Custom(
+                        LocalDate.ofEpochDay(
+                            customStartEpochDay
+                        ),
+                        LocalDate.ofEpochDay(
+                            customEndEpochDay
+                        )
+                    )
+                } else {
+                    Last7Days
+                }
+            }
+            else -> Last7Days
+        }
     }
 }

WordPress/src/main/java/org/wordpress/android/ui/newstats/datasource/StatsDataSource.kt

@@ -281,6 +281,26 @@ interface StatsDataSource {
         siteId: Long,
         quantity: Int = 10
     ): StatsEmailsSummaryDataResult
+
+    /**
+     * Fetches UTM stats for a specific site.
+     *
+     * @param siteId The WordPress.com site ID
+     * @param keys UTM key names to query
+     * @param date End date for the query (format: yyyy-MM-dd)
+     * @param days Number of days to include
+     * @param max Maximum number of items to return (0 = no limit)
+     * @param queryTopPosts Whether to include top posts
+     * @return Result containing UTM data or an error
+     */
+    suspend fun fetchUtm(
+        siteId: Long,
+        keys: List<String>,
+        date: String,
+        days: Int,
+        max: Int = 0,
+        queryTopPosts: Boolean = true
+    ): UtmDataResult
 }
 
 /**
@@ -767,3 +787,29 @@ data class EmailSummaryItem(
     val opens: Long,
     val clicks: Long
 )
+
+/**
+ * Result wrapper for UTM stats fetch operation.
+ */
+sealed class UtmDataResult {
+    data class Success(val data: UtmData) : UtmDataResult()
+    data class Error(
+        val errorType: StatsErrorType
+    ) : UtmDataResult()
+}
+
+/**
+ * UTM stats data from the API.
+ */
+data class UtmData(
+    val topUtmValues: Map<String, Long>,
+    val topPosts: Map<String, List<UtmPostData>>
+)
+
+/**
+ * A single UTM post item from the API.
+ */
+data class UtmPostData(
+    val title: String,
+    val views: Long
+)

WordPress/src/main/java/org/wordpress/android/ui/newstats/datasource/StatsDataSourceImpl.kt

@@ -40,6 +40,7 @@ import uniffi.wp_api.SubscribersByUserTypeSortField
 import uniffi.wp_api.StatsEmailsSummaryParams
 import uniffi.wp_api.StatsEmailsSummaryPeriod
 import uniffi.wp_api.StatsEmailsSummarySortField
+import uniffi.wp_api.StatsUtmParams
 import uniffi.wp_api.WpApiParamOrder
 import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.AppLog.T
@@ -1347,6 +1348,71 @@ class StatsDataSourceImpl @Inject constructor(
         }
     }
 
+    override suspend fun fetchUtm(
+        siteId: Long,
+        keys: List<String>,
+        date: String,
+        days: Int,
+        max: Int,
+        queryTopPosts: Boolean
+    ): UtmDataResult {
+        val key = keys.joinToString(",")
+        val params = StatsUtmParams(
+            max = max.toUInt(),
+            date = date,
+            days = days.toUInt(),
+            startDate = null,
+            queryTopPosts = queryTopPosts
+        )
+        AppLog.d(
+            T.STATS,
+            "fetchUtm - siteId=$siteId, " +
+                "key=$key, date=$date, days=$days"
+        )
+        val result = getOrCreateClient()
+            .request { requestBuilder ->
+                requestBuilder.statsUtm()
+                    .getStatsUtm(
+                        wpComSiteId = siteId.toULong(),
+                        statsUtmKeys = key,
+                        params = params
+                    )
+            }
+        logResultType("fetchUtm", result)
+        return when (result) {
+            is WpRequestResult.Success -> {
+                val response = result.response.data
+                val topValues = response.topUtmValues
+                    .mapValues { it.value.toLong() }
+                val topPosts = response.topPosts
+                    .mapValues { entry ->
+                        entry.value.map { post ->
+                            UtmPostData(
+                                title = post.title,
+                                views = post.views.toLong()
+                            )
+                        }
+                    }
+                AppLog.d(
+                    T.STATS,
+                    "fetchUtm success - " +
+                        "${topValues.size} values"
+                )
+                UtmDataResult.Success(
+                    UtmData(
+                        topUtmValues = topValues,
+                        topPosts = topPosts
+                    )
+                )
+            }
+            else -> logErrorAndReturn(
+                "fetchUtm", result
+            ) {
+                UtmDataResult.Error(it)
+            }
+        }
+    }
+
     companion object {
         private const val HTTP_UNAUTHORIZED = 401
         private const val HTTP_FORBIDDEN = 403