+
+
-
- { props.label }
-
-
+ {
+ if ( ! isOpen ) {
+ setIsOpen( true );
+ }
+ setIsFocused( true );
+ },
+ onBlur: ( event ) => {
+ // if blurring to an element inside the dropdown, don't close it
+ if (
+ isOpen &&
+ ! document
+ .querySelector( '.' + menuInstanceId )
+ ?.contains( event.relatedTarget )
+ ) {
+ setIsOpen( false );
+ }
+ setIsFocused( false );
+ },
+ onKeyDown: ( event ) => {
+ setIsOpen( true );
+ if ( event.key === 'ArrowDown' ) {
+ event.preventDefault();
+ // focus on the first element from the Popover
+ (
+ document.querySelector(
+ `.${ menuInstanceId } input, .${ menuInstanceId } button`
+ ) as HTMLInputElement | HTMLButtonElement
+ )?.focus();
+ }
+ if ( event.key === 'Tab' ) {
+ setIsOpen( false );
+ }
+ },
+ onChange: ( event ) =>
+ onInputChange &&
+ onInputChange( event.target.value ),
+ placeholder,
+ } }
+ suffix={ suffix }
+ >
+ item?.label || '' }
+ getItemValue={ ( item ) => item?.value || '' }
+ onRemove={ ( item ) => {
+ if ( ! Array.isArray( item ) && props.onRemove ) {
+ props.onRemove( item );
+ setIsOpen( false );
+ }
} }
- inputProps={ {
- className:
- 'woocommerce-experimental-select-control__input',
- id: `${ props.id }-input`,
- 'aria-autocomplete': 'list',
- 'aria-controls': `${ props.id }-menu`,
- autoComplete: 'off',
- onFocus: () => {
- if ( ! isOpen ) {
- onToggle();
- }
- setIsFocused( true );
- },
- onBlur: ( event ) => {
- // if blurring to an element inside the dropdown, don't close it
- if (
- isOpen &&
- ! document
- .querySelector(
- '.woocommerce-experimental-select-control ~ .components-popover'
- )
- ?.contains( event.relatedTarget )
- ) {
- onClose();
- }
- setIsFocused( false );
- },
- onKeyDown: ( event ) => {
- const baseQuery =
- '.woocommerce-experimental-select-tree-control__dropdown > .components-popover';
- if ( event.key === 'ArrowDown' ) {
- event.preventDefault();
- // focus on the first element from the Popover
- (
- document.querySelector(
- `${ baseQuery } input, ${ baseQuery } button`
- ) as
- | HTMLInputElement
- | HTMLButtonElement
- )?.focus();
- }
- if ( event.key === 'Tab' ) {
- onClose();
- }
- },
- onChange: ( event ) =>
- onInputChange &&
- onInputChange( event.target.value ),
- placeholder,
- } }
- suffix={ suffix }
- >
- item?.label || '' }
- getItemValue={ ( item ) => item?.value || '' }
- onRemove={ ( item ) => {
- if (
- ! Array.isArray( item ) &&
- props.onRemove
- ) {
- props.onRemove( item );
- onClose();
- }
- } }
- getSelectedItemProps={ () => ( {} ) }
- />
-
-
- ) }
- />
+ getSelectedItemProps={ () => ( {} ) }
+ />
+
+
setIsOpen( false ) }
+ />
+
);
};
diff --git a/packages/js/components/src/experimental-select-tree-control/stories/index.tsx b/packages/js/components/src/experimental-select-tree-control/stories/index.tsx
index 4034c571905..024f1e68e9e 100644
--- a/packages/js/components/src/experimental-select-tree-control/stories/index.tsx
+++ b/packages/js/components/src/experimental-select-tree-control/stories/index.tsx
@@ -1,14 +1,15 @@
/**
* External dependencies
*/
-
-import React, { createElement } from 'react';
+import React, { createElement, useState } from 'react';
+import { Button, Modal, SlotFillProvider } from '@wordpress/components';
/**
* Internal dependencies
*/
import { SelectTree } from '../select-tree';
import { Item } from '../../experimental-tree-control/types';
+import { SelectTreeMenuSlot } from '../select-tree-menu';
const listItems: Item[] = [
{ value: '1', label: 'Technology' },
@@ -95,6 +96,72 @@ export const MultipleSelectTree: React.FC = () => {
);
};
+export const SingleWithinModalUsingBodyDropdownPlacement: React.FC = () => {
+ const [ isOpen, setOpen ] = useState( true );
+ const [ value, setValue ] = useState( '' );
+ const [ selected, setSelected ] = useState< Item[] >( [] );
+
+ const items = filterItems( listItems, value );
+
+ return (
+
+ Selected: { JSON.stringify( selected ) }
+ setOpen( true ) }>
+ Show Dropdown in Modal
+
+ { isOpen && (
+ setOpen( false ) }
+ >
+
+ ! value ||
+ listItems.findIndex(
+ ( item ) => item.label === typedValue
+ ) === -1
+ }
+ createValue={ value }
+ // eslint-disable-next-line no-alert
+ onCreateNew={ () => alert( 'create new called' ) }
+ onInputChange={ ( a ) => setValue( a || '' ) }
+ onSelect={ ( selectedItems ) => {
+ if ( Array.isArray( selectedItems ) ) {
+ setSelected( [
+ ...selected,
+ ...selectedItems,
+ ] );
+ }
+ } }
+ onRemove={ ( removedItems ) => {
+ const newValues = Array.isArray( removedItems )
+ ? selected.filter(
+ ( item ) =>
+ ! removedItems.some(
+ ( { value: removedValue } ) =>
+ item.value === removedValue
+ )
+ )
+ : selected.filter(
+ ( item ) =>
+ item.value !== removedItems.value
+ );
+ setSelected( newValues );
+ } }
+ />
+
+ ) }
+
+ );
+};
+
export default {
title: 'WooCommerce Admin/experimental/SelectTreeControl',
component: SelectTree,
diff --git a/packages/js/components/src/index.ts b/packages/js/components/src/index.ts
index 99d39bf3fa9..e971ee0d231 100644
--- a/packages/js/components/src/index.ts
+++ b/packages/js/components/src/index.ts
@@ -99,7 +99,10 @@ export {
TreeControl as __experimentalTreeControl,
Item as TreeItemType,
} from './experimental-tree-control';
-export { SelectTree as __experimentalSelectTreeControl } from './experimental-select-tree-control';
+export {
+ SelectTree as __experimentalSelectTreeControl,
+ SelectTreeMenuSlot as __experimentalSelectTreeMenuSlot,
+} from './experimental-select-tree-control';
export { default as TreeSelectControl } from './tree-select-control';
// Exports below can be removed once the @woocommerce/product-editor package is released.
diff --git a/packages/js/experimental/changelog/fix-37654-invalid-return-callback-ref b/packages/js/experimental/changelog/fix-37654-invalid-return-callback-ref
new file mode 100644
index 00000000000..d14e18f1448
--- /dev/null
+++ b/packages/js/experimental/changelog/fix-37654-invalid-return-callback-ref
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix invalid return callback ref warning
diff --git a/packages/js/experimental/src/inbox-note/test/inbox-note.tsx b/packages/js/experimental/src/inbox-note/test/inbox-note.tsx
index f1078577e04..bbe03171804 100644
--- a/packages/js/experimental/src/inbox-note/test/inbox-note.tsx
+++ b/packages/js/experimental/src/inbox-note/test/inbox-note.tsx
@@ -23,6 +23,8 @@ jest.mock( 'react-visibility-sensor', () =>
} )
);
+window.open = jest.fn();
+
describe( 'InboxNoteCard', () => {
const note = {
id: 1,
diff --git a/packages/js/experimental/src/inbox-note/test/use-callback-on-link-click.tsx b/packages/js/experimental/src/inbox-note/test/use-callback-on-link-click.tsx
index a7c4d334565..2efcb221b98 100644
--- a/packages/js/experimental/src/inbox-note/test/use-callback-on-link-click.tsx
+++ b/packages/js/experimental/src/inbox-note/test/use-callback-on-link-click.tsx
@@ -42,4 +42,17 @@ describe( 'useCallbackOnLinkClick hook', () => {
userEvent.click( getByText( 'Button' ) );
expect( callback ).not.toHaveBeenCalled();
} );
+
+ it( 'should remove listener on unmount', () => {
+ const listener = jest.fn();
+ const { getByText, unmount } = render(
+
+
{ title }
+ { label } ,
+ tooltip: (
+ { tooltip } }
+ position="top center"
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+ // @ts-ignore Incorrect types.
+ className={
+ 'woocommerce-product-form__checkbox-tooltip'
+ }
+ delay={ 0 }
+ >
+
+
+
+ ),
+ } )
+ : label
+ }
+ checked={ value }
+ onChange={ ( selected ) => setValue( selected ) }
+ />
+
+ );
+}
diff --git a/packages/js/product-editor/src/blocks/checkbox/editor.scss b/packages/js/product-editor/src/blocks/checkbox/editor.scss
new file mode 100644
index 00000000000..472ffb521b5
--- /dev/null
+++ b/packages/js/product-editor/src/blocks/checkbox/editor.scss
@@ -0,0 +1,24 @@
+
+.woocommerce-product-form__checkbox {
+
+ .components-base-control__field {
+ display: flex;
+ }
+
+ .components-checkbox-control__label {
+ display: flex;
+ }
+
+ &-tooltip-icon {
+ margin: -2px 0 0 $gap-small;
+ }
+}
+
+.woocommerce-product-form__checkbox-tooltip {
+ .components-popover__content {
+ width: 200px;
+ min-width: auto;
+ white-space: normal !important;
+ }
+}
+
diff --git a/packages/js/product-editor/src/blocks/checkbox/index.ts b/packages/js/product-editor/src/blocks/checkbox/index.ts
new file mode 100644
index 00000000000..15144b2b28d
--- /dev/null
+++ b/packages/js/product-editor/src/blocks/checkbox/index.ts
@@ -0,0 +1,17 @@
+/**
+ * Internal dependencies
+ */
+import initBlock from '../../utils/init-block';
+import metadata from './block.json';
+import { Edit } from './edit';
+
+const { name } = metadata;
+
+export { metadata, name };
+
+export const settings = {
+ example: {},
+ edit: Edit,
+};
+
+export const init = () => initBlock( { name, metadata, settings } );
diff --git a/packages/js/product-editor/src/blocks/conditional/block.json b/packages/js/product-editor/src/blocks/conditional/block.json
new file mode 100644
index 00000000000..572a2d90c35
--- /dev/null
+++ b/packages/js/product-editor/src/blocks/conditional/block.json
@@ -0,0 +1,27 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 2,
+ "name": "woocommerce/conditional",
+ "title": "Conditional",
+ "category": "widgets",
+ "description": "Container to only conditionally render inner blocks.",
+ "textdomain": "default",
+ "attributes": {
+ "mustMatch": {
+ "__experimentalRole": "content",
+ "type": "array",
+ "items": {
+ "type": "object"
+ },
+ "default": []
+ }
+ },
+ "supports": {
+ "align": false,
+ "html": false,
+ "multiple": true,
+ "reusable": false,
+ "inserter": false,
+ "lock": false
+ }
+}
diff --git a/packages/js/product-editor/src/blocks/conditional/edit.tsx b/packages/js/product-editor/src/blocks/conditional/edit.tsx
new file mode 100644
index 00000000000..61e15444d4d
--- /dev/null
+++ b/packages/js/product-editor/src/blocks/conditional/edit.tsx
@@ -0,0 +1,52 @@
+/**
+ * External dependencies
+ */
+import type { BlockAttributes } from '@wordpress/blocks';
+import { createElement, useMemo } from '@wordpress/element';
+import { InnerBlocks, useBlockProps } from '@wordpress/block-editor';
+import { useSelect } from '@wordpress/data';
+import { DisplayState } from '@woocommerce/components';
+import { Product } from '@woocommerce/data';
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore No types for this exist yet.
+// eslint-disable-next-line @woocommerce/dependency-group
+import { useEntityId } from '@wordpress/core-data';
+
+export function Edit( {
+ attributes,
+}: {
+ attributes: BlockAttributes & {
+ mustMatch: Record< string, Array< string > >;
+ };
+} ) {
+ const blockProps = useBlockProps();
+ const { mustMatch } = attributes;
+
+ const productId = useEntityId( 'postType', 'product' );
+ const product: Product = useSelect( ( select ) =>
+ select( 'core' ).getEditedEntityRecord(
+ 'postType',
+ 'product',
+ productId
+ )
+ );
+
+ const displayBlocks = useMemo( () => {
+ for ( const [ prop, values ] of Object.entries( mustMatch ) ) {
+ if ( ! values.includes( product[ prop ] ) ) {
+ return false;
+ }
+ }
+ return true;
+ }, [ mustMatch, product ] );
+
+ return (
+
+
+
+
+ );
+}
diff --git a/packages/js/product-editor/src/blocks/conditional/index.ts b/packages/js/product-editor/src/blocks/conditional/index.ts
new file mode 100644
index 00000000000..43b3aabdc22
--- /dev/null
+++ b/packages/js/product-editor/src/blocks/conditional/index.ts
@@ -0,0 +1,18 @@
+/**
+ * Internal dependencies
+ */
+import { initBlock } from '../../utils';
+import metadata from './block.json';
+import { Edit } from './edit';
+
+const { name } = metadata;
+
+export { metadata, name };
+
+export const settings = {
+ example: {},
+ edit: Edit,
+};
+
+export const init = () =>
+ initBlock( { name, metadata: metadata as never, settings } );
diff --git a/packages/js/product-editor/src/blocks/inventory-email/block.json b/packages/js/product-editor/src/blocks/inventory-email/block.json
new file mode 100644
index 00000000000..749846acb5a
--- /dev/null
+++ b/packages/js/product-editor/src/blocks/inventory-email/block.json
@@ -0,0 +1,25 @@
+{
+ "$schema": "https://schemas.wp.org/trunk/block.json",
+ "apiVersion": 2,
+ "name": "woocommerce/product-inventory-email",
+ "title": "Stock level threshold",
+ "category": "widgets",
+ "description": "Stock management minimum quantity.",
+ "keywords": [ "products", "inventory", "email", "minimum" ],
+ "textdomain": "default",
+ "attributes": {
+ "name": {
+ "type": "string",
+ "__experimentalRole": "content"
+ }
+ },
+ "supports": {
+ "align": false,
+ "html": false,
+ "multiple": false,
+ "reusable": false,
+ "inserter": false,
+ "lock": false
+ },
+ "editorStyle": "file:./editor.css"
+}
diff --git a/packages/js/product-editor/src/blocks/inventory-email/edit.tsx b/packages/js/product-editor/src/blocks/inventory-email/edit.tsx
new file mode 100644
index 00000000000..44af82442d1
--- /dev/null
+++ b/packages/js/product-editor/src/blocks/inventory-email/edit.tsx
@@ -0,0 +1,85 @@
+/**
+ * External dependencies
+ */
+import { __, sprintf } from '@wordpress/i18n';
+import { Link } from '@woocommerce/components';
+
+import {
+ createElement,
+ Fragment,
+ createInterpolateElement,
+} from '@wordpress/element';
+import { getSetting } from '@woocommerce/settings';
+
+import { useBlockProps } from '@wordpress/block-editor';
+
+import {
+ BaseControl,
+ // @ts-expect-error `__experimentalInputControl` does exist.
+ __experimentalInputControl as InputControl,
+} from '@wordpress/components';
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore No types for this exist yet.
+// eslint-disable-next-line @woocommerce/dependency-group
+import { useEntityProp } from '@wordpress/core-data';
+
+export function Edit() {
+ const blockProps = useBlockProps( {
+ className: 'woocommerce-product-form__inventory-email',
+ } );
+ const notifyLowStockAmount = getSetting( 'notifyLowStockAmount', 2 );
+
+ const [ lowStockAmount, setLowStockAmount ] = useEntityProp(
+ 'postType',
+ 'product',
+ 'low_stock_amount'
+ );
+
+ return (
+ <>
+
+
+
+ store settings.',
+ 'woocommerce'
+ ),
+ {
+ link: (
+
+
+
+
+
+
+ { __( '(STOCK KEEPING UNIT)', 'woocommerce' ) }
+
+ ),
+ }
+ ) }
+ >
+
+ );
+}
diff --git a/packages/js/product-editor/src/blocks/inventory-sku/index.ts b/packages/js/product-editor/src/blocks/inventory-sku/index.ts
new file mode 100644
index 00000000000..15144b2b28d
--- /dev/null
+++ b/packages/js/product-editor/src/blocks/inventory-sku/index.ts
@@ -0,0 +1,17 @@
+/**
+ * Internal dependencies
+ */
+import initBlock from '../../utils/init-block';
+import metadata from './block.json';
+import { Edit } from './edit';
+
+const { name } = metadata;
+
+export { metadata, name };
+
+export const settings = {
+ example: {},
+ edit: Edit,
+};
+
+export const init = () => initBlock( { name, metadata, settings } );
diff --git a/packages/js/product-editor/src/blocks/inventory-sku/style.scss b/packages/js/product-editor/src/blocks/inventory-sku/style.scss
new file mode 100644
index 00000000000..32372ce5b82
--- /dev/null
+++ b/packages/js/product-editor/src/blocks/inventory-sku/style.scss
@@ -0,0 +1,13 @@
+
+.woocommerce-product-form_inventory-sku {
+ .components-base-control__label {
+ display: flex;
+ align-items: center;
+ }
+ .woocommerce-product-form__optional-input {
+ margin-left: $gap-smallest;
+ }
+ .woocommerce-tooltip__button {
+ padding: 0 0 0 $gap-smallest;
+ }
+}
diff --git a/packages/js/product-editor/src/components/details-categories-field/create-category-modal.tsx b/packages/js/product-editor/src/components/details-categories-field/create-category-modal.tsx
index 0b9d2ae3b31..eefec178245 100644
--- a/packages/js/product-editor/src/components/details-categories-field/create-category-modal.tsx
+++ b/packages/js/product-editor/src/components/details-categories-field/create-category-modal.tsx
@@ -32,6 +32,15 @@ type CreateCategoryModalProps = {
onCreate: ( newCategory: ProductCategory ) => void;
};
+function getCategoryItemLabel( item: ProductCategoryNode | null ): string {
+ return item?.name || '';
+}
+function getCategoryItemValue(
+ item: ProductCategoryNode | null
+): string | number {
+ return item?.id || '';
+}
+
export const CreateCategoryModal: React.FC< CreateCategoryModalProps > = ( {
initialCategoryName,
onCancel,
@@ -109,8 +118,8 @@ export const CreateCategoryModal: React.FC< CreateCategoryModalProps > = ( {
onRemove={ () => setCategoryParent( null ) }
onInputChange={ debouncedSearch }
getFilteredItems={ getFilteredItems }
- getItemLabel={ ( item ) => item?.name || '' }
- getItemValue={ ( item ) => item?.id || '' }
+ getItemLabel={ getCategoryItemLabel }
+ getItemValue={ getCategoryItemValue }
>
{ ( {
items,
diff --git a/packages/js/product-editor/src/components/details-name-block/edit.tsx b/packages/js/product-editor/src/components/details-name-block/edit.tsx
index ea38e9a0703..a06c2de2d9a 100644
--- a/packages/js/product-editor/src/components/details-name-block/edit.tsx
+++ b/packages/js/product-editor/src/components/details-name-block/edit.tsx
@@ -2,36 +2,179 @@
* External dependencies
*/
import { __ } from '@wordpress/i18n';
-import { createElement, createInterpolateElement } from '@wordpress/element';
-import { TextControl } from '@woocommerce/components';
+import {
+ createElement,
+ Fragment,
+ createInterpolateElement,
+ useState,
+} from '@wordpress/element';
+
import { useBlockProps } from '@wordpress/block-editor';
+import { cleanForSlug } from '@wordpress/url';
+import { useSelect, useDispatch } from '@wordpress/data';
+import {
+ PRODUCTS_STORE_NAME,
+ WCDataSelector,
+ Product,
+} from '@woocommerce/data';
+import {
+ Button,
+ BaseControl,
+ // @ts-expect-error `__experimentalInputControl` does exist.
+ __experimentalInputControl as InputControl,
+} from '@wordpress/components';
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore No types for this exist yet.
// eslint-disable-next-line @woocommerce/dependency-group
-import { useEntityProp } from '@wordpress/core-data';
+import { useEntityProp, useEntityId } from '@wordpress/core-data';
+
+/**
+ * Internal dependencies
+ */
+import { AUTO_DRAFT_NAME } from '../../utils';
+import { EditProductLinkModal } from '../edit-product-link-modal';
+
+import { useValidation } from '../../hooks/use-validation';
export function Edit() {
const blockProps = useBlockProps();
- const [ name, setName ] = useEntityProp( 'postType', 'product', 'name' );
+
+ const { editEntityRecord, saveEntityRecord } = useDispatch( 'core' );
+
+ const [ showProductLinkEditModal, setShowProductLinkEditModal ] =
+ useState( false );
+
+ const productId = useEntityId( 'postType', 'product' );
+ const product: Product = useSelect( ( select ) =>
+ select( 'core' ).getEditedEntityRecord(
+ 'postType',
+ 'product',
+ productId
+ )
+ );
+
+ const [ sku, setSku ] = useEntityProp( 'postType', 'product', 'sku' );
+ const [ name, setName ] = useEntityProp< string >(
+ 'postType',
+ 'product',
+ 'name'
+ );
+
+ const { permalinkPrefix, permalinkSuffix } = useSelect(
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+ // @ts-ignore
+ ( select: WCDataSelector ) => {
+ const { getPermalinkParts } = select( PRODUCTS_STORE_NAME );
+ if ( productId ) {
+ const parts = getPermalinkParts( productId );
+ return {
+ permalinkPrefix: parts?.prefix,
+ permalinkSuffix: parts?.suffix,
+ };
+ }
+ return {};
+ }
+ );
+
+ const nameIsValid = useValidation(
+ 'product/name',
+ () => Boolean( name ) && name !== AUTO_DRAFT_NAME
+ );
+
+ const setSkuIfEmpty = () => {
+ if ( sku || ! nameIsValid ) {
+ return;
+ }
+ setSku( cleanForSlug( name ) );
+ };
return (
-
-
', 'woocommerce' ),
- {
- required: (
-
- { __( '(required)', 'woocommerce' ) }
-
- ),
- }
+ <>
+
+
', 'woocommerce' ),
+ {
+ required: (
+
+ { __( '*', 'woocommerce' ) }
+
+ ),
+ }
+ ) }
+ >
+
+
+ { productId &&
+ nameIsValid &&
+ [ 'publish', 'draft' ].includes( product.status ) &&
+ permalinkPrefix && (
+
+ { __( 'Product link', 'woocommerce' ) }
+ :
+
+ { permalinkPrefix }
+ { product.slug || cleanForSlug( name ) }
+ { permalinkSuffix }
+
+
+ setShowProductLinkEditModal( true )
+ }
+ >
+ { __( 'Edit', 'woocommerce' ) }
+
+
+ ) }
+ { showProductLinkEditModal && (
+
setShowProductLinkEditModal( false ) }
+ onSaved={ () => setShowProductLinkEditModal( false ) }
+ saveHandler={ async ( updatedSlug ) => {
+ const { slug, permalink }: Product =
+ await saveEntityRecord( 'postType', 'product', {
+ id: product.id,
+ slug: updatedSlug,
+ } );
+
+ if ( slug && permalink ) {
+ editEntityRecord(
+ 'postType',
+ 'product',
+ product.id,
+ {
+ slug,
+ permalink,
+ }
+ );
+
+ return {
+ slug,
+ permalink,
+ };
+ }
+ } }
+ />
) }
- name={ 'woocommerce-product-name' }
- placeholder={ __( 'e.g. 12 oz Coffee Mug', 'woocommerce' ) }
- onChange={ setName }
- value={ name || '' }
- />
-
+
{
- onSave();
+ isBusy={ isSaving }
+ disabled={ isSaving || slug === product.slug }
+ onClick={ async () => {
+ setIsSaving( true );
+ await onSave();
+ setIsSaving( false );
} }
>
{ __( 'Save', 'woocommerce' ) }
diff --git a/packages/js/product-editor/src/components/edit-product-link-modal/test/edit-product-link-modal.test.tsx b/packages/js/product-editor/src/components/edit-product-link-modal/test/edit-product-link-modal.test.tsx
index d134dfddf8b..bb33e69164c 100644
--- a/packages/js/product-editor/src/components/edit-product-link-modal/test/edit-product-link-modal.test.tsx
+++ b/packages/js/product-editor/src/components/edit-product-link-modal/test/edit-product-link-modal.test.tsx
@@ -37,6 +37,12 @@ describe( 'EditProductLinkModal', () => {
}
onCancel={ () => {} }
onSaved={ () => {} }
+ saveHandler={ () =>
+ new Promise( () => ( {
+ slug: 'test-slug',
+ permalink: 'http://test-link',
+ } ) )
+ }
/>
);
expect(
@@ -57,6 +63,12 @@ describe( 'EditProductLinkModal', () => {
}
onCancel={ () => {} }
onSaved={ () => {} }
+ saveHandler={ () =>
+ new Promise( () => ( {
+ slug: 'test-slug',
+ permalink: 'http://test-link',
+ } ) )
+ }
/>
);
userEvent.type(
@@ -82,6 +94,12 @@ describe( 'EditProductLinkModal', () => {
}
onCancel={ () => {} }
onSaved={ () => {} }
+ saveHandler={ () =>
+ new Promise( () => ( {
+ slug: 'test-slug',
+ permalink: 'http://test-link',
+ } ) )
+ }
/>
);
userEvent.type(
diff --git a/packages/js/product-editor/src/components/editor/init-blocks.ts b/packages/js/product-editor/src/components/editor/init-blocks.ts
index ea4d0128b1d..346fecf1720 100644
--- a/packages/js/product-editor/src/components/editor/init-blocks.ts
+++ b/packages/js/product-editor/src/components/editor/init-blocks.ts
@@ -22,6 +22,10 @@ import { init as initPricing } from '../pricing-block';
import { init as initCollapsible } from '../collapsible-block';
import { init as initScheduleSale } from '../../blocks/schedule-sale';
import { init as initTrackInventory } from '../../blocks/track-inventory';
+import { init as initSku } from '../../blocks/inventory-sku';
+import { init as initConditional } from '../../blocks/conditional';
+import { init as initLowStockQty } from '../../blocks/inventory-email';
+import { init as initCheckbox } from '../../blocks/checkbox';
export const initBlocks = () => {
const coreBlocks = __experimentalGetCoreBlocks();
@@ -42,4 +46,8 @@ export const initBlocks = () => {
initCollapsible();
initScheduleSale();
initTrackInventory();
+ initSku();
+ initConditional();
+ initLowStockQty();
+ initCheckbox();
};
diff --git a/packages/js/product-editor/src/components/radio/editor.scss b/packages/js/product-editor/src/components/radio/editor.scss
index 8b1729d3d81..185c801248e 100644
--- a/packages/js/product-editor/src/components/radio/editor.scss
+++ b/packages/js/product-editor/src/components/radio/editor.scss
@@ -13,7 +13,6 @@
font-size: 16px;
font-weight: 600;
color: #1e1e1e;
- margin-bottom: $gap-smaller;
}
&__description {
@@ -24,4 +23,4 @@
.components-base-control__field > .components-v-stack {
gap: $gap;
}
-}
\ No newline at end of file
+}
diff --git a/packages/js/product-editor/src/style.scss b/packages/js/product-editor/src/style.scss
index be7eb118202..825a8d367fe 100644
--- a/packages/js/product-editor/src/style.scss
+++ b/packages/js/product-editor/src/style.scss
@@ -9,9 +9,13 @@
@import 'components/images/editor.scss';
@import 'components/block-editor/style.scss';
@import 'components/radio/editor.scss';
+@import 'blocks/checkbox/editor.scss';
@import 'components/section/editor.scss';
@import 'components/tab/editor.scss';
@import 'components/tabs/style.scss';
@import 'components/details-summary-block/style.scss';
@import 'components/product-mvp-ces-footer/style.scss';
@import 'components/product-mvp-feedback-modal/style.scss';
+@import 'components/details-name-block/style.scss';
+@import 'blocks/inventory-sku/style.scss';
+@import 'blocks/inventory-email/style.scss';
diff --git a/packages/js/product-editor/src/utils/index.ts b/packages/js/product-editor/src/utils/index.ts
index 67a0014effc..31d0ce7f148 100644
--- a/packages/js/product-editor/src/utils/index.ts
+++ b/packages/js/product-editor/src/utils/index.ts
@@ -22,6 +22,7 @@ import { preventLeavingProductForm } from './prevent-leaving-product-form';
export * from './create-ordered-children';
export * from './sort-fills-by-order';
export * from './init-blocks';
+export * from './product-apifetch-middleware';
export {
AUTO_DRAFT_NAME,
diff --git a/packages/js/product-editor/src/utils/product-apifetch-middleware.ts b/packages/js/product-editor/src/utils/product-apifetch-middleware.ts
new file mode 100644
index 00000000000..b33c5d8ca71
--- /dev/null
+++ b/packages/js/product-editor/src/utils/product-apifetch-middleware.ts
@@ -0,0 +1,34 @@
+/**
+ * External dependencies
+ */
+import apiFetch from '@wordpress/api-fetch';
+import { getQuery } from '@woocommerce/navigation';
+
+const isProductEditor = () => {
+ const query: { page?: string; path?: string } = getQuery();
+ return (
+ query?.page === 'wc-admin' &&
+ [ '/add-product', '/product/' ].some( ( path ) =>
+ query?.path?.startsWith( path )
+ )
+ );
+};
+
+export const productApiFetchMiddleware = () => {
+ // This is needed to ensure that we use the correct namespace for the entity data store
+ // without disturbing the rest_namespace outside of the product block editor.
+ apiFetch.use( ( options, next ) => {
+ const versionTwoRegex = new RegExp( '^/wp/v2/product' );
+ if (
+ options.path &&
+ versionTwoRegex.test( options?.path ) &&
+ isProductEditor()
+ ) {
+ options.path = options.path.replace(
+ versionTwoRegex,
+ '/wc/v3/products'
+ );
+ }
+ return next( options );
+ } );
+};
diff --git a/plugins/woocommerce-admin/client/products/hooks/use-product-entity-record.ts b/plugins/woocommerce-admin/client/products/hooks/use-product-entity-record.ts
index b0f03086810..823e371869d 100644
--- a/plugins/woocommerce-admin/client/products/hooks/use-product-entity-record.ts
+++ b/plugins/woocommerce-admin/client/products/hooks/use-product-entity-record.ts
@@ -4,7 +4,6 @@
import { AUTO_DRAFT_NAME } from '@woocommerce/product-editor';
import { Product } from '@woocommerce/data';
import { useDispatch, resolveSelect } from '@wordpress/data';
-
import { useEffect, useState } from '@wordpress/element';
export function useProductEntityRecord(
diff --git a/plugins/woocommerce-admin/client/products/product-page.tsx b/plugins/woocommerce-admin/client/products/product-page.tsx
index 6b414978f5a..2f67ab5fadb 100644
--- a/plugins/woocommerce-admin/client/products/product-page.tsx
+++ b/plugins/woocommerce-admin/client/products/product-page.tsx
@@ -4,6 +4,7 @@
import {
__experimentalEditor as Editor,
ProductEditorSettings,
+ productApiFetchMiddleware,
} from '@woocommerce/product-editor';
import { Spinner } from '@wordpress/components';
@@ -20,6 +21,8 @@ import './fills/product-block-editor-fills';
declare const productBlockEditorSettings: ProductEditorSettings;
+productApiFetchMiddleware();
+
export default function ProductPage() {
const { productId } = useParams();
diff --git a/plugins/woocommerce/.wp-env.json b/plugins/woocommerce/.wp-env.json
index be25f189c38..618c4a21fdf 100644
--- a/plugins/woocommerce/.wp-env.json
+++ b/plugins/woocommerce/.wp-env.json
@@ -1,19 +1,24 @@
{
- "phpVersion": "7.4",
- "plugins": [ "." ],
- "config": {
- "JETPACK_AUTOLOAD_DEV": true,
- "WP_DEBUG_LOG": true,
- "WP_DEBUG_DISPLAY": true,
- "ALTERNATE_WP_CRON": true
- },
- "env": {
- "development": {},
- "tests": {
- "port": 8086,
- "config": {
- "ALTERNATE_WP_CRON": false
- }
- }
- }
-}
+ "phpVersion": "7.4",
+ "plugins": [
+ "."
+ ],
+ "config": {
+ "JETPACK_AUTOLOAD_DEV": true,
+ "WP_DEBUG_LOG": true,
+ "WP_DEBUG_DISPLAY": true,
+ "ALTERNATE_WP_CRON": true
+ },
+ "mappings": {
+ "wp-cli.yml": ".\/tests\/wp-cli.yml"
+ },
+ "env": {
+ "development": [],
+ "tests": {
+ "port": 8086,
+ "config": {
+ "ALTERNATE_WP_CRON": false
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/plugins/woocommerce/changelog/add-e2e-tests-wp-version-support b/plugins/woocommerce/changelog/add-e2e-tests-wp-version-support
new file mode 100644
index 00000000000..0525f22750f
--- /dev/null
+++ b/plugins/woocommerce/changelog/add-e2e-tests-wp-version-support
@@ -0,0 +1,4 @@
+Significance: patch
+Type: add
+
+Allows the WP, WC & PHP version to be specified in .wp-env.json for e2e and api tests
diff --git a/plugins/woocommerce/changelog/add-inventory-advanced-37401 b/plugins/woocommerce/changelog/add-inventory-advanced-37401
new file mode 100644
index 00000000000..6bbe1d6982d
--- /dev/null
+++ b/plugins/woocommerce/changelog/add-inventory-advanced-37401
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Adding checkbox, conditional and inventory email blocks to product blocks editor.
diff --git a/plugins/woocommerce/changelog/add-inventory-sku-block-37399 b/plugins/woocommerce/changelog/add-inventory-sku-block-37399
new file mode 100644
index 00000000000..07efb4ad5cb
--- /dev/null
+++ b/plugins/woocommerce/changelog/add-inventory-sku-block-37399
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Adding inventory section and sku blocks to product block editor.
diff --git a/plugins/woocommerce/changelog/e2e-dismiss-tour-product-variations b/plugins/woocommerce/changelog/e2e-dismiss-tour-product-variations
new file mode 100644
index 00000000000..ad3f2217be1
--- /dev/null
+++ b/plugins/woocommerce/changelog/e2e-dismiss-tour-product-variations
@@ -0,0 +1,4 @@
+Significance: patch
+Type: tweak
+
+Update to the merchant variable product e2e test
diff --git a/plugins/woocommerce/changelog/fix-37200 b/plugins/woocommerce/changelog/fix-37200
new file mode 100644
index 00000000000..ecce3e178be
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-37200
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add a category for product editor blocks
diff --git a/plugins/woocommerce/changelog/fix-37650-delete-meta-data b/plugins/woocommerce/changelog/fix-37650-delete-meta-data
new file mode 100644
index 00000000000..1a27725d278
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-37650-delete-meta-data
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Add method delete_meta_data_value to WC_Data objects
diff --git a/plugins/woocommerce/changelog/fix-37657 b/plugins/woocommerce/changelog/fix-37657
new file mode 100644
index 00000000000..43d36063725
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-37657
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Lock the product block editor template root
diff --git a/plugins/woocommerce/changelog/fix-37660 b/plugins/woocommerce/changelog/fix-37660
new file mode 100644
index 00000000000..19479c9b9bf
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-37660
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Use first meta value for HPOS migration when there are duplicates for flat column.
diff --git a/plugins/woocommerce/changelog/fix-empty-attributes-tracking b/plugins/woocommerce/changelog/fix-empty-attributes-tracking
new file mode 100644
index 00000000000..ecbc77d5177
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-empty-attributes-tracking
@@ -0,0 +1,4 @@
+Significance: patch
+Type: tweak
+
+Exclude empty attributes from the attribute count when tracking product updates.
diff --git a/plugins/woocommerce/changelog/fix-order_key_migration b/plugins/woocommerce/changelog/fix-order_key_migration
new file mode 100644
index 00000000000..0dd82f9f565
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-order_key_migration
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Remove unique constraint from order_key, since orders can be created with empty order keys, which then conflict with the constraint.
diff --git a/plugins/woocommerce/changelog/fix-rest-namespace-blocks-37619 b/plugins/woocommerce/changelog/fix-rest-namespace-blocks-37619
new file mode 100644
index 00000000000..683a9b7bc9f
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-rest-namespace-blocks-37619
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Removing modification to rest_namespace on post type and replacing with middleware.
diff --git a/plugins/woocommerce/changelog/update-16525-check-php-version-for-extensions b/plugins/woocommerce/changelog/update-16525-check-php-version-for-extensions
new file mode 100644
index 00000000000..9cb44346db3
--- /dev/null
+++ b/plugins/woocommerce/changelog/update-16525-check-php-version-for-extensions
@@ -0,0 +1,4 @@
+Significance: minor
+Type: update
+
+Support min_php_version and min_wp_version for the free extensions feed
diff --git a/plugins/woocommerce/changelog/update-37690-shipping-task-is-not-marked-as-completed b/plugins/woocommerce/changelog/update-37690-shipping-task-is-not-marked-as-completed
new file mode 100644
index 00000000000..2670a0d49a0
--- /dev/null
+++ b/plugins/woocommerce/changelog/update-37690-shipping-task-is-not-marked-as-completed
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Delete shipping zone count transient on woocommerce_shipping_zone_method_added and woocommerce_after_shipping_zone_object_save
diff --git a/plugins/woocommerce/changelog/update-test-docs-php-8 b/plugins/woocommerce/changelog/update-test-docs-php-8
new file mode 100644
index 00000000000..b8c0c05f43d
--- /dev/null
+++ b/plugins/woocommerce/changelog/update-test-docs-php-8
@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+Comment: No changelog entry needed, this is an update to developer-facing documentation only.
+
+
diff --git a/plugins/woocommerce/includes/abstracts/abstract-wc-data.php b/plugins/woocommerce/includes/abstracts/abstract-wc-data.php
index 863db390320..1079c52f9c1 100644
--- a/plugins/woocommerce/includes/abstracts/abstract-wc-data.php
+++ b/plugins/woocommerce/includes/abstracts/abstract-wc-data.php
@@ -506,6 +506,26 @@ abstract class WC_Data {
}
}
+ /**
+ * Delete meta data with a matching value.
+ *
+ * @since 7.7.0
+ * @param string $key Meta key.
+ * @param mixed $value Meta value. Entries will only be removed that match the value.
+ */
+ public function delete_meta_data_value( $key, $value ) {
+ $this->maybe_read_meta_data();
+ $array_keys = array_keys( wp_list_pluck( $this->meta_data, 'key' ), $key, true );
+
+ if ( $array_keys ) {
+ foreach ( $array_keys as $array_key ) {
+ if ( $value === $this->meta_data[ $array_key ]->value ) {
+ $this->meta_data[ $array_key ]->value = null;
+ }
+ }
+ }
+ }
+
/**
* Delete meta data.
*
diff --git a/plugins/woocommerce/includes/class-wc-post-types.php b/plugins/woocommerce/includes/class-wc-post-types.php
index e2c74e2afe7..5670bf77b90 100644
--- a/plugins/woocommerce/includes/class-wc-post-types.php
+++ b/plugins/woocommerce/includes/class-wc-post-types.php
@@ -365,7 +365,6 @@ class WC_Post_Types {
'has_archive' => $has_archive,
'show_in_nav_menus' => true,
'show_in_rest' => true,
- 'rest_namespace' => 'wp/v3',
'template' => array(
array(
'woocommerce/product-tab',
@@ -586,10 +585,97 @@ class WC_Post_Types {
),
array(
array(
- 'woocommerce/product-track-inventory-fields',
- array(),
+ 'woocommerce/product-section',
+ array(
+ 'title' => __( 'Inventory', 'woocommerce' ),
+ 'description' => sprintf(
+ /* translators: %1$s: Inventory settings link opening tag. %2$s: Inventory settings link closing tag.*/
+ __( 'Set up and manage inventory for this product, including status and available quantity. %1$sManage store inventory settings%2$s', 'woocommerce' ),
+ '',
+ ' '
+ ),
+ 'icon' => array(
+ 'src' => '',
' '
),
- 'image_url' => plugins_url( '/assets/images/onboarding/google.svg', WC_PLUGIN_FILE ),
- 'manage_url' => 'admin.php?page=wc-admin&path=%2Fgoogle%2Fstart',
- 'is_built_by_wc' => true,
- 'is_visible' => [
+ 'image_url' => plugins_url( '/assets/images/onboarding/google.svg', WC_PLUGIN_FILE ),
+ 'manage_url' => 'admin.php?page=wc-admin&path=%2Fgoogle%2Fstart',
+ 'is_built_by_wc' => true,
+ 'is_visible' => [
[
'type' => 'not',
'operand' => [
@@ -125,11 +126,12 @@ class DefaultFreeExtensions {
'is_built_by_wc' => false,
],
'pinterest-for-woocommerce' => [
- 'name' => __( 'Pinterest for WooCommerce', 'woocommerce' ),
- 'description' => __( 'Get your products in front of Pinners searching for ideas and things to buy.', 'woocommerce' ),
- 'image_url' => plugins_url( '/assets/images/onboarding/pinterest.png', WC_PLUGIN_FILE ),
- 'manage_url' => 'admin.php?page=wc-admin&path=%2Fpinterest%2Flanding',
- 'is_built_by_wc' => true,
+ 'name' => __( 'Pinterest for WooCommerce', 'woocommerce' ),
+ 'description' => __( 'Get your products in front of Pinners searching for ideas and things to buy.', 'woocommerce' ),
+ 'image_url' => plugins_url( '/assets/images/onboarding/pinterest.png', WC_PLUGIN_FILE ),
+ 'manage_url' => 'admin.php?page=wc-admin&path=%2Fpinterest%2Flanding',
+ 'is_built_by_wc' => true,
+ 'min_php_version' => '7.3',
],
'pinterest-for-woocommerce:alt' => [
'name' => __( 'Pinterest for WooCommerce', 'woocommerce' ),
@@ -349,6 +351,7 @@ class DefaultFreeExtensions {
DefaultPaymentGateways::get_rules_for_cbd( false ),
],
'is_built_by_wc' => true,
+ 'min_wp_version' => '5.9',
],
'woocommerce-services:shipping' => [
'description' => sprintf(
@@ -516,6 +519,7 @@ class DefaultFreeExtensions {
],
],
'is_built_by_wc' => false,
+ 'min_wp_version' => '6.0',
],
'mailpoet' => [
'name' => __( 'MailPoet', 'woocommerce' ),
diff --git a/plugins/woocommerce/src/Internal/Admin/RemoteFreeExtensions/EvaluateExtension.php b/plugins/woocommerce/src/Internal/Admin/RemoteFreeExtensions/EvaluateExtension.php
index 100dd94a125..2589a7d2847 100644
--- a/plugins/woocommerce/src/Internal/Admin/RemoteFreeExtensions/EvaluateExtension.php
+++ b/plugins/woocommerce/src/Internal/Admin/RemoteFreeExtensions/EvaluateExtension.php
@@ -21,6 +21,7 @@ class EvaluateExtension {
* @return object The evaluated extension.
*/
public static function evaluate( $extension ) {
+ global $wp_version;
$rule_evaluator = new RuleEvaluator();
if ( isset( $extension->is_visible ) ) {
@@ -30,6 +31,17 @@ class EvaluateExtension {
$extension->is_visible = true;
}
+ // Run PHP and WP version chcecks.
+ if ( true === $extension->is_visible ) {
+ if ( isset( $extension->min_php_version ) && ! version_compare( PHP_VERSION, $extension->min_php_version, '>=' ) ) {
+ $extension->is_visible = false;
+ }
+
+ if ( isset( $extension->min_wp_version ) && ! version_compare( $wp_version, $extension->min_wp_version, '>=' ) ) {
+ $extension->is_visible = false;
+ }
+ }
+
$installed_plugins = PluginsHelper::get_installed_plugin_slugs();
$activated_plugins = PluginsHelper::get_active_plugin_slugs();
$extension->is_installed = in_array( explode( ':', $extension->key )[0], $installed_plugins, true );
diff --git a/plugins/woocommerce/src/Internal/DataStores/Orders/OrdersTableDataStore.php b/plugins/woocommerce/src/Internal/DataStores/Orders/OrdersTableDataStore.php
index 4050de796f1..f9d15c1e53a 100644
--- a/plugins/woocommerce/src/Internal/DataStores/Orders/OrdersTableDataStore.php
+++ b/plugins/woocommerce/src/Internal/DataStores/Orders/OrdersTableDataStore.php
@@ -847,7 +847,7 @@ WHERE
$wpdb->prepare(
"SELECT {$orders_table}.id FROM {$orders_table}
INNER JOIN {$op_table} ON {$op_table}.order_id = {$orders_table}.id
- WHERE {$op_table}.order_key = %s",
+ WHERE {$op_table}.order_key = %s AND {$op_table}.order_key != ''",
$order_key
)
);
@@ -2412,7 +2412,7 @@ CREATE TABLE $operational_data_table_name (
discount_total_amount decimal(26, 8) NULL,
recorded_sales tinyint(1) NULL,
UNIQUE KEY order_id (order_id),
- UNIQUE KEY order_key (order_key)
+ KEY order_key (order_key)
) $collate;
CREATE TABLE $meta_table (
id bigint(20) unsigned auto_increment primary key,
diff --git a/plugins/woocommerce/tests/README.md b/plugins/woocommerce/tests/README.md
index 6e662606437..7d931f510e9 100644
--- a/plugins/woocommerce/tests/README.md
+++ b/plugins/woocommerce/tests/README.md
@@ -97,32 +97,6 @@ $ tests/bin/install.sh woocommerce_tests_1 root root
Note that `woocommerce_tests` changed to `woocommerce_tests_1` as the `woocommerce_tests` database already exists due to the prior command.
-### Running tests in PHP 8
-
-WooCommerce currently supports PHP versions from 7.0 up to 8.0, and this poses an issue with PHPUnit:
-
-* The latest PHPUnit version that supports PHP 7.0 is 6.5.14
-* The latest PHPUnit version that WordPress (and thus WooCommerce) supports is 7.5.20, but that version doesn't work on PHP 8
-
-To workaround this, the testing strategy used by WooCommerce is as follows:
-
-* We normally use PHPUnit 6.5.14
-* For PHP 8 we use [a custom fork of PHPUnit 7.5.20 with support for PHP 8](https://github.com/woocommerce/phpunit/pull/1). WooCommerce's GitHub Actions CI workflow is configured to use this fork instead of the old version 6 when running in PHP 8.
-
-If you want to run the tests locally under PHP 8 you'll need to temporarily modify `composer.json` to use the custom PHPUnit fork in the same way that the GitHub Actions CI workflow file does. These are the commands that you'll need (run them after a regular `composer install` from within the `plugins/woocommerce` directory):
-
-```shell
-curl -L https://github.com/woocommerce/phpunit/archive/add-compatibility-with-php8-to-phpunit-7.zip -o /tmp/phpunit-7.5-fork.zip
-unzip -d /tmp/phpunit-7.5-fork /tmp/phpunit-7.5-fork.zip
-composer bin phpunit config --unset platform
-composer bin phpunit config repositories.0 '{"type": "path", "url": "/tmp/phpunit-7.5-fork/phpunit-add-compatibility-with-php8-to-phpunit-7", "options": {"symlink": false}}'
-composer bin phpunit require --dev -W phpunit/phpunit:@dev --ignore-platform-reqs
-rm -rf ./vendor/phpunit/
-composer dump-autoload
-```
-
-Just remember that you can't include the modified `composer.json` in any commit!
-
## Writing Tests
There are three different unit test directories:
diff --git a/plugins/woocommerce/tests/e2e-pw/README.md b/plugins/woocommerce/tests/e2e-pw/README.md
index 4cb9d6fb2a8..5df175f010b 100644
--- a/plugins/woocommerce/tests/e2e-pw/README.md
+++ b/plugins/woocommerce/tests/e2e-pw/README.md
@@ -57,13 +57,30 @@ To see all options, run `cd plugins/woocommerce && pnpm playwright test --help`
The default values are:
-- Latest stable WordPress version
+- Latest stable WordPress version
- PHP 7.4
- MariaDB
- URL: `http://localhost:8086/`
- Admin credentials: `admin/password`
-If you want to customize these, check the [Test Variables](#test-variables) section.
+If you want to customize the port or admin credentials, check the [Test Variables](#test-variables) section.
+
+If you would like to customize the `PHP`, `WordPress` or `WooCommerce` versions installed in the environment, you can define `UPDATE_WP_JSON_FILE=1` along with any or all of the following env vars when building the environment.
+- `WP_VERSION`
+ - Acceptable versions are `nightly`, `trunk`, and any version listed on [WordPress Releases] page.
+- `WC_VERSION`
+ - Acceptable versions can be found on the [WooCommerce Releases](https://github.com/woocommerce/woocommerce/releases) page
+- `PHP`
+ - Any PHP version you see it. Please note that WooCommerce requries a minimum of PHP 7.2.
+
+**Example**
+
+The command below will create and environment with WordPress version 6.2, WooCommerce version 7.5.1 and PHP version 8.2 installed.
+
+`UPDATE_WP_JSON_FILE=1 WP_VERSION=6.2 WC_TEST_VERSION=7.5.1 PHP_VERSION=8.2 pnpm run env:test`
+
+If you'd like to run with the default configuation, simply remove the `UPDATE_WP_JSON_FILE`.
+
For more information how to configure the test environment for `wp-env`, please checkout the [documentation](https://github.com/WordPress/gutenberg/tree/trunk/packages/env) documentation.
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/test-env-setup.sh b/plugins/woocommerce/tests/e2e-pw/bin/test-env-setup.sh
index 9f3d7601740..623f4caa128 100755
--- a/plugins/woocommerce/tests/e2e-pw/bin/test-env-setup.sh
+++ b/plugins/woocommerce/tests/e2e-pw/bin/test-env-setup.sh
@@ -4,39 +4,39 @@ ENABLE_HPOS="${ENABLE_HPOS:-0}"
ENABLE_NEW_PRODUCT_EDITOR="${ENABLE_NEW_PRODUCT_EDITOR:-0}"
ENABLE_TRACKING="${ENABLE_TRACKING:-0}"
-wp-env run tests-cli "wp theme install twentynineteen --activate"
+echo -e 'Normalize permissions for wp-content directory \n'
+docker-compose -f $(wp-env install-path)/docker-compose.yml run --rm -u www-data -e HOME=/tmp tests-wordpress sh -c "chmod -c ugo+w /var/www/html/wp-config.php \
+&& chmod -c ugo+w /var/www/html/wp-content \
+&& chmod -c ugo+w /var/www/html/wp-content/themes \
+&& chmod -c ugo+w /var/www/html/wp-content/plugins"
-wp-env run tests-cli "wp plugin install https://github.com/WP-API/Basic-Auth/archive/master.zip --activate"
-
-wp-env run tests-cli "wp plugin install wp-mail-logging --activate"
-
-wp-env run tests-cli "wp plugin install https://github.com/woocommerce/woocommerce-reset/archive/refs/heads/trunk.zip --activate"
-
-wp-env run tests-cli "wp rewrite structure /%postname%/"
-
-wp-env run tests-cli "wp user create customer customer@woocommercecoree2etestsuite.com \
+docker-compose -f $(wp-env install-path)/docker-compose.yml run --rm -u www-data -e HOME=/tmp tests-cli sh -c "ls \
+&& wp theme install twentynineteen --activate \
+&& wp plugin install https://github.com/WP-API/Basic-Auth/archive/master.zip --activate \
+&& wp plugin install wp-mail-logging --activate \
+&& wp plugin install https://github.com/woocommerce/woocommerce-reset/archive/refs/heads/trunk.zip --activate \
+&& wp rewrite structure '/%postname%/' --hard \
+&& wp user create customer customer@woocommercecoree2etestsuite.com \
--user_pass=password \
--role=subscriber \
--first_name='Jane' \
--last_name='Smith' \
- --path=/var/www/html \
- --user_registered='2022-01-01 12:23:45'
-"
+ --user_registered='2022-01-01 12:23:45'"
echo -e 'Update Blog Name \n'
-wp-env run tests-cli 'wp option update blogname "WooCommerce Core E2E Test Suite"'
+docker-compose -f $(wp-env install-path)/docker-compose.yml run --rm -u $(id -u) -e HOME=/tmp tests-cli sh -c 'wp option update blogname "WooCommerce Core E2E Test Suite"'
if [ $ENABLE_HPOS == 1 ]; then
echo 'Enable the COT feature'
- wp-env run tests-cli "wp plugin install https://gist.github.com/vedanshujain/564afec8f5e9235a1257994ed39b1449/archive/b031465052fc3e04b17624acbeeb2569ef4d5301.zip --activate"
+ docker-compose -f $(wp-env install-path)/docker-compose.yml run --rm -u www-data -e HOME=/tmp tests-cli sh -c "wp plugin install https://gist.github.com/vedanshujain/564afec8f5e9235a1257994ed39b1449/archive/b031465052fc3e04b17624acbeeb2569ef4d5301.zip --activate"
fi
if [ $ENABLE_NEW_PRODUCT_EDITOR == 1 ]; then
echo 'Enable the new product editor feature'
- wp-env run tests-cli "wp plugin install https://github.com/woocommerce/woocommerce-experimental-enable-new-product-editor/releases/download/0.1.0/woocommerce-experimental-enable-new-product-editor.zip --activate"
+ docker-compose -f $(wp-env install-path)/docker-compose.yml run --rm -u www-data -e HOME=/tmp tests-cli sh -c "wp plugin install https://github.com/woocommerce/woocommerce-experimental-enable-new-product-editor/releases/download/0.1.0/woocommerce-experimental-enable-new-product-editor.zip --activate"
fi
if [ $ENABLE_TRACKING == 1 ]; then
echo 'Enable tracking'
- wp-env run tests-cli "wp option update woocommerce_allow_tracking 'yes'"
+ docker-compose -f $(wp-env install-path)/docker-compose.yml run --rm -u $(id -u) -e HOME=/tmp tests-cli sh -c "wp option update woocommerce_allow_tracking 'yes'"
fi
diff --git a/plugins/woocommerce/tests/e2e-pw/bin/update-wp-env.php b/plugins/woocommerce/tests/e2e-pw/bin/update-wp-env.php
new file mode 100644
index 00000000000..07e5be7c0db
--- /dev/null
+++ b/plugins/woocommerce/tests/e2e-pw/bin/update-wp-env.php
@@ -0,0 +1,99 @@
+wp_env_path ) ) {
+ $this->wp_json = json_decode( file_get_contents( $this->wp_env_path ), true );
+ } else {
+ throw new Exception( ".wp_env.json doesn't exist!" );
+ }
+
+ $env = getenv();
+
+ $this->wp_version = isset( $env['WP_VERSION'] ) ? $env['WP_VERSION'] : null;
+ $this->wc_version = isset( $env['WC_TEST_VERSION'] ) ? $env['WC_TEST_VERSION'] : null;
+ $this->php_version = isset( $env['PHP_VERSION'] ) ? $env['PHP_VERSION'] : null;
+ }
+
+ public function set_wp_version(){
+ if ( $this->wp_version ) {
+
+ $version = "WordPress/WordPress#tags/$this->wp_version";
+
+ if ( 'trunk' === $this->wp_version ) {
+ $version = "WordPress/WordPress";
+ }
+
+ if ( 'nightly' === $this->wp_version ) {
+ $version = "https://wordpress.org/nightly-builds/wordpress-latest.zip";
+ }
+
+ echo "Set WP Version to $version \n";
+ $this->wp_json["core"] = $version;
+ }
+ }
+
+ public function revert_wp_version(){
+ unset( $this->wp_json["core"] );
+ }
+
+ public function set_wc_version(){
+ if ( $this->wc_version ) {
+ echo "Set WC Version to $this->wc_version \n";
+ $this->wp_json["plugins"] = [ "https://github.com/woocommerce/woocommerce/releases/download/$this->wc_version/woocommerce.zip" ];
+ }
+ }
+
+ public function revert_wc_version(){
+ $this->wp_json["plugins"] = [ "." ];
+ }
+
+ public function set_php_version(){
+ if ( $this->php_version ) {
+ echo "Set PHP Version to $this->php_version \n";
+ $this->wp_json["phpVersion"] = $this->php_version;
+ }
+ }
+
+ public function revert_php_version(){
+ $this->wp_json["phpVersion"] = "7.4";
+ }
+
+ public function update(){
+ $this->set_wp_version();
+ $this->set_wc_version();
+ $this->set_php_version();
+ file_put_contents( $this->wp_env_path, json_encode( $this->wp_json, JSON_PRETTY_PRINT ) );
+ }
+
+ public function revert(){
+ $this->revert_wp_version();
+ $this->revert_wc_version();
+ $this->revert_php_version();
+ file_put_contents( $this->wp_env_path, json_encode( $this->wp_json, JSON_PRETTY_PRINT ) );
+
+ echo "Reverted .wp-env.json \n";
+ }
+ }
+}
+
+
+$env = getenv();
+$update_wp_json = isset( $env['UPDATE_WP_JSON_FILE'] ) ? $env['UPDATE_WP_JSON_FILE'] : null;
+
+if ( is_null( $update_wp_json ) || $update_wp_json == false ) {
+ $wp_json = new UPDATE_WP_JSON();
+ $wp_json->revert();
+} else {
+ $wp_json = new UPDATE_WP_JSON();
+ $wp_json->update();
+}
diff --git a/plugins/woocommerce/tests/e2e-pw/tests/merchant/create-variable-product.spec.js b/plugins/woocommerce/tests/e2e-pw/tests/merchant/create-variable-product.spec.js
index 446d3e64c87..ad4842cfb60 100644
--- a/plugins/woocommerce/tests/e2e-pw/tests/merchant/create-variable-product.spec.js
+++ b/plugins/woocommerce/tests/e2e-pw/tests/merchant/create-variable-product.spec.js
@@ -75,36 +75,6 @@ test.describe( 'Add New Variable Product Page', () => {
await resetVariableProductTour( baseURL, browser );
} );
- test( 'shows the variable product tour', async ( { page } ) => {
- await page.goto( 'wp-admin/post-new.php?post_type=product' );
- await page.selectOption( '#product-type', 'variable' );
-
- // because of the way that the tour is dynamically positioned,
- // Playwright can't automatically scroll the button into view,
- // so we will manually scroll the attributes tab into view,
- // which will cause the tour to be scrolled into view as well
- await page
- .locator( '.attribute_tab' )
- .getByRole( 'link', { name: 'Attributes' } )
- .scrollIntoViewIfNeeded();
-
- // the tour only seems to display when not running headless, so just make sure
- if ( await page.locator( '.components-card-header' ).nth(1).isVisible() ) {
- // dismiss the variable product tour
- await page
- .getByRole( 'button', { name: 'Close Tour' } )
- .click();
-
- // wait for the tour's dismissal to be saved
- await page.waitForResponse(
- ( response ) =>
- response.url().includes( '/users/' ) &&
- response.status() === 200
- );
-
- }
- } );
-
test( 'can create product, attributes and variations, edit variations and delete variations', async ( {
page,
} ) => {
@@ -112,6 +82,26 @@ test.describe( 'Add New Variable Product Page', () => {
await page.fill( '#title', variableProductName );
await page.selectOption( '#product-type', 'variable' );
+ await page
+ .locator( '.attribute_tab' )
+ .getByRole( 'link', { name: 'Attributes' } )
+ .scrollIntoViewIfNeeded();
+
+ // the tour only seems to display when not running headless, so just make sure
+ if ( await page.locator( '.woocommerce-tour-kit-step__heading' ).isVisible() ) {
+ // dismiss the variable product tour
+ await page
+ .getByRole( 'button', { name: 'Close Tour' } )
+ .click();
+
+ // wait for the tour's dismissal to be saved
+ await page.waitForResponse(
+ ( response ) =>
+ response.url().includes( '/users/' ) &&
+ response.status() === 200
+ );
+ }
+
await page.click( 'a[href="#product_attributes"]' );
// add 3 attributes
@@ -251,7 +241,28 @@ test.describe( 'Add New Variable Product Page', () => {
} ) => {
await page.goto( productPageURL );
await page.fill( '#title', manualVariableProduct );
- await page.selectOption( '#product-type', 'variable', { force: true } );
+ await page.selectOption( '#product-type', 'variable' );
+
+ await page
+ .locator( '.attribute_tab' )
+ .getByRole( 'link', { name: 'Attributes' } )
+ .scrollIntoViewIfNeeded();
+
+ // the tour only seems to display when not running headless, so just make sure
+ if ( await page.locator( '.woocommerce-tour-kit-step__heading' ).isVisible() ) {
+ // dismiss the variable product tour
+ await page
+ .getByRole( 'button', { name: 'Close Tour' } )
+ .click();
+
+ // wait for the tour's dismissal to be saved
+ await page.waitForResponse(
+ ( response ) =>
+ response.url().includes( '/users/' ) &&
+ response.status() === 200
+ );
+ }
+
await page.click( 'a[href="#product_attributes"]' );
// add 3 attributes
for ( let i = 0; i < 3; i++ ) {
diff --git a/plugins/woocommerce/tests/legacy/unit-tests/crud/data.php b/plugins/woocommerce/tests/legacy/unit-tests/crud/data.php
index e4a4c4ce33b..76a8e85c921 100644
--- a/plugins/woocommerce/tests/legacy/unit-tests/crud/data.php
+++ b/plugins/woocommerce/tests/legacy/unit-tests/crud/data.php
@@ -325,6 +325,30 @@ class WC_Tests_CRUD_Data extends WC_Unit_Test_Case {
$this->assertEmpty( $object->get_meta( 'test_meta_key' ) );
}
+ /**
+ * Test deleting meta selectively.
+ */
+ public function test_delete_meta_data_value() {
+ $object = $this->create_test_post();
+ $object_id = $object->get_id();
+ add_metadata( 'post', $object_id, 'test_meta_key', 'val1' );
+ add_metadata( 'post', $object_id, 'test_meta_key', 'val2' );
+ add_metadata( 'post', $object_id, 'test_meta_key', array( 'foo', 'bar' ) );
+ $object = new WC_Mock_WC_Data( $object_id );
+
+ $this->assertCount( 3, $object->get_meta( 'test_meta_key', false ) );
+
+ $object->delete_meta_data_value( 'test_meta_key', 'val1' );
+ $this->assertCount( 2, $object->get_meta( 'test_meta_key', false ) );
+
+ $object->delete_meta_data_value( 'test_meta_key', array( 'bar', 'baz' ) );
+ $this->assertCount( 2, $object->get_meta( 'test_meta_key', false ) );
+
+ $object->delete_meta_data_value( 'test_meta_key', array( 'foo', 'bar' ) );
+ $this->assertCount( 1, $object->get_meta( 'test_meta_key', false ) );
+
+ $this->assertEquals( 'val2', $object->get_meta( 'test_meta_key' ) );
+ }
/**
* Test saving metadata (Actually making sure changes are written to DB).
diff --git a/plugins/woocommerce/tests/php/src/Database/Migrations/CustomOrderTable/PostsToOrdersMigrationControllerTest.php b/plugins/woocommerce/tests/php/src/Database/Migrations/CustomOrderTable/PostsToOrdersMigrationControllerTest.php
index 1670e5444c3..072125136fb 100644
--- a/plugins/woocommerce/tests/php/src/Database/Migrations/CustomOrderTable/PostsToOrdersMigrationControllerTest.php
+++ b/plugins/woocommerce/tests/php/src/Database/Migrations/CustomOrderTable/PostsToOrdersMigrationControllerTest.php
@@ -746,4 +746,48 @@ WHERE order_id = {$order_id} AND meta_key = 'non_unique_key_1' AND meta_value in
$this->assertEmpty( $errors );
}
+
+ /**
+ * @testDox When there are mutli meta values for a supposed unique meta key, the first one is picked.
+ */
+ public function test_first_value_is_picked_when_multi_value() {
+ global $wpdb;
+ $order = wc_get_order( OrderHelper::create_complex_wp_post_order() );
+ $original_order_key = $order->get_order_key();
+
+ $this->assertNotEmpty( $original_order_key );
+
+ // Add a second order key.
+ add_post_meta( $order->get_id(), '_order_key', 'second_order_key_should_be_ignored' );
+
+ $this->sut->migrate_order( $order->get_id() );
+
+ $migrated_order_key = $wpdb->get_var(
+ $wpdb->prepare(
+ "SELECT order_key FROM {$wpdb->prefix}wc_order_operational_data WHERE order_id = %d",
+ $order->get_id()
+ )
+ );
+
+ $this->assertEquals( $original_order_key, $migrated_order_key );
+
+ $errors = $this->sut->verify_migrated_orders( array( $order->get_id() ) );
+ $this->assertEmpty( $errors );
+ }
+
+ /**
+ * @testDox Test migration for multiple null order_key meta value.
+ */
+ public function test_order_key_null_multiple() {
+ $order1 = OrderHelper::create_order();
+ $order2 = OrderHelper::create_order();
+ delete_post_meta( $order1->get_id(), '_order_key' );
+ delete_post_meta( $order2->get_id(), '_order_key' );
+
+ $this->sut->migrate_order( $order1->get_id() );
+ $this->sut->migrate_order( $order2->get_id() );
+
+ $errors = $this->sut->verify_migrated_orders( array( $order1->get_id(), $order2->get_id() ) );
+ $this->assertEmpty( $errors );
+ }
}
diff --git a/plugins/woocommerce/tests/wp-cli.yml b/plugins/woocommerce/tests/wp-cli.yml
new file mode 100644
index 00000000000..3cf7565b3bc
--- /dev/null
+++ b/plugins/woocommerce/tests/wp-cli.yml
@@ -0,0 +1,2 @@
+apache_modules:
+ - mod_rewrite
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 94584ec418c..9d24fa04cd5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1441,6 +1441,7 @@ importers:
'@woocommerce/number': workspace:*
'@woocommerce/settings': ^1.0.0
'@woocommerce/tracks': workspace:^1.3.0
+ '@wordpress/api-fetch': wp-6.0
'@wordpress/block-editor': ^9.8.0
'@wordpress/blocks': ^12.3.0
'@wordpress/browserslist-config': wp-6.0
@@ -1496,6 +1497,7 @@ importers:
'@woocommerce/number': link:../number
'@woocommerce/settings': 1.0.0
'@woocommerce/tracks': link:../tracks
+ '@wordpress/api-fetch': 6.3.1
'@wordpress/block-editor': 9.8.0_mtk4wljkd5jimhszw4p7nnxuzm
'@wordpress/blocks': 12.5.0_react@17.0.2
'@wordpress/components': 19.8.5_eqi5qhcxfphl6j3pngzexvnehi
@@ -9078,7 +9080,7 @@ packages:
'@babel/core': ^7.0.0-0
dependencies:
'@babel/core': 7.17.8
- '@babel/helper-plugin-utils': 7.19.0
+ '@babel/helper-plugin-utils': 7.20.2
'@babel/plugin-proposal-unicode-property-regex': 7.18.6_@babel+core@7.17.8
'@babel/plugin-transform-dotall-regex': 7.18.6_@babel+core@7.17.8
'@babel/types': 7.21.3
@@ -9091,7 +9093,7 @@ packages:
'@babel/core': ^7.0.0-0
dependencies:
'@babel/core': 7.21.3
- '@babel/helper-plugin-utils': 7.19.0
+ '@babel/helper-plugin-utils': 7.20.2
'@babel/plugin-proposal-unicode-property-regex': 7.18.6_@babel+core@7.21.3
'@babel/plugin-transform-dotall-regex': 7.18.6_@babel+core@7.21.3
'@babel/types': 7.21.3
@@ -17215,7 +17217,7 @@ packages:
'@wordpress/style-engine': 0.15.0
'@wordpress/token-list': 2.19.0
'@wordpress/url': 3.29.0
- '@wordpress/warning': 2.28.0
+ '@wordpress/warning': 2.19.0
'@wordpress/wordcount': 3.19.0
change-case: 4.1.2
classnames: 2.3.1
@@ -20624,8 +20626,8 @@ packages:
peerDependencies:
postcss: ^8.1.0
dependencies:
- browserslist: 4.21.4
- caniuse-lite: 1.0.30001418
+ browserslist: 4.20.2
+ caniuse-lite: 1.0.30001352
fraction.js: 4.2.0
normalize-range: 0.1.2
picocolors: 1.0.0
@@ -22182,7 +22184,6 @@ packages:
escalade: 3.1.1
node-releases: 2.0.6
picocolors: 1.0.0
- dev: true
/browserslist/4.20.4:
resolution: {integrity: sha512-ok1d+1WpnU24XYN7oC3QWgTyMhY/avPJ/r9T00xxvUOIparA/gc+UPUMaod3i+G6s+nI2nUb9xZ5k794uIwShw==}
@@ -38056,7 +38057,7 @@ packages:
is-touch-device: 1.0.1
lodash: 4.17.21
moment: 2.29.4
- object.assign: 4.1.2
+ object.assign: 4.1.4
object.values: 1.1.5
prop-types: 15.8.1
raf: 3.4.1
diff --git a/tools/monorepo-utils/bin/run b/tools/monorepo-utils/bin/run
index 4c9974b2f94..f6931219020 100755
--- a/tools/monorepo-utils/bin/run
+++ b/tools/monorepo-utils/bin/run
@@ -1,5 +1,25 @@
#!/usr/bin/env node
+const { existsSync } = require( 'fs' );
+const chalk = require( 'chalk' );
+const path = require( 'path' );
+
+const nodeModulesDirectory = path.join( __dirname, '../', 'node_modules' );
+
+if ( ! existsSync( nodeModulesDirectory ) ) {
+ console.log(
+ chalk.red(
+ 'The @woocommerce/monorepo-utils must be built before running the CLI.'
+ )
+ );
+ console.log(
+ chalk.yellow(
+ 'run `pnpm run build` from the root of the monorepo-utils package. or `pnpm install --filter monorepo-utils` from project root.'
+ )
+ );
+ process.exit( 1 );
+}
+
const { program } = require( '../dist/index' );
program.parse( process.argv );
diff --git a/tools/monorepo-utils/package.json b/tools/monorepo-utils/package.json
index a0d8c5cddc7..a231fd003e8 100644
--- a/tools/monorepo-utils/package.json
+++ b/tools/monorepo-utils/package.json
@@ -27,6 +27,7 @@
"build": "tsc",
"start": "tsc --watch",
"lint": "eslint . --ext .ts",
+ "postinstall": "pnpm run build",
"test": "jest"
},
"engines": {