Merge pull request #14773 from woocommerce/woomob-1447-woo-poslocal-catalog-handle-manual-sync-errors-in-pos

[Woo POS][Local Catalog] Sync error dialog in Settings

Author: samiuelson

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/WooPosHomeChildToParentCommunication.kt

@@ -99,6 +99,10 @@ sealed class ChildToParentEvent {
             val discountAmount: BigDecimal,
         )
     }
+
+    sealed class SettingsEvent : ChildToParentEvent() {
+        data class ShowSyncErrorDialog(val errorMessage: String) : SettingsEvent()
+    }
 }
 
 interface WooPosChildrenToParentEventReceiver {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/WooPosHomeParentToChildCommunication.kt

@@ -90,6 +90,10 @@ sealed class ParentToChildrenEvent {
             val discountAmount: BigDecimal,
         )
     }
+
+    sealed class SettingsEvent : ParentToChildrenEvent() {
+        data object RetrySyncRequested : SettingsEvent()
+    }
 }
 
 interface WooPosParentToChildrenEventReceiver {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/WooPosHomeViewModel.kt

@@ -250,6 +250,8 @@ class WooPosHomeViewModel @Inject constructor(
                     ChildToParentEvent.RefreshProductList -> {
                         sendEventToChildren(ParentToChildrenEvent.RefreshProductList)
                     }
+
+                    is ChildToParentEvent.SettingsEvent -> Unit
                 }
             }
         }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/cart/WooPosCartViewModel.kt

@@ -216,7 +216,8 @@ class WooPosCartViewModel @Inject constructor(
                     ParentToChildrenEvent.SearchEvent.Finished,
                     ParentToChildrenEvent.SearchEvent.Started,
                     ParentToChildrenEvent.RefreshProductList,
-                    is ParentToChildrenEvent.CouponsRemoved -> Unit
+                    is ParentToChildrenEvent.CouponsRemoved,
+                    is ParentToChildrenEvent.SettingsEvent -> Unit
 
                     is ParentToChildrenEvent.CouponsValidationFailed -> {
                         onCouponsValidationFails()

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsSearchHelper.kt

@@ -68,6 +68,7 @@ class WooPosItemsSearchHelper @Inject constructor(
                     is ParentToChildrenEvent.RemoveCouponsClicked -> Unit
                     is ParentToChildrenEvent.CouponsValidationFailed -> Unit
                     is ParentToChildrenEvent.OrderSuccessfullyPaid -> Unit
+                    is ParentToChildrenEvent.SettingsEvent -> Unit
                 }
             }
         }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/WooPosItemsViewModel.kt

@@ -117,7 +117,8 @@ class WooPosItemsViewModel @Inject constructor(
                     ParentToChildrenEvent.SearchEvent.Finished,
                     is ParentToChildrenEvent.SearchEvent.RecentSearchSelected,
                     ParentToChildrenEvent.SearchEvent.Started,
-                    is ParentToChildrenEvent.BarcodeEvent -> Unit
+                    is ParentToChildrenEvent.BarcodeEvent,
+                    is ParentToChildrenEvent.SettingsEvent -> Unit
 
                     is ParentToChildrenEvent.OrderSuccessfullyPaid -> _viewState.value = initialState()
 

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/products/WooPosProductsInDbDataSource.kt

@@ -9,6 +9,7 @@ import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
+import org.wordpress.android.fluxc.model.LocalOrRemoteId
 import org.wordpress.android.fluxc.store.pos.localcatalog.WooPosLocalCatalogStore
 import javax.inject.Inject
 
@@ -20,7 +21,7 @@ class WooPosProductsInDbDataSource @Inject constructor(
 
     private fun getProductsFromDatabaseFlow(): Flow<List<WooPosProductModel>> {
         val siteModel = selectedSite.getOrNull() ?: return flow { emit(emptyList()) }
-        val siteId = org.wordpress.android.fluxc.model.LocalOrRemoteId.LocalId(siteModel.id)
+        val siteId = LocalOrRemoteId.LocalId(siteModel.id)
 
         return posLocalCatalogStore.observeProducts(siteId)
             .map { result ->

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/products/WooPosProductsViewModel.kt

@@ -91,7 +91,8 @@ class WooPosProductsViewModel @Inject constructor(
                     is ParentToChildrenEvent.SearchEvent.ChangedQuery,
                     ParentToChildrenEvent.SearchEvent.Finished,
                     is ParentToChildrenEvent.SearchEvent.RecentSearchSelected,
-                    ParentToChildrenEvent.SearchEvent.Started -> Unit
+                    ParentToChildrenEvent.SearchEvent.Started,
+                    is ParentToChildrenEvent.SettingsEvent -> Unit
                 }
             }
         }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/items/search/WooPosItemsSearchViewModel.kt

@@ -193,6 +193,7 @@ class WooPosItemsSearchViewModel @Inject constructor(
                     is ParentToChildrenEvent.CouponsRemoved -> Unit
                     is ParentToChildrenEvent.RefreshProductList -> Unit
                     is ParentToChildrenEvent.CouponsValidationFailed -> Unit
+                    is ParentToChildrenEvent.SettingsEvent -> Unit
                     is ParentToChildrenEvent.ItemClickedInItemsList -> {
                         if (event.itemData is ItemClickedData.Product.Variation && searchHelper.isSearchOpen()) {
                             storeRecentSearch()

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/home/totals/WooPosTotalsViewModel.kt

@@ -325,7 +325,8 @@ class WooPosTotalsViewModel @Inject constructor(
                     ParentToChildrenEvent.RemoveCouponsClicked,
                     ParentToChildrenEvent.RefreshProductList,
                     ParentToChildrenEvent.CouponsValidationFailed,
-                    is ParentToChildrenEvent.BarcodeEvent -> Unit
+                    is ParentToChildrenEvent.BarcodeEvent,
+                    is ParentToChildrenEvent.SettingsEvent -> Unit
                 }
             }
         }