Merge branch 'develop' into jdv/menu-position

Author: ilicfilip

.github/workflows/plugin-check.yml

@@ -26,6 +26,8 @@ jobs:
             unzip ${{ github.event.repository.name }}.zip -d build
 
         - name: Run plugin check
-          uses: wordpress/plugin-check-action@v1.0.6
+          uses: wordpress/plugin-check-action@v1.1.4
           with:
             build-dir: './build/${{ github.event.repository.name }}'
+            exclude-checks: |
+              direct_file_access

assets/css/onboarding/onboarding.css

@@ -298,6 +298,7 @@
 		img, svg {
 			height: 100%;
 			width: auto;
+			max-width: 100%;
 		}
 	}
 

assets/js/onboarding/onboarding.js

@@ -373,6 +373,17 @@ class ProgressPlannerOnboardWizard {
 					this.state.data.finished =
 						this.state.currentStep === this.tourSteps.length - 1;
 					this.closeTour();
+
+					// If on PP Dashboard page and privacy was accepted during onboarding,
+					// refresh the page to properly initialize dashboard components.
+					if (
+						this.state.data.privacyAccepted &&
+						window.location.href.includes(
+							'admin.php?page=progress-planner'
+						)
+					) {
+						window.location.reload();
+					}
 				} );
 			}
 		} else {

assets/js/onboarding/steps/SettingsStep.js

@@ -1,18 +1,11 @@
 /**
- * Settings step - Configure About, Contact, FAQ pages, Post Types, and Login Destination
+ * Settings step - Configure About, Contact, FAQ pages, and Post Types
  * Multi-step process with 5 sub-steps
  */
 /* global OnboardingStep, ProgressPlannerOnboardData */
 
 class PrplSettingsStep extends OnboardingStep {
-	subSteps = [
-		'homepage',
-		'about',
-		'contact',
-		'faq',
-		'post-types',
-		'login-destination',
-	];
+	subSteps = [ 'homepage', 'about', 'contact', 'faq', 'post-types' ];
 
 	defaultSettings = {
 		homepage: {
@@ -34,9 +27,6 @@ class PrplSettingsStep extends OnboardingStep {
 		'post-types': {
 			selectedTypes: [], // Array of selected post type slugs
 		},
-		'login-destination': {
-			redirectOnLogin: false, // Checkbox state
-		},
 	};
 
 	constructor() {
@@ -137,7 +127,7 @@ class PrplSettingsStep extends OnboardingStep {
 
 	/**
 	 * Setup event listeners for a sub-step
-	 * @param {string} subStepName - Name of sub-step (about/contact/faq/post-types/login-destination)
+	 * @param {string} subStepName - Name of sub-step (about/contact/faq/post-types)
 	 * @param {Object} subStepData - Data for this sub-step
 	 * @param {Object} state       - Wizard state
 	 */
@@ -153,16 +143,6 @@ class PrplSettingsStep extends OnboardingStep {
 		// Handle post types sub-step
 		if ( subStepName === 'post-types' ) {
 			this.setupPostTypesListeners( subStepName, subStepData, state );
-			return;
-		}
-
-		// Handle login destination sub-step
-		if ( subStepName === 'login-destination' ) {
-			this.setupLoginDestinationListeners(
-				subStepName,
-				subStepData,
-				state
-			);
 		}
 	}
 
@@ -342,60 +322,6 @@ class PrplSettingsStep extends OnboardingStep {
 		this.updateSaveButtonState( saveButton, subStepData );
 	}
 
-	/**
-	 * Setup event listeners for login destination sub-step
-	 * @param {string} subStepName - Name of sub-step
-	 * @param {Object} subStepData - Data for this sub-step
-	 * @param {Object} state       - Wizard state
-	 */
-	setupLoginDestinationListeners( subStepName, subStepData, state ) {
-		const container = this.popover.querySelector(
-			`.prpl-setting-item[data-page="${ subStepName }"]`
-		);
-		const saveButton = this.popover.querySelector(
-			`#prpl-save-${ subStepName }-setting`
-		);
-
-		if ( ! container || ! saveButton ) {
-			return;
-		}
-
-		// Get checkbox
-		const checkbox = container.querySelector(
-			'input[type="checkbox"][name="prpl-redirect-on-login"]'
-		);
-
-		if ( ! checkbox ) {
-			return;
-		}
-
-		// Initialize from checkbox that is already set in template, or from saved data
-		if ( subStepData.redirectOnLogin === undefined ) {
-			subStepData.redirectOnLogin = checkbox.checked;
-		} else {
-			checkbox.checked = subStepData.redirectOnLogin;
-		}
-
-		// Add change listener
-		checkbox.addEventListener( 'change', ( e ) => {
-			subStepData.redirectOnLogin = e.target.checked;
-			this.updateSaveButtonState( saveButton, subStepData );
-
-			// Update Next/Dashboard button if on last sub-step
-			if ( this.currentSubStep === this.subSteps.length - 1 ) {
-				this.updateNextButton();
-			}
-		} );
-
-		// Save button handler - just advances to next sub-step
-		saveButton.addEventListener( 'click', () => {
-			this.advanceSubStep( state );
-		} );
-
-		// Initial button state
-		this.updateSaveButtonState( saveButton, subStepData );
-	}
-
 	/**
 	 * Advance to next sub-step
 	 * @param {Object} state - Wizard state
@@ -445,11 +371,6 @@ class PrplSettingsStep extends OnboardingStep {
 			return subStepData.selectedTypes.length > 0;
 		}
 
-		// Handle login destination sub-step - always valid (checkbox is optional)
-		if ( subStepData.redirectOnLogin !== undefined ) {
-			return true;
-		}
-
 		return false;
 	}
 
@@ -525,12 +446,6 @@ class PrplSettingsStep extends OnboardingStep {
 				} );
 			}
 
-			// Add login destination
-			const loginData = state.data.settings[ 'login-destination' ];
-			if ( loginData && loginData.redirectOnLogin ) {
-				formDataObj.append( 'prpl-redirect-on-login', '1' );
-			}
-
 			// Send single AJAX request
 			const response = await fetch(
 				ProgressPlannerOnboardData.adminAjaxUrl,

assets/js/web-components/prpl-interactive-task.js

@@ -5,14 +5,6 @@
  */
 // eslint-disable-next-line no-unused-vars
 class PrplInteractiveTask extends HTMLElement {
-	// eslint-disable-next-line no-useless-constructor
-	constructor() {
-		// Get parent class properties
-		super();
-
-		this.repositionPopover = this.repositionPopover.bind( this ); // So this is available in the event listener.
-	}
-
 	/**
 	 * Runs when the component is added to the DOM.
 	 */
@@ -55,20 +47,6 @@ class PrplInteractiveTask extends HTMLElement {
 		} );
 	}
 
-	/**
-	 * Runs when the popover is added to the DOM.
-	 */
-	popoverAddedToDOM() {
-		window.addEventListener( 'resize', this.repositionPopover );
-	}
-
-	/**
-	 * Runs when the popover is opening.
-	 */
-	popoverOpening() {
-		this.repositionPopover();
-	}
-
 	/**
 	 * Runs when the popover is closing.
 	 */
@@ -107,63 +85,6 @@ class PrplInteractiveTask extends HTMLElement {
 		const popover = document.getElementById( popoverId );
 		popover.hidePopover();
 	}
-
-	/**
-	 * Repositions the popover relative to the target element.
-	 * @private
-	 */
-	repositionPopover() {
-		const horizontalTarget = document.querySelector( '.prpl-wrap' );
-		const verticalTarget = document.querySelector(
-			'.prpl-widget-wrapper.prpl-suggested-tasks'
-		);
-
-		// Just in case.
-		if ( ! horizontalTarget || ! verticalTarget ) {
-			return;
-		}
-
-		const horizontalRect = horizontalTarget.getBoundingClientRect();
-		const verticalRect = verticalTarget.getBoundingClientRect();
-		const popoverId = this.getAttribute( 'popover-id' );
-		const popover = document.getElementById( popoverId );
-
-		// Reset default popover styles.
-		popover.style.margin = '0';
-
-		// Calculate target's center
-		const horizontalTargetCenter =
-			horizontalRect.left + horizontalRect.width / 2;
-
-		// Ensure that the popover is not too far from the top of the screen on small screens.
-		const MARGIN_TOP = 12; // minimum gap from top
-		const MARGIN_BOTTOM = 12; // minimum gap from bottom
-		const MOBILE_TOP_CAP = 100; // max starting offset on small screens
-		const isSmallScreen = window.matchMedia( '(max-width: 768px)' ).matches;
-		const MAX_TOP_CAP = isSmallScreen
-			? MOBILE_TOP_CAP
-			: Number.POSITIVE_INFINITY;
-
-		const desiredTop = Math.round( verticalRect.top );
-
-		const clampedTop = Math.max(
-			MARGIN_TOP,
-			Math.min( desiredTop, MAX_TOP_CAP )
-		);
-
-		// Apply the position.
-		popover.style.position = 'fixed';
-		popover.style.left = `${ horizontalTargetCenter }px`;
-		popover.style.top = `${ Math.round( clampedTop ) }px`;
-		popover.style.transform = 'translateX(-50%)';
-
-		// Make sure popover content can scroll if needed
-		popover.style.maxHeight = '80vh'; // adjustable
-		popover.style.overflowY = 'auto';
-		popover.style.maxHeight = `calc(100vh - ${
-			clampedTop + MARGIN_BOTTOM
-		}px)`;
-	}
 }
 
 /**

classes/class-onboard-wizard.php

@@ -12,20 +12,36 @@
  */
 class Onboard_Wizard {
 
+	/**
+	 * Option name for storing onboarding progress.
+	 *
+	 * @var string
+	 */
+	public const PROGRESS_OPTION_NAME = 'prpl_onboard_progress';
+
 	/**
 	 * Steps and their order.
 	 *
 	 * @var array
 	 */
 	protected $steps = [];
 
+	/**
+	 * Delete the onboarding progress option.
+	 *
+	 * @return bool True if the option was deleted, false otherwise.
+	 */
+	public static function delete_progress() {
+		return \delete_option( self::PROGRESS_OPTION_NAME );
+	}
+
 	/**
 	 * Constructor.
 	 *
 	 * @return void
 	 */
 	public function __construct() {
-		\add_action( 'init', [ $this, 'maybe_register_popover_hooks' ], 0 );
+		\add_action( 'init', [ $this, 'maybe_register_popover_hooks' ], 10 ); // Wait for the Playground to register its hooks.
 	}
 
 	/**
@@ -51,21 +67,21 @@ public function maybe_register_popover_hooks() {
 		// 2. Onboarding already in progress.
 		// 3. Branded site (privacy auto-accepted, but still needs onboarding).
 		$is_branded      = 0 !== (int) \progress_planner()->get_ui__branding()->get_branding_id();
-		$skip_onboarding = \progress_planner()->is_privacy_policy_accepted()
-			&& ! \get_option( 'prpl_onboard_progress', false )
-			&& ! $is_branded;
+		$show_onboarding = ! \progress_planner()->is_privacy_policy_accepted()
+			|| \get_option( self::PROGRESS_OPTION_NAME, false )
+			|| $is_branded;
 
 		/**
-		 * Filter whether to skip the onboarding wizard.
+		 * Filter whether to show the onboarding wizard.
 		 *
 		 * Hosting integrations can use this filter to force showing
 		 * or hiding the onboarding wizard.
 		 *
-		 * @param bool $skip_onboarding Whether to skip showing the onboarding wizard.
+		 * @param bool $show_onboarding Whether to show the onboarding wizard.
 		 */
-		$skip_onboarding = \apply_filters( 'progress_planner_skip_onboarding', $skip_onboarding );
+		$show_onboarding = \apply_filters( 'progress_planner_show_onboarding', $show_onboarding );
 
-		if ( $skip_onboarding ) {
+		if ( ! $show_onboarding ) {
 			return;
 		}
 
@@ -319,7 +335,7 @@ protected function get_saved_progress() {
 			return null;
 		}
 
-		$onboarding_progress = \get_option( 'prpl_onboard_progress', true );
+		$onboarding_progress = \get_option( self::PROGRESS_OPTION_NAME, true );
 		if ( ! $onboarding_progress ) {
 			return null;
 		}
@@ -363,7 +379,7 @@ public function ajax_save_onboarding_progress() {
 		\error_log( print_r( $progress, true ) ); // phpcs:ignore WordPress.PHP.DevelopmentFunctions.error_log_print_r, WordPress.PHP.DevelopmentFunctions.error_log_error_log
 
 		// Save as user meta?
-		\update_option( 'prpl_onboard_progress', $progress );
+		\update_option( self::PROGRESS_OPTION_NAME, $progress );
 
 		\wp_send_json_success( [ 'message' => \esc_html__( 'Tour progress saved.', 'progress-planner' ) ] );
 	}

classes/class-plugin-upgrade-tasks.php

@@ -83,8 +83,9 @@ public function handle_activation_or_upgrade() {
 	 * @return void
 	 */
 	protected function add_initial_onboarding_tasks() {
-		// Privacy policy is not accepted, so it's a fresh install.
-		$fresh_install = ! \progress_planner()->is_privacy_policy_accepted();
+		// Check if this is a fresh install (not a re-activation).
+		// If the option doesn't exist, it's a fresh install.
+		$fresh_install = false === \get_option( 'progress_planner_previous_version_task_providers', false );
 
 		// If this is the first time the plugin is installed, save the task providers.
 		if ( $fresh_install ) {

classes/utils/class-debug-tools.php

@@ -791,7 +791,7 @@ public function check_delete_onboarding_progress() {
 		$this->verify_nonce();
 
 		// Delete the onboarding progress.
-		\delete_option( 'prpl_onboard_progress' );
+		\Progress_Planner\Onboard_Wizard::delete_progress();
 
 		// Delete the license key.
 		\delete_option( 'progress_planner_license_key' );