Merge pull request #1484 from wordpress-mobile/wc/orderlist-search

Woo: Only include the `search` query param when fetching orders if it's being used
wordpress-mobile · Jan 23, 2020 · 370e6d8 · 370e6d8
2 parents f18e8d7 + b62b027
commit 370e6d8
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/...rc/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderRestClient.kt b/...rc/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderRestClient.kt
@@ -126,12 +126,14 @@ class OrderRestClient(
         val url = WOOCOMMERCE.orders.pathV3
         val responseType = object : TypeToken<List<OrderSummaryApiResponse>>() {}.type
         val networkPageSize = listDescriptor.config.networkPageSize
-        val params = mapOf(
+        val params = mutableMapOf(
                 "per_page" to networkPageSize.toString(),
                 "offset" to offset.toString(),
                 "status" to statusFilter,
-                "_fields" to "id,date_created_gmt,date_modified_gmt",
-                "search" to listDescriptor.searchQuery.orEmpty())
+                "_fields" to "id,date_created_gmt,date_modified_gmt")
+        listDescriptor.searchQuery.takeUnless { it.isNullOrEmpty() }?.let {
+            params.put("search", it)
+        }
         val request = JetpackTunnelGsonRequest.buildGetRequest(url, listDescriptor.site.siteId, params, responseType,
                 { response: List<OrderSummaryApiResponse>? ->
                     val orderSummaries = response?.map {