Merge branch 'trunk' into woomob-1293-wcios17-store-charts-address-plotareaframe-deprecation

Author: itsmeichigo

Modules/Package.swift

@@ -179,7 +179,10 @@ let package = Package(
         ),
         .target(
             name: "WooFoundation",
-            dependencies: ["WooFoundationCore"]
+            dependencies: [
+                "WooFoundationCore",
+                .product(name: "Kingfisher", package: "Kingfisher")
+            ]
         ),
         .target(
             name: "WooFoundationCore",

Modules/Sources/Experiments/DefaultFeatureFlagService.swift

@@ -100,10 +100,10 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return true
         case .pointOfSaleHistoricalOrdersi1:
             return buildConfig == .localDeveloper || buildConfig == .alpha
-        case .applicationPasswordExperiment:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
         case .pointOfSaleLocalCatalogi1:
             return buildConfig == .localDeveloper || buildConfig == .alpha
+        case .ciabBookings:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
         default:
             return true
         }

Modules/Sources/Experiments/FeatureFlag.swift

@@ -207,12 +207,12 @@ public enum FeatureFlag: Int {
     ///
     case pointOfSaleHistoricalOrdersi1
 
-    /// Enables switching Jetpack requests to use application password
-    ///
-    case applicationPasswordExperiment
-
     /// Enables Local Catalog i1 in Point of Sale.
     /// It syncs products and variations to local storage and display them in POS for quick access.
     ///
     case pointOfSaleLocalCatalogi1
+
+    /// Enables a new Bookings tab for CIAB sites
+    ///
+    case ciabBookings
 }

Modules/Sources/Networking/Model/Product/Product.swift

@@ -457,7 +457,7 @@ public struct Product: Codable, GeneratedCopiable, Equatable, GeneratedFakeable
                                                                     // `true`
                                                                     value.lowercased() == Values.manageStockParent ? true : false
                                                                 })
-        ]) ?? false
+                                                            ]) ?? false
 
         // Even though WooCommerce Core returns Int or null values,
         // some plugins alter the field value from Int to Decimal or String.
@@ -535,15 +535,17 @@ public struct Product: Codable, GeneratedCopiable, Equatable, GeneratedFakeable
         let menuOrder = try container.decode(Int.self, forKey: .menuOrder)
 
         // Filter out metadata if the key is prefixed with an underscore (internal meta keys)
-        let customFields = (try? container.decode([MetaData].self, forKey: .metadata).filter({ !$0.key.hasPrefix("_")})) ?? []
+        // Support both array format and object keyed by index strings
+        let allMetaData = [MetaData].decodeFlexibly(from: container, forKey: .metadata)
+        let customFields = allMetaData.filter { !$0.key.hasPrefix("_") }
 
         // In some isolated cases, it appears to be some malformed meta-data that causes this line to throw hence the whole product decoding to throw.
         // Since add-ons are optional, `try?` will be used to prevent the whole decoding to stop.
         // https://github.com/woocommerce/woocommerce-ios/issues/4205
         let addOns = (try? container.decodeIfPresent(ProductAddOnEnvelope.self, forKey: .metadata)?.revolve()) ?? []
 
-        let metaDataExtractor = try? container.decodeIfPresent(ProductMetadataExtractor.self, forKey: .metadata)
-        let isSampleItem = (metaDataExtractor?.extractStringValue(forKey: MetadataKeys.headStartPost) == Values.headStartValue)
+        let metaDataExtractor = ProductMetadataExtractor(metadata: allMetaData)
+        let isSampleItem = (metaDataExtractor.extractStringValue(forKey: MetadataKeys.headStartPost) == Values.headStartValue)
 
         // Product Bundle properties
         // Uses failsafe decoding because non-bundle product types can return unexpected value types.
@@ -561,7 +563,7 @@ public struct Product: Codable, GeneratedCopiable, Equatable, GeneratedFakeable
         let compositeComponents = try container.decodeIfPresent([ProductCompositeComponent].self, forKey: .compositeComponents) ?? []
 
         // Subscription properties
-        let subscription = try? metaDataExtractor?.extractProductSubscription()
+        let subscription = try? metaDataExtractor.extractProductSubscription()
 
         // Min/Max Quantities properties
         let minAllowedQuantity = container.failsafeDecodeIfPresent(stringForKey: .minAllowedQuantity)

