Merge trunk into woomob-2073-woo-posfts-add-analytics-tracking-for-search

Author: kidinov

CHANGELOG.md

@@ -1,6 +1,9 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 24.3
+We’ve improved stability in Site Picker by fixing a crash that could happen when re-adding a previously hidden site. This update makes switching back to hidden stores smoother and more reliable.
+
 ## 24.2
 Signing in just got easier and more secure! This update adds passkey support for WordPress.com accounts during Jetpack setup, so you can skip the password and log in with a tap. We also introduced booking management for eligible stores, helping you handle appointments right from the app.
 

RELEASE-NOTES.txt

@@ -6,6 +6,7 @@
 -----
 - [Internal] Add full-text search for POS product search with analytics tracking [https://github.com/woocommerce/woocommerce-android/pull/15484]
 
+
 24.3
 -----
 - [*] Fixed a crash when re-adding a previously hidden site in Site Picker [https://github.com/woocommerce/woocommerce-android/pull/15439]

WooCommerce/src/main/kotlin/com/woocommerce/android/analytics/AnalyticsEvent.kt

@@ -505,8 +505,24 @@ enum class AnalyticsEvent(override val siteless: Boolean = false) : IAnalyticsEv
 
     MAIN_TAB_HUB_MENU_SELECTED,
     MAIN_TAB_HUB_MENU_RESELECTED,
-    MAIN_TAB_BOOKINGS_SELECTED,
-    MAIN_TAB_BOOKINGS_RESELECTED,
+    MAIN_TAB_BOOKINGS_SELECT,
+    MAIN_TAB_BOOKINGS_RESELECT,
+
+    // -- Bookings
+    BOOKING_LIST_TAB_SELECT,
+    BOOKING_LIST_VIEW,
+    BOOKING_LIST_FAILED_TO_FETCH_BOOKINGS,
+    BOOKING_LIST_FAILED_TO_UPDATE_BOOKING_DETAILS,
+    BOOKING_LIST_BOOKING_TAP,
+    BOOKING_LIST_FILTERS_TAP,
+    BOOKING_LIST_APPLY_FILTERS,
+    BOOKING_LIST_SEARCH_TAP,
+    BOOKING_DETAIL_CANCEL_BOOKING,
+    BOOKING_DETAIL_ATTENDANCE_STATUS_UPDATE,
+    BOOKING_DETAIL_ADD_NOTE_TAP,
+    BOOKING_DETAIL_VIEW_LINKED_ORDER_TAP,
+    BOOKING_LIST_SORT_BY_TAP,
+    BOOKING_LIST_SORT_BY_OPTION_TAP,
 
     // -- Settings
     SETTING_CHANGE,

WooCommerce/src/main/kotlin/com/woocommerce/android/model/FeatureAnnouncement.kt

@@ -9,6 +9,7 @@ data class FeatureAnnouncement(
     val minimumAppVersion: String,
     val maximumAppVersion: String,
     val appVersionTargets: List<String>,
+    val detailsUrl: String,
     val isLocalized: Boolean = false,
     val features: List<FeatureAnnouncementItem>
 ) : Parcelable {

WooCommerce/src/main/kotlin/com/woocommerce/android/notifications/push/ShouldShowEnablePushNotificationsUi.kt

@@ -15,7 +15,8 @@ import javax.inject.Inject
 /**
  * Checks whether the "Enable Push Notifications" UI should be shown.
  *
- * This is part of the Woo Core push notifications system for app-password authenticated sites.
+ * This is part of the Woo Core push notifications system for non-Jetpack sites
+ * (app-password authenticated sites and Jetpack Connection Package sites).
  */
 @OptIn(ExperimentalCoroutinesApi::class)
 class ShouldShowEnablePushNotificationsUi @Inject constructor(
@@ -26,7 +27,7 @@ class ShouldShowEnablePushNotificationsUi @Inject constructor(
         if (!FeatureFlag.WOO_PUSH_NOTIFICATIONS_SYSTEM_M2.isEnabled()) return flowOf(false)
         return selectedSite.observe()
             .flatMapLatest { site ->
-                if (site == null || site.connectionType != SiteConnectionType.ApplicationPasswords) {
+                if (site == null || site.connectionType == SiteConnectionType.Jetpack) {
                     flowOf(false)
                 } else {
                     pushNotificationRegistrationStatus.observe(site.siteId).map { registrationStatus ->

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

@@ -0,0 +1,46 @@
+package com.woocommerce.android.ui.bookings
+
+import com.woocommerce.android.WooException
+import com.woocommerce.android.analytics.AnalyticsEvent
+import com.woocommerce.android.analytics.AnalyticsTracker
+import com.woocommerce.android.analytics.AnalyticsTrackerWrapper
+
+class BookingAnalyticsHelper {
+    fun AnalyticsTrackerWrapper.trackError(
+        event: AnalyticsEvent,
+        throwable: Throwable,
+        errorContext: String,
+        additionalProperties: Map<String, Any> = emptyMap()
+    ) {
+        track(
+            stat = event,
+            properties = buildMap {
+                throwable.errorCode()?.let { code -> put(AnalyticsTracker.KEY_ERROR_CODE, code) }
+                putAll(additionalProperties)
+            },
+            errorContext = errorContext,
+            errorType = throwable.errorType(),
+            errorDescription = throwable.message
+        )
+    }
+
+    private fun Throwable.errorCode(): String? = (this as? WooException)?.error?.apiErrorCode
+
+    private fun Throwable.errorType(): String? = when (this) {
+        is WooException -> error.type.name
+        else -> javaClass.simpleName
+    }
+
+    companion object {
+        const val KEY_BOOKING_STATUS = "booking_status"
+        const val KEY_ACTION = "action"
+        const val KEY_SELECTED_TAB = "selected_tab"
+        const val KEY_IS_SEARCH_ACTIVE = "is_search_active"
+        const val KEY_IS_FILTERING_ACTIVE = "is_filtering_active"
+        const val KEY_SORT_OPTION = "sort_option"
+        const val KEY_IS_DEFAULT_TAB = "is_default_tab"
+        const val KEY_IS_LIST_EMPTY = "is_list_empty"
+        const val KEY_IS_FILTERED = "is_filtered"
+        const val KEY_SELECTED_FILTERS = "selected_filters"
+    }
+}

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

@@ -8,6 +8,7 @@ import com.woocommerce.android.model.UiString
 import com.woocommerce.android.ui.bookings.compose.BookingAppointmentDetailsModel
 import com.woocommerce.android.ui.bookings.compose.BookingAttendanceStatus
 import com.woocommerce.android.ui.bookings.compose.BookingCustomerDetailsUiModel
+import com.woocommerce.android.ui.bookings.compose.BookingLocationStatus
 import com.woocommerce.android.ui.bookings.compose.BookingPaymentDetailsModel
 import com.woocommerce.android.ui.bookings.compose.BookingStaffMemberStatus
 import com.woocommerce.android.ui.bookings.compose.BookingSummaryModel
@@ -69,6 +70,7 @@ class BookingMapper @Inject constructor(
         staffMemberStatus: BookingStaffMemberStatus?,
         cancelStatus: CancelStatus,
         attendanceUpdateStatus: AttendanceUpdateStatus = AttendanceUpdateStatus.Idle,
+        locationStatus: BookingLocationStatus = BookingLocationStatus.Loading,
     ): BookingAppointmentDetailsModel {
         val duration = Duration.between(start, end)
             .normalizeDuration()
@@ -77,8 +79,7 @@ class BookingMapper @Inject constructor(
             date = detailsDateFormatter.format(start),
             time = "${dateFormatter.formatTime(start)} - ${dateFormatter.formatTime(end)}",
             staff = staffMemberStatus,
-            // TODO replace mocked values when available from API
-            location = "238 Willow Creek Drive, Montgomery AL 36109",
+            location = locationStatus,
             cancelStatus = cancelStatus,
             cancelButtonVisible = isCancellable,
             duration = duration,

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

@@ -61,6 +61,18 @@ class BookingsRepository @Inject constructor(
             order = order
         )
 
+    suspend fun getBookingsList(
+        limit: Int? = null,
+        filters: BookingFilters? = null,
+        order: BookingsOrderOption
+    ): List<Booking> =
+        bookingsStore.getBookings(
+            site = selectedSite.get(),
+            limit = limit,
+            filters = filters,
+            order = order
+        )
+
     fun observeBookingsCount(): Flow<Long> = bookingsStore.observeBookingCount(site = selectedSite.get())
 
     fun observeBooking(bookingId: Long): Flow<Booking?> =
@@ -135,18 +147,18 @@ class BookingsRepository @Inject constructor(
     suspend fun updateAttendanceStatus(
         bookingId: Long,
         attendanceStatus: BookingEntity.AttendanceStatus,
-    ): Result<Unit> = appCoroutineScope.async {
+    ): Result<Unit> {
         val result = bookingsStore.updateBooking(
             site = selectedSite.get(),
             bookingId = bookingId,
             bookingUpdatePayload = BookingUpdatePayload(attendanceStatus = attendanceStatus)
         )
-        if (result.isError) {
+        return if (result.isError) {
             Result.failure(WooException(result.error))
         } else {
             Result.success(Unit)
         }
-    }.await()
+    }
 
     suspend fun updateNote(
         bookingId: Long,
@@ -180,10 +192,11 @@ class BookingsRepository @Inject constructor(
         }
     }.await()
 
-    suspend fun fetchProductBookingLocation(productId: Long): Result<String?> {
+    suspend fun fetchProductBookingLocation(productId: Long, bookingId: Long? = null): Result<String?> {
         val result = bookingsStore.fetchProductBookingLocation(
             site = selectedSite.get(),
-            productId = productId
+            productId = productId,
+            bookingId = bookingId
         )
         return if (result.isError) {
             Result.failure(WooException(result.error))

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

@@ -1,6 +1,7 @@
 package com.woocommerce.android.ui.bookings
 
 import com.woocommerce.android.tools.SelectedSite
+import org.wordpress.android.fluxc.persistence.entity.OrderEntity
 import org.wordpress.android.fluxc.store.WCOrderStore
 import java.math.BigDecimal
 import javax.inject.Inject
@@ -13,6 +14,22 @@ class PaymentStatusResolver @Inject constructor(
         val order = orderStore.getOrderByIdAndSite(orderId, selectedSite.get())
             ?: return PaymentStatus.UNPAID
 
+        return statusForOrder(order)
+    }
+
+    suspend fun resolveAll(orderIds: List<Long>): Map<Long, PaymentStatus> {
+        val uniqueOrderIds = orderIds.distinct()
+        if (uniqueOrderIds.isEmpty()) return emptyMap()
+
+        val ordersById = orderStore.getOrdersByIdsAndSite(uniqueOrderIds, selectedSite.get())
+            .associateBy { it.orderId }
+
+        return uniqueOrderIds.associateWith { orderId ->
+            ordersById[orderId]?.let(::statusForOrder) ?: PaymentStatus.UNPAID
+        }
+    }
+
+    private fun statusForOrder(order: OrderEntity): PaymentStatus {
         val total = order.total.toBigDecimalOrNull() ?: BigDecimal.ZERO
         return computeStatus(order.refundTotal.abs(), total, order.datePaid, order.status)
     }

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

@@ -73,9 +73,29 @@ fun BookingAppointmentDetails(
                 }
             }
             AppointmentDetailsRow(
-                label = R.string.booking_appointment_label_location,
-                value = model.location
-            )
+                label = R.string.booking_appointment_label_location
+            ) {
+                when (model.location) {
+                    is BookingLocationStatus.Loaded, is BookingLocationStatus.Unavailable -> {
+                        Text(
+                            text = (model.location as? BookingLocationStatus.Loaded)?.location ?: "-",
+                            style = MaterialTheme.typography.bodyMedium,
+                            color = MaterialTheme.colorScheme.onSurfaceVariant,
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis
+                        )
+                    }
+
+                    BookingLocationStatus.Loading -> {
+                        SkeletonView(
+                            width = 80.dp,
+                            height = with(LocalDensity.current) {
+                                MaterialTheme.typography.bodyMedium.fontSize.toDp()
+                            },
+                        )
+                    }
+                }
+            }
             AppointmentDetailsRow(
                 label = R.string.booking_appointment_label_duration,
                 value = model.duration,
@@ -166,7 +186,7 @@ data class BookingAppointmentDetailsModel(
     val date: String,
     val time: String,
     val staff: BookingStaffMemberStatus?,
-    val location: String,
+    val location: BookingLocationStatus,
     val duration: String,
     val cancelButtonVisible: Boolean,
     val cancelStatus: CancelStatus,
@@ -181,6 +201,12 @@ data class BookingAppointmentDetailsModel(
     val attendanceInProgressShown: Boolean = attendanceUpdateStatus == AttendanceUpdateStatus.InProgress
 }
 
+sealed interface BookingLocationStatus {
+    data object Loading : BookingLocationStatus
+    data class Loaded(val location: String) : BookingLocationStatus
+    data object Unavailable : BookingLocationStatus
+}
+
 sealed interface BookingStaffMemberStatus {
     data object Loading : BookingStaffMemberStatus
     data class Loaded(val name: String) : BookingStaffMemberStatus
@@ -196,7 +222,7 @@ private fun BookingAppointmentDetailsPreview() {
                 date = "05/07/2025, 11:00 AM",
                 time = "11:00 am - 12:00 pm",
                 staff = BookingStaffMemberStatus.Loading,
-                location = "238 Willow Creek Drive, Montgomery AL 36109",
+                location = BookingLocationStatus.Loaded("238 Willow Creek Drive, Montgomery AL 36109"),
                 duration = "60 min",
                 cancelButtonVisible = true,
                 cancelStatus = CancelStatus.Idle,
@@ -219,7 +245,7 @@ private fun BookingAppointmentDetailsCancelHiddenPreview() {
                 date = "05/07/2025, 11:00 AM",
                 time = "11:00 am - 12:00 pm",
                 staff = BookingStaffMemberStatus.Loading,
-                location = "238 Willow Creek Drive, Montgomery AL 36109",
+                location = BookingLocationStatus.Loaded("238 Willow Creek Drive, Montgomery AL 36109"),
                 duration = "60 min",
                 cancelButtonVisible = false,
                 cancelStatus = CancelStatus.Idle,