HACK Week: Add entry point to connectivity tool from Settings (#15391)

Author: itsmeichigo

RELEASE-NOTES.txt

@@ -7,6 +7,7 @@
 - [*] Product Form: Fix crash related to picking photos [https://github.com/woocommerce/woocommerce-ios/pull/15275]
 - [internal] Assign `siteID` and `productID` to image product upload statuses. [https://github.com/woocommerce/woocommerce-ios/pull/15196]
 - [*] Payments: Improved payment views' adaptability to larger accessibility font sizes [https://github.com/woocommerce/woocommerce-ios/pull/15328].
+- [*] Added an entry point to Troubleshoot Connection from the Settings screen. [https://github.com/woocommerce/woocommerce-ios/pull/15391]
 - [**] Filters in Orders and Products lists are now persisted. [https://github.com/woocommerce/woocommerce-ios/issues/14791]
 - [internal] Add site related properties to crowdsignal surveys. [https://github.com/woocommerce/woocommerce-ios/pull/15353]
 

WooCommerce/Classes/Analytics/WooAnalyticsEvent+ConnectivityTool.swift

@@ -20,6 +20,10 @@ extension WooAnalyticsEvent {
             .init(statName: .ordersListTopBannerTroubleshootTapped, properties: [:])
         }
 
+        static func settingsTroubleshootTapped() -> WooAnalyticsEvent {
+            .init(statName: .settingsTroubleshootConnectionTapped, properties: [:])
+        }
+
         static func requestResponse(test: Test, success: Bool, timeTaken: Double) -> WooAnalyticsEvent {
             .init(statName: .connectivityToolRequestResponse,
                   properties: [

WooCommerce/Classes/Analytics/WooAnalyticsStat.swift

@@ -321,6 +321,7 @@ enum WooAnalyticsStat: String {
     case settingsSelectedStoreTapped = "settings_selected_site_tapped"
     case settingsContactSupportTapped = "main_menu_contact_support_tapped"
     case settingsDomainsTapped = "settings_domains_tapped"
+    case settingsTroubleshootConnectionTapped = "settings_troubleshoot_connection_tapped"
 
     case settingsBetaFeaturesButtonTapped = "settings_beta_features_button_tapped"
     case settingsBetaFeaturesProductsToggled = "settings_beta_features_products_toggled"

WooCommerce/Classes/ViewRelated/Connectivity Tool/ConnectivityTool.swift

@@ -103,6 +103,8 @@ struct ConnectivityTool: View {
             .padding()
         }
         .background(Color(uiColor: .listBackground))
+        .navigationTitle(Localization.title)
+        .navigationBarTitleDisplayMode(.inline)
     }
 }
 
@@ -112,6 +114,11 @@ private extension ConnectivityTool {
                                                 comment: "Subtitle on the connectivity tool screen")
         static let contactSupport = NSLocalizedString("Contact Support",
                                                       comment: "Contact support button in the connectivity tool screen")
+        static let title = NSLocalizedString(
+            "connectivityTool.title",
+            value: "Troubleshoot Connection",
+            comment: "Screen title for the connectivity tool"
+        )
     }
 }
 

WooCommerce/Classes/ViewRelated/Dashboard/Settings/Settings/SettingsViewController.swift

@@ -144,6 +144,8 @@ private extension SettingsViewController {
             configureWooCommmerceDetails(cell: cell)
         case let cell as BasicTableViewCell where row == .domain:
             configureDomain(cell: cell)
+        case let cell as BasicTableViewCell where row == .connectivity:
+            configureConnectivity(cell: cell)
         case let cell as BasicTableViewCell where row == .installJetpack:
             configureInstallJetpack(cell: cell)
         case let cell as BasicTableViewCell where row == .themes:
@@ -213,6 +215,12 @@ private extension SettingsViewController {
         cell.textLabel?.text = Localization.domain
     }
 
+    func configureConnectivity(cell: BasicTableViewCell) {
+        cell.accessoryType = .disclosureIndicator
+        cell.selectionStyle = .default
+        cell.textLabel?.text = Localization.connectivity
+    }
+
     func configureInstallJetpack(cell: BasicTableViewCell) {
         cell.accessoryType = .disclosureIndicator
         cell.selectionStyle = .default
@@ -489,6 +497,12 @@ private extension SettingsViewController {
         show(controller, sender: self)
     }
 
+    func showConnectivityTool() {
+        ServiceLocator.analytics.track(event: .ConnectivityTool.settingsTroubleshootTapped())
+        let controller = ConnectivityToolViewController()
+        show(controller, sender: self)
+    }
+
     func deviceSettingsWasPressed() {
         guard let targetURL = URL(string: UIApplication.openSettingsURLString) else {
             return
@@ -668,6 +682,8 @@ extension SettingsViewController: UITableViewDelegate {
             showThemeSettings()
         case .notifications:
             showNotificationSettings()
+        case .connectivity:
+            showConnectivityTool()
         default:
             break
         }
@@ -727,6 +743,7 @@ extension SettingsViewController {
         case installJetpack
         case storeName
         case themes
+        case connectivity
 
         // Help & Feedback
         case support
@@ -772,7 +789,7 @@ extension SettingsViewController {
                 return HostingTableViewCell<PluginDetailsRowContent>.self
             case .support:
                 return BasicTableViewCell.self
-            case .domain:
+            case .domain, .connectivity:
                 return BasicTableViewCell.self
             case .installJetpack:
                 return BasicTableViewCell.self
@@ -848,6 +865,12 @@ private extension SettingsViewController {
             comment: "Navigates to domain settings screen."
         )
 
+        static let connectivity = NSLocalizedString(
+            "settingsViewController.connectivity",
+            value: "Troubleshoot Connection",
+            comment: "Navigates to connectivity test screen."
+        )
+
         static let installJetpack = NSLocalizedString(
             "Install Jetpack",
             comment: "Navigates to Install Jetpack screen."

WooCommerce/Classes/ViewRelated/Dashboard/Settings/Settings/SettingsViewModel.swift

@@ -214,6 +214,12 @@ private extension SettingsViewModel {
                 rows.append(.domain)
             }
 
+            if stores.isAuthenticated,
+               stores.isAuthenticatedWithoutWPCom == false,
+               stores.sessionManager.defaultSite?.isWordPressComStore == false {
+                rows.append(.connectivity)
+            }
+
             guard rows.isNotEmpty else {
                 return nil
             }

WooCommerce/WooCommerceTests/ViewRelated/Settings/SettingsViewModelTests.swift

@@ -355,7 +355,7 @@ final class SettingsViewModelTests: XCTestCase {
         XCTAssertFalse(viewModel.sections.contains { $0.rows.contains(SettingsViewController.Row.notifications) })
     }
 
-    func test_sections_does_not_contain_notifications_row_for_Jetpack_site_and_user_is_authenticated_with_WPCom() {
+    func test_sections_contains_notifications_row_for_Jetpack_site_and_user_is_authenticated_with_WPCom() {
         // Given
         let featureFlagService = MockFeatureFlagService(notificationSettings: true)
         let testSite = Site.fake().copy(siteID: 123, isJetpackThePluginInstalled: true, isJetpackConnected: true)
@@ -368,6 +368,42 @@ final class SettingsViewModelTests: XCTestCase {
         // Then
         XCTAssertTrue(viewModel.sections.contains { $0.rows.contains(SettingsViewController.Row.notifications) })
     }
+
+    func test_sections_does_not_contain_connectivity_row_for_wpcom_site() {
+        let testSite = Site.fake().copy(siteID: 123, isJetpackThePluginInstalled: true, isJetpackConnected: true, isWordPressComStore: true)
+        let stores = MockStoresManager(sessionManager: .makeForTesting(authenticated: true, isWPCom: true, defaultSite: testSite))
+        let viewModel = SettingsViewModel(stores: stores)
+
+        // When
+        viewModel.onViewDidLoad()
+
+        // Then
+        XCTAssertFalse(viewModel.sections.contains { $0.rows.contains(SettingsViewController.Row.connectivity) })
+    }
+
+    func test_sections_does_not_contain_connectivity_row_if_user_authenticated_without_wpcom() {
+        let testSite = Site.fake().copy(siteID: 123, isJetpackThePluginInstalled: true, isJetpackConnected: true, isWordPressComStore: false)
+        let stores = MockStoresManager(sessionManager: .makeForTesting(authenticated: true, isWPCom: false, defaultSite: testSite))
+        let viewModel = SettingsViewModel(stores: stores)
+
+        // When
+        viewModel.onViewDidLoad()
+
+        // Then
+        XCTAssertFalse(viewModel.sections.contains { $0.rows.contains(SettingsViewController.Row.connectivity) })
+    }
+
+    func test_sections_contains_connectivity_row_if_user_authenticated_with_wpcom_to_non_wpcom_site() {
+        let testSite = Site.fake().copy(siteID: 123, isJetpackThePluginInstalled: true, isJetpackConnected: true, isWordPressComStore: false)
+        let stores = MockStoresManager(sessionManager: .makeForTesting(authenticated: true, isWPCom: true, defaultSite: testSite))
+        let viewModel = SettingsViewModel(stores: stores)
+
+        // When
+        viewModel.onViewDidLoad()
+
+        // Then
+        XCTAssertTrue(viewModel.sections.contains { $0.rows.contains(SettingsViewController.Row.connectivity) })
+    }
 }
 
 private final class MockSettingsPresenter: SettingsViewPresenter {