Merge branch 'trunk' into woomob-876-woo-posbarcodes-copy-updates-for-the-setup-flow

Author: staskus

CHANGELOG.md

@@ -1,6 +1,9 @@
 <!--
 Contains editorialized release notes. Raw release notes should go into `RELEASE-NOTES.txt`.
 -->
+## 22.9
+This update enhances Shipping Labels with improved accessibility, smarter address validation, and faster performance. We’ve also made the dedicated Point of Sale tab more widely available for quicker access, and POS orders are now filterable in your order list for better organization. Plus, we've optimized assets to reduce the app’s size.
+
 ## 22.8
 Our latest update brings smoother split shipment screens and improved accessibility for Shipping Labels, plus easier label size selection, and POS badges within the order list. In Point of Sale, enjoy a new barcode scan flow, and a safer cart clear button.
 

Modules/Sources/Yosemite/Model/Enums/CardPresentPaymentsPlugin.swift

@@ -13,12 +13,12 @@ public enum CardPresentPaymentsPlugin: Equatable, CaseIterable {
         }
     }
 
-    public var fileNameWithoutExtension: String {
+    public var plugin: Plugin {
         switch self {
         case .wcPay:
-            return "woocommerce-payments"
+            return .wooPayments
         case .stripe:
-            return "woocommerce-gateway-stripe"
+            return .stripe
         }
     }
 

Modules/Sources/Yosemite/Tools/Plugin.swift

@@ -1,23 +1,64 @@
 import Foundation
 
 public enum Plugin: Equatable, CaseIterable {
+    case blaze
+    case jetpack
+    case googleListingsAndAds
     case stripe
     case wooCommerce
+    case wooCompositeProducts
+    case wooGiftCards
     case wooPayments
+    case wooPayPal
+    case wooProductBundles
     case wooSubscriptions
     case wooShipmentTracking
     case wooSquare
 
+    /// Creates a Plugin from a plugin file name in the plugin path.
+    /// Returns nil if the file name doesn't match any known Plugin case.
+    ///
+    /// - Parameter systemPlugin: The SystemPlugin to convert.
+    public init?(fileNameWithoutExtension: String) {
+        guard let plugin = Plugin.allCases.first(where: { $0.fileNameWithoutExtension == fileNameWithoutExtension }) else {
+            return nil
+        }
+        self = plugin
+    }
+
+    /// Creates a Plugin from a SystemPlugin by matching the plugin file name in the plugin path.
+    /// Returns nil if the SystemPlugin doesn't match any known Plugin case.
+    ///
+    /// - Parameter systemPlugin: The SystemPlugin to convert.
+    public init?(systemPlugin: SystemPlugin) {
+        let pluginFileNameWithoutExtension = systemPlugin.fileNameWithoutExtension
+        self.init(fileNameWithoutExtension: pluginFileNameWithoutExtension)
+    }
+
     /// File name without extension in the plugin path.
     /// Full plugin path is like `woocommerce/woocommerce.php`.
     var fileNameWithoutExtension: String {
         switch self {
+        case .blaze:
+            return "blaze-ads"
+        case .jetpack:
+            return "jetpack"
+        case .googleListingsAndAds:
+            return "google-listings-and-ads"
         case .stripe:
             return "woocommerce-gateway-stripe"
         case .wooCommerce:
             return "woocommerce"
+        case .wooCompositeProducts:
+            return "woocommerce-composite-products"
+        case .wooGiftCards:
+            return "woocommerce-gift-cards"
         case .wooPayments:
             return "woocommerce-payments"
+        case .wooPayPal:
+            return "woocommerce-paypal-payments"
+        case .wooProductBundles:
+            return "woocommerce-product-bundles"
         case .wooSubscriptions:
             return "woocommerce-subscriptions"
         case .wooShipmentTracking:
@@ -27,3 +68,9 @@ public enum Plugin: Equatable, CaseIterable {
         }
     }
 }
+
+private extension SystemPlugin {
+    var fileNameWithoutExtension: String {
+        ((plugin as NSString).lastPathComponent as NSString).deletingPathExtension
+    }
+}

Modules/Tests/YosemiteTests/Tools/PluginTests.swift

@@ -0,0 +1,109 @@
+import Foundation
+import Testing
+import Networking
+
+@testable import Yosemite
+
+struct PluginTests {
+    @Test(arguments: [
+        ("blaze-ads/blaze-ads.php", Plugin.blaze),
+        ("jetpack/jetpack.php", Plugin.jetpack),
+        ("google-listings-and-ads/google-listings-and-ads.php", Plugin.googleListingsAndAds),
+        ("woocommerce-gateway-stripe/woocommerce-gateway-stripe.php", Plugin.stripe),
+        ("woocommerce/woocommerce.php", Plugin.wooCommerce),
+        ("woocommerce-composite-products/woocommerce-composite-products.php", Plugin.wooCompositeProducts),
+        ("woocommerce-gift-cards/woocommerce-gift-cards.php", Plugin.wooGiftCards),
+        ("woocommerce-payments/woocommerce-payments.php", Plugin.wooPayments),
+        ("woocommerce-paypal-payments/woocommerce-paypal-payments.php", Plugin.wooPayPal),
+        ("woocommerce-product-bundles/woocommerce-product-bundles.php", Plugin.wooProductBundles),
+        ("woocommerce-subscriptions/woocommerce-subscriptions.php", Plugin.wooSubscriptions),
+        ("woocommerce-shipment-tracking/woocommerce-shipment-tracking.php", Plugin.wooShipmentTracking),
+        ("woocommerce-square/woocommerce-square.php", Plugin.wooSquare),
+        // Altered paths
+        ("_woocommerce-subscriptions/woocommerce-subscriptions.php", .wooSubscriptions),
+        ("woocommerce-subscriptions.php", .wooSubscriptions),
+        ("test/woocommerce-dev.php", nil)
+    ])
+    func init_with_systemPlugin_returns_correct_plugin(pluginPath: String, expectedPlugin: Plugin?) {
+        // Given
+        let systemPlugin = SystemPlugin.fake().copy(
+            siteID: 134,
+            plugin: pluginPath,
+            active: true
+        )
+
+        // When
+        let plugin = Plugin(systemPlugin: systemPlugin)
+
+        // Then
+        #expect(plugin == expectedPlugin)
+    }
+
+    @Test func init_with_systemPlugin_returns_nil_for_unknown_plugin() {
+        // Given
+        let systemPlugin = SystemPlugin.fake().copy(
+            siteID: 134,
+            plugin: "unknown-plugin/unknown-plugin.php"
+        )
+
+        // When
+        let plugin = Plugin(systemPlugin: systemPlugin)
+
+        // Then
+        #expect(plugin == nil)
+    }
+
+    @Test func init_with_systemPlugin_returns_nil_for_empty_plugin_path() {
+        // Given
+        let systemPlugin = SystemPlugin.fake().copy(
+            plugin: ""
+        )
+
+        // When
+        let plugin = Plugin(systemPlugin: systemPlugin)
+
+        // Then
+        #expect(plugin == nil)
+    }
+
+    // MARK: - `init(fileNameWithoutExtension:)`
+
+    @Test(arguments: [
+        ("blaze-ads", Plugin.blaze),
+        ("jetpack", Plugin.jetpack),
+        ("google-listings-and-ads", Plugin.googleListingsAndAds),
+        ("woocommerce-gateway-stripe", Plugin.stripe),
+        ("woocommerce", Plugin.wooCommerce),
+        ("woocommerce-composite-products", Plugin.wooCompositeProducts),
+        ("woocommerce-gift-cards", Plugin.wooGiftCards),
+        ("woocommerce-payments", Plugin.wooPayments),
+        ("woocommerce-paypal-payments", Plugin.wooPayPal),
+        ("woocommerce-product-bundles", Plugin.wooProductBundles),
+        ("woocommerce-subscriptions", Plugin.wooSubscriptions),
+        ("woocommerce-shipment-tracking", Plugin.wooShipmentTracking),
+        ("woocommerce-square", Plugin.wooSquare)
+    ])
+    func init_with_fileNameWithoutExtension_returns_correct_plugin(fileName: String, expectedPlugin: Plugin) {
+        // When
+        let plugin = Plugin(fileNameWithoutExtension: fileName)
+
+        // Then
+        #expect(plugin == expectedPlugin)
+    }
+
+    @Test func init_with_fileNameWithoutExtension_returns_nil_for_unknown_filename() {
+        // When
+        let plugin = Plugin(fileNameWithoutExtension: "wooooocommerce")
+
+        // Then
+        #expect(plugin == nil)
+    }
+
+    @Test func init_with_fileNameWithoutExtension_returns_nil_for_empty_filename() {
+        // When
+        let plugin = Plugin(fileNameWithoutExtension: "")
+
+        // Then
+        #expect(plugin == nil)
+    }
+}

RELEASE-NOTES.txt

@@ -1,6 +1,10 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 *** Use [*****] to indicate smoke tests of all critical flows should be run on the final IPA before release (e.g. major library or OS update).
 
+23.0
+-----
+
+
 22.9
 -----
 - [*] Shipping Labels: Empty dimensions are no longer presented for product cards [https://github.com/woocommerce/woocommerce-ios/pull/15912]
@@ -15,6 +19,7 @@
 - [*] Shipping Labels: Show UPS TOS modal in full length for better accessibility. [https://github.com/woocommerce/woocommerce-ios/pull/15926]
 - [*] Shipping Labels: Optimize data loading on purchase form [https://github.com/woocommerce/woocommerce-ios/pull/15919]
 - [*] Shipping Labels: Cache settings and origin addresses to improve loading experience for purchase form [https://github.com/woocommerce/woocommerce-ios/pull/15935]
+- [*] Shipping Labels: Fixed UI glitch on the bottom sheet of the purchase form. [https://github.com/woocommerce/woocommerce-ios/pull/15940]
 - [internal] Optimized assets for app size reduction [https://github.com/woocommerce/woocommerce-ios/pull/15881]
 - [*] Shipping Labels: Allow dots in HS tariff number input field for customs settings [https://github.com/woocommerce/woocommerce-ios/pull/15933]
 
@@ -29,6 +34,8 @@
 - [*] Watch app: Fixed connection issue upon fresh install [https://github.com/woocommerce/woocommerce-ios/pull/15867]
 - [Internal] Shipping Labels: Optimize requests for syncing countries [https://github.com/woocommerce/woocommerce-ios/pull/15875]
 - [*] Shipping Labels: Display label size from account settings as default [https://github.com/woocommerce/woocommerce-ios/pull/15873]
+- [*] Shipping Labels: Ensured customs form validation enforces non-zero product weight to fix shipping rate loading failure. [https://github.com/woocommerce/woocommerce-ios/pull/15927]
+- [*] Shipping Labels: ITN number is now required for shipments with total value more than 2500. [https://github.com/woocommerce/woocommerce-ios/pull/15937]
 
 22.7
 -----

WooCommerce/Classes/Blaze/BlazeEligibilityChecker.swift

@@ -71,7 +71,7 @@ private extension BlazeEligibilityChecker {
             stores.dispatch(SystemStatusAction.synchronizeSystemInformation(siteID: siteID) { result in
                 switch result {
                 case .success(let info):
-                    let plugin = info.systemPlugins.first(where: { $0.plugin == Constants.pluginSlug })
+                    let plugin = info.systemPlugins.first(where: { Plugin(systemPlugin: $0) == .blaze && $0.active })
                     continuation.resume(returning: plugin)
                 case .failure:
                     continuation.resume(returning: nil)
@@ -80,9 +80,3 @@ private extension BlazeEligibilityChecker {
         }
     }
 }
-
-private extension BlazeEligibilityChecker {
-    enum Constants {
-        static let pluginSlug = "blaze-ads/blaze-ads.php"
-    }
-}

WooCommerce/Classes/Extensions/SitePlugin+Woo.swift

@@ -3,14 +3,6 @@ import Yosemite
 /// Defines the names of the Site Plugins officially supported by the app.
 ///
 extension SitePlugin {
-    enum SupportedPlugin {
-        public static let WCSubscriptions = ["WooCommerce Subscriptions", "Woo Subscriptions"]
-        public static let WCProductBundles = ["WooCommerce Product Bundles", "Woo Product Bundles"]
-        public static let WCCompositeProducts = "WooCommerce Composite Products"
-        public static let WCGiftCards = ["WooCommerce Gift Cards", "Woo Gift Cards"]
-        public static let GoogleForWooCommerce = ["Google Listings and Ads", "Google for WooCommerce"]
-    }
-
     enum SupportedPluginPath {
         public static let LegacyWCShip = "woocommerce-services/woocommerce-services.php"
         public static let WooShipping = "woocommerce-shipping/woocommerce-shipping.php"

WooCommerce/Classes/GoogleAds/GoogleAdsEligibilityChecker.swift

@@ -49,7 +49,7 @@ private extension DefaultGoogleAdsEligibilityChecker {
             stores.dispatch(SystemStatusAction.synchronizeSystemInformation(siteID: siteID) { result in
                 switch result {
                 case .success(let info):
-                    let plugin = info.systemPlugins.first(where: { $0.plugin == Constants.pluginSlug })
+                    let plugin = info.systemPlugins.first(where: { Plugin(systemPlugin: $0) == .googleListingsAndAds && $0.active })
                     continuation.resume(returning: plugin)
                 case .failure:
                     continuation.resume(returning: nil)
@@ -76,8 +76,6 @@ private extension DefaultGoogleAdsEligibilityChecker {
     }
 
     enum Constants {
-        static let pluginSlug = "google-listings-and-ads/google-listings-and-ads.php"
-
         /// Version 2.7.7 is required for an optimized experience of the plugin on the mobile web.
         /// Ref: https://github.com/woocommerce/google-listings-and-ads/releases/tag/2.7.7.
         /// We can remove this limit once we support native experience.

WooCommerce/Classes/Tools/CardPresentPluginsDataProvider.swift

@@ -95,12 +95,6 @@ struct CardPresentPluginsDataProvider: CardPresentPluginsDataProviderProtocol {
         }
         return storageManager.viewStorage
             .loadSystemPlugins(siteID: siteID).map { $0.toReadOnly() }
-            .first(where: { $0.fileNameWithoutExtension == configuration.fileNameWithoutExtension })
-    }
-}
-
-extension Yosemite.SystemPlugin {
-    var fileNameWithoutExtension: String {
-        ((plugin as NSString).lastPathComponent as NSString).deletingPathExtension
+            .first(where: { Plugin(systemPlugin: $0) == configuration.plugin })
     }
 }

WooCommerce/Classes/ViewRelated/Customers/CustomersListViewModel.swift

@@ -329,7 +329,6 @@ private extension CustomersListViewModel {
     }
 
     enum Constants {
-        static let wcPluginName = "WooCommerce"
         static let wcPluginMinimumVersion = "8.0.0-beta.1"
     }
 }