Make sure block has valid ID stored.

Author: iamdharmesh

includes/blocks/class-mailchimp-list-subscribe-form-blocks.php

@@ -119,7 +119,7 @@ public function register_blocks() {
 
 		$data = array(
 			'admin_settings_url'      => esc_url_raw( admin_url( 'admin.php?page=mailchimp_sf_options' ) ),
-			'lists'                   => $this->mailchimp_sf_get_lists(),
+			'lists'                   => $this->get_lists(),
 			'merge_fields_visibility' => $merge_fields_visibility,
 		);
 		$data = 'window.mailchimp_sf_block_data = ' . wp_json_encode( $data );
@@ -136,8 +136,14 @@ public function register_blocks() {
 	 *
 	 * @return array List of Mailchimp lists.
 	 */
-	public function mailchimp_sf_get_lists() {
-		// Just get out if nothing else matters...
+	public function get_lists() {
+		$lists = get_option( 'mailchimp_sf_lists', array() );
+		// If we have lists, return them.
+		if ( ! empty( $lists ) ) {
+			return $lists;
+		}
+
+		// If we don't have any lists, get them from the API.
 		$api = mailchimp_sf_get_api();
 		if ( ! $api ) {
 			return array();
@@ -148,7 +154,13 @@ public function mailchimp_sf_get_lists() {
 		if ( is_wp_error( $lists ) ) {
 			return array();
 		}
-		return $lists['lists'] ?? array();
+
+		$lists = $lists['lists'] ?? array();
+
+		// Update the option with the lists.
+		update_option( 'mailchimp_sf_lists', $lists );
+
+		return $lists;
 	}
 
 	/**

includes/blocks/mailchimp/markup.php

@@ -13,10 +13,22 @@
 		return;
 	}
 
-	$block_instance = $block->parsed_block;
+	// Make sure we have a list ID and it's valid.
+	$lists    = ( new Mailchimp_List_Subscribe_Form_Blocks() )->get_lists();
+	$list_ids = array_map(
+		function ( $single_list ) {
+			return $single_list['id'];
+		},
+		$lists
+	);
+
+	if ( ! in_array( $attributes['list_id'], $list_ids, true ) ) {
+		return;
+	}
 
 	// Backwards compatibility for old block.
-	$inner_blocks = $block_instance['innerBlocks'] ?? [];
+	$block_instance = $block->parsed_block;
+	$inner_blocks   = $block_instance['innerBlocks'] ?? [];
 	if ( empty( $inner_blocks ) ) {
 		mailchimp_sf_signup_form();
 		?>
@@ -36,7 +48,7 @@
 	$unsubscribe_link_text       = $attributes['unsubscribe_link_text'] ?? __( 'unsubscribe from list', 'mailchimp' );
 	$update_existing_subscribers = ( $attributes['update_existing_subscribers'] ?? get_option( 'mc_update_existing' ) === 'on' ) ? 'yes' : 'no';
 	$double_opt_in               = ( $attributes['double_opt_in'] ?? get_option( 'mc_double_optin' ) === 'on' ) ? 'yes' : 'no';
-	$show_required_indicator	 = $attributes['show_required_indicator'] ?? true;
+	$show_required_indicator     = $attributes['show_required_indicator'] ?? true;
 	$hash                        = wp_hash(
 		serialize( // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.serialize_serialize
 			array(

includes/class-mailchimp-admin.php

@@ -309,7 +309,7 @@ public function verify_and_save_oauth_token( $access_token, $data_center ) {
 			update_option( 'mc_user', $this->sanitize_data( $user ) );
 
 			// Clear Mailchimp List ID if saved list is not available.
-			$lists = $api->get( 'lists', 100, array( 'fields' => 'lists.id' ) );
+			$lists = $api->get( 'lists', 100, array( 'fields' => 'lists.id,lists.name,lists.email_type_option' ) );
 			if ( ! is_wp_error( $lists ) ) {
 				$lists         = $lists['lists'] ?? array();
 				$saved_list_id = get_option( 'mc_list_id' );
@@ -322,6 +322,11 @@ function ( $ele ) {
 				if ( ! in_array( $saved_list_id, $list_ids, true ) ) {
 					delete_option( 'mc_list_id' );
 				}
+
+				// Update lists option.
+				if ( ! empty( $lists ) ) {
+					update_option( 'mailchimp_sf_lists', $lists );
+				}
 			}
 			return true;
 		} else {

mailchimp.php

@@ -609,6 +609,15 @@ function mailchimp_sf_change_list_if_necessary() {
 				$list_name = $list['name'];
 				$list_key  = $key;
 			}
+
+			$merge_fields = mailchimp_sf_get_merge_vars( $list['id'], false, false );
+			$interests    = mailchimp_sf_get_interest_categories( $list['id'], false, false );
+			if ( ! empty( $merge_fields ) ) {
+				update_option( 'mailchimp_sf_merge_fields_' . $list['id'], $merge_fields );
+			}
+			if ( ! empty( $interests ) ) {
+				update_option( 'mailchimp_sf_interest_groups_' . $list['id'], $interests );
+			}
 		}
 
 		$orig_list = get_option( 'mc_list_id' );
@@ -647,6 +656,9 @@ function mailchimp_sf_change_list_if_necessary() {
 
 			mailchimp_sf_global_msg( $msg );
 		}
+
+		// Update the lists option.
+		update_option( 'mailchimp_sf_lists', $lists );
 	}
 }
 
@@ -655,9 +667,10 @@ function mailchimp_sf_change_list_if_necessary() {
  *
  * @param string $list_id List ID
  * @param bool   $new_list Whether this is a new list
+ * @param bool   $update_option Whether to update the option
  * @return array
  */
-function mailchimp_sf_get_merge_vars( $list_id, $new_list ) {
+function mailchimp_sf_get_merge_vars( $list_id, $new_list, $update_option = true ) {
 	$api = mailchimp_sf_get_api();
 	$mv  = $api->get( 'lists/' . $list_id . '/merge-fields', 80 );
 
@@ -667,7 +680,10 @@ function mailchimp_sf_get_merge_vars( $list_id, $new_list ) {
 	}
 
 	$mv['merge_fields'] = mailchimp_sf_add_email_field( $mv['merge_fields'] );
-	update_option( 'mc_merge_vars', $mv['merge_fields'] );
+	if ( $update_option ) {
+		update_option( 'mc_merge_vars', $mv['merge_fields'] );
+	}
+
 	foreach ( $mv['merge_fields'] as $mv_var ) {
 		$opt = 'mc_mv_' . $mv_var['tag'];
 		// turn them all on by default
@@ -703,9 +719,10 @@ function mailchimp_sf_add_email_field( $merge ) {
  *
  * @param string $list_id List ID
  * @param bool   $new_list Whether this is a new list
+ * @param bool   $update_option Whether to update the option
  * @return array
  */
-function mailchimp_sf_get_interest_categories( $list_id, $new_list ) {
+function mailchimp_sf_get_interest_categories( $list_id, $new_list, $update_option = true ) {
 	$api = mailchimp_sf_get_api();
 	$igs = $api->get( 'lists/' . $list_id . '/interest-categories', 60 );
 
@@ -728,7 +745,11 @@ function mailchimp_sf_get_interest_categories( $list_id, $new_list ) {
 			++$key;
 		}
 	}
-	update_option( 'mc_interest_groups', $igs['categories'] );
+
+	if ( $update_option ) {
+		update_option( 'mc_interest_groups', $igs['categories'] );
+	}
+
 	return $igs['categories'];
 }