From 4b82793b33b8312b1466ea70d5e8ad9d008e31be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albert=20Juh=C3=A9=20Lluveras?= <contact@albertjuhe.com>
Date: Thu, 2 Mar 2023 11:16:32 +0100
Subject: [PATCH] Fix Mini Cart missing translations
 (https://github.com/woocommerce/woocommerce-blocks/pull/8591)

---
 .../empty-mini-cart-contents-block/index.tsx  |  6 +++--
 .../filled-mini-cart-contents-block/index.tsx |  6 +++--
 .../mini-cart-footer-block/index.tsx          |  6 +++--
 .../mini-cart-items-block/index.tsx           |  6 +++--
 .../mini-cart-products-table-block/index.tsx  |  6 +++--
 .../mini-cart-shopping-button-block/index.tsx |  6 +++--
 .../mini-cart-title-block/index.tsx           |  6 +++--
 .../BlockTypes/EmptyMiniCartContentsBlock.php | 14 +++++++++++
 .../FilledMiniCartContentsBlock.php           | 14 +++++++++++
 .../src/BlockTypes/MiniCart.php               |  5 ++--
 .../src/BlockTypes/MiniCartContents.php       | 25 ++++++++++++++++---
 .../src/BlockTypes/MiniCartFooterBlock.php    | 14 +++++++++++
 .../src/BlockTypes/MiniCartItemsBlock.php     | 14 +++++++++++
 .../BlockTypes/MiniCartProductsTableBlock.php | 14 +++++++++++
 .../MiniCartShoppingButtonBlock.php           | 14 +++++++++++
 .../src/BlockTypes/MiniCartTitleBlock.php     | 14 +++++++++++
 .../src/BlockTypesController.php              |  9 +++++--
 17 files changed, 156 insertions(+), 23 deletions(-)
 create mode 100644 plugins/woocommerce-blocks/src/BlockTypes/EmptyMiniCartContentsBlock.php
 create mode 100644 plugins/woocommerce-blocks/src/BlockTypes/FilledMiniCartContentsBlock.php
 create mode 100644 plugins/woocommerce-blocks/src/BlockTypes/MiniCartFooterBlock.php
 create mode 100644 plugins/woocommerce-blocks/src/BlockTypes/MiniCartItemsBlock.php
 create mode 100644 plugins/woocommerce-blocks/src/BlockTypes/MiniCartProductsTableBlock.php
 create mode 100644 plugins/woocommerce-blocks/src/BlockTypes/MiniCartShoppingButtonBlock.php
 create mode 100644 plugins/woocommerce-blocks/src/BlockTypes/MiniCartTitleBlock.php

diff --git a/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/empty-mini-cart-contents-block/index.tsx b/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/empty-mini-cart-contents-block/index.tsx
index 020128b2c14..a4f1b100a03 100644
--- a/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/empty-mini-cart-contents-block/index.tsx
+++ b/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/empty-mini-cart-contents-block/index.tsx
@@ -9,9 +9,11 @@ import { registerBlockType } from '@wordpress/blocks';
  * Internal dependencies
  */
 import { Edit, Save } from './edit';
-import metadata from './block.json';
 
-registerBlockType( metadata, {
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore -- TypeScript expects some required properties which we already
+// registered in PHP.
+registerBlockType( 'woocommerce/empty-mini-cart-contents-block', {
 	icon: {
 		src: (
 			<Icon
diff --git a/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/filled-mini-cart-contents-block/index.tsx b/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/filled-mini-cart-contents-block/index.tsx
index 143bde56f56..db5310d7410 100644
--- a/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/filled-mini-cart-contents-block/index.tsx
+++ b/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/filled-mini-cart-contents-block/index.tsx
@@ -9,9 +9,11 @@ import { registerBlockType } from '@wordpress/blocks';
  * Internal dependencies
  */
 import { Edit, Save } from './edit';
-import metadata from './block.json';
 
-registerBlockType( metadata, {
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore -- TypeScript expects some required properties which we already
+// registered in PHP.
+registerBlockType( 'woocommerce/filled-mini-cart-contents-block', {
 	icon: {
 		src: (
 			<Icon
diff --git a/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-footer-block/index.tsx b/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-footer-block/index.tsx
index 27a6339cdfa..81f6901cbbf 100644
--- a/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-footer-block/index.tsx
+++ b/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-footer-block/index.tsx
@@ -8,10 +8,12 @@ import { registerBlockType } from '@wordpress/blocks';
  * Internal dependencies
  */
 import { Edit, Save } from './edit';
-import metadata from './block.json';
 import attributes from './attributes';
 
-registerBlockType( metadata, {
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore -- TypeScript expects some required properties which we already
+// registered in PHP.
+registerBlockType( 'woocommerce/mini-cart-footer-block', {
 	icon: {
 		src: (
 			<Icon
diff --git a/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-items-block/index.tsx b/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-items-block/index.tsx
index dedf75f4f56..1e3a240e040 100644
--- a/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-items-block/index.tsx
+++ b/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-items-block/index.tsx
@@ -8,9 +8,11 @@ import { registerBlockType } from '@wordpress/blocks';
  * Internal dependencies
  */
 import { Edit, Save } from './edit';
-import metadata from './block.json';
 
-registerBlockType( metadata, {
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore -- TypeScript expects some required properties which we already
+// registered in PHP.
+registerBlockType( 'woocommerce/mini-cart-items-block', {
 	icon: {
 		src: (
 			<Icon
diff --git a/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-products-table-block/index.tsx b/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-products-table-block/index.tsx
index 5dab7035d7c..6821bee7b82 100644
--- a/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-products-table-block/index.tsx
+++ b/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-products-table-block/index.tsx
@@ -8,9 +8,11 @@ import { registerBlockType } from '@wordpress/blocks';
  * Internal dependencies
  */
 import { Edit, Save } from './edit';
-import metadata from './block.json';
 
-registerBlockType( metadata, {
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore -- TypeScript expects some required properties which we already
+// registered in PHP.
+registerBlockType( 'woocommerce/mini-cart-products-table-block', {
 	icon: (
 		<Icon icon={ list } className="wc-block-editor-components-block-icon" />
 	),
diff --git a/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-shopping-button-block/index.tsx b/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-shopping-button-block/index.tsx
index 929ac027764..8d7a9720f70 100644
--- a/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-shopping-button-block/index.tsx
+++ b/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-shopping-button-block/index.tsx
@@ -8,10 +8,12 @@ import { registerBlockType } from '@wordpress/blocks';
  * Internal dependencies
  */
 import { Edit, Save } from './edit';
-import metadata from './block.json';
 import attributes from './attributes';
 
-registerBlockType( metadata, {
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore -- TypeScript expects some required properties which we already
+// registered in PHP.
+registerBlockType( 'woocommerce/mini-cart-shopping-button-block', {
 	icon: {
 		src: (
 			<Icon
diff --git a/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-title-block/index.tsx b/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-title-block/index.tsx
index 9a7b7721ac2..bcbb61fec1e 100644
--- a/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-title-block/index.tsx
+++ b/plugins/woocommerce-blocks/assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/mini-cart-title-block/index.tsx
@@ -8,9 +8,11 @@ import { registerBlockType } from '@wordpress/blocks';
  * Internal dependencies
  */
 import { Edit, Save } from './edit';
-import metadata from './block.json';
 
-registerBlockType( metadata, {
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore -- TypeScript expects some required properties which we already
+// registered in PHP.
+registerBlockType( 'woocommerce/mini-cart-title-block', {
 	icon: {
 		src: (
 			<Icon
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/EmptyMiniCartContentsBlock.php b/plugins/woocommerce-blocks/src/BlockTypes/EmptyMiniCartContentsBlock.php
new file mode 100644
index 00000000000..9ef03aa2140
--- /dev/null
+++ b/plugins/woocommerce-blocks/src/BlockTypes/EmptyMiniCartContentsBlock.php
@@ -0,0 +1,14 @@
+<?php
+namespace Automattic\WooCommerce\Blocks\BlockTypes;
+
+/**
+ * EmptyMiniCartContentsBlock class.
+ */
+class EmptyMiniCartContentsBlock extends AbstractInnerBlock {
+	/**
+	 * Block name.
+	 *
+	 * @var string
+	 */
+	protected $block_name = 'empty-mini-cart-contents-block';
+}
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/FilledMiniCartContentsBlock.php b/plugins/woocommerce-blocks/src/BlockTypes/FilledMiniCartContentsBlock.php
new file mode 100644
index 00000000000..f46475b66ca
--- /dev/null
+++ b/plugins/woocommerce-blocks/src/BlockTypes/FilledMiniCartContentsBlock.php
@@ -0,0 +1,14 @@
+<?php
+namespace Automattic\WooCommerce\Blocks\BlockTypes;
+
+/**
+ * FilledMiniCartContentsBlock class.
+ */
+class FilledMiniCartContentsBlock extends AbstractInnerBlock {
+	/**
+	 * Block name.
+	 *
+	 * @var string
+	 */
+	protected $block_name = 'filled-mini-cart-contents-block';
+}
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/MiniCart.php b/plugins/woocommerce-blocks/src/BlockTypes/MiniCart.php
index 971b7670ff8..6d5e054cdc5 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/MiniCart.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/MiniCart.php
@@ -363,7 +363,6 @@ class MiniCart extends AbstractBlock {
 		$cart_controller     = $this->get_cart_controller();
 		$cart                = $cart_controller->get_cart_instance();
 		$cart_contents_count = $cart->get_cart_contents_count();
-		$cart_contents       = $cart->get_cart();
 		$cart_contents_total = $cart->get_subtotal();
 
 		if ( $cart->display_prices_including_tax() ) {
@@ -378,7 +377,7 @@ class MiniCart extends AbstractBlock {
 		$wrapper_styles = $classes_styles['styles'];
 
 		$aria_label = sprintf(
-		/* translators: %1$d is the number of products in the cart. %2$s is the cart total */
+			/* translators: %1$d is the number of products in the cart. %2$s is the cart total */
 			_n(
 				'%1$d item in cart, total price of %2$s',
 				'%1$d items in cart, total price of %2$s',
@@ -401,7 +400,7 @@ class MiniCart extends AbstractBlock {
 
 		if ( is_cart() || is_checkout() ) {
 			// It is not necessary to load the Mini Cart Block on Cart and Checkout page.
-				return '<div class="' . $wrapper_classes . '" style="visibility:hidden" aria-hidden="true">
+			return '<div class="' . $wrapper_classes . '" style="visibility:hidden" aria-hidden="true">
 				<button class="wc-block-mini-cart__button" aria-label="' . esc_attr( $aria_label ) . '" disabled>' . $button_html . '</button>
 			</div>';
 		}
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/MiniCartContents.php b/plugins/woocommerce-blocks/src/BlockTypes/MiniCartContents.php
index 5ef6b82c140..9c9d2c0ff3a 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/MiniCartContents.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/MiniCartContents.php
@@ -1,10 +1,6 @@
 <?php
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
-use Automattic\WooCommerce\Blocks\Package;
-use Automattic\WooCommerce\Blocks\Assets;
-use Automattic\WooCommerce\Blocks\Assets\AssetDataRegistry;
-use Automattic\WooCommerce\StoreApi\Utilities\CartController;
 use Automattic\WooCommerce\Blocks\Utils\StyleAttributesUtils;
 
 /**
@@ -140,4 +136,25 @@ class MiniCartContents extends AbstractBlock {
 			$parsed_style
 		);
 	}
+
+	/**
+	 * Get list of Mini Cart block & its inner-block types.
+	 *
+	 * @return array;
+	 */
+	public static function get_mini_cart_block_types() {
+		$block_types = [];
+
+		$block_types[] = 'MiniCartContents';
+		$block_types[] = 'EmptyMiniCartContentsBlock';
+		$block_types[] = 'FilledMiniCartContentsBlock';
+		$block_types[] = 'MiniCartFooterBlock';
+		$block_types[] = 'MiniCartItemsBlock';
+		$block_types[] = 'MiniCartProductsTableBlock';
+		$block_types[] = 'MiniCartShoppingButtonBlock';
+		$block_types[] = 'MiniCartTitleBlock';
+
+		return $block_types;
+	}
+
 }
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/MiniCartFooterBlock.php b/plugins/woocommerce-blocks/src/BlockTypes/MiniCartFooterBlock.php
new file mode 100644
index 00000000000..f13fe774e95
--- /dev/null
+++ b/plugins/woocommerce-blocks/src/BlockTypes/MiniCartFooterBlock.php
@@ -0,0 +1,14 @@
+<?php
+namespace Automattic\WooCommerce\Blocks\BlockTypes;
+
+/**
+ * MiniCartFooterBlock class.
+ */
+class MiniCartFooterBlock extends AbstractInnerBlock {
+	/**
+	 * Block name.
+	 *
+	 * @var string
+	 */
+	protected $block_name = 'mini-cart-footer-block';
+}
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/MiniCartItemsBlock.php b/plugins/woocommerce-blocks/src/BlockTypes/MiniCartItemsBlock.php
new file mode 100644
index 00000000000..9e8ee59efd5
--- /dev/null
+++ b/plugins/woocommerce-blocks/src/BlockTypes/MiniCartItemsBlock.php
@@ -0,0 +1,14 @@
+<?php
+namespace Automattic\WooCommerce\Blocks\BlockTypes;
+
+/**
+ * MiniCartItemsBlock class.
+ */
+class MiniCartItemsBlock extends AbstractInnerBlock {
+	/**
+	 * Block name.
+	 *
+	 * @var string
+	 */
+	protected $block_name = 'mini-cart-items-block';
+}
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/MiniCartProductsTableBlock.php b/plugins/woocommerce-blocks/src/BlockTypes/MiniCartProductsTableBlock.php
new file mode 100644
index 00000000000..d6f8740e385
--- /dev/null
+++ b/plugins/woocommerce-blocks/src/BlockTypes/MiniCartProductsTableBlock.php
@@ -0,0 +1,14 @@
+<?php
+namespace Automattic\WooCommerce\Blocks\BlockTypes;
+
+/**
+ * MiniCartProductsTableBlock class.
+ */
+class MiniCartProductsTableBlock extends AbstractInnerBlock {
+	/**
+	 * Block name.
+	 *
+	 * @var string
+	 */
+	protected $block_name = 'mini-cart-products-table-block';
+}
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/MiniCartShoppingButtonBlock.php b/plugins/woocommerce-blocks/src/BlockTypes/MiniCartShoppingButtonBlock.php
new file mode 100644
index 00000000000..6916e855a1e
--- /dev/null
+++ b/plugins/woocommerce-blocks/src/BlockTypes/MiniCartShoppingButtonBlock.php
@@ -0,0 +1,14 @@
+<?php
+namespace Automattic\WooCommerce\Blocks\BlockTypes;
+
+/**
+ * MiniCartShoppingButtonBlock class.
+ */
+class MiniCartShoppingButtonBlock extends AbstractInnerBlock {
+	/**
+	 * Block name.
+	 *
+	 * @var string
+	 */
+	protected $block_name = 'mini-cart-shopping-button-block';
+}
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/MiniCartTitleBlock.php b/plugins/woocommerce-blocks/src/BlockTypes/MiniCartTitleBlock.php
new file mode 100644
index 00000000000..621383febda
--- /dev/null
+++ b/plugins/woocommerce-blocks/src/BlockTypes/MiniCartTitleBlock.php
@@ -0,0 +1,14 @@
+<?php
+namespace Automattic\WooCommerce\Blocks\BlockTypes;
+
+/**
+ * MiniCartTitleBlock class.
+ */
+class MiniCartTitleBlock extends AbstractInnerBlock {
+	/**
+	 * Block name.
+	 *
+	 * @var string
+	 */
+	protected $block_name = 'mini-cart-title-block';
+}
diff --git a/plugins/woocommerce-blocks/src/BlockTypesController.php b/plugins/woocommerce-blocks/src/BlockTypesController.php
index 5ad32e5558a..d5640646c3e 100644
--- a/plugins/woocommerce-blocks/src/BlockTypesController.php
+++ b/plugins/woocommerce-blocks/src/BlockTypesController.php
@@ -8,6 +8,7 @@ use Automattic\WooCommerce\Blocks\Assets\Api as AssetApi;
 use Automattic\WooCommerce\Blocks\Integrations\IntegrationRegistry;
 use Automattic\WooCommerce\Blocks\BlockTypes\Cart;
 use Automattic\WooCommerce\Blocks\BlockTypes\Checkout;
+use Automattic\WooCommerce\Blocks\BlockTypes\MiniCartContents;
 
 /**
  * BlockTypesController class.
@@ -182,7 +183,6 @@ final class BlockTypesController {
 			'FilterWrapper',
 			'HandpickedProducts',
 			'MiniCart',
-			'MiniCartContents',
 			'StoreNotices',
 			'PriceFilter',
 			'ProductAddToCart',
@@ -217,7 +217,12 @@ final class BlockTypesController {
 			'StockFilter',
 		];
 
-		$block_types = array_merge( $block_types, Cart::get_cart_block_types(), Checkout::get_checkout_block_types() );
+		$block_types = array_merge(
+			$block_types,
+			Cart::get_cart_block_types(),
+			Checkout::get_checkout_block_types(),
+			MiniCartContents::get_mini_cart_block_types()
+		);
 
 		if ( Package::feature()->is_experimental_build() ) {
 			$block_types[] = 'SingleProduct';