Update Astra theme from 4.12.1 to 4.12.3

Author: bitpoke-bot

wp-content/themes/astra/admin/assets/build/dashboard-app-rtl.css

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'react-dom', 'wp-api-fetch', 'wp-element', 'wp-i18n'), 'version' => '32eda592bb7f43fa9b1f');
+<?php return array('dependencies' => array('react', 'react-dom', 'wp-api-fetch', 'wp-element', 'wp-i18n'), 'version' => '611f111aba2b4fa50e69');

wp-content/themes/astra/admin/assets/build/dashboard-app.asset.php

@@ -36,6 +36,9 @@ public function __construct() {
 
 		add_action( 'init', array( $this, 'init_bsf_analytics' ), 5 );
 		add_filter( 'bsf_core_stats', array( $this, 'add_astra_analytics_data' ) );
+
+		// Track Astra customizer publish events for kpi tracking.
+		add_action( 'astra_customizer_save', array( $this, 'maybe_save_customizer_published_timestamp' ) );
 	}
 
 	/**
@@ -173,6 +176,9 @@ public function add_astra_analytics_data( $stats_data ) {
 		// Add learn progress analytics data.
 		self::add_learn_progress_analytics_data( $astra_stats );
 
+		// Add KPI tracking data.
+		self::add_kpi_tracking_data( $astra_stats );
+
 		$stats_data['plugin_data']['astra'] = array_merge_recursive( $stats_data['plugin_data']['astra'], $astra_stats );
 
 		return $stats_data;
@@ -412,6 +418,113 @@ public static function get_hosting_provider( $ip = '', $token = null ) {
 		return null;
 	}
 
+	/**
+	 * Maybe save customizer published timestamp.
+	 *
+	 * This function checks if Astra customizer settings were modified during the customizer save event.
+	 * If so, it records the current timestamp in the '_astra_customizer_published_timestamps' option for KPI tracking.
+	 *
+	 * @since 4.12.2
+	 * @return void
+	 */
+	public function maybe_save_customizer_published_timestamp() {
+		global $wp_customize;
+
+		// Bail if customizer manager not available or no Astra customizer settings modified.
+		if ( ! $wp_customize || ! self::has_astra_customizer_settings_modified( $wp_customize ) ) {
+			return;
+		}
+
+		$timestamps = get_option( '_astra_customizer_published_timestamps', array() );
+		if ( ! is_array( $timestamps ) ) {
+			$timestamps = array();
+		}
+
+		$timestamps[] = time();
+		update_option( '_astra_customizer_published_timestamps', $timestamps, false );
+	}
+
+	/**
+	 * Check if any Astra-specific settings were modified in the customizer.
+	 *
+	 * @param WP_Customize_Manager $wp_customize The customizer manager instance.
+	 *
+	 * @since 4.12.2
+	 * @return bool True if Astra customizer settings were modified, false otherwise.
+	 */
+	public static function has_astra_customizer_settings_modified( $wp_customize ) {
+		$posted_values = $wp_customize->unsanitized_post_values();
+
+		// Check if any setting key starts with 'astra-' to identify Astra customizer settings.
+		foreach ( $posted_values as $setting_id => $setting_value ) {
+			if ( strpos( $setting_id, 'astra-' ) === 0 ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Add KPI tracking data.
+	 *
+	 * @param array $astra_stats Reference to the astra stats data.
+	 * @since 4.12.2
+	 * @return void
+	 */
+	public static function add_kpi_tracking_data( &$astra_stats ) {
+		$timestamps = get_option( '_astra_customizer_published_timestamps', array() );
+		if ( empty( $timestamps ) || ! is_array( $timestamps ) ) {
+			return;
+		}
+
+		// Get today's date for comparison.
+		$today = gmdate( 'Y-m-d' );
+
+		// Group timestamps by date and count occurrences, excluding today's data.
+		$kpi_data              = array();
+		$timestamps_to_cleanup = array();
+
+		foreach ( $timestamps as $timestamp ) {
+			// Skip invalid timestamps.
+			if ( ! is_numeric( $timestamp ) ) {
+				continue;
+			}
+
+			$date = gmdate( 'Y-m-d', (int) $timestamp );
+
+			// Skip today's data as we may have incomplete data for the current day.
+			if ( $date === $today ) {
+				continue;
+			}
+
+			// Count occurrences by date.
+			if ( ! isset( $kpi_data[ $date ] ) ) {
+				$kpi_data[ $date ] = array(
+					'numeric_values' => array(
+						'customizer_published' => 0,
+					),
+				);
+			}
+			$kpi_data[ $date ]['numeric_values']['customizer_published']++;
+
+			// Mark this timestamp for cleanup (all timestamps except today's).
+			$timestamps_to_cleanup[] = $timestamp;
+		}
+
+		// Only add to stats if we have data to report.
+		if ( ! empty( $kpi_data ) ) {
+			$astra_stats['kpi_records'] = $kpi_data;
+		}
+
+		// Cleanup old timestamps that are being sent to analytics.
+		// Keep only today's timestamps in the option.
+		if ( ! empty( $timestamps_to_cleanup ) ) {
+			$remaining_timestamps = array_diff( $timestamps, $timestamps_to_cleanup );
+			update_option( '_astra_customizer_published_timestamps', array_values( $remaining_timestamps ), false );
+		}
+	}
+
 	/**
 	 * Initiator.
 	 *

wp-content/themes/astra/admin/assets/build/dashboard-app.css

@@ -265,7 +265,7 @@ public function astra_analytics_optin_status() {
 		}
 
 		$opt_in = filter_input( INPUT_POST, 'value', FILTER_VALIDATE_BOOLEAN ) ? 'yes' : 'no';
-		update_site_option( 'astra_analytics_optin', $opt_in );
+		update_site_option( 'astra_usage_optin', $opt_in );
 
 		$response_data = array(
 			'message' => esc_html__( 'Successfully saved data!', 'astra' ),

wp-content/themes/astra/admin/assets/build/dashboard-app.js

@@ -165,7 +165,7 @@ public function get_admin_settings( $request ) {
 				'preload_local_fonts'   => self::get_admin_settings_option( 'preload_local_fonts', false ),
 				'use_old_header_footer' => astra_get_option( 'is-header-footer-builder', false ),
 				'use_upgrade_notices'   => astra_showcase_upgrade_notices(),
-				'analytics_enabled'     => get_option( 'astra_analytics_optin', 'no' ) === 'yes',
+				'analytics_enabled'     => get_option( 'astra_usage_optin', 'no' ) === 'yes',
 			)
 		);
 

wp-content/themes/astra/admin/class-astra-bsf-analytics.php

@@ -340,6 +340,35 @@ public static function get_chapters_structure() {
 		return apply_filters( 'astra_learn_chapters', $chapters );
 	}
 
+	/**
+	 * Get count of incomplete chapters.
+	 *
+	 * A chapter is considered incomplete if it has at least one incomplete step.
+	 *
+	 * @param int $user_id Optional. User ID to get progress for. Defaults to current user.
+	 * @return int Number of incomplete chapters.
+	 * @since 4.12.2
+	 */
+	public static function get_incomplete_chapters_count( $user_id = 0 ) {
+		$chapters         = self::get_learn_chapters( $user_id );
+		$incomplete_count = 0;
+
+		foreach ( $chapters as $chapter ) {
+			if ( ! isset( $chapter['steps'] ) || ! is_array( $chapter['steps'] ) ) {
+				continue;
+			}
+
+			foreach ( $chapter['steps'] as $step ) {
+				if ( empty( $step['completed'] ) ) {
+					$incomplete_count++;
+					break;
+				}
+			}
+		}
+
+		return $incomplete_count;
+	}
+
 	/**
 	 * Get learn chapters with user progress merged.
 	 *

wp-content/themes/astra/admin/includes/class-astra-admin-ajax.php

@@ -211,13 +211,32 @@ public function setup_menu() {
 					$capability,
 					'admin.php?page=' . self::$plugin_slug . '&path=woocommerce'
 				);
-			} elseif ( ASTRA_THEME_ORG_VERSION && ! $this->spectra_has_top_level_menu() ) {
+			}
+			// elseif ( ASTRA_THEME_ORG_VERSION && ! $this->spectra_has_top_level_menu() ) {
+			// add_submenu_page( // phpcs:ignore WPThemeReview.PluginTerritory.NoAddAdminPages.add_menu_pages_add_submenu_page -- Taken the menu on top level
+			// self::$plugin_slug,
+			// 'Spectra',
+			// 'Spectra',
+			// $capability,
+			// $this->get_spectra_page_admin_link()
+			// );
+			// }
+		}
+
+		if ( is_callable( 'Astra_Learn::get_incomplete_chapters_count' ) ) {
+			$incomplete_count = Astra_Learn::get_incomplete_chapters_count();
+			if ( $incomplete_count > 0 ) {
+				$learn_menu_title = __( 'Learn', 'astra' ) . sprintf(
+					' <span class="awaiting-mod count-%1$d"><span class="pending-count">%1$d</span></span>',
+					$incomplete_count
+				);
+
 				add_submenu_page( // phpcs:ignore WPThemeReview.PluginTerritory.NoAddAdminPages.add_menu_pages_add_submenu_page -- Taken the menu on top level
 					self::$plugin_slug,
-					'Spectra',
-					'Spectra',
+					__( 'Learn', 'astra' ),
+					$learn_menu_title,
 					$capability,
-					$this->get_spectra_page_admin_link()
+					'admin.php?page=' . self::$plugin_slug . '&path=learn'
 				);
 			}
 		}