[Bookings] Update type filter logic #14889

irfano · 2025-11-03T19:46:37Z

Description

This PR implements the logic in BookingFilterListViewModel to display the selected type and includes some refactoring.

Test Steps

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

Images/gif

Before	After

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.

Converts the `BookingType` sealed interface into a data class containing a `Type` enum.

Moved the `BookingType.titleRes` extension property out of the `BookingTypeFilterUiState` companion object to the top level of the file.

Replaced the `value` string in `BookingFilterListItem` with a `BookingFilterListItemSubtitle` data class. This change allows the subtitle to be represented by either a direct string or a string resource ID, providing more flexibility in the UI.

Adds a subtitle to the booking filter list to show the currently selected booking type.

irfano · 2025-11-03T19:48:18Z

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

 data class BookingFilterListItem(
    @StringRes val title: Int,
-    val value: String? = null,
+    val subtitle: BookingFilterListItemSubtitle? = null,


I renamed value to subtitle since BookingFilterListItem is a UI model, and subtitle better reflects its purpose.

np: but I'm not sure subtitle is a better name. A subtitle would usually be a text below the title, but this model is used for the Root booking filter page, where we have the label and the value (currently selected filter).

This would make more sense in a UI like this:

Copilot

Pull Request Overview

This PR refactors the BookingType filter option from a sealed interface with object implementations to a data class with an enum value. This change simplifies the architecture and makes the filtering logic more maintainable by removing the need for special case handling when updating filters.

Key Changes:

Converted BookingType from a sealed interface with singleton objects to a data class containing an enum value
Standardized the filter update logic by removing special case handling for BookingType
Refactored the UI state management to use a selected property in list items instead of comparing string values

Reviewed Changes

Copilot reviewed 8 out of 8 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
BookingsFilterOption.kt	Refactored BookingType from sealed interface to data class with enum
BookingTypeFilterUiState.kt	Updated to use data class instances and moved extension properties to file level
BookingTypeFilterPage.kt	Simplified by removing redundant selectedValue parameter
SingleChoiceFilterPage.kt	Changed to use boolean selected property instead of string comparison
BookingFilterRootPage.kt	Updated subtitle handling to support both string and resource ID values
BookingFilterListViewModel.kt	Removed special case handling for BookingType filter updates
BookingFilterListUiState.kt	Added BookingType filter value resolution and subtitle data structure
BookingFilterListItem.kt	Added subtitle data class and selected boolean property

Comments suppressed due to low confidence (1)

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/bookings/filter/BookingFilterListUiState.kt:72

BookingFilterPage.BookingType is listed twice in this when expression - once at line 61 where it returns a subtitle value, and again at line 72 where it returns null. This creates unreachable code as the first match will always be used. Remove the duplicate entry at line 72.

            BookingFilterPage.BookingType,

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

irfano · 2025-11-03T19:51:37Z

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

    val onClick: () -> Unit = {}
-)
+) {
+    data class BookingFilterListItemSubtitle(val valueString: String? = null, @StringRes val valueRes: Int? = null)


The subtitle sometimes comes from a remote source, such as the customer name, and other times from a string resource, such as “Service.” That’s why I created the BookingFilterListItemSubtitle model.

💡 Would it make sense to either:

Make this a sealed class with one non-nullable value, or...

Keep it like that, but use UiString instead.

The above allows us to call BookingFilterListItemSubtitle(). That is not a correct "state". Using the above options would prevent that.

irfano · 2025-11-03T19:53:35Z

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

I applied @AdamGrzybkowski's suggestion to BookingType.

wpmobilebot · 2025-11-03T19:56:49Z

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

…er-logic

wpmobilebot · 2025-11-04T10:58:46Z

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

codecov-commenter · 2025-11-04T11:12:07Z

Codecov Report

❌ Patch coverage is 27.27273% with 24 lines in your changes missing coverage. Please review.
✅ Project coverage is 38.27%. Comparing base (ae62311) to head (5abbf62).
⚠️ Report is 34 commits behind head on trunk.

Files with missing lines	Patch %	Lines
...i/bookings/filter/type/BookingTypeFilterUiState.kt	0.00%	9 Missing ⚠️
...ui/bookings/filter/data/BookingFilterRepository.kt	44.44%	3 Missing and 2 partials ⚠️
...oid/ui/bookings/filter/BookingFilterListUiState.kt	50.00%	1 Missing and 2 partials ⚠️
...ork/rest/wpcom/wc/bookings/BookingsFilterOption.kt	0.00%	2 Missing and 1 partial ⚠️
...d/ui/bookings/filter/BookingFilterListViewModel.kt	0.00%	1 Missing ⚠️
...ndroid/ui/bookings/filter/BookingFilterRootPage.kt	0.00%	1 Missing ⚠️
...d/ui/bookings/filter/type/BookingTypeFilterPage.kt	0.00%	1 Missing ⚠️
...twork/rest/wpcom/wc/bookings/BookingsRestClient.kt	0.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##              trunk   #14889   +/-   ##
=========================================
  Coverage     38.27%   38.27%           
- Complexity    10101    10106    +5     
=========================================
  Files          2137     2137           
  Lines        120998   121002    +4     
  Branches      16579    16580    +1     
=========================================
+ Hits          46309    46315    +6     
+ Misses        69980    69975    -5     
- Partials       4709     4712    +3

☔ 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

I see that this PR closes the Linear issue, but to fully implement it, you need to implement the storage for the BookingType filter here.

Are you planning on doing that separately?

AdamGrzybkowski · 2025-11-04T12:08:51Z

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

    val onClick: () -> Unit = {}
-)
+) {
+    data class BookingFilterListItemSubtitle(val valueString: String? = null, @StringRes val valueRes: Int? = null)


💡 Would it make sense to either:

Make this a sealed class with one non-nullable value, or...

Keep it like that, but use UiString instead.

The above allows us to call BookingFilterListItemSubtitle(). That is not a correct "state". Using the above options would prevent that.

AdamGrzybkowski · 2025-11-04T12:59:55Z

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

 }

