Merge pull request #5298 from woocommerce/issue/5296-order-fields-param

Fix order request failing from spaces in `_fields` parameter value for certain sites

Author: jaclync

Networking/Networking/Remote/OrdersRemote.swift

@@ -245,16 +245,16 @@ public extension OrdersRemote {
 
     enum ParameterValues {
         // Same as singleOrderFieldValues except we exclude the line_items and shipping fields
-        static let listFieldValues: String = """
-            id,parent_id,number,status,currency,customer_id,customer_note,date_created_gmt,date_modified_gmt,date_paid_gmt,\
-            discount_total,discount_tax,shipping_total,shipping_tax,total,total_tax,payment_method,payment_method_title,\
-            billing,coupon_lines,shipping_lines,refunds,fee_lines
-            """
-        static let singleOrderFieldValues: String = """
-            id,parent_id,number,status,currency,customer_id,customer_note,date_created_gmt,date_modified_gmt,date_paid_gmt,\
-            discount_total,discount_tax,shipping_total,shipping_tax,total,total_tax,payment_method,payment_method_title,shipping,\
-            billing,coupon_lines,shipping_lines,refunds,fee_lines,line_items
-        """
+        static let listFieldValues: String = commonOrderFieldValues.joined(separator: ",")
+        static let singleOrderFieldValues: String = (commonOrderFieldValues + singleOrderExtraFieldValues).joined(separator: ",")
+        private static let commonOrderFieldValues = [
+            "id", "parent_id", "number", "status", "currency", "customer_id", "customer_note", "date_created_gmt", "date_modified_gmt", "date_paid_gmt",
+            "discount_total", "discount_tax", "shipping_total", "shipping_tax", "total", "total_tax", "payment_method", "payment_method_title",
+            "billing", "coupon_lines", "shipping_lines", "refunds", "fee_lines"
+        ]
+        private static let singleOrderExtraFieldValues = [
+            "line_items", "shipping"
+        ]
     }
 
     /// Order fields supported for update

Networking/NetworkingTests/Remote/OrdersRemoteTests.swift

@@ -36,6 +36,18 @@ final class OrdersRemoteTests: XCTestCase {
         network.removeAllSimulatedResponses()
     }
 
+    /// Verifies that the parameter `_fields` in single order and order list requests do not contain whitespace.
+    ///
+    func test_order_fields_parameter_values_do_not_contain_whitespace() throws {
+        // When
+        let orderListFieldsValue = OrdersRemote.ParameterValues.listFieldValues
+        let orderFieldsValue = OrdersRemote.ParameterValues.singleOrderFieldValues
+
+        // Then
+        XCTAssertFalse(orderListFieldsValue.contains(" "))
+        XCTAssertFalse(orderFieldsValue.contains(" "))
+    }
+
     // MARK: - Load All Orders Tests
 
     /// Verifies that loadAllOrders properly parses the `orders-load-all` sample response.

RELEASE-NOTES.txt

@@ -6,6 +6,7 @@
 - [*] Order Details: Show a button on the "Product" section of Order Details screen to allow recreating shipping labels. [https://github.com/woocommerce/woocommerce-ios/pull/5255]
 - [*] Edit Order Address - Enable `Done` button when `Use as {Shipping/Billing} Address` toggle is turned on. [https://github.com/woocommerce/woocommerce-ios/pull/5254]
 - [*] Add/Edit Product: fix an issue where the product name keyboard is English only. [https://github.com/woocommerce/woocommerce-ios/pull/5288]
+- [*] Order Details: some sites cannot parse order requests where the fields parameter has spaces, and the products section cannot load as a result. The spaces are now removed. [https://github.com/woocommerce/woocommerce-ios/pull/5298]
 
 7.8
 -----