[POS Orders] Pagination #14614

toupper · 2025-09-15T12:44:14Z

Part of WOOMOB-1149

Description

With this PR we add pagination to the POS Orders list, loading more pages when the user scrolls down to the bottom.

This PR will be followed by:

Pagination Error
Search Pagination

Steps to reproduce

With a site with enough POS Orders (more than the page size 25)

Open the app
Go to POS
Go to POS Orders
Scroll the Orders list to the bottom
See the loading shimmering row
See how it loads a new page

The tests that have been performed

See above.

Images/gif

Screen_Recording_20250917_130720_Woo.Dev.mp4

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.

wpmobilebot · 2025-09-15T12:53:26Z

📲 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	`2500934`
	Direct Download	`woocommerce-wear-prototype-build-pr14614-2500934.apk`

wpmobilebot · 2025-09-15T13:06:36Z

📲 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	`2500934`
	Direct Download	`woocommerce-prototype-build-pr14614-2500934.apk`

kidinov · 2025-09-15T13:21:50Z

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersScreen.kt

                        selectedOrderId = state.selectedOrderId,
                        onOrderSelected = onOrderSelected,
+                        onEndOfOrdersListReached = onEndOfOrdersListReached,
+                        canLoadMore = canLoadMore && state.pullToRefreshState != WooPosPullToRefreshState.Refreshing,


It looks like that this is equal to

canLoadMore = state.paginationState == WooPosPaginationState.None && state.pullToRefreshState != WooPosPullToRefreshState.Refreshing && state.pullToRefreshState != WooPosPullToRefreshState.Refreshing

comparing the same twice

Good catch! Done in 61e72f3

kidinov · 2025-09-15T13:25:01Z

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersViewModel.kt

+        }
+
+        if (loadOrdersJob?.isActive == true) {
+            loadMoreAfterLoadCompletes = true


In my opinion, queuing another load of requests overcomplicates things and isn’t worth the added complexity. I don’t believe users expects this behavior

I agree, I removed that logic in a62305a

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersViewModel.kt

kidinov · 2025-09-15T13:26:39Z

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersViewModel.kt

+
    private fun loadOrders() {
-        viewModelScope.launch {
+        loadOrdersJob?.cancel()


I think this is done already in the search PR so can be reused after taking the changes from there. Also, keep in mind that pagination should also work when the search is on

Yeah, I will manage that when merging the work on for the Search

…nation # Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersDataSource.kt # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersScreen.kt # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersViewModel.kt

codecov-commenter · 2025-09-17T11:22:36Z

Codecov Report

❌ Patch coverage is 75.71429% with 17 lines in your changes missing coverage. Please review.
✅ Project coverage is 38.43%. Comparing base (24ca8cc) to head (2500934).
⚠️ Report is 80 commits behind head on trunk.

Files with missing lines	Patch %	Lines
.../android/ui/woopos/orders/WooPosOrdersViewModel.kt	69.23%	4 Missing and 12 partials ⚠️
...uxc/network/rest/wpcom/wc/order/OrderRestClient.kt	0.00%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##              trunk   #14614      +/-   ##
============================================
+ Coverage     38.42%   38.43%   +0.01%     
- Complexity     9739     9745       +6     
============================================
  Files          2059     2059              
  Lines        115359   115409      +50     
  Branches      15357    15368      +11     
============================================
+ Hits          44328    44363      +35     
- Misses        66922    66926       +4     
- Partials       4109     4120      +11

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

kidinov · 2025-09-17T13:46:50Z

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersScreen.kt

                }

                is WooPosOrdersState.Content -> {
+                    val isLoadingMore = state.paginationState == WooPosPaginationState.Loading


Sorry for not commenting on this before. I think the filtering of when to request another page and when to ignore the "end of list" event should be done in the VM

Good point, done in f84c0a8

It’s not quite what I meant. The VM should not expose anything beyond its state. Here is an example - I didn't test it much, but it looks correct

Refactor_pagination_logic_in_WooPosOrdersScreen_and_WooPosOrdersViewModel.patch

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersViewModel.kt

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersDataSource.kt

kidinov

Thanks for your here!

Overall, everything looks good. The only thing I think needs to be fixed surely is that pagination doesn’t currently work for search cases

toupper · 2025-09-18T09:32:25Z

Thanks for the review @kidinov! As mentioned in the comments, this PR will be followed by:

Pagination Error
Search Pagination

kidinov

LGTM! I left one refactoring proposal which I think would be nice to implement, please take a look

toupper added 5 commits September 11, 2025 14:56

Detect when the end of the list is reached

e44ce5f

Implement load more when reaching the end of the orders list

4480273

Refine code for pagination

1a4c933

Fix can load more logic

5f5750e

Append new items to the end of the list

46ae5bb

toupper marked this pull request as draft September 15, 2025 12:44

kidinov reviewed Sep 15, 2025

View reviewed changes

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersViewModel.kt Outdated Show resolved Hide resolved

kidinov reviewed Sep 15, 2025

View reviewed changes

toupper added 8 commits September 16, 2025 12:08

Simplify statement

61e72f3

Remove non necessary logic

a62305a

Set canLoadMore also in the first load

819c7b2

Better logic to update content

dab2cef

Add shimmering row when loading a new page

c604101

Increase count when loading orders

0b41ccc

Add unit tests

f8d77fc

toupper changed the title ~~Feat/woomob 1149 pos historical orders pagination~~ [POS Orders] Pagination Sep 17, 2025

toupper requested a review from kidinov September 17, 2025 11:29

toupper marked this pull request as ready for review September 17, 2025 11:29

kidinov reviewed Sep 17, 2025

View reviewed changes

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersViewModel.kt Outdated Show resolved Hide resolved

kidinov reviewed Sep 17, 2025

View reviewed changes

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersViewModel.kt Show resolved Hide resolved

kidinov reviewed Sep 17, 2025

View reviewed changes

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/orders/WooPosOrdersDataSource.kt Show resolved Hide resolved

kidinov reviewed Sep 17, 2025

View reviewed changes

Move logic to view model, where it ideally belongs

f84c0a8

Better logic

0c433d5

toupper added the type: task An internally driven task. label Sep 18, 2025

toupper added this to the 23.4 milestone Sep 18, 2025

toupper added 2 commits September 18, 2025 11:59

Remove non necessary check

2bf39dd

Fix test

3ae8ba1

kidinov self-requested a review September 18, 2025 12:58

kidinov approved these changes Sep 18, 2025

View reviewed changes

toupper added 2 commits September 19, 2025 12:01

Refactor for better architecture

d1136dc

Fix detekt issues

2500934

toupper merged commit f788092 into trunk Sep 19, 2025
15 checks passed

toupper deleted the feat/WOOMOB-1149-pos-historical-orders-pagination branch September 19, 2025 10:51

[POS Orders] Pagination #14614

[POS Orders] Pagination #14614

Uh oh!

Conversation

toupper commented Sep 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Steps to reproduce

The tests that have been performed

Images/gif

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codecov-commenter commented Sep 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kidinov Sep 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

kidinov left a comment

Choose a reason for hiding this comment

Uh oh!

toupper commented Sep 18, 2025

Uh oh!

kidinov left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

toupper commented Sep 15, 2025 •

edited

Loading

wpmobilebot commented Sep 15, 2025 •

edited

Loading

wpmobilebot commented Sep 15, 2025 •

edited

Loading

codecov-commenter commented Sep 17, 2025 •

edited

Loading

kidinov Sep 18, 2025 •

edited

Loading