@automattic/newspack-blocks 3.0.0 → 3.0.1

package/includes/class-newspack-blocks.php

@@ -1550,6 +1550,9 @@ class Newspack_Blocks {
 	 * @return string
 	 */
 	public static function get_formatted_amount( $amount = 0, $frequency = 'day', $hide_once_label = false ) {
+		if ( ! function_exists( 'wc_price' ) ) {
+			return $amount;
+		}
 		if ( ! function_exists( 'wcs_price_string' ) ) {
 			return \wc_price( $amount );
 		}

package/newspack-blocks.php

@@ -7,7 +7,7 @@
  * Author URI:      https://newspack.com/
  * Text Domain:     newspack-blocks
  * Domain Path:     /languages
- * Version:         3.0.0
+ * Version:         3.0.1
  *
  * @package         Newspack_Blocks
  */
@@ -15,7 +15,7 @@
 define( 'NEWSPACK_BLOCKS__PLUGIN_FILE', __FILE__ );
 define( 'NEWSPACK_BLOCKS__BLOCKS_DIRECTORY', 'dist/' );
 define( 'NEWSPACK_BLOCKS__PLUGIN_DIR', plugin_dir_path( NEWSPACK_BLOCKS__PLUGIN_FILE ) );
-define( 'NEWSPACK_BLOCKS__VERSION', '3.0.0' );
+define( 'NEWSPACK_BLOCKS__VERSION', '3.0.1' );
 
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks.php';
 require_once NEWSPACK_BLOCKS__PLUGIN_DIR . 'includes/class-newspack-blocks-api.php';

package/package.json

@@ -1,11 +1,11 @@
 {
 	"name": "@automattic/newspack-blocks",
-	"version": "3.0.0",
+	"version": "3.0.1",
 	"author": "Automattic",
 	"devDependencies": {
-		"@rushstack/eslint-patch": "^1.5.1",
-		"@testing-library/dom": "^9.3.3",
-		"@testing-library/user-event": "^14.5.1",
+		"@rushstack/eslint-patch": "^1.7.2",
+		"@testing-library/dom": "^9.3.4",
+		"@testing-library/user-event": "^14.5.2",
 		"@types/lodash": "^4.14.202",
 		"@types/lodash.debounce": "^4.0.9",
 		"eslint": "^7.32.0",

package/src/blocks/homepage-articles/utils.ts

@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { times, isEqual, isUndefined, pick, pickBy } from 'lodash';
+import { times, isEqual, isNull, isUndefined, pick, pickBy } from 'lodash';
 
 /**
  * WordPress dependencies
@@ -117,12 +117,12 @@ export const queryCriteriaFromAttributes = ( attributes: Block[ 'attributes' ] )
 			  }
 			: {
 					postsToShow,
-					categories,
+					categories: validateAttributeCollection( categories ),
 					includeSubcategories,
-					authors,
-					tags,
-					tagExclusions,
-					categoryExclusions,
+					authors: validateAttributeCollection( authors ),
+					tags: validateAttributeCollection( tags ),
+					tagExclusions: validateAttributeCollection( tagExclusions ),
+					categoryExclusions: validateAttributeCollection( categoryExclusions ),
 					customTaxonomyExclusions,
 					customTaxonomies,
 					postType,
@@ -138,6 +138,9 @@ export const queryCriteriaFromAttributes = ( attributes: Block[ 'attributes' ] )
 export const sanitizePostList = ( postList: HomepageArticlesAttributes[ 'specificPosts' ] ) =>
 	postList.map( id => parseInt( id ) ).filter( id => id > 0 );
 
+export const validateAttributeCollection = ( attr: Array< number > ) =>
+	pickBy( attr, ( value: unknown ) => ! isUndefined( value ) && ! isNull( value ) );
+
 /**
  * Each eligible block's attributes can be used to create a posts query.
  * This function is recursively traversing an array of blocks and creating an aray

package/src/components/autocomplete-tokenfield.js

@@ -88,8 +88,12 @@ class AutocompleteTokenField extends Component {
 	 */
 	getValuesForLabels( labels ) {
 		const { validValues } = this.state;
-		return labels.map( label =>
-			Object.keys( validValues ).find( key => validValues[ key ] === label )
+
+		return (
+			labels
+				.map( label => Object.keys( validValues ).find( key => validValues[ key ] === label ) )
+				// It's possible the submitted label doesn't have a corresponding value, so we filter out any undefined values.
+				.filter( value => !! value )
 		);
 	}
 

package/vendor/autoload.php

@@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitdc7748537d8a65e4e90543d7093ea289::getLoader();
+return ComposerAutoloaderInit4ba4b62e2920461868dda110937b637d::getLoader();

package/vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitdc7748537d8a65e4e90543d7093ea289
+class ComposerAutoloaderInit4ba4b62e2920461868dda110937b637d
 {
     private static $loader;
 
@@ -22,12 +22,12 @@ class ComposerAutoloaderInitdc7748537d8a65e4e90543d7093ea289
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitdc7748537d8a65e4e90543d7093ea289', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit4ba4b62e2920461868dda110937b637d', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitdc7748537d8a65e4e90543d7093ea289', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit4ba4b62e2920461868dda110937b637d', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitdc7748537d8a65e4e90543d7093ea289::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit4ba4b62e2920461868dda110937b637d::getInitializer($loader));
 
         $loader->register(true);
 

package/vendor/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitdc7748537d8a65e4e90543d7093ea289
+class ComposerStaticInit4ba4b62e2920461868dda110937b637d
 {
     public static $classMap = array (
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
@@ -13,7 +13,7 @@ class ComposerStaticInitdc7748537d8a65e4e90543d7093ea289
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->classMap = ComposerStaticInitdc7748537d8a65e4e90543d7093ea289::$classMap;
+            $loader->classMap = ComposerStaticInit4ba4b62e2920461868dda110937b637d::$classMap;
 
         }, null, ClassLoader::class);
     }

package/vendor/composer/installed.php

@@ -3,7 +3,7 @@
         'name' => 'automattic/newspack-blocks',
         'pretty_version' => 'dev-trunk',
         'version' => 'dev-trunk',
-        'reference' => '83fa32fc835b8979be2e2cb6998bf7bda0b125d4',
+        'reference' => 'c3c19777300e21ab346333bdd1031615c2f6fabe',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         'automattic/newspack-blocks' => array(
             'pretty_version' => 'dev-trunk',
             'version' => 'dev-trunk',
-            'reference' => '83fa32fc835b8979be2e2cb6998bf7bda0b125d4',
+            'reference' => 'c3c19777300e21ab346333bdd1031615c2f6fabe',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),