Merge pull request #7142 from woocommerce/issue/7132-fix-missing-products-request

[Order Details] Fix race condition for missing products request

Author: ealeksandrov

WooCommerce/Classes/ViewModels/Order Details/OrderDetailsViewModel.swift

@@ -192,18 +192,23 @@ extension OrderDetailsViewModel {
         syncState = .syncing
 
         group.enter()
-        syncOrder { _ in
-            group.leave()
-        }
+        syncOrder { [weak self] _ in
+            defer {
+                group.leave()
+            }
 
-        group.enter()
-        syncProducts { _ in
-            group.leave()
-        }
+            // Products require order.items data, so sync them only after the order is loaded
+            guard let self = self else { return }
 
-        group.enter()
-        syncProductVariations { _ in
-            group.leave()
+            group.enter()
+            self.syncProducts { _ in
+                group.leave()
+            }
+
+            group.enter()
+            self.syncProductVariations { _ in
+                group.leave()
+            }
         }
 
         group.enter()

Yosemite/Yosemite/Stores/ProductStore.swift

@@ -211,6 +211,12 @@ private extension ProductStore {
             }
         }
 
+        // Do not trigger API request for empty array of items
+        guard !missingIDs.isEmpty else {
+            onCompletion(nil)
+            return
+        }
+
         remote.loadProducts(for: order.siteID, by: missingIDs) { [weak self] result in
             switch result {
             case .success(let products):