From 41e507bfcd2a24f693391f8a061d00ca75151c2f Mon Sep 17 00:00:00 2001 From: Carlos Bravo Date: Thu, 21 Apr 2022 10:50:52 +0200 Subject: [PATCH 1/3] Rename Comments Query Loop to Comments --- docs/reference-guides/core-blocks.md | 22 +++++++++---------- lib/blocks.php | 2 +- .../block.json | 2 +- .../{comments-query-loop => comments}/edit.js | 2 +- .../edit/comments-inspector-controls.js | 0 .../editor.scss | 0 .../index.js | 0 .../{comments-query-loop => comments}/save.js | 4 +--- packages/block-library/src/editor.scss | 2 +- packages/block-library/src/index.js | 5 ++--- .../block-library/src/post-comment/block.json | 2 +- .../src/post-comments/block.json | 2 +- ...omments-query.test.js => comments.test.js} | 8 +++---- 13 files changed, 24 insertions(+), 27 deletions(-) rename packages/block-library/src/{comments-query-loop => comments}/block.json (94%) rename packages/block-library/src/{comments-query-loop => comments}/edit.js (94%) rename packages/block-library/src/{comments-query-loop => comments}/edit/comments-inspector-controls.js (100%) rename packages/block-library/src/{comments-query-loop => comments}/editor.scss (100%) rename packages/block-library/src/{comments-query-loop => comments}/index.js (100%) rename packages/block-library/src/{comments-query-loop => comments}/save.js (69%) rename packages/e2e-tests/specs/editor/blocks/{comments-query.test.js => comments.test.js} (95%) diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md index 5b31b1be281c5..550ace59ff82b 100644 --- a/docs/reference-guides/core-blocks.md +++ b/docs/reference-guides/core-blocks.md @@ -170,6 +170,15 @@ Contains the block elements used to display a comment, like the title, date, aut - **Supports:** align, ~~html~~, ~~reusable~~ - **Attributes:** +## Comments + +An advanced block that allows displaying post comments using different visual configurations. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/comments)) + +- **Name:** core/comments-query-loop +- **Category:** theme +- **Supports:** align (full, wide), color (background, gradients, link, text), ~~html~~ +- **Attributes:** tagName + ## Comments Pagination Displays a paginated navigation to next/previous set of comments, when applicable. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/comments-pagination)) @@ -206,15 +215,6 @@ Displays the previous comment's page link. ([Source](https://github.com/WordPres - **Supports:** color (background, gradients, ~~text~~), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~ - **Attributes:** label -## Comments Query Loop - -An advanced block that allows displaying post comments using different visual configurations. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/comments-query-loop)) - -- **Name:** core/comments-query-loop -- **Category:** theme -- **Supports:** align (full, wide), color (background, gradients, link, text), ~~html~~ -- **Attributes:** tagName - ## Comments Title Displays a title with the number of comments ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/comments-title)) @@ -487,7 +487,7 @@ The author name. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/pac ## Post Comment (deprecated) -This block is deprecated. Please use the Comments Query Loop block instead. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/post-comment)) +This block is deprecated. Please use the Comments block instead. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/post-comment)) - **Name:** core/post-comment - **Category:** theme @@ -496,7 +496,7 @@ This block is deprecated. Please use the Comments Query Loop block instead. ([So ## Post Comments (deprecated) -This block is deprecated. Please use the Comments Query Loop block instead. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/post-comments)) +This block is deprecated. Please use the Comments block instead. ([Source](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/post-comments)) - **Name:** core/post-comments - **Category:** theme diff --git a/lib/blocks.php b/lib/blocks.php index 816aceb777d88..10c052954ad7d 100644 --- a/lib/blocks.php +++ b/lib/blocks.php @@ -21,7 +21,7 @@ function gutenberg_reregister_core_block_types() { 'code', 'column', 'columns', - 'comments-query-loop', + 'comments', 'group', 'heading', 'html', diff --git a/packages/block-library/src/comments-query-loop/block.json b/packages/block-library/src/comments/block.json similarity index 94% rename from packages/block-library/src/comments-query-loop/block.json rename to packages/block-library/src/comments/block.json index fecbd7c92f6bb..fbdfdd253b278 100644 --- a/packages/block-library/src/comments-query-loop/block.json +++ b/packages/block-library/src/comments/block.json @@ -2,7 +2,7 @@ "$schema": "https://schemas.wp.org/trunk/block.json", "apiVersion": 2, "name": "core/comments-query-loop", - "title": "Comments Query Loop", + "title": "Comments", "category": "theme", "description": "An advanced block that allows displaying post comments using different visual configurations.", "textdomain": "default", diff --git a/packages/block-library/src/comments-query-loop/edit.js b/packages/block-library/src/comments/edit.js similarity index 94% rename from packages/block-library/src/comments-query-loop/edit.js rename to packages/block-library/src/comments/edit.js index fa7f048a285f0..14303fe7c5458 100644 --- a/packages/block-library/src/comments-query-loop/edit.js +++ b/packages/block-library/src/comments/edit.js @@ -68,7 +68,7 @@ const TEMPLATE = [ [ 'core/post-comments-form' ], ]; -export default function CommentsQueryLoopEdit( { attributes, setAttributes } ) { +export default function CommentsEdit( { attributes, setAttributes } ) { const { tagName: TagName } = attributes; const blockProps = useBlockProps(); diff --git a/packages/block-library/src/comments-query-loop/edit/comments-inspector-controls.js b/packages/block-library/src/comments/edit/comments-inspector-controls.js similarity index 100% rename from packages/block-library/src/comments-query-loop/edit/comments-inspector-controls.js rename to packages/block-library/src/comments/edit/comments-inspector-controls.js diff --git a/packages/block-library/src/comments-query-loop/editor.scss b/packages/block-library/src/comments/editor.scss similarity index 100% rename from packages/block-library/src/comments-query-loop/editor.scss rename to packages/block-library/src/comments/editor.scss diff --git a/packages/block-library/src/comments-query-loop/index.js b/packages/block-library/src/comments/index.js similarity index 100% rename from packages/block-library/src/comments-query-loop/index.js rename to packages/block-library/src/comments/index.js diff --git a/packages/block-library/src/comments-query-loop/save.js b/packages/block-library/src/comments/save.js similarity index 69% rename from packages/block-library/src/comments-query-loop/save.js rename to packages/block-library/src/comments/save.js index dc080f0f41344..47c774fc4b9bb 100644 --- a/packages/block-library/src/comments-query-loop/save.js +++ b/packages/block-library/src/comments/save.js @@ -3,9 +3,7 @@ */ import { InnerBlocks, useBlockProps } from '@wordpress/block-editor'; -export default function CommentsQueryLoopSave( { - attributes: { tagName: Tag }, -} ) { +export default function CommentsSave( { attributes: { tagName: Tag } } ) { return ( diff --git a/packages/block-library/src/editor.scss b/packages/block-library/src/editor.scss index 5e1b6d7afa733..ba031d6cbdeaa 100644 --- a/packages/block-library/src/editor.scss +++ b/packages/block-library/src/editor.scss @@ -6,8 +6,8 @@ @import "./buttons/editor.scss"; @import "./categories/editor.scss"; @import "./columns/editor.scss"; +@import "./comments/editor.scss"; @import "./comment-author-avatar/editor.scss"; -@import "./comments-query-loop/editor.scss"; @import "./comments-pagination/editor.scss"; @import "./comments-pagination-numbers/editor.scss"; @import "./comments-title/editor.scss"; diff --git a/packages/block-library/src/index.js b/packages/block-library/src/index.js index fb033052907e3..a7d361050ebc2 100644 --- a/packages/block-library/src/index.js +++ b/packages/block-library/src/index.js @@ -23,6 +23,7 @@ import * as classic from './freeform'; import * as code from './code'; import * as column from './column'; import * as columns from './columns'; +import * as comments from './comments'; import * as commentAuthorAvatar from './comment-author-avatar'; import * as commentAuthorName from './comment-author-name'; import * as commentContent from './comment-content'; @@ -31,7 +32,6 @@ import * as commentEditLink from './comment-edit-link'; import * as commentReplyLink from './comment-reply-link'; import * as commentTemplate from './comment-template'; import * as commentsPaginationPrevious from './comments-pagination-previous'; -import * as commentsQueryLoop from './comments-query-loop'; import * as commentsPagination from './comments-pagination'; import * as commentsPaginationNext from './comments-pagination-next'; import * as commentsPaginationNumbers from './comments-pagination-numbers'; @@ -207,6 +207,7 @@ export const __experimentalGetCoreBlocks = () => [ queryPaginationPrevious, queryNoResults, readMore, + comments, commentAuthorName, commentContent, commentDate, @@ -214,12 +215,10 @@ export const __experimentalGetCoreBlocks = () => [ commentReplyLink, commentTemplate, commentsTitle, - commentsQueryLoop, commentsPagination, commentsPaginationNext, commentsPaginationNumbers, commentsPaginationPrevious, - postComments, postCommentsForm, homeLink, diff --git a/packages/block-library/src/post-comment/block.json b/packages/block-library/src/post-comment/block.json index 5210253b6447c..cc8311cfce547 100644 --- a/packages/block-library/src/post-comment/block.json +++ b/packages/block-library/src/post-comment/block.json @@ -4,7 +4,7 @@ "name": "core/post-comment", "title": "Post Comment (deprecated)", "category": "theme", - "description": "This block is deprecated. Please use the Comments Query Loop block instead.", + "description": "This block is deprecated. Please use the Comments block instead.", "textdomain": "default", "attributes": { "commentId": { diff --git a/packages/block-library/src/post-comments/block.json b/packages/block-library/src/post-comments/block.json index 6c5c4e16b8f74..dc719fff5d708 100644 --- a/packages/block-library/src/post-comments/block.json +++ b/packages/block-library/src/post-comments/block.json @@ -4,7 +4,7 @@ "name": "core/post-comments", "title": "Post Comments (deprecated)", "category": "theme", - "description": "This block is deprecated. Please use the Comments Query Loop block instead.", + "description": "This block is deprecated. Please use the Comments block instead.", "textdomain": "default", "attributes": { "textAlign": { diff --git a/packages/e2e-tests/specs/editor/blocks/comments-query.test.js b/packages/e2e-tests/specs/editor/blocks/comments.test.js similarity index 95% rename from packages/e2e-tests/specs/editor/blocks/comments-query.test.js rename to packages/e2e-tests/specs/editor/blocks/comments.test.js index 5f142aee56c75..19b4704b676fb 100644 --- a/packages/e2e-tests/specs/editor/blocks/comments-query.test.js +++ b/packages/e2e-tests/specs/editor/blocks/comments.test.js @@ -11,7 +11,7 @@ import { trashAllComments, } from '@wordpress/e2e-test-utils'; -describe( 'Comment Query Loop', () => { +describe( 'Comments', () => { let previousPageComments, previousCommentsPerPage, previousDefaultCommentsPage; @@ -27,12 +27,12 @@ describe( 'Comment Query Loop', () => { it( 'We show no results message if there are no comments', async () => { await trashAllComments(); await createNewPost(); - await insertBlock( 'Comments Query Loop' ); + await insertBlock( 'Comments' ); await page.waitForXPath( '//p[contains(text(), "No results found.")]' ); } ); it( 'Pagination links are working as expected', async () => { await createNewPost(); - await insertBlock( 'Comments Query Loop' ); + await insertBlock( 'Comments' ); await insertBlock( 'Post Comments Form' ); await publishPost(); // Visit the post that was just published. @@ -93,7 +93,7 @@ describe( 'Comment Query Loop', () => { it( 'Pagination links are not appearing if break comments is not enabled', async () => { await setOption( 'page_comments', '0' ); await createNewPost(); - await insertBlock( 'Comments Query Loop' ); + await insertBlock( 'Comments' ); await insertBlock( 'Post Comments Form' ); await publishPost(); // Visit the post that was just published. From 0468e4450ff3a1113e0e2a2a2d1f0ab1594202c3 Mon Sep 17 00:00:00 2001 From: Bernie Reiter Date: Fri, 29 Apr 2022 16:15:53 +0200 Subject: [PATCH 2/3] Change mention on Comments Query Loop in Post Comments block warning --- packages/block-library/src/post-comments/edit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/block-library/src/post-comments/edit.js b/packages/block-library/src/post-comments/edit.js index 248922da8b19e..723280d6416cf 100644 --- a/packages/block-library/src/post-comments/edit.js +++ b/packages/block-library/src/post-comments/edit.js @@ -53,7 +53,7 @@ export default function PostCommentsEdit( { ); let warning = __( - 'Post Comments block: This is just a placeholder, not a real comment. The final styling may differ because it also depends on the current theme. For better compatibility with the Block Editor, please consider replacing this block with the "Comments Query Loop" block.' + 'Post Comments block: This is just a placeholder, not a real comment. The final styling may differ because it also depends on the current theme. For better compatibility with the Block Editor, please consider replacing this block with the "Comments" block.' ); let showPlaceholder = true; From 041949d19568e505fb636cc3d1350c292bf16942 Mon Sep 17 00:00:00 2001 From: Michal Czaplinski Date: Mon, 2 May 2022 14:04:59 -0500 Subject: [PATCH 3/3] Update CODEOWNERS file --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9cabbc4936894..f3d23c778bd3e 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -19,7 +19,7 @@ /packages/block-library/src/navigation-submenu @tellthemachines /packages/block-library/src/page-list @tellthemachines /packages/block-library/src/comment-template @michalczaplinski -/packages/block-library/src/comments-query-loop @michalczaplinski +/packages/block-library/src/comments @michalczaplinski # Duotone /lib/block-supports/duotone.php @ajlende