-val BookingType.filterValue: String?
+val BookingType.remoteValue: String?


If this is strictly a value we would use to send via REST API, I would create this somewhere else, not in the ...UiState.

BTW. Is this property used?

Actually, type filter hasn't been implemented on the backend yet. Besides, we don't even know if it's handled on the client side. So for now, I removed remoteValue from BookingTypeFilterUiState.kt. de8fc3e

Replaced the custom `BookingFilterListItemSubtitle` class with the generic `UiString` model to handle subtitle text in the bookings filter list.

irfano · 2025-11-04T20:22:41Z

Keep it like that, but use UiString instead.

Good idea! I've implemented it: fbb7d93

This change introduces the functionality to save and retrieve the "Booking Type" filter to and from the DataStore.

Do not increment the active filter count when the booking type filter is set to 'Any'.

irfano · 2025-11-04T21:34:50Z

I see that this PR closes the Linear issue, but to fully implement it, you need to implement the storage for the BookingType filter here.

Are you planning on doing that separately?

I thought caching filters was a missing feature and wanted to add it in a separate PR, but it appears to be completed. So, I just added storing the booking type here: 5179aab.

AdamGrzybkowski

Looks good!

irfano added 6 commits November 3, 2025 21:49

Convert BookingType to a data class

39e6e29

Converts the `BookingType` sealed interface into a data class containing a `Type` enum.

Move extension property out of companion object

6f66b49

Moved the `BookingType.titleRes` extension property out of the `BookingTypeFilterUiState` companion object to the top level of the file.

Display selected booking type filter

3f27601

Adds a subtitle to the booking filter list to show the currently selected booking type.

Refactor bookings filter selection logic

363b691

Rename filterValue to remoteValue in BookingType

0b95184

irfano added this to the 23.7 milestone Nov 3, 2025

irfano added Task (new) feature: CIAB Mobile Bookings MVP labels Nov 3, 2025

irfano requested a review from Copilot November 3, 2025 19:46

irfano commented Nov 3, 2025

View reviewed changes

Copilot AI reviewed Nov 3, 2025

View reviewed changes

irfano commented Nov 3, 2025

View reviewed changes

irfano added 2 commits November 4, 2025 12:30

Merge branch 'trunk' into issue/WOOMOB-1465-update-bookings-type-filt…

fef5007

…er-logic

Merge branch 'trunk' into issue/WOOMOB-1465-update-bookings-type-filt…

171a7e2

…er-logic

irfano requested review from AdamGrzybkowski and JorgeMucientes November 4, 2025 11:36

AdamGrzybkowski self-assigned this Nov 4, 2025

AdamGrzybkowski reviewed Nov 4, 2025

View reviewed changes

Use UiString for booking filter subtitles

fbb7d93

Replaced the custom `BookingFilterListItemSubtitle` class with the generic `UiString` model to handle subtitle text in the bookings filter list.

irfano added 3 commits November 4, 2025 23:23

Remove unused remoteValue from BookingType

de8fc3e

Persist Booking Type filter in DataStore

5179aab

This change introduces the functionality to save and retrieve the "Booking Type" filter to and from the DataStore.

Exclude 'any' booking type from filter count

5abbf62

Do not increment the active filter count when the booking type filter is set to 'Any'.

AdamGrzybkowski approved these changes Nov 5, 2025

View reviewed changes

irfano merged commit 3532e3f into trunk Nov 5, 2025
18 checks passed

irfano deleted the issue/WOOMOB-1465-update-bookings-type-filter-logic branch November 5, 2025 14:21

[Bookings] Update type filter logic #14889

[Bookings] Update type filter logic #14889

Uh oh!

Conversation

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

Uh oh!

Description

Test Steps

Images/gif

Uh oh!

irfano Nov 3, 2025

Choose a reason for hiding this comment

Uh oh!

AdamGrzybkowski Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Key Changes:

Reviewed Changes

Uh oh!

irfano Nov 3, 2025

Choose a reason for hiding this comment

Uh oh!

AdamGrzybkowski Nov 4, 2025

Choose a reason for hiding this comment

Uh oh!

irfano Nov 3, 2025

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

AdamGrzybkowski 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!

AdamGrzybkowski Nov 4, 2025

Choose a reason for hiding this comment

Uh oh!

AdamGrzybkowski Nov 4, 2025

Choose a reason for hiding this comment

Uh oh!

irfano Nov 4, 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!

irfano commented Nov 4, 2025

Uh oh!

irfano commented Nov 4, 2025

Uh oh!

AdamGrzybkowski left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

irfano commented Nov 3, 2025 •

edited

Loading

wpmobilebot commented Nov 3, 2025 •

edited

Loading

wpmobilebot commented Nov 4, 2025 •

edited

Loading

codecov-commenter commented Nov 4, 2025 •

edited

Loading

AdamGrzybkowski left a comment •

edited

Loading

irfano Nov 4, 2025 •

edited

Loading