Modules/Sources/Networking/Model/Product/ProductMetadataExtractor.swift

@@ -1,5 +1,6 @@
 import Foundation
 import WordPressShared
+import NetworkingCore
 
 /// Helper to extract specific data from inside `Product` metadata.
 /// Sample Json:
@@ -21,25 +22,23 @@ import WordPressShared
 /// }
 /// ]
 ///
-internal struct ProductMetadataExtractor: Decodable {
+struct ProductMetadataExtractor {
 
-    private typealias DecodableDictionary = [String: AnyDecodable]
     private typealias AnyDictionary = [String: Any?]
 
     /// Internal metadata representation
     ///
-    private let metadata: [DecodableDictionary]
+    private let metadata: [MetaData]
 
-    /// Decode main metadata array as an untyped dictionary.
+    /// Initialize with already-decoded metadata array
     ///
-    init(from decoder: Decoder) throws {
-        let container = try decoder.singleValueContainer()
-        self.metadata = try container.decode([DecodableDictionary].self)
+    init(metadata: [MetaData]) {
+        self.metadata = metadata
     }
 
     /// Searches product metadata for subscription data and converts it to a `ProductSubscription` if possible.
     ///
-    internal func extractProductSubscription() throws -> ProductSubscription? {
+    func extractProductSubscription() throws -> ProductSubscription? {
         let subscriptionMetadata = filterMetadata(with: Constants.subscriptionPrefix)
 
         guard !subscriptionMetadata.isEmpty else {
@@ -54,30 +53,33 @@ internal struct ProductMetadataExtractor: Decodable {
 
     /// Extracts a `String` metadata value for the provided key.
     ///
-    internal func extractStringValue(forKey key: String) -> String? {
+    func extractStringValue(forKey key: String) -> String? {
         let metaData = filterMetadata(with: key)
         let keyValueMetadata = getKeyValueDictionary(from: metaData)
         return keyValueMetadata.valueAsString(forKey: key)
     }
 
     /// Filters product metadata using the provided prefix.
     ///
-    private func filterMetadata(with prefix: String) -> [DecodableDictionary] {
-        metadata.filter { object in
-            let objectKey = object["key"]?.value as? String ?? ""
-            return objectKey.hasPrefix(prefix)
-        }
+    private func filterMetadata(with prefix: String) -> [MetaData] {
+        metadata.filter { $0.key.hasPrefix(prefix) }
     }
 
     /// Parses provided metadata to return a dictionary with each metadata object's key and value.
     ///
-    private func getKeyValueDictionary(from metadata: [DecodableDictionary]) -> AnyDictionary {
-        metadata.reduce(AnyDictionary()) { (dict, object) in
-            var newDict = dict
-            let objectKey = object["key"]?.value as? String ?? ""
-            let objectValue = object["value"]?.value
-            newDict.updateValue(objectValue, forKey: objectKey)
-            return newDict
+    private func getKeyValueDictionary(from metadata: [MetaData]) -> AnyDictionary {
+        metadata.reduce(into: AnyDictionary()) { dict, object in
+            // For JSON values, decode them to get the actual object
+            if object.value.isJson {
+                if let data = object.value.stringValue.data(using: .utf8),
+                   let jsonObject = try? JSONSerialization.jsonObject(with: data, options: []) {
+                    dict[object.key] = jsonObject
+                } else {
+                    dict[object.key] = object.value.stringValue
+                }
+            } else {
+                dict[object.key] = object.value.stringValue
+            }
         }
     }
 

Modules/Sources/Networking/Model/Product/ProductVariation.swift

@@ -279,7 +279,7 @@ public struct ProductVariation: Codable, GeneratedCopiable, Equatable, Generated
                                                                     }
                                                                     return false
                                                                 })
-        ]) ?? false
+                                                            ]) ?? false
 
         // Even though WooCommerce Core returns Int or null values,
         // some plugins alter the field value from Int to Decimal or String.
@@ -309,7 +309,9 @@ public struct ProductVariation: Codable, GeneratedCopiable, Equatable, Generated
         let menuOrder = try container.decode(Int64.self, forKey: .menuOrder)
 
         // Subscription settings for subscription variations
-        let subscription = try? container.decodeIfPresent(ProductMetadataExtractor.self, forKey: .metadata)?.extractProductSubscription()
+        let allMetaData = [MetaData].decodeFlexibly(from: container, forKey: .metadata)
+        let metaDataExtractor = ProductMetadataExtractor(metadata: allMetaData)
+        let subscription = try? metaDataExtractor.extractProductSubscription()
 
         // Min/Max Quantities properties
         let minAllowedQuantity = container.failsafeDecodeIfPresent(stringForKey: .minAllowedQuantity)

Modules/Sources/Networking/Remote/FeatureFlagRemote.swift

@@ -30,6 +30,7 @@ public enum RemoteFeatureFlag: Decodable {
     case storeCreationCompleteNotification
     case hardcodedPlanUpgradeDetailsMilestone1AreAccurate
     case pointOfSale
+    case appPasswordsForJetpackSites
 
     init?(rawValue: String) {
         switch rawValue {
@@ -39,6 +40,8 @@ public enum RemoteFeatureFlag: Decodable {
             self = .hardcodedPlanUpgradeDetailsMilestone1AreAccurate
         case "woo_pos":
             self = .pointOfSale
+        case "woo_app_passwords_for_jetpack_sites":
+            self = .appPasswordsForJetpackSites
         default:
             return nil
         }

Modules/Sources/Networking/Remote/ProductsRemote.swift

@@ -48,6 +48,7 @@ public protocol ProductsRemoteProtocol {
                         pageNumber: Int,
                         pageSize: Int,
                         productStatus: ProductStatus?,
+                        productType: ProductType?,
                         completion: @escaping (Result<[Int64], Error>) -> Void)
     func loadNumberOfProducts(siteID: Int64) async throws -> Int64
 
@@ -593,12 +594,14 @@ public final class ProductsRemote: Remote, ProductsRemoteProtocol {
                                pageNumber: Int = Default.pageNumber,
                                pageSize: Int = Default.pageSize,
                                productStatus: ProductStatus? = nil,
+                               productType: ProductType? = nil,
                                completion: @escaping (Result<[Int64], Error>) -> Void) {
         let parameters = [
             ParameterKey.page: String(pageNumber),
             ParameterKey.perPage: String(pageSize),
             ParameterKey.fields: ParameterKey.id,
-            ParameterKey.productStatus: productStatus?.rawValue ?? ""
+            ParameterKey.productStatus: productStatus?.rawValue ?? "",
+            ParameterKey.productType: productType?.rawValue ?? ""
         ].filter({ $0.value.isEmpty == false })
 
         let path = Path.products

Modules/Sources/NetworkingCore/Model/MetaDataArray+FlexibleDecoding.swift

@@ -0,0 +1,24 @@
+import Foundation
+
+/// Extension to support flexible decoding of MetaData arrays
+/// Handles both standard array format and object format keyed by index strings
+extension Array where Element == MetaData {
+
+    /// Custom decoding from container that supports both array and dictionary formats
+    public static func decodeFlexibly<K>(from container: KeyedDecodingContainer<K>,
+                                         forKey key: KeyedDecodingContainer<K>.Key) -> [MetaData] {
+        // Try to decode as array first (standard format)
+        if let metaDataArray = try? container.decode([MetaData].self, forKey: key) {
+            return metaDataArray
+        }
+
+        // Try to decode as object keyed by index strings
+        if let metaDataDict = try? container.decode([String: MetaData].self, forKey: key) {
+            return Array(metaDataDict.values)
+        }
+
+        // Fallback to empty array
+        DDLogWarn("⚠️ Could not decode metadata as either an array or object keyed by index strings. Falling back to empty array.")
+        return []
+    }
+}

Modules/Sources/NetworkingCore/Model/Order.swift

@@ -201,7 +201,10 @@ public struct Order: Decodable, Sendable, GeneratedCopiable, GeneratedFakeable {
         // "payment_url" is only available on stores with version >= 6.4
         let paymentURL = try container.decodeIfPresent(URL.self, forKey: .paymentURL)
 
-        let allOrderMetaData = try? container.decode([MetaData].self, forKey: .metadata)
+        let allOrderMetaData: [MetaData]? = {
+            let metadata = [MetaData].decodeFlexibly(from: container, forKey: .metadata)
+            return metadata.isEmpty ? nil : metadata
+        }()
         var chargeID: String? = nil
         chargeID = allOrderMetaData?.first(where: { $0.key == "_charge_id" })?.value.stringValue