[Bookings] Type filter #14858

irfano · 2025-10-29T17:24:42Z

Description

This adds the Type Filter page to the Booking Filter screen. It currently includes only the UI part. once we have a dedicated ViewModel for the Type Filter screen, we’ll need to bind the logic to the UI.

Test Steps

Log in with a CIAB store.
Go to Bookings.
Go to the All tab.
Tap the Filters button.
Select Booking type.

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.

Moves the `BookingFilterListItem` data class from `BookingFilterListUiState.kt` to a new, dedicated file `BookingFilterListItem.kt` within the same package.

This commit introduces a new Composable, `SingleChoiceFilterPage`, for displaying a list of filter options where only one can be selected at a time.

Introduces the `BookingTypeFilterPage` composable. This page utilizes the generic `SingleChoiceFilterPage` to display a list of booking type filter options.

dangermattic · 2025-10-29T17:25:43Z

	2 Warnings
⚠️	Class `BookingTypeFilterViewModel` is missing tests, but `unit-tests-exemption` label was set to ignore this.
⚠️	This PR is assigned to the milestone 23.6. The due date for this milestone has already passed. Please assign it to a milestone with a later deadline or check whether the release for this milestone has already been finished.

Generated by 🚫 Danger

irfano · 2025-10-29T17:27:48Z

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/filter/BookingFilterListItem.kt

+data class BookingFilterListItem(
+    @StringRes val title: Int,
+    val value: String? = null,
+    val onClick: () -> Unit = {}
+)


I extracted this from BookingFilterListUiState to make it reusable across all screens, not just the root page.

wpmobilebot · 2025-10-29T17:30:13Z

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

irfano · 2025-10-29T17:30:50Z

.../src/main/kotlin/com/woocommerce/android/ui/bookings/filter/type/BookingTypeFilterUiState.kt

I tried to use a structure similar to BookingFilterListUiState here.

wpmobilebot · 2025-10-29T17:43:07Z

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

codecov-commenter · 2025-10-29T17:57:30Z

Codecov Report

❌ Patch coverage is 5.63380% with 67 lines in your changes missing coverage. Please review.
✅ Project coverage is 38.24%. Comparing base (7e5bb1b) to head (2291267).

Files with missing lines	Patch %	Lines
...droid/ui/bookings/filter/SingleChoiceFilterPage.kt	0.00%	33 Missing ⚠️
...i/bookings/filter/type/BookingTypeFilterUiState.kt	0.00%	28 Missing ⚠️
...d/ui/bookings/filter/type/BookingTypeFilterPage.kt	0.00%	5 Missing ⚠️
...ndroid/ui/bookings/filter/BookingFilterListItem.kt	80.00%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##              trunk   #14858      +/-   ##
============================================
- Coverage     38.26%   38.24%   -0.03%     
  Complexity    10077    10077              
============================================
  Files          2131     2135       +4     
  Lines        120744   120810      +66     
  Branches      16547    16561      +14     
============================================
  Hits          46206    46206              
- Misses        69840    69906      +66     
  Partials       4698     4698

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

# Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/filter/BookingFilterListScreen.kt

Adds a new `BookingTypeFilterViewModel` to manage the state for the booking type filter. This ViewModel handles the initial selected type and updates the UI state when a new type is selected.

JorgeMucientes

Nicely done @irfano. Code looks good.

I just left a minor concern that might worth checking before merging this.
Additionally, I was wondering if within the UI scope work we are doing here, shouldn't this PR also include the logic to update BookingFilterListScreen with the selected value from BookingTypeFilterPage? It feels like that part would make sense as part of the UI work too.

JorgeMucientes · 2025-10-30T19:36:34Z

...mmerce/src/main/kotlin/com/woocommerce/android/ui/bookings/filter/BookingFilterListScreen.kt

-            TODO()
+            BookingTypeFilterRoute(initialType = state.currentBookingType) { type ->
+                state.onUpdateFilterOption(type)
+            }


I'm a bit confused with this new filter "BookingType" and the one added below in line 133 "Service/Event". I think we are adding the same filter twice. Might be worth double checking with Wagner or with folks from ciab-bookings how do they want to refer to this filter.

Currently in desktop experience they are referring to it as Service/Event filter. But who knows if that is the final call:

I guess “Service/Event” refers to the name of the service or event, while “Booking type” indicates whether the booking is for a service or an event. These both screens are from Figma, so let’s keep both.

irfano · 2025-10-31T08:52:21Z

shouldn't this PR also include the logic to update BookingFilterListScreen with the selected value from BookingTypeFilterPage?

I plan to handle that in a separate PR. The change will involve updating the BookingFilterListViewModel, which affects all sub-screens, and this PR is already close to 300 lines.

