POS Modularization: Complete remaining file updates

- Move WooAnalyticsEventPropertyType to WooFoundationCore
- Update DefaultConnectivityObserver and tests in WooFoundation
- Update authentication and POS utility files with proper imports
- Complete final import updates across remaining files

Author: staskus

Modules/Sources/WooFoundation/Protocols/Analytics/WooAnalyticsEventPropertyType.swift

@@ -1,19 +1,23 @@
 import Combine
 import Network
 
-final class DefaultConnectivityObserver: ConnectivityObserver {
+public final class DefaultConnectivityObserver: ConnectivityObserver {
 
     /// Network monitor to evaluate connection.
     ///
     private let networkMonitor: NetworkMonitoring
     private let observingQueue: DispatchQueue = .global(qos: .background)
 
-    @Published private(set) var currentStatus: ConnectivityStatus = .unknown
+    @Published private(set) public var currentStatus: ConnectivityStatus = .unknown
 
-    var statusPublisher: AnyPublisher<ConnectivityStatus, Never> {
+    public var statusPublisher: AnyPublisher<ConnectivityStatus, Never> {
         $currentStatus.eraseToAnyPublisher()
     }
 
+    public convenience init() {
+        self.init(networkMonitor: NWPathMonitor())
+    }
+
     init(networkMonitor: NetworkMonitoring = NWPathMonitor()) {
         self.networkMonitor = networkMonitor
         startObserving()
@@ -25,11 +29,11 @@ final class DefaultConnectivityObserver: ConnectivityObserver {
         }
     }
 
-    func startObserving() {
+    public func startObserving() {
         networkMonitor.start(queue: observingQueue)
     }
 
-    func stopObserving() {
+    public func stopObserving() {
         networkMonitor.cancel()
     }
 

Modules/Sources/WooFoundation/Utilities/Connectivity/DefaultConnectivityObserver.swift

@@ -1,7 +1,7 @@
 import Combine
 import Network
 import XCTest
-@testable import WooCommerce
+@testable import WooFoundation
 
 final class DefaultConnectivityObserverTests: XCTestCase {
     private var subscriptions: Set<AnyCancellable> = []

Modules/Tests/WooFoundationTests/Utilities/DefaultConnectivityObserverTests.swift

@@ -1,6 +1,6 @@
 import Testing
 import WooFoundationCore
-@testable import WooCommerce
+@testable import WooFoundation
 
 /// VersionHelpers Unit Tests
 ///

Modules/Tests/WooFoundationTests/Utilities/VersionHelpersTests.swift

@@ -1,4 +1,5 @@
 import SwiftUI
+import struct WooFoundation.ScrollableVStack
 
 /// View to be displayed when the Jetpack connection flow is dismissed.
 /// This screen is used only in the Jetpack setup flow for non-JCP sites.

WooCommerce/Classes/Authentication/Jetpack Setup/Native Jetpack Setup/JetpackSetupInterruptedView.swift

@@ -7,6 +7,7 @@ struct POSIneligibleView: View {
     let onRefresh: () async throws -> Void
     @Environment(\.dismiss) private var dismiss
     @Environment(\.sizeCategory) private var sizeCategory
+    @Environment(\.posAnalytics) private var analytics
     @State private var isLoading: Bool = false
     @State private var scrollViewHeight: CGFloat = 0
     @State private var contentHeight: CGFloat = 0
@@ -59,7 +60,7 @@ struct POSIneligibleView: View {
                             Task { @MainActor in
                                 do {
                                     isLoading = true
-                                    ServiceLocator.analytics.track(
+                                    analytics.track(
                                         event: .PointOfSaleIneligibleUI.ineligibleUIRetryTapped(reason: reason)
                                     )
                                     try await onRefresh()
@@ -95,10 +96,10 @@ struct POSIneligibleView: View {
                 contentHeight = height
             }
             .onAppear {
-                ServiceLocator.analytics.track(event: .PointOfSaleIneligibleUI.ineligibleUIShown(reason: reason))
+                analytics.track(event: .PointOfSaleIneligibleUI.ineligibleUIShown(reason: reason))
             }
             .onChange(of: reason) { _, newReason in
-                ServiceLocator.analytics.track(event: .PointOfSaleIneligibleUI.ineligibleUIShown(reason: newReason))
+                analytics.track(event: .PointOfSaleIneligibleUI.ineligibleUIShown(reason: newReason))
             }
         }
         .scrollDisabled(shouldDisableScrolling)

WooCommerce/Classes/POS/TabBar/POSIneligibleView.swift

@@ -8,6 +8,7 @@ import struct Yosemite.Order
 import enum Yosemite.Plugin
 import protocol WooFoundation.Analytics
 import class Yosemite.PluginsService
+import WooFoundationCore
 
 protocol POSReceiptSending {
     func sendReceipt(orderID: Int64, recipientEmail: String) async throws
@@ -17,9 +18,10 @@ final class POSReceiptSender: POSReceiptSending {
     init(siteID: Int64,
          orderService: POSOrderServiceProtocol,
          receiptService: POSReceiptServiceProtocol,
-         analytics: Analytics = ServiceLocator.analytics,
-         featureFlagService: FeatureFlagService = ServiceLocator.featureFlagService,
-         pluginsService: PluginsServiceProtocol = PluginsService(storageManager: ServiceLocator.storageManager)) {
+         analytics: POSAnalyticsProviding,
+         featureFlagService: POSFeatureFlagProviding,
+         pluginsService: PluginsServiceProtocol
+    ) {
         self.siteID = siteID
         self.orderService = orderService
         self.receiptService = receiptService
@@ -31,8 +33,8 @@ final class POSReceiptSender: POSReceiptSending {
     private let siteID: Int64
     private let orderService: POSOrderServiceProtocol
     private let receiptService: POSReceiptServiceProtocol
-    private let analytics: Analytics
-    private let featureFlagService: FeatureFlagService
+    private let analytics: POSAnalyticsProviding
+    private let featureFlagService: POSFeatureFlagProviding
     private let pluginsService: PluginsServiceProtocol
 
     @MainActor
@@ -59,12 +61,12 @@ final class POSReceiptSender: POSReceiptSending {
 
             try await receiptService.sendReceipt(orderID: orderID, recipientEmail: recipientEmail, isEligibleForPOSReceipt: posReceiptEligibility)
 
-            analytics.track(.receiptEmailSuccess, withProperties: ["eligible_for_pos_receipt": posReceiptEligibility])
+            analytics.track(.receiptEmailSuccess, parameters: ["eligible_for_pos_receipt": posReceiptEligibility])
         } catch {
             let properties = [
                 "eligible_for_pos_receipt": isEligibleForPOSReceipt
             ].compactMapValues( { $0 })
-            analytics.track(.receiptEmailFailed, properties: properties, error: error)
+            analytics.track(.receiptEmailFailed, parameters: properties, error: error)
             throw error
         }
     }

WooCommerce/Classes/POS/Utils/POSReceiptSender.swift

@@ -219,17 +219,21 @@ struct POSPreviewHelpers {
         collectOrderPaymentAnalyticsTracker: POSCollectOrderPaymentAnalyticsTracking = POSCollectOrderPaymentPreviewAnalytics(),
         searchHistoryService: POSSearchHistoryProviding = PointOfSalePreviewHistoryService(),
         popularItemsController: PointOfSaleItemsControllerProtocol = PointOfSalePreviewItemsController(),
-        barcodeScanService: PointOfSaleBarcodeScanServiceProtocol = PointOfSalePreviewBarcodeScanService()
+        barcodeScanService: PointOfSaleBarcodeScanServiceProtocol = PointOfSalePreviewBarcodeScanService(),
+        analytics: POSAnalyticsProviding = EmptyPOSAnalytics(),
+        featureFlags: POSFeatureFlagProviding = EmptyPOSFeatureFlags()
     ) -> PointOfSaleAggregateModel {
         return PointOfSaleAggregateModel(
-            entryPointController: POSEntryPointController(eligibilityChecker: LegacyPOSTabEligibilityChecker(siteID: 0)),
+            entryPointController: POSEntryPointController(eligibilityChecker: LegacyPOSTabEligibilityChecker(siteID: 0),
+                                                          featureFlagService: featureFlags),
             itemsController: itemsController,
             purchasableItemsSearchController: purchasableItemsSearchController,
             couponsController: couponsController,
             couponsSearchController: couponsSearchController,
             cardPresentPaymentService: cardPresentPaymentService,
             orderController: orderController,
             settingsController: settingsController,
+            analytics: analytics,
             collectOrderPaymentAnalyticsTracker: collectOrderPaymentAnalyticsTracker,
             searchHistoryService: searchHistoryService,
             popularPurchasableItemsController: popularItemsController,
@@ -435,4 +439,13 @@ final class POSCollectOrderPaymentPreviewAnalytics: POSCollectOrderPaymentAnalyt
     func trackReceiptPrintFailed(error: any Error) {}
 }
 
+final class POSPreviewServices: POSDependencyProviding {
+    var analytics: POSAnalyticsProviding = EmptyPOSAnalytics()
+    var currency: POSCurrencySettingsProviding = EmptyPOSCurrencySettings()
+    var featureFlags: POSFeatureFlagProviding = EmptyPOSFeatureFlags()
+    var connectivity: POSConnectivityProviding = EmptyPOSConnectivityProvider()
+    var externalNavigation: POSExternalNavigationProviding = EmptyPOSExternalNavigation()
+    var externalViews: POSExternalViewProviding = EmptyPOSExternalView()
+}
+
 #endif