Release May 15

CHANGELOG.md

@@ -1,17 +1,47 @@
-## [3.8.2](https://github.com/Automattic/newspack-plugin/compare/v3.8.1...v3.8.2) (2024-04-26)
+# [4.0.0-alpha.3](https://github.com/Automattic/newspack-plugin/compare/v4.0.0-alpha.2...v4.0.0-alpha.3) (2024-04-26)
 
 
 ### Bug Fixes
 
 * enable Memberships fix cron job only when environment constant is defined ([#3087](https://github.com/Automattic/newspack-plugin/issues/3087)) ([5d40297](https://github.com/Automattic/newspack-plugin/commit/5d40297252a9022bb9b63b72cf805a08c37eb553))
 
+# [4.0.0-alpha.2](https://github.com/Automattic/newspack-plugin/compare/v4.0.0-alpha.1...v4.0.0-alpha.2) (2024-04-25)
+
+
+### Bug Fixes
+
+* remove deprecated filter callback ([#3090](https://github.com/Automattic/newspack-plugin/issues/3090)) ([5d7d0bf](https://github.com/Automattic/newspack-plugin/commit/5d7d0bf71d16907d3aa98def372a7d9ede8949c6))
+
 ## [3.8.1](https://github.com/Automattic/newspack-plugin/compare/v3.8.0...v3.8.1) (2024-04-25)
 
 
 ### Bug Fixes
 
 * remove deprecated filter callback ([#3090](https://github.com/Automattic/newspack-plugin/issues/3090)) ([5d7d0bf](https://github.com/Automattic/newspack-plugin/commit/5d7d0bf71d16907d3aa98def372a7d9ede8949c6))
 
+
+# [4.0.0-alpha.1](https://github.com/Automattic/newspack-plugin/compare/v3.8.0...v4.0.0-alpha.1) (2024-04-25)
+
+
+### Bug Fixes
+
+* ensure only admins can reset starter content and newspack options ([#3081](https://github.com/Automattic/newspack-plugin/issues/3081)) ([4606721](https://github.com/Automattic/newspack-plugin/commit/46067217985f904286ddb2c952ba0e1deb954e56))
+
+
+### Features
+
+* add product option to autocomplete orders ([#3072](https://github.com/Automattic/newspack-plugin/issues/3072)) ([4a2859b](https://github.com/Automattic/newspack-plugin/commit/4a2859b894eab499e194102b0636dc20466e0c22))
+* **ras:** skip campaign setup ([#3051](https://github.com/Automattic/newspack-plugin/issues/3051)) ([9ef0e6d](https://github.com/Automattic/newspack-plugin/commit/9ef0e6d1de8d4dafda4d2af1304206d0f8190b15))
+
+
+### BREAKING CHANGES
+
+* Changes order autocompletion behavior for existing products!
+
+* feat: add product option to autocomplete orders
+
+* chore: update outdated docblock description
+
 # [3.8.0](https://github.com/Automattic/newspack-plugin/compare/v3.7.0...v3.8.0) (2024-04-25)
 
 

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,9 +94,7 @@ export default function Prerequisite( {
 									: sprintf(
 											// Translators: Save or Update settings.
 											__( '%s settings', 'newspack-plugin' ),
-											prerequisite.active
-												? __( 'Update', 'newspack-plugin' )
-												: __( 'Save', 'newspack-plugin' )
+											isValid ? __( 'Update', 'newspack-plugin' ) : __( 'Save', 'newspack-plugin' )
 									  ) }
 							</Button>
 						</div>
@@ -138,7 +137,7 @@ export default function Prerequisite( {
 									} }
 								>
 									{ /* eslint-disable no-nested-ternary */ }
-									{ ( prerequisite.active
+									{ ( isValid
 										? __( 'Update ', 'newspack-plugin' )
 										: prerequisite.fields
 										? __( 'Save ', 'newspack-plugin' )
@@ -158,8 +157,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 +171,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() }
 		>

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;
 	};
 };
 

assets/wizards/engagement/views/reader-activation/campaign.js

@@ -16,16 +16,26 @@ 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 { 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 { reader_activation_url } = newspack_engagement_wizard;
+	const [ skipped, setSkipped ] = useState( {
+		status: '',
+		isSkipped: is_skipped_campaign_setup === '1',
+	} );
+	const history = useHistory();
 
 	const fetchPrompts = () => {
 		setError( false );
@@ -40,6 +50,45 @@ 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;
+		}
+		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 },
+			} );
+			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' : '';
+			history.push( '/reader-activation/complete' );
+		} catch ( err ) {
+			setError( err );
+			setSkipped( { isSkipped: false, status: '' } );
+		}
+	}
+
 	useEffect( () => {
 		window.scrollTo( 0, 0 );
 		fetchPrompts();
@@ -83,9 +132,21 @@ export default withWizardScreen( () => {
 					/>
 				) ) }
 			<div className="newspack-buttons-card">
+				<Button
+					isTertiary
+					disabled={ inFlight || skipped.isSkipped || skipped.status === 'pending' }
+					onClick={ onSkipCampaignSetup }
+				>
+					{ /* 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' ) }

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 = [
@@ -42,6 +50,8 @@ const activationSteps = [
 	__( 'Activating Reader Activation Campaign…', 'newspack-plugin' ),
 ];
 
+const activationStepsCount = activationSteps.length;
+
 /**
  * Get a random number between min and max.
  *
@@ -60,7 +70,29 @@ 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 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 ) {
@@ -80,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 ] );
@@ -95,6 +127,9 @@ export default withWizardScreen( () => {
 				await apiFetch( {
 					path: '/newspack/v1/wizard/newspack-engagement-wizard/reader-activation/activate',
 					method: 'post',
+					data: {
+						skip_activation: isSkippedCampaignSetup,
+					},
 				} )
 			);
 		} catch ( err ) {

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 );
 

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 {

includes/class-newspack.php

@@ -86,6 +86,7 @@ private function includes() {
 		include_once NEWSPACK_ABSPATH . 'includes/data-events/class-popups.php';
 		include_once NEWSPACK_ABSPATH . 'includes/data-events/class-memberships.php';
 		include_once NEWSPACK_ABSPATH . 'includes/data-events/connectors/ga4/class-ga4.php';
+		include_once NEWSPACK_ABSPATH . 'includes/data-events/connectors/class-connector.php';
 		include_once NEWSPACK_ABSPATH . 'includes/data-events/connectors/class-mailchimp.php';
 		include_once NEWSPACK_ABSPATH . 'includes/data-events/connectors/class-activecampaign.php';
 		include_once NEWSPACK_ABSPATH . 'includes/data-events/class-woo-user-registration.php';
@@ -206,6 +207,9 @@ class_exists( 'Newspack_Popups' ) && 'edit.php?post_type=' . \Newspack_Popups::N
 	 * Handle resetting of various options and content.
 	 */
 	public function handle_resets() {
+		if ( ! current_user_can( 'manage_options' ) ) {
+			return;
+		}
 		$redirect_url   = admin_url( 'admin.php?page=newspack' );
 		$newspack_reset = filter_input( INPUT_GET, 'newspack_reset', FILTER_SANITIZE_FULL_SPECIAL_CHARS );
 		if ( 'starter-content' === $newspack_reset ) {