JITM - show a link to settings after a module is activated (#32826)

* [not verified] working on adding an activation redirect for Newsletter JITM * [not verified] changelog * [not verified] admin url * [not verified] admin url * [not verified] tweaks * [not verified] fixing redirect logic * [not verified] remove console logging * [not verified] tidying comments * [not verified] making the admin URL so we can redirect to my jetpack and other pages which are in the #/jetpack app * Tweak to show settings link instead of redirect * settings link logic * tweaking to link not redirect * showing and hiding some buttons * change button to primary * updating the logic and settings name * finialising * changlogger validity fix * removing jptracks class * changelog validity --------- Co-authored-by: Mike Stott <mikestott@Mikes-MacBook-Pro.local>
Automattic · Oct 6, 2023 · c055370 · c055370
1 parent e2ac97d
commit c055370
Show file tree

Hide file tree

Showing 31 changed files with 135 additions and 20 deletions.
diff --git a/projects/packages/jitm/changelog/jitm-redirection-after-activate-click b/projects/packages/jitm/changelog/jitm-redirection-after-activate-click
@@ -0,0 +1,4 @@
+Significance: minor
+Type: added
+
+JITMs can now redirect to a specific Jetpack settings page
diff --git a/projects/packages/jitm/composer.json b/projects/packages/jitm/composer.json
@@ -66,7 +66,7 @@
 			"link-template": "https://github.com/Automattic/jetpack-jitm/compare/v${old}...v${new}"
 		},
 		"branch-alias": {
-			"dev-trunk": "2.4.x-dev"
+			"dev-trunk": "2.5.x-dev"
 		}
 	}
 }
diff --git a/projects/packages/jitm/src/class-jitm.php b/projects/packages/jitm/src/class-jitm.php
@@ -20,7 +20,7 @@
  */
 class JITM {
 
-	const PACKAGE_VERSION = '2.4.0';
+	const PACKAGE_VERSION = '2.5.0-alpha';
 
 	/**
 	 * The configuration method that is called from the jetpack-config package.
@@ -156,6 +156,7 @@ public function jitm_enqueue_files() {
 				'activate_module_text'   => esc_html__( 'Activate', 'jetpack-jitm' ),
 				'activated_module_text'  => esc_html__( 'Activated', 'jetpack-jitm' ),
 				'activating_module_text' => esc_html__( 'Activating', 'jetpack-jitm' ),
+				'settings_module_text'   => esc_html__( 'Settings', 'jetpack-jitm' ),
 				'nonce'                  => wp_create_nonce( 'wp_rest' ),
 			)
 		);

diff --git a/projects/packages/jitm/src/js/jetpack-jitm.js b/projects/packages/jitm/src/js/jetpack-jitm.js
@@ -72,6 +72,7 @@ jQuery( document ).ready( function ( $ ) {
 				html +=
 					'<a href="#" data-module="' +
 					envelope.activate_module +
+					'" data-settings_link="' + envelope.module_settings_link +
 					'" type="button" class="jitm-button is-compact is-primary" data-jptracks-name="nudge_click" data-jptracks-prop="jitm-' +
 					envelope.id +
 					'-activate_module" data-jitm-path="' +
@@ -80,6 +81,18 @@ jQuery( document ).ready( function ( $ ) {
 					window.jitm_config.activate_module_text +
 					'</a>';
 				html += '</div>';
+				if ( envelope.module_settings_link){
+					html += '<div class="jitm-banner__action" id="jitm-banner__settings" style="display:none;">';
+					html +=
+						'<a href="' +
+						envelope.module_settings_link +
+						'" type="button" class="jitm-button is-compact is-primary" data-jptracks-name="nudge_click" data-jptracks-prop="jitm-' +
+						envelope.id +
+						'-settings_link">' +
+						window.jitm_config.settings_module_text +
+						'</a>';
+					html += '</div>';
+				}
 			}
 			if ( envelope.CTA.message ) {
 				var ctaClasses = 'jitm-button is-compact';
@@ -209,9 +222,16 @@ jQuery( document ).ready( function ( $ ) {
 					$( '#jitm-banner__activate a' ).attr( 'disabled', true );
 				},
 			} ).done( function () {
+				// Display the link to settings and hide the activate link
 				$( '#jitm-banner__activate a' ).text( window.jitm_config.activated_module_text );
 				$( '#jitm-banner__activate a' ).attr( 'disabled', true );
 
+				if ( $activate_button.data( 'settings_link' ) ) {
+					$( '#jitm-banner__settings' ).show();
+					$( '#jitm-banner__activate' ).hide();
+					return;
+				}
+
 				// Hide the JITM after 2 seconds.
 				setTimeout( function () {
 					$template.fadeOut( 'slow' );

diff --git a/projects/plugins/backup/changelog/jitm-redirection-after-activate-click b/projects/plugins/backup/changelog/jitm-redirection-after-activate-click
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/backup/changelog/jitm-redirection-after-activate-click#2 b/projects/plugins/backup/changelog/jitm-redirection-after-activate-click#2
@@ -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/jitm-redirection-after-activate-click b/projects/plugins/boost/changelog/jitm-redirection-after-activate-click
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/boost/changelog/jitm-redirection-after-activate-click#2 b/projects/plugins/boost/changelog/jitm-redirection-after-activate-click#2
@@ -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/changelog/jitm-redirection-after-activate-click b/projects/plugins/jetpack/changelog/jitm-redirection-after-activate-click
@@ -0,0 +1,5 @@
+Significance: patch
+Type: other
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/jetpack/changelog/jitm-redirection-after-activate-click#2 b/projects/plugins/jetpack/changelog/jitm-redirection-after-activate-click#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/migration/changelog/jitm-redirection-after-activate-click b/projects/plugins/migration/changelog/jitm-redirection-after-activate-click
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/migration/changelog/jitm-redirection-after-activate-click#2 b/projects/plugins/migration/changelog/jitm-redirection-after-activate-click#2
@@ -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/jitm-redirection-after-activate-click b/projects/plugins/protect/changelog/jitm-redirection-after-activate-click
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/protect/changelog/jitm-redirection-after-activate-click#2 b/projects/plugins/protect/changelog/jitm-redirection-after-activate-click#2
@@ -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/jitm-redirection-after-activate-click b/projects/plugins/search/changelog/jitm-redirection-after-activate-click
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/search/changelog/jitm-redirection-after-activate-click#2 b/projects/plugins/search/changelog/jitm-redirection-after-activate-click#2
@@ -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/jitm-redirection-after-activate-click b/projects/plugins/social/changelog/jitm-redirection-after-activate-click
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/social/changelog/jitm-redirection-after-activate-click#2 b/projects/plugins/social/changelog/jitm-redirection-after-activate-click#2
@@ -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/jitm-redirection-after-activate-click b/projects/plugins/starter-plugin/changelog/jitm-redirection-after-activate-click
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/starter-plugin/changelog/jitm-redirection-after-activate-click#2 b/projects/plugins/starter-plugin/changelog/jitm-redirection-after-activate-click#2
@@ -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/jitm-redirection-after-activate-click b/projects/plugins/videopress/changelog/jitm-redirection-after-activate-click
@@ -0,0 +1,5 @@
+Significance: patch
+Type: changed
+Comment: Updated composer.lock.
+
+
diff --git a/projects/plugins/videopress/changelog/jitm-redirection-after-activate-click#2 b/projects/plugins/videopress/changelog/jitm-redirection-after-activate-click#2
@@ -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