Use NavigationLink to set disclosure indicator on variable product rows

Author: rachelmcr

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

@@ -19,11 +19,7 @@ struct AddProductToOrder: View {
                     InfiniteScrollList(isLoading: viewModel.shouldShowScrollIndicator,
                                        loadAction: viewModel.syncNextPage) {
                         ForEach(viewModel.productRows) { rowViewModel in
-                            ProductRow(viewModel: rowViewModel)
-                                .onTapGesture {
-                                    viewModel.selectProduct(rowViewModel.productOrVariationID)
-                                    isPresented.toggle()
-                                }
+                            createProductRow(rowViewModel: rowViewModel)
                         }
                     }
                 case .empty:
@@ -57,6 +53,22 @@ struct AddProductToOrder: View {
         }
         .wooNavigationBarStyle()
     }
+
+    @ViewBuilder private func createProductRow(rowViewModel: ProductRowViewModel) -> some View {
+        if rowViewModel.numberOfVariations > 0 {
+            NavigationLink {
+                // TODO: Navigate to variation list
+            } label: {
+                ProductRow(viewModel: rowViewModel)
+            }
+        } else {
+            ProductRow(viewModel: rowViewModel)
+                .onTapGesture {
+                    viewModel.selectProduct(rowViewModel.productOrVariationID)
+                    isPresented.toggle()
+                }
+        }
+    }
 }
 
 private extension AddProductToOrder {

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

@@ -42,12 +42,6 @@ struct ProductRow: View {
 
                 ProductStepper(viewModel: viewModel)
                     .renderedIf(viewModel.canChangeQuantity)
-
-                Image(uiImage: .chevronImage)
-                    .renderedIf(viewModel.isSelectable)
-                    .flipsForRightToLeftLayoutDirection(true)
-                    .frame(width: Layout.chevronImageSize, height: Layout.chevronImageSize)
-                    .foregroundColor(Color(UIColor.gray(.shade30)))
             }
         }
     }
@@ -149,17 +143,6 @@ struct ProductRow_Previews: PreviewProvider {
                                                           manageStock: true,
                                                           canChangeQuantity: false,
                                                           imageURL: nil)
-        let viewModelSelectable = ProductRowViewModel(productOrVariationID: 1,
-                                                      name: "Love Ficus",
-                                                      sku: "123456",
-                                                      price: "",
-                                                      stockStatusKey: "instock",
-                                                      stockQuantity: 7,
-                                                      manageStock: true,
-                                                      canChangeQuantity: false,
-                                                      imageURL: nil,
-                                                      isSelectable: true,
-                                                      numberOfVariations: 3)
 
         ProductRow(viewModel: viewModel)
             .previewDisplayName("ProductRow with stepper")
@@ -168,9 +151,5 @@ struct ProductRow_Previews: PreviewProvider {
         ProductRow(viewModel: viewModelWithoutStepper)
             .previewDisplayName("ProductRow without stepper")
             .previewLayout(.sizeThatFits)
-
-        ProductRow(viewModel: viewModelSelectable)
-            .previewDisplayName("Selectable ProductRow")
-            .previewLayout(.sizeThatFits)
     }
 }

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

@@ -84,14 +84,9 @@ final class ProductRowViewModel: ObservableObject, Identifiable {
         quantity <= minimumQuantity
     }
 
-    /// Whether the product row is selectable
-    /// Used to add a disclosure indicator for variable products
-    ///
-    let isSelectable: Bool
-
     /// Number of variations in a variable product
     ///
-    private let numberOfVariations: Int
+    let numberOfVariations: Int
 
     init(id: String? = nil,
          productOrVariationID: Int64,
@@ -104,7 +99,6 @@ final class ProductRowViewModel: ObservableObject, Identifiable {
          quantity: Decimal = 1,
          canChangeQuantity: Bool,
          imageURL: URL?,
-         isSelectable: Bool = false,
          numberOfVariations: Int = 0,
          currencyFormatter: CurrencyFormatter = CurrencyFormatter(currencySettings: ServiceLocator.currencySettings)) {
         self.id = id ?? productOrVariationID.description
@@ -119,7 +113,6 @@ final class ProductRowViewModel: ObservableObject, Identifiable {
         self.canChangeQuantity = canChangeQuantity
         self.imageURL = imageURL
         self.currencyFormatter = currencyFormatter
-        self.isSelectable = isSelectable
         self.numberOfVariations = numberOfVariations
     }
 
@@ -149,7 +142,6 @@ final class ProductRowViewModel: ObservableObject, Identifiable {
                   quantity: quantity,
                   canChangeQuantity: canChangeQuantity,
                   imageURL: product.imageURL,
-                  isSelectable: product.productType == .variable,
                   numberOfVariations: product.variations.count,
                   currencyFormatter: currencyFormatter)
     }

WooCommerce/WooCommerceTests/ViewRelated/Orders/Order Creation/ProductRowViewModelTests.swift

@@ -22,18 +22,18 @@ class ProductRowViewModelTests: XCTestCase {
         XCTAssertEqual(viewModel.imageURL, URL(string: imageURLString))
         XCTAssertFalse(viewModel.canChangeQuantity)
         XCTAssertEqual(viewModel.quantity, 1)
-        XCTAssertFalse(viewModel.isSelectable)
+        XCTAssertEqual(viewModel.numberOfVariations, 0)
     }
 
     func test_viewModel_is_created_with_correct_initial_values_from_variable_product() {
         // Given
-        let product = Product.fake().copy(productTypeKey: "variable")
+        let product = Product.fake().copy(productTypeKey: "variable", variations: [0, 1, 2])
 
         // When
         let viewModel = ProductRowViewModel(product: product, canChangeQuantity: false)
 
         // Then
-        XCTAssertTrue(viewModel.isSelectable)
+        XCTAssertEqual(viewModel.numberOfVariations, 3)
     }
 
     func test_viewModel_is_created_with_correct_initial_values_from_product_variation() {