Progress presenting the support screen from the migration flow

Author: salimbraksa

WordPress/Classes/ViewRelated/Support/SupportTableViewController.swift

@@ -171,7 +171,7 @@ private extension SupportTableViewController {
             )
         }
 
-        // Log out sections
+        // Log out Section
         var logOutSections: ImmuTableSection?
         if configuration.showsLogOutButton {
             let logOutRow = DestructiveButtonRow(

WordPress/Jetpack/Classes/System/JetpackWindowManager.swift

@@ -43,6 +43,6 @@ class JetpackWindowManager: WindowManager {
 
     // TODO: Add logic in here to trigger migration UI if needed
     private var shouldShowMigrationUI: Bool {
-        false
+        true
     }
 }

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

@@ -16,7 +16,7 @@ struct MigrationViewControllerFactory {
         self.coordinator = coordinator
     }
 
-    func viewController(for step: MigrationStep) -> UIViewController? {
+    func viewController(for parent: UIViewController, in step: MigrationStep) -> UIViewController? {
         switch step {
         case .welcome:
             return makeWelcomeViewController()
@@ -44,10 +44,14 @@ struct MigrationViewControllerFactory {
         }
     }
 
+    // MARK: - View Models
+
     private func makeWelcomeViewModel() -> MigrationWelcomeViewModel {
         MigrationWelcomeViewModel(account: makeAccount(), coordinator: coordinator)
     }
 
+    // MARK: - View Controllers
+
     private func makeWelcomeViewController() -> UIViewController {
         MigrationWelcomeViewController(viewModel: makeWelcomeViewModel())
     }

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

@@ -2,13 +2,18 @@ import Combine
 import UIKit
 
 class MigrationNavigationController: UINavigationController {
+
+    // MARK: - Properties
+
     /// Navigation coordinator
     private let coordinator: MigrationFlowCoordinator
     /// The view controller factory used to push view controllers on the stack
     private let factory: MigrationViewControllerFactory
     /// Receives state changes to set the navigation stack accordingly
     private var cancellable: AnyCancellable?
 
+    // MARK: - Orientation
+
     override var supportedInterfaceOrientations: UIInterfaceOrientationMask {
         if WPDeviceIdentification.isiPhone() {
             return .portrait
@@ -21,6 +26,8 @@ class MigrationNavigationController: UINavigationController {
         .portrait
     }
 
+    // MARK: - Init
+
     init(coordinator: MigrationFlowCoordinator, factory: MigrationViewControllerFactory) {
         self.coordinator = coordinator
         self.factory = factory
@@ -36,6 +43,8 @@ class MigrationNavigationController: UINavigationController {
         fatalError("init(coder:) has not been implemented")
     }
 
+    // MARK: - Configuration
+
     private func configure() {
         let navigationBar = self.navigationBar
         let standardAppearance = UINavigationBarAppearance()
@@ -63,7 +72,7 @@ class MigrationNavigationController: UINavigationController {
 
     private func updateStack(for step: MigrationStep) {
         // sets the stack for the next navigation step, if there's one
-        guard let viewController = factory.viewController(for: step) else {
+        guard let viewController = factory.viewController(for: self, in: step) else {
             return
         }
         // if we want to support backwards navigation, we need to set

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

@@ -51,6 +51,12 @@ final class MigrationWelcomeViewController: UIViewController {
         self.updateTableViewContentInset()
     }
 
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        let supportVC = SupportTableViewController(configuration: .currentAccountConfiguration())
+        self.present(UINavigationController(rootViewController: supportVC), animated: animated)
+    }
+
     // MARK: - Setup and Updates
 
     private func setupTableView() {

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

@@ -24,12 +24,25 @@ final class MigrationWelcomeViewModel {
         let headerConfiguration = MigrationHeaderConfiguration(step: .welcome,
                                                                multiSite: blogListDataSource.visibleBlogsCount > 1)
 
-        let actionsConfiguration = MigrationActionsViewConfiguration(step: .welcome,
-                                                                     primaryHandler: { [weak coordinator] in
+        let primaryHandler = { [weak coordinator] () -> Void in
             coordinator?.transitionToNextStep()
-        },
-                                                                     secondaryHandler: { })
-
+        }
+        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.
+        }
+        let actionsConfiguration = MigrationActionsViewConfiguration(step: .welcome, primaryHandler: primaryHandler, secondaryHandler: secondaryHandler)
         configuration = MigrationStepConfiguration(headerConfiguration: headerConfiguration, actionsConfiguration: actionsConfiguration)
     }
 }