Automattic · elliottprogrammer · Nov 11, 2021 · Oct 20, 2021 · Oct 20, 2021 · Oct 20, 2021
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/projects/js-packages/api/changelog/update-user-license-counts b/projects/js-packages/api/changelog/update-user-license-counts
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+Add updateUserLicensesCounts API method
diff --git a/projects/js-packages/api/index.jsx b/projects/js-packages/api/index.jsx
@@ -413,6 +413,18 @@ function JetpackRestApiClient( root, nonce ) {
 				.then( checkStatus )
 				.then( parseJsonResponse ),
 
+		getUserLicensesCounts: () =>
+			getRequest( `${ apiRoot }jetpack/v4/licensing/user/counts`, getParams )
+				.then( checkStatus )
+				.then( parseJsonResponse ),
+
+		updateLicensingActivationNoticeDismiss: lastDetachedCount =>
+			postRequest( `${ apiRoot }jetpack/v4/licensing/user/activation-notice-dismiss`, postParams, {
+				body: JSON.stringify( { last_detached_count: lastDetachedCount } ),
+			} )
+				.then( checkStatus )
+				.then( parseJsonResponse ),
+
 		updateRecommendationsStep: step =>
 			postRequest( `${ apiRoot }jetpack/v4/recommendations/step`, postParams, {
 				body: JSON.stringify( { step } ),

diff --git a/projects/js-packages/api/package.json b/projects/js-packages/api/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@automattic/jetpack-api",
-	"version": "0.5.0",
+	"version": "0.5.1-alpha",
 	"description": "Jetpack Api Package",
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",

diff --git a/projects/js-packages/connection/changelog/add-user-license-activate-notice-2 b/projects/js-packages/connection/changelog/add-user-license-activate-notice-2
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/js-packages/connection/package.json b/projects/js-packages/connection/package.json
@@ -5,7 +5,7 @@
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",
 	"dependencies": {
-		"@automattic/jetpack-api": "workspace:^0.5.0",
+		"@automattic/jetpack-api": "workspace:^0.5.1-alpha",
 		"@automattic/jetpack-components": "workspace:^0.6.1-alpha",
 		"@wordpress/base-styles": "4.0.3",
 		"@wordpress/browserslist-config": "4.1.0",

diff --git a/projects/js-packages/idc/changelog/add-user-license-activate-notice-2 b/projects/js-packages/idc/changelog/add-user-license-activate-notice-2
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/js-packages/idc/package.json b/projects/js-packages/idc/package.json
@@ -5,7 +5,7 @@
 	"author": "Automattic",
 	"license": "GPL-2.0-or-later",
 	"dependencies": {
-		"@automattic/jetpack-api": "workspace:^0.5.0",
+		"@automattic/jetpack-api": "workspace:^0.5.1-alpha",
 		"@automattic/jetpack-components": "workspace:^0.6.1-alpha",
 		"@wordpress/base-styles": "4.0.3",
 		"@wordpress/components": "19.0.1",

diff --git a/projects/js-packages/storybook/changelog/add-user-license-activate-notice-2 b/projects/js-packages/storybook/changelog/add-user-license-activate-notice-2
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/js-packages/storybook/changelog/add-user-license-activate-notice-2#2 b/projects/js-packages/storybook/changelog/add-user-license-activate-notice-2#2
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/packages/connection-ui/changelog/add-user-license-activate-notice-2 b/projects/packages/connection-ui/changelog/add-user-license-activate-notice-2
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/packages/connection-ui/changelog/add-user-license-activate-notice-2#2 b/projects/packages/connection-ui/changelog/add-user-license-activate-notice-2#2
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/packages/connection-ui/package.json b/projects/packages/connection-ui/package.json
@@ -14,7 +14,7 @@
 		"watch": "pnpm run build && pnpx webpack watch"
 	},
 	"dependencies": {
-		"@automattic/jetpack-api": "workspace:^0.5.0",
+		"@automattic/jetpack-api": "workspace:^0.5.1-alpha",
 		"@automattic/jetpack-connection": "workspace:^0.9.2-alpha",
 		"@automattic/jetpack-idc": "workspace:^0.4.3-alpha",
 		"@wordpress/data": "6.1.3"

diff --git a/projects/packages/licensing/changelog/add-user-license-activate-notice-2 b/projects/packages/licensing/changelog/add-user-license-activate-notice-2
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+Added get_license_activation_notice_dismiss() function.
diff --git a/projects/packages/licensing/composer.json b/projects/packages/licensing/composer.json
@@ -49,7 +49,7 @@
 			"link-template": "https://github.com/Automattic/jetpack-licensing/compare/v${old}...v${new}"
 		},
 		"branch-alias": {
-			"dev-master": "1.4.x-dev"
+			"dev-master": "1.5.x-dev"
 		}
 	}
 }
diff --git a/projects/packages/licensing/src/class-licensing.php b/projects/packages/licensing/src/class-licensing.php
@@ -249,4 +249,24 @@ public static function is_licensing_input_enabled() {
 		 */
 		return apply_filters( 'jetpack_licensing_ui_enabled', false ) && current_user_can( 'jetpack_connect_user' );
 	}
+
+	/**
+	 * Gets the user-licensing activation notice dismissal info.
+	 *
+	 * @since 10.4.0
+	 * @return array
+	 */
+	public function get_license_activation_notice_dismiss() {
+
+		$default = array(
+			'last_detached_count' => null,
+			'last_dismissed_time' => null,
+		);
+
+		if ( $this->connection()->is_user_connected() && $this->connection()->is_connection_owner() ) {
+			return Jetpack_Options::get_option( 'licensing_activation_notice_dismiss', $default );
+		}
+
+		return $default;
+	}
 }
diff --git a/projects/packages/options/changelog/add-user-license-activate-notice-2 b/projects/packages/options/changelog/add-user-license-activate-notice-2
@@ -0,0 +1,4 @@
+Significance: patch
+Type: added
+
+Added Jetpack Option 'licensing_activation_notice_dismiss'.
diff --git a/projects/packages/options/legacy/class-jetpack-options.php b/projects/packages/options/legacy/class-jetpack-options.php
@@ -92,34 +92,35 @@ public static function get_option_names( $type = 'compact' ) {
 		}
 
 		return array(
-			'id',                               // (int)    The Client ID/WP.com Blog ID of this site.
-			'publicize_connections',            // (array)  An array of Publicize connections from WordPress.com.
-			'master_user',                      // (int)    The local User ID of the user who connected this site to jetpack.wordpress.com.
-			'version',                          // (string) Used during upgrade procedure to auto-activate new modules. version:time.
-			'old_version',                      // (string) Used to determine which modules are the most recently added. previous_version:time.
-			'fallback_no_verify_ssl_certs',     // (int)    Flag for determining if this host must skip SSL Certificate verification due to misconfigured SSL.
-			'time_diff',                        // (int)    Offset between Jetpack server's clocks and this server's clocks. Jetpack Server Time = time() + (int) Jetpack_Options::get_option( 'time_diff' )
-			'public',                           // (int|bool) If we think this site is public or not (1, 0), false if we haven't yet tried to figure it out.
-			'videopress',                       // (array)  VideoPress options array.
-			'is_network_site',                  // (int|bool) If we think this site is a network or a single blog (1, 0), false if we haven't yet tried to figue it out.
-			'social_links',                     // (array)  The specified links for each social networking site.
-			'identity_crisis_whitelist',        // (array)  An array of options, each having an array of the values whitelisted for it.
-			'gplus_authors',                    // (array)  The Google+ authorship information for connected users.
-			'last_heartbeat',                   // (int)    The timestamp of the last heartbeat that fired.
-			'hide_jitm',                        // (array)  A list of just in time messages that we should not show because they have been dismissed by the user.
-			'custom_css_4.7_migration',         // (bool)   Whether Custom CSS has scanned for and migrated any legacy CSS CPT entries to the new Core format.
-			'image_widget_migration',           // (bool)   Whether any legacy Image Widgets have been converted to the new Core widget.
-			'gallery_widget_migration',         // (bool)   Whether any legacy Gallery Widgets have been converted to the new Core widget.
-			'sso_first_login',                  // (bool)   Is this the first time the user logins via SSO.
-			'dismissed_hints',                  // (array)  Part of Plugin Search Hints. List of cards that have been dismissed.
-			'first_admin_view',                 // (bool)   Set to true the first time the user views the admin. Usually after the initial connection.
-			'setup_wizard_questionnaire',       // (array)  (DEPRECATED) List of user choices from the setup wizard.
-			'setup_wizard_status',              // (string) (DEPRECATED) Status of the setup wizard.
-			'licensing_error',                  // (string) Last error message occurred while attaching licenses that is yet to be surfaced to the user.
-			'recommendations_banner_dismissed', // (bool) Determines if the recommendations dashboard banner is dismissed or not.
-			'recommendations_banner_enabled',   // (bool)   Whether the recommendations are enabled or not.
-			'recommendations_data',             // (array)  The user choice and other data for the recommendations.
-			'recommendations_step',             // (string) The current step of the recommendations.
+			'id',                                  // (int)    The Client ID/WP.com Blog ID of this site.
+			'publicize_connections',               // (array)  An array of Publicize connections from WordPress.com.
+			'master_user',                         // (int)    The local User ID of the user who connected this site to jetpack.wordpress.com.
+			'version',                             // (string) Used during upgrade procedure to auto-activate new modules. version:time.
+			'old_version',                         // (string) Used to determine which modules are the most recently added. previous_version:time.
+			'fallback_no_verify_ssl_certs',        // (int)    Flag for determining if this host must skip SSL Certificate verification due to misconfigured SSL.
+			'time_diff',                           // (int)    Offset between Jetpack server's clocks and this server's clocks. Jetpack Server Time = time() + (int) Jetpack_Options::get_option( 'time_diff' )
+			'public',                              // (int|bool) If we think this site is public or not (1, 0), false if we haven't yet tried to figure it out.
+			'videopress',                          // (array)  VideoPress options array.
+			'is_network_site',                     // (int|bool) If we think this site is a network or a single blog (1, 0), false if we haven't yet tried to figue it out.
+			'social_links',                        // (array)  The specified links for each social networking site.
+			'identity_crisis_whitelist',           // (array)  An array of options, each having an array of the values whitelisted for it.
+			'gplus_authors',                       // (array)  The Google+ authorship information for connected users.
+			'last_heartbeat',                      // (int)    The timestamp of the last heartbeat that fired.
+			'hide_jitm',                           // (array)  A list of just in time messages that we should not show because they have been dismissed by the user.
+			'custom_css_4.7_migration',            // (bool)   Whether Custom CSS has scanned for and migrated any legacy CSS CPT entries to the new Core format.
+			'image_widget_migration',              // (bool)   Whether any legacy Image Widgets have been converted to the new Core widget.
+			'gallery_widget_migration',            // (bool)   Whether any legacy Gallery Widgets have been converted to the new Core widget.
+			'sso_first_login',                     // (bool)   Is this the first time the user logins via SSO.
+			'dismissed_hints',                     // (array)  Part of Plugin Search Hints. List of cards that have been dismissed.
+			'first_admin_view',                    // (bool)   Set to true the first time the user views the admin. Usually after the initial connection.
+			'setup_wizard_questionnaire',          // (array)  (DEPRECATED) List of user choices from the setup wizard.
+			'setup_wizard_status',                 // (string) (DEPRECATED) Status of the setup wizard.
+			'licensing_error',                     // (string) Last error message occurred while attaching licenses that is yet to be surfaced to the user.
+			'recommendations_banner_dismissed',    // (bool) Determines if the recommendations dashboard banner is dismissed or not.
+			'recommendations_banner_enabled',      // (bool)   Whether the recommendations are enabled or not.
+			'recommendations_data',                // (array)  The user choice and other data for the recommendations.
+			'recommendations_step',                // (string) The current step of the recommendations.
+			'licensing_activation_notice_dismiss', // (array) The `last_detached_count` and the `last_dismissed_time` for the user-license activation notice.
 		);
 	}
 

