Merge branch 'trunk' into update/blocks-build-message

.github/project-community-pr-assigner.yml

@@ -72,6 +72,9 @@
 "packages/js/onboarding/**/*":
   - team: ghidorah
 
+"packages/js/product-editor/**/*":
+  - team: mothra
+
 "packages/js/tracks/**/*":
   - team: mothra
 
@@ -85,11 +88,15 @@
 "plugins/woocommerce/src/Internal/Admin/**/*":
   - team: mothra
   - team: ghidorah
-  
+
 "plugins/woocommerce-admin/**/*":
   - team: mothra
   - team: ghidorah
 
+"plugins/woocommerce-blocks/**/*":
+  - team: rubik
+  - team: woo-fse
+
 "plugins/woocommerce-beta-tester/**/*":
   - team: vortex
 

.github/workflows/release-code-freeze.yml

@@ -1,17 +1,17 @@
 name: 'Release: Code freeze'
-on:
-    schedule:
-        - cron: '0 0 * * 4' # Run at start of day UTC on Thursdays. i.e. ~Wednesdays EOD 23:59:59 UTC
-    workflow_dispatch:
-        inputs:
-            timeOverride:
-                description: "Time Override: The time to use in checking whether the action should run (default: 'now')."
-                default: 'now'
-            skipSlackPing:
-                description: 'Skip Slack Ping: If true, the Slack ping will be skipped (useful for testing)'
-                type: boolean
-            slackChannelOverride:
-                description: 'Slack Channel Override: The channel ID to send the Slack ping about the freeze'
+#on:
+#    schedule:
+#        - cron: '0 0 * * 4' # Run at start of day UTC on Thursday. i.e. ~Wednesday EOD 23:59:59 UTC
+#    workflow_dispatch:
+#        inputs:
+#            timeOverride:
+#                description: "Time Override: The time to use in checking whether the action should run (default: 'now')."
+#                default: 'now'
+#            skipSlackPing:
+#                description: 'Skip Slack Ping: If true, the Slack ping will be skipped (useful for testing)'
+#                type: boolean
+#            slackChannelOverride:
+#                description: 'Slack Channel Override: The channel ID to send the Slack ping about the freeze'
 
 env:
     TIME_OVERRIDE: ${{ inputs.timeOverride || 'now' }}

docs/docs-manifest.json

@@ -350,7 +350,7 @@
         {
           "post_title": "Logging in WooCommerce",
           "edit_url": "https://github.com/woocommerce/woocommerce/edit/trunk/docs/extension-development/logging.md",
-          "hash": "ff3ff9f8f0f8f14175482b68d9e16b697089120894e6bd4d8cbf4d55145d9510",
+          "hash": "dbe7c96a7ffd9d8c95fdc07eba211f03840bc47d3c49f8cb0eff8363d4ad826d",
           "url": "https://raw.githubusercontent.com/woocommerce/woocommerce/trunk/docs/extension-development/logging.md",
           "id": "c684e2efba45051a4e1f98eb5e6ef6bab194f25c"
         },
@@ -916,6 +916,11 @@
       ],
       "categories": []
     },
+    {
+      "category_slug": "utilities",
+      "category_title": "Utilities",
+      "categories": []
+    },
     {
       "content": "\nThis section covers general guidelines, and best practices to follow in order to ensure your product experience aligns with WooCommerce for ease of use, seamless integration, and strong adoption.\n\nWe strongly recommend you review the current [WooCommerce setup experience](https://woo.com/documentation/plugins/woocommerce/getting-started/) to get familiar with the user experience and taxonomy.\n\nWe also recommend you review the [WordPress core guidelines](https://developer.wordpress.org/plugins/wordpress-org/detailed-plugin-guidelines/) to ensure your product isn't breaking any rules, and review [this helpful resource](https://woo.com/document/grammar-punctuation-style-guide/) on content style.\n\n## General\n\nUse existing WordPress/WooCommerce UI, built in components (text fields, checkboxes, etc) and existing menu structures.\n\nPlugins which draw on WordPress' core design aesthetic will benefit from future updates to this design as WordPress continues to evolve. If you need to make an exception for your product, be prepared to provide a valid use case.\n\n- [WordPress Components library](https://wordpress.github.io/gutenberg/?path=/story/docs-introduction--page)\n- [Figma for WordPress](https://make.wordpress.org/design/2018/11/19/figma-for-wordpress/) | ([WordPress Design Library Figma](https://www.figma.com/file/e4tLacmlPuZV47l7901FEs/WordPress-Design-Library))\n- [WooCommerce Component Library](https://woocommerce.github.io/woocommerce-admin/)\n",
       "category_slug": "user-experience-extensions",
@@ -1204,5 +1209,5 @@
       "categories": []
     }
   ],
