Merge pull request #2735 from Parsely/refactor/internal-api-settings

REST API Refactor: Settings namespace implementation
Parsely · Sep 6, 2024 · b2eb9bb · b2eb9bb
2 parents 8380fc2 + d68ad09
commit b2eb9bb
Show file tree

Hide file tree

Showing 28 changed files with 974 additions and 1,397 deletions.
diff --git a/build/content-helper/dashboard-widget.asset.php b/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' => 'd852566173ef137708b0');
+<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n', 'wp-url'), 'version' => 'b654f2e02d29a1665104');
diff --git a/build/content-helper/dashboard-widget.js b/build/content-helper/dashboard-widget.js
diff --git a/build/content-helper/editor-sidebar.asset.php b/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-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-plugins', 'wp-primitives', 'wp-url'), 'version' => 'eaad1ca5764f3fbdb9e6');
+<?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-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-plugins', 'wp-primitives', 'wp-url'), 'version' => '7d87b64bdabeaf1dc579');
diff --git a/build/content-helper/editor-sidebar.js b/build/content-helper/editor-sidebar.js
diff --git a/src/Endpoints/class-base-api-proxy.php b/src/Endpoints/class-base-api-proxy.php
diff --git a/src/RemoteAPI/content-suggestions/class-content-suggestions-base-api.php b/src/RemoteAPI/content-suggestions/class-content-suggestions-base-api.php
@@ -10,7 +10,6 @@
 
 namespace Parsely\RemoteAPI\ContentSuggestions;
 
-use Parsely\Endpoints\Base_Endpoint;
 use Parsely\Parsely;
 use Parsely\RemoteAPI\Base_Endpoint_Remote;
 use UnexpectedValueException;
@@ -61,7 +60,7 @@ public function is_available_to_current_user( $request = null ): bool {
 		return current_user_can(
 			// phpcs:ignore WordPress.WP.Capabilities.Undetermined
 			$this->apply_capability_filters(
-				Base_Endpoint::DEFAULT_ACCESS_CAPABILITY
+				self::DEFAULT_ACCESS_CAPABILITY
 			)
 		);
 	}

diff --git a/src/content-helper/common/class-content-helper-feature.php b/src/content-helper/common/class-content-helper-feature.php
@@ -166,15 +166,17 @@ protected function inject_inline_scripts(
 				$settings = rest_do_request(
 					new WP_REST_Request(
 						'GET',
-						'/wp-parsely/v1' . $settings_route
+						'/wp-parsely/v2/settings/' . $settings_route
 					)
 				)->get_data();
 			}
 
-			if ( ! is_string( $settings ) ) {
-				$settings = '';
+			if ( ! is_array( $settings ) ) {
+				$settings = array();
 			}
 
+			$settings = wp_json_encode( $settings );
+
 			wp_add_inline_script(
 				static::get_script_id(),
 				"window.wpParselyContentHelperSettings = '$settings';",

diff --git a/src/content-helper/common/settings/provider.tsx b/src/content-helper/common/settings/provider.tsx
@@ -78,6 +78,7 @@ type ReactDeps = React.DependencyList | undefined;
  *
  * @since 3.13.0
  * @since 3.14.0 Moved from `content-helper/common/hooks/useSaveSettings.ts`.
+ * @since 3.17.0 Updated to the new API endpoints.
  *
  * @param {string}    endpoint The settings endpoint to send the data to.
  * @param {Settings}  data     The data to send.
@@ -96,7 +97,7 @@ const useSaveSettings = (
 		}
 
 		apiFetch( {
-			path: '/wp-parsely/v1/user-meta/content-helper/' + endpoint,
+			path: '/wp-parsely/v2/settings/' + endpoint,
 			method: 'PUT',
 			data,
 		} );

diff --git a/src/content-helper/dashboard-widget/class-dashboard-widget.php b/src/content-helper/dashboard-widget/class-dashboard-widget.php
@@ -10,7 +10,6 @@
 
 namespace Parsely\Content_Helper;
 
-use Parsely\Endpoints\User_Meta\Dashboard_Widget_Settings_Endpoint;
 use Parsely\Parsely;
 use Parsely\RemoteAPI\Analytics_Posts_API;
 
@@ -136,7 +135,7 @@ public function enqueue_assets(): void {
 			true
 		);
 
-		$this->inject_inline_scripts( Dashboard_Widget_Settings_Endpoint::get_route() );
+		$this->inject_inline_scripts( 'dashboard-widget' );
 
 		wp_enqueue_style(
 			static::get_style_id(),

diff --git a/src/content-helper/dashboard-widget/dashboard-widget.tsx b/src/content-helper/dashboard-widget/dashboard-widget.tsx
@@ -56,7 +56,7 @@ window.addEventListener(
 		if ( null !== container ) {
 			const component =
 				<SettingsProvider
-					endpoint="dashboard-widget-settings"
+					endpoint="dashboard-widget"
 					defaultSettings={ getSettingsFromJson( window.wpParselyContentHelperSettings ) }
 				>
 					<VerifyCredentials>

diff --git a/src/content-helper/editor-sidebar/class-editor-sidebar.php b/src/content-helper/editor-sidebar/class-editor-sidebar.php
@@ -12,9 +12,7 @@
 
 use Parsely\Content_Helper\Editor_Sidebar\Smart_Linking;
 use Parsely\Dashboard_Link;
-use Parsely\Endpoints\User_Meta\Editor_Sidebar_Settings_Endpoint;
 use Parsely\Parsely;
-use Parsely\Content_Helper\Content_Helper_Feature;
 
 use Parsely\Utils\Utils;
 use WP_Post;
@@ -163,7 +161,7 @@ public function run(): void {
 			true
 		);
 
-		$this->inject_inline_scripts( Editor_Sidebar_Settings_Endpoint::get_route() );
+		$this->inject_inline_scripts( 'editor-sidebar' );
 
 		// Inject inline variables for the editor sidebar, without UTM parameters.
 		$parsely_post_url = $this->get_parsely_post_url( null, false );