Merge branch 'develop' into ari/detect-domain-changes

Author: aristath

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/utils/class-playground.php

@@ -20,6 +20,7 @@ public function __construct() {
 		\add_action( 'plugins_loaded', [ $this, 'enable_debug_tools' ], 1 );
 		\add_filter( 'progress_planner_tasks_show_ui', '__return_true' );
 		\add_action( 'admin_footer', [ $this, 'inject_playground_js_patch' ] );
+		\add_action( 'init', [ $this, 'disable_upgrade_tasks_popover' ], 101 );
 	}
 
 	/**
@@ -54,6 +55,22 @@ public function register_hooks() {
 		\progress_planner()->get_settings()->set( 'activation_date', ( new \DateTime() )->modify( '-2 months' )->format( 'Y-m-d' ) );
 	}
 
+	/**
+	 * Disable the upgrade tasks popover.
+	 *
+	 * @return void
+	 */
+	public function disable_upgrade_tasks_popover() {
+		// This will make the plugin think it was activated, so the upgrade tasks popover will not be shown.
+		$onboard_task_provider_ids = \apply_filters( 'prpl_onboarding_task_providers', [] );
+
+		// Update 'progress_planner_previous_version_task_providers' option.
+		\update_option( 'progress_planner_previous_version_task_providers', \array_unique( $onboard_task_provider_ids ), SORT_REGULAR );
+
+		// Clear the upgrade popover task provider IDs, this are the 'newly' added task providers, so the upgrade tasks popover will not be shown.
+		\update_option( 'progress_planner_upgrade_popover_task_provider_ids', [] );
+	}
+
 	/**
 	 * Enable debug tools.
 	 *