Merge branch 'trunk' into woomob-754-ui-updates

Author: itsmeichigo

Modules/Sources/Experiments/DefaultFeatureFlagService.swift

@@ -100,7 +100,7 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
         case .pointOfSaleOrdersi1:
             return true
         case .pointOfSaleOrdersi2:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
+            return true
         case .pointOfSaleBarcodeScanningi2:
             return buildConfig == .localDeveloper || buildConfig == .alpha
         default:

Modules/Sources/Networking/Remote/ProductsRemote.swift

@@ -259,7 +259,7 @@ public final class ProductsRemote: Remote, ProductsRemoteProtocol {
                                                    productsPerPage: String = POSConstants.productsPerPage,
                                                    productTypes: [ProductType],
                                                    orderBy: OrderKey = .name,
-                                                   order: Order = .ascending) -> [String: String] {
+                                                   order: Order = .ascending) -> [String: any Hashable] {
         [
             ParameterKey.page: String(pageNumber),
             ParameterKey.perPage: productsPerPage,
@@ -276,7 +276,7 @@ public final class ProductsRemote: Remote, ProductsRemoteProtocol {
 
     private func makePagedPointOfSaleProductsRequest(for siteID: Int64,
                                                      pageNumber: Int,
-                                                     parameters: [String: String]) async throws -> PagedItems<POSProduct> {
+                                                     parameters: [String: any Hashable]) async throws -> PagedItems<POSProduct> {
         let request = JetpackRequest(wooApiVersion: .mark3,
                                      method: .get,
                                      siteID: siteID,
@@ -318,8 +318,13 @@ public final class ProductsRemote: Remote, ProductsRemoteProtocol {
             productTypes: productTypes)
 
         parameters.updateValue(query, forKey: ParameterKey.search)
+
+        // Takes precedence over `search` from WC 9.9 to 10.1
         parameters.updateValue(query, forKey: ParameterKey.searchNameOrSKU)
 
+        // Takes precedence over `search_name_or_sku` from WC 10.1+ and is combined with `search` value
+        parameters.updateValue([SearchField.name, SearchField.sku, SearchField.globalUniqueID], forKey: ParameterKey.searchFields)
+
         return try await makePagedPointOfSaleProductsRequest(
             for: siteID,
             pageNumber: pageNumber,
@@ -749,6 +754,7 @@ public extension ProductsRemote {
         static let include: String    = "include"
         static let search: String     = "search"
         static let searchNameOrSKU: String = "search_name_or_sku"
+        static let searchFields: String = "search_fields"
         static let orderBy: String    = "orderby"
         static let order: String      = "order"
         static let sku: String        = "sku"
@@ -776,6 +782,12 @@ public extension ProductsRemote {
         static let productSegment = "product"
         static let itemsSold = "items_sold"
     }
+
+    private enum SearchField {
+        static let name = "name"
+        static let sku = "sku"
+        static let globalUniqueID = "global_unique_id"
+    }
 }
 
 private extension ProductsRemote {

Modules/Sources/Storage/Protocols/StorageManagerType.swift

@@ -57,4 +57,17 @@ public extension StorageManagerType {
     func reset() {
         reset(onCompletion: nil)
     }
+
+    /// Async/await version of `performAndSave`.
+    ///
+    /// - Parameters:
+    ///   - operation: A closure which uses the given `StorageType` to make data changes in background.
+    ///   - queue: A queue on which to execute the completion closure.
+    func performAndSaveAsync(_ operation: @escaping (StorageType) -> Void, on queue: DispatchQueue = .main) async {
+        await withCheckedContinuation { continuation in
+            performAndSave(operation, completion: {
+                continuation.resume()
+            }, on: queue)
+        }
+    }
 }

Modules/Sources/Yosemite/PointOfSale/Eligibility/POSSystemStatusService.swift

@@ -1,5 +1,6 @@
 import Foundation
 import Networking
+import Storage
 
 public protocol POSSystemStatusServiceProtocol {
     /// Loads WooCommerce plugin and POS feature switch value remotely for eligibility checks.
@@ -23,27 +24,36 @@ public struct POSPluginAndFeatureInfo {
 /// Service for fetching POS-related system status information.
 public final class POSSystemStatusService: POSSystemStatusServiceProtocol {
     private let remote: SystemStatusRemote
+    private let storageManager: StorageManagerType
 
-    public init(credentials: Credentials?) {
+    public init(credentials: Credentials?, storageManager: StorageManagerType) {
         let network = AlamofireNetwork(credentials: credentials)
-        remote = SystemStatusRemote(network: network)
+        self.remote = SystemStatusRemote(network: network)
+        self.storageManager = storageManager
     }
 
     /// Test-friendly initializer that accepts a network implementation.
-    init(network: Network) {
-        remote = SystemStatusRemote(network: network)
+    init(network: Network, storageManager: StorageManagerType) {
+        self.remote = SystemStatusRemote(network: network)
+        self.storageManager = storageManager
     }
 
+    @MainActor
     public func loadWooCommercePluginAndPOSFeatureSwitch(siteID: Int64) async throws -> POSPluginAndFeatureInfo {
         let mapper = SingleItemMapper<POSPluginEligibilitySystemStatus>(siteID: siteID)
         let systemStatus: POSPluginEligibilitySystemStatus = try await remote.loadSystemStatus(
             for: siteID,
-            fields: [.activePlugins, .settings],
+            fields: [.activePlugins, .inactivePlugins, .settings],
             mapper: mapper
         )
 
-        // Finds WooCommerce plugin from active plugins response.
-        guard let wcPlugin = systemStatus.activePlugins.first(where: { $0.plugin == Constants.wcPluginPath }) else {
+        // Upserts all plugins in storage.
+        await storageManager.performAndSaveAsync({ [weak self] storage in
+            self?.upsertSystemPlugins(siteID: siteID, systemStatus: systemStatus, in: storage)
+        })
+
+        // Loads WooCommerce plugin from storage.
+        guard let wcPlugin = storageManager.viewStorage.loadSystemPlugin(siteID: siteID, path: Constants.wcPluginPath)?.toReadOnly() else {
             return POSPluginAndFeatureInfo(wcPlugin: nil, featureValue: nil)
         }
 
@@ -53,6 +63,42 @@ public final class POSSystemStatusService: POSSystemStatusServiceProtocol {
     }
 }
 
+private extension POSSystemStatusService {
+    /// Updates or inserts system plugins in storage.
+    func upsertSystemPlugins(siteID: Int64, systemStatus: POSPluginEligibilitySystemStatus, in storage: StorageType) {
+        // Active and inactive plugins share identical structure, but are stored in separate parts of the remote response
+        // (and without an active attribute in the response). So we apply the correct value for active (or not)
+        let readonlySystemPlugins: [SystemPlugin] = {
+            let activePlugins = systemStatus.activePlugins.map {
+                $0.copy(active: true)
+            }
+
+            let inactivePlugins = systemStatus.inactivePlugins.map {
+                $0.copy(active: false)
+            }
+
+            return activePlugins + inactivePlugins
+        }()
+
+        let storedPlugins = storage.loadSystemPlugins(siteID: siteID, matching: readonlySystemPlugins.map { $0.name })
+        readonlySystemPlugins.forEach { readonlySystemPlugin in
+            // Loads or creates new StorageSystemPlugin matching the readonly one.
+            let storageSystemPlugin: StorageSystemPlugin = {
+                if let systemPlugin = storedPlugins.first(where: { $0.name == readonlySystemPlugin.name }) {
+                    return systemPlugin
+                }
+                return storage.insertNewObject(ofType: StorageSystemPlugin.self)
+            }()
+
+            storageSystemPlugin.update(with: readonlySystemPlugin)
+        }
+
+        // Removes stale system plugins.
+        let currentSystemPlugins = readonlySystemPlugins.map(\.name)
+        storage.deleteStaleSystemPlugins(siteID: siteID, currentSystemPlugins: currentSystemPlugins)
+    }
+}
+
 private extension POSSystemStatusService {
     enum Constants {
         static let wcPluginPath = "woocommerce/woocommerce.php"
@@ -63,10 +109,12 @@ private extension POSSystemStatusService {
 
 private struct POSPluginEligibilitySystemStatus: Decodable {
     let activePlugins: [SystemPlugin]
+    let inactivePlugins: [SystemPlugin]
     let settings: POSEligibilitySystemStatusSettings
 
     enum CodingKeys: String, CodingKey {
         case activePlugins = "active_plugins"
+        case inactivePlugins = "inactive_plugins"
         case settings
     }
 }

Modules/Tests/NetworkingTests/Remote/POSProductsNetworkingTests.swift

@@ -64,9 +64,9 @@ struct POSProductsNetworkingTests {
         _ = try? await remote.loadProductsForPointOfSale(for: sampleSiteID, productTypes: [.simple, .variable], pageNumber: 1)
 
         // Then
-        let queryParametersDictionary = try #require(network.queryParametersDictionary as? [String: String])
-        #expect(queryParametersDictionary["downloadable"] == "false")
-        #expect(queryParametersDictionary["include_types"] == "simple,variable")
+        let queryParametersDictionary = try #require(network.queryParametersDictionary as? [String: any Hashable])
+        #expect(queryParametersDictionary["downloadable"] as? String == "false")
+        #expect(queryParametersDictionary["include_types"] as? String == "simple,variable")
     }
 
     @Test(arguments: 1...4) func loadProductsForPointOfSale_returns_hasMorePages_based_on_header_with_case_insensitive_name(pageNumber: Int) async throws {
@@ -126,13 +126,13 @@ struct POSProductsNetworkingTests {
             pageNumber: 1)
 
         // Then
-        let queryParametersDictionary = try #require(network.queryParametersDictionary as? [String: String])
-        #expect(queryParametersDictionary["downloadable"] == "false")
-        #expect(queryParametersDictionary["include_types"] == "simple,variable")
-        #expect(queryParametersDictionary["search"] == "search terms")
+        let queryParametersDictionary = try #require(network.queryParametersDictionary as? [String: any Hashable])
+        #expect(queryParametersDictionary["downloadable"] as? String == "false")
+        #expect(queryParametersDictionary["include_types"] as? String == "simple,variable")
+        #expect(queryParametersDictionary["search"] as? String == "search terms")
     }
 
-    @Test func searchProductsForPointOfSale_sets_both_search_parameters() async throws {
+    @Test func searchProductsForPointOfSale_sets_all_search_parameters() async throws {
         // Given
         let remote = ProductsRemote(network: network)
         let searchQuery = "search terms"
@@ -145,9 +145,10 @@ struct POSProductsNetworkingTests {
             pageNumber: 1)
 
         // Then
-        let queryParametersDictionary = try #require(network.queryParametersDictionary as? [String: String])
-        #expect(queryParametersDictionary["search"] == searchQuery)
-        #expect(queryParametersDictionary["search_name_or_sku"] == searchQuery)
+        let queryParametersDictionary = try #require(network.queryParametersDictionary as? [String: any Hashable])
+        #expect(queryParametersDictionary["search"] as? String == searchQuery)
+        #expect(queryParametersDictionary["search_name_or_sku"] as? String == searchQuery)
+        #expect(queryParametersDictionary["search_fields"] as? [String] == ["name", "sku", "global_unique_id"])
     }
 
     @Test func searchProductsForPointOfSale_returns_parsed_products() async throws {
@@ -205,8 +206,8 @@ struct POSProductsNetworkingTests {
         _ = try? await remote.loadProductsForPointOfSale(for: sampleSiteID)
 
         // Then
-        let queryParametersDictionary = try #require(network.queryParametersDictionary as? [String: String])
-        #expect(queryParametersDictionary["_fields"] == POSProduct.requestFields.joined(separator: ","))
+        let queryParametersDictionary = try #require(network.queryParametersDictionary as? [String: any Hashable])
+        #expect(queryParametersDictionary["_fields"] as? String == POSProduct.requestFields.joined(separator: ","))
     }
 
     @Test func searchProductsForPointOfSale_requests_only_required_fields() async throws {
@@ -217,8 +218,8 @@ struct POSProductsNetworkingTests {
         _ = try? await remote.searchProductsForPointOfSale(for: sampleSiteID, query: "search")
 
         // Then
-        let queryParametersDictionary = try #require(network.queryParametersDictionary as? [String: String])
-        #expect(queryParametersDictionary["_fields"] == POSProduct.requestFields.joined(separator: ","))
+        let queryParametersDictionary = try #require(network.queryParametersDictionary as? [String: any Hashable])
+        #expect(queryParametersDictionary["_fields"] as? String == POSProduct.requestFields.joined(separator: ","))
     }
 
     @Test func loadProductsForPointOfSale_returns_total_items_from_header() async throws {

Modules/Tests/NetworkingTests/Responses/system-status-wc-plugin-and-pos-feature-disabled.json

@@ -1,5 +1,6 @@
 {
   "data": {
+    "inactive_plugins": [],
     "active_plugins":[
       {
         "plugin": "woocommerce/woocommerce.php",

Modules/Tests/NetworkingTests/Responses/system-status-wc-plugin-and-pos-feature-enabled.json

@@ -1,5 +1,6 @@
 {
   "data": {
+    "inactive_plugins": [],
     "active_plugins":[
       {
         "plugin": "woocommerce/woocommerce.php",

Modules/Tests/NetworkingTests/Responses/system-status-wc-plugin-missing.json

@@ -1,5 +1,6 @@
 {
   "data": {
+    "inactive_plugins": [],
     "active_plugins":[
     ],
     "settings": {

Modules/Tests/YosemiteTests/PointOfSale/POSSystemStatusServiceTests.swift

@@ -2,22 +2,24 @@ import Foundation
 import Testing
 import TestKit
 @testable import Networking
+@testable import Storage
 @testable import Yosemite
 
 @MainActor
 struct POSSystemStatusServiceTests {
     private let network = MockNetwork()
+    private let storageManager = MockStorageManager()
     private let sampleSiteID: Int64 = 134
     private let sut: POSSystemStatusService
 
     init() async throws {
         network.removeAllSimulatedResponses()
-        sut = POSSystemStatusService(network: network)
+        sut = POSSystemStatusService(network: network, storageManager: storageManager)
     }
 
     // MARK: - loadWooCommercePluginAndPOSFeatureSwitch Tests
 
-    @Test func loadWooCommercePluginAndPOSFeatureSwitch_returns_plugin_and_nil_feature_when_settings_response_does_not_include_enabled_featuers() async throws {
+    @Test func loadWooCommercePluginAndPOSFeatureSwitch_returns_plugin_and_nil_feature_when_settings_response_does_not_include_enabled_features() async throws {
         // Given
         network.simulateResponse(requestUrlSuffix: "system_status", filename: "systemStatus")
 
@@ -37,6 +39,10 @@ struct POSSystemStatusServiceTests {
         // Given
         network.simulateResponse(requestUrlSuffix: "system_status", filename: "system-status-wc-plugin-and-pos-feature-enabled")
 
+        // Inserts WooCommerce plugin into storage with an older version and inactive.
+        let storageWCPlugin = createWCPlugin(version: "9.5.2", active: false)
+        storageManager.insertSampleSystemPlugin(readOnlySystemPlugin: storageWCPlugin)
+
         // When
         let result = try await sut.loadWooCommercePluginAndPOSFeatureSwitch(siteID: sampleSiteID)
 
@@ -53,6 +59,10 @@ struct POSSystemStatusServiceTests {
         // Given
         network.simulateResponse(requestUrlSuffix: "system_status", filename: "system-status-wc-plugin-and-pos-feature-disabled")
 
+        // Inserts WooCommerce plugin into storage with an older version and inactive.
+        let storageWCPlugin = createWCPlugin(version: "9.5.2", active: false)
+        storageManager.insertSampleSystemPlugin(readOnlySystemPlugin: storageWCPlugin)
+
         // When
         let result = try await sut.loadWooCommercePluginAndPOSFeatureSwitch(siteID: sampleSiteID)
 
@@ -69,6 +79,10 @@ struct POSSystemStatusServiceTests {
         // Given
         network.simulateResponse(requestUrlSuffix: "system_status", filename: "system-status-wc-plugin-missing")
 
+        // Inserts WooCommerce plugin eligible for POS into storage.
+        let storageWCPlugin = createWCPlugin(version: "9.9.0", active: true)
+        storageManager.insertSampleSystemPlugin(readOnlySystemPlugin: storageWCPlugin)
+
         // When
         let result = try await sut.loadWooCommercePluginAndPOSFeatureSwitch(siteID: sampleSiteID)
 
@@ -87,3 +101,15 @@ struct POSSystemStatusServiceTests {
         }
     }
 }
+
+private extension POSSystemStatusServiceTests {
+    func createWCPlugin(version: String = "5.8.0", active: Bool = true) -> Yosemite.SystemPlugin {
+        .fake().copy(
+            siteID: sampleSiteID,
+            plugin: "woocommerce/woocommerce.php",
+            version: version,
+            versionLatest: version,
+            active: active
+        )
+    }
+}

RELEASE-NOTES.txt

@@ -4,7 +4,7 @@
 22.9
 -----
 - [**] Order Details: Update Shipping Labels section for stores with Woo Shipping extension [https://github.com/woocommerce/woocommerce-ios/pull/15889]
-
+- [*] Order List: New orders made through Point of Sale are now filterable via the Order List filters menu [https://github.com/woocommerce/woocommerce-ios/pull/15910]
 
 22.8
 -----