Merge pull request #181 from alleyinteractive/feature/LEDE-2719/updat…

…e-newsletter-builder-and-fixes

LEDE-2719: Update Newsletter Builder Version + Minor Fixes

blocks/button/index.php

@@ -13,15 +13,6 @@
  * @see https://developer.wordpress.org/reference/functions/register_block_type/
  */
 function wp_newsletter_builder_button_block_init(): void {
-	/**
-	 * Filters whether to register the block.
-	 *
-	 * @param bool   $register Whether to register the block. Default true.
-	 * @param string $name     Block name.
-	 */
-	if ( ! apply_filters( 'wp_newsletter_builder_register_block', true, 'button' ) ) {
-		return;
-	}
 	// Register the block by passing the location of block.json.
 	register_block_type(
 		__DIR__

blocks/divider/index.php

@@ -13,15 +13,6 @@
  * @see https://developer.wordpress.org/reference/functions/register_block_type/
  */
 function wp_newsletter_builder_divider_block_init(): void {
-	/**
-	 * Filters whether to register the block.
-	 *
-	 * @param bool   $register Whether to register the block. Default true.
-	 * @param string $name     Block name.
-	 */
-	if ( ! apply_filters( 'wp_newsletter_builder_register_block', true, 'divider' ) ) {
-		return;
-	}
 	// Register the block by passing the location of block.json.
 	register_block_type(
 		__DIR__

blocks/email-settings/edit.tsx

@@ -188,6 +188,7 @@ export default function Edit() {
           value={suppressionGroup}
           options={suppressionLists.map((item) => ({ label: item.Name, value: item.ListID }))}
           onChange={(newValue: string) => setMeta({ nb_newsletter_suppression_group: newValue })}
+          required
         />
       ) : (
         /* @ts-ignore */

blocks/email-settings/index.php

@@ -13,15 +13,6 @@
  * @see https://developer.wordpress.org/reference/functions/register_block_type/
  */
 function wp_newsletter_builder_email_settings_block_init(): void {
-	/**
-	 * Filters whether to register the block.
-	 *
-	 * @param bool   $register Whether to register the block. Default true.
-	 * @param string $name     Block name.
-	 */
-	if ( ! apply_filters( 'wp_newsletter_builder_register_block', true, 'email-settings' ) ) {
-		return;
-	}
 	// Register the block by passing the location of block.json.
 	register_block_type(
 		__DIR__

blocks/footer/index.php

@@ -13,15 +13,6 @@
  * @see https://developer.wordpress.org/reference/functions/register_block_type/
  */
 function wp_newsletter_builder_footer_block_init(): void {
-	/**
-	 * Filters whether to register the block.
-	 *
-	 * @param bool   $register Whether to register the block. Default true.
-	 * @param string $name     Block name.
-	 */
-	if ( ! apply_filters( 'wp_newsletter_builder_register_block', true, 'footer' ) ) {
-		return;
-	}
 	// Register the block by passing the location of block.json.
 	register_block_type(
 		__DIR__

blocks/header/index.php

@@ -13,15 +13,6 @@
  * @see https://developer.wordpress.org/reference/functions/register_block_type/
  */
 function wp_newsletter_builder_header_block_init(): void {
-	/**
-	 * Filters whether to register the block.
-	 *
-	 * @param bool   $register Whether to register the block. Default true.
-	 * @param string $name     Block name.
-	 */
-	if ( ! apply_filters( 'wp_newsletter_builder_register_block', true, 'header' ) ) {
-		return;
-	}
 	// Register the block by passing the location of block.json.
 	register_block_type(
 		__DIR__

blocks/heading/index.php

@@ -13,15 +13,6 @@
  * @see https://developer.wordpress.org/reference/functions/register_block_type/
  */
 function wp_newsletter_builder_heading_block_init(): void {
-	/**
-	 * Filters whether to register the block.
-	 *
-	 * @param bool   $register Whether to register the block. Default true.
-	 * @param string $name     Block name.
-	 */
-	if ( ! apply_filters( 'wp_newsletter_builder_register_block', true, 'heading' ) ) {
-		return;
-	}
 	// Register the block by passing the location of block.json.
 	register_block_type(
 		__DIR__

blocks/list/index.php

@@ -13,15 +13,6 @@
  * @see https://developer.wordpress.org/reference/functions/register_block_type/
  */
 function wp_newsletter_builder_list_block_init(): void {
-	/**
-	 * Filters whether to register the block.
-	 *
-	 * @param bool   $register Whether to register the block. Default true.
-	 * @param string $name     Block name.
-	 */
-	if ( ! apply_filters( 'wp_newsletter_builder_register_block', true, 'list' ) ) {
-		return;
-	}
 	// Register the block by passing the location of block.json.
 	register_block_type(
 		__DIR__

blocks/paragraph/index.php

@@ -13,15 +13,6 @@
  * @see https://developer.wordpress.org/reference/functions/register_block_type/
  */
 function wp_newsletter_builder_paragraph_block_init(): void {
-	/**
-	 * Filters whether to register the block.
-	 *
-	 * @param bool   $register Whether to register the block. Default true.
-	 * @param string $name     Block name.
-	 */
-	if ( ! apply_filters( 'wp_newsletter_builder_register_block', true, 'paragraph' ) ) {
-		return;
-	}
 	// Register the block by passing the location of block.json.
 	register_block_type(
 		__DIR__

blocks/post-byline/index.php

@@ -13,15 +13,6 @@
  * @see https://developer.wordpress.org/reference/functions/register_block_type/
  */
 function wp_newsletter_builder_post_byline_block_init(): void {
-	/**
-	 * Filters whether to register the block.
-	 *
-	 * @param bool   $register Whether to register the block. Default true.
-	 * @param string $name     Block name.
-	 */
-	if ( ! apply_filters( 'wp_newsletter_builder_register_block', true, 'post-byline' ) ) {
-		return;
-	}
 	// Register the block by passing the location of block.json.
 	register_block_type(
 		__DIR__

blocks/post-content/index.php

@@ -13,15 +13,6 @@
  * @see https://developer.wordpress.org/reference/functions/register_block_type/
  */
 function wp_newsletter_builder_post_content_block_init(): void {
-	/**
-	 * Filters whether to register the block.
-	 *
-	 * @param bool   $register Whether to register the block. Default true.
-	 * @param string $name     Block name.
-	 */
-	if ( ! apply_filters( 'wp_newsletter_builder_register_block', true, 'post-content' ) ) {
-		return;
-	}
 	// Register the block by passing the location of block.json.
 	register_block_type(
 		__DIR__

blocks/post-excerpt/index.php

@@ -13,15 +13,6 @@
  * @see https://developer.wordpress.org/reference/functions/register_block_type/
  */
 function wp_newsletter_builder_post_excerpt_block_init(): void {
-	/**
-	 * Filters whether to register the block.
-	 *
-	 * @param bool   $register Whether to register the block. Default true.
-	 * @param string $name     Block name.
-	 */
-	if ( ! apply_filters( 'wp_newsletter_builder_register_block', true, 'post-excerpt' ) ) {
-		return;
-	}
 	// Register the block by passing the location of block.json.
 	register_block_type(
 		__DIR__

blocks/post-featured-image/index.php

@@ -13,15 +13,6 @@
  * @see https://developer.wordpress.org/reference/functions/register_block_type/
  */
 function wp_newsletter_builder_post_featured_image_block_init(): void {
-	/**
-	 * Filters whether to register the block.
-	 *
-	 * @param bool   $register Whether to register the block. Default true.
-	 * @param string $name     Block name.
-	 */
-	if ( ! apply_filters( 'wp_newsletter_builder_register_block', true, 'post-featured-image' ) ) {
-		return;
-	}
 	// Register the block by passing the location of block.json.
 	register_block_type(
 		__DIR__

blocks/post-item/index.php

@@ -13,15 +13,6 @@
  * @see https://developer.wordpress.org/reference/functions/register_block_type/
  */
 function wp_newsletter_builder_post_item_block_init(): void {
-	/**
-	 * Filters whether to register the block.
-	 *
-	 * @param bool   $register Whether to register the block. Default true.
-	 * @param string $name     Block name.
-	 */
-	if ( ! apply_filters( 'wp_newsletter_builder_register_block', true, 'post-item' ) ) {
-		return;
-	}
 	// Register the block by passing the location of block.json.
 	register_block_type(
 		__DIR__

blocks/post-read-more/index.php

@@ -13,15 +13,6 @@
  * @see https://developer.wordpress.org/reference/functions/register_block_type/
  */
 function wp_newsletter_builder_post_read_more_block_init(): void {
-	/**
-	 * Filters whether to register the block.
-	 *
-	 * @param bool   $register Whether to register the block. Default true.
-	 * @param string $name     Block name.
-	 */
-	if ( ! apply_filters( 'wp_newsletter_builder_register_block', true, 'post-read-more' ) ) {
-		return;
-	}
 	// Register the block by passing the location of block.json.
 	register_block_type(
 		__DIR__

blocks/post-title/index.php

@@ -13,15 +13,6 @@
  * @see https://developer.wordpress.org/reference/functions/register_block_type/
  */
 function wp_newsletter_builder_post_title_block_init(): void {
-	/**
-	 * Filters whether to register the block.
-	 *
-	 * @param bool   $register Whether to register the block. Default true.
-	 * @param string $name     Block name.
-	 */
-	if ( ! apply_filters( 'wp_newsletter_builder_register_block', true, 'post-title' ) ) {
-		return;
-	}
 	// Register the block by passing the location of block.json.
 	register_block_type(
 		__DIR__

blocks/post/index.php

@@ -13,15 +13,6 @@
  * @see https://developer.wordpress.org/reference/functions/register_block_type/
  */
 function wp_newsletter_builder_post_block_init(): void {
-	/**
-	 * Filters whether to register the block.
-	 *
-	 * @param bool   $register Whether to register the block. Default true.
-	 * @param string $name     Block name.
-	 */
-	if ( ! apply_filters( 'wp_newsletter_builder_register_block', true, 'post' ) ) {
-		return;
-	}
 	// Register the block by passing the location of block.json.
 	register_block_type(
 		__DIR__

blocks/section/index.php

@@ -13,15 +13,6 @@
  * @see https://developer.wordpress.org/reference/functions/register_block_type/
  */
 function wp_newsletter_builder_section_block_init(): void {
-	/**
-	 * Filters whether to register the block.
-	 *
-	 * @param bool   $register Whether to register the block. Default true.
-	 * @param string $name     Block name.
-	 */
-	if ( ! apply_filters( 'wp_newsletter_builder_register_block', true, 'section' ) ) {
-		return;
-	}
 	// Register the block by passing the location of block.json.
 	register_block_type(
 		__DIR__

blocks/two-up-post/index.php

@@ -13,15 +13,6 @@
  * @see https://developer.wordpress.org/reference/functions/register_block_type/
  */
 function wp_newsletter_builder_two_up_post_block_init(): void {
-	/**
-	 * Filters whether to register the block.
-	 *
-	 * @param bool   $register Whether to register the block. Default true.
-	 * @param string $name     Block name.
-	 */
-	if ( ! apply_filters( 'wp_newsletter_builder_register_block', true, 'two-up-post' ) ) {
-		return;
-	}
 	// Register the block by passing the location of block.json.
 	register_block_type(
 		__DIR__

plugin.php

@@ -3,7 +3,7 @@
  * Plugin Name: Newsletter Builder
  * Plugin URI: https://github.com/alleyinteractive/wp-newsletter-builder
  * Description: Interface to manage email newsletters
- * Version: 0.4.1
+ * Version: 0.4.2
  * Author: Alley Interactive
  * Author URI: https://github.com/alleyinteractive/wp-newsletter-builder
  * Requires at least: 6.2

plugins/pre-publish-checks/pre-publish-panel.tsx

@@ -1,24 +1,40 @@
 import { PluginPrePublishPanel } from '@wordpress/edit-post';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
+import { usePostMetaValue } from '@alleyinteractive/block-editor-tools';
+
+const SUPPRESSION_ID_LOCK = 'suppression-group-id-lock';
+const TITLE_LOCK = 'title-empty-lock';
 
 function PrePublishPanel() {
   // @ts-ignore
   const postTitle = useSelect((select) => select('core/editor').getEditedPostAttribute('title'));
+  const [supressionGroupId] = usePostMetaValue('nb_newsletter_suppression_group');
   const isTitleOk = postTitle.trim().length > 0;
 
   const { lockPostSaving, unlockPostSaving } = useDispatch('core/editor');
   const { createWarningNotice, removeNotice } = useDispatch('core/notices');
 
   if (!isTitleOk) {
-    lockPostSaving('title-empty-lock');
+    lockPostSaving(TITLE_LOCK);
     createWarningNotice(
       __('Please enter a newsletter title before publishing.', 'wp-newsletter-builder'),
-      { id: 'title-empty-lock', isDismissible: false },
+      { id: TITLE_LOCK, isDismissible: false },
+    );
+  } else {
+    unlockPostSaving(TITLE_LOCK);
+    removeNotice(TITLE_LOCK);
+  }
+
+  if (!supressionGroupId) {
+    lockPostSaving(SUPPRESSION_ID_LOCK);
+    createWarningNotice(
+      __('Please select a suppression group before publishing.', 'wp-newsletter-builder'),
+      { id: SUPPRESSION_ID_LOCK, isDismissible: false },
     );
   } else {
-    unlockPostSaving('title-empty-lock');
-    removeNotice('title-empty-lock');
+    unlockPostSaving(SUPPRESSION_ID_LOCK);
+    removeNotice(SUPPRESSION_ID_LOCK);
   }
 
   return (
@@ -31,6 +47,11 @@ function PrePublishPanel() {
           ? __('All headline requirements are met.', 'wp-newsletter-builder')
           : __('Headline is required before publishing.', 'wp-newsletter-builder')}
       </p>
+      <p>
+        {supressionGroupId
+          ? __('Suppression group selected.', 'wp-newsletter-builder')
+          : __('Suppression group is required before publishing.', 'wp-newsletter-builder')}
+      </p>
     </PluginPrePublishPanel>
   );
 }