Ensure that manually classifying works in the Block Editor for Watson

Author: dkotter

includes/Classifai/Features/Classification.php

@@ -195,8 +195,9 @@ public function rest_endpoint_callback( WP_REST_Request $request ) {
 				]
 			);
 
+			// Save results or return the results that need saved.
 			if ( ! empty( $results ) && ! is_wp_error( $results ) ) {
-				$this->save( $request->get_param( 'id' ), $results );
+				$results = $this->save( $request->get_param( 'id' ), $results, $request->get_param( 'linkTerms' ) ?? true );
 			}
 
 			return rest_ensure_response(
@@ -214,19 +215,23 @@ public function rest_endpoint_callback( WP_REST_Request $request ) {
 	 * Save the classification results.
 	 *
 	 * @param int   $post_id The post ID.
-	 * @param array $results Term results.
+	 * @param array $results Term results
+	 * @param bool  $link Whether to link the terms or not.
+	 * @return array|WP_Error
 	 */
-	public function save( int $post_id, array $results ) {
+	public function save( int $post_id, array $results, bool $link = true ) {
 		$provider_instance = $this->get_feature_provider_instance();
 
 		switch ( $provider_instance::ID ) {
 			case NLU::ID:
-				$results = $provider_instance->link( $post_id, $results );
+				$results = $provider_instance->link( $post_id, $results, $link );
 				break;
 			case Embeddings::ID:
 				$results = $provider_instance->set_terms( $post_id, $results );
 				break;
 		}
+
+		return $results;
 	}
 
 	/**
@@ -844,7 +849,7 @@ public function get_all_feature_taxonomies(): array {
 			return $feature_taxonomies;
 		}
 
-		foreach ( array_keys( $this->get_supported_taxonomies() ) as $feature_name ) {
+		foreach ( array_keys( $provider_instance->nlu_features ) as $feature_name ) {
 			if ( ! get_classification_feature_enabled( $feature_name ) ) {
 				continue;
 			}

includes/Classifai/Providers/Watson/NLU.php

@@ -379,26 +379,29 @@ public function classify( int $post_id ) {
 
 		$classifier = new PostClassifier();
 
-		$output = $classifier->classify( $post_id );
+		return get_post_meta( $post_id, 'classifai_watson_nlu_results', true ); // TODO
+		// $output = $classifier->classify( $post_id );
 
-		return $output;
+		// update_post_meta( $post_id, 'classifai_watson_nlu_results', $output );
+		// return $output;
 	}
 
 	/**
 	 * Links the Watson NLU response output to taxonomy terms.
 	 *
 	 * @param int   $post_id The post ID.
 	 * @param array $terms The classification results from Watson NLU.
+	 * @param bool  $link Whether to link the terms or not.
 	 * @return array|WP_Error
 	 */
-	public function link( int $post_id, array $terms ) {
+	public function link( int $post_id, array $terms, bool $link = true ) {
 		if ( empty( $terms ) ) {
 			return new WP_Error( 'invalid', esc_html__( 'No terms to link.', 'classifai' ) );
 		}
 
 		$classifier = new PostClassifier();
 
-		$output = $classifier->link( $post_id, $terms );
+		$output = $classifier->link( $post_id, $terms, [], $link );
 
 		return $output;
 	}

src/js/gutenberg-plugin.js

@@ -288,7 +288,7 @@ const ClassificationButton = () => {
 		<div id="classify-post-component">
 			{ isOpen && (
 				<Modal
-					title={ __( 'Confirm Post Classification', 'classifai' ) }
+					title={ __( 'Confirm Classification', 'classifai' ) }
 					onRequestClose={ closeModal }
 					isFullScreen={ false }
 					className="classify-modal"