feat(sync): add ESP sync notice to RAS wizard (#3400)

Automattic · Sep 6, 2024 · f9acd56 · f9acd56
1 parent 2c0bf26
commit f9acd56
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/includes/reader-activation/sync/class-sync.php b/includes/reader-activation/sync/class-sync.php
@@ -62,7 +62,7 @@ public static function can_sync( $return_errors = false ) {
 		) {
 			$errors->add(
 				'esp_sync_not_allowed',
-				__( 'Sync is disabled for non-production sites. Set NEWSPACK_ALLOW_READER_SYNC to allow sync.', 'newspack-plugin' )
+				__( 'Sync is disabled for staging sites. To bypass this check, set the NEWSPACK_ALLOW_READER_SYNC constant in your wp-config.php.', 'newspack-plugin' )
 			);
 		}
 

diff --git a/includes/wizards/class-engagement-wizard.php b/includes/wizards/class-engagement-wizard.php
@@ -246,6 +246,7 @@ public function api_get_reader_activation_settings() {
 				'config'               => Reader_Activation::get_settings(),
 				'prerequisites_status' => Reader_Activation::get_prerequisites_status(),
 				'memberships'          => self::get_memberships_settings(),
+				'can_esp_sync'         => Reader_Activation\ESP_Sync::can_esp_sync( true ),
 			]
 		);
 	}
@@ -278,6 +279,7 @@ public function api_update_reader_activation_settings( $request ) {
 				'config'               => Reader_Activation::get_settings(),
 				'prerequisites_status' => Reader_Activation::get_prerequisites_status(),
 				'memberships'          => self::get_memberships_settings(),
+				'can_esp_sync'         => Reader_Activation\ESP_Sync::can_esp_sync( true ),
 			]
 		);
 	}

diff --git a/src/wizards/engagement/views/reader-activation/index.js b/src/wizards/engagement/views/reader-activation/index.js
@@ -39,6 +39,7 @@ export default withWizardScreen( ( { wizardApiFetch } ) => {
 	const [ prerequisites, setPrerequisites ] = useState( null );
 	const [ missingPlugins, setMissingPlugins ] = useState( [] );
 	const [ showAdvanced, setShowAdvanced ] = useState( false );
+	const [ espSyncErrors, setEspSyncErrors ] = useState( [] );
 	const updateConfig = ( key, val ) => {
 		setConfig( { ...config, [ key ]: val } );
 	};
@@ -48,10 +49,11 @@ export default withWizardScreen( ( { wizardApiFetch } ) => {
 		apiFetch( {
 			path: '/newspack/v1/wizard/newspack-engagement-wizard/reader-activation',
 		} )
-			.then( ( { config: fetchedConfig, prerequisites_status, memberships } ) => {
+			.then( ( { config: fetchedConfig, prerequisites_status, memberships, can_esp_sync } ) => {
 				setPrerequisites( prerequisites_status );
 				setConfig( fetchedConfig );
 				setMembershipsConfig( memberships );
+				setEspSyncErrors( can_esp_sync.errors );
 			} )
 			.catch( setError )
 			.finally( () => setInFlight( false ) );
@@ -65,10 +67,11 @@ export default withWizardScreen( ( { wizardApiFetch } ) => {
 			quiet: true,
 			data,
 		} )
-			.then( ( { config: fetchedConfig, prerequisites_status, memberships } ) => {
+			.then( ( { config: fetchedConfig, prerequisites_status, memberships, can_esp_sync } ) => {
 				setPrerequisites( prerequisites_status );
 				setConfig( fetchedConfig );
 				setMembershipsConfig( memberships );
+				setEspSyncErrors( can_esp_sync.errors );
 			} )
 			.catch( setError )
 			.finally( () => setInFlight( false ) );
@@ -352,6 +355,12 @@ export default withWizardScreen( ( { wizardApiFetch } ) => {
 					>
 						{ config.sync_esp && (
 							<>
+								{ 0 < Object.keys(espSyncErrors).length && (
+									<Notice
+										noticeText={ Object.values(espSyncErrors).join( ' ' ) }
+										isError
+									/>
+								) }
 								{ isMailchimp && (
 									<Mailchimp
 										value={ {