AdamGrzybkowski · 2025-10-31T09:18:23Z

...in/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/bookings/BookingsFilterOption.kt

+    sealed interface BookingType : BookingsFilterOption {
+        object Any : BookingType
+        object Service : BookingType
+        object Event : BookingType
+    }


@irfano I'm late, but I think something like this would be more consistent with other filters here. Having it like this wouldn't require different filtering logic in the ViewModel to set the state.

data class BookingType( val value: Type ) : BookingsFilterOption { enum class Type { ANY, SERVICE, EVENT } }

Thanks for noticing this and sharing your feedback, Adam. This was the alternative I had in mind. I would either do this or update the onUpdateFilterOption() function, I chose the latter to avoid defining a new Type class. But your suggestion might actually be better, I’ll consider it and update BookingType in my next PR.

irfano added 7 commits October 29, 2025 20:05

Adds string resources for type filter

1e482a7

Add BookingTypeFilterUiState

13b6c07

Move BookingFilterListItem to its own file

0dc120f

Moves the `BookingFilterListItem` data class from `BookingFilterListUiState.kt` to a new, dedicated file `BookingFilterListItem.kt` within the same package.

Add single choice filter page

8236942

This commit introduces a new Composable, `SingleChoiceFilterPage`, for displaying a list of filter options where only one can be selected at a time.

Create booking type filter page

a249bb6

Introduces the `BookingTypeFilterPage` composable. This page utilizes the generic `SingleChoiceFilterPage` to display a list of booking type filter options.

Add dummy state for booking type filter screen

640ca4d

Show new booking type page in filters screens

3b08b52

irfano added this to the 23.6 milestone Oct 29, 2025

irfano added Task (new) feature: CIAB Mobile Bookings MVP labels Oct 29, 2025

irfano commented Oct 29, 2025

View reviewed changes

irfano requested review from AdamGrzybkowski, JorgeMucientes and hichamboushaba October 29, 2025 17:31

Merge branch 'trunk' into issue/WOOMOB-1465-bookings-type-filter

4db1805

# Conflicts: # WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/filter/BookingFilterListScreen.kt

irfano marked this pull request as draft October 30, 2025 09:20

JorgeMucientes self-assigned this Oct 30, 2025

irfano added 5 commits October 30, 2025 18:13

Merge branch 'trunk' into issue/WOOMOB-1465-bookings-type-filter

2291267

Move BookingType filter model to FluxC

d77fed5

Add BookingTypeFilterViewModel

7976b4c

Adds a new `BookingTypeFilterViewModel` to manage the state for the booking type filter. This ViewModel handles the initial selected type and updates the UI state when a new type is selected.

Add BookingTypeFilterRoute composable

60c9f47

Update booking type filter selection

59ba3a9

irfano changed the title ~~[Bookings] Type filter UI~~ [Bookings] Type filter Oct 30, 2025

irfano marked this pull request as ready for review October 30, 2025 16:00

Fix detekt error

e1bee75

JorgeMucientes approved these changes Oct 30, 2025

View reviewed changes

irfano modified the milestones: 23.6, 23.7 Oct 31, 2025

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

irfano merged commit 6d7c199 into trunk Oct 31, 2025
21 of 23 checks passed

irfano deleted the issue/WOOMOB-1465-bookings-type-filter branch October 31, 2025 08:52

AdamGrzybkowski reviewed Oct 31, 2025

View reviewed changes

irfano mentioned this pull request Nov 3, 2025

[Bookings] Update type filter logic #14889

Merged

1 task

[Bookings] Type filter #14858

[Bookings] Type filter #14858

Uh oh!

Conversation

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

Uh oh!

Description

Test Steps

Images/gif

Uh oh!

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

Uh oh!

Uh oh!

irfano Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Uh oh!

irfano Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

JorgeMucientes left a comment

Choose a reason for hiding this comment

Uh oh!

JorgeMucientes Oct 30, 2025

Choose a reason for hiding this comment

Uh oh!

irfano Oct 31, 2025

Choose a reason for hiding this comment

Uh oh!

irfano commented Oct 31, 2025

Uh oh!

Uh oh!

AdamGrzybkowski Oct 31, 2025

Choose a reason for hiding this comment

Uh oh!

irfano Oct 31, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

irfano commented Oct 29, 2025 •

edited

Loading

dangermattic commented Oct 29, 2025 •

edited

Loading

wpmobilebot commented Oct 29, 2025 •

edited

Loading

wpmobilebot commented Oct 29, 2025 •

edited

Loading

codecov-commenter commented Oct 29, 2025 •

edited

Loading