Merge branch 'develop' into filip/interactive-tasks

Author: aristath

CHANGELOG.md

@@ -1,5 +1,16 @@
 = 1.9.0 =
 
+In this release we've added an integration with the **All In One Seo** plugin so you’ll now see personalized suggestions based on your current SEO configuration.
+
+Added these recommendations from Ravi:
+
+* All In One SEO: [noindex the author archive](https://prpl.fyi/aioseo-author-archive)
+* All In One SEO: [noindex the date archive](https://prpl.fyi/aioseo-date-archive)
+* All In One SEO: [Remove post authors feeds](https://prpl.fyi/aioseo-crawl-optimization-feed-authors)
+* All In One SEO: [Remove comment feeds](https://prpl.fyi/aioseo-crawl-optimization-feed-comments)
+* All In One SEO: [disable the media pages](https://prpl.fyi/aioseo-media-pages)
+* All In One SEO: set your [organization](https://prpl.fyi/aioseo-organization-logo) or [person](https://prpl.fyi/aioseo-person-logo) logo
+
 Enhancements:
 
 * Add "Show all Recommendations" button to the "Ravi's Recommendations" widget

assets/js/recommendations/aioseo-author-archive.js

@@ -0,0 +1,24 @@
+/* global prplInteractiveTaskFormListener, progressPlanner */
+
+/*
+ * All in One SEO: noindex the author archive.
+ *
+ * Dependencies: progress-planner/recommendations/interactive-task
+ */
+
+prplInteractiveTaskFormListener.customSubmit( {
+	taskId: 'aioseo-author-archive',
+	popoverId: 'prpl-popover-aioseo-author-archive',
+	callback: () => {
+		fetch( progressPlanner.ajaxUrl, {
+			method: 'POST',
+			headers: {
+				'Content-Type': 'application/x-www-form-urlencoded',
+			},
+			body: new URLSearchParams( {
+				action: 'prpl_interactive_task_submit_aioseo-author-archive',
+				nonce: progressPlanner.nonce,
+			} ),
+		} );
+	},
+} );

assets/js/recommendations/aioseo-crawl-settings-feed-authors.js

@@ -0,0 +1,24 @@
+/* global prplInteractiveTaskFormListener, progressPlanner */
+
+/*
+ * All in One SEO: disable author RSS feeds.
+ *
+ * Dependencies: progress-planner/recommendations/interactive-task
+ */
+
+prplInteractiveTaskFormListener.customSubmit( {
+	taskId: 'aioseo-crawl-settings-feed-authors',
+	popoverId: 'prpl-popover-aioseo-crawl-settings-feed-authors',
+	callback: () => {
+		fetch( progressPlanner.ajaxUrl, {
+			method: 'POST',
+			headers: {
+				'Content-Type': 'application/x-www-form-urlencoded',
+			},
+			body: new URLSearchParams( {
+				action: 'prpl_interactive_task_submit_aioseo-crawl-settings-feed-authors',
+				nonce: progressPlanner.nonce,
+			} ),
+		} );
+	},
+} );

assets/js/recommendations/aioseo-crawl-settings-feed-comments.js

@@ -0,0 +1,24 @@
+/* global prplInteractiveTaskFormListener, progressPlanner */
+
+/*
+ * All in One SEO: disable global comment RSS feeds.
+ *
+ * Dependencies: progress-planner/recommendations/interactive-task
+ */
+
+prplInteractiveTaskFormListener.customSubmit( {
+	taskId: 'aioseo-crawl-settings-feed-comments',
+	popoverId: 'prpl-popover-aioseo-crawl-settings-feed-comments',
+	callback: () => {
+		fetch( progressPlanner.ajaxUrl, {
+			method: 'POST',
+			headers: {
+				'Content-Type': 'application/x-www-form-urlencoded',
+			},
+			body: new URLSearchParams( {
+				action: 'prpl_interactive_task_submit_aioseo-crawl-settings-feed-comments',
+				nonce: progressPlanner.nonce,
+			} ),
+		} );
+	},
+} );

assets/js/recommendations/aioseo-date-archive.js

@@ -0,0 +1,24 @@
+/* global prplInteractiveTaskFormListener, progressPlanner */
+
+/*
+ * All in One SEO: noindex the date archive.
+ *
+ * Dependencies: progress-planner/recommendations/interactive-task
+ */
+
+prplInteractiveTaskFormListener.customSubmit( {
+	taskId: 'aioseo-date-archive',
+	popoverId: 'prpl-popover-aioseo-date-archive',
+	callback: () => {
+		fetch( progressPlanner.ajaxUrl, {
+			method: 'POST',
+			headers: {
+				'Content-Type': 'application/x-www-form-urlencoded',
+			},
+			body: new URLSearchParams( {
+				action: 'prpl_interactive_task_submit_aioseo-date-archive',
+				nonce: progressPlanner.nonce,
+			} ),
+		} );
+	},
+} );

assets/js/recommendations/aioseo-media-pages.js

@@ -0,0 +1,24 @@
+/* global prplInteractiveTaskFormListener, progressPlanner */
+
+/*
+ * All in One SEO: redirect media pages.
+ *
+ * Dependencies: progress-planner/recommendations/interactive-task
+ */
+
+prplInteractiveTaskFormListener.customSubmit( {
+	taskId: 'aioseo-media-pages',
+	popoverId: 'prpl-popover-aioseo-media-pages',
+	callback: () => {
+		fetch( progressPlanner.ajaxUrl, {
+			method: 'POST',
+			headers: {
+				'Content-Type': 'application/x-www-form-urlencoded',
+			},
+			body: new URLSearchParams( {
+				action: 'prpl_interactive_task_submit_aioseo-media-pages',
+				nonce: progressPlanner.nonce,
+			} ),
+		} );
+	},
+} );

assets/js/web-components/prpl-badge-progress-bar.js

@@ -17,7 +17,12 @@ customElements.define(
 		 * Observed attributes, defined the attributes that will trigger the attributeChangedCallback.
 		 */
 		static get observedAttributes() {
-			return [ 'data-badge-id', 'data-points', 'data-max-points' ];
+			return [
+				'data-badge-id',
+				'data-points',
+				'data-max-points',
+				'data-branding-id',
+			];
 		}
 
 		/**
@@ -32,6 +37,9 @@ customElements.define(
 				maxPoints: parseInt(
 					this.getAttribute( 'data-max-points' ) || 10
 				),
+				brandingId: parseInt(
+					this.getAttribute( 'data-branding-id' ) || 0
+				),
 			};
 		}
 
@@ -70,6 +78,10 @@ customElements.define(
 		 * Get the progress percent.
 		 */
 		get progressPercent() {
+			// Prevent division by zero.
+			if ( 0 === this.maxPoints ) {
+				return 0;
+			}
 			return ( this.points / this.maxPoints ) * 100;
 		}
 
@@ -98,8 +110,14 @@ customElements.define(
 				// Convert kebab-case to camelCase
 				.replace( /-([a-z])/g, ( _, chr ) => chr.toUpperCase() );
 
-			// Update state.
-			this.state[ camelCaseName ] = newVal;
+			// Update state with proper type conversion.
+			this.state[ camelCaseName ] = [
+				'points',
+				'maxPoints',
+				'brandingId',
+			].includes( camelCaseName )
+				? parseInt( newVal || 0 )
+				: newVal;
 
 			// Update progress.
 			this.updateProgress();

classes/admin/class-page.php

@@ -180,8 +180,8 @@ public function enqueue_scripts() {
 			$default_localization_data = [
 				'name' => 'progressPlanner',
 				'data' => [
-					'onboardNonceURL' => \progress_planner()->get_utils__onboard()->get_remote_nonce_url(),
-					'onboardAPIUrl'   => \progress_planner()->get_utils__onboard()->get_remote_url(),
+					'onboardNonceURL' => \progress_planner()->get_utils__onboard()->get_remote_url( 'get-nonce' ),
+					'onboardAPIUrl'   => \progress_planner()->get_utils__onboard()->get_remote_url( 'onboard' ),
 					'ajaxUrl'         => \admin_url( 'admin-ajax.php' ),
 					'nonce'           => \wp_create_nonce( 'progress_planner' ),
 				],

classes/class-suggested-tasks-db.php

@@ -52,20 +52,25 @@ public function add( $data ) {
 		}
 
 		// Check if we have an existing task with the same title.
-		$posts = $this->get_tasks_by(
+		$posts         = $this->get_tasks_by(
 			[
 				'post_status' => [ 'publish', 'trash', 'draft', 'future', 'pending' ], // 'any' doesn't include statuses which have 'exclude_from_search' set to true (trash and pending).
 				'numberposts' => 1,
-				'meta_query'  => [ // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_meta_query
-					[
-						'key'     => 'prpl_task_id',
-						'value'   => $data['task_id'],
-						'compare' => '=',
-					],
-				],
+				'name'        => \progress_planner()->get_suggested_tasks()->get_task_id_from_slug( $data['task_id'] ),
+			]
+		);
+		$posts_trashed = $this->get_tasks_by(
+			[
+				'post_status' => [ 'trash' ],
+				'numberposts' => 1,
+				'name'        => \progress_planner()->get_suggested_tasks()->get_task_id_from_slug( $data['task_id'] ) . '__trashed',
 			]
 		);
 
+		if ( empty( $posts ) && ! empty( $posts_trashed ) ) {
+			$posts = $posts_trashed;
+		}
+
 		// If we have an existing task, skip.
 		if ( ! empty( $posts ) ) {
 			\delete_option( $lock_key );
@@ -83,6 +88,7 @@ public function add( $data ) {
 			'post_title'   => $data['post_title'],
 			'post_content' => $data['description'] ?? '',
 			'menu_order'   => $data['order'] ?? 0,
+			'post_name'    => \progress_planner()->get_suggested_tasks()->get_task_id_from_slug( $data['task_id'] ),
 		];
 		switch ( $data['post_status'] ) {
 			case 'pending':
@@ -313,12 +319,7 @@ public function get_tasks_by( $params ) {
 					break;
 
 				case 'task_id':
-					$args['meta_query']   = isset( $args['meta_query'] ) ? $args['meta_query'] : []; // phpcs:ignore WordPress.DB.SlowDBQuery
-					$args['meta_query'][] = [
-						'key'   => 'prpl_task_id',
-						'value' => $value,
-					];
-
+					$args['name'] = \progress_planner()->get_suggested_tasks()->get_task_id_from_slug( $value );
 					unset( $params[ $param ] );
 					break;
 
@@ -359,6 +360,23 @@ public function get( $args = [] ) {
 		$results = $this->format_recommendations(
 			\get_posts( $args )
 		);
+		if ( ! empty( $args['post_status'] )
+			&& \in_array( 'trash', (array) $args['post_status'], true )
+			&& isset( $args['name'] )
+		) {
+			$results_trashed = $this->format_recommendations(
+				\get_posts(
+					\wp_parse_args(
+						$args,
+						[
+							'post_status' => [ 'trash' ],
+							'name'        => \progress_planner()->get_suggested_tasks()->get_task_id_from_slug( $args['name'] ) . '__trashed',
+						]
+					)
+				)
+			);
+			$results         = array_merge( $results, $results_trashed );
+		}
 
 		\wp_cache_set( $cache_key, $results, static::GET_TASKS_CACHE_GROUP );
 

classes/class-suggested-tasks.php

@@ -80,15 +80,15 @@ public function init(): void {
 		$completed_tasks = $this->tasks_manager->evaluate_tasks();
 
 		foreach ( $completed_tasks as $task ) {
-			if ( ! $task->task_id && $task->ID ) {
+			if ( ! $task->post_name && $task->ID ) {
 				continue;
 			}
 
 			// Change the task status to pending.
 			$task->celebrate();
 
 			// Insert an activity.
-			$this->insert_activity( $task->task_id );
+			$this->insert_activity( \progress_planner()->get_suggested_tasks()->get_task_id_from_slug( $task->post_name ) );
 		}
 	}
 
@@ -156,7 +156,7 @@ public function on_automatic_updates_complete(): void {
 		\progress_planner()->get_suggested_tasks_db()->update_recommendation( $pending_tasks[0]->ID, [ 'post_status' => 'trash' ] );
 
 		// Insert an activity.
-		$this->insert_activity( $pending_tasks[0]->task_id );
+		$this->insert_activity( \progress_planner()->get_suggested_tasks()->get_task_id_from_slug( $pending_tasks[0]->post_name ) );
 	}
 
 	/**
@@ -247,13 +247,13 @@ public function suggested_task_action() {
 		switch ( $action ) {
 			case 'complete':
 				// Insert an activity.
-				$this->insert_activity( $task->task_id );
+				$this->insert_activity( \progress_planner()->get_suggested_tasks()->get_task_id_from_slug( $task->post_name ) );
 				$updated = true;
 				break;
 
 			case 'pending': // User task was marked as pending.
 			case 'delete':
-				$this->delete_activity( $task->task_id );
+				$this->delete_activity( \progress_planner()->get_suggested_tasks()->get_task_id_from_slug( $task->post_name ) );
 				$updated = true;
 				break;
 		}
@@ -298,17 +298,12 @@ public function register_post_type() {
 		);
 
 		$rest_meta_fields = [
-			'prpl_task_id' => [
+			'prpl_url'   => [
 				'type'         => 'string',
 				'single'       => true,
 				'show_in_rest' => true,
 			],
-			'prpl_url'     => [
-				'type'         => 'string',
-				'single'       => true,
-				'show_in_rest' => true,
-			],
-			'menu_order'   => [
+			'menu_order' => [
 				'type'         => 'number',
 				'single'       => true,
 				'show_in_rest' => true,
@@ -429,6 +424,8 @@ public function rest_prepare_recommendation( $response, $post ) {
 			$provider = \progress_planner()->get_suggested_tasks()->get_tasks_manager()->get_task_provider( $provider_term[0]->slug );
 		}
 
+		$response->data['slug'] = \progress_planner()->get_suggested_tasks()->get_task_id_from_slug( $response->data['slug'] );
+
 		if ( $provider ) {
 			$response->data['prpl_provider'] = $provider_term[0];
 			// Link should be added during run time, since it is not added for users without required capability.
@@ -437,18 +434,18 @@ public function rest_prepare_recommendation( $response, $post ) {
 				: '';
 
 			$response->data['prpl_popover_id'] = $provider->get_popover_id();
-
-			// This has to be the last item to be added because actions use data from previous items.
-			$response->data['prpl_task_actions'] = $provider->get_task_actions( $response->data );
-			$response->data['prpl_points']       = $provider->get_points();
+			$response->data['prpl_points']     = $provider->get_points();
 
 			/*
 			 * Check if task was completed before - for example, comments were disabled and then re-enabled, and remove points if so.
 			 * Those are tasks which are completed by toggling an option, so non repetitive & not user tasks.
 			 */
-			if ( ! \has_term( 'user', 'prpl_recommendations_provider', $post->ID ) && ! $provider->is_repetitive() && $provider->task_has_activity( $response->data['meta']['prpl_task_id'] ) ) {
+			if ( ! \has_term( 'user', 'prpl_recommendations_provider', $post->ID ) && ! $provider->is_repetitive() && $provider->task_has_activity( $response->data['slug'] ) ) {
 				$response->data['prpl_points'] = 0;
 			}
+
+			// This has to be the last item to be added because actions use data from previous items.
+			$response->data['prpl_task_actions'] = $provider->get_task_actions( $response->data );
 		}
 
 		// Category taxonomy removed - no longer adding prpl_category to response.
@@ -520,4 +517,14 @@ function ( $task ) use ( $args ) {
 		 */
 		return \apply_filters( 'progress_planner_suggested_tasks_in_rest_format', $tasks, $args );
 	}
+
+	/**
+	 * Get the task ID from a slug.
+	 *
+	 * @param string $slug The slug.
+	 * @return string
+	 */
+	public function get_task_id_from_slug( $slug ) {
+		return explode( '__trashed', $slug )[0];
+	}
 }