Remove Interactive abstraction

Author: aristath

classes/suggested-tasks/class-tasks-manager.php

@@ -25,7 +25,7 @@
 use Progress_Planner\Suggested_Tasks\Tasks_Interface;
 use Progress_Planner\Suggested_Tasks\Providers\Integrations\Yoast\Add_Yoast_Providers;
 use Progress_Planner\Suggested_Tasks\Providers\User as User_Tasks;
-use Progress_Planner\Suggested_Tasks\Providers\Interactive\Email_Sending;
+use Progress_Planner\Suggested_Tasks\Providers\Email_Sending;
 use Progress_Planner\Suggested_Tasks\Providers\Set_Valuable_Post_Types;
 use Progress_Planner\Suggested_Tasks\Providers\Fewer_Tags;
 use Progress_Planner\Suggested_Tasks\Providers\Remove_Terms_Without_Posts;

…ders/interactive/class-email-sending.php …-tasks/providers/class-email-sending.phpclasses/suggested-tasks/providers/interactive/class-email-sending.php renamed to classes/suggested-tasks/providers/class-email-sending.php classes/suggested-tasks/providers/interactive/class-email-sending.php renamed to classes/suggested-tasks/providers/class-email-sending.php

@@ -5,14 +5,12 @@
  * @package Progress_Planner
  */
 
-namespace Progress_Planner\Suggested_Tasks\Providers\Interactive;
-
-use Progress_Planner\Suggested_Tasks\Providers\Interactive;
+namespace Progress_Planner\Suggested_Tasks\Providers;
 
 /**
  * Add task for Email sending.
  */
-class Email_Sending extends Interactive {
+class Email_Sending extends Tasks {
 
 	/**
 	 * Whether the task is an onboarding task.
@@ -35,6 +33,13 @@ class Email_Sending extends Interactive {
 	 */
 	const CATEGORY = 'configuration';
 
+	/**
+	 * Whether the task is interactive.
+	 *
+	 * @var bool
+	 */
+	protected $is_interactive = true;
+
 	/**
 	 * Whether the task is dismissable.
 	 *
@@ -126,6 +131,37 @@ public function init() {
 		);
 	}
 
+	/**
+	 * We want task to be added always.
+	 *
+	 * @return bool
+	 */
+	public function should_add_task() {
+		return true;
+	}
+
+	/**
+	 * Task should be completed only manually by the user.
+	 *
+	 * @param string $task_id The task ID.
+	 *
+	 * @return bool
+	 */
+	public function is_task_completed( $task_id = '' ) {
+		return false;
+	}
+
+	/**
+	 * Task should be completed only manually by the user.
+	 *
+	 * @param string $task_id The task ID.
+	 *
+	 * @return bool|string
+	 */
+	public function evaluate_task( $task_id ) {
+		return false;
+	}
+
 	/**
 	 * Get the title.
 	 *

classes/suggested-tasks/providers/class-interactive.php

@@ -119,6 +119,31 @@ abstract class Tasks implements Tasks_Interface {
 	 */
 	protected $data_collector = null;
 
+	/**
+	 * The popover ID for interactive tasks.
+	 *
+	 * @var string
+	 */
+	protected $popover_id = '';
+
+	/**
+	 * Whether the task is interactive.
+	 *
+	 * @var bool
+	 */
+	protected $is_interactive = false;
+
+	/**
+	 * Constructor.
+	 *
+	 * @return void
+	 */
+	public function __construct() {
+		if ( $this->is_interactive ) {
+			\add_action( 'progress_planner_admin_page_after_widgets', [ $this, 'add_popover' ] );
+		}
+	}
+
 	/**
 	 * Initialize the task provider.
 	 *
@@ -548,4 +573,24 @@ protected function transform_collector_data( array $data ): array {
 
 		return $data;
 	}
+
+	/**
+	 * Add the popover.
+	 *
+	 * @return void
+	 */
+	public function add_popover() {
+		?>
+		<div id="prpl-popover-<?php echo \esc_attr( $this->popover_id ); ?>" class="prpl-popover prpl-popover-interactive" popover>
+			<?php $this->the_popover_content(); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
+		</div>
+		<?php
+	}
+
+	/**
+	 * The popover content.
+	 *
+	 * @return void
+	 */
+	public function the_popover_content() {}
 }