Merge branch 'develop' into add/implement-content-helper-feature-perm…

…issions

build/content-helper/dashboard-widget.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n', 'wp-url'), 'version' => '2a49abdb7116eaea1017');
+<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n', 'wp-url'), 'version' => '20fc48e438e82a58464f');

build/content-helper/editor-sidebar.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom-ready', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-plugins', 'wp-primitives', 'wp-url'), 'version' => 'a2af3963d0ec93c28029');
+<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-dom-ready', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-plugins', 'wp-primitives', 'wp-url'), 'version' => '1f97f0ca87e022ed4921');

build/content-helper/excerpt-generator.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-data', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-plugins', 'wp-primitives', 'wp-url', 'wp-wordcount'), 'version' => 'b3a8c97419df2d1807a8');
+<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-data', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-plugins', 'wp-primitives', 'wp-url', 'wp-wordcount'), 'version' => '4af404737b96aa89a9a6');

src/content-helper/common/content-helper-error.tsx

@@ -31,6 +31,7 @@ export enum ContentHelperErrorCode {
 	PluginSettingsApiSecretNotSet = 'parsely_api_secret_not_set',
 	PluginSettingsSiteIdNotSet = 'parsely_site_id_not_set',
 	PostIsNotPublished = 'ch_post_not_published',
+	UnknownError = 'ch_unknown_error',
 
 	// Suggestions API.
 	ParselySuggestionsApiAuthUnavailable = 'AUTH_UNAVAILABLE', // HTTP Code 503.
@@ -79,6 +80,7 @@ export class ContentHelperError extends Error {
 			ContentHelperErrorCode.PluginSettingsApiSecretNotSet,
 			ContentHelperErrorCode.PluginSettingsSiteIdNotSet,
 			ContentHelperErrorCode.PostIsNotPublished,
+			ContentHelperErrorCode.UnknownError,
 
 			// Don't perform any fetch retries for the Suggestions API due to
 			// its time-consuming operations.

src/content-helper/editor-sidebar/smart-linking/component.tsx

@@ -15,7 +15,7 @@ import { Icon, external } from '@wordpress/icons';
  */
 import { GutenbergFunction, dispatchCoreEditor } from '../../../@types/gutenberg/types';
 import { Telemetry } from '../../../js/telemetry/telemetry';
-import { ContentHelperErrorCode } from '../../common/content-helper-error';
+import { ContentHelperError, ContentHelperErrorCode } from '../../common/content-helper-error';
 import { SidebarSettings, SmartLinkingSettings, useSettings } from '../../common/settings';
 import { generateProtocolVariants } from '../../common/utils/functions';
 import { ContentHelperPermissions } from '../../common/utils/permissions';
@@ -484,7 +484,11 @@ export const SmartLinkingPanel = ( {
 			await processSmartLinks( generatedLinks );
 			setIsReviewModalOpen( true );
 		} catch ( e: any ) { // eslint-disable-line @typescript-eslint/no-explicit-any
-			let snackBarMessage = __( 'There was a problem generating smart links.', 'wp-parsely' );
+			const contentHelperError = new ContentHelperError(
+				e.message ?? 'An unknown error has occurred.',
+				e.code ?? ContentHelperErrorCode.UnknownError
+			);
+			let snackBarMessage = contentHelperError.message;
 
 			// Handle the case where the operation was aborted by the user.
 			if ( e.code && e.code === ContentHelperErrorCode.ParselyAborted ) {
@@ -547,6 +551,7 @@ export const SmartLinkingPanel = ( {
 				err.numRetries = MAX_NUMBER_OF_RETRIES - retries;
 				throw err;
 			}
+
 			// If the error is a retryable fetch error, retry the fetch.
 			if ( retries > 0 && err.retryFetch ) {
 				// Print the error to the console to help with debugging.
@@ -555,6 +560,7 @@ export const SmartLinkingPanel = ( {
 				await incrementRetryAttempt();
 				return await generateSmartLinksWithRetry( retries - 1 );
 			}
+
 			// Throw the error to be handled elsewhere.
 			throw err;
 		}

src/content-helper/editor-sidebar/title-suggestions/component.tsx

@@ -198,7 +198,7 @@ export const TitleSuggestionsPanel = (): React.JSX.Element => {
 
 		createNotice(
 			'error',
-			__( 'There was an error generating title suggestions.', 'wp-parsely' ),
+			error.message,
 			{
 				type: 'snackbar',
 				className: 'parsely-title-suggestion-error',

wp-parsely.php

@@ -108,14 +108,6 @@ function parsely_initialize_plugin(): void {
 	$GLOBALS['parsely'] = new Parsely();
 	$GLOBALS['parsely']->run();
 
-	/**
-	 * The Editor Sidebar instance.
-	 *
-	 * @since 3.16.0
-	 * @var Editor_Sidebar $GLOBALS['parsely_editor_sidebar']
-	 */
-	$GLOBALS['parsely_editor_sidebar'] = new Editor_Sidebar( $GLOBALS['parsely'] );
-
 	if ( class_exists( 'WPGraphQL' ) ) {
 		$graphql = new GraphQL_Metadata( $GLOBALS['parsely'] );
 		$graphql->run();
@@ -294,13 +286,20 @@ function init_content_helper_editor_sidebar(): void {
 
 require_once __DIR__ . '/src/content-helper/excerpt-generator/class-excerpt-generator.php';
 
-add_action( 'init', __NAMESPACE__ . '\\parsely_content_helper_editor_sidebar_features' );
+add_action( 'admin_init', __NAMESPACE__ . '\\parsely_content_helper_editor_sidebar_features' );
 /**
  * Initializes the PCH Editor Sidebar features.
  *
  * @since 3.16.0
  */
 function parsely_content_helper_editor_sidebar_features(): void {
+	/**
+	 * The Editor Sidebar instance.
+	 *
+	 * @since 3.16.0
+	 * @var Editor_Sidebar $GLOBALS['parsely_editor_sidebar']
+	 */
+	$GLOBALS['parsely_editor_sidebar'] = new Editor_Sidebar( $GLOBALS['parsely'] );
 	$GLOBALS['parsely_editor_sidebar']->init_features();
 }