WordAds: Add option to toggle CMP banner under Monetize settings (#35205)

Alameen688 · web-flow · commit e58f789e6b77 · 2024-02-21T23:05:11.000Z
* changelog

* add support text w/ link to gdpr toggle

* RAN tools/fixup-project-versions.sh
diff --git a/projects/packages/sync/changelog/add-cmp-ad-settings b/projects/packages/sync/changelog/add-cmp-ad-settings
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Ads Settings: Include option to toggle GDPR Consent Banner
diff --git a/projects/packages/sync/composer.json b/projects/packages/sync/composer.json
@@ -58,7 +58,7 @@
 			"link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}"
 		},
 		"branch-alias": {
-			"dev-trunk": "2.7.x-dev"
+			"dev-trunk": "2.8.x-dev"
 		}
 	},
 	"config": {
diff --git a/projects/packages/sync/src/class-defaults.php b/projects/packages/sync/src/class-defaults.php
@@ -167,6 +167,7 @@ class Defaults {
 		'videopress_private_enabled_for_site',
 		'wordads_ccpa_enabled',
 		'wordads_ccpa_privacy_policy_url',
+		'wordads_cmp_enabled',
 		'wordads_custom_adstxt',
 		'wordads_custom_adstxt_enabled',
 		'wordads_display_archive',
diff --git a/projects/packages/sync/src/class-package-version.php b/projects/packages/sync/src/class-package-version.php
@@ -12,7 +12,7 @@
  */
 class Package_Version {
 
-	const PACKAGE_VERSION = '2.7.0';
+	const PACKAGE_VERSION = '2.8.0-alpha';
 
 	const PACKAGE_SLUG = 'sync';
 
diff --git a/projects/plugins/backup/changelog/add-cmp-ad-settings b/projects/plugins/backup/changelog/add-cmp-ad-settings
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/backup/composer.lock b/projects/plugins/backup/composer.lock
diff --git a/projects/plugins/boost/changelog/add-cmp-ad-settings b/projects/plugins/boost/changelog/add-cmp-ad-settings
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/boost/composer.lock b/projects/plugins/boost/composer.lock
diff --git a/projects/plugins/jetpack/_inc/client/earn/ads.jsx b/projects/plugins/jetpack/_inc/client/earn/ads.jsx
@@ -139,6 +139,9 @@ export const Ads = withModuleSettingsFormHelpers(
 				'wordads_ccpa_privacy_policy_url',
 				'wordads'
 			);
+
+			const wordads_cmp_enabled = this.props.getOptionValue( 'wordads_cmp_enabled', 'wordads' );
+
 			const isSubDirSite = this.props.siteRawUrl.indexOf( '::' ) !== -1;
 			return (
 				<SettingsCard
@@ -355,6 +358,27 @@ export const Ads = withModuleSettingsFormHelpers(
 							</FormFieldset>
 						) }
 					</SettingsGroup>
+					<SettingsGroup
+						support={ {
+							text: __(
+								'Show a cookie banner to all EU and UK site visitors prompting them to consent to their personal data being used to personalize the ads they see. Without proper consents EU/UK visitors will only see lower paying non-personalized ads.',
+								'jetpack'
+							),
+							link: getRedirectUrl( 'jetpack-support-ads' ),
+						} }
+					>
+						<ToggleControl
+							checked={ wordads_cmp_enabled }
+							disabled={
+								! isAdsActive ||
+								unavailableInOfflineMode ||
+								this.props.isSavingAnyOption( [ 'wordads' ] )
+							}
+							toggling={ this.props.isSavingAnyOption( [ 'wordads_cmp_enabled' ] ) }
+							onChange={ this.handleChange( 'wordads_cmp_enabled' ) }
+							label={ __( 'Enable GDPR Consent Banner', 'jetpack' ) }
+						/>
+					</SettingsGroup>
 					{ ! isSubDirSite && this.renderAdsTxtSection() }
 					{ ! unavailableInOfflineMode && isAdsActive && (
 						<Card
diff --git a/projects/plugins/jetpack/_inc/lib/class.core-rest-api-endpoints.php b/projects/plugins/jetpack/_inc/lib/class.core-rest-api-endpoints.php
@@ -2841,6 +2841,13 @@ public static function get_updateable_data_list( $selector = '' ) {
 				'sanitize_callback' => 'sanitize_text_field',
 				'jp_group'          => 'wordads',
 			),
+			'wordads_cmp_enabled'                  => array(
+				'description'       => esc_html__( 'Enable GDPR Consent Management Banner for WordAds', 'jetpack' ),
+				'type'              => 'boolean',
+				'default'           => 0,
+				'validate_callback' => __CLASS__ . '::validate_boolean',
+				'jp_group'          => 'wordads',
+			),
 
 			// Google Analytics.
 			'google_analytics_tracking_id'         => array(
diff --git a/projects/plugins/jetpack/changelog/add-cmp-ad-settings b/projects/plugins/jetpack/changelog/add-cmp-ad-settings
@@ -0,0 +1,4 @@
+Significance: minor
+Type: enhancement
+
+Ads Settings: Include option to toggle GDPR Consent Banner
diff --git a/projects/plugins/jetpack/changelog/add-cmp-ad-settings#2 b/projects/plugins/jetpack/changelog/add-cmp-ad-settings#2
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/jetpack/composer.lock b/projects/plugins/jetpack/composer.lock
diff --git a/projects/plugins/jetpack/modules/wordads/php/class-wordads-params.php b/projects/plugins/jetpack/modules/wordads/php/class-wordads-params.php
@@ -93,6 +93,7 @@ public function __construct() {
 			'wordads_custom_adstxt_enabled'   => false,
 			'wordads_ccpa_enabled'            => false,
 			'wordads_ccpa_privacy_policy_url' => get_option( 'wp_page_for_privacy_policy' ) ? get_permalink( (int) get_option( 'wp_page_for_privacy_policy' ) ) : '',
+			'wordads_cmp_enabled'             => false,
 		);
 
 		// Grab settings, or set as default if it doesn't exist.
diff --git a/projects/plugins/jetpack/tests/php/sync/test_class.jetpack-sync-options.php b/projects/plugins/jetpack/tests/php/sync/test_class.jetpack-sync-options.php
@@ -211,6 +211,7 @@ public function test_sync_default_options() {
 			'wordads_custom_adstxt_enabled'                => false,
 			'wordads_ccpa_enabled'                         => false,
 			'wordads_ccpa_privacy_policy_url'              => 'pineapple',
+			'wordads_cmp_enabled'                          => false,
 			'woocommerce_custom_orders_table_enabled'      => false,
 			'site_user_type'                               => wp_json_encode( array( 1 => 'pineapple' ) ),
 			'site_segment'                                 => 'pineapple',
diff --git a/projects/plugins/migration/changelog/add-cmp-ad-settings b/projects/plugins/migration/changelog/add-cmp-ad-settings
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/migration/composer.lock b/projects/plugins/migration/composer.lock
diff --git a/projects/plugins/protect/changelog/add-cmp-ad-settings b/projects/plugins/protect/changelog/add-cmp-ad-settings
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/protect/composer.lock b/projects/plugins/protect/composer.lock
diff --git a/projects/plugins/search/changelog/add-cmp-ad-settings b/projects/plugins/search/changelog/add-cmp-ad-settings
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/search/composer.lock b/projects/plugins/search/composer.lock
diff --git a/projects/plugins/social/changelog/add-cmp-ad-settings b/projects/plugins/social/changelog/add-cmp-ad-settings
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/social/composer.lock b/projects/plugins/social/composer.lock
diff --git a/projects/plugins/starter-plugin/changelog/add-cmp-ad-settings b/projects/plugins/starter-plugin/changelog/add-cmp-ad-settings
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/starter-plugin/composer.lock b/projects/plugins/starter-plugin/composer.lock
diff --git a/projects/plugins/videopress/changelog/add-cmp-ad-settings b/projects/plugins/videopress/changelog/add-cmp-ad-settings
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/videopress/composer.lock b/projects/plugins/videopress/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@`
`58`	`58`	`"link-template": "https://github.com/Automattic/jetpack-sync/compare/v${old}...v${new}"`
`59`	`59`	`},`
`60`	`60`	`"branch-alias": {`
`61`		`- "dev-trunk": "2.7.x-dev"`
	`61`	`+ "dev-trunk": "2.8.x-dev"`
`62`	`62`	`}`
`63`	`63`	`},`
`64`	`64`	`"config": {`