From 0d36a58c6742ec6345b635fb02219b615456cf27 Mon Sep 17 00:00:00 2001
From: rishishah-multidots <rishi.shah@multidots.com>
Date: Tue, 15 Oct 2024 19:00:59 +0530
Subject: [PATCH 1/2] feedback changes

---
 lib/compat/wordpress-6.7/rest-api.php         |  2 +-
 lib/compat/wordpress-6.8/rest-api.php         | 51 +++++++++++++++++++
 lib/load.php                                  |  3 ++
 .../block-settings-dropdown.js                |  6 +--
 ...onToolbar.js => comment-button-toolbar.js} |  0
 .../{commentButton.js => comment-button.js}   |  0
 .../src/components/collab-sidebar/index.js    | 29 ++++++-----
 7 files changed, 75 insertions(+), 16 deletions(-)
 create mode 100644 lib/compat/wordpress-6.8/rest-api.php
 rename packages/editor/src/components/collab-sidebar/{commentButtonToolbar.js => comment-button-toolbar.js} (100%)
 rename packages/editor/src/components/collab-sidebar/{commentButton.js => comment-button.js} (100%)

diff --git a/lib/compat/wordpress-6.7/rest-api.php b/lib/compat/wordpress-6.7/rest-api.php
index aa0ab92278b4b0..701c8569428b18 100644
--- a/lib/compat/wordpress-6.7/rest-api.php
+++ b/lib/compat/wordpress-6.7/rest-api.php
@@ -152,7 +152,7 @@ function update_get_avatar_comment_type( $comment_type ) {
 		$comment_type[] = 'block_comment';
 		return $comment_type;
 	}
