Fix setup link in plugin links and notice.

10up · Sep 5, 2024 · b44da16 · b44da16
1 parent fa5bc37
commit b44da16
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/includes/Classifai/Admin/Notifications.php b/includes/Classifai/Admin/Notifications.php
@@ -4,6 +4,7 @@
 
 use Classifai\Features\DescriptiveTextGenerator;
 use Classifai\Features\Classification;
+use function Classifai\should_use_legacy_settings_panel;
 
 class Notifications {
 
@@ -84,6 +85,11 @@ public function render_activation_notice() {
 			return;
 		}
 
+		$setup_url = admin_url( 'tools.php?page=classifai#/classifai_setup' );
+		if ( should_use_legacy_settings_panel() ) {
+			$setup_url = admin_url( 'admin.php?page=classifai_setup' );
+		}
+
 		// Prevent showing the default WordPress "Plugin Activated" notice.
 		unset( $_GET['activate'] ); // phpcs:ignore WordPress.Security.NonceVerification
 		?>
@@ -96,7 +102,7 @@ public function render_activation_notice() {
 				<h3 class="classifai-activation-message">
 					<?php esc_html_e( 'Congratulations, the ClassifAI plugin is now activated.', 'classifai' ); ?>
 				</h3>
-				<a class="classifai-button" href="<?php echo esc_url( admin_url( 'admin.php?page=classifai_setup' ) ); ?>">
+				<a class="classifai-button" href="<?php echo esc_url( $setup_url ); ?>">
 					<?php esc_html_e( 'Start setup', 'classifai' ); ?>
 				</a>
 			</div>

diff --git a/includes/Classifai/Admin/Settings.php b/includes/Classifai/Admin/Settings.php
@@ -67,7 +67,7 @@ public function render_settings_page() {
 	 * @param string $hook_suffix The current admin page.
 	 */
 	public function admin_enqueue_scripts( $hook_suffix ) {
-		if ( ! in_array( $hook_suffix, array( 'admin_page_classifai_setup', 'tools_page_classifai' ), true ) ) {
+		if ( ! in_array( $hook_suffix, array( 'tools_page_classifai' ), true ) ) {
 			return;
 		}
 

diff --git a/includes/Classifai/Plugin.php b/includes/Classifai/Plugin.php
@@ -226,11 +226,16 @@ public function filter_plugin_action_links( $links ): array {
 			return $links;
 		}
 
+		$setup_url = admin_url( 'tools.php?page=classifai#/classifai_setup' );
+		if ( should_use_legacy_settings_panel() ) {
+			$setup_url = admin_url( 'admin.php?page=classifai_setup' );
+		}
+
 		return array_merge(
 			array(
 				'setup'    => sprintf(
 					'<a href="%s"> %s </a>',
-					esc_url( admin_url( 'admin.php?page=classifai_setup' ) ),
+					esc_url( $setup_url ),
 					esc_html__( 'Set up', 'classifai' )
 				),
 				'settings' => sprintf(