From 5744f086068e5b8d3fba3561243a1194b84bfc1b Mon Sep 17 00:00:00 2001 From: Tung Du Date: Mon, 10 Oct 2022 21:58:26 +0700 Subject: [PATCH 1/4] Correct block name and description --- assets/js/blocks/active-filters/block.json | 2 +- assets/js/blocks/attribute-filter/block.json | 2 +- assets/js/blocks/filter-wrapper/index.tsx | 8 ++++---- assets/js/blocks/stock-filter/block.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/assets/js/blocks/active-filters/block.json b/assets/js/blocks/active-filters/block.json index a587007a243..09f8e1b571c 100644 --- a/assets/js/blocks/active-filters/block.json +++ b/assets/js/blocks/active-filters/block.json @@ -1,7 +1,7 @@ { "name": "woocommerce/active-filters", "version": "1.0.0", - "title": "Active Product Filter Controls", + "title": "Active Product Filters Controls", "description": "Display the currently active product filters.", "category": "woocommerce", "keywords": [ "WooCommerce" ], diff --git a/assets/js/blocks/attribute-filter/block.json b/assets/js/blocks/attribute-filter/block.json index 065855ec40c..4da9adf753a 100644 --- a/assets/js/blocks/attribute-filter/block.json +++ b/assets/js/blocks/attribute-filter/block.json @@ -2,7 +2,7 @@ "name": "woocommerce/attribute-filter", "version": "1.0.0", "title": "Filter by Attribute Controls", - "description": "Allow customers to filter the grid by product attribute, such as color.", + "description": "Enable customers to filter the product grid by selecting one or more attributes, such as color.", "category": "woocommerce", "keywords": [ "WooCommerce" ], "supports": { diff --git a/assets/js/blocks/filter-wrapper/index.tsx b/assets/js/blocks/filter-wrapper/index.tsx index 7be38559c27..dded13cb733 100644 --- a/assets/js/blocks/filter-wrapper/index.tsx +++ b/assets/js/blocks/filter-wrapper/index.tsx @@ -29,7 +29,7 @@ registerBlockType( metadata, { 'woo-gutenberg-products-block' ), description: __( - 'Show the currently active product filters. Works in combination with other filters blocks.', + 'Display the currently active product filters.', 'woo-gutenberg-products-block' ), /** @@ -58,7 +58,7 @@ registerBlockType( metadata, { name: 'price-filter', title: __( 'Filter by Price', 'woo-gutenberg-products-block' ), description: __( - 'Allow customers to filter products by price range.', + 'Enable customers to filter the product grid by choosing a price range.', 'woo-gutenberg-products-block' ), isActive: ( attributes ) => @@ -83,7 +83,7 @@ registerBlockType( metadata, { name: 'stock-filter', title: __( 'Filter by Stock', 'woo-gutenberg-products-block' ), description: __( - 'Allow customers to filter the grid by products stock status.', + 'Enable customers to filter the product grid by stock status.', 'woo-gutenberg-products-block' ), isActive: ( attributes ) => @@ -108,7 +108,7 @@ registerBlockType( metadata, { name: 'attribute-filter', title: __( 'Filter by Attribute', 'woo-gutenberg-products-block' ), description: __( - 'Allow customers to filter the grid by product attribute, such as color.', + 'Enable customers to filter the product grid by selecting one or more attributes, such as color.', 'woo-gutenberg-products-block' ), isActive: ( attributes ) => diff --git a/assets/js/blocks/stock-filter/block.json b/assets/js/blocks/stock-filter/block.json index ea1da4b7e35..885cb64d44f 100644 --- a/assets/js/blocks/stock-filter/block.json +++ b/assets/js/blocks/stock-filter/block.json @@ -2,7 +2,7 @@ "name": "woocommerce/stock-filter", "version": "1.0.0", "title": "Filter by Stock Controls", - "description": "Allow customers to filter the grid by products stock status.", + "description": "Enable customers to filter the product grid by stock status.", "category": "woocommerce", "keywords": [ "WooCommerce" ], "supports": { From ed5417eb0e5191ed2f1def2a04c9e724fe70856a Mon Sep 17 00:00:00 2001 From: Tung Du Date: Mon, 10 Oct 2022 22:56:57 +0700 Subject: [PATCH 2/4] remove duplicated description for controls blocks --- assets/js/blocks/active-filters/block.json | 1 - assets/js/blocks/attribute-filter/block.json | 1 - assets/js/blocks/price-filter/block.json | 1 - assets/js/blocks/stock-filter/block.json | 1 - 4 files changed, 4 deletions(-) diff --git a/assets/js/blocks/active-filters/block.json b/assets/js/blocks/active-filters/block.json index 09f8e1b571c..f8ae1e6ce5e 100644 --- a/assets/js/blocks/active-filters/block.json +++ b/assets/js/blocks/active-filters/block.json @@ -2,7 +2,6 @@ "name": "woocommerce/active-filters", "version": "1.0.0", "title": "Active Product Filters Controls", - "description": "Display the currently active product filters.", "category": "woocommerce", "keywords": [ "WooCommerce" ], "supports": { diff --git a/assets/js/blocks/attribute-filter/block.json b/assets/js/blocks/attribute-filter/block.json index 4da9adf753a..6740460068e 100644 --- a/assets/js/blocks/attribute-filter/block.json +++ b/assets/js/blocks/attribute-filter/block.json @@ -2,7 +2,6 @@ "name": "woocommerce/attribute-filter", "version": "1.0.0", "title": "Filter by Attribute Controls", - "description": "Enable customers to filter the product grid by selecting one or more attributes, such as color.", "category": "woocommerce", "keywords": [ "WooCommerce" ], "supports": { diff --git a/assets/js/blocks/price-filter/block.json b/assets/js/blocks/price-filter/block.json index e97b1323273..02c83f7f2c4 100644 --- a/assets/js/blocks/price-filter/block.json +++ b/assets/js/blocks/price-filter/block.json @@ -2,7 +2,6 @@ "name": "woocommerce/price-filter", "version": "1.0.0", "title": "Filter by Price Controls", - "description": "Enable customers to filter the product grid by choosing a price range.", "category": "woocommerce", "keywords": [ "WooCommerce" ], "supports": { diff --git a/assets/js/blocks/stock-filter/block.json b/assets/js/blocks/stock-filter/block.json index 885cb64d44f..c07975e5155 100644 --- a/assets/js/blocks/stock-filter/block.json +++ b/assets/js/blocks/stock-filter/block.json @@ -2,7 +2,6 @@ "name": "woocommerce/stock-filter", "version": "1.0.0", "title": "Filter by Stock Controls", - "description": "Enable customers to filter the product grid by stock status.", "category": "woocommerce", "keywords": [ "WooCommerce" ], "supports": { From 9dbac32bbdb524e718a5353ffb080d6a667ae140 Mon Sep 17 00:00:00 2001 From: Tung Du Date: Mon, 10 Oct 2022 23:11:34 +0700 Subject: [PATCH 3/4] remove duplicated title and desc --- assets/js/blocks/active-filters/index.tsx | 8 -------- assets/js/blocks/stock-filter/index.tsx | 6 ------ 2 files changed, 14 deletions(-) diff --git a/assets/js/blocks/active-filters/index.tsx b/assets/js/blocks/active-filters/index.tsx index f330cb0e9ad..e63c31f5eb3 100644 --- a/assets/js/blocks/active-filters/index.tsx +++ b/assets/js/blocks/active-filters/index.tsx @@ -17,14 +17,6 @@ import { blockAttributes } from './attributes'; import { Attributes } from './types'; registerBlockType( metadata, { - title: __( - 'Active Product Filter Controls', - 'woo-gutenberg-products-block' - ), - description: __( - 'Display the currently active product filters.', - 'woo-gutenberg-products-block' - ), icon: { src: ( Date: Tue, 11 Oct 2022 15:28:00 +0700 Subject: [PATCH 4/4] Revert "remove duplicated description for controls blocks" This reverts commit ed5417eb0e5191ed2f1def2a04c9e724fe70856a. --- assets/js/blocks/active-filters/block.json | 1 + assets/js/blocks/attribute-filter/block.json | 1 + assets/js/blocks/price-filter/block.json | 1 + assets/js/blocks/stock-filter/block.json | 1 + 4 files changed, 4 insertions(+) diff --git a/assets/js/blocks/active-filters/block.json b/assets/js/blocks/active-filters/block.json index f8ae1e6ce5e..09f8e1b571c 100644 --- a/assets/js/blocks/active-filters/block.json +++ b/assets/js/blocks/active-filters/block.json @@ -2,6 +2,7 @@ "name": "woocommerce/active-filters", "version": "1.0.0", "title": "Active Product Filters Controls", + "description": "Display the currently active product filters.", "category": "woocommerce", "keywords": [ "WooCommerce" ], "supports": { diff --git a/assets/js/blocks/attribute-filter/block.json b/assets/js/blocks/attribute-filter/block.json index 6740460068e..4da9adf753a 100644 --- a/assets/js/blocks/attribute-filter/block.json +++ b/assets/js/blocks/attribute-filter/block.json @@ -2,6 +2,7 @@ "name": "woocommerce/attribute-filter", "version": "1.0.0", "title": "Filter by Attribute Controls", + "description": "Enable customers to filter the product grid by selecting one or more attributes, such as color.", "category": "woocommerce", "keywords": [ "WooCommerce" ], "supports": { diff --git a/assets/js/blocks/price-filter/block.json b/assets/js/blocks/price-filter/block.json index 02c83f7f2c4..e97b1323273 100644 --- a/assets/js/blocks/price-filter/block.json +++ b/assets/js/blocks/price-filter/block.json @@ -2,6 +2,7 @@ "name": "woocommerce/price-filter", "version": "1.0.0", "title": "Filter by Price Controls", + "description": "Enable customers to filter the product grid by choosing a price range.", "category": "woocommerce", "keywords": [ "WooCommerce" ], "supports": { diff --git a/assets/js/blocks/stock-filter/block.json b/assets/js/blocks/stock-filter/block.json index c07975e5155..885cb64d44f 100644 --- a/assets/js/blocks/stock-filter/block.json +++ b/assets/js/blocks/stock-filter/block.json @@ -2,6 +2,7 @@ "name": "woocommerce/stock-filter", "version": "1.0.0", "title": "Filter by Stock Controls", + "description": "Enable customers to filter the product grid by stock status.", "category": "woocommerce", "keywords": [ "WooCommerce" ], "supports": {