mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-04-05 12:42:35 +02:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Block Patterns: Update the value used for keywords.

Browse Source 
Patterns on the [https://wordpress.org/patterns/ Pattern Directory] can have keywords for better discoverability while searching. The way these are stored [69548ff1f0 was changed from a taxonomy to meta value], but the `/wp/v2/pattern-directory/patterns` endpoint was still pulling from that old value.

The correct property to use for this field is `meta.wpop_keywords`, which returns a single string with comma-separated keywords.

Props ryelle, TimothyBlynJacobs.
Merges [53665] to the 6.0 branch.
See #56126.

git-svn-id: https://develop.svn.wordpress.org/branches/6.0@53666 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2022-07-05 16:03:10 +00:00
parent 340966a8c1
commit a71bf79d64
6 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-includes/rest-api/endpoints/class-wp-rest-pattern-directory-controller.php
View File

@ -206,7 +206,7 @@ class WP_REST_Pattern_Directory_Controller extends WP_REST_Controller {
'title' => sanitize_text_field( $raw_pattern->title->rendered ),
'content' => wp_kses_post( $raw_pattern->pattern_content ),
'categories' => array_map( 'sanitize_title', $raw_pattern->category_slugs ),
'keywords' => array_map( 'sanitize_title', $raw_pattern->keyword_slugs ),
'keywords' => array_map( 'sanitize_text_field', explode( ',', $raw_pattern->meta->wpop_keywords ) ),
'description' => sanitize_text_field( $raw_pattern->meta->wpop_description ),
'viewport_width' => absint( $raw_pattern->meta->wpop_viewport_width ),
);
@ -274,7 +274,7 @@ class WP_REST_Pattern_Directory_Controller extends WP_REST_Controller {
),
'keywords' => array(
'description' => __( "The pattern's keyword slugs." ),
'description' => __( "The pattern's keywords." ),
'type' => 'array',
'uniqueItems' => true,
'items' => array( 'type' => 'string' ),

3
tests/phpunit/data/blocks/pattern-directory/browse-all.json
View File

@ -9,6 +9,7 @@
"meta": {
"spay_email": "",
"wpop_description": "A heading preceded by a chapter number, and followed by a paragraph.",
"wpop_keywords": "blog post",
"wpop_viewport_width": 1000
},
"category_slugs": [ "text" ],
@ -25,6 +26,7 @@
"meta": {
"spay_email": "",
"wpop_description": "A large hero section with an example background image and a heading in the center.",
"wpop_keywords": "header, hero",
"wpop_viewport_width": 1000
},
"category_slugs": [ "header" ],
@ -41,6 +43,7 @@
"meta": {
"spay_email": "",
"wpop_description": "A large hero section with a bright gradient background, a big heading and a filled button.",
"wpop_keywords": "call to action, hero section",
"wpop_viewport_width": 1000
},
"category_slugs": [ "header" ],

2
tests/phpunit/data/blocks/pattern-directory/browse-category-2.json
View File

@ -9,6 +9,7 @@
"meta": {
"spay_email": "",
"wpop_description": "Three filled buttons with rounded corners, side by side.",
"wpop_keywords": "",
"wpop_viewport_width": 600
},
"category_slugs": [ "buttons" ],
@ -25,6 +26,7 @@
"meta": {
"spay_email": "",
"wpop_description": "Two buttons, one filled and one outlined, side by side.",
"wpop_keywords": "",
"wpop_viewport_width": 500
},
"category_slugs": [ "buttons" ],

3
tests/phpunit/data/blocks/pattern-directory/browse-keyword-11.json
View File

@ -9,6 +9,7 @@
"meta": {
"spay_email": "",
"wpop_description": "A heading preceded by a chapter number, and followed by a paragraph.",
"wpop_keywords": "",
"wpop_viewport_width": 1000
},
"category_slugs": [ "text" ],
@ -25,6 +26,7 @@
"meta": {
"spay_email": "",
"wpop_description": "A large hero section with an example background image and a heading in the center.",
"wpop_keywords": "",
"wpop_viewport_width": 1000
},
"category_slugs": [ "header" ],
@ -41,6 +43,7 @@
"meta": {
"spay_email": "",
"wpop_description": "A large hero section with a bright gradient background, a big heading and a filled button.",
"wpop_keywords": "",
"wpop_viewport_width": 1000
},
"category_slugs": [ "header" ],

4
tests/phpunit/data/blocks/pattern-directory/search-button.json
View File

@ -9,6 +9,7 @@
"meta": {
"spay_email": "",
"wpop_description": "A large hero section with a bright gradient background, a big heading and a filled button.",
"wpop_keywords": "",
"wpop_viewport_width": 1000
},
"category_slugs": [ "header" ],
@ -25,6 +26,7 @@
"meta": {
"spay_email": "",
"wpop_description": "Three small columns of text, each with an outlined button with rounded corners at the bottom.",
"wpop_keywords": "",
"wpop_viewport_width": 1000
},
"category_slugs": [ "columns" ],
@ -41,6 +43,7 @@
"meta": {
"spay_email": "",
"wpop_description": "Three filled buttons with rounded corners, side by side.",
"wpop_keywords": "",
"wpop_viewport_width": 600
},
"category_slugs": [ "buttons" ],
@ -57,6 +60,7 @@
"meta": {
"spay_email": "",
"wpop_description": "Two buttons, one filled and one outlined, side by side.",
"wpop_keywords": "",
"wpop_viewport_width": 500
},
"category_slugs": [ "buttons" ],

7
tests/phpunit/tests/rest-api/rest-pattern-directory-controller.php
View File

@ -111,6 +111,9 @@ class WP_REST_Pattern_Directory_Controller_Test extends WP_Test_REST_Controller_
$this->assertGreaterThan( 0, count( $patterns ) );
array_walk( $patterns, array( $this, 'assertPatternMatchesSchema' ) );
$this->assertSame( array( 'blog post' ), $patterns[0]['keywords'] );
$this->assertSame( array( 'header', 'hero' ), $patterns[1]['keywords'] );
$this->assertSame( array( 'call to action', 'hero section' ), $patterns[2]['keywords'] );
}
/**
@ -157,10 +160,6 @@ class WP_REST_Pattern_Directory_Controller_Test extends WP_Test_REST_Controller_
$this->assertGreaterThan( 0, count( $patterns ) );
array_walk( $patterns, array( $this, 'assertPatternMatchesSchema' ) );
foreach ( $patterns as $pattern ) {
$this->assertContains( 'core', $pattern['keywords'] );
}
}
/**