Added support for the WooCommerce block 'all-products'.

assets/admin/settings.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-api-fetch', 'wp-components', 'wp-element', 'wp-i18n'), 'version' => '492875e2cff4b97d6fff');
+<?php return array('dependencies' => array('lodash', 'react', 'react-dom', 'wp-api-fetch', 'wp-components', 'wp-element', 'wp-i18n'), 'version' => '783bc0098ae10ff2b858');

assets/admin/wizard.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'react', 'wp-api-fetch', 'wp-components', 'wp-element', 'wp-i18n'), 'version' => '41bbfcedb3247f67e9a1');
+<?php return array('dependencies' => array('lodash', 'react', 'wp-api-fetch', 'wp-components', 'wp-element', 'wp-i18n'), 'version' => '19e8a41f77e996c8a8f6');

assets/frontend/woocommerce-blocks.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('wp-hooks'), 'version' => '8e97ab5407a1a7355719');
+<?php return array('dependencies' => array('wp-hooks', 'wp-i18n'), 'version' => '8644d72d73d05623cda7');

readme.txt

@@ -91,6 +91,7 @@ Yes! Pagespeed is one of our main focus points, and we strive to make the plugin
 = 1.X =
 
 Enhancements:
+* Added support for the WooCommerce block 'all-products'.
 * Inline scripts are now registered with the wp_add_inline_script insted of wp_head. This allows easy extension GTM Kit and implementation of a CSP (Content Security Policy).
 
 Bugfixes:

src/Installation/Upgrade.php

@@ -41,6 +41,7 @@ protected function get_upgrades(): array {
 		$available_upgrades = [
 			'1.11' => 'v111_upgrade',
 			'1.14' => 'v114_upgrade',
+			'1.15' => 'v115_upgrade',
 		];
 
 		$current_version = \get_option( 'gtmkit_version' );
@@ -108,4 +109,18 @@ protected function v114_upgrade(): void {
 
 		Options::init()->set( $values, false, false );
 	}
+
+	/**
+	 * Upgrade routine for v1.15
+	 */
+	protected function v115_upgrade(): void {
+
+		$values = [
+			'integrations' => [
+				'woocommerce_view_item_list_limit' => 0,
+			],
+		];
+
+		Options::init()->set( $values, false, false );
+	}
 }

src/Integration/WooCommerce.php

@@ -212,6 +212,19 @@ public function enqueue_scripts(): void {
 			} else {
 				$this->util->enqueue_script( 'gtmkit-woocommerce-checkout', 'integration/woocommerce-checkout.js', false, [ 'gtmkit-woocommerce' ] );
 			}
+		} elseif ( has_block( 'woocommerce/all-products' ) ) {
+
+			$this->util->enqueue_script( 'gtmkit-woocommerce-blocks', 'frontend/woocommerce-blocks.js', true );
+
+			wp_localize_script(
+				'gtmkit-woocommerce-blocks',
+				'gtmkitWooCommerceBlocksBuild',
+				[
+					'root'  => esc_url_raw( rest_url() ),
+					'nonce' => wp_create_nonce( 'wp_rest' ),
+				]
+			);
+
 		}
 	}
 
