Merge pull request #17612 from wordpress-mobile/issue/17503-add-site-…

…tracking

Adds tracking to the Add Site buttons

WordPress/Classes/Utility/Analytics/WPAnalyticsEvent.swift

@@ -289,6 +289,8 @@ import Foundation
     // Preview WebKitView
     case previewWebKitViewDeviceChanged
 
+    case addSiteAlertDisplayed
+
     /// A String that represents the event
     var value: String {
         switch self {
@@ -778,6 +780,9 @@ import Foundation
         case .previewWebKitViewDeviceChanged:
             return "preview_webkitview_device_changed"
 
+        case .addSiteAlertDisplayed:
+            return "add_site_alert_displayed"
+
         } // END OF SWITCH
     }
 

WordPress/Classes/ViewRelated/Blog/Add Site/AddSiteAlertFactory.swift

@@ -7,6 +7,7 @@ class AddSiteAlertFactory: NSObject {
 
     @objc
     func makeAddSiteAlert(
+        source: String?,
         canCreateWPComSite: Bool,
         createWPComSite: @escaping () -> Void,
         addSelfHostedSite: @escaping () -> Void) -> UIAlertController {
@@ -20,6 +21,8 @@ class AddSiteAlertFactory: NSObject {
         alertController.addAction(addSelfHostedSiteAction(handler: addSelfHostedSite))
         alertController.addAction(cancelAction())
 
+        WPAnalytics.track(.addSiteAlertDisplayed, properties: ["source": source ?? "unknown"])
+
         return alertController
     }
 

WordPress/Classes/ViewRelated/Blog/Blog List/BlogListViewController+SiteCreation.swift

@@ -6,6 +6,6 @@ extension BlogListViewController {
             return
         }
         present(wizard, animated: true)
-        WPAnalytics.track(.enhancedSiteCreationAccessed)
+        WPAnalytics.track(.enhancedSiteCreationAccessed, withProperties: ["source": "my_sites"])
     }
 }

WordPress/Classes/ViewRelated/Blog/Blog List/BlogListViewController.m

@@ -995,13 +995,15 @@ - (void)showAddSiteAlertFrom:(id)source
         [self setEditing:YES animated:YES];
     } else {
         AddSiteAlertFactory *factory = [AddSiteAlertFactory new];
-        UIAlertController *alertController = [factory makeAddSiteAlertWithCanCreateWPComSite:[self defaultWordPressComAccount]
-                                                                             createWPComSite:^{
+        BOOL canCreateWPComSite = [self defaultWordPressComAccount] ? YES : NO;
+        UIAlertController *alertController = [factory makeAddSiteAlertWithSource:@"my_site"
+                                                              canCreateWPComSite:canCreateWPComSite
+                                                                 createWPComSite:^{
             [self launchSiteCreation];
         } addSelfHostedSite:^{
             [self showLoginControllerForAddingSelfHostedSite];
         }];
-        
+
         if ([source isKindOfClass:[UIView class]]) {
             UIView *sourceView = (UIView *)source;
             alertController.popoverPresentationController.sourceView = sourceView;

WordPress/Classes/ViewRelated/Blog/My Site/MySiteViewController.swift

@@ -78,7 +78,7 @@ class MySiteViewController: UIViewController, NoResultsViewHost {
     }
 
     private func subscribeToPostSignupNotifications() {
-        NotificationCenter.default.addObserver(self, selector: #selector(launchSiteCreation), name: .createSite, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(launchSiteCreationFromNotification), name: .createSite, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(showAddSelfHostedSite), name: .addSelfHosted, object: nil)
     }
 
@@ -280,8 +280,8 @@ class MySiteViewController: UIViewController, NoResultsViewHost {
 
     @objc
     func presentInterfaceForAddingNewSite() {
-        let addSiteAlert = AddSiteAlertFactory().makeAddSiteAlert(canCreateWPComSite: defaultAccount() != nil) { [weak self] in
-            self?.launchSiteCreation()
+        let addSiteAlert = AddSiteAlertFactory().makeAddSiteAlert(source: "my_site_no_sites", canCreateWPComSite: defaultAccount() != nil) { [weak self] in
+            self?.launchSiteCreation(source: "my_site_no_sites")
         } addSelfHostedSite: {
             WordPressAuthenticator.showLoginForSelfHostedSite(self)
         }
@@ -298,13 +298,17 @@ class MySiteViewController: UIViewController, NoResultsViewHost {
     }
 
     @objc
-    func launchSiteCreation() {
+    func launchSiteCreationFromNotification() {
+        self.launchSiteCreation(source: "signup_epilogue")
+    }
+
+    func launchSiteCreation(source: String) {
         let wizardLauncher = SiteCreationWizardLauncher()
         guard let wizard = wizardLauncher.ui else {
             return
         }
         present(wizard, animated: true)
-        WPAnalytics.track(.enhancedSiteCreationAccessed)
+        WPAnalytics.track(.enhancedSiteCreationAccessed, withProperties: ["source": source])
     }
 
     @objc

WordPress/Classes/ViewRelated/NUX/WordPressAuthenticationManager.swift

@@ -389,6 +389,7 @@ extension WordPressAuthenticationManager: WordPressAuthenticatorDelegate {
             }
 
             navigationController.present(wizard, animated: true)
+            WPAnalytics.track(.enhancedSiteCreationAccessed, withProperties: ["source": "login_epilogue"])
         }
 
         navigationController.pushViewController(epilogueViewController, animated: true)

WordPress/Classes/ViewRelated/System/Coordinators/MySitesCoordinator.swift

@@ -146,7 +146,7 @@ class MySitesCoordinator: NSObject {
 
     func showSiteCreation() {
         showRootViewController()
-        mySiteViewController.launchSiteCreation()
+        mySiteViewController.launchSiteCreation(source: "my_site")
     }
 
     @objc