From b67e5a5f101e3c2e5a2511be0d3405d886213b0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albert=20Juh=C3=A9=20Lluveras?= <aljullu@gmail.com>
Date: Wed, 25 Mar 2020 12:19:24 +0100
Subject: [PATCH] Fix 'Show Sorting Dropdown' attribute ignored in All Products
 block (https://github.com/woocommerce/woocommerce-blocks/pull/2019)

* Fix 'Show Sorting Dropdown' attribute ignored in All Products block

* Update snapshot
---
 .../assets/js/blocks/products/all-products/index.js   | 11 +++++++----
 .../backend/__snapshots__/all-products.test.js.snap   |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/plugins/woocommerce-blocks/assets/js/blocks/products/all-products/index.js b/plugins/woocommerce-blocks/assets/js/blocks/products/all-products/index.js
index 557d2ff6c4f..c027e28c7ba 100644
--- a/plugins/woocommerce-blocks/assets/js/blocks/products/all-products/index.js
+++ b/plugins/woocommerce-blocks/assets/js/blocks/products/all-products/index.js
@@ -52,11 +52,14 @@ const blockSettings = {
 	 * @param {Object} attributes Attributes to save.
 	 */
 	save( { attributes } ) {
+		const dataAttributes = {};
+		Object.keys( attributes )
+			.sort()
+			.forEach( ( key ) => {
+				dataAttributes[ key ] = attributes[ key ];
+			} );
 		const data = {
-			'data-attributes': JSON.stringify(
-				attributes,
-				Object.keys( attributes ).sort()
-			),
+			'data-attributes': JSON.stringify( dataAttributes ),
 		};
 		return (
 			<div
diff --git a/plugins/woocommerce-blocks/tests/e2e-tests/specs/backend/__snapshots__/all-products.test.js.snap b/plugins/woocommerce-blocks/tests/e2e-tests/specs/backend/__snapshots__/all-products.test.js.snap
index a84205f5cfb..05c620b5898 100644
--- a/plugins/woocommerce-blocks/tests/e2e-tests/specs/backend/__snapshots__/all-products.test.js.snap
+++ b/plugins/woocommerce-blocks/tests/e2e-tests/specs/backend/__snapshots__/all-products.test.js.snap
@@ -2,6 +2,6 @@
 
 exports[`All Products can be created 1`] = `
 "<!-- wp:woocommerce/all-products {\\"columns\\":3,\\"rows\\":3,\\"alignButtons\\":false,\\"contentVisibility\\":{\\"orderBy\\":true},\\"orderby\\":\\"date\\",\\"layoutConfig\\":[[\\"woocommerce/product-image\\"],[\\"woocommerce/product-title\\"],[\\"woocommerce/product-price\\"],[\\"woocommerce/product-rating\\"],[\\"woocommerce/product-button\\"]]} -->
-<div class=\\"wp-block-woocommerce-all-products wc-block-all-products\\" data-attributes=\\"{&quot;alignButtons&quot;:false,&quot;columns&quot;:3,&quot;contentVisibility&quot;:{},&quot;isPreview&quot;:false,&quot;layoutConfig&quot;:[[&quot;woocommerce/product-image&quot;],[&quot;woocommerce/product-title&quot;],[&quot;woocommerce/product-price&quot;],[&quot;woocommerce/product-rating&quot;],[&quot;woocommerce/product-button&quot;]],&quot;orderby&quot;:&quot;date&quot;,&quot;rows&quot;:3}\\"></div>
+<div class=\\"wp-block-woocommerce-all-products wc-block-all-products\\" data-attributes=\\"{&quot;alignButtons&quot;:false,&quot;columns&quot;:3,&quot;contentVisibility&quot;:{&quot;orderBy&quot;:true},&quot;isPreview&quot;:false,&quot;layoutConfig&quot;:[[&quot;woocommerce/product-image&quot;],[&quot;woocommerce/product-title&quot;],[&quot;woocommerce/product-price&quot;],[&quot;woocommerce/product-rating&quot;],[&quot;woocommerce/product-button&quot;]],&quot;orderby&quot;:&quot;date&quot;,&quot;rows&quot;:3}\\"></div>
 <!-- /wp:woocommerce/all-products -->"
 `;
\ No newline at end of file