Remove ServiceLocator dependency in new features

Author: staskus

WooCommerce/Classes/POS/Adaptors/POSServiceLocatorAdaptor.swift

@@ -77,10 +77,10 @@ private struct POSExternalNavigationAdaptor: POSExternalNavigationProviding {
 }
 
 private struct POSExternalViewAdaptor: POSExternalViewProviding {
-    func createSupportFormView(isPresented: Binding<Bool>) -> AnyView {
+    func createSupportFormView(isPresented: Binding<Bool>, sourceTag: String) -> AnyView {
         AnyView(
             SupportForm(isPresented: isPresented,
-                        viewModel: SupportFormViewModel(sourceTag: "pos",
+                        viewModel: SupportFormViewModel(sourceTag: sourceTag,
                                                         defaultSite: ServiceLocator.stores.sessionManager.defaultSite))
         )
     }

WooCommerce/Classes/POS/Analytics/POSCollectOrderPaymentAnalytics.swift

@@ -23,8 +23,8 @@ protocol PointOfSaleSettingsControllerProtocol {
          settingsService: PointOfSaleSettingsServiceProtocol,
          cardPresentPaymentService: CardPresentPaymentFacade,
          pluginsService: PluginsServiceProtocol,
-         defaultSiteName: String? = ServiceLocator.stores.sessionManager.defaultSite?.name,
-         siteSettings: [SiteSetting] = ServiceLocator.selectedSiteSettings.siteSettings) {
+         defaultSiteName: String?,
+         siteSettings: [SiteSetting]) {
         self.storeViewModel = POSSettingsStoreViewModel(siteID: siteID,
                                                         settingsService: settingsService,
                                                         pluginsService: pluginsService,

WooCommerce/Classes/POS/Models/PointOfSaleSettingsController.swift

@@ -4,6 +4,7 @@ import WooFoundation
 
 struct PointOfSaleCollectCashView: View {
     @Environment(\.dynamicTypeSize) var dynamicTypeSize
+    @Environment(\.posAnalytics) var analytics
     @Environment(\.floatingControlAreaSize) private var floatingControlAreaSize: CGSize
     @Environment(PointOfSaleAggregateModel.self) private var posModel
     @FocusState private var isTextFieldFocused: Bool
@@ -136,7 +137,7 @@ struct PointOfSaleCollectCashView: View {
 
 private extension PointOfSaleCollectCashView {
     private func submitCashAmount() async {
-        ServiceLocator.analytics.track(.pointOfSaleCashPaymentTapped)
+        analytics.track(.pointOfSaleCashPaymentTapped)
         isLoading = true
         do {
             try await markComplete()

WooCommerce/Classes/POS/Presentation/PointOfSaleCollectCashView.swift

@@ -191,9 +191,9 @@ struct PointOfSaleDashboardView: View {
 private extension PointOfSaleDashboardView {
     var supportForm: some View {
         NavigationView {
-            externalViews.createSupportFormView(isPresented: $showSupport)
+            externalViews.createSupportFormView(isPresented: $showSupport, sourceTag: Constants.supportTag)
                 .toolbar {
-                    ToolbarItem(placement: .confirmationAction) {
+                    ToolbarItem(placement: .cancellationAction) {
                         Button(Localization.supportCancel) {
                             showSupport = false
                         }
@@ -256,6 +256,7 @@ private extension PointOfSaleDashboardView {
         static let floatingControlHorizontalOffset: CGFloat = POSPadding.medium
         static let floatingControlVerticalOffset: CGFloat = 0
         static let exitPOSSheetMaxWidth: CGFloat = 900.0
+        static let supportTag = "origin:point-of-sale"
     }
 
     enum Localization {

WooCommerce/Classes/POS/Presentation/PointOfSaleDashboardView.swift

@@ -2,6 +2,7 @@ import SwiftUI
 
 struct PointOfSaleSettingsHelpDetailView: View {
     @Environment(\.dynamicTypeSize) private var dynamicTypeSize
+    @Environment(\.posExternalViews) private var externalViews
 
     @State private var showProductRestrictions = false
     @State private var showDocumentation = false
@@ -174,9 +175,7 @@ private extension PointOfSaleSettingsHelpDetailView {
 
     var supportForm: some View {
         NavigationView {
-            SupportForm(isPresented: $showSupport,
-                        viewModel: SupportFormViewModel(sourceTag: Constants.supportTag,
-                                                        defaultSite: ServiceLocator.stores.sessionManager.defaultSite))
+            externalViews.createSupportFormView(isPresented: $showSupport, sourceTag: Constants.supportTag)
             .toolbar {
                 ToolbarItem(placement: .cancellationAction) {
                     Button(Localization.supportCancel) {

WooCommerce/Classes/POS/Presentation/Settings/PointOfSaleSettingsHelpDetailView.swift

@@ -2,6 +2,7 @@ import SwiftUI
 
 struct PointOfSaleSettingsView: View {
     @Environment(\.dismiss) private var dismiss
+    @Environment(\.posAnalytics) private var analytics
     @State private var selection: SidebarNavigation? = .store
 
     let settingsController: PointOfSaleSettingsControllerProtocol
@@ -27,7 +28,7 @@ extension PointOfSaleSettingsView {
                 title: Localization.navigationTitle,
                 backButtonConfiguration: .init(state: .enabled,
                                                action: {
-                                                   ServiceLocator.analytics.track(.pointOfSaleSettingsCloseButtonTapped)
+                                                   analytics.track(.pointOfSaleSettingsCloseButtonTapped)
                                                    dismiss()
                                                },
                                                buttonIcon: "xmark"))
@@ -39,7 +40,7 @@ extension PointOfSaleSettingsView {
                     item: .store,
                     isSelected: selection == .store,
                     onTap: {
-                        ServiceLocator.analytics.track(.pointOfSaleSettingsStoreDetailsTapped)
+                        analytics.track(.pointOfSaleSettingsStoreDetailsTapped)
                         selection = .store
                     }
                 )
@@ -48,7 +49,7 @@ extension PointOfSaleSettingsView {
                     item: .hardware,
                     isSelected: selection == .hardware,
                     onTap: {
-                        ServiceLocator.analytics.track(.pointOfSaleSettingsHardwareTapped)
+                        analytics.track(.pointOfSaleSettingsHardwareTapped)
                         selection = .hardware
                     }
                 )
@@ -59,7 +60,7 @@ extension PointOfSaleSettingsView {
                     item: .help,
                     isSelected: selection == .help,
                     onTap: {
-                        ServiceLocator.analytics.track(.pointOfSaleSettingsHelpTapped)
+                        analytics.track(.pointOfSaleSettingsHelpTapped)
                         selection = .help
                     }
                 )

WooCommerce/Classes/POS/Presentation/Settings/PointOfSaleSettingsView.swift

@@ -35,7 +35,7 @@ protocol POSExternalNavigationProviding {
 
 /// Protocol that provides external view creation capabilities for POS
 protocol POSExternalViewProviding {
-    func createSupportFormView(isPresented: Binding<Bool>) -> AnyView
+    func createSupportFormView(isPresented: Binding<Bool>, sourceTag: String) -> AnyView
 }
 
 /// Main protocol that combines all POS dependency providers

WooCommerce/Classes/POS/Protocols/POSDependencyProviding.swift

@@ -152,7 +152,9 @@ private extension POSTabCoordinator {
                     settingsController: PointOfSaleSettingsController(siteID: siteID,
                                                                       settingsService: settingsService,
                                                                       cardPresentPaymentService: cardPresentPaymentService,
-                                                                      pluginsService: pluginsService),
+                                                                      pluginsService: pluginsService,
+                                                                      defaultSiteName: storesManager.sessionManager.defaultSite?.name,
+                                                                      siteSettings: ServiceLocator.selectedSiteSettings.siteSettings),
                     collectOrderPaymentAnalyticsTracker: collectPaymentAnalyticsAdaptor,
                     searchHistoryService: POSSearchHistoryService(siteID: siteID),
                     popularPurchasableItemsController: PointOfSaleItemsController(

WooCommerce/Classes/POS/TabBar/POSTabCoordinator.swift

@@ -121,6 +121,6 @@ struct EmptyPOSAnalytics: POSAnalyticsProviding {
 }
 
 struct EmptyPOSExternalView: POSExternalViewProviding {
-    func createSupportFormView(isPresented: Binding<Bool>) -> AnyView { AnyView(EmptyView()) }
+    func createSupportFormView(isPresented: Binding<Bool>, sourceTag: String) -> AnyView { AnyView(EmptyView()) }
     init() {}
 }