Add callback to pass Customer data between views

Author: iamgabrielma

WooCommerce/Classes/ViewRelated/Orders/Order Creation/CustomerSection/CustomerSearchUICommand.swift

@@ -17,15 +17,17 @@ final class CustomerSearchUICommand: SearchUICommand {
 
     var resynchronizeModels: (() -> Void) = {}
 
+    var onDidSelectSearchResult: ((Customer) -> Void)
+
     private let siteID: Int64
 
-    init(siteID: Int64) {
+    init(siteID: Int64, onDidSelectSearchResult: @escaping ((Customer) -> Void)) {
         self.siteID = siteID
+        self.onDidSelectSearchResult = onDidSelectSearchResult
     }
 
     func createResultsController() -> ResultsController<StorageCustomer> {
         let storageManager = ServiceLocator.storageManager
-        let predicate = NSPredicate(format: "siteID == %lld", siteID)
         let descriptor = NSSortDescriptor(keyPath: \StorageCustomer.customerID, ascending: false)
         return ResultsController<StorageCustomer>(storageManager: storageManager, sortedBy: [descriptor])
     }
@@ -37,7 +39,7 @@ final class CustomerSearchUICommand: SearchUICommand {
     func createCellViewModel(model: Customer) -> TitleAndSubtitleAndStatusTableViewCell.ViewModel {
         return CellViewModel(
             id: "\(model.customerID)",
-            title: "\(model.firstName ?? "") \(model.lastName ?? ""))",
+            title: "\(model.firstName ?? "") \(model.lastName ?? "")",
             subtitle: model.email,
             accessibilityLabel: "",
             status: "",
@@ -59,7 +61,10 @@ final class CustomerSearchUICommand: SearchUICommand {
 
     func didSelectSearchResult(model: Customer, from viewController: UIViewController, reloadData: () -> Void, updateActionButton: () -> Void) {
         // Not implemented yet
-        print("Selected ID: \(model.customerID) - Name: \(String(describing: model.firstName))")
+        print("1 - Customer tapped")
+        print("2 - Customer ID: \(model.customerID) - Name: \(model.firstName ?? ""))")
+        // Customer data will go up to EditOrderAddressForm, via OrderCustomerListView completion handler
+        onDidSelectSearchResult(model)
     }
 
     func searchResultsPredicate(keyword: String) -> NSPredicate? {

WooCommerce/Classes/ViewRelated/Orders/Order Creation/CustomerSection/OrderCustomerListView.swift

@@ -1,4 +1,5 @@
 import Foundation
+import Yosemite
 import SwiftUI
 
 /// `SwiftUI` wrapper for `SearchViewController` using `CustomerSearchUICommand`
@@ -7,11 +8,13 @@ struct OrderCustomerListView: UIViewControllerRepresentable {
 
     let siteID: Int64
 
+    let onCustomerTapped: ((Customer) -> Void)
+
     func makeUIViewController(context: Context) -> WooNavigationController {
 
         let viewController = SearchViewController(
             storeID: siteID,
-            command: CustomerSearchUICommand(siteID: siteID),
+            command: CustomerSearchUICommand(siteID: siteID, onDidSelectSearchResult: onCustomerTapped),
             cellType: TitleAndSubtitleAndStatusTableViewCell.self,
             // Must conform to SearchResultCell.
             // TODO: Proper cell for this cellType.

WooCommerce/Classes/ViewRelated/Orders/Order Details/Address Edit/EditOrderAddressForm.swift

@@ -171,7 +171,11 @@ struct EditOrderAddressForm<ViewModel: AddressFormViewModelProtocol>: View {
         }
         .notice($viewModel.notice)
         .sheet(isPresented: $showingCustomerSearch, content: {
-            OrderCustomerListView(siteID: viewModel.siteID)
+            OrderCustomerListView(siteID: viewModel.siteID, onCustomerTapped: { customer in
+                // Not implemented yet.
+                print("3 - Customer Callback. Fill Order data with Customer details")
+                print("4 - Customer ID: \(customer.customerID) - Name: \(customer.firstName ?? ""))")
+            })
         })
     }