Split web and native coordinator

Author: adborbas

WooCommerce/Classes/Routing/ProductDetail/Coordinator/ProductDetailCoordinator.swift

@@ -3,7 +3,7 @@ import UIKit
 
 /// Coordinator for the **native** product detail/editor flow.
 /// Delegates VC construction to `ProductDetailsFactory` and applies the requested presentation style.
-class ProductDetailNativeCoordinator: ProductDetailCoordinator {
+class ProductDetailNativeCoordinator {
 
     func viewController(
         product: Product,

WooCommerce/Classes/Routing/ProductDetail/Coordinator/ProductDetailNativeCoordinator.swift

@@ -2,24 +2,20 @@ import UIKit
 import Yosemite
 
 /// Coordinator for the **admin web** product detail/editor flow.
-final class ProductDetailWebCoordinator: NSObject, ProductDetailCoordinator {
-    var onDismiss: (() -> Void)?
-    private let site: Site
+class ProductDetailWebCoordinator: NSObject {
+    private let site: Site?
 
-    init(site: Site) {
+    init(site: Site?) {
         self.site = site
     }
 
-    func viewController(product: Product,
-                        presentationStyle: ProductDetailNavigator.Presentation,
-                        isReadOnly: Bool,
-                        onDelete: (() -> Void)? = nil) -> UIViewController {
+    func viewController(product: Product, onDismiss: @escaping () -> Void) -> UIViewController {
         guard let url = ProductAdminURLProvider.editURL(for: product, site: site) else {
             return UIViewController()
         }
 
         let viewModel = AdminWebViewModel(title: product.name, initialURL: url) { [onDismiss] in
-            onDismiss?()
+            onDismiss()
         }
         let webViewController = AuthenticatedWebViewController(viewModel: viewModel)
 
@@ -28,15 +24,15 @@ final class ProductDetailWebCoordinator: NSObject, ProductDetailCoordinator {
 }
 
 fileprivate class AdminWebViewModel: WPAdminWebViewModel {
-    var onDismiss: (() -> Void)?
+    let onDismiss: (() -> Void)
 
-    init(title: String, initialURL: URL, onDismiss: (() -> Void)?) {
+    init(title: String, initialURL: URL, onDismiss: @escaping () -> Void) {
         self.onDismiss = onDismiss
         super.init(title: title, initialURL: initialURL)
     }
 
     override func handleDismissal() {
-        onDismiss?()
+        onDismiss()
         super.handleDismissal()
     }
 }

WooCommerce/Classes/Routing/ProductDetail/Coordinator/ProductDetailWebCoordinator.swift

@@ -4,8 +4,8 @@ import Foundation
 /// Builds canonical admin edit URLs for products.
 enum ProductAdminURLProvider {
 
-    static func editURL(for product: Product, site: Site) -> URL? {
-        guard let base = site.adminURLWithFallback() else { return nil }
+    static func editURL(for product: Product, site: Site?) -> URL? {
+        guard let base = site?.adminURLWithFallback() else { return nil }
 
         var components = URLComponents(url: base, resolvingAgainstBaseURL: false)!
         components.queryItems = [

WooCommerce/Classes/Routing/ProductDetail/ProductAdminURLProvider.swift

@@ -2,15 +2,15 @@ import Yosemite
 
 /// Factory for producing coordinators used by the navigator.
 protocol ProductDetailCoordinatorFactoryProtocol {
-    func webCoordinator(site: Site) -> ProductDetailWebCoordinator
+    func webCoordinator(site: Site?) -> ProductDetailWebCoordinator
     func nativeCoordinator() -> ProductDetailNativeCoordinator
 }
 
 /// Default coordinator factory that wires production dependencies.
 class ProductDetailCoordinatorFactory: ProductDetailCoordinatorFactoryProtocol {
     static let `default` = ProductDetailCoordinatorFactory()
 
-    func webCoordinator(site: Site) -> ProductDetailWebCoordinator {
+    func webCoordinator(site: Site?) -> ProductDetailWebCoordinator {
         return ProductDetailWebCoordinator(site: site)
     }
 

WooCommerce/Classes/Routing/ProductDetail/ProductDetailCoordinatorFactoryProtocol.swift

@@ -46,24 +46,25 @@ final class ProductDetailNavigator {
                          onDismissWeb: (() -> Void)? = nil,
                          onDelete: (() -> Void)? = nil) -> UIViewController {
 
-        let coordinator: ProductDetailCoordinator
+        let viewController: UIViewController
         if shouldOpenInWeb(product: product) {
-            let webCoordinator = coordinatorFactory.webCoordinator(site: stores.sessionManager.defaultSite!)
-            webCoordinator.onDismiss = onDismissWeb
-            coordinator = webCoordinator
-        } else {
-            coordinator = coordinatorFactory.nativeCoordinator()
-        }
+            let coordinator = coordinatorFactory.webCoordinator(site: stores.sessionManager.defaultSite)
+            viewController = coordinator.viewController(product: product) {
+                onDismissWeb?()
+            }
 
-        let viewController = coordinator.viewController(product: product,
+        } else {
+            let coordinator = coordinatorFactory.nativeCoordinator()
+            viewController = coordinator.viewController(product: product,
                                                         presentationStyle: presentationStyle,
                                                         isReadOnly: isReadOnly,
                                                         onDelete: onDelete)
+        }
 
         return viewController
     }
 
     private func shouldOpenInWeb(product: Product) -> Bool {
-        return /*ciabChecker.isCurrentSiteCIAB &&*/ product.productType == .booking
+        return ciabChecker.isCurrentSiteCIAB && product.productType == .booking
     }
 }

WooCommerce/Classes/Routing/ProductDetail/ProductDetailNavigator.swift

@@ -2,8 +2,14 @@ import UIKit
 import Yosemite
 @testable import WooCommerce
 
-struct MockProductDetailCoordinator: ProductDetailCoordinator {
-    func viewController(product: Product,
+class MockProductDetailWebCoordinator: ProductDetailWebCoordinator {
+    override func viewController(product: Product, onDismiss: @escaping () -> Void) -> UIViewController {
+        UIViewController()
+    }
+}
+
+class MockProductDetailNativeCoordinator: ProductDetailNativeCoordinator {
+    override func viewController(product: Product,
                         presentationStyle: ProductDetailNavigator.Presentation,
                         isReadOnly: Bool,
                         onDelete: (() -> Void)?) -> UIViewController {

WooCommerce/WooCommerceTests/Mocks/MockProductDetailCoordinator.swift

@@ -1,16 +1,17 @@
 @testable import WooCommerce
+import Yosemite
 
 class MockProductDetailCoordinatorFactory: ProductDetailCoordinatorFactoryProtocol {
     private(set) var createdWebCoordiantor = false
     private(set) var createdNativeCoordiantor = false
 
-    func webCoordinator() -> ProductDetailCoordinator {
+    func webCoordinator(site: Site?) -> ProductDetailWebCoordinator {
         createdWebCoordiantor = true
-        return MockProductDetailCoordinator()
+        return MockProductDetailWebCoordinator(site: Site.fake())
     }
 
-    func nativeCoordinator() -> ProductDetailCoordinator {
+    func nativeCoordinator() -> ProductDetailNativeCoordinator {
         createdNativeCoordiantor = true
-        return MockProductDetailCoordinator()
+        return MockProductDetailNativeCoordinator()
     }
 }