Merge branch 'trunk' into woomob-1697-disable-cellular-data-toggle-in-local-catalog-settings-in

Author: samiuelson

RELEASE-NOTES.txt

@@ -5,6 +5,7 @@
 23.8
 -----
 - [*] Optimized POS Local Catalog Settings screen [https://github.com/woocommerce/woocommerce-android/pull/14971]
+- [Internal][Woo POS] Improve detection and handling of deleted products during checkout [https://github.com/woocommerce/woocommerce-android/pull/14981]
 
 23.7
 -----

WooCommerce/build.gradle

@@ -26,6 +26,10 @@ fladle {
     devices = [
             ["model": "MediumPhone.arm", "version": "35"]
     ]
+
+    additionalTestApks = [
+            "- test: ${rootProject.projectDir}/libs/fluxc-plugin/build/outputs/apk/androidTest/debug/fluxc-plugin-debug-androidTest.apk".toString()
+    ]
     localResultsDir = "$rootDir/build/instrumented-tests"
 
     useOrchestrator = true

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

@@ -7,8 +7,8 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.async
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
+import org.wordpress.android.fluxc.network.rest.wpcom.wc.bookings.BookingFilters
 import org.wordpress.android.fluxc.network.rest.wpcom.wc.bookings.BookingUpdatePayload
-import org.wordpress.android.fluxc.network.rest.wpcom.wc.bookings.BookingsFilterOption
 import org.wordpress.android.fluxc.network.rest.wpcom.wc.bookings.BookingsOrderOption
 import org.wordpress.android.fluxc.network.rest.wpcom.wc.bookings.BookingsStore
 import org.wordpress.android.fluxc.persistence.entity.BookingEntity
@@ -24,7 +24,7 @@ class BookingsRepository @Inject constructor(
         page: Int,
         perPage: Int,
         query: String? = null,
-        filters: List<BookingsFilterOption> = emptyList(),
+        filters: BookingFilters? = null,
         order: BookingsOrderOption
     ): Result<FetchResult> {
         val result = bookingsStore.fetchBookings(
@@ -51,7 +51,7 @@ class BookingsRepository @Inject constructor(
 
     fun observeBookings(
         limit: Int? = null,
-        filters: List<BookingsFilterOption> = emptyList(),
+        filters: BookingFilters? = null,
         order: BookingsOrderOption
     ): Flow<List<Booking>> =
         bookingsStore.observeBookings(
@@ -61,6 +61,8 @@ class BookingsRepository @Inject constructor(
             order = order
         )
 
+    fun observeBookingsCount(): Flow<Long> = bookingsStore.observeBookingCount(site = selectedSite.get())
+
     fun observeBooking(bookingId: Long): Flow<Booking?> =
         bookingsStore.observeBooking(
             site = selectedSite.get(),
@@ -88,6 +90,19 @@ class BookingsRepository @Inject constructor(
         }
     }
 
+    suspend fun fetchResources(): Result<Unit> {
+        val result = bookingsStore.fetchResources(site = selectedSite.get())
+        return if (result.isError) {
+            Result.failure(WooException(result.error))
+        } else {
+            Result.success(Unit)
+        }
+    }
+
+    suspend fun getResource(
+        resourceId: Long
+    ): BookingResource? = bookingsStore.getResource(site = selectedSite.get(), resourceId = resourceId)
+
     suspend fun fetchResource(
         resourceId: Long
     ): Result<Unit> {
@@ -113,6 +128,9 @@ class BookingsRepository @Inject constructor(
         }
     }
 
+    fun observeResources(): Flow<List<BookingResource>> =
+        bookingsStore.observeResources(site = selectedSite.get())
+
     suspend fun updateAttendanceStatus(
         bookingId: Long,
         attendanceStatus: BookingEntity.AttendanceStatus,

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

@@ -1,13 +1,12 @@
 package com.woocommerce.android.ui.bookings.filter
 
-import androidx.annotation.StringRes
 import com.woocommerce.android.model.UiString
 
 /**
  * UI model simple filter item
  */
 data class BookingFilterListItem(
-    @StringRes val title: Int,
+    val title: UiString,
     val value: UiString? = null,
     val selected: Boolean = false,
     val onClick: () -> Unit = {}

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

@@ -30,7 +30,8 @@ import androidx.navigation.compose.rememberNavController
 import com.woocommerce.android.R
 import com.woocommerce.android.ui.bookings.filter.attendancestatus.BookingAttendanceStatusFilterRoute
 import com.woocommerce.android.ui.bookings.filter.customer.BookingCustomerFilterPage
-import com.woocommerce.android.ui.bookings.filter.datetime.DateTimeFilterPage
+import com.woocommerce.android.ui.bookings.filter.datetime.DateTimeFilterRoute
+import com.woocommerce.android.ui.bookings.filter.teammember.BookingTeamMemberFilterRoute
 import com.woocommerce.android.ui.bookings.filter.type.BookingTypeFilterRoute
 import com.woocommerce.android.ui.compose.Render
 import com.woocommerce.android.ui.compose.component.Toolbar
@@ -130,7 +131,17 @@ private fun FiltersNavHost(
         composable(BookingFilterPage.List.route) {
             BookingFilterRootPage(state.items)
         }
+        composable(BookingFilterPage.DateTime.route) {
+            DateTimeFilterRoute(
+                initialRange = state.updatedBookingFilters.dateRange
+            ) { dateRange ->
+                state.onUpdateFilterOption(dateRange)
+            }
+        }
         composable(BookingFilterPage.TeamMember.route) {
+            BookingTeamMemberFilterRoute(initialTeamMembers = state.updatedBookingFilters.teamMembers) { teamMember ->
+                state.onUpdateFilterOption(teamMember)
+            }
         }
         composable(BookingFilterPage.BookingType.route) {
             BookingTypeFilterRoute(initialType = state.updatedBookingFilters.bookingType) { type ->
@@ -160,9 +171,6 @@ private fun FiltersNavHost(
                 state.onClose()
             }
         }
-        composable(BookingFilterPage.DateTime.route) {
-            DateTimeFilterPage()
-        }
         composable(BookingFilterPage.Location.route) {
         }
     }

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

@@ -32,6 +32,7 @@ enum class BookingFilterPage {
 data class BookingFilterListUiState(
     val initialBookingFilters: BookingFilters = BookingFilters(),
     val updatedBookingFilters: BookingFilters = initialBookingFilters,
+    val selectedFilterValues: SelectedFilterValues = SelectedFilterValues(),
     val currentPage: BookingFilterPage = BookingFilterPage.List,
     val dialogState: DialogState? = null,
     val onClose: () -> Unit = {},
@@ -40,15 +41,15 @@ data class BookingFilterListUiState(
     val onUpdateFilterOption: (BookingsFilterOption) -> Unit = {},
     val onClear: () -> Unit = {},
 ) {
+    data class SelectedFilterValues(val teamMemberValue: String? = null)
 
     val items: List<BookingFilterListItem> = availableBookingFilters().map { page ->
         BookingFilterListItem(
-            title = page.titleRes,
+            title = UiString.UiStringRes(page.titleRes),
             value = page.filterValue,
             onClick = { openPage(page) },
         )
     }
-
     val updatedBookingFiltersCount = updatedBookingFilters.enabledFiltersCount
 
     val showClearButton: Boolean
@@ -62,6 +63,7 @@ data class BookingFilterListUiState(
 
     val BookingFilterPage.filterValue: UiString
         get() = when (this) {
+            BookingFilterPage.TeamMember -> selectedFilterValues.teamMemberValue?.let { UiString.UiStringText(it) }
             BookingFilterPage.BookingType -> {
                 updatedBookingFilters.bookingType?.titleRes?.let { UiString.UiStringRes(it) }
             }
@@ -80,10 +82,15 @@ data class BookingFilterListUiState(
                 UiString.UiStringText(name)
             }
 
+            BookingFilterPage.DateTime -> {
+                updatedBookingFilters.dateRange?.let {
+                    UiString.UiStringRes(R.string.bookings_filter_date_filter_value)
+                }
+            }
+
             BookingFilterPage.TeamMember,
             BookingFilterPage.ServiceEvent,
             BookingFilterPage.PaymentStatus,
-            BookingFilterPage.DateTime,
             BookingFilterPage.Location,
             BookingFilterPage.List -> null
         } ?: UiString.UiStringRes(R.string.bookings_filter_default)
@@ -103,7 +110,7 @@ data class BookingFilterListUiState(
 
 val BookingFilterPage.titleRes: Int
     @StringRes get() = when (this) {
-        BookingFilterPage.TeamMember -> R.string.bookings_filter_title_team_member
+        BookingFilterPage.TeamMember -> R.string.bookings_filter_title_member
         BookingFilterPage.AttendanceStatus -> R.string.bookings_filter_title_attendance_status
         BookingFilterPage.PaymentStatus -> R.string.bookings_filter_title_payment_status
         BookingFilterPage.BookingType -> R.string.bookings_filter_title_type
@@ -133,7 +140,7 @@ fun BookingFilters.updateFilterOption(bookingsFilterOption: BookingsFilterOption
     when (bookingsFilterOption) {
         is BookingsFilterOption.DateRange -> copy(dateRange = bookingsFilterOption)
         is BookingsFilterOption.Customer -> copy(customer = bookingsFilterOption)
-        is BookingsFilterOption.TeamMember -> copy(teamMember = bookingsFilterOption)
+        is BookingsFilterOption.TeamMembers -> copy(teamMembers = bookingsFilterOption)
         is BookingsFilterOption.AttendanceStatuses -> copy(attendanceStatuses = bookingsFilterOption)
         is BookingsFilterOption.PaymentStatus -> copy(paymentStatus = bookingsFilterOption)
         is BookingsFilterOption.BookingType -> copy(bookingType = bookingsFilterOption)

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

@@ -4,13 +4,16 @@ import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.asLiveData
 import com.woocommerce.android.R
 import com.woocommerce.android.model.UiString
+import com.woocommerce.android.ui.bookings.BookingsRepository
 import com.woocommerce.android.ui.bookings.filter.data.BookingFilterRepository
 import com.woocommerce.android.ui.compose.DialogState
 import com.woocommerce.android.viewmodel.MultiLiveEvent
 import com.woocommerce.android.viewmodel.ScopedViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.firstOrNull
+import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import org.wordpress.android.fluxc.network.rest.wpcom.wc.bookings.BookingFilters
@@ -21,6 +24,7 @@ import javax.inject.Inject
 class BookingFilterListViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     private val bookingFilterRepository: BookingFilterRepository,
+    private val bookingsRepository: BookingsRepository,
 ) : ScopedViewModel(savedStateHandle) {
 
     private val _uiState = MutableStateFlow(
@@ -36,6 +40,7 @@ class BookingFilterListViewModel @Inject constructor(
 
     init {
         getBookingFilter()
+        observeSelectedTeamMembers()
     }
 
     private fun onOpenPage(page: BookingFilterPage) {
@@ -66,6 +71,26 @@ class BookingFilterListViewModel @Inject constructor(
         }
     }
 
+    private fun observeSelectedTeamMembers() {
+        launch {
+            _uiState
+                .map { state -> state.updatedBookingFilters.teamMembers.values.map { it.value } }
+                .distinctUntilChanged()
+                .collect { ids ->
+                    val teamMemberValue = when {
+                        ids.isEmpty() -> null
+                        ids.size == 1 -> bookingsRepository.getResource(ids.first())?.name
+                        else -> ids.size.toString()
+                    }
+                    _uiState.update { current ->
+                        current.copy(
+                            selectedFilterValues = current.selectedFilterValues.copy(teamMemberValue = teamMemberValue)
+                        )
+                    }
+                }
+        }
+    }
+
     private fun onClose() {
         if (_uiState.value.currentPage != BookingFilterPage.List) {
             _uiState.update { current ->

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

@@ -11,7 +11,6 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.woocommerce.android.ui.compose.component.WCListItemWithInlineSubtitle
 import com.woocommerce.android.ui.compose.component.getText
@@ -33,7 +32,7 @@ fun BookingFilterRootPage(
 private fun BookingFilterListRow(item: BookingFilterListItem) {
     Column(modifier = Modifier.fillMaxWidth()) {
         WCListItemWithInlineSubtitle(
-            text = stringResource(item.title),
+            text = item.title.getText(),
             subtitle = item.value?.getText().orEmpty(),
             modifier = Modifier
                 .defaultMinSize(minHeight = 64.dp)

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

@@ -17,10 +17,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.woocommerce.android.R
+import com.woocommerce.android.ui.compose.component.getText
 
 @Composable
 fun BookingsFilterSelectionPage(
@@ -30,7 +30,7 @@ fun BookingsFilterSelectionPage(
     LazyColumn(modifier = modifier) {
         items(items) { item ->
             SelectionRow(
-                text = stringResource(item.title),
+                text = item.title.getText(),
                 selected = item.selected,
                 onClick = { item.onClick() }
             )

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

@@ -2,6 +2,7 @@ package com.woocommerce.android.ui.bookings.filter.attendancestatus
 
 import androidx.annotation.StringRes
 import com.woocommerce.android.R
+import com.woocommerce.android.model.UiString
 import com.woocommerce.android.ui.bookings.filter.BookingFilterListItem
 import org.wordpress.android.fluxc.network.rest.wpcom.wc.bookings.BookingsFilterOption.AttendanceStatuses
 import org.wordpress.android.fluxc.persistence.entity.BookingEntity.AttendanceStatus
@@ -12,7 +13,7 @@ data class BookingAttendanceStatusFilterUiState(
 ) {
     val items: List<BookingFilterListItem> = availableAttendanceStatuses().map { status ->
         BookingFilterListItem(
-            title = status.titleRes,
+            title = UiString.UiStringRes(status.titleRes),
             selected = isSelected(status),
             onClick = { onStatusSelected(status) }
         )