feat: add quick actions edit mode

includes/api/class-plugins-controller.php

@@ -376,6 +376,9 @@ public function configure_item( $request ) {
 		$managed_plugins = Plugin_Manager::get_managed_plugins();
 
 		\Newspack\Configuration_Managers::configure( $slug );
+
+		$managed_plugins[ $slug ]['Configured'] = \Newspack\Configuration_Managers::is_configured( $slug );
+
 		return rest_ensure_response( $managed_plugins[ $slug ] );
 	}
 

includes/class-blocks.php

@@ -40,13 +40,13 @@ public static function enqueue_block_editor_assets() {
 			[
 				'has_newsletters'         => class_exists( 'Newspack_Newsletters_Subscription' ),
 				'has_reader_activation'   => Reader_Activation::is_enabled(),
-				'newsletters_url'         => Wizards::get_wizard( 'engagement' )->newsletters_settings_url(),
+				'newsletters_url'         => Wizards::get_wizard( 'newsletters' )->newsletters_settings_url(),
 				'has_google_oauth'        => Google_OAuth::is_oauth_configured(),
 				'google_logo_svg'         => \Newspack\Newspack_UI_Icons::get_svg( 'google' ),
 				'reader_activation_terms' => Reader_Activation::get_setting( 'terms_text' ),
 				'reader_activation_url'   => Reader_Activation::get_setting( 'terms_url' ),
 				'has_recaptcha'           => Recaptcha::can_use_captcha(),
-				'recaptcha_url'           => admin_url( 'admin.php?page=newspack-connections-wizard' ),
+				'recaptcha_url'           => admin_url( 'admin.php?page=newspack-settings' ),
 			]
 		);
 		\wp_enqueue_style(

includes/class-donations.php

@@ -82,6 +82,8 @@ public static function init() {
 		add_filter( 'wcs_place_subscription_order_text', [ __CLASS__, 'order_button_text' ], 9 );
 		add_filter( 'woocommerce_order_button_text', [ __CLASS__, 'order_button_text' ], 9 );
 		add_filter( 'option_woocommerce_subscriptions_order_button_text', [ __CLASS__, 'order_button_text' ], 9 );
+
+		add_filter( 'render_block', [ __CLASS__, 'prevent_rendering_donate_block' ], 10, 2 );
 	}
 
 	/**
@@ -454,8 +456,7 @@ public static function get_donation_settings() {
 			$parsed_settings['amounts'][ $frequency ] = array_map( 'floatval', $amounts );
 		}
 
-		$parsed_settings['platform']      = self::get_platform_slug();
-		$parsed_settings['billingFields'] = self::get_billing_fields();
+		$parsed_settings['platform'] = self::get_platform_slug();
 
 		// If NYP isn't available, force untiered config.
 		if ( ! self::can_use_name_your_price() ) {
@@ -486,13 +487,6 @@ public static function set_donation_settings( $args ) {
 			if ( isset( $args['saveDonationProduct'] ) && $args['saveDonationProduct'] === true ) {
 				self::update_donation_product( $configuration );
 			}
-
-			// Update the billing fields.
-			$billing_fields = isset( $args['billingFields'] ) ? $args['billingFields'] : [];
-			if ( ! empty( $billing_fields ) ) {
-				$billing_fields = array_map( 'sanitize_text_field', $billing_fields );
-				self::update_billing_fields( $billing_fields );
-			}
 		}
 
 		Logger::log( 'Save donation settings' );
@@ -644,7 +638,6 @@ public static function get_platform_slug() {
 	 * @param string $platform Platform slug.
 	 */
 	public static function set_platform_slug( $platform ) {
-		delete_option( self::NEWSPACK_READER_REVENUE_PLATFORM );
 		update_option( self::NEWSPACK_READER_REVENUE_PLATFORM, $platform, true );
 	}
 
@@ -1140,6 +1133,23 @@ public static function disable_coupons( $enabled ) {
 		return false;
 	}
 
+	/**
+	 * Prevent rendering of Donate block if Reader Revenue platform is set to 'other.
+	 *
+	 * @param string $block_content The block content about to be rendered.
+	 * @param array  $block The data of the block about to be rendered.
+	 */
+	public static function prevent_rendering_donate_block( $block_content, $block ) {
+		if (
+			isset( $block['blockName'] )
+			&& 'newspack-blocks/donate' === $block['blockName']
+			&& self::is_platform_other()
+		) {
+			return '';
+		}
+		return $block_content;
+	}
+
 	/**
 	 * Set the "Place order" button text.
 	 *

includes/class-newspack-image-credits.php

@@ -421,8 +421,8 @@ function( $setting ) use ( $key ) {
 					return $setting['key'] === $key;
 				}
 			);
-			$setting_values = array_values( $setting );
-			return reset( $setting_values );
+			$settings_values = array_values( $setting );
+			return reset( $settings_values );
 		}
 
 		return $default_settings;

includes/class-newspack.php

@@ -46,9 +46,6 @@ public function __construct() {
 		add_action( 'current_screen', [ $this, 'wizard_redirect' ] );
 		add_action( 'admin_menu', [ $this, 'handle_resets' ], 1 );
 		add_action( 'admin_menu', [ $this, 'remove_newspack_suite_plugin_links' ], 1 );
-		add_action( 'admin_notices', [ $this, 'remove_notifications' ], -9999 );
-		add_action( 'network_admin_notices', [ $this, 'remove_notifications' ], -9999 );
-		add_action( 'all_admin_notices', [ $this, 'remove_notifications' ], -9999 );
 		register_activation_hook( NEWSPACK_PLUGIN_FILE, [ $this, 'activation_hook' ] );
 		register_deactivation_hook( NEWSPACK_PLUGIN_FILE, [ $this, 'deactivation_hook' ] );
 	}
@@ -72,6 +69,7 @@ private function define_constants() {
 		define( 'NEWSPACK_ACTIVATION_TRANSIENT', '_newspack_activation_redirect' );
 		define( 'NEWSPACK_NRH_CONFIG', 'newspack_nrh_config' );
 		define( 'NEWSPACK_CLIENT_ID_COOKIE_NAME', 'newspack-cid' );
+		define( 'NEWSPACK_SETUP_COMPLETE', 'newspack_setup_complete' );
 	}
 
 	/**
@@ -117,7 +115,6 @@ private function includes() {
 		include_once NEWSPACK_ABSPATH . 'includes/oauth/class-google-oauth.php';
 		include_once NEWSPACK_ABSPATH . 'includes/oauth/class-google-services-connection.php';
 		include_once NEWSPACK_ABSPATH . 'includes/oauth/class-mailchimp-api.php';
-		include_once NEWSPACK_ABSPATH . 'includes/oauth/class-fivetran-connection.php';
 		include_once NEWSPACK_ABSPATH . 'includes/oauth/class-google-login.php';
 		include_once NEWSPACK_ABSPATH . 'includes/class-blocks.php';
 		include_once NEWSPACK_ABSPATH . 'includes/tracking/class-pixel.php';
@@ -126,29 +123,53 @@ private function includes() {
 		include_once NEWSPACK_ABSPATH . 'includes/revisions-control/class-revisions-control.php';
 		include_once NEWSPACK_ABSPATH . 'includes/authors/class-authors-custom-fields.php';
 		include_once NEWSPACK_ABSPATH . 'includes/corrections/class-corrections.php';
+		include_once NEWSPACK_ABSPATH . 'includes/class-syndication.php';
 		include_once NEWSPACK_ABSPATH . 'includes/bylines/class-bylines.php';
 
 		include_once NEWSPACK_ABSPATH . 'includes/starter_content/class-starter-content-provider.php';
 		include_once NEWSPACK_ABSPATH . 'includes/starter_content/class-starter-content-generated.php';
 		include_once NEWSPACK_ABSPATH . 'includes/starter_content/class-starter-content-wordpress.php';
 
+		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-wizard.php';
+		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-wizard-section.php';
+
 		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-setup-wizard.php';
-		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-dashboard.php';
 		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-components-demo.php';
 
-		/* Unified Wizards */
-		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-settings.php';
-		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-advertising-wizard.php';
-		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-analytics-wizard.php';
-		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-engagement-wizard.php';
-		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-reader-revenue-wizard.php';
-		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-seo-wizard.php';
-		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-site-design-wizard.php';
-		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-syndication-wizard.php';
-		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-health-check-wizard.php';
-		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-popups-wizard.php';
-		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-connections-wizard.php';
+		include_once NEWSPACK_ABSPATH . 'includes/wizards/traits/trait-wizards-admin-header.php';
+
+		// Newspack Wizards and Sections.
+		include_once NEWSPACK_ABSPATH . 'includes/wizards/newspack/class-newspack-dashboard.php';
+		include_once NEWSPACK_ABSPATH . 'includes/wizards/newspack/class-newspack-settings.php';
+		include_once NEWSPACK_ABSPATH . 'includes/wizards/newspack/class-custom-events-section.php';
+		include_once NEWSPACK_ABSPATH . 'includes/wizards/newspack/class-syndication-section.php';
+		include_once NEWSPACK_ABSPATH . 'includes/wizards/newspack/class-seo-section.php';
+		include_once NEWSPACK_ABSPATH . 'includes/wizards/newspack/class-pixels-section.php';
+		include_once NEWSPACK_ABSPATH . 'includes/wizards/newspack/class-recirculation-section.php';
+
+		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-setup-wizard.php';
+		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-components-demo.php';
+
+		// Listings Wizard.
+		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-listings-wizard.php';
 
+		// Advertising Wizard.
+		include_once NEWSPACK_ABSPATH . 'includes/wizards/advertising/class-advertising-display-ads.php';
+		include_once NEWSPACK_ABSPATH . 'includes/wizards/advertising/class-advertising-sponsors.php';
+
+		// Audience Wizard.
+		include_once NEWSPACK_ABSPATH . 'includes/wizards/audience/class-audience-wizard.php';
+		include_once NEWSPACK_ABSPATH . 'includes/wizards/audience/class-audience-campaigns.php';
+		include_once NEWSPACK_ABSPATH . 'includes/wizards/audience/class-audience-donations.php';
+		include_once NEWSPACK_ABSPATH . 'includes/wizards/audience/class-audience-subscriptions.php';
+
+		// Network Wizard.
+		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-network-wizard.php';
+
+		// Newsletters Wizard.
+		include_once NEWSPACK_ABSPATH . 'includes/wizards/class-newsletters-wizard.php';
+
+		/* Unified Wizards */
 		include_once NEWSPACK_ABSPATH . 'includes/class-wizards.php';
 
 		include_once NEWSPACK_ABSPATH . 'includes/class-handoff-banner.php';
@@ -179,6 +200,7 @@ private function includes() {
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/woocommerce-subscriptions/class-woocommerce-subscriptions-gifting.php';
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-teams-for-memberships.php';
 		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-newspack-elections.php';
+		include_once NEWSPACK_ABSPATH . 'includes/plugins/class-yoast.php';
 
 		include_once NEWSPACK_ABSPATH . 'includes/class-patches.php';
 		include_once NEWSPACK_ABSPATH . 'includes/polyfills/class-amp-polyfills.php';
@@ -236,7 +258,7 @@ public function handle_resets() {
 		if ( ! current_user_can( 'manage_options' ) ) {
 			return;
 		}
-		$redirect_url   = admin_url( 'admin.php?page=newspack' );
+		$redirect_url   = admin_url( 'admin.php?page=newspack-dashboard' );
 		$newspack_reset = filter_input( INPUT_GET, 'newspack_reset', FILTER_SANITIZE_FULL_SPECIAL_CHARS );
 		if ( 'starter-content' === $newspack_reset ) {
 			Starter_Content::remove_starter_content();
@@ -262,19 +284,6 @@ public function handle_resets() {
 		}
 	}
 
-	/**
-	 * Remove notifications.
-	 */
-	public function remove_notifications() {
-		$screen = get_current_screen();
-
-		$is_newspack_screen = ( 'newspack' === $screen->parent_base ) || ( 'admin_page_newspack-' === substr( $screen->base, 0, 20 ) );
-		if ( ! $screen || ! $is_newspack_screen ) {
-			return;
-		}
-		remove_all_actions( current_action() );
-	}
-
 	/**
 	 * Activation Hook
 	 */
@@ -334,15 +343,15 @@ public function wizard_redirect( $current_screen ) {
 		$post_type_mapping = [
 			Emails::POST_TYPE => [
 				'base' => 'edit',
-				'url'  => esc_url( admin_url( 'admin.php?page=newspack' ) ),
+				'url'  => esc_url( admin_url( 'admin.php?page=newspack-dashboard' ) ),
 			],
 		];
 
 		// Map custom post types to their wizard screen URLs.
 		if ( class_exists( '\Newspack_Popups' ) ) {
 			$post_type_mapping[ \Newspack_Popups::NEWSPACK_POPUPS_CPT ] = [
 				'base' => 'edit',
-				'url'  => esc_url( admin_url( 'admin.php?page=newspack-popups-wizard' ) ),
+				'url'  => esc_url( admin_url( 'admin.php?page=newspack-audience-campaigns' ) ),
 			];
 		}
 
@@ -379,6 +388,13 @@ public static function is_debug_mode() {
 		return defined( 'WP_NEWSPACK_DEBUG' ) && WP_NEWSPACK_DEBUG;
 	}
 
+	/**
+	 * Is the Setup completed?
+	 */
+	public static function is_setup_complete() {
+		return '1' === get_option( NEWSPACK_SETUP_COMPLETE, '0' );
+	}
+
 	/**
 	 * Load the common assets.
 	 */
@@ -401,12 +417,14 @@ public static function load_common_assets() {
 		wp_style_add_data( 'newspack-commons', 'rtl', 'replace' );
 		wp_enqueue_style( 'newspack-commons' );
 
-		\wp_enqueue_style(
-			'newspack-admin',
-			self::plugin_url() . '/dist/admin.css',
-			[],
-			NEWSPACK_PLUGIN_VERSION
-		);
+		if ( is_admin() ) {
+			\wp_enqueue_style(
+				'newspack-admin',
+				self::plugin_url() . '/dist/admin.css',
+				[],
+				NEWSPACK_PLUGIN_VERSION
+			);
+		}
 	}
 }
 Newspack::instance();

includes/class-plugin-manager.php

@@ -199,7 +199,7 @@ public static function get_managed_plugins() {
 			],
 			'publish-to-apple-news'       => [
 				'Name'        => \esc_html__( 'Publish to Apple News', 'newspack-plugin' ),
-				'Description' => \esc_html__( 'Export and synchronize posts to Apple format', 'newspack-plugin' ),
+				'Description' => \esc_html__( 'Export and synchronize posts to Apple format.', 'newspack-plugin' ),
 				'Author'      => \esc_html__( 'Alley Interactive', 'newspack-plugin' ),
 				'AuthorURI'   => \esc_url( 'https://www.alleyinteractive.com' ),
 				'PluginURI'   => \esc_url( 'https://github.com/alleyinteractive/apple-news' ),
@@ -444,7 +444,7 @@ public static function get_managed_plugin_status( $plugin_slug ) {
 	/**
 	 * Get the list of plugins which are supported, but not managed.
 	 * These plugins will not be added to the WP Admin plugins screen,
-	 * but installing them will not raise any issues in Health Check.
+	 * but installing them shouldn't be an issue.
 	 */
 	private static function get_supported_plugins_slugs() {
 		return [
@@ -562,7 +562,7 @@ public static function activate( $plugin ) {
 		}
 
 		if ( \is_plugin_active( $installed_plugins[ $plugin_slug ] ) ) {
-			return new WP_Error( 'newspack_plugin_already_active', __( 'The plugin is already active.', 'newspack-plugin' ) );
+			return true;
 		}
 
 		$activated = activate_plugin( $installed_plugins[ $plugin_slug ] );

includes/class-recaptcha.php

@@ -179,7 +179,16 @@ public static function api_permissions_check() {
 	public static function get_settings_config() {
 		return [
 			'use_captcha' => false,
-			'credentials' => [],
+			'credentials' => [
+				'v3'           => [
+					'site_key'    => '',
+					'site_secret' => '',
+				],
+				'v2_invisible' => [
+					'site_key'    => '',
+					'site_secret' => '',
+				],
+			],
 			'threshold'   => 0.5,
 			'version'     => 'v3',
 		];
@@ -226,7 +235,11 @@ public static function get_settings() {
 		$config   = self::get_settings_config();
 		$settings = [];
 		foreach ( $config as $key => $default_value ) {
-			$settings[ $key ] = self::get_setting( $key );
+			if ( 'credentials' === $key ) {
+				$settings[ $key ] = wp_parse_args( self::get_setting( $key ), $default_value );
+			} else {
+				$settings[ $key ] = self::get_setting( $key );
+			}
 		}
 
 		// Migrate reCAPTCHA settings from separate site_key/site_secret options to credentials array.
@@ -328,7 +341,7 @@ public static function update_settings( $settings ) {
 	/**
 	 * Check whether reCaptcha is enabled and that we have all required settings.
 	 *
-	 * @param string $version If specified, chedk whether the given version of reCaptcha is enabled.
+	 * @param string $version If specified, check whether the given version of reCaptcha is enabled.
 	 *
 	 * @return boolean True if we can use reCaptcha to secure checkout requests.
 	 */

includes/class-salesforce.php

@@ -708,7 +708,7 @@ private static function sync_salesforce( $order ) {
 	 * @return string Redirect URL.
 	 */
 	public static function get_redirect_url() {
-		return get_admin_url( null, 'admin.php?page=newspack-reader-revenue-wizard#/salesforce' );
+		return get_admin_url( null, 'admin.php?page=newspack-audience' );
 	}
 
 	/**

includes/class-starter-content.php

@@ -174,7 +174,7 @@ public static function get_theme() {
 	 */
 	public static function upload_logo() {
 
-		$attachment_title = esc_attr__( 'Newspack Placeholder Logo', 'newspack' );
+		$attachment_title = esc_attr__( 'Newspack Placeholder Logomark', 'newspack' );
 
 		$args = [
 			'posts_per_page' => 1,
@@ -195,9 +195,9 @@ public static function upload_logo() {
 		}
 
 		$file = wp_upload_bits(
-			'newspack-logo.png',
+			'newspack-logomark.png',
 			null,
-			file_get_contents( NEWSPACK_ABSPATH . 'includes/raw_assets/images/newspack-logo.png' )
+			file_get_contents( NEWSPACK_ABSPATH . 'includes/raw_assets/images/newspack-logomark.png' )
 		);
 
 		if ( ! $file || empty( $file['file'] ) ) {