Move analytics mapping extensions to analytics file

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: adborbas

WooCommerce/Classes/Analytics/WooAnalyticsEvent+PushNotificationsSetup.swift

@@ -22,10 +22,33 @@ extension WooAnalyticsEvent {
                               properties: [Keys.buttonLabel.rawValue: buttonLabel.rawValue])
         }
 
-        static func flowButtonTap(buttonLabel: FlowButtonLabel) -> WooAnalyticsEvent {
+        static func flowButtonTap(_ buttonLabel: FlowButtonLabel) -> WooAnalyticsEvent {
             WooAnalyticsEvent(statName: .pushNotificationsSetupFlowButtonTap,
                               properties: [Keys.buttonLabel.rawValue: buttonLabel.rawValue])
         }
 
     }
 }
+
+// MARK: - Analytics mapping extensions
+
+extension SetupStep {
+    var analyticsFlowStep: String {
+        switch self {
+        case .checkPlugin: return "plugin_compatibility"
+        case .connect: return "connect_wpcom"
+        case .enablePush: return "enable_push_notifications"
+        }
+    }
+}
+
+extension WPComConnectionSetupStep.ErrorType: LocalizedError {
+    var errorDescription: String? {
+        switch self {
+        case .outdatedPlugin(let version):
+            return "Outdated plugin version: \(version)"
+        case .generic(let reason):
+            return reason
+        }
+    }
+}

WooCommerce/Classes/Authentication/WPComLogin/WPComConnectionSetup/WPComConnectionSetupHandlerProtocol.swift

@@ -5,14 +5,6 @@ enum SetupStep: Int, CaseIterable {
     case checkPlugin = 0
     case connect = 1
     case enablePush = 2
-
-    var analyticsFlowStep: String {
-        switch self {
-        case .checkPlugin: return "plugin_compatibility"
-        case .connect: return "connect_wpcom"
-        case .enablePush: return "enable_push_notifications"
-        }
-    }
 }
 
 @MainActor

WooCommerce/Classes/Authentication/WPComLogin/WPComConnectionSetup/WPComConnectionSetupStep.swift

@@ -17,14 +17,3 @@ struct WPComConnectionSetupStep: Identifiable {
     let status: Status
     let id = UUID()
 }
-
-extension WPComConnectionSetupStep.ErrorType: LocalizedError {
-    var errorDescription: String? {
-        switch self {
-        case .outdatedPlugin(let version):
-            return "Outdated plugin version: \(version)"
-        case .generic(let reason):
-            return reason
-        }
-    }
-}

WooCommerce/Classes/Authentication/WPComLogin/WPComConnectionSetup/WPComConnectionSetupViewModel.swift

@@ -118,19 +118,19 @@ final class WPComConnectionSetupViewModel: ObservableObject {
     func primaryButtonTapped() {
         switch setupState {
         case .completed:
-            analytics.track(event: .PushNotificationsSetup.flowButtonTap(buttonLabel: .goToMyStore))
+            analytics.track(event: .PushNotificationsSetup.flowButtonTap( .goToMyStore))
             onGoToStore()
         case .failed(let step, let checkPluginError):
             switch step {
             case .connect, .enablePush:
-                analytics.track(event: .PushNotificationsSetup.flowButtonTap(buttonLabel: .tryAgain))
+                analytics.track(event: .PushNotificationsSetup.flowButtonTap( .tryAgain))
                 retrySetup()
             case .checkPlugin:
                 if checkPluginError == .outdated {
-                    analytics.track(event: .PushNotificationsSetup.flowButtonTap(buttonLabel: .updatePlugin))
+                    analytics.track(event: .PushNotificationsSetup.flowButtonTap( .updatePlugin))
                     onUpdatePlugin()
                 } else {
-                    analytics.track(event: .PushNotificationsSetup.flowButtonTap(buttonLabel: .tryAgain))
+                    analytics.track(event: .PushNotificationsSetup.flowButtonTap( .tryAgain))
                     retrySetup()
                 }
             }
@@ -140,7 +140,7 @@ final class WPComConnectionSetupViewModel: ObservableObject {
     }
 
     func secondaryButtonTapped() {
-        analytics.track(event: .PushNotificationsSetup.flowButtonTap(buttonLabel: .tryAgain))
+        analytics.track(event: .PushNotificationsSetup.flowButtonTap( .tryAgain))
         retrySetup()
     }
 

WooCommerce/WooCommerceTests/Analytics/WooAnalyticsEvent+PushNotificationsSetupTests.swift

@@ -37,7 +37,7 @@ struct WooAnalyticsEvent_PushNotificationsSetupTests {
 
         for (label, expected) in cases {
             // When
-            let event = WooAnalyticsEvent.PushNotificationsSetup.flowButtonTap(buttonLabel: label)
+            let event = WooAnalyticsEvent.PushNotificationsSetup.flowButtonTap(label)
 
             // Then
             #expect(event.statName == .pushNotificationsSetupFlowButtonTap)