Updates NewOrderViewModel to support product deletion & selection

Author: Ecarrion

WooCommerce/Classes/ViewRelated/Orders/Order Creation/NewOrder.swift

@@ -106,11 +106,10 @@ private struct ProductsSection: View {
                 ForEach(viewModel.productRows) { productRow in
                     ProductRow(viewModel: productRow)
                         .onTapGesture {
-                            // TODO: Support selecting an order item
-                            // viewModel.selectOrderItem(productRow.id)
+                            viewModel.selectOrderItem(productRow.id)
                         }
-                        .sheet(item: $viewModel.selectedOrderItem) { item in
-                            createProductInOrderView(for: item)
+                        .sheet(item: $viewModel.selectedProductViewModel) { productViewModel in
+                            ProductInOrder(viewModel: productViewModel)
                         }
 
                     Divider()
@@ -138,17 +137,6 @@ private struct ProductsSection: View {
             Divider()
         }
     }
-
-    @ViewBuilder private func createProductInOrderView(for item: NewOrderViewModel.NewOrderItem) -> some View {
-        // TODO: Support selecting an order item
-//        if let productRowViewModel = viewModel.createProductRowViewModel(for: item, canChangeQuantity: false) {
-//            let productInOrderViewModel = ProductInOrderViewModel(productRowViewModel: productRowViewModel) {
-//                viewModel.removeItemFromOrder(item)
-//            }
-//            ProductInOrder(viewModel: productInOrderViewModel)
-//        }
-        EmptyView()
-    }
 }
 
 // MARK: Constants

WooCommerce/Classes/ViewRelated/Orders/Order Creation/NewOrderViewModel.swift

@@ -114,10 +114,10 @@ final class NewOrderViewModel: ObservableObject {
     ///
     @Published private(set) var productRows: [ProductRowViewModel] = []
 
-    /// Item selected from the list of products in the order.
+    /// Selected product view model to render.
     /// Used to open the product details in `ProductInOrder`.
     ///
-    @Published var selectedOrderItem: NewOrderItem? = nil
+    @Published var selectedProductViewModel: ProductInOrderViewModel? = nil
 
     // MARK: Payment properties
 
@@ -171,18 +171,19 @@ final class NewOrderViewModel: ObservableObject {
         configurePaymentDataViewModel()
     }
 
-    /// Selects an order item.
+    /// Selects an order item by setting the `selectedProductViewModel`.
     ///
     /// - Parameter id: ID of the order item to select
-    func selectOrderItem(_ id: String) {
-        selectedOrderItem = orderDetails.items.first(where: { $0.id == id })
+    func selectOrderItem(_ id: Int64) {
+        selectedProductViewModel = createSelectedProductViewModel(itemID: id)
     }
 
     /// Removes an item from the order.
     ///
     /// - Parameter item: Item to remove from the order
-    func removeItemFromOrder(_ item: NewOrderItem) {
-        orderDetails.items.removeAll(where: { $0 == item })
+    func removeItemFromOrder(_ item: OrderItem) {
+        guard let input = createUpdateProductInput(item: item, quantity: 0) else { return }
+        orderSynchronizer.setProduct.send(input)
         configureProductRowViewModels()
     }
 
@@ -581,6 +582,23 @@ private extension NewOrderViewModel {
         // Return a new input with the new quantity but with the same item id to properly reference the update.
         return OrderSyncProductInput(id: item.itemID, product: product, quantity: quantity)
     }
+
+    /// Creates a `ProductInOrderViewModel` based on the provided order item id.
+    ///
+    func createSelectedProductViewModel(itemID: Int64) -> ProductInOrderViewModel? {
+        // Find order item based on the provided id.
+        // Creates the product row view model needed for `ProductInOrderViewModel`.
+        guard
+            let orderItem = orderSynchronizer.order.items.first(where: { $0.itemID == itemID }),
+            let rowViewModel = createProductRowViewModel(for: orderItem, canChangeQuantity: false)
+        else {
+            return nil
+        }
+
+        return ProductInOrderViewModel(productRowViewModel: rowViewModel) { [weak self] in
+            self?.removeItemFromOrder(orderItem)
+        }
+    }
 }
 
 private extension NewOrderViewModel {

WooCommerce/Classes/ViewRelated/Orders/Order Creation/ProductsSection/ProductInOrderViewModel.swift

@@ -2,7 +2,13 @@ import Yosemite
 
 /// View model for `ProductInOrder`.
 ///
-final class ProductInOrderViewModel {
+final class ProductInOrderViewModel: Identifiable {
+
+    /// Underlying row ID.
+    ///
+    var ID: Int64 {
+        productRowViewModel.id
+    }
 
     /// The product being edited.
     ///