@@ -229,6 +242,7 @@ public function get_global_settings( array $global_settings ): array {
 		$global_settings['wc']['add_shipping_info']['config'] = (int) Options::init()->get( 'integrations', 'woocommerce_shipping_info' );
 		$global_settings['wc']['add_payment_info']['config']  = (int) Options::init()->get( 'integrations', 'woocommerce_payment_info' );
 		$global_settings['wc']['view_item']['config']         = (int) Options::init()->get( 'integrations', 'woocommerce_variable_product_tracking' );
+		$global_settings['wc']['view_item_list']['config']    = (int) Options::init()->get( 'integrations', 'woocommerce_view_item_list_limit' );
 		$global_settings['wc']['text']                        = [
 			'wp-block-handpicked-products'   => __( 'Handpicked Products', 'gtm-kit' ),
 			'wp-block-product-best-sellers'  => __( 'Best Sellers', 'gtm-kit' ),
@@ -1035,7 +1049,7 @@ public function extend_store() {
 	 */
 	public function extend_product_data( $product ): array {
 		return array(
-			'item' => wp_json_encode( $this->get_item_data( $product ) ),
+			'item' => $this->get_item_data( $product ),
 		);
 	}
 

src/Options.php

@@ -42,6 +42,7 @@ final class Options {
 			'woocommerce_shipping_info',
 			'woocommerce_payment_info',
 			'woocommerce_variable_product_tracking',
+			'woocommerce_view_item_list_limit',
 			'cf7_load_js',
 		],
 
@@ -114,6 +115,7 @@ public static function get_defaults(): array {
 				'woocommerce_payment_info'              => 1,
 				'cf7_load_js'                           => 1,
 				'woocommerce_variable_product_tracking' => 0,
+				'woocommerce_view_item_list_limit'      => 0,
 			],
 		];
 	}
@@ -174,6 +176,7 @@ protected function postprocess_key_defaults( string $key ) {
 				break;
 
 			case 'woocommerce_variable_product_tracking':
+			case 'woocommerce_view_item_list_limit':
 				$value = 0;
 				break;
 		}

src/js/frontend/woocommerce-blocks/index.js

@@ -1,13 +1,19 @@
 /**
  * External dependencies
  */
+import { __ } from '@wordpress/i18n';
 import { addAction } from '@wordpress/hooks';
 
 /**
  * Internal dependencies
  */
 import { actionPrefix, namespace } from './constants';
-import { shippingInfo, paymentInfo, pushEvent } from './utils';
+import {
+	getProductImpressionObject,
+	shippingInfo,
+	paymentInfo,
+	pushEvent,
+} from './utils';
 
 /**
  * Track the shipping rate being set
@@ -103,6 +109,9 @@ addAction(
 	}
 );
 
+/**
+ * remove_from_cart.
+ */
 addAction(
 	`${actionPrefix}-cart-remove-item`,
 	namespace,
@@ -121,6 +130,9 @@ addAction(
 	}
 );
 
+/**
+ * add_to_cart.
+ */
 addAction(
 	`${actionPrefix}-cart-add-item`,
 	namespace,
@@ -138,3 +150,67 @@ addAction(
 		pushEvent('add_to_cart', eventParams);
 	}
 );
+
+const lists = [];
+
+/**
+ * view_item_list.
+ */
+addAction(
+	`${actionPrefix}-product-list-render`,
+	namespace,
+	({ products, listName = __('Product List', 'gtm-kit') }) => {
+		if (products.length === 0 || window.gtmkit_data.wc.is_cart === true) {
+			return;
+		}
+
+		if (
+			window.gtmkit_settings.wc.view_item_list.config === 1 &&
+			Object.values(window.gtmkit_data.wc.blocks).includes(
+				'filter-wrapper'
+			)
+		) {
+			if (lists.includes(listName)) return;
+			lists.push(listName);
+		}
+
+		const eventParams = {
+			ecommerce: {
+				items: products.map((product, index) => ({
+					...getProductImpressionObject(product, listName),
+					index,
+				})),
+			},
+		};
+
+		pushEvent('view_item_list', eventParams);
+	}
+);
+
+/**
+ * select_item.
+ */
+addAction(
+	`${actionPrefix}-product-view-link`,
+	namespace,
+	({ product, listName = '' }) => {
+		const eventParams = {
+			ecommerce: {
+				item_list_name: listName,
+				items: [getProductImpressionObject(product, listName)],
+			},
+		};
+
+		pushEvent('select_item', eventParams);
+	}
+);
+
+/**
+ * Product Search
+ */
+addAction(`${actionPrefix}-product-search`, namespace, ({ searchTerm }) => {
+	const eventParams = {
+		search_term: searchTerm,
+	};
+	pushEvent('search', eventParams);
+});

src/js/frontend/woocommerce-blocks/utils.js

@@ -8,7 +8,7 @@ export const pushEvent = (eventName, eventParams) => {
 	window[window.gtmkit_settings.datalayer_name].push({ ecommerce: null });
 	window[window.gtmkit_settings.datalayer_name].push({
 		event: eventName,
-		eventParams,
+		...eventParams,
 	});
 
 	if (window.gtmkit_settings.console_log === 'on')
@@ -55,3 +55,19 @@ export const paymentInfo = () => {
 
 	window.gtmkit_data.wc.add_payment_info.fired = true;
 };
+
+/**
+ * Formats data into the impressionFieldObject shape.
+ *
+ * @param {Object} product
+ * @param {string} listName
+ */
+export const getProductImpressionObject = (product, listName = '') => {
+	const item = product.extensions.gtmkit.item;
+
+	if (listName) {
+		item.item_list_name = listName;
+	}
+
+	return item;
+};