-	add_filter( 'get_avatar_comment_types', 'update_get_avatar_comment_type', 10, 1 );
+	add_filter( 'get_avatar_comment_types', 'update_get_avatar_comment_type' );
 }
 
 /**
diff --git a/lib/compat/wordpress-6.8/rest-api.php b/lib/compat/wordpress-6.8/rest-api.php
new file mode 100644
index 00000000000000..c9e146c869d83d
--- /dev/null
+++ b/lib/compat/wordpress-6.8/rest-api.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * PHP and WordPress configuration compatibility functions for the Gutenberg
+ * editor plugin changes related to REST API.
+ *
+ * @package gutenberg
+ */
+
+if ( ! defined( 'ABSPATH' ) ) {
+	die( 'Silence is golden.' );
+}
+
+/**
+ * Updates the comment type in the REST API for WordPress version 6.7.
+ *
+ * This function is used as a filter callback for the 'rest_pre_insert_comment' hook.
+ * It checks if the 'comment_type' parameter is set to 'block_comment' in the REST API request,
+ * and if so, updates the 'comment_type' and 'comment_approved' properties of the prepared comment.
+ *
+ * @param array $prepared_comment The prepared comment data.
+ * @param WP_REST_Request $request The REST API request object.
+ * @return array The updated prepared comment data.
+ */
+if ( ! function_exists( 'update_comment_type_in_rest_api_6_8' ) && gutenberg_is_experiment_enabled( 'gutenberg-block-comment' ) ) {
+	function update_comment_type_in_rest_api_6_8( $prepared_comment, $request ) {
+		if ( ! empty( $request['comment_type'] ) && 'block_comment' === $request['comment_type'] ) {
+			$prepared_comment['comment_type']     = $request['comment_type'];
+			$prepared_comment['comment_approved'] = $request['comment_approved'];
+		}
+
+		return $prepared_comment;
+	}
+	add_filter( 'rest_pre_insert_comment', 'update_comment_type_in_rest_api_6_8', 10, 2 );
+}
+
+/**
+ * Updates the comment type for avatars in the WordPress REST API.
+ *
+ * This function adds the 'block_comment' type to the list of comment types
+ * for which avatars should be retrieved in the WordPress REST API.
+ *
+ * @param array $comment_type The array of comment types.
+ * @return array The updated array of comment types.
+ */
+if ( ! function_exists( 'update_get_avatar_comment_type' ) && gutenberg_is_experiment_enabled( 'gutenberg-block-comment' ) ) {
+	function update_get_avatar_comment_type( $comment_type ) {
+		$comment_type[] = 'block_comment';
+		return $comment_type;
+	}
+	add_filter( 'get_avatar_comment_types', 'update_get_avatar_comment_type' );
+}
diff --git a/lib/load.php b/lib/load.php
index c26160eba2b67d..f3a96c2365f0de 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -46,6 +46,9 @@ function gutenberg_is_experiment_enabled( $name ) {
 	require __DIR__ . '/compat/wordpress-6.7/class-gutenberg-rest-server.php';
 	require __DIR__ . '/compat/wordpress-6.7/rest-api.php';
 
+	// WordPress 6.8 compat.
+	require __DIR__ . '/compat/wordpress-6.8/rest-api.php';
+
 	// Plugin specific code.
 	require_once __DIR__ . '/class-wp-rest-global-styles-controller-gutenberg.php';
 	require_once __DIR__ . '/class-wp-rest-edit-site-export-controller-gutenberg.php';
diff --git a/packages/block-editor/src/components/block-settings-menu/block-settings-dropdown.js b/packages/block-editor/src/components/block-settings-menu/block-settings-dropdown.js
index 8f42c4df0a17a6..2b43636cd0c764 100644
--- a/packages/block-editor/src/components/block-settings-menu/block-settings-dropdown.js
+++ b/packages/block-editor/src/components/block-settings-menu/block-settings-dropdown.js
@@ -295,10 +295,10 @@ export function BlockSettingsDropdown( {
 											</MenuItem>
 										</>
 									) }
+									<__unstableCommentIconFill.Slot
+										fillProps={ { onClose } }
+									/>
 								</MenuGroup>
-								<__unstableCommentIconFill.Slot
-									fillProps={ { onClose } }
-								/>
 								{ canCopyStyles && ! isContentOnly && (
 									<MenuGroup>
 										<CopyMenuItem
diff --git a/packages/editor/src/components/collab-sidebar/commentButtonToolbar.js b/packages/editor/src/components/collab-sidebar/comment-button-toolbar.js
similarity index 100%
rename from packages/editor/src/components/collab-sidebar/commentButtonToolbar.js
rename to packages/editor/src/components/collab-sidebar/comment-button-toolbar.js
diff --git a/packages/editor/src/components/collab-sidebar/commentButton.js b/packages/editor/src/components/collab-sidebar/comment-button.js
similarity index 100%
rename from packages/editor/src/components/collab-sidebar/commentButton.js
rename to packages/editor/src/components/collab-sidebar/comment-button.js
diff --git a/packages/editor/src/components/collab-sidebar/index.js b/packages/editor/src/components/collab-sidebar/index.js
index 00d2f5d5c2878f..f1f1508c6708cd 100644
--- a/packages/editor/src/components/collab-sidebar/index.js
+++ b/packages/editor/src/components/collab-sidebar/index.js
@@ -18,13 +18,13 @@ import { collabSidebarName } from './constants';
 import { Comments } from './comments';
 import { AddComment } from './add-comment';
 import { store as editorStore } from '../../store';
-import AddCommentButton from './commentButton';
-import AddCommentToolbarButton from './commentButtonToolbar';
+import AddCommentButton from './comment-button';
+import AddCommentToolbarButton from './comment-button-toolbar';
 
 const isBlockCommentExperimentEnabled =
 	window?.__experimentalEnableBlockComment;
 const modifyBlockCommentAttributes = ( settings, name ) => {
-	if ( name?.includes( 'core/' ) && ! settings.attributes.blockCommentId ) {
+	if ( ! settings.attributes.blockCommentId ) {
 		settings.attributes = {
 			...settings.attributes,
 			blockCommentId: {
@@ -66,13 +66,13 @@ export default function CollabSidebar() {
 
 	const clientId = useSelect( ( select ) => {
 		const { getSelectedBlockClientId } = select( blockEditorStore );
-		setBlockCommentID(
-			select( blockEditorStore ).getBlock( getSelectedBlockClientId() )
-				?.attributes.blockCommentId
-		);
 		return getSelectedBlockClientId();
 	}, [] );
 
+	const blockDetails = useSelect( ( select ) => {
+		return clientId ? select( blockEditorStore ).getBlock( clientId ) : null;
+	}, [clientId] );
+
 	// Get the dispatch functions to save the comment and update the block attributes.
 	const { updateBlockAttributes } = useDispatch( blockEditorStore );
 
@@ -90,11 +90,13 @@ export default function CollabSidebar() {
 			comment_approved: 0,
 		};
 
-		if ( parentCommentId ) {
-			args.parent = parentCommentId;
-		}
+		// Create a new object, conditionally including the parent property
+		const updatedArgs = {
+			...args,
+			...(parentCommentId ? { parent: parentCommentId } : {}),
+		};
 
-		const savedRecord = await saveEntityRecord( 'root', 'comment', args );
+		const savedRecord = await saveEntityRecord( 'root', 'comment', updatedArgs );
 
 		if ( savedRecord ) {
 			// If it's a main comment, update the block attributes with the comment id.
@@ -212,8 +214,11 @@ export default function CollabSidebar() {
 	}, [ postId, getEntityRecords ] );
 
 	useEffect( () => {
+		if ( blockDetails ) {
+			setBlockCommentID( blockDetails?.attributes.blockCommentId );
+		}
 		fetchComments();
-	}, [ postId, fetchComments ] );
+	}, [ postId, fetchComments, clientId ] );
 
 	const allBlocks = useSelect( ( select ) => {
 		return select( blockEditorStore ).getBlocks();

From 9a6556f00e6601f795b6216e45267bb995966ff1 Mon Sep 17 00:00:00 2001
From: rishishah-multidots <rishi.shah@multidots.com>
Date: Tue, 15 Oct 2024 19:16:39 +0530
Subject: [PATCH 2/2] linting error fixes

---
 .../src/components/collab-sidebar/comments.js | 10 ++--------
 .../src/components/collab-sidebar/index.js    | 19 ++++++++++++++-----
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/packages/editor/src/components/collab-sidebar/comments.js b/packages/editor/src/components/collab-sidebar/comments.js
index e2c07c9968d840..836340af393105 100644
--- a/packages/editor/src/components/collab-sidebar/comments.js
+++ b/packages/editor/src/components/collab-sidebar/comments.js
@@ -269,10 +269,7 @@ function CommentForm( { onSubmit, onCancel, thread } ) {
 							? _x( 'Update', 'verb' )
 							: _x( 'Reply', 'Add reply comment' ) }
 					</Button>
-					<Button
-						__next40pxDefaultSize
-						onClick={ onCancel }
-					>
+					<Button __next40pxDefaultSize onClick={ onCancel }>
 						{ _x( 'Cancel', 'Cancel comment edit' ) }
 					</Button>
 				</HStack>
@@ -312,10 +309,7 @@ function ConfirmNotice( { confirmMessage, confirmAction, discardAction } ) {
 				>
 					{ __( 'Yes' ) }
 				</Button>
-				<Button
-					__next40pxDefaultSize
-					onClick={ discardAction }
-				>
+				<Button __next40pxDefaultSize onClick={ discardAction }>
 					{ __( 'No' ) }
 				</Button>
 			</HStack>
diff --git a/packages/editor/src/components/collab-sidebar/index.js b/packages/editor/src/components/collab-sidebar/index.js
index dc3f62d1c03b6f..e71f896aa18cef 100644
--- a/packages/editor/src/components/collab-sidebar/index.js
+++ b/packages/editor/src/components/collab-sidebar/index.js
@@ -69,9 +69,14 @@ export default function CollabSidebar() {
 		return getSelectedBlockClientId();
 	}, [] );
 
-	const blockDetails = useSelect( ( select ) => {
-		return clientId ? select( blockEditorStore ).getBlock( clientId ) : null;
-	}, [clientId] );
+	const blockDetails = useSelect(
+		( select ) => {
+			return clientId
+				? select( blockEditorStore ).getBlock( clientId )
+				: null;
+		},
+		[ clientId ]
+	);
 
 	// Get the dispatch functions to save the comment and update the block attributes.
 	const { updateBlockAttributes } = useDispatch( blockEditorStore );
@@ -93,10 +98,14 @@ export default function CollabSidebar() {
 		// Create a new object, conditionally including the parent property
 		const updatedArgs = {
 			...args,
-			...(parentCommentId ? { parent: parentCommentId } : {}),
+			...( parentCommentId ? { parent: parentCommentId } : {} ),
 		};
 
-		const savedRecord = await saveEntityRecord( 'root', 'comment', updatedArgs );
+		const savedRecord = await saveEntityRecord(
+			'root',
+			'comment',
+			updatedArgs
+		);
 
 		if ( savedRecord ) {
 			// If it's a main comment, update the block attributes with the comment id.