Add Support Screen presentation logic

Author: salimbraksa

WordPress/Jetpack/Classes/ViewRelated/WordPress-to-Jetpack Migration/Common/MigrationDependencyContainer.swift

@@ -44,16 +44,30 @@ struct MigrationViewControllerFactory {
         }
     }
 
-    // MARK: - View Models
+    // MARK: - View Controllers
 
-    private func makeWelcomeViewModel() -> MigrationWelcomeViewModel {
-        MigrationWelcomeViewModel(account: makeAccount(), coordinator: coordinator)
+    private func makeWelcomeViewModel(handlers: ActionHandlers) -> MigrationWelcomeViewModel {
+        let primaryHandler = { () -> Void in handlers.primary?() }
+        let secondaryHandler = { () -> Void in handlers.secondary?() }
+
+        let actions = MigrationActionsViewConfiguration(
+            step: .welcome,
+            primaryHandler: primaryHandler,
+            secondaryHandler: secondaryHandler
+        )
+        
+        return .init(account: makeAccount(), actions: actions)
     }
 
-    // MARK: - View Controllers
-
     private func makeWelcomeViewController() -> UIViewController {
-        MigrationWelcomeViewController(viewModel: makeWelcomeViewModel())
+        let handlers = ActionHandlers()
+        let viewModel = makeWelcomeViewModel(handlers: handlers)
+
+        let viewController = MigrationWelcomeViewController(viewModel: viewModel)
+        handlers.primary = { [weak coordinator] in coordinator?.transitionToNextStep() }
+        handlers.secondary = makeSupportViewControllerRouter(with: viewController)
+
+        return viewController
     }
 
     private func makeNotificationsViewModel() -> MigrationNotificationsViewModel {
@@ -71,4 +85,21 @@ struct MigrationViewControllerFactory {
     private func makeDoneViewController() -> UIViewController {
         MigrationDoneViewController(viewModel: makeDoneViewModel())
     }
+
+    // MARK: - Routers
+
+    private func makeSupportViewControllerRouter(with presenter: UIViewController) -> () -> Void {
+        return { [weak presenter] in
+            let destination = SupportTableViewController(configuration: .currentAccountConfiguration())
+            presenter?.present(UINavigationController(rootViewController: destination), animated: true)
+        }
+    }
+
+    // MARK: - Types
+
+    private class ActionHandlers {
+        var primary: (() -> Void)?
+        var secondary: (() -> Void)?
+    }
+
 }

WordPress/Jetpack/Classes/ViewRelated/WordPress-to-Jetpack Migration/Common/Navigation/MigrationFlowCoordinator.swift

@@ -8,9 +8,6 @@ final class MigrationFlowCoordinator: ObservableObject {
     // related to this property.
     @Published private(set) var currentStep = MigrationStep.welcome
 
-    /// Call this closure to display the support screen
-    var routeToSupportViewController: (() -> Void)?
-
     func transitionToNextStep() {
         Task { [weak self] in
             if let nextStep = await Self.nextStep(from: currentStep) {

WordPress/Jetpack/Classes/ViewRelated/WordPress-to-Jetpack Migration/Common/Navigation/MigrationNavigationController.swift

@@ -58,15 +58,7 @@ class MigrationNavigationController: UINavigationController {
             navigationBar.compactScrollEdgeAppearance = scrollEdgeAppearance
         }
         navigationBar.isTranslucent = true
-        configure(coordinator: coordinator)
-    }
-
-    private func configure(coordinator: MigrationFlowCoordinator) {
-        coordinator.routeToSupportViewController = { [weak self] in
-            let destination = SupportTableViewController(configuration: .currentAccountConfiguration())
-            self?.present(UINavigationController(rootViewController: destination), animated: true)
-        }
-        self.listenForStateChanges()
+        listenForStateChanges()
     }
 
     private func listenForStateChanges() {

WordPress/Jetpack/Classes/ViewRelated/WordPress-to-Jetpack Migration/Welcome/MigrationWelcomeViewController.swift

@@ -65,7 +65,9 @@ final class MigrationWelcomeViewController: UIViewController {
     }
 
     private func setupNavigationBar() {
-        self.navigationItem.rightBarButtonItem = UIBarButtonItem(email: viewModel.gravatarEmail)
+        self.navigationItem.rightBarButtonItem = UIBarButtonItem(email: viewModel.gravatarEmail) { [weak self] () -> Void in
+            self?.viewModel.configuration.actionsConfiguration.secondaryHandler?()
+        }
     }
 
     private func setupBottomSheet() {

WordPress/Jetpack/Classes/ViewRelated/WordPress-to-Jetpack Migration/Welcome/MigrationWelcomeViewModel.swift

@@ -4,51 +4,35 @@ final class MigrationWelcomeViewModel {
 
     // MARK: - Properties
 
-    var gravatarEmail: String?
-
-    let blogListDataSource: BlogListDataSource
-
+    let gravatarEmail: String?
     let configuration: MigrationStepConfiguration
+    let blogListDataSource: BlogListDataSource
 
     // MARK: - Init
 
-    init(account: WPAccount?, coordinator: MigrationFlowCoordinator) {
-        if let account {
-            self.gravatarEmail = account.email
-        }
-
-        self.blogListDataSource = BlogListDataSource()
-        self.blogListDataSource.loggedIn = true
-        self.blogListDataSource.account = account
-
-        let headerConfiguration = MigrationHeaderConfiguration(step: .welcome,
-                                                               multiSite: blogListDataSource.visibleBlogsCount > 1)
+    init(gravatarEmail: String?, blogListDataSource: BlogListDataSource, configuration: MigrationStepConfiguration) {
+        self.gravatarEmail = gravatarEmail
+        self.configuration = configuration
+        self.blogListDataSource = blogListDataSource
+    }
 
-        let primaryHandler = { [weak coordinator] () -> Void in
-            coordinator?.transitionToNextStep()
-        }
-        let secondaryHandler = { [weak coordinator] () -> Void in
-            // Which object is responsible for displaying the support screen?
-            //
-            // The following code needs to be executed somewhere:
-            //
-            // let destination = SupportTableViewController()
-            // presentingViewController.present(destination, completion: nil)
-            //
-            // Approaches considered:
-            //
-            // 1. The View Model shouldn't be responsible for displaying the support screen
-            // 2. The coordination can't perform the presentation because it doesn't have access to the `presenting` view controller
-            // 3. I thought of making the `MigrationViewControllerFactory` responsible for creating the `secondaryHandler` and injecting it into this view model
-            //    But that didn't work as well.
-            //
-            // Workaround:
-            //
-            coordinator?.routeToSupportViewController?()
-        }
-        let actionsConfiguration = MigrationActionsViewConfiguration(step: .welcome, primaryHandler: primaryHandler, secondaryHandler: secondaryHandler)
-        configuration = MigrationStepConfiguration(headerConfiguration: headerConfiguration,
-                                                   centerViewConfiguration: nil,
-                                                   actionsConfiguration: actionsConfiguration)
+    convenience init(account: WPAccount?, actions: MigrationActionsViewConfiguration) {
+        let blogsDataSource = BlogListDataSource()
+        blogsDataSource.loggedIn = true
+        blogsDataSource.account = account
+        let header = MigrationHeaderConfiguration(
+            step: .welcome,
+            multiSite: blogsDataSource.visibleBlogsCount > 1
+        )
+        let configuration = MigrationStepConfiguration(
+            headerConfiguration: header,
+            centerViewConfiguration: nil,
+            actionsConfiguration: actions
+        )
+        self.init(
+            gravatarEmail: account?.email,
+            blogListDataSource: blogsDataSource,
+            configuration: configuration
+        )
     }
 }