[Bookings] Add list filtering UI #14719

irfano · 2025-10-08T00:23:08Z

Part of

Description

This PR adds the filter screen UI, it doesn’t include the filtering logic or sub-screens.

I aimed to align it with the current Order filter screen design.

Steps to reproduce

Use a CIAB site.
Manually install the bookings plugin from this ZIP file: p1758531103469849/1758101141.913349-slack-C03L1NF1EA3
You'll need to enable bookings v2 on your CIAB testing site. You can do that by installing the Code Snippets plugin to your site and adding the following PHP snippet: define( 'WC_BOOKINGS_NEXT_ENABLED', true );
Navigate to Bookings.
Change the tab to All.
Tap the Filters button.

The tests that have been performed

Screens below.

Images/gif

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-10-08T00:23:59Z

	2 Warnings
⚠️	This PR is larger than 300 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.
⚠️	Class `BookingFilterListViewModel` is missing tests, but `unit-tests-exemption` label was set to ignore this.

Generated by 🚫 Danger

wpmobilebot · 2025-10-08T00:32:27Z

📲 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	`5d3d83c`
	Direct Download	`woocommerce-wear-prototype-build-pr14719-5d3d83c.apk`

wpmobilebot · 2025-10-08T00:42:00Z

📲 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	`5d3d83c`
	Direct Download	`woocommerce-prototype-build-pr14719-5d3d83c.apk`

AdamGrzybkowski

@hichamboushaba Since Irfan is AFK do you want to check my comments? I don't think those are blockers and we can update the code in the following PRs.

...erce/src/main/kotlin/com/woocommerce/android/ui/bookings/filter/BookingFilterListFragment.kt

AdamGrzybkowski · 2025-10-08T19:46:20Z

...erce/src/main/kotlin/com/woocommerce/android/ui/bookings/filter/BookingFilterListFragment.kt

