Release: 6.7.3 (#5617)

* Enable Mini Cart template-parts only for experimental builds #5598 (#5606)

Enable Mini Cart template-parts only for experimental builds

* bump version to 6.7.3-dev

* Empty commit for release pull request

* update readme.txt

* add testing release notes

* Bumping version strings to new version.

Co-authored-by: Luigi Teschio <[email protected]>
Co-authored-by: github-actions <[email protected]>

docs/testing/releases/673.md

@@ -0,0 +1,11 @@
+## Testing notes and ZIP for release 6.7.3
+
+Zip file for testing: [woocommerce-gutenberg-products-block.zip](https://github.com/woocommerce/woocommerce-gutenberg-products-block/files/7924587/woocommerce-gutenberg-products-block.zip)
+
+## Feature plugin and package inclusion in WooCommerce
+
+### Enable Mini Cart template-parts only for experimental builds ([5606](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/5606))
+
+1. Install Gutenberg (or use WordPress 5.9) and select a block theme e.g. `TT1 Blocks`.
+2. Open Appearance > Editor > Templates Parts.
+3. Check that `Mini Cart` template is NOT visible.

docs/testing/releases/README.md

@@ -56,4 +56,5 @@ Every release includes specific testing instructions for new features and bug fi
 -   [6.6.0](./660.md)
 -   [6.7.0](./670.md)
     -   [6.7.1](./671.md)
-    -   [6.7.2](./672.md)
+    -   [6.7.2](./672.md)
+    -   [6.7.3](./673.md)

package.json

@@ -2,7 +2,7 @@
 	"name": "@woocommerce/block-library",
 	"title": "WooCommerce Blocks",
 	"author": "Automattic",
-	"version": "6.7.2",
+	"version": "6.7.3",
 	"description": "WooCommerce blocks for the Gutenberg editor.",
 	"homepage": "https://github.com/woocommerce/woocommerce-gutenberg-products-block/",
 	"keywords": [

readme.txt

@@ -4,7 +4,7 @@ Tags: gutenberg, woocommerce, woo commerce, products, blocks, woocommerce blocks
 Requires at least: 5.8
 Tested up to: 5.8
 Requires PHP: 7.0
-Stable tag: 6.7.2
+Stable tag: 6.7.3
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -85,6 +85,12 @@ Release and roadmap notes available on the [WooCommerce Developers Blog](https:/
 
 == Changelog ==
 
+= 6.7.3 - 2022-01-24 =
+
+#### Bug Fixes
+
+- Enable Mini Cart template parts only for experimental builds. ([#5606](https://github.com/woocommerce/woocommerce-gutenberg-products-block/pull/5606))
+
 = 6.7.2 - 2022-01-17 =
 
 #### Bug Fixes

src/BlockTemplatesController.php

@@ -369,12 +369,14 @@ function ( $template ) use ( $template_slug ) {
 	 * @param array $slugs An array of slugs to retrieve templates for.
 	 * @param array $template_type wp_template or wp_template_part.
 	 *
-	 * @return array
+	 * @return array WP_Block_Template[] An array of block template objects.
 	 */
 	public function get_block_templates( $slugs = array(), $template_type = 'wp_template' ) {
 		$templates_from_db  = $this->get_block_templates_from_db( $slugs, $template_type );
 		$templates_from_woo = $this->get_block_templates_from_woocommerce( $slugs, $templates_from_db, $template_type );
-		return array_merge( $templates_from_db, $templates_from_woo );
+		$templates          = array_merge( $templates_from_db, $templates_from_woo );
+		return BlockTemplateUtils::filter_block_templates_by_feature_flag( $templates );
+
 	}
 
 	/**

src/Domain/Services/FeatureGating.php

@@ -137,4 +137,32 @@ public function is_production_environment() {
 	public function is_test_environment() {
 		return self::TEST_ENVIRONMENT === $this->environment;
 	}
+
+	/**
+	 * Returns core flag value.
+	 *
+	 * @return number
+	 */
+	public static function get_core_flag() {
+		return self::CORE_FLAG;
+	}
+
+	/**
+	 * Returns feature plugin flag value.
+	 *
+	 * @return number
+	 */
+	public static function get_feature_plugin_flag() {
+		return self::FEATURE_PLUGIN_FLAG;
+	}
+
+	/**
+	 * Returns experimental flag value.
+	 *
+	 * @return number
+	 */
+	public static function get_experimental_flag() {
+		return self::EXPERIMENTAL_FLAG;
+	}
+
 }

src/Package.php

@@ -106,7 +106,7 @@ public static function container( $reset = false ) {
 				NewPackage::class,
 				function ( $container ) {
 					// leave for automated version bumping.
-					$version = '6.7.2';
+					$version = '6.7.3';
 					return new NewPackage(
 						$version,
 						dirname( __DIR__ ),

src/Utils/BlockTemplateUtils.php

@@ -1,6 +1,9 @@
 <?php
 namespace Automattic\WooCommerce\Blocks\Utils;
 
+use Automattic\WooCommerce\Blocks\Domain\Services\FeatureGating;
+
+
 /**
  * BlockTemplateUtils class used for serving block templates from Woo Blocks.
  * IMPORTANT: These methods have been duplicated from Gutenberg/lib/full-site-editing/block-templates.php as those functions are not for public usage.
@@ -414,4 +417,36 @@ public static function set_has_theme_file_if_fallback_is_available( $query_resul
 
 		return false;
 	}
+
+	/**
+	 * Filter block templates by feature flag.
+	 *
+	 * @param WP_Block_Template[] $block_templates An array of block template objects.
+	 *
+	 * @return WP_Block_Template[] An array of block template objects.
+	 */
+	public static function filter_block_templates_by_feature_flag( $block_templates ) {
+		$feature_gating = new FeatureGating();
+		$flag           = $feature_gating->get_flag();
+
+		/**
+		 * An array of block templates with slug as key and flag as value.
+		 *
+		 * @var array
+		*/
+		$block_templates_with_feature_gate = array(
+			'mini-cart' => $feature_gating->get_experimental_flag(),
+		);
+
+		return array_filter(
+			$block_templates,
+			function( $block_template ) use ( $flag, $block_templates_with_feature_gate ) {
+				if ( isset( $block_templates_with_feature_gate[ $block_template->slug ] ) ) {
+					return $block_templates_with_feature_gate[ $block_template->slug ] <= $flag;
+				}
+				return true;
+			}
+		);
+	}
+
 }

woocommerce-gutenberg-products-block.php

@@ -3,7 +3,7 @@
  * Plugin Name: WooCommerce Blocks
  * Plugin URI: https://github.com/woocommerce/woocommerce-gutenberg-products-block
  * Description: WooCommerce blocks for the Gutenberg editor.
- * Version: 6.7.2
+ * Version: 6.7.3
  * Author: Automattic
  * Author URI: https://woocommerce.com
  * Text Domain:  woo-gutenberg-products-block