← All changes | src/general/user-interface/general-page-integration.php +17 -16 28.0 → trunk View file →

		@@ -92,20 +92,20 @@
92	92	*/
93	93	private $alert_dismissal_action;
94	94
95	95	/**
96		- * Holds the user helper.
	96	+ * Holds the options helper.
97	97	*
98		- * @var User_Helper
	98	+ * @var Options_Helper
99	99	*/
100		- private $user_helper;
	100	+ private $options_helper;
101	101
102	102	/**
103		- * Holds the options helper.
	103	+ * Holds the user helper.
104	104	*
105		- * @var Options_Helper
	105	+ * @var User_Helper
106	106	*/
107		- private $options_helper;
	107	+ private $user_helper;
108	108
109	109	/**
110	110	* Holds the WooCommerce conditional.
111	111	*
		@@ -130,10 +130,10 @@
130	130	* @param Notification_Helper $notification_helper The Notification_Helper.
131	131	* @param Alert_Dismissal_Action $alert_dismissal_action The alert dismissal action.
132	132	* @param Promotion_Manager $promotion_manager The promotion manager.
133	133	* @param Dashboard_Configuration $dashboard_configuration The dashboard configuration.
	134	+ * @param Options_Helper $options_helper The options helper.
134	135	* @param User_Helper $user_helper The user helper.
135		- * @param Options_Helper $options_helper The options helper.
136	136	* @param WooCommerce_Conditional $woocommerce_conditional The WooCommerce conditional.
137	137	* @param WPSEO_Addon_Manager $addon_manager The WPSEO_Addon_Manager.
138	138	* @param Task_List_Configuration $task_list_configuration The task list configuration.
139	139	*/
		@@ -145,10 +145,10 @@
145	145	Notification_Helper $notification_helper,
146	146	Alert_Dismissal_Action $alert_dismissal_action,
147	147	Promotion_Manager $promotion_manager,
148	148	Dashboard_Configuration $dashboard_configuration,
	149	+ Options_Helper $options_helper,
149	150	User_Helper $user_helper,
150		- Options_Helper $options_helper,
151	151	WooCommerce_Conditional $woocommerce_conditional,
152	152	WPSEO_Addon_Manager $addon_manager,
153	153	Task_List_Configuration $task_list_configuration
154	154	) {
		@@ -159,10 +159,10 @@
159	159	$this->notification_helper = $notification_helper;
160	160	$this->alert_dismissal_action = $alert_dismissal_action;
161	161	$this->promotion_manager = $promotion_manager;
162	162	$this->dashboard_configuration = $dashboard_configuration;
	163	+ $this->options_helper = $options_helper;
163	164	$this->user_helper = $user_helper;
164		- $this->options_helper = $options_helper;
165	165	$this->woocommerce_conditional = $woocommerce_conditional;
166	166	$this->addon_manager = $addon_manager;
167	167	$this->task_list_configuration = $task_list_configuration;
168	168	}
		@@ -249,9 +249,9 @@
249	249
250	250	/**
251	251	* Creates the script data.
252	252	*
253		- * @return array The script data.
	253	+ * @return array<string, string|array<string, string|bool|array<string, string|bool>>> The script data.
254	254	*/
255	255	private function get_script_data() {
256	256	return [
257	257	'preferences' => [
		@@ -279,21 +279,22 @@
279	279	'alerts' => $this->notification_helper->get_alerts(),
280	280	'currentPromotions' => $this->promotion_manager->get_current_promotions(),
281	281	'dismissedAlerts' => $this->alert_dismissal_action->all_dismissed(),
282	282	'dashboard' => $this->dashboard_configuration->get_configuration(),
	283	+ 'taskListConfiguration' => $this->task_list_configuration->get_configuration(),
283	284	'optInNotificationSeen' => [
284		- 'task_list' => $this->is_task_list_opt_in_notification_seen(),
	285	+ 'bulk_editor_tour' => $this->is_bulk_editor_tour_seen(),
285	286	],
286		- 'taskListConfiguration' => $this->task_list_configuration->get_configuration(),
287	287	];
288	288	}
289	289
290	290	/**
291		- * Gets if the llms.txt opt-in notification has been seen.
	291	+ * Gets whether the bulk editor guided tour has been seen by the current user.
292	292	*
293		- * @return bool True if the notification has been seen, false otherwise.
	293	+ * @return bool True when the tour has been seen, false otherwise.
294	294	*/
295		- private function is_task_list_opt_in_notification_seen(): bool {
	295	+ private function is_bulk_editor_tour_seen(): bool {
296	296	$current_user_id = $this->user_helper->get_current_user_id();
297		- return (bool) $this->user_helper->get_meta( $current_user_id, '_yoast_wpseo_task_list_opt_in_notification_seen', true );
	297	+
	298	+ return (bool) $this->user_helper->get_meta( $current_user_id, '_yoast_wpseo_bulk_editor_tour_opt_in_notification_seen', true );
298	299	}
299	300	}