Merge pull request #23218 from Yoast/2972-trivial-ai-features-displayed-two-times-at-user-settings

Fix AI features rendered twice on user profile page

Author: pls78

src/ai-authorization/user-interface/abstract-callback-route.php

@@ -11,6 +11,7 @@
 use Yoast\WP\SEO\AI_Authorization\Infrastructure\Refresh_Token_User_Meta_Repository_Interface;
 use Yoast\WP\SEO\AI_HTTP_Request\Domain\Exceptions\Unauthorized_Exception;
 use Yoast\WP\SEO\Conditionals\AI_Conditional;
+use Yoast\WP\SEO\Conditionals\Old_Premium_AI_Conditional;
 use Yoast\WP\SEO\Main;
 use Yoast\WP\SEO\Routes\Route_Interface;
 
@@ -53,7 +54,7 @@ abstract class Abstract_Callback_Route implements Route_Interface {
 	 * @return array<string> The conditionals.
 	 */
 	public static function get_conditionals() {
-		return [ AI_Conditional::class ];
+		return [ AI_Conditional::class, Old_Premium_AI_Conditional::class ];
 	}
 
 	/**

src/ai-consent/user-interface/ai-consent-integration.php

@@ -4,6 +4,7 @@
 
 use WPSEO_Admin_Asset_Manager;
 use Yoast\WP\SEO\AI\Consent\Application\Consent_Endpoints_Repository;
+use Yoast\WP\SEO\Conditionals\Old_Premium_AI_Conditional;
 use Yoast\WP\SEO\Conditionals\User_Profile_Conditional;
 use Yoast\WP\SEO\Helpers\Short_Link_Helper;
 use Yoast\WP\SEO\Helpers\User_Helper;
@@ -48,7 +49,7 @@ class Ai_Consent_Integration implements Integration_Interface {
 	 * @return array<string>
 	 */
 	public static function get_conditionals(): array {
-		return [ User_Profile_Conditional::class ];
+		return [ User_Profile_Conditional::class, Old_Premium_AI_Conditional::class ];
 	}
 
 	/**

src/ai-consent/user-interface/consent-route.php

@@ -17,6 +17,7 @@
 use Yoast\WP\SEO\AI_HTTP_Request\Domain\Exceptions\Service_Unavailable_Exception;
 use Yoast\WP\SEO\AI_HTTP_Request\Domain\Exceptions\Too_Many_Requests_Exception;
 use Yoast\WP\SEO\Conditionals\AI_Conditional;
+use Yoast\WP\SEO\Conditionals\Old_Premium_AI_Conditional;
 use Yoast\WP\SEO\Main;
 use Yoast\WP\SEO\Routes\Route_Interface;
 
@@ -63,7 +64,7 @@ class Consent_Route implements Route_Interface {
 	 * @return array<string> The conditionals.
 	 */
 	public static function get_conditionals() {
-		return [ AI_Conditional::class ];
+		return [ AI_Conditional::class, Old_Premium_AI_Conditional::class ];
 	}
 
 	/**

src/ai-free-sparks/user-interface/free-sparks-route.php

@@ -6,6 +6,7 @@
 use WP_REST_Response;
 use Yoast\WP\SEO\AI_Free_Sparks\Application\Free_Sparks_Handler_Interface;
 use Yoast\WP\SEO\Conditionals\AI_Conditional;
+use Yoast\WP\SEO\Conditionals\Old_Premium_AI_Conditional;
 use Yoast\WP\SEO\Main;
 use Yoast\WP\SEO\Routes\Route_Interface;
 
@@ -41,7 +42,7 @@ class Free_Sparks_Route implements Route_Interface {
 	 * @return array<string> The conditionals.
 	 */
 	public static function get_conditionals() {
-		return [ AI_Conditional::class ];
+		return [ AI_Conditional::class, Old_Premium_AI_Conditional::class ];
 	}
 
 	/**

src/ai-generator/user-interface/ai-generator-integration.php

@@ -10,6 +10,7 @@
 use Yoast\WP\SEO\AI_HTTP_Request\Infrastructure\API_Client;
 use Yoast\WP\SEO\Conditionals\AI_Conditional;
 use Yoast\WP\SEO\Conditionals\AI_Editor_Conditional;
+use Yoast\WP\SEO\Conditionals\Old_Premium_AI_Conditional;
 use Yoast\WP\SEO\Helpers\Current_Page_Helper;
 use Yoast\WP\SEO\Helpers\Options_Helper;
 use Yoast\WP\SEO\Helpers\User_Helper;
@@ -98,7 +99,7 @@ class Ai_Generator_Integration implements Integration_Interface {
 	 * @return array<string>
 	 */
 	public static function get_conditionals() {
-		return [ AI_Conditional::class, AI_Editor_Conditional::class ];
+		return [ AI_Conditional::class, AI_Editor_Conditional::class, Old_Premium_AI_Conditional::class ];
 	}
 
 	/**

src/ai-generator/user-interface/bust-subscription-cache-route.php

@@ -6,6 +6,7 @@
 use WP_REST_Response;
 use WPSEO_Addon_Manager;
 use Yoast\WP\SEO\Conditionals\AI_Conditional;
+use Yoast\WP\SEO\Conditionals\Old_Premium_AI_Conditional;
 use Yoast\WP\SEO\Main;
 use Yoast\WP\SEO\Routes\Route_Interface;
 
@@ -47,7 +48,7 @@ class Bust_Subscription_Cache_Route implements Route_Interface {
 	 * @return array<string> The conditionals.
 	 */
 	public static function get_conditionals() {
-		return [ AI_Conditional::class ];
+		return [ AI_Conditional::class, Old_Premium_AI_Conditional::class ];
 	}
 
 	/**

src/ai-generator/user-interface/get-suggestions-route.php

@@ -11,7 +11,7 @@
 use Yoast\WP\SEO\AI_HTTP_Request\Domain\Exceptions\Remote_Request_Exception;
 use Yoast\WP\SEO\AI_HTTP_Request\Domain\Exceptions\Too_Many_Requests_Exception;
 use Yoast\WP\SEO\Conditionals\AI_Conditional;
-use Yoast\WP\SEO\Conditionals\No_Conditionals;
+use Yoast\WP\SEO\Conditionals\Old_Premium_AI_Conditional;
 use Yoast\WP\SEO\Main;
 use Yoast\WP\SEO\Routes\Route_Interface;
 
@@ -24,7 +24,6 @@
  */
 class Get_Suggestions_Route implements Route_Interface {
 
-	use No_Conditionals;
 	use Route_Permission_Trait;
 
 	/**
@@ -54,7 +53,7 @@ class Get_Suggestions_Route implements Route_Interface {
 	 * @return array<string> The conditionals.
 	 */
 	public static function get_conditionals() {
-		return [ AI_Conditional::class ];
+		return [ AI_Conditional::class, Old_Premium_AI_Conditional::class ];
 	}
 
 	/**

src/ai-generator/user-interface/get-usage-route.php

@@ -12,6 +12,7 @@
 use Yoast\WP\SEO\AI_HTTP_Request\Domain\Exceptions\WP_Request_Exception;
 use Yoast\WP\SEO\AI_HTTP_Request\Domain\Request;
 use Yoast\WP\SEO\Conditionals\AI_Conditional;
+use Yoast\WP\SEO\Conditionals\Old_Premium_AI_Conditional;
 use Yoast\WP\SEO\Main;
 use Yoast\WP\SEO\Routes\Route_Interface;
 
@@ -67,7 +68,7 @@ class Get_Usage_Route implements Route_Interface {
 	 * @return array<string> The conditionals.
 	 */
 	public static function get_conditionals() {
-		return [ AI_Conditional::class ];
+		return [ AI_Conditional::class, Old_Premium_AI_Conditional::class ];
 	}
 
 	/**

src/ai/authorization/user-interface/abstract-callback-route.php

@@ -11,6 +11,7 @@
 use Yoast\WP\SEO\AI\Authorization\Infrastructure\Refresh_Token_User_Meta_Repository_Interface;
 use Yoast\WP\SEO\AI\HTTP_Request\Domain\Exceptions\Unauthorized_Exception;
 use Yoast\WP\SEO\Conditionals\AI_Conditional;
+use Yoast\WP\SEO\Conditionals\New_Premium_Or_Free_AI_Conditional;
 use Yoast\WP\SEO\Main;
 use Yoast\WP\SEO\Routes\Route_Interface;
 
@@ -53,7 +54,7 @@ abstract class Abstract_Callback_Route implements Route_Interface {
 	 * @return array<string> The conditionals.
 	 */
 	public static function get_conditionals() {
-		return [ AI_Conditional::class ];
+		return [ AI_Conditional::class, New_Premium_Or_Free_AI_Conditional::class ];
 	}
 
 	/**

src/ai/consent/user-interface/ai-consent-integration.php

@@ -6,6 +6,7 @@
 
 use WPSEO_Admin_Asset_Manager;
 use Yoast\WP\SEO\AI\Consent\Application\Consent_Endpoints_Repository;
+use Yoast\WP\SEO\Conditionals\New_Premium_Or_Free_AI_Conditional;
 use Yoast\WP\SEO\Conditionals\User_Profile_Conditional;
 use Yoast\WP\SEO\Helpers\Short_Link_Helper;
 use Yoast\WP\SEO\Helpers\User_Helper;
@@ -50,7 +51,7 @@ class Ai_Consent_Integration implements Integration_Interface {
 	 * @return array<string>
 	 */
 	public static function get_conditionals(): array {
-		return [ User_Profile_Conditional::class ];
+		return [ User_Profile_Conditional::class, New_Premium_Or_Free_AI_Conditional::class ];
 	}
 
 	/**