Merge branch 'develop' into filip/onboarding-tweaks

Author: ilicfilip

assets/js/recommendations/interactive-task.js

@@ -118,17 +118,25 @@ const prplInteractiveTaskFormListener = {
 				.finally( () => {
 					// Hide loading state.
 					prplInteractiveTaskFormListener.hideLoading( formElement );
-
-					// Remove the form listener once the callback is executed.
-					formElement.removeEventListener(
-						'submit',
-						formSubmitHandler
-					);
 				} );
 		};
 
 		// Add a form listener to the form.
 		formElement.addEventListener( 'submit', formSubmitHandler );
+
+		// Remove the form listener when the popover is closed.
+		document.getElementById( popoverId ).addEventListener(
+			'toggle',
+			( toggleEvent ) => {
+				if ( toggleEvent.newState === 'closed' ) {
+					formElement.removeEventListener(
+						'submit',
+						formSubmitHandler
+					);
+				}
+			},
+			{ once: true }
+		);
 	},
 
 	settings: ( {

classes/actions/class-content-scan.php

@@ -59,12 +59,18 @@ public function update_stats() {
 			return;
 		}
 
+		// Bail if content helpers are not available (can happen during plugin updates).
+		$content_helpers = \progress_planner()->get_activities__content_helpers();
+		if ( null === $content_helpers ) {
+			return;
+		}
+
 		// Get posts.
 		$posts = \get_posts(
 			[
 				'posts_per_page' => static::SCAN_POSTS_PER_PAGE,
 				'paged'          => $current_page,
-				'post_type'      => \progress_planner()->get_activities__content_helpers()->get_post_types_names(),
+				'post_type'      => $content_helpers->get_post_types_names(),
 				'post_status'    => 'publish',
 			]
 		);
@@ -88,9 +94,15 @@ public function update_stats() {
 	 * @return int
 	 */
 	public function get_total_pages() {
+		// Bail if content helpers are not available (can happen during plugin updates).
+		$content_helpers = \progress_planner()->get_activities__content_helpers();
+		if ( null === $content_helpers ) {
+			return 0;
+		}
+
 		// Get the total number of posts.
 		$total_posts_count = 0;
-		foreach ( \progress_planner()->get_activities__content_helpers()->get_post_types_names() as $post_type ) {
+		foreach ( $content_helpers->get_post_types_names() as $post_type ) {
 			$total_posts_count += \wp_count_posts( $post_type )->publish;
 		}
 		// Calculate the total pages to scan.

classes/actions/class-content.php

@@ -157,10 +157,16 @@ public function delete_post( $post_id ) {
 	 * @return bool
 	 */
 	private function should_skip_saving( $post ) {
+		// Bail if content helpers are not available (can happen during plugin updates).
+		$content_helpers = \progress_planner()->get_activities__content_helpers();
+		if ( null === $content_helpers ) {
+			return true;
+		}
+
 		// Bail if the post is not included in the post-types we're tracking.
 		if ( ! \in_array(
 			$post->post_type,
-			\progress_planner()->get_activities__content_helpers()->get_post_types_names(),
+			$content_helpers->get_post_types_names(),
 			true
 		) ) {
 			return true;

classes/actions/class-maintenance.php

@@ -128,6 +128,11 @@ public function on_switch_theme() {
 	 * @return void
 	 */
 	protected function create_maintenance_activity( $type ) {
+		// Bail if the class doesn't exist (can happen during plugin updates).
+		if ( ! \class_exists( Activities_Maintenance::class ) ) {
+			return;
+		}
+
 		$activity       = new Activities_Maintenance();
 		$activity->type = $type;
 		$activity->save();

classes/class-base.php

@@ -51,7 +51,7 @@
  * @method \Progress_Planner\UI\Popover get_ui__popover()
  * @method \Progress_Planner\Admin\Widgets\Content_Activity get_admin__widgets__content_activity()
  * @method \Progress_Planner\UI\Chart get_ui__chart()
- * @method \Progress_Planner\Activities\Content_Helpers get_activities__content_helpers()
+ * @method \Progress_Planner\Activities\Content_Helpers|null get_activities__content_helpers()
  * @method \Progress_Planner\Admin\Widgets\Challenge get_admin__widgets__challenge()
  * @method \Progress_Planner\Admin\Widgets\Activity_Scores get_admin__widgets__activity_scores()
  * @method \Progress_Planner\Utils\Date get_utils__date()

classes/suggested-tasks/providers/class-set-valuable-post-types.php

@@ -1,14 +1,14 @@
 <?php
 /**
- * Add tasks for settings saved.
+ * Add tasks for set valuable post types.
  *
  * @package Progress_Planner
  */
 
 namespace Progress_Planner\Suggested_Tasks\Providers;
 
 /**
- * Add tasks for settings saved.
+ * Add tasks for set valuable post types.
  */
 class Set_Valuable_Post_Types extends Tasks_Interactive {
 
@@ -119,30 +119,31 @@ protected function get_title() {
 
 	/**
 	 * Check if the task should be added.
-	 * We add tasks only to users who have have completed "Fill the settings page" task
-	 * and have upgraded from v1.2 or have 'include_post_types' option empty.
+	 * We add tasks only to users who have upgraded from v1.2 or have 'include_post_types' option empty.
 	 * Reason being that this option was migrated,
 	 * but it could be missed, and post type selection should be revisited.
 	 *
 	 * @return bool
 	 */
 	public function should_add_task() {
-		$saved_posts = \progress_planner()->get_suggested_tasks_db()->get_tasks_by( [ 'provider_id' => 'settings-saved' ] );
-		if ( empty( $saved_posts ) ) {
+		$activity = \progress_planner()->get_activities__query()->query_activities(
+			[
+				'category' => 'suggested_task',
+				'data_id'  => static::PROVIDER_ID,
+			]
+		);
+		if ( ! empty( $activity ) ) {
 			return false;
 		}
 
-		// Is the task trashed?
-		$post_trashed = 'trash' === $saved_posts[0]->post_status;
-
 		// Upgraded from <= 1.2?
 		$upgraded = (bool) \get_option( 'progress_planner_set_valuable_post_types', false );
 
 		// Include post types option empty?
 		$include_post_types = \progress_planner()->get_settings()->get( 'include_post_types', [] );
 
-		// Add the task only to users who have completed the "Settings saved" task and have upgraded from v1.2 or have 'include_post_types' option empty.
-		return $post_trashed && ( true === $upgraded || empty( $include_post_types ) );
+		// Add the task only to users who have upgraded from v1.2 or have 'include_post_types' option empty.
+		return ( true === $upgraded || empty( $include_post_types ) );
 	}
 
 	/**