From 38de868cd135bddd377a1e41782a944b3882cb55 Mon Sep 17 00:00:00 2001
From: Jared Rethman <jaredrethman@gmail.com>
Date: Mon, 8 Apr 2024 21:46:37 -0500
Subject: [PATCH 01/12] feat(ras): skip campaign setup boilerplate

added new route, added fe logic
---
 .../views/reader-activation/campaign.js       | 37 ++++++++++++++++++-
 .../class-reader-activation.php               |  2 +-
 includes/wizards/class-engagement-wizard.php  | 18 ++++++++-
 3 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/assets/wizards/engagement/views/reader-activation/campaign.js b/assets/wizards/engagement/views/reader-activation/campaign.js
index 66bca1d63e..6f54185882 100644
--- a/assets/wizards/engagement/views/reader-activation/campaign.js
+++ b/assets/wizards/engagement/views/reader-activation/campaign.js
@@ -16,16 +16,23 @@ import {
 	SectionHeader,
 	Waiting,
 	withWizardScreen,
+	utils,
 } from '../../../../components/src';
 import Prompt from '../../components/prompt';
+import Router from '../../../../components/src/proxied-imports/router';
 import './style.scss';
 
+const { is_skipped_campaign_setup, reader_activation_url } = newspack_engagement_wizard;
+const { useHistory } = Router;
+
 export default withWizardScreen( () => {
 	const [ inFlight, setInFlight ] = useState( false );
 	const [ error, setError ] = useState( false );
 	const [ prompts, setPrompts ] = useState( null );
 	const [ allReady, setAllReady ] = useState( false );
-	const { reader_activation_url } = newspack_engagement_wizard;
+	const [ isSetupSkipped, setIsSetupSkipped ] = useState( is_skipped_campaign_setup === '1' );
+
+	const history = useHistory();
 
 	const fetchPrompts = () => {
 		setError( false );
@@ -83,6 +90,34 @@ export default withWizardScreen( () => {
 					/>
 				) ) }
 			<div className="newspack-buttons-card">
+				<Button
+					disabled={ isSetupSkipped }
+					onClick={ () => {
+						if (
+							utils.confirmAction(
+								__(
+									'Are you sure you want to skip setting up a reader activation campaign?',
+									'newspack-plugin'
+								)
+							)
+						) {
+							apiFetch( {
+								path: '/newspack/v1/wizard/newspack-engagement-wizard/reader-activation/skip-campaign-setup',
+								method: 'POST',
+							} )
+								.then( res => {
+									setIsSetupSkipped( Boolean( res ) );
+									history.push( '/reader-activation' );
+									newspack_engagement_wizard.is_skipped_campaign_setup = '1';
+								} )
+								.catch( () => setIsSetupSkipped( false ) );
+						} else {
+							console.log( 'Denied' );
+						}
+					} }
+				>
+					{ __( 'Skip', 'newspack-plugin' ) }
+				</Button>
 				<Button
 					isPrimary
 					disabled={ inFlight || ! allReady }
diff --git a/includes/reader-activation/class-reader-activation.php b/includes/reader-activation/class-reader-activation.php
index e17f86ee57..7900e9cda6 100644
--- a/includes/reader-activation/class-reader-activation.php
+++ b/includes/reader-activation/class-reader-activation.php
@@ -407,7 +407,7 @@ public static function is_transactional_email_configured() {
 	 * TODO: Make this dynamic once the third UI screen to generate the prompts is built.
 	 */
 	public static function is_ras_campaign_configured() {
-		return self::is_enabled();
+		return self::is_enabled() || get_option( Engagement_Wizard::SKIP_CAMPAIGN_SETUP_OPTION, '' ) === '1';
 	}
 
 	/**
diff --git a/includes/wizards/class-engagement-wizard.php b/includes/wizards/class-engagement-wizard.php
index f810a255f4..24b7d22e76 100644
--- a/includes/wizards/class-engagement-wizard.php
+++ b/includes/wizards/class-engagement-wizard.php
@@ -7,7 +7,7 @@
 
 namespace Newspack;
 
-use WP_Error, WP_Query;
+use WP_Error;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -18,6 +18,8 @@
  */
 class Engagement_Wizard extends Wizard {
 
+	const SKIP_CAMPAIGN_SETUP_OPTION = '_newspack_ras_skip_campaign_setup';
+
 	/**
 	 * The slug of this wizard.
 	 *
@@ -108,6 +110,18 @@ public function register_api_endpoints() {
 				'permission_callback' => [ $this, 'api_permissions_check' ],
 			]
 		);
+		register_rest_route(
+			NEWSPACK_API_NAMESPACE,
+			'/wizard/' . $this->slug . '/reader-activation/skip-campaign-setup',
+			[
+				'methods'             => \WP_REST_Server::EDITABLE,
+				'callback'            => function() {
+					$skip_campaign_setup = update_option( static::SKIP_CAMPAIGN_SETUP_OPTION, true );
+					return rest_ensure_response( $skip_campaign_setup );
+				},
+				'permission_callback' => [ $this, 'api_permissions_check' ],
+			]
+		);
 		register_rest_route(
 			NEWSPACK_API_NAMESPACE,
 			'/wizard/' . $this->slug . '/newsletters',
@@ -423,6 +437,8 @@ public function enqueue_scripts_and_styles() {
 			$data['preview_archive']    = $newspack_popups->preview_archive();
 		}
 
+		$data['is_skipped_campaign_setup'] = get_option( static::SKIP_CAMPAIGN_SETUP_OPTION, '' );
+
 		\wp_localize_script(
 			'newspack-engagement-wizard',
 			'newspack_engagement_wizard',

From 9459fd2870da6f291e6c002c83bf25038028a248 Mon Sep 17 00:00:00 2001
From: Jared Rethman <jaredrethman@gmail.com>
Date: Tue, 9 Apr 2024 10:24:49 -0500
Subject: [PATCH 02/12] feat(ras): added `is_skipped` to prerequisite status
 endpoint

---
 includes/reader-activation/class-reader-activation.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/includes/reader-activation/class-reader-activation.php b/includes/reader-activation/class-reader-activation.php
index 7900e9cda6..b091af5393 100644
--- a/includes/reader-activation/class-reader-activation.php
+++ b/includes/reader-activation/class-reader-activation.php
@@ -500,6 +500,7 @@ public static function get_prerequisites_status() {
 			],
 			'ras_campaign'     => [
 				'active'         => self::is_ras_campaign_configured(),
+				'is_skipped'     => get_option( Engagement_Wizard::SKIP_CAMPAIGN_SETUP_OPTION, '' ) === '1',
 				'plugins'        => [
 					'newspack-popups' => class_exists( '\Newspack_Popups_Model' ),
 				],

From a3ef59f0f91f2889be382622cd8c41397238db0c Mon Sep 17 00:00:00 2001
From: Jared Rethman <jaredrethman@gmail.com>
Date: Tue, 9 Apr 2024 10:35:31 -0500
Subject: [PATCH 03/12] refactor: moved callback to named function

added ui to indicate async skipping flow
---
 .../views/reader-activation/campaign.js       | 69 +++++++++++--------
 1 file changed, 42 insertions(+), 27 deletions(-)

diff --git a/assets/wizards/engagement/views/reader-activation/campaign.js b/assets/wizards/engagement/views/reader-activation/campaign.js
index 6f54185882..6526cb281c 100644
--- a/assets/wizards/engagement/views/reader-activation/campaign.js
+++ b/assets/wizards/engagement/views/reader-activation/campaign.js
@@ -22,15 +22,19 @@ import Prompt from '../../components/prompt';
 import Router from '../../../../components/src/proxied-imports/router';
 import './style.scss';
 
-const { is_skipped_campaign_setup, reader_activation_url } = newspack_engagement_wizard;
 const { useHistory } = Router;
 
 export default withWizardScreen( () => {
+	const { is_skipped_campaign_setup, reader_activation_url } = newspack_engagement_wizard;
+
 	const [ inFlight, setInFlight ] = useState( false );
 	const [ error, setError ] = useState( false );
 	const [ prompts, setPrompts ] = useState( null );
 	const [ allReady, setAllReady ] = useState( false );
-	const [ isSetupSkipped, setIsSetupSkipped ] = useState( is_skipped_campaign_setup === '1' );
+	const [ skipped, setSkipped ] = useState( {
+		status: '',
+		isSkipped: is_skipped_campaign_setup === '1',
+	} );
 
 	const history = useHistory();
 
@@ -47,6 +51,37 @@ export default withWizardScreen( () => {
 			.finally( () => setInFlight( false ) );
 	};
 
+	/**
+	 * Display prompt requiring editors to confirm skipping, on confirmation send request to
+	 * server to store skipped option in options table and redirect back to RAS
+	 *
+	 * @return {void}
+	 */
+	async function onSkipCampaignSetup() {
+		if (
+			! utils.confirmAction(
+				__(
+					'Are you sure you want to skip setting up a reader activation campaign?',
+					'newspack-plugin'
+				)
+			)
+		) {
+			return;
+		}
+		setSkipped( { ...skipped, status: 'pending' } );
+		try {
+			const request = await apiFetch( {
+				path: '/newspack/v1/wizard/newspack-engagement-wizard/reader-activation/skip-campaign-setup',
+				method: 'POST',
+			} );
+			setSkipped( { isSkipped: Boolean( request ), status: '' } );
+			newspack_engagement_wizard.is_skipped_campaign_setup = '1';
+			history.push( '/reader-activation' );
+		} catch ( err ) {
+			setSkipped( { isSkipped: false, status: '' } );
+		}
+	}
+
 	useEffect( () => {
 		window.scrollTo( 0, 0 );
 		fetchPrompts();
@@ -91,32 +126,12 @@ export default withWizardScreen( () => {
 				) ) }
 			<div className="newspack-buttons-card">
 				<Button
-					disabled={ isSetupSkipped }
-					onClick={ () => {
-						if (
-							utils.confirmAction(
-								__(
-									'Are you sure you want to skip setting up a reader activation campaign?',
-									'newspack-plugin'
-								)
-							)
-						) {
-							apiFetch( {
-								path: '/newspack/v1/wizard/newspack-engagement-wizard/reader-activation/skip-campaign-setup',
-								method: 'POST',
-							} )
-								.then( res => {
-									setIsSetupSkipped( Boolean( res ) );
-									history.push( '/reader-activation' );
-									newspack_engagement_wizard.is_skipped_campaign_setup = '1';
-								} )
-								.catch( () => setIsSetupSkipped( false ) );
-						} else {
-							console.log( 'Denied' );
-						}
-					} }
+					disabled={ skipped.isSkipped || skipped.status === 'pending' }
+					onClick={ onSkipCampaignSetup }
 				>
-					{ __( 'Skip', 'newspack-plugin' ) }
+					{ skipped.status === ''
+						? __( 'Skip', 'newspack-plugin' )
+						: __( 'Skipping…', 'newspack-plugin' ) }
 				</Button>
 				<Button
 					isPrimary

From f665e2177e65a6bf4e217831f1d3c531e835d4a2 Mon Sep 17 00:00:00 2001
From: Jared Rethman <jaredrethman@gmail.com>
Date: Tue, 9 Apr 2024 10:36:45 -0500
Subject: [PATCH 04/12] feat: added skip logic to prerequisite component

combined "skipped" and "active" into single `isValid` const
---
 .../engagement/components/prerequisite.tsx      | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/assets/wizards/engagement/components/prerequisite.tsx b/assets/wizards/engagement/components/prerequisite.tsx
index 0c8b9aa825..4bd2ae5ade 100644
--- a/assets/wizards/engagement/components/prerequisite.tsx
+++ b/assets/wizards/engagement/components/prerequisite.tsx
@@ -23,10 +23,11 @@ export default function Prerequisite( {
 	saveConfig,
 }: PrequisiteProps ) {
 	const { href } = prerequisite;
+	const isValid = Boolean( prerequisite.active || prerequisite.is_skipped );
 
 	// If the prerequisite is active but has empty fields, show a warning.
 	const hasEmptyFields = () => {
-		if ( prerequisite.active && prerequisite.fields && prerequisite.warning ) {
+		if ( isValid && prerequisite.fields && prerequisite.warning ) {
 			const emptyValues = Object.keys( prerequisite.fields ).filter(
 				fieldName => '' === config[ fieldName as keyof Config ]
 			);
@@ -93,7 +94,7 @@ export default function Prerequisite( {
 									: sprintf(
 											// Translators: Save or Update settings.
 											__( '%s settings', 'newspack-plugin' ),
-											prerequisite.active
+											isValid
 												? __( 'Update', 'newspack-plugin' )
 												: __( 'Save', 'newspack-plugin' )
 									  ) }
@@ -138,7 +139,7 @@ export default function Prerequisite( {
 									} }
 								>
 									{ /* eslint-disable no-nested-ternary */ }
-									{ ( prerequisite.active
+									{ ( isValid
 										? __( 'Update ', 'newspack-plugin' )
 										: prerequisite.fields
 										? __( 'Save ', 'newspack-plugin' )
@@ -158,8 +159,10 @@ export default function Prerequisite( {
 	);
 
 	let status = __( 'Pending', 'newspack-plugin' );
-	if ( prerequisite.active ) {
-		status = __( 'Ready', 'newspack-plugin' );
+	if ( isValid ) {
+		status = `${ __( 'Ready', 'newspack-plugin' ) } ${
+			prerequisite.is_skipped ? `(${ __( 'Skipped', 'newspack-plugin' ) })` : ''
+		}`;
 	}
 	if ( prerequisite.is_unavailable ) {
 		status = __( 'Unavailable', 'newspack-plugin' );
@@ -170,14 +173,14 @@ export default function Prerequisite( {
 			className="newspack-ras-wizard__prerequisite"
 			isMedium
 			expandable={ ! prerequisite.is_unavailable }
-			collapse={ prerequisite.active }
+			collapse={ isValid }
 			title={ prerequisite.label }
 			description={ sprintf(
 				/* translators: %s: Prerequisite status */
 				__( 'Status: %s', 'newspack-plugin' ),
 				status
 			) }
-			checkbox={ prerequisite.active ? 'checked' : 'unchecked' }
+			checkbox={ isValid ? 'checked' : 'unchecked' }
 			notificationLevel="info"
 			notification={ hasEmptyFields() }
 		>

From 2ee8664b81d800d5f9810c7631dfe0410ac05b0c Mon Sep 17 00:00:00 2001
From: Jared Rethman <jaredrethman@gmail.com>
Date: Tue, 9 Apr 2024 10:39:27 -0500
Subject: [PATCH 05/12] feat: `is_skipped` property to prerequisite type

added skip logic to RAS wizard
---
 assets/wizards/engagement/components/types.ts              | 1 +
 assets/wizards/engagement/views/reader-activation/index.js | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/assets/wizards/engagement/components/types.ts b/assets/wizards/engagement/components/types.ts
index e1e947d277..dc577e72e3 100644
--- a/assets/wizards/engagement/components/types.ts
+++ b/assets/wizards/engagement/components/types.ts
@@ -127,6 +127,7 @@ export type PrequisiteProps = {
 		action_enabled?: boolean;
 		disabled_text?: string;
 		is_unavailable?: boolean;
+		is_skipped?: boolean;
 	};
 };
 
diff --git a/assets/wizards/engagement/views/reader-activation/index.js b/assets/wizards/engagement/views/reader-activation/index.js
index 8c78199340..a86c4b7b86 100644
--- a/assets/wizards/engagement/views/reader-activation/index.js
+++ b/assets/wizards/engagement/views/reader-activation/index.js
@@ -96,7 +96,9 @@ export default withWizardScreen( ( { wizardApiFetch } ) => {
 		const _allReady =
 			! missingPlugins.length &&
 			prerequisites &&
-			Object.keys( prerequisites ).every( key => prerequisites[ key ]?.active );
+			Object.keys( prerequisites ).every(
+				key => prerequisites[ key ]?.active || prerequisites[ key ]?.skipped
+			);
 
 		setAllReady( _allReady );
 

From f7d78955d3488a7553626b044f46094a8909c1e0 Mon Sep 17 00:00:00 2001
From: Jared Rethman <jaredrethman@gmail.com>
Date: Tue, 9 Apr 2024 11:04:08 -0500
Subject: [PATCH 06/12] fix: circle ci / typescript

---
 assets/wizards/engagement/components/prerequisite.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/assets/wizards/engagement/components/prerequisite.tsx b/assets/wizards/engagement/components/prerequisite.tsx
index 4bd2ae5ade..601eff767a 100644
--- a/assets/wizards/engagement/components/prerequisite.tsx
+++ b/assets/wizards/engagement/components/prerequisite.tsx
@@ -80,9 +80,8 @@ export default function Prerequisite( {
 								onClick={ () => {
 									const dataToSave: Partial< Config > = {};
 									fieldKeys.forEach( fieldName => {
-										if ( config[ fieldName ] ) {
-											// @ts-ignore - not sure what's the issue here.
-											dataToSave[ fieldName ] = config[ fieldName ];
+										if ( typeof config[ fieldName ] !== 'undefined' ) {
+											dataToSave[ fieldName ] = config[ fieldName ] as any;
 										}
 									} );
 									saveConfig( dataToSave );

From 81c675758fa72dab60e5c6baffa56c9dd8db4fe8 Mon Sep 17 00:00:00 2001
From: Jared Rethman <jaredrethman@gmail.com>
Date: Tue, 9 Apr 2024 11:07:58 -0500
Subject: [PATCH 07/12] fix: ci / eslint

---
 assets/wizards/engagement/components/prerequisite.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/assets/wizards/engagement/components/prerequisite.tsx b/assets/wizards/engagement/components/prerequisite.tsx
index 601eff767a..3670fdade9 100644
--- a/assets/wizards/engagement/components/prerequisite.tsx
+++ b/assets/wizards/engagement/components/prerequisite.tsx
@@ -93,9 +93,7 @@ export default function Prerequisite( {
 									: sprintf(
 											// Translators: Save or Update settings.
 											__( '%s settings', 'newspack-plugin' ),
-											isValid
-												? __( 'Update', 'newspack-plugin' )
-												: __( 'Save', 'newspack-plugin' )
+											isValid ? __( 'Update', 'newspack-plugin' ) : __( 'Save', 'newspack-plugin' )
 									  ) }
 							</Button>
 						</div>

From b3bf63b775de6280503d8eb44f35b11f8795b26c Mon Sep 17 00:00:00 2001
From: Jared Rethman <jaredrethman@gmail.com>
Date: Tue, 9 Apr 2024 16:21:32 -0500
Subject: [PATCH 08/12] refactor: remove redirect after skip

added allow continue when skipped.
---
 .../views/reader-activation/campaign.js       | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/assets/wizards/engagement/views/reader-activation/campaign.js b/assets/wizards/engagement/views/reader-activation/campaign.js
index 6526cb281c..a08e0867b9 100644
--- a/assets/wizards/engagement/views/reader-activation/campaign.js
+++ b/assets/wizards/engagement/views/reader-activation/campaign.js
@@ -19,11 +19,8 @@ import {
 	utils,
 } from '../../../../components/src';
 import Prompt from '../../components/prompt';
-import Router from '../../../../components/src/proxied-imports/router';
 import './style.scss';
 
-const { useHistory } = Router;
-
 export default withWizardScreen( () => {
 	const { is_skipped_campaign_setup, reader_activation_url } = newspack_engagement_wizard;
 
@@ -36,8 +33,6 @@ export default withWizardScreen( () => {
 		isSkipped: is_skipped_campaign_setup === '1',
 	} );
 
-	const history = useHistory();
-
 	const fetchPrompts = () => {
 		setError( false );
 		setInFlight( true );
@@ -76,7 +71,6 @@ export default withWizardScreen( () => {
 			} );
 			setSkipped( { isSkipped: Boolean( request ), status: '' } );
 			newspack_engagement_wizard.is_skipped_campaign_setup = '1';
-			history.push( '/reader-activation' );
 		} catch ( err ) {
 			setSkipped( { isSkipped: false, status: '' } );
 		}
@@ -126,16 +120,20 @@ export default withWizardScreen( () => {
 				) ) }
 			<div className="newspack-buttons-card">
 				<Button
-					disabled={ skipped.isSkipped || skipped.status === 'pending' }
+					isTertiary
+					disabled={ inFlight || skipped.isSkipped || skipped.status === 'pending' }
 					onClick={ onSkipCampaignSetup }
 				>
-					{ skipped.status === ''
-						? __( 'Skip', 'newspack-plugin' )
-						: __( 'Skipping…', 'newspack-plugin' ) }
+					{ /* eslint-disable-next-line no-nested-ternary */ }
+					{ skipped.status === 'pending'
+						? __( 'Skipping…', 'newspack-plugin' )
+						: skipped.isSkipped
+						? __( 'Skipped', 'newspack-plugin' )
+						: __( 'Skip', 'newspack-plugin' ) }
 				</Button>
 				<Button
 					isPrimary
-					disabled={ inFlight || ! allReady }
+					disabled={ inFlight || ( ! allReady && ! skipped.isSkipped ) }
 					href={ `${ reader_activation_url }/complete` }
 				>
 					{ __( 'Continue', 'newspack-plugin' ) }

From e1fce56104553c20eb2736010792ebe323a22c63 Mon Sep 17 00:00:00 2001
From: Jared Rethman <jaredrethman@gmail.com>
Date: Tue, 9 Apr 2024 17:17:14 -0500
Subject: [PATCH 09/12] refactor: allow parametrized skip

---
 .../engagement/views/reader-activation/campaign.js   | 12 ++++++++++--
 includes/wizards/class-engagement-wizard.php         | 12 +++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/assets/wizards/engagement/views/reader-activation/campaign.js b/assets/wizards/engagement/views/reader-activation/campaign.js
index a08e0867b9..4fb2ca6b60 100644
--- a/assets/wizards/engagement/views/reader-activation/campaign.js
+++ b/assets/wizards/engagement/views/reader-activation/campaign.js
@@ -63,15 +63,23 @@ export default withWizardScreen( () => {
 		) {
 			return;
 		}
+		setError( false );
 		setSkipped( { ...skipped, status: 'pending' } );
 		try {
 			const request = await apiFetch( {
 				path: '/newspack/v1/wizard/newspack-engagement-wizard/reader-activation/skip-campaign-setup',
 				method: 'POST',
+				data: { skip: ! skipped.isSkipped },
 			} );
-			setSkipped( { isSkipped: Boolean( request ), status: '' } );
-			newspack_engagement_wizard.is_skipped_campaign_setup = '1';
+			if ( ! request.updated ) {
+				setError( { message: __( 'Server not updated', 'newspack-plugin' ) } );
+				setSkipped( { isSkipped: false, status: '' } );
+				return;
+			}
+			setSkipped( { isSkipped: Boolean( request.skipped ), status: '' } );
+			newspack_engagement_wizard.is_skipped_campaign_setup = request.skipped ? '1' : '';
 		} catch ( err ) {
+			setError( err );
 			setSkipped( { isSkipped: false, status: '' } );
 		}
 	}
diff --git a/includes/wizards/class-engagement-wizard.php b/includes/wizards/class-engagement-wizard.php
index 24b7d22e76..20f67495e9 100644
--- a/includes/wizards/class-engagement-wizard.php
+++ b/includes/wizards/class-engagement-wizard.php
@@ -115,9 +115,15 @@ public function register_api_endpoints() {
 			'/wizard/' . $this->slug . '/reader-activation/skip-campaign-setup',
 			[
 				'methods'             => \WP_REST_Server::EDITABLE,
-				'callback'            => function() {
-					$skip_campaign_setup = update_option( static::SKIP_CAMPAIGN_SETUP_OPTION, true );
-					return rest_ensure_response( $skip_campaign_setup );
+				'callback'            => function( $request ) {
+					$skip = $request->get_param( 'skip' );
+					$skip_campaign_setup = update_option( static::SKIP_CAMPAIGN_SETUP_OPTION, $skip );
+					return rest_ensure_response( 
+						[ 
+							'skipped' => $skip,
+							'updated' => $skip_campaign_setup,
+						]
+					);
 				},
 				'permission_callback' => [ $this, 'api_permissions_check' ],
 			]

From 6b5bd223f8a62629bf6ce96cbbc35548259f1ec1 Mon Sep 17 00:00:00 2001
From: Jared Rethman <jaredrethman@gmail.com>
Date: Tue, 9 Apr 2024 22:31:55 -0500
Subject: [PATCH 10/12] refactor: revert any type cast

---
 assets/wizards/engagement/components/prerequisite.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/assets/wizards/engagement/components/prerequisite.tsx b/assets/wizards/engagement/components/prerequisite.tsx
index 3670fdade9..16ae5b86fd 100644
--- a/assets/wizards/engagement/components/prerequisite.tsx
+++ b/assets/wizards/engagement/components/prerequisite.tsx
@@ -80,8 +80,9 @@ export default function Prerequisite( {
 								onClick={ () => {
 									const dataToSave: Partial< Config > = {};
 									fieldKeys.forEach( fieldName => {
-										if ( typeof config[ fieldName ] !== 'undefined' ) {
-											dataToSave[ fieldName ] = config[ fieldName ] as any;
+										if ( config[ fieldName ] ) {
+											// @ts-ignore - not sure what's the issue here.
+											dataToSave[ fieldName ] = config[ fieldName ];
 										}
 									} );
 									saveConfig( dataToSave );

From 3110cb5dded858bfaa32d1b6b9e5ff2763140ac6 Mon Sep 17 00:00:00 2001
From: Jared Rethman <jaredrethman@gmail.com>
Date: Mon, 15 Apr 2024 11:47:20 -0500
Subject: [PATCH 11/12] feat: pr feedback - added redirect, activation skip and
 remove `activationStep[0]`

---
 .../engagement/views/reader-activation/campaign.js   |  5 +++++
 .../engagement/views/reader-activation/complete.js   | 12 +++++++++++-
 includes/wizards/class-engagement-wizard.php         |  9 +++++++--
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/assets/wizards/engagement/views/reader-activation/campaign.js b/assets/wizards/engagement/views/reader-activation/campaign.js
index 4fb2ca6b60..b9e216ab05 100644
--- a/assets/wizards/engagement/views/reader-activation/campaign.js
+++ b/assets/wizards/engagement/views/reader-activation/campaign.js
@@ -19,8 +19,11 @@ import {
 	utils,
 } from '../../../../components/src';
 import Prompt from '../../components/prompt';
+import Router from '../../../../components/src/proxied-imports/router';
 import './style.scss';
 
+const { useHistory } = Router;
+
 export default withWizardScreen( () => {
 	const { is_skipped_campaign_setup, reader_activation_url } = newspack_engagement_wizard;
 
@@ -32,6 +35,7 @@ export default withWizardScreen( () => {
 		status: '',
 		isSkipped: is_skipped_campaign_setup === '1',
 	} );
+	const history = useHistory();
 
 	const fetchPrompts = () => {
 		setError( false );
@@ -78,6 +82,7 @@ export default withWizardScreen( () => {
 			}
 			setSkipped( { isSkipped: Boolean( request.skipped ), status: '' } );
 			newspack_engagement_wizard.is_skipped_campaign_setup = request.skipped ? '1' : '';
+			history.push( '/reader-activation/complete' );
 		} catch ( err ) {
 			setError( err );
 			setSkipped( { isSkipped: false, status: '' } );
diff --git a/assets/wizards/engagement/views/reader-activation/complete.js b/assets/wizards/engagement/views/reader-activation/complete.js
index 78be902a09..9e4250b3e0 100644
--- a/assets/wizards/engagement/views/reader-activation/complete.js
+++ b/assets/wizards/engagement/views/reader-activation/complete.js
@@ -42,6 +42,8 @@ const activationSteps = [
 	__( 'Activating Reader Activation Campaign…', 'newspack-plugin' ),
 ];
 
+const activationStepsCount = activationSteps.length;
+
 /**
  * Get a random number between min and max.
  *
@@ -60,7 +62,12 @@ export default withWizardScreen( () => {
 	const [ progressLabel, setProgressLabel ] = useState( false );
 	const [ completed, setCompleted ] = useState( false );
 	const timer = useRef();
-	const { reader_activation_url } = newspack_engagement_wizard;
+	const { reader_activation_url, is_skipped_campaign_setup = '' } = newspack_engagement_wizard;
+	const isSkippedCampaignSetup = is_skipped_campaign_setup === '1';
+
+	if ( isSkippedCampaignSetup && activationSteps.length !== activationStepsCount - 1 ) {
+		activationSteps.shift();
+	}
 
 	useEffect( () => {
 		if ( timer.current ) {
@@ -95,6 +102,9 @@ export default withWizardScreen( () => {
 				await apiFetch( {
 					path: '/newspack/v1/wizard/newspack-engagement-wizard/reader-activation/activate',
 					method: 'post',
+					data: {
+						skip_activation: isSkippedCampaignSetup,
+					},
 				} )
 			);
 		} catch ( err ) {
diff --git a/includes/wizards/class-engagement-wizard.php b/includes/wizards/class-engagement-wizard.php
index 20f67495e9..724af88cb0 100644
--- a/includes/wizards/class-engagement-wizard.php
+++ b/includes/wizards/class-engagement-wizard.php
@@ -7,7 +7,10 @@
 
 namespace Newspack;
 
+use TypeError;
 use WP_Error;
+use WP_REST_Request;
+use WP_REST_Response;
 
 defined( 'ABSPATH' ) || exit;
 
@@ -276,10 +279,12 @@ public function api_update_reader_activation_settings( $request ) {
 	/**
 	 * Activate reader activation and publish RAS prompts/segments.
 	 *
+	 * @param WP_REST_Request $request WP Rest Request object.
 	 * @return WP_REST_Response
 	 */
-	public function api_activate_reader_activation() {
-		$response = Reader_Activation::activate();
+	public function api_activate_reader_activation( WP_REST_Request $request ) {
+		$skip_activation = $request->get_param( 'skip_activation' ) ?? false;
+		$response = $skip_activation ? true : Reader_Activation::activate();
 
 		if ( \is_wp_error( $response ) ) {
 			return new \WP_REST_Response( [ 'message' => $response->get_error_message() ], 400 );

From 80d55a922b319aa65816b207153c70adbdc322af Mon Sep 17 00:00:00 2001
From: Jared Rethman <jaredrethman@gmail.com>
Date: Mon, 15 Apr 2024 20:33:11 -0500
Subject: [PATCH 12/12] feat: pr feedback, appended `[skipped]` to select items

---
 .../views/reader-activation/complete.js       | 51 ++++++++++++++-----
 .../views/reader-activation/style.scss        |  4 ++
 2 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/assets/wizards/engagement/views/reader-activation/complete.js b/assets/wizards/engagement/views/reader-activation/complete.js
index 9e4250b3e0..22e2bb5a7f 100644
--- a/assets/wizards/engagement/views/reader-activation/complete.js
+++ b/assets/wizards/engagement/views/reader-activation/complete.js
@@ -22,18 +22,26 @@ import {
 } from '../../../../components/src';
 
 const listItems = [
-	__(
-		'Your <strong>current segments and prompts</strong> will be deactivated and archived.',
-		'newspack-plugin'
-	),
-	__(
-		'<strong>Reader registration</strong> will be activated to enable better targeting for driving engagement and conversations.',
-		'newspack-plugin'
-	),
-	__(
-		'The <strong>Reader Activation campaign</strong> will be activated with default segments and settings.',
-		'newspack-plugin'
-	),
+	{
+		text: __(
+			'Your <strong>current segments and prompts</strong> will be deactivated and archived.',
+			'newspack-plugin'
+		),
+		isSkipped: '<span class="is-skipped">[skipped]</span>',
+	},
+	{
+		text: __(
+			'<strong>Reader registration</strong> will be activated to enable better targeting for driving engagement and conversations.',
+			'newspack-plugin'
+		),
+	},
+	{
+		text: __(
+			'The <strong>Reader Activation campaign</strong> will be activated with default segments and settings.',
+			'newspack-plugin'
+		),
+		isSkipped: '<span class="is-skipped">[skipped]</span>',
+	},
 ];
 
 const activationSteps = [
@@ -65,10 +73,27 @@ export default withWizardScreen( () => {
 	const { reader_activation_url, is_skipped_campaign_setup = '' } = newspack_engagement_wizard;
 	const isSkippedCampaignSetup = is_skipped_campaign_setup === '1';
 
+	/**
+	 * If skipped, remove first item.
+	 */
 	if ( isSkippedCampaignSetup && activationSteps.length !== activationStepsCount - 1 ) {
 		activationSteps.shift();
 	}
 
+	/**
+	 * Generate step list strings
+	 */
+	for ( const listItemIndex in listItems ) {
+		if ( ! listItems[ listItemIndex ].text ) {
+			continue;
+		}
+		const suffix = isSkippedCampaignSetup ? ` ${ listItems[ listItemIndex ].isSkipped ?? '' }` : '';
+		listItems[ listItemIndex ] = `${ listItems[ listItemIndex ].text }${ suffix }`;
+		if ( isSkippedCampaignSetup ) {
+			listItems[ listItemIndex ] += ` ${ listItems[ listItemIndex ].isSkipped ?? '' }`;
+		}
+	}
+
 	useEffect( () => {
 		if ( timer.current ) {
 			clearTimeout( timer.current );
@@ -87,7 +112,7 @@ export default withWizardScreen( () => {
 			setProgressLabel( __( 'Done!', 'newspack-plugin' ) );
 			setTimeout( () => {
 				setInFlight( false );
-				window.location = reader_activation_url;
+				// window.location = reader_activation_url;
 			}, 3000 );
 		}
 	}, [ completed, progress ] );
diff --git a/assets/wizards/engagement/views/reader-activation/style.scss b/assets/wizards/engagement/views/reader-activation/style.scss
index 878daf7ea6..6083db16d9 100644
--- a/assets/wizards/engagement/views/reader-activation/style.scss
+++ b/assets/wizards/engagement/views/reader-activation/style.scss
@@ -4,6 +4,10 @@
 	margin-top: 0 !important;
 }
 
+span.is-skipped {
+	color: wp-colors.$gray-700;
+}
+
 .newspack-ras-campaign {
 	&__prompt-wizard,
 	&__completed {