Merge pull request #12135 from Automattic/fix/data-layer-post

Data Layer: Fix POSTing data in data layer
Automattic · Mar 16, 2017 · 856f143 · 856f143
2 parents 1ddbd43 + a6412fb
commit 856f143
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/client/state/data-layer/wpcom-http/actions.js b/client/state/data-layer/wpcom-http/actions.js
@@ -21,7 +21,7 @@ import { WPCOM_HTTP_REQUEST } from 'state/action-types';
  */
 export const http = ( {
 	apiVersion = 'v1',
-	body = {},
+	body,
 	method,
 	path,
 	query = {},
@@ -35,7 +35,7 @@ export const http = ( {
 	body,
 	method,
 	path,
-	query: { ...query, apiVersion },
+	query: method === 'GET' && { ...query, apiVersion },
 	formData,
 	onSuccess: onSuccess || action,
 	onFailure: onFailure || action,

diff --git a/client/state/data-layer/wpcom-http/index.js b/client/state/data-layer/wpcom-http/index.js
@@ -25,11 +25,11 @@ const fetcherMap = method => get( {
 
 export const successMeta = data => ( { meta: { dataLayer: { data } } } );
 export const failureMeta = error => ( { meta: { dataLayer: { error } } } );
-export const progressMeta = ( { size: total, loaded } ) => ( { meta: { dataLayer: { progress: { total, loaded } } } } );
+export const progressMeta = ( { total, loaded } ) => ( { meta: { dataLayer: { progress: { total, loaded } } } } );
 
 const queueRequest = ( { dispatch }, action, next ) => {
 	const {
-		body = {},
+		body,
 		formData,
 		method: rawMethod,
 		onSuccess,