Merge branch 'trunk' into feat/WOOMOB-673-generate-screenshots-for-pos-tab

Author: jaclync

Modules/.swiftpm/xcode/xcshareddata/xcschemes/Yosemite.xcscheme

@@ -27,8 +27,13 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      shouldAutocreateTestPlan = "YES">
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:Tests/YosemiteTests/YosemiteTests.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"

Modules/Package.resolved

@@ -89,6 +89,7 @@ let package = Package(
         .package(url: "https://github.com/markiv/SwiftUI-Shimmer", from: "1.0.0"),
         .package(url: "https://github.com/nalexn/ViewInspector", from: "0.10.0"),
         .package(url: "https://github.com/onevcat/Kingfisher", from: "7.6.2"),
+        .package(url: "https://github.com/pmusolino/Wormholy", from: "2.0.0"),
         .package(url: "https://github.com/pavolkmet/ScrollViewSectionKit", from: "1.2.0"),
         .package(url: "https://github.com/Quick/Nimble.git", from: "13.0.0"),
         .package(url: "https://github.com/simibac/ConfettiSwiftUI.git", from: "1.0.0"),
@@ -266,6 +267,21 @@ let package = Package(
             dependencies: [.target(name: "WordPressShared")],
             resources: [.process("Resources")]
         ),
+        .testTarget(
+            name: "YosemiteTests",
+            dependencies: [
+                "Codegen",
+                "Fakes",
+                "TestKit",
+                "WooFoundation",
+                "WordPressShared",
+                "Yosemite"
+            ],
+            resources: [
+                .process("Resources"),
+                .process("../NetworkingTests/Responses")
+            ]
+        )
     ]
 )
 
@@ -297,7 +313,6 @@ enum XcodeTargetNames {
     static let wooCommerceWatchApp = "Woo Watch App"
     static let wordPressAuthenticator = "WordPressAuthenticator"
     static let wordPressAuthenticatorTests = "WordPressAuthenticatorTests"
-    static let yosemiteTests = "YosemiteTests"
 }
 
 enum XcodeSupport {
@@ -313,7 +328,6 @@ enum XcodeSupport {
             XcodeTargetNames.wooCommerceWatchApp,
             XcodeTargetNames.wordPressAuthenticator,
             XcodeTargetNames.wordPressAuthenticatorTests,
-            XcodeTargetNames.yosemiteTests
         ].map { .supportingProduct(forXcodeTarget: $0) }
     }
 
@@ -374,6 +388,7 @@ enum XcodeSupport {
                     .product(name: "Shimmer", package: "SwiftUI-Shimmer"),
                     .product(name: "StripeTerminal", package: "stripe-terminal-ios"),
                     .product(name: "WordPressEditor", package: "AztecEditor-iOS"),
+                    .product(name: "Wormholy", package: "Wormholy"),
                     .product(name: "ZendeskSupportSDK", package: "support_sdk_ios"),
                 ]
             ),
@@ -439,17 +454,6 @@ enum XcodeSupport {
                     XcodeTargetNames.wordPressAuthenticator.asDependency,
                 ]
             ),
-            .xcodeTarget(
-                XcodeTargetNames.yosemiteTests,
-                dependencies: [
-                    "Codegen",
-                    "Fakes",
-                    "TestKit",
-                    "WooFoundation",
-                    "WordPressShared",
-                    "Yosemite"
-                ]
-            )
         ]
     }
 }

Modules/Package.swift

@@ -55,9 +55,10 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
         case .splitViewInProductsTab:
             return true
         case .subscriptionsInOrderCreationUI:
-            return buildConfig == .localDeveloper || buildConfig == .alpha
+            // Feature paused pdqJU4-4mn-p2#comment-2067
+            return false
         case .subscriptionsInOrderCreationCustomers:
-            // Feature paused pfoUAQ-zw-p2#comment-510.
+            // Feature paused pdqJU4-4mn-p2#comment-2067
             return false
         case .pointOfSale:
             return buildConfig == .localDeveloper || buildConfig == .alpha

Modules/Sources/Experiments/DefaultFeatureFlagService.swift