diff --git a/projects/plugins/backup/changelog/add-user-license-activate-notice-2 b/projects/plugins/backup/changelog/add-user-license-activate-notice-2
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/plugins/backup/changelog/add-user-license-activate-notice-2#2 b/projects/plugins/backup/changelog/add-user-license-activate-notice-2#2
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/plugins/backup/composer.lock b/projects/plugins/backup/composer.lock
diff --git a/projects/plugins/backup/package.json b/projects/plugins/backup/package.json
@@ -27,7 +27,7 @@
 		"extends @wordpress/browserslist-config"
 	],
 	"dependencies": {
-		"@automattic/jetpack-api": "workspace:^0.5.0",
+		"@automattic/jetpack-api": "workspace:^0.5.1-alpha",
 		"@automattic/jetpack-components": "workspace:^0.6.1-alpha",
 		"@automattic/jetpack-connection": "workspace:^0.9.2-alpha",
 		"@wordpress/api-fetch": "5.2.5",

diff --git a/projects/plugins/beta/changelog/add-user-license-activate-notice-2 b/projects/plugins/beta/changelog/add-user-license-activate-notice-2
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/plugins/beta/composer.lock b/projects/plugins/beta/composer.lock
diff --git a/projects/plugins/boost/changelog/add-user-license-activate-notice-2 b/projects/plugins/boost/changelog/add-user-license-activate-notice-2
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/plugins/boost/composer.lock b/projects/plugins/boost/composer.lock
diff --git a/projects/plugins/debug-helper/changelog/add-user-license-activate-notice-2 b/projects/plugins/debug-helper/changelog/add-user-license-activate-notice-2
@@ -0,0 +1,4 @@
+Significance: patch
+Type: changed
+
+Updated package dependencies.
diff --git a/projects/plugins/debug-helper/composer.lock b/projects/plugins/debug-helper/composer.lock
diff --git a/projects/plugins/jetpack/_inc/client/components/jetpack-notices/index.jsx b/projects/plugins/jetpack/_inc/client/components/jetpack-notices/index.jsx
@@ -18,6 +18,7 @@ import { getRedirectUrl } from '@automattic/jetpack-components';
  */
 import ConnectionBanner from 'components/connection-banner';
 import DismissableNotices from './dismissable';
+import UserLicenseActivationNotice from './user-license-activation';
 import {
 	getSiteConnectionStatus,
 	getSiteOfflineMode,
@@ -276,6 +277,7 @@ class JetpackNotices extends React.Component {
 						onDismissClick={ this.props.clearLicensingError }
 					/>
 				) }
+				<UserLicenseActivationNotice />
 			</div>
 		);
 	}