POC of ProductDetailRouter

Author: adborbas

WooCommerce/Classes/Routing/ProductDetailRouter.swift

@@ -4,16 +4,10 @@ import Yosemite
 final class ProductDetailRouter {
     enum PresentationStyle {
         case undefined
-        case push
-        case modal
         case contained(containerViewController: () -> UIViewController?)
 
         var asProductFormPresentationStyle: ProductFormPresentationStyle {
             switch self {
-            case .push:
-                    .navigationStack
-            case .modal:
-                    .navigationStack
             case .contained(let containerViewController):
                     .contained(containerViewController: containerViewController)
             case .undefined:
@@ -30,42 +24,24 @@ final class ProductDetailRouter {
         self.productURLProvider = productURLProvider
     }
 
-    func open(product: Product,
-              presenter: UIViewController,
-              presentationStyle: PresentationStyle,
-              onDismiss: (() -> Void)? = nil) {
-        if  product.productType == .booking {
-            let coordinator = WebViewProductDetailCoordinator(product: product,
-                                                              productURLProvider: productURLProvider)
-            coordinator.start(presenter: presenter, onDismiss: onDismiss)
-        } else {
-            let coordinator = NativeProductDetailCoordinator(product: product)
-            coordinator.start(presenter: presenter,
-                              presentationStyle: presentationStyle,
-                              onDismiss: onDismiss)
-        }
-    }
-
     func viewController(product: Product,
                         presentationStyle: PresentationStyle = .undefined,
                         forceReadOnly: Bool,
                         onDeleteCompletion: (() -> Void)? = nil) -> UIViewController {
+
+        let viewController: UIViewController
         if  product.productType == .booking {
             let coordinator = WebViewProductDetailCoordinator(product: product,
                                                               productURLProvider: productURLProvider)
-            return coordinator.viewController()
+            viewController = coordinator.viewController()
 
         } else {
             let coordinator = NativeProductDetailCoordinator(product: product)
-            return coordinator.viewController(presentationStyle: presentationStyle,
+            viewController = coordinator.viewController(presentationStyle: presentationStyle,
                                               forceReadOnly: forceReadOnly)
         }
-    }
-}
 
-final class ProductURLProvider {
-    func adminURL(for product: Product) -> URL? {
-        return URL(string: "https://wordpress.com")
+        return viewController
     }
 }
 
@@ -91,18 +67,6 @@ final class WebViewProductDetailCoordinator: NSObject {
         return webViewController
     }
 
-    func start(presenter: UIViewController,
-               onDismiss: (() -> Void)? = nil) {
-        let webViewController = viewController()
-        webViewController.navigationItem.leftBarButtonItem = UIBarButtonItem(
-            barButtonSystemItem: .done,
-            target: self,
-            action: #selector(dismissWebView)
-        )
-
-        presenter.navigationController?.present(webViewController, animated: true)
-    }
-
     @objc
     private func dismissWebView() {
         let completion = onDismiss
@@ -118,12 +82,6 @@ final class NativeProductDetailCoordinator {
         self.product = product
     }
 
-    func start(presenter: UIViewController,
-               presentationStyle: ProductDetailRouter.PresentationStyle,
-               onDismiss: (() -> Void)? = nil) {
-
-    }
-
     func viewController(
         presentationStyle: ProductDetailRouter.PresentationStyle,
         forceReadOnly: Bool,
@@ -134,3 +92,9 @@ final class NativeProductDetailCoordinator {
                                                         onDeleteCompletion: onDeleteCompletion ?? {})
         }
 }
+
+final class ProductURLProvider {
+    func adminURL(for product: Product) -> URL? {
+        return URL(string: "https://wordpress.com")
+    }
+}

WooCommerce/Classes/ViewRelated/Products/ProductDetailsFactory.swift

@@ -27,6 +27,13 @@ struct ProductDetailsFactory {
         onCompletion(vc)
     }
 
+    /// Creates a product details view controller asynchronously based on the app settings.
+    /// - Parameters:
+    ///   - product: product model.
+    ///   - presentationStyle: how the product details are presented.
+    ///   - currencySettings: site currency settings.
+    ///   - forceReadOnly: force the product detail to be presented in read only mode
+    ///   - onDeleteCompletion: called when the product deletion completes in the product form.
     static func productDetails(product: Product,
                                presentationStyle: ProductFormPresentationStyle,
                                currencySettings: CurrencySettings = ServiceLocator.currencySettings,

WooCommerce/Classes/ViewRelated/Products/ProductsViewController.swift

@@ -1214,12 +1214,9 @@ extension ProductsViewController: UITableViewDelegate {
 private extension ProductsViewController {
     func didSelectProduct(product: Product) {
         guard isSplitViewEnabled else {
-            // TODO: Replace with ProductDetailRouter
-            ProductDetailsFactory.productDetails(product: product,
-                                                 presentationStyle: .navigationStack,
-                                                 forceReadOnly: false) { [weak self] viewController in
-                self?.navigationController?.pushViewController(viewController, animated: true)
-            }
+            let viewController = ProductDetailRouter.shared.viewController(product: product,
+                                                                           forceReadOnly: false)
+            navigationController?.pushViewController(viewController, animated: true)
             return
         }
         navigateToContent(.productForm(product: product))