Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Always use productTemplateId when available and use editedRecord in useEntityRecord hooks (#46395) 

* Use editedRecord instead of record

* Always use productTemplateId when available

* Change private methods to protected in ProductVariationTemplate

* Use editedRecord in hook useEntityRecord

* Update changelogs

* Restore attribute renamed by mistake

* Change useProductTemplate unit test
This commit is contained in:
Nathan Silveira 2024-04-12 10:16:35 -03:00 committed by GitHub
parent d8ffca8d40
commit 450b06a1e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/js/product-editor/changelog/fix-template-for-variable-product Normal file
View File

@ -0,0 +1,4 @@
Significance: patch
Type: fix
Always use productTemplateId when available and use editedRecord in useEntityRecord hooks

2
packages/js/product-editor/src/components/block-editor/block-editor.tsx
View File

@ -155,7 +155,7 @@ export function BlockEditor( {
{ postType }
);
const { record: product } = useEntityRecord< Product >(
const { editedRecord: product } = useEntityRecord< Product >(
'postType',
postType,
productId

4
packages/js/product-editor/src/hooks/use-product-template/test/use-product-template.test.ts
View File

@ -117,9 +117,9 @@ describe( 'useProductTemplate', () => {
expect( result.current.productTemplate ).toBeUndefined();
} );
it( 'should use the standard product template if the product type is variable', () => {
it( 'should use the standard product template if no templateId is provided', () => {
const { result } = renderHook( () =>
useProductTemplate( 'template-1', { type: 'variable' } )
useProductTemplate( undefined, { type: 'simple' } )
);
expect( result.current.productTemplate?.id ).toEqual(

4
packages/js/product-editor/src/hooks/use-product-template/use-product-template.ts
View File

@ -67,9 +67,7 @@ export const useProductTemplate = (
const productType = product?.type;
const productTemplateIdToFind =
productType === 'variable'
? 'standard-product-template'
: productTemplateId;
productTemplateId || 'standard-product-template';
const productTypeToFind =
productType === 'variable' ? 'simple' : productType;

2
packages/js/product-editor/src/hooks/use-product-variations-helper.ts
View File

@ -60,7 +60,7 @@ export function useProductVariationsHelper() {
'id'
);
const { record: product } = useEntityRecord< Product >(
const { editedRecord: product } = useEntityRecord< Product >(
'postType',
'product',
productId

2
packages/js/product-editor/typings/index.d.ts vendored
View File

@ -23,5 +23,5 @@ declare module '@wordpress/core-data' {
kind: string,
name: string,
id: number | string
): { record: T };
): { record: T, editedRecord: T };
}

4
plugins/woocommerce/changelog/fix-template-for-variable-product Normal file
View File

@ -0,0 +1,4 @@
Significance: patch
Type: tweak
Change private methods to protected in ProductVariationTemplate

10
plugins/woocommerce/src/Internal/Features/ProductBlockEditor/ProductTemplates/ProductVariationTemplate.php
View File

@ -64,7 +64,7 @@ class ProductVariationTemplate extends AbstractProductFormTemplate implements Pr
/**
* Adds the group blocks to the template.
*/
private function add_group_blocks() {
protected function add_group_blocks() {
$this->add_group(
array(
'id' => $this::GROUP_IDS['GENERAL'],
@ -106,7 +106,7 @@ class ProductVariationTemplate extends AbstractProductFormTemplate implements Pr
/**
* Adds the general group blocks to the template.
*/
private function add_general_group_blocks() {
protected function add_general_group_blocks() {
$general_group = $this->get_group_by_id( $this::GROUP_IDS['GENERAL'] );
$general_group->add_block(
array(
@ -193,7 +193,7 @@ class ProductVariationTemplate extends AbstractProductFormTemplate implements Pr
/**
* Adds the pricing group blocks to the template.
*/
private function add_pricing_group_blocks() {
protected function add_pricing_group_blocks() {
$is_calc_taxes_enabled = wc_tax_enabled();
$pricing_group = $this->get_group_by_id( $this::GROUP_IDS['PRICING'] );
@ -315,7 +315,7 @@ class ProductVariationTemplate extends AbstractProductFormTemplate implements Pr
/**
* Adds the inventory group blocks to the template.
*/
private function add_inventory_group_blocks() {
protected function add_inventory_group_blocks() {
$inventory_group = $this->get_group_by_id( $this::GROUP_IDS['INVENTORY'] );
$inventory_group->add_block(
array(
@ -425,7 +425,7 @@ class ProductVariationTemplate extends AbstractProductFormTemplate implements Pr
/**
* Adds the shipping group blocks to the template.
*/
private function add_shipping_group_blocks() {
protected function add_shipping_group_blocks() {
$shipping_group = $this->get_group_by_id( $this::GROUP_IDS['SHIPPING'] );
$shipping_group->add_block(
array(