+            BookingFilterListScreen(
+                state = BookingFilterListViewModel.BookingFilterListUiState(
+                    items = options.orEmpty(),
+                    onClose = { requireActivity().onBackPressedDispatcher.onBackPressed() },


❓ Shouldn't we use findNavController().popBackStack() for "going back"?

Good catch, Adam! I agree that using popBackStack() and MultiLiveEvent.Event.Exit fits our current architecture better. Thanks for handling it.

I also added a TODO comment to remind us to handle those actions later: 76a2cec

Given this is called by the app bar navigation button (Up button), we should prefer using navigateUp, it doesn't make any difference for this screen since it can't be deeplinked from outside, but just to follow the best practices 🙂

AdamGrzybkowski · 2025-10-08T19:47:56Z

...erce/src/main/kotlin/com/woocommerce/android/ui/bookings/filter/BookingFilterListFragment.kt

+                    onClose = { requireActivity().onBackPressedDispatcher.onBackPressed() },
+                    onShowBookings = {
+                        // TODO Pass new filter payload instead of `true`
+                        navigateBackWithResult(BookingListFragment.BOOKINGS_FILTER_RESULT, true)


I would consider switching this approach to an in-memory persistence for applied filters exposed as a Flow. This way, we don't have to "return" them. The booking list screen would simply observe them and react to the updates.

@hichamboushaba Thoughts about this?

Some extra thoughts:

One of the cons of this approach would be the extra logic to handle process death. With filters being passed via args we would have this solved by SaveStateHandle for free, with an in-memory filter persistenca that's not the case.

❓ Do we want to persist the filters across app launches?

Good question. I noticed that we persist the latest filters for orders, so I’d say we should do the same for bookings, unless @hichamboushaba disagrees.

If we all agree to persist it, I’d suggest merging this PR first and handling the persistence in a separate one.

oh hi @irfano 👋

If we all agree to persist it, I’d suggest merging this PR first and handling the persistence in a separate one.

Yes, that's obviosly not part of this PR!

I noticed that we persist the latest filters for orders, so I’d say we should do the same for bookings

I noticed it after I asked the question and I agree it would make sense to align.

Sorry folks, I missed the ping about this. I think given it's easy to support persiting filters, we should handle it, we just need to let the iOS folks about this to have a similar feature.

If we add the persistence, I would suggest not returning the filters with navigateBackWithResult, we can just observe them, if we use DataStore for storing the, then we can observe the changes right in the list, and with this we'll have a unique data flow. WDYT?

Also, @irfano go and enjoy your AFK 😄, we'll take it from here for this PR.

If we add the persistence, I would suggest not returning the filters with navigateBackWithResult

Yup, it's already removed in this PR.

we can just observe them, if we use DataStore for storing the, then we can observe the changes right in the list, and with this we'll have a unique data flow. WDYT?

Yes, I already have a working code. Will open a PR soon.

…oking-list-filering-ui

codecov-commenter · 2025-10-09T13:51:14Z

Codecov Report

❌ Patch coverage is 0% with 58 lines in your changes missing coverage. Please review.
✅ Project coverage is 38.41%. Comparing base (d8fe4c0) to head (5d3d83c).
⚠️ Report is 14 commits behind head on trunk.

Files with missing lines	Patch %	Lines
...d/ui/bookings/filter/BookingFilterListViewModel.kt	0.00%	42 Missing ⚠️
...twork/rest/wpcom/wc/bookings/BookingsRestClient.kt	0.00%	13 Missing ⚠️
...e/android/ui/bookings/list/BookingListViewModel.kt	0.00%	2 Missing ⚠️
...ork/rest/wpcom/wc/bookings/BookingsFilterOption.kt	0.00%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##              trunk   #14719      +/-   ##
============================================
- Coverage     38.43%   38.41%   -0.02%     
- Complexity     9887     9888       +1     
============================================
  Files          2105     2106       +1     
  Lines        117088   117138      +50     
  Branches      15646    15659      +13     
============================================
+ Hits          45001    45002       +1     
- Misses        67914    67964      +50     
+ Partials       4173     4172       -1

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

AdamGrzybkowski · 2025-10-09T18:15:24Z

@hichamboushaba Since I've added some code here, do you want to assign yourself and review, or should I approve this myself? :D

hichamboushaba

Looks good, nice work.
I've reviewed just your changes @AdamGrzybkowski, given you reviewed the other changes.

hichamboushaba · 2025-10-09T19:07:29Z

...rce/src/main/kotlin/com/woocommerce/android/ui/bookings/filter/BookingFilterListViewModel.kt

+            onShowBookings = ::onShowBookings
+        )
+    )
+    val uiState = _uiState.asLiveData(viewModelScope.coroutineContext)


np, is there a reason we are passing a specific coroutine context here? asLiveData already uses Dispatchers.Main.immediate by default, so I don't think this has any effect.

Good catch - I missed it. Removed in 5d3d83c

…oking-list-filering-ui

irfano added 6 commits October 8, 2025 03:11

Add new strings for booking filters

3c78b2d

Add more bookings filter options

344b16b

Add BookingsFilterListViewModel

c17ecea

Add booking filter list fragment

a36b4f9

Add BookingFilterListScreen composable

8fd6658

Navigate to the booking filters screen

2214c7e

irfano added this to the 23.5 milestone Oct 8, 2025

irfano added type: enhancement A request for an enhancement. feature: CIAB Mobile Bookings MVP labels Oct 8, 2025

irfano requested review from AdamGrzybkowski, JorgeMucientes and hichamboushaba October 8, 2025 00:23

irfano added the unit-tests-exemption label Oct 8, 2025

AdamGrzybkowski self-assigned this Oct 8, 2025

AdamGrzybkowski reviewed Oct 8, 2025

View reviewed changes

AdamGrzybkowski and others added 5 commits October 9, 2025 10:10

Merge remote-tracking branch 'origin/trunk' into issue/WOOMOB-1239-bo…

4f3a28f

…oking-list-filering-ui

Build BookingFilterListUiState in the VM

2d2c015

Remove booking filter result in favor of reactive approach

19c3ea9

Properly remove viewState creation from composable 🤦

6da0653

Add TODOs for filter actions

76a2cec

hichamboushaba approved these changes Oct 9, 2025

View reviewed changes

AdamGrzybkowski added 2 commits October 9, 2025 21:43

Merge remote-tracking branch 'origin/trunk' into issue/WOOMOB-1239-bo…

607af9a

…oking-list-filering-ui

Use default context in asLiveData()

5d3d83c

hichamboushaba merged commit cfbae08 into trunk Oct 9, 2025
16 checks passed

hichamboushaba deleted the issue/WOOMOB-1239-booking-list-filering-ui branch October 9, 2025 22:05

[Bookings] Add list filtering UI #14719

[Bookings] Add list filtering UI #14719

Uh oh!

Conversation

irfano commented Oct 8, 2025

Description

Steps to reproduce

The tests that have been performed

Images/gif

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

AdamGrzybkowski left a comment

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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

AdamGrzybkowski Oct 9, 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!

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!

AdamGrzybkowski Oct 9, 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!

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

Uh oh!

Codecov Report

Uh oh!

AdamGrzybkowski commented Oct 9, 2025

Uh oh!

hichamboushaba left a comment • 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!

Choose a reason for hiding this comment

Uh oh!

AdamGrzybkowski Oct 9, 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!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

dangermattic commented Oct 8, 2025 •

edited

Loading

wpmobilebot commented Oct 8, 2025 •

edited

Loading

wpmobilebot commented Oct 8, 2025 •

edited

Loading

AdamGrzybkowski Oct 9, 2025 •

edited

Loading

AdamGrzybkowski Oct 9, 2025 •

edited

Loading

codecov-commenter commented Oct 9, 2025 •

edited

Loading

hichamboushaba left a comment •

edited

Loading

AdamGrzybkowski Oct 9, 2025 •

edited

Loading