-  "hash": "a138874d270595236e1db122206be746424ea22f376a8799473e5505486c4b11"
+  "hash": "383787d7f861905c25f96a7f003f9214f60da39fcdccdd90a61a5bf961346199"
 }

packages/js/product-editor/changelog.md

@@ -2,40 +2,30 @@
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.4.0](https://www.npmjs.com/package/@woocommerce/product-editor/v/1.4.0) - 2024-02-20 
+
+-   Patch - Add empty state when filtering variations by attribute terms and the response is empty [#44505]
+-   Minor - Fix pre-publish modal styles #44562 [#44562]
+-   Patch - Fix toggle visibility on bach update variations [#44508]
+-   Patch - Product Editor loading state now shows until form is displayed. No more blank flash of white. [#43840]
+-   Minor - Add the collapsible Schedule section [#44563]
+-   Minor - Add visibility section to pre-publish panel #44434 [#44434]
+-   Minor - Export Notice component in package [#44812]
+-   Minor - Refactor section and subsection blocks #44502 [#44502]
+-   Minor - [Product editor block]: Change visibility label when a password is set #44623 [#44624]
+-   Minor - [Product editor block]: Modify pre-publish sidebar title after scheduling a product #44651 [#44652]
+-   Minor - [Product editor block]: Rename the Add button to Publish #44461 [#44461]
+
 ## [1.3.0](https://www.npmjs.com/package/@woocommerce/product-editor/v/1.3.0) - 2024-02-09 
 
 -   Patch - Corrected build configuration for packages that weren't outputting minified code.
 -   Patch - Export __experimentalVariationQUickUpdateMenuItem, __experimentalPluginHeaderItemModal, __experimentalPluginHeaderItemPopover
--   Minor - Fix header toolbar in iframe modal editor to have block toolbar render correctly with latest Gutenberg and WP version.
--   Minor - Fix issue when generating variations for the first time in the new editor.
 -   Patch - Fix performance issue when modifying product metadata
 -   Patch - Fix product editor UI misbehaving in custom adminmenu widths (e.g. Calypso)
 -   Patch - Fix typo that broke the CI pipeline and the build process.
 -   Patch - Hide the product type selector dropdown when click outside
--   Minor - Revert "Show feedback bar only once (#41787)" #43178
--   Minor - Variation quick actions update properly when variation inherits sku of parent; slot fills always deal with arrays
 -   Patch - [Product Block Editor]: fix e2e test that happens in the text-area block
 -   Patch - [Product Block Editor]: fix the top area for the dashboard
--   Minor - Add a featured product button
--   Minor - Add empty state to the linked product list block
--   Minor - Add HOC to hide inventory collapsible block when nothing is inside it
--   Minor - Add prepublish panel #44331
--   Minor - Add slotFills for header items #43687
--   Minor - Add step buttons for Number block and component
--   Minor - Add tooltip attribute to Pricing field #43144
--   Minor - Allow providing recently updated data for the validate function in the useValidation hook
--   Minor - Always fallback to the standard product template in case the given product type is variable
--   Minor - Create attribute control custom empty state
--   Minor - Create linked product list block
--   Minor - Create variation empty state when no variable attributes are asigned to the product
--   Minor - Expose metadata as object from useProductMetadata hook
--   Minor - Fix margin top for none first child nested sections
--   Minor - Introduce a product type selection within the new experience
--   Minor - Load/save the product template from/to the product meta data
--   Minor - Product Editor: Subsection block #43725
--   Minor - Set the product template id also for unsupported product templates
--   Minor - track Linked Products feature events
--   Minor - Unlink downloads and downloadable product props so they can be managed separately
 -   Patch - [Product Block Editor]: add CashRegister image component
 -   Patch - [Product Block Editor]: Add Linked Product sections
 -   Patch - [Product Block Editor]: add loading for the `Choose products for me` button
@@ -53,23 +43,47 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 -   Patch - [Product Block Editor]: render empty state for the Cross-sells section
 -   Patch - [Product Block Editor]: use Label component to render Textarea field block label
 -   Patch - [Product Block Editor]: use text-area block to handle the variation description field
--   Minor - Add isLoading to useProductMetadata hook
 -   Patch - bump php version in packages/js/*/composer.json
--   Minor - Load layout templates via the REST API. Note that layout template modifications must now be hooked up in an action that is called when REST API endpoints are handled, such as `rest_api_init`.
--   Minor - Use different delays for initial click and hold when incrementing number on NumberControl
--   Minor - Use woocommerce's Tooltip component for Label and checkbox instead of wordpress Tooltip
 -   Patch - [Product Block Editor]: dismiss AdviceCard by clicking close button
 -   Patch - [Product Block Editor]: fallback with random products when there isn't related products in the Linked Products tab
 -   Patch - [Product Block Editor]: improve getting suggested products from linked product section
 -   Patch - [Product Block Editor]: redefine the app dashboard size
 -   Patch - [Product Block Editor]: tweak section actions of some blocks #43555
 -   Patch - [Product Block Editor]: update advice card instances
--   Minor - Add slotFill for variation menus #43441
--   Minor - Modify feedback modal actions #43005
 -   Patch - [Product Block Editor]: add className prop to ButtonWithDropdownMenu component
 -   Patch - [Product Block Editor]: improve and tweak AdviceCard component
 -   Patch - [Product Block Editor]: show three products by default in the Linked Products tab
 -   Patch - [Product Block Editor]: tweak styles and layout of AdviceCard component
+-   Minor - Fix header toolbar in iframe modal editor to have block toolbar render correctly with latest Gutenberg and WP version.
+-   Minor - Fix issue when generating variations for the first time in the new editor.
+-   Minor - Revert "Show feedback bar only once (#41787)" #43178
+-   Minor - Variation quick actions update properly when variation inherits sku of parent; slot fills always deal with arrays
+-   Minor - Add a featured product button
+-   Minor - Add empty state to the linked product list block
+-   Minor - Add HOC to hide inventory collapsible block when nothing is inside it
+-   Minor - Add prepublish panel #44331
+-   Minor - Add slotFills for header items #43687
+-   Minor - Add step buttons for Number block and component
+-   Minor - Add tooltip attribute to Pricing field #43144
+-   Minor - Allow providing recently updated data for the validate function in the useValidation hook
+-   Minor - Always fallback to the standard product template in case the given product type is variable
+-   Minor - Create attribute control custom empty state
+-   Minor - Create linked product list block
+-   Minor - Create variation empty state when no variable attributes are asigned to the product
+-   Minor - Expose metadata as object from useProductMetadata hook
+-   Minor - Fix margin top for none first child nested sections
+-   Minor - Introduce a product type selection within the new experience
+-   Minor - Load/save the product template from/to the product meta data
+-   Minor - Product Editor: Subsection block #43725
+-   Minor - Set the product template id also for unsupported product templates
+-   Minor - track Linked Products feature events
+-   Minor - Unlink downloads and downloadable product props so they can be managed separately
+-   Minor - Add isLoading to useProductMetadata hook
+-   Minor - Load layout templates via the REST API. Note that layout template modifications must now be hooked up in an action that is called when REST API endpoints are handled, such as `rest_api_init`.
+-   Minor - Use different delays for initial click and hold when incrementing number on NumberControl
+-   Minor - Use woocommerce's Tooltip component for Label and checkbox instead of wordpress Tooltip
+-   Minor - Add slotFill for variation menus #43441
+-   Minor - Modify feedback modal actions #43005
 
 ## [1.2.0](https://www.npmjs.com/package/@woocommerce/product-editor/v/1.2.0) - 2023-12-20 
 

packages/js/product-editor/changelog/fix-44809_downloads_buttons

@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Remove Subsection actions and fix use of SectionActions for both section and subsection.

packages/js/product-editor/changelog/update-do-not-current-product-form-me

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+[Product Block Editor]: do not include current product in the suggested products list

packages/js/product-editor/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@woocommerce/product-editor",
-	"version": "1.3.0",
+	"version": "1.4.0",
 	"description": "React components for the WooCommerce admin product editor.",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",

packages/js/product-editor/src/blocks/generic/section/edit.tsx

@@ -40,7 +40,6 @@ export function SectionBlockEdit( {
 					description={ description }
 					sectionTagName={ SectionTagName }
 					title={ title }
-					type="section"
 				/>
 			) }
 

packages/js/product-editor/src/blocks/generic/subsection-description/edit.tsx

@@ -20,7 +20,7 @@ export function SubsectionDescriptionBlockEdit( {
 	return (
 		<BlockFill
 			{ ...blockProps }
-			name="subsection-description"
+			name="section-description"
 			slotContainerBlockName="woocommerce/product-subsection"
 		>
 			<div>{ content }</div>

packages/js/product-editor/src/blocks/generic/subsection/edit.tsx

@@ -40,7 +40,6 @@ export function SubsectionBlockEdit( {
 					description={ description }
 					sectionTagName={ SubsectionTagName }
 					title={ title }
-					type="subsection"
 				/>
 			) }
 

packages/js/product-editor/src/components/block-slot-fill/section-actions/index.tsx

@@ -13,11 +13,16 @@ export type SectionActionsProps = Omit<
 	BlockFillProps,
 	'name' | 'slotContainerBlockName'
 > & {
-	containerBlockName?: string;
+	containerBlockName?: string | string[];
 };
 
+const DEFAULT_SECTION_BLOCKS = [
+	'woocommerce/product-section',
+	'woocommerce/product-subsection',
+];
+
 export function SectionActions( {
-	containerBlockName = 'woocommerce/product-section',
+	containerBlockName = DEFAULT_SECTION_BLOCKS,
 	...restProps
 }: SectionActionsProps ) {
 	return (

packages/js/product-editor/src/components/block-slot-fill/types.ts

@@ -15,5 +15,5 @@ export type BlockSlotProps = BlockSlotFillProps & Slot.Props;
 
 export type BlockFillProps = BlockSlotFillProps &
 	Fill.Props & {
-		slotContainerBlockName: string;
+		slotContainerBlockName: string | string[];
 	};

packages/js/product-editor/src/components/index.ts

@@ -88,3 +88,5 @@ export {
 	ProductImage as __experimentalProductImage,
 	ProductImageProps,
 } from './product-image';
+
+export { Notice as __experimentalNotice } from './notice';

packages/js/product-editor/src/components/section-header/section-header.tsx

@@ -16,7 +16,6 @@ export function SectionHeader( {
 	description,
 	sectionTagName,
 	title,
-	type = 'section',
 }: SectionHeaderProps ) {
 	const HeadingTagName = sectionTagName === 'fieldset' ? 'legend' : 'div';
 
@@ -46,10 +45,10 @@ export function SectionHeader( {
 				</h2>
 
 				<div className="wp-block-woocommerce-product-section-header__actions">
-					<BlockSlot name={ `${ type }-actions` } />
+					<BlockSlot name={ `section-actions` } />
 				</div>
 			</div>
-			<BlockSlot name={ `${ type }-description` } />
+			<BlockSlot name={ `section-description` } />
 		</HeadingTagName>
 	);
 }

packages/js/product-editor/src/components/section-header/types.ts

@@ -2,5 +2,4 @@ export interface SectionHeaderProps {
 	description?: string | undefined;
 	sectionTagName: string;
 	title: string;
-	type: 'section' | 'subsection';
 }