Refactor to simplify experiment branching code

This refactors the implementation of the ExPlat experiment to land in
the editor so that the logic in the consumer can be close to the
original implementation.

Author: mkevins

WordPress/Classes/ViewRelated/Site Creation/FinalAssembly/SiteAssemblyCompletionHelper.swift

@@ -1,57 +1,33 @@
 typealias HomepageEditorCompletion = () -> Void
 
 class SiteAssemblyCompletionHelper {
-    static func completeSiteCreation(for blog: Blog, quickStartSettings: QuickStartSettings) {
-        // branch here for explat variation
-        if ABTest.landInTheEditorPhase1.variation == .control {
-            showMySitesScreen(for: blog, quickStartSettings: quickStartSettings)
-        } else {
-            landInTheEditor(for: blog, quickStartSettings: quickStartSettings)
-        }
-    }
-
-    static func completeSiteCreationFromAuthenticationScreen(for blog: Blog, quickStartSettings: QuickStartSettings, navigationController: UINavigationController, completion: @escaping HomepageEditorCompletion) {
+    /// Land in the editor, or continue as usual for the control group -  Used to branch on the ExPlat experiment for landing in the editor from the site creation flow
+    /// - Parameter blog: Blog (which was just created) for which to show the home page editor
+    /// - Parameter navigationController: UINavigationController used to present the home page editor
+    /// - Parameter completion: HomepageEditorCompletion callback to be invoked after the user finishes editing the home page, or immediately in the control group case
+    static func landInTheEditorOrContinue(for blog: Blog, navigationController: UINavigationController, completion: @escaping HomepageEditorCompletion) {
         // branch here for explat variation
         if ABTest.landInTheEditorPhase1.variation == .control {
             completion()
         } else {
-            landInTheEditor(for: blog, quickStartSettings: quickStartSettings, navigationController: navigationController, completion: completion)
+            landInTheEditor(for: blog, navigationController: navigationController, completion: completion)
         }
-
-    }
-
-    private static func landInTheEditor(for blog: Blog, quickStartSettings: QuickStartSettings) {
-        fetchAllPages(for: blog, success: { _ in
-            DispatchQueue.main.async {
-                WPTabBarController.sharedInstance()?.showHomePageEditor(forBlog: blog) {
-                    showMySitesScreen(for: blog, quickStartSettings: quickStartSettings)
-                }
-            }
-            WPAnalytics.track(.landingEditorShown)
-        }, failure: { _ in
-            NSLog("Fetching all pages failed after site creation!")
-        })
     }
 
-    private static func landInTheEditor(for blog: Blog, quickStartSettings: QuickStartSettings, navigationController: UINavigationController, completion: @escaping HomepageEditorCompletion) {
+    private static func landInTheEditor(for blog: Blog, navigationController: UINavigationController, completion: @escaping HomepageEditorCompletion) {
         fetchAllPages(for: blog, success: { _ in
             DispatchQueue.main.async {
                 if let homepage = blog.homepage {
                     let editorViewController = EditPageViewController(homepage: homepage, completion: completion)
                     navigationController.present(editorViewController, animated: false)
+                    WPAnalytics.track(.landingEditorShown)
                 }
-                WPAnalytics.track(.landingEditorShown)
             }
         }, failure: { _ in
             NSLog("Fetching all pages failed after site creation!")
         })
     }
 
-    private static func showMySitesScreen(for blog: Blog, quickStartSettings: QuickStartSettings) {
-        WPTabBarController.sharedInstance()?.mySitesCoordinator.showBlogDetails(for: blog)
-        showQuickStartPrompt(for: blog, quickStartSettings: quickStartSettings)
-    }
-
     // This seems to be necessary before casting `AbstractPost` to `Page`.
     private static func fetchAllPages(for blog: Blog, success: @escaping PostServiceSyncSuccess, failure: @escaping PostServiceSyncFailure) {
         let options = PostServiceSyncOptions()
@@ -60,22 +36,4 @@ class SiteAssemblyCompletionHelper {
         let postService = PostService(managedObjectContext: context)
         postService.syncPosts(ofType: .page, with: options, for: blog, success: success, failure: failure)
     }
-
-    private static func showQuickStartPrompt(for blog: Blog, quickStartSettings: QuickStartSettings) {
-        guard !quickStartSettings.promptWasDismissed(for: blog) else {
-            return
-        }
-
-        guard let tabBar = WPTabBarController.sharedInstance() else {
-            return
-        }
-
-        let quickstartPrompt = QuickStartPromptViewController(blog: blog)
-        quickstartPrompt.onDismiss = { blog, showQuickStart in
-            if showQuickStart {
-                QuickStartTourGuide.shared.setupWithDelay(for: blog)
-            }
-        }
-        tabBar.present(quickstartPrompt, animated: true)
-    }
 }

WordPress/Classes/ViewRelated/Site Creation/FinalAssembly/SiteAssemblyWizardContent.swift

@@ -230,27 +230,45 @@ extension SiteAssemblyWizardContent: NUXButtonViewControllerDelegate {
     func primaryButtonPressed() {
         SiteCreationAnalyticsHelper.trackSiteCreationSuccessPreviewOkButtonTapped()
 
-        guard let blog = createdBlog else {
+        guard let blog = createdBlog, let navigationController = navigationController else {
             return
         }
 
-        guard let navigationController = navigationController else {
-            return
-        }
+        SiteAssemblyCompletionHelper.landInTheEditorOrContinue(for: blog, navigationController: navigationController) { [weak self] in
+
+            guard let self = self else {
+                return
+            }
 
-        if let onDismiss = onDismiss {
-            SiteAssemblyCompletionHelper.completeSiteCreationFromAuthenticationScreen(for: blog, quickStartSettings: quickStartSettings, navigationController: navigationController) { [weak self, blog] in
+            if let onDismiss = self.onDismiss {
                 let quickstartPrompt = QuickStartPromptViewController(blog: blog)
                 quickstartPrompt.onDismiss = onDismiss
-                self?.navigationController?.pushViewController(quickstartPrompt, animated: true)
+                navigationController.pushViewController(quickstartPrompt, animated: true)
+                return
             }
+
+            self.dismissTapped(viaDone: true) { [blog, weak self] in
+                WPTabBarController.sharedInstance()?.mySitesCoordinator.showBlogDetails(for: blog)
+                self?.showQuickStartPrompt(for: blog)
+            }
+        }
+    }
+
+    private func showQuickStartPrompt(for blog: Blog) {
+        guard !quickStartSettings.promptWasDismissed(for: blog) else {
+            return
+        }
+
+        guard let tabBar = WPTabBarController.sharedInstance() else {
             return
         }
 
-        dismissTapped(viaDone: true) { [weak self, blog] in
-            if let strongSelf = self {
-                SiteAssemblyCompletionHelper.completeSiteCreation(for: blog, quickStartSettings: strongSelf.quickStartSettings)
+        let quickstartPrompt = QuickStartPromptViewController(blog: blog)
+        quickstartPrompt.onDismiss = { blog, showQuickStart in
+            if showQuickStart {
+                QuickStartTourGuide.shared.setupWithDelay(for: blog)
             }
         }
+        tabBar.present(quickstartPrompt, animated: true)
     }
 }

WordPress/Classes/ViewRelated/System/WPTabBarController+ShowTab.swift

@@ -13,22 +13,6 @@ extension WPTabBarController {
         showStoryEditor(blog: forBlog)
     }
 
-    /// Show the home page editor - Used just after site creation
-    /// - Parameter blog: Blog (which was just created) for which to show the home page editor
-    func showHomePageEditor(forBlog blog: Blog, completion: @escaping HomepageEditorCompletion) {
-        guard presentedViewController == nil else {
-            dismiss(animated: true) { [weak self] in
-                self?.showHomePageEditor(forBlog: blog, completion: completion)
-            }
-            return
-        }
-        if let homepage = blog.homepage {
-            let editorViewController = EditPageViewController(homepage: homepage, completion: completion)
-            present(editorViewController, animated: false)
-        }
-    }
-
-    /// Show the page tab
     /// - Parameter blog: Blog to a add a page to. Uses the current or last blog if not provided
     func showPageEditor(blog inBlog: Blog? = nil, title: String? = nil, content: String? = nil, source: String = "create_button") {