Subscriber sort order #21995

nbradbury · 2025-07-07T18:57:08Z

This PR updates the subscriber list by adding ascending & descending items to the sort dropdown menu. I also removed "Plan" as a sort field to match iOS.

To test:

My Site > Subscribers
Tap the sort icon
Note the addition of ascending & descending items
Note that changing the sort order works as expected

sort.mp4

dangermattic · 2025-07-07T18:58:03Z

	2 Warnings
⚠️	`strings.xml` files should only be updated on release branches, when the translations are downloaded by our automation.
⚠️	PR is not assigned to a milestone.

Generated by 🚫 Danger

Copilot

Pull Request Overview

This PR adds ascending and descending sort order options to the subscriber list dropdown and wires them through the view models and UI layers.

Introduces two new string resources for “Ascending” and “Descending.”
Extends DataViewViewModel and SubscribersViewModel to track and apply sort order.
Updates SubscribersActivity and DataViewScreen composables to render and handle the new sort-order menu items.

Reviewed Changes

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

Show a summary per file

File	Description
`strings.xml`	Added string resources for “ascending” and “descending.”
`SubscribersViewModel.kt`	Implemented `getDefaultSort()` override.
`SubscribersActivity.kt`	Passed `currentSortOrder` and `onSortOrderClick` to the UI.
`DataViewViewModel.kt`	Introduced `_sortOrder` state, `sortOrder` flow, and `onSortOrderClick`.
`DataViewScreen.kt`	Created `SortDropdownMenuButton` with ascending/descending items and updated previews.

Comments suppressed due to low confidence (2)

WordPress/src/main/java/org/wordpress/android/ui/dataview/DataViewViewModel.kt:189

