Handle dismiss

Author: adborbas

WooCommerce/Classes/Extensions/UIViewController+Navigation.swift

@@ -6,7 +6,10 @@ extension UIViewController {
     /// A VC added to an existing navigation controller is dismissed when `isMovingFromParent` is `true`.
     /// For any other scenario `isBeingDismissed` will do.
     var isBeingDismissedInAnyWay: Bool {
-        isMovingFromParent || isBeingDismissed || navigationController?.isBeingDismissed == true
+        isMovingFromParent ||
+        isBeingDismissed ||
+        navigationController?.isBeingDismissed == true ||
+        navigationController?.isMovingFromParent == true
     }
 
     /// Async/await version of the UIKit `dismiss(animated:)`.

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

@@ -3,8 +3,7 @@ import Yosemite
 
 /// Coordinator for the **admin web** product detail/editor flow.
 final class ProductDetailWebCoordinator: NSObject, ProductDetailCoordinator {
-    private var onDismiss: (() -> Void)?
-
+    var onDismiss: (() -> Void)?
     private let site: Site
 
     init(site: Site) {
@@ -19,16 +18,25 @@ final class ProductDetailWebCoordinator: NSObject, ProductDetailCoordinator {
             return UIViewController()
         }
 
-        let viewModel = WPAdminWebViewModel(title: product.name, initialURL: url)
+        let viewModel = AdminWebViewModel(title: product.name, initialURL: url) { [onDismiss] in
+            onDismiss?()
+        }
         let webViewController = AuthenticatedWebViewController(viewModel: viewModel)
 
         return webViewController
     }
+}
+
+fileprivate class AdminWebViewModel: WPAdminWebViewModel {
+    var onDismiss: (() -> Void)?
+
+    init(title: String, initialURL: URL, onDismiss: (() -> Void)?) {
+        self.onDismiss = onDismiss
+        super.init(title: title, initialURL: initialURL)
+    }
 
-    @objc
-    private func dismissWebView() {
-        let completion = onDismiss
-        onDismiss = nil
-        completion?()
+    override func handleDismissal() {
+        onDismiss?()
+        super.handleDismissal()
     }
 }

WooCommerce/Classes/Routing/ProductDetail/ProductDetailCoordinatorFactoryProtocol.swift

@@ -2,25 +2,19 @@ import Yosemite
 
 /// Factory for producing coordinators used by the navigator.
 protocol ProductDetailCoordinatorFactoryProtocol {
-    func webCoordinator() -> ProductDetailCoordinator
-    func nativeCoordinator() -> ProductDetailCoordinator
+    func webCoordinator(site: Site) -> ProductDetailWebCoordinator
+    func nativeCoordinator() -> ProductDetailNativeCoordinator
 }
 
 /// Default coordinator factory that wires production dependencies.
 class ProductDetailCoordinatorFactory: ProductDetailCoordinatorFactoryProtocol {
     static let `default` = ProductDetailCoordinatorFactory()
 
-    private let stores: StoresManager
-
-    init(stores: StoresManager = ServiceLocator.stores) {
-        self.stores = stores
-    }
-
-    func webCoordinator() -> ProductDetailCoordinator {
-        return ProductDetailWebCoordinator(site: stores.sessionManager.defaultSite!)
+    func webCoordinator(site: Site) -> ProductDetailWebCoordinator {
+        return ProductDetailWebCoordinator(site: site)
     }
 
-    func nativeCoordinator() -> ProductDetailCoordinator {
+    func nativeCoordinator() -> ProductDetailNativeCoordinator {
         return ProductDetailNativeCoordinator()
     }
 }

WooCommerce/Classes/Routing/ProductDetail/ProductDetailNavigator.swift

@@ -22,11 +22,15 @@ final class ProductDetailNavigator {
 
     private let ciabChecker: CIABEligibilityCheckerProtocol
     private let coordinatorFactory: ProductDetailCoordinatorFactoryProtocol
+    private let stores: StoresManager
 
     init(ciabChecker: CIABEligibilityCheckerProtocol = CIABEligibilityChecker(),
-         coordinatorFactory: ProductDetailCoordinatorFactoryProtocol = ProductDetailCoordinatorFactory.default) {
+         coordinatorFactory: ProductDetailCoordinatorFactoryProtocol = ProductDetailCoordinatorFactory.default,
+         stores: StoresManager = ServiceLocator.stores,
+    ) {
         self.ciabChecker = ciabChecker
         self.coordinatorFactory = coordinatorFactory
+        self.stores = stores
     }
 
     /// Builds the destination `UIViewController` for the given product.
@@ -39,11 +43,14 @@ final class ProductDetailNavigator {
     func makeDestination(product: Product,
                          presentationStyle: Presentation = .push,
                          isReadOnly: Bool,
+                         onDismissWeb: (() -> Void)? = nil,
                          onDelete: (() -> Void)? = nil) -> UIViewController {
 
         let coordinator: ProductDetailCoordinator
         if shouldOpenInWeb(product: product) {
-            coordinator = coordinatorFactory.webCoordinator()
+            let webCoordinator = coordinatorFactory.webCoordinator(site: stores.sessionManager.defaultSite!)
+            webCoordinator.onDismiss = onDismissWeb
+            coordinator = webCoordinator
         } else {
             coordinator = coordinatorFactory.nativeCoordinator()
         }
@@ -57,6 +64,6 @@ final class ProductDetailNavigator {
     }
 
     private func shouldOpenInWeb(product: Product) -> Bool {
-        return ciabChecker.isCurrentSiteCIAB && product.productType == .booking
+        return /*ciabChecker.isCurrentSiteCIAB &&*/ product.productType == .booking
     }
 }

WooCommerce/Classes/ViewRelated/Products/ProductsSplitViewCoordinator.swift

@@ -122,11 +122,15 @@ private extension ProductsSplitViewCoordinator {
     }
 
     func showProductForm(product: Product) {
-        let viewController = ProductDetailNavigator.shared.makeDestination(product: product,
-                                                                           isReadOnly: false,
-                                                                           onDelete: { [weak self] in
-            self?.onSecondaryProductFormDeletion()
-        })
+        let viewController = ProductDetailNavigator.shared.makeDestination(
+            product: product,
+            isReadOnly: false,
+            onDismissWeb: { [weak self] in
+                self?.resyncProducts()
+            },
+            onDelete: { [weak self] in
+                self?.onSecondaryProductFormDeletion()
+            })
 
         showSecondaryView(contentType: .productForm(product: product),
                           viewController: viewController,
@@ -195,6 +199,11 @@ private extension ProductsSplitViewCoordinator {
         }
     }
 
+    func resyncProducts() {
+        guard let productsViewController = primaryNavigationController.topViewController as? ProductsViewController else { return }
+        productsViewController.resync()
+    }
+
     func showEmptyViewOrFirstProduct() {
         showEmptyView()
         switch primaryNavigationController.topViewController {

WooCommerce/Classes/ViewRelated/Products/ProductsViewController.swift

@@ -303,6 +303,11 @@ final class ProductsViewController: UIViewController, GhostableViewController {
     func startProductCreation() {
         addProduct(sourceBarButtonItem: addProductButton, isFirstProduct: false)
     }
+
+    func resync() {
+        tableView.reloadData()
+        paginationTracker.resync()
+    }
 }
 
 // MARK: - Navigation Bar Actions