feat: allow unsetting interest groups

Automattic · Apr 16, 2020 · 5498f66 · 5498f66
1 parent 59f0643
commit 5498f66
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 15 deletions.
diff --git a/includes/class-newspack-newsletters.php b/includes/class-newspack-newsletters.php
@@ -331,8 +331,8 @@ public static function api_set_mailchimp_list( $request ) {
 	public static function api_set_mailchimp_interest( $request ) {
 		$id          = $request['id'];
 		$exploded    = explode( ':', $request['interest_id'] );
-		$field       = $exploded[0];
-		$interest_id = $exploded[1];
+		$field       = count( $exploded ) ? $exploded[0] : null;
+		$interest_id = count( $exploded ) > 1 ? $exploded[1] : null;
 
 		if ( self::NEWSPACK_NEWSLETTERS_CPT !== get_post_type( $id ) ) {
 			return new WP_Error(
@@ -341,6 +341,13 @@ public static function api_set_mailchimp_interest( $request ) {
 			);
 		}
 
+		if ( 'no_interests' !== $request['interest_id'] && ( ! $field || ! $interest_id ) ) {
+			return new WP_Error(
+				'newspack_newsletters_incorrect_post_type',
+				__( 'Invalid Mailchimp Interest .', 'newspack-newsletters' )
+			);
+		}
+
 		$mc_campaign_id = get_post_meta( $id, 'mc_campaign_id', true );
 		if ( ! $mc_campaign_id ) {
 			return new WP_Error(
@@ -360,19 +367,21 @@ public static function api_set_mailchimp_interest( $request ) {
 			);
 		}
 
-		$segment_opts = [
-			'match'      => 'any',
-			'conditions' => [
-				[
-					'condition_type' => 'Interests',
-					'field'          => $field,
-					'op'             => 'interestcontains',
-					'value'          => [
-						$interest_id,
+		$segment_opts = ( 'no_interests' === $request['interest_id'] ) ?
+			(object) [] :
+			[
+				'match'      => 'any',
+				'conditions' => [
+					[
+						'condition_type' => 'Interests',
+						'field'          => $field,
+						'op'             => 'interestcontains',
+						'value'          => [
+							$interest_id,
+						],
 					],
 				],
-			],
-		];
+			];
 
 		$payload = [
 			'recipients' => [

diff --git a/src/editor/sidebar/index.js b/src/editor/sidebar/index.js
@@ -84,6 +84,9 @@ class Sidebar extends Component {
 		apiFetch( params ).then( result => this.setStateFromAPIResponse( result ) );
 	};
 	setInterest = interestId => {
+		if ( ! interestId || 'interest_group' === interestId ) {
+			return;
+		}
 		this.setState( { inFlight: true } );
 		const { postId } = this.props;
 		const params = {
@@ -132,7 +135,7 @@ class Sidebar extends Component {
 			const { title, interests, id } = item;
 			accumulator.push( {
 				label: title,
-				value: interest_id,
+				value: 'interest_group',
 			} );
 			if ( interests && interests.interests && interests.interests.length ) {
 				interests.interests.forEach( interest => {
@@ -151,7 +154,13 @@ class Sidebar extends Component {
 			<SelectControl
 				label={ __( 'Interests', 'newspack-newsletters' ) }
 				value={ interestValue }
-				options={ options }
+				options={ [
+					{
+						label: __( '-- No Interest Selected --', 'newspack-newsletters' ),
+						value: 'no_interests',
+					},
+					...options,
+				] }
 				onChange={ value => this.setInterest( value ) }
 				disabled={ inFlight }
 			/>