The new onSortOrderClick logic and the associated sortOrder state changes aren't covered by existing unit tests. Consider adding tests to verify state updates and that fetchData() is called.

    fun onSortOrderClick(order: WpApiParamOrder) {

WordPress/src/main/java/org/wordpress/android/ui/dataview/DataViewScreen.kt:318

In the descending DropdownMenuItem handler, ensure that menuExpanded = false is executed inside the onClick lambda so the menu closes after selection, matching the ascending behavior.

                onClick = {

WordPress/src/main/java/org/wordpress/android/ui/dataview/DataViewScreen.kt

+ * Dropdown menu button for displaying a list of filter [DataViewDropdownItem]s
+ */
+@Composable
+private fun FilterDropdownMenuButton(
+    filters: List<DataViewDropdownItem>,
+    currentFilter: DataViewDropdownItem?,
+    onFilterClick: (DataViewDropdownItem) -> Unit,
+) {
+    var menuExpanded by remember { mutableStateOf(false) }
+    IconButton(
+        onClick = {
+            menuExpanded = !menuExpanded
+        },
+        modifier = Modifier
+            .size(48.dp)
+    ) {
+        Icon(
+            imageVector = ImageVector.vectorResource(id = R.drawable.ic_filter_list_white_24dp),
+            contentDescription = stringResource(id = R.string.filter),
+            tint = MaterialTheme.colorScheme.primary
+        )
+        DropdownMenu(
+            expanded = menuExpanded,
+            onDismissRequest = {
+                menuExpanded = false
+            }
+        ) {
+            DropdownItems(
+                titleRes = R.string.filter,
+                items = filters,
+                currentItem = currentFilter,
                onItemClick = { item ->
-                    onSortClick(item)
+                    onFilterClick(item)
+                    menuExpanded = false
                }
            )
        }
    }


wpmobilebot · 2025-07-07T19:11:38Z

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

	App Name	Jetpack
	Flavor	Jalapeno
	Build Type	Debug
	Version	pr21995-c437bcf
	Commit	`c437bcf`
	Direct Download	`jetpack-prototype-build-pr21995-c437bcf.apk`

Note: Google Login is not supported on these builds.

wpmobilebot · 2025-07-07T19:15:18Z

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

	App Name	WordPress
	Flavor	Jalapeno
	Build Type	Debug
	Version	pr21995-c437bcf
	Commit	`c437bcf`
	Direct Download	`wordpress-prototype-build-pr21995-c437bcf.apk`

Note: Google Login is not supported on these builds.

codecov · 2025-07-07T19:17:16Z

Codecov Report

Attention: Patch coverage is 0% with 69 lines in your changes missing coverage. Please review.

Project coverage is 39.02%. Comparing base (a8cfad9) to head (c437bcf).
Report is 2 commits behind head on trunk.

Files with missing lines	Patch %	Lines
...rg/wordpress/android/ui/dataview/DataViewScreen.kt	0.00%	63 Missing ⚠️
...wordpress/android/ui/dataview/DataViewViewModel.kt	0.00%	6 Missing ⚠️

Additional details and impacted files

@@           Coverage Diff           @@
##            trunk   #21995   +/-   ##
=======================================
  Coverage   39.02%   39.02%           
=======================================
  Files        2153     2153           
  Lines      101494   101494           
  Branches    15585    15585           
=======================================
  Hits        39613    39613           
  Misses      58384    58384           
  Partials     3497     3497

☔ 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.

…ame" to just "Name"

sonarqubecloud · 2025-07-08T08:18:05Z

Quality Gate passed

Issues
1 New issue
0 Accepted issues

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

See analysis details on SonarQube Cloud

adalpari

Looks good!!

Just as a suggestion, what about start adding tests for DataViewViewModel so we prevent breaking the current stuff while adding all these new changes?

nbradbury · 2025-07-08T11:33:53Z

what about start adding tests for DataViewViewModel so we prevent breaking the current stuff while adding all these new changes?

I was planning on making tests one of the last things I do, simply because I expect to make changes to that view model as I use it more. But if you think it's important now, I can create the tests in a separate PR.

adalpari · 2025-07-08T12:28:52Z

what about start adding tests for DataViewViewModel so we prevent breaking the current stuff while adding all these new changes?

I was planning on making tests one of the last things I do, simply because I expect to make changes to that view model as I use it more. But if you think it's important now, I can create the tests in a separate PR.

Fair enough. It was just a comment. So, feel free to stick with your plan :)

nbradbury added 4 commits July 7, 2025 14:17

AI added ascending/descending menu items

27c4323

Attempt to re-unify sort and filter menus

746524a

Separate filter and sort dropdowns (necessary to add sort order items)

f7d816f

Added divider

0db230e

nbradbury added unit-tests-exemption Subscribers View and manage newsletter subscribers labels Jul 7, 2025

nbradbury requested a review from Copilot July 7, 2025 18:57

Copilot AI reviewed Jul 7, 2025

View reviewed changes

nbradbury added 2 commits July 7, 2025 15:30

To match iOS, removed "Plan" as a sort field and shortened "Display n…

ebc2634

…ame" to just "Name"

Shortened "Email address" to "Email" to match iOS

270c8a5

nbradbury marked this pull request as ready for review July 7, 2025 19:59

nbradbury requested a review from adalpari July 7, 2025 19:59

Merge branch 'trunk' into feature/subscriber-sort-order

c437bcf

adalpari approved these changes Jul 8, 2025

View reviewed changes

nbradbury merged commit 2927acb into trunk Jul 8, 2025
26 checks passed

nbradbury deleted the feature/subscriber-sort-order branch July 8, 2025 14:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Subscriber sort order #21995

Subscriber sort order #21995

nbradbury commented Jul 7, 2025 •

edited

Loading

Uh oh!

dangermattic commented Jul 7, 2025 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

This comment was marked as resolved.

Uh oh!

wpmobilebot commented Jul 7, 2025 •

edited

Loading

Uh oh!

wpmobilebot commented Jul 7, 2025 •

edited

Loading

Uh oh!

codecov bot commented Jul 7, 2025 •

edited

Loading

Uh oh!

sonarqubecloud bot commented Jul 8, 2025

Uh oh!

adalpari left a comment

Uh oh!

nbradbury commented Jul 8, 2025

Uh oh!

adalpari commented Jul 8, 2025

Uh oh!

Uh oh!

Uh oh!

Subscriber sort order #21995

Subscriber sort order #21995

Conversation

nbradbury commented Jul 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dangermattic commented Jul 7, 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!

This comment was marked as resolved.

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

codecov bot commented Jul 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

sonarqubecloud bot commented Jul 8, 2025

Quality Gate passed

Uh oh!

adalpari left a comment

Choose a reason for hiding this comment

Uh oh!

nbradbury commented Jul 8, 2025

Uh oh!

adalpari commented Jul 8, 2025

Uh oh!

Uh oh!

Uh oh!

nbradbury commented Jul 7, 2025 •

edited

Loading

dangermattic commented Jul 7, 2025 •

edited

Loading

wpmobilebot commented Jul 7, 2025 •

edited

Loading

wpmobilebot commented Jul 7, 2025 •

edited

Loading

codecov bot commented Jul 7, 2025 •

edited

Loading