Merge branch 'trunk' into try/general-app-settings

# Conflicts:
#	Storage/Storage.xcodeproj/project.pbxproj

Author: koke

Experiments/Experiments/DefaultFeatureFlagService.swift

@@ -35,6 +35,10 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return buildConfig == .localDeveloper || buildConfig == .alpha
         case .inPersonPaymentGatewaySelection:
             return buildConfig == .localDeveloper || buildConfig == .alpha
+        case .unifiedOrderEditing:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
+        case .backgroundProductImageUpload:
+            return buildConfig == .localDeveloper || buildConfig == .alpha
         default:
             return true
         }

Experiments/Experiments/FeatureFlag.swift

@@ -69,4 +69,12 @@ public enum FeatureFlag: Int {
     /// Enable selection of payment gateway to use for In-Person Payments when there is more than one available
     ///
     case inPersonPaymentGatewaySelection
+
+    /// Enable order editing from the order detailed screen.
+    ///
+    case unifiedOrderEditing
+
+    /// Enable image upload after leaving the product form
+    ///
+    case backgroundProductImageUpload
 }

Gemfile.lock

@@ -1,9 +1,9 @@
 GIT
   remote: [email protected]:wordpress-mobile/release-toolkit
-  revision: 48bf4f8ee18079154b2054b3014bed9f114416d6
+  revision: a4d04a43125d84288e46ea38b893d001cd660a3b
   branch: trunk
   specs:
-    fastlane-plugin-wpmreleasetoolkit (4.1.0)
+    fastlane-plugin-wpmreleasetoolkit (4.2.0)
       activesupport (~> 5)
       bigdecimal (~> 1.4)
       buildkit (~> 1.5)
@@ -23,7 +23,7 @@ GEM
   specs:
     CFPropertyList (3.0.5)
       rexml
-    activesupport (5.2.7)
+    activesupport (5.2.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -258,9 +258,9 @@ GEM
       racc (~> 1.4)
     nokogiri (1.13.6-x86_64-darwin)
       racc (~> 1.4)
-    octokit (4.22.0)
-      faraday (>= 0.9)
-      sawyer (~> 0.8.0, >= 0.5.3)
+    octokit (4.23.0)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
     oj (3.13.13)
     optimist (3.0.1)
     options (2.3.2)
@@ -306,9 +306,9 @@ GEM
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    sawyer (0.8.2)
+    sawyer (0.9.1)
       addressable (>= 2.3.5)
-      faraday (> 0.8, < 2.0)
+      faraday (>= 0.17.3, < 3)
     security (0.1.3)
     signet (0.16.1)
       addressable (~> 2.8)

Networking/Networking/Remote/ProductsRemote.swift

@@ -35,6 +35,7 @@ public protocol ProductsRemoteProtocol {
                    sku: String,
                    completion: @escaping (Result<String, Error>) -> Void)
     func updateProduct(product: Product, completion: @escaping (Result<Product, Error>) -> Void)
+    func updateProductImages(siteID: Int64, productID: Int64, images: [ProductImage], completion: @escaping (Result<Product, Error>) -> Void)
 }
 
 extension ProductsRemoteProtocol {
@@ -279,6 +280,19 @@ public final class ProductsRemote: Remote, ProductsRemoteProtocol {
             completion(.failure(error))
         }
     }
+
+    public func updateProductImages(siteID: Int64, productID: Int64, images: [ProductImage], completion: @escaping (Result<Product, Error>) -> Void) {
+        do {
+            let parameters = try ([ParameterKey.images: images]).toDictionary()
+            let path = "\(Path.products)/\(productID)"
+            let request = JetpackRequest(wooApiVersion: .mark3, method: .post, siteID: siteID, path: path, parameters: parameters)
+            let mapper = ProductMapper(siteID: siteID)
+
+            enqueue(request, mapper: mapper, completion: completion)
+        } catch {
+            completion(.failure(error))
+        }
+    }
 }
 
 
@@ -320,6 +334,7 @@ public extension ProductsRemote {
         static let stockStatus: String = "stock_status"
         static let category: String   = "category"
         static let fields: String     = "_fields"
+        static let images: String = "images"
     }
 
     private enum ParameterValues {

Networking/NetworkingTests/Remote/ProductsRemoteTests.swift

@@ -503,6 +503,44 @@ final class ProductsRemoteTests: XCTestCase {
             }
         }
     }
+
+    // MARK: - Update Product Images
+
+    /// Verifies that updateProductImages properly parses the `product-update` sample response.
+    ///
+    func test_updateProductImages_properly_returns_parsed_product() throws {
+        // Given
+        let remote = ProductsRemote(network: network)
+        network.simulateResponse(requestUrlSuffix: "products/\(sampleProductID)", filename: "product-update")
+
+        // When
+        let result = waitFor { promise in
+            remote.updateProductImages(siteID: self.sampleSiteID, productID: self.sampleProductID, images: []) { result in
+                promise(result)
+            }
+        }
+
+        // Then
+        let product = try XCTUnwrap(result.get())
+        XCTAssertEqual(product.images.map { $0.imageID }, [1043, 1064])
+    }
+
+    /// Verifies that updateProductImages properly relays Networking Layer errors.
+    ///
+    func test_updateProductImages_properly_relays_networking_error() {
+        // Given
+        let remote = ProductsRemote(network: network)
+
+        // When
+        let result = waitFor { promise in
+            remote.updateProductImages(siteID: self.sampleSiteID, productID: self.sampleProductID, images: []) { result in
+                promise(result)
+            }
+        }
+
+        // Then
+        XCTAssertTrue(result.isFailure)
+    }
 }
 
 // MARK: - Private Helpers

RELEASE-NOTES.txt

@@ -4,6 +4,7 @@
 -----
 - [*] Orders: Order details now displays both the date and time for all orders. [https://github.com/woocommerce/woocommerce-ios/pull/6996]
 - [*] Simple payments have the `Card` option available for stores with configuration issues to resolve, and show onboarding to help resolve them [https://github.com/woocommerce/woocommerce-ios/pull/7002]
+- [*] Order & Product list: Now, we can pull to refresh from an empty view. [https://github.com/woocommerce/woocommerce-ios/pull/7023, https://github.com/woocommerce/woocommerce-ios/pull/7030]
 
 9.3
 -----