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

REST API: Update usage of attributes/<id>/terms to match core. (https://github.com/woocommerce/woocommerce-blocks/pull/453) 

* REST API: Update usage of attributes/<id>/terms to match core.

* phpcs fixes, i think
This commit is contained in:
Timmy Crawford 2019-02-26 08:11:31 -08:00 committed by GitHub
parent fb482b0cf6
commit 8e3d19ee6d
2 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/woocommerce-blocks/assets/js/components/product-attribute-control/index.js
View File

@ -72,7 +72,7 @@ class ProductAttributeControl extends Component {
} ),
} )
.then( ( terms ) => {
terms = terms.map( ( term ) => ( { ...term, parent: attribute } ) );
terms = terms.map( ( term ) => ( { ...term, parent: attribute, attr_slug: term.attribute.slug } ) );
this.setState( ( prevState ) => ( {
termsList: { ...prevState.termsList, [ attribute ]: terms },
termsLoading: false,

43
plugins/woocommerce-blocks/includes/class-wgpb-product-attribute-terms-controller.php
View File

@ -114,8 +114,11 @@ class WGPB_Product_Attribute_Terms_Controller extends WC_REST_Product_Attribute_
'name' => $item->name,
'slug' => $item->slug,
'count' => (int) $item->count,
'attr_name' => $attribute->name,
'attr_slug' => $attribute->slug,
'attribute' => array(
'id' => $attribute->id,
'name' => $attribute->name,
'slug' => $attribute->slug,
),
);
$context = ! empty( $request['context'] ) ? $request['context'] : 'view';
@ -147,20 +150,30 @@ class WGPB_Product_Attribute_Terms_Controller extends WC_REST_Product_Attribute_
$schema['properties']['name'] = $raw_schema['properties']['name'];
$schema['properties']['slug'] = $raw_schema['properties']['slug'];
$schema['properties']['count'] = $raw_schema['properties']['count'];
$schema['properties']['attr_name'] = array(
'description' => __( 'Attribute group name.', 'woo-gutenberg-products-block' ),
'type' => 'string',
$schema['properties']['attribute'] = array(
'description' => __( 'Attribute.', 'woo-gutenberg-products-block' ),
'type' => 'object',
'context' => array( 'view', 'edit' ),
'arg_options' => array(
'sanitize_callback' => 'sanitize_text_field',
),
);
$schema['properties']['attr_slug'] = array(
'description' => __( 'An alphanumeric identifier for the resource unique to its type.', 'woo-gutenberg-products-block' ),
'type' => 'string',
'context' => array( 'view', 'edit' ),
'arg_options' => array(
'sanitize_callback' => 'sanitize_title',
'readonly' => true,
'properties' => array(
'id' => array(
'description' => __( 'Attribute ID.', 'woo-gutenberg-products-block' ),
'type' => 'integer',
'context' => array( 'view', 'edit' ),
'readonly' => true,
),
'name' => array(
'description' => __( 'Attribute name.', 'woo-gutenberg-products-block' ),
'type' => 'string',
'context' => array( 'view', 'edit' ),
'readonly' => true,
),
'slug' => array(
'description' => __( 'Attribute slug.', 'woo-gutenberg-products-block' ),
'type' => 'string',
'context' => array( 'view', 'edit' ),
'readonly' => true,
),
),
);