@@ -8,6 +8,9 @@ public enum WooShippingPackageType: String {
 /// Protocol for `WooShippingRemote` mainly used for mocking.
 ///
 public protocol WooShippingRemoteProtocol {
+    func checkCreationEligibility(siteID: Int64,
+                                  orderID: Int64,
+                                  completion: @escaping (Result<ShippingLabelCreationEligibilityResponse, Error>) -> Void)
     func createPackage(siteID: Int64,
                        customPackage: WooShippingCustomPackage?,
                        predefinedOption: WooShippingPredefinedSavedOption?,
@@ -82,6 +85,25 @@ public protocol WooShippingRemoteProtocol {
 ///
 public final class WooShippingRemote: Remote, WooShippingRemoteProtocol {
 
+    /// Checks eligibility for shipping label creation.
+    /// - Parameters:
+    ///     - siteID: Remote ID of the site.
+    ///     - orderID: Remote ID of the order that owns the shipping labels.
+    ///     - completion: Closure to be executed upon completion.
+    public func checkCreationEligibility(siteID: Int64,
+                                         orderID: Int64,
+                                         completion: @escaping (Result<ShippingLabelCreationEligibilityResponse, Error>) -> Void) {
+        let path = "\(Path.eligibility)/\(orderID)"
+        let request = JetpackRequest(wooApiVersion: .wooShipping,
+                                     method: .get,
+                                     siteID: siteID,
+                                     path: path,
+                                     parameters: nil,
+                                     availableAsRESTRequest: true)
+        let mapper = ShippingLabelCreationEligibilityMapper()
+        enqueue(request, mapper: mapper, completion: completion)
+    }
+
     /// Creates a new custom package.
     /// - Parameters:
     ///   - siteID: Remote ID of the site that owns the shipping label.
@@ -564,6 +586,7 @@ public final class WooShippingRemote: Remote, WooShippingRemoteProtocol {
 // MARK: Constants
 private extension WooShippingRemote {
     enum Path {
+        static let eligibility = "eligibility"
         static let packages = "packages"
         static let rates = "label/rate"
         static let accountSettings = "account/settings"

Modules/Sources/Networking/Mapper/ProductListMapper.swift

@@ -2,6 +2,12 @@ import Foundation
 import Networking
 
 public enum WooShippingAction: Action {
+    /// Checks whether an order is eligible for shipping label creation.
+    ///
+    case checkCreationEligibility(siteID: Int64,
+                                  orderID: Int64,
+                                  onCompletion: (_ isEligible: Bool) -> Void)
+
     /// Creates a custom package or activated a carrier package with provided package details.
     ///
     case createPackage(siteID: Int64,

Modules/Sources/Networking/Remote/WooShippingRemote.swift

@@ -30,6 +30,8 @@ public final class WooShippingStore: Store {
         }
 
         switch action {
+        case let .checkCreationEligibility(siteID, orderID, onCompletion):
+            checkCreationEligibility(siteID: siteID, orderID: orderID, onCompletion: onCompletion)
         case .createPackage(let siteID, let customPackage, let predefinedOption, let completion):
             createPackage(siteID: siteID, customPackage: customPackage, predefinedOption: predefinedOption, completion: completion)
         case let .deletePackage(siteID, packageID, packageType, completion):
@@ -98,6 +100,34 @@ public final class WooShippingStore: Store {
 }
 
 private extension WooShippingStore {
+    /// Checks whether an order is eligible for shipping label creation.
+    ///
+    func checkCreationEligibility(siteID: Int64,
+                                  orderID: Int64,
+                                  onCompletion: @escaping (_ isEligible: Bool) -> Void) {
+        remote.checkCreationEligibility(siteID: siteID,
+                                        orderID: orderID) { result in
+            switch result {
+            case .success(let eligibility):
+                if !eligibility.isEligible {
+                    if let reason = eligibility.reason {
+                        DDLogError("Order \(orderID) not eligible for shipping label creation: \(reason)")
+                    } else {
+                        DDLogError("Order \(orderID) not eligible for shipping label creation")
+                    }
+                }
+                onCompletion(eligibility.isEligible)
+            case .failure(let error):
+                if error as? DotcomError == .noRestRoute {
+                    DDLogError("⚠️ Endpoint for shipping label creation eligibility is unreachable for order: \(orderID). WC Shipping plugin may be missing.")
+                } else {
+                    DDLogError("⛔️ Error checking shipping label creation eligibility for order \(orderID): \(error)")
+                }
+                onCompletion(false)
+            }
+        }
+    }
+
     func createPackage(siteID: Int64,
                        customPackage: WooShippingCustomPackage? = nil,
                        predefinedOption: WooShippingPredefinedSavedOption? = nil,

Modules/Sources/Yosemite/Actions/WooShippingAction.swift

@@ -3,7 +3,7 @@ import XCTest
 @testable import NetworkingCore
 
 
-/// ProductListMapper Unit Tests
+/// ListMapper<Product> Unit Tests
 ///
 final class ProductListMapperTests: XCTestCase {
     private enum ProductListMapperTestsError: Error {
@@ -230,17 +230,17 @@ final class ProductListMapperTests: XCTestCase {
 ///
 private extension ProductListMapperTests {
 
-    /// Returns the ProductListMapper output upon receiving `filename` (Data Encoded)
+    /// Returns the ListMapper<Product> output upon receiving `filename` (Data Encoded)
     ///
     func mapProducts(from filename: String) throws -> [Product] {
         guard let response = Loader.contentsOf(filename) else {
             throw ProductListMapperTestsError.unableToLoadFile
         }
 
-        return try ProductListMapper(siteID: dummySiteID).map(response: response)
+        return try ListMapper<Product>(siteID: dummySiteID).map(response: response)
     }
 
-    /// Returns the ProductListMapper output upon receiving `products-load-all` and `products-load-all-without-data`
+    /// Returns the ListMapper<Product> output upon receiving `products-load-all` and `products-load-all-without-data`
     ///
     func mapLoadAllProductsResponse() throws -> [[Product]] {
         let products = try mapProducts(from: "products-load-all")

Modules/Sources/Yosemite/Stores/WooShippingStore.swift

@@ -74,13 +74,13 @@ private extension ProductReviewListMapperTests {
         return try! ProductReviewListMapper(siteID: dummySiteID).map(response: response)
     }
 
-    /// Returns the ProductListMapper output upon receiving `reviews-all`
+    /// Returns the ProductReviewListMapper output upon receiving `reviews-all`
     ///
     func mapLoadAllProductReviewsResponse() -> [ProductReview] {
         return mapProductReviews(from: "reviews-all")
     }
 
-    /// Returns the ProductListMapper output upon receiving `reviews-all-without-data`
+    /// Returns the ProductReviewListMapper output upon receiving `reviews-all-without-data`
     ///
     func mapLoadAllProductReviewsResponseWithoutDataEnvelope() -> [ProductReview] {
         return mapProductReviews(from: "reviews-all-without-data")