Replace previews with default empty values

Author: staskus

Modules/Sources/PointOfSale/Environment/POSEnvironmentKeys.swift

@@ -7,61 +7,27 @@ import struct Yosemite.Site
 
 /// Environment key for POS analytics service in SwiftUI
 public struct POSAnalyticsKey: EnvironmentKey {
-    public static let defaultValue: POSAnalyticsProviding = DefaultPOSAnalytics()
-}
-
-/// Default implementation that does nothing (for previews/testing)
-private struct DefaultPOSAnalytics: POSAnalyticsProviding {
-    func track(event: WooAnalyticsEvent) {
-        // No-op implementation for previews/testing
-    }
-
-    func track(_ stat: WooAnalyticsStat, parameters: [String: WooAnalyticsEventPropertyType] = [:]) {
-        // No-op implementation for previews/testing
-    }
-
-    func track(_ stat: WooAnalyticsStat) {
-        // No-op implementation for previews/testing
-    }
-
-    func track(_ stat: WooFoundationCore.WooAnalyticsStat, parameters: [String: WooAnalyticsEventPropertyType], error: any Error) {
-        // No-op implementation for previews/testing
-    }
+    public static let defaultValue: POSAnalyticsProviding = EmptyPOSAnalytics()
 }
 
 /// Environment key for POS currency settings
 public struct POSCurrencySettingsKey: EnvironmentKey {
-    public static let defaultValue: CurrencySettings = CurrencySettings()
+    public static let defaultValue: POSCurrencySettingsProviding = EmptyPOSCurrencySettings()
 }
 
 /// Environment key for POS feature flags service
 public struct POSFeatureFlagsKey: EnvironmentKey {
-    public static let defaultValue: POSFeatureFlagProviding = DefaultPOSFeatureFlags()
+    public static let defaultValue: POSFeatureFlagProviding = EmptyPOSFeatureFlags()
 }
 
 /// Environment key for POS session manager
 public struct POSSessionManagerKey: EnvironmentKey {
-    public static let defaultValue: POSSessionManagerProviding = DefaultPOSSessionManager()
+    public static let defaultValue: POSSessionManagerProviding = EmptyPOSSessionManager()
 }
 
 /// Environment key for POS connectivity
 public struct POSConnectivityKey: EnvironmentKey {
-    public static let defaultValue: ConnectivityObserver = DefaultPOSConnectivity()
-}
-
-private struct DefaultPOSSessionManager: POSSessionManagerProviding {
-    var defaultSite: Site? = nil
-}
-
-private struct DefaultPOSFeatureFlags: POSFeatureFlagProviding {
-    func isFeatureFlagEnabled(_ flag: FeatureFlag) -> Bool { false }
-}
-
-private class DefaultPOSConnectivity: ConnectivityObserver {
-    @Published private(set) var currentStatus: ConnectivityStatus = .reachable(type: .ethernetOrWiFi)
-    var statusPublisher: AnyPublisher<ConnectivityStatus, Never> { $currentStatus.eraseToAnyPublisher() }
-    func startObserving() {}
-    func stopObserving() {}
+    public static let defaultValue: POSConnectivityProviding = EmptyPOSConnectivityProvider()
 }
 
 public extension EnvironmentValues {
@@ -70,7 +36,7 @@ public extension EnvironmentValues {
         set { self[POSAnalyticsKey.self] = newValue }
     }
 
-    var posCurrencySettings: CurrencySettings {
+    var posCurrencyProvider: POSCurrencySettingsProviding {
         get { self[POSCurrencySettingsKey.self] }
         set { self[POSCurrencySettingsKey.self] = newValue }
     }
@@ -85,8 +51,46 @@ public extension EnvironmentValues {
         set { self[POSSessionManagerKey.self] = newValue }
     }
 
-    var posConnectivity: ConnectivityObserver {
+    var posConnectivityProvider: POSConnectivityProviding {
         get { self[POSConnectivityKey.self] }
         set { self[POSConnectivityKey.self] = newValue }
     }
 }
+
+// MARK: - Empty Default Values
+
+public struct EmptyPOSSessionManager: POSSessionManagerProviding {
+    public var defaultSite: Site? = nil
+    public init() {}
+}
+
+public struct EmptyPOSFeatureFlags: POSFeatureFlagProviding {
+    public func isFeatureFlagEnabled(_ flag: FeatureFlag) -> Bool { false }
+    public init() {}
+}
+
+public struct EmptyPOSCurrencySettings: POSCurrencySettingsProviding {
+    public var currencySettings = CurrencySettings()
+    public init() {}
+}
+
+public class EmptyPOSConnectivityProvider: POSConnectivityProviding {
+    public var connectivityObserver: WooFoundation.ConnectivityObserver = EmptyPOSConnectivity()
+    public init() {}
+}
+
+public class EmptyPOSConnectivity: ConnectivityObserver {
+    @Published private(set) public var currentStatus: ConnectivityStatus = .reachable(type: .ethernetOrWiFi)
+    public var statusPublisher: AnyPublisher<ConnectivityStatus, Never> { $currentStatus.eraseToAnyPublisher() }
+    public func startObserving() {}
+    public func stopObserving() {}
+    public init() {}
+}
+
+public struct EmptyPOSAnalytics: POSAnalyticsProviding {
+    public func track(event: WooAnalyticsEvent) {}
+    public func track(_ stat: WooAnalyticsStat, parameters: [String: WooAnalyticsEventPropertyType] = [:]) {}
+    public func track(_ stat: WooAnalyticsStat) {}
+    public func track(_ stat: WooFoundationCore.WooAnalyticsStat, parameters: [String: WooAnalyticsEventPropertyType], error: any Error) {}
+    public init() {}
+}

WooCommerce/Classes/POS/Utils/PreviewHelpers.swift

@@ -26,6 +26,7 @@ import Combine
 import struct Yosemite.PaymentIntent
 import protocol Yosemite.Action
 import struct Yosemite.Site
+import PointOfSale
 
 // MARK: - PreviewProvider helpers
 //
@@ -224,7 +225,7 @@ struct POSPreviewHelpers {
     ) -> PointOfSaleAggregateModel {
         return PointOfSaleAggregateModel(
             entryPointController: POSEntryPointController(eligibilityChecker: LegacyPOSTabEligibilityChecker(siteID: 0),
-                                                          featureFlagService: POSPreviewFeatureFlags()),
+                                                          featureFlagService: EmptyPOSFeatureFlags()),
             itemsController: itemsController,
             purchasableItemsSearchController: purchasableItemsSearchController,
             couponsController: couponsController,
@@ -293,26 +294,10 @@ final class POSPreviewAnalytics: POSAnalyticsProviding {
 }
 
 final class POSPreviewServices: POSDependencyProviding {
-    var analytics: POSAnalyticsProviding = POSPreviewAnalytics()
-    var currency: CurrencySettings = CurrencySettings()
-    var featureFlags: POSFeatureFlagProviding = POSPreviewFeatureFlags()
-    var session: POSSessionManagerProviding = POSPreviewSessionManager()
-    var connectivity: ConnectivityObserver = POSPreviewConnectivity()
+    var analytics: POSAnalyticsProviding = EmptyPOSAnalytics()
+    var currency: POSCurrencySettingsProviding = EmptyPOSCurrencySettings()
+    var featureFlags: POSFeatureFlagProviding = EmptyPOSFeatureFlags()
+    var session: POSSessionManagerProviding = EmptyPOSSessionManager()
+    var connectivity: POSConnectivityProviding = EmptyPOSConnectivityProvider()
 }
-
-private struct POSPreviewSessionManager: POSSessionManagerProviding {
-    var defaultSite: Site? = nil
-}
-
-private struct POSPreviewFeatureFlags: POSFeatureFlagProviding {
-    func isFeatureFlagEnabled(_ flag: FeatureFlag) -> Bool { false }
-}
-
-private class POSPreviewConnectivity: ConnectivityObserver {
-    @Published private(set) var currentStatus: ConnectivityStatus = .reachable(type: .ethernetOrWiFi)
-    var statusPublisher: AnyPublisher<ConnectivityStatus, Never> { $currentStatus.eraseToAnyPublisher() }
-    func startObserving() {}
-    func stopObserving() {}
-}
-
 #endif