See pewresearch/pewresearch-org@8949651 from refs/heads/main

includes/apple-news/class-apple-news.php

@@ -29,7 +29,7 @@ public function __construct( $version, $loader ) {
 	public function init($loader = null) {
 		if (null !== $loader) {
 			$loader->add_filter( 'apple_news_exporter_byline', $this, 'get_bylines', 10, 2) ;
-			$loader->add_filter( 'apple_news_skip_push', $this, 'skip_push', 10, 1) ;
+			$loader->add_filter( 'apple_news_skip_push', $this, 'skip_push_on_non_prod_env', 10, 1) ;
 		}
 	}
 
@@ -58,6 +58,6 @@ public function get_bylines($byline, $post_id) {
 	public function skip_push_on_non_prod_env($post_id) {
 		// get the post status for $post_id
 		$post_status = get_post_status($post_id);
-		return 'publish' !== $post_status || 'production' !== wp_get_environment_type();
+		return 'publish' !== $post_status && 'production' !== wp_get_environment_type();
 	}
 }

includes/class-platform.php

@@ -132,6 +132,7 @@ private function load_dependencies() {
 		$this->include('mailchimp/class-mailchimp.php');
 		$this->include('media/class-media.php');
 		$this->include('multisite-post-migration/class-multisite-post-migration.php');
+		$this->include('newsletter/class-newsletter.php');
 		$this->include('permalink-rewrites/class-permalink-rewrites.php');
 		$this->include('post-publish-pipeline/class-post-publish-pipeline.php');
 		$this->include('post-report-package/class-post-report-package.php');
@@ -189,6 +190,7 @@ function() {
 			}
 		);
 		new Multisite_Post_Migration( $this->get_version(), $this->get_loader() );
+		new Newsletter( $this->get_version(), $this->get_loader() );
 		new Permalink_Rewrites( $this->version, $this->get_loader() );
 		new Post_Publish_Pipeline( $this->get_version(), $this->get_loader() );
 		new Post_Report_Package( $this->get_version(), $this->get_loader() );

includes/datasets/src/dataset-description-block/TODO.md

@@ -0,0 +1 @@
+Convert this to use block bindings and the core/paragraph block.

includes/facets/blocks/facet-template/build/block.json

@@ -74,6 +74,9 @@
       "label": "No Label"
     }
   ],
+  "ancestor": [
+    "prc-platform/facets-context-provider"
+  ],
   "textdomain": "facet-template",
   "editorScript": "file:./index.js",
   "editorStyle": "file:./index.css",

includes/facets/blocks/facet-template/build/index.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('prc-block-utils', 'prc-components', 'prc-icons', 'react', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '22abe0797baba7bd9fff');
+<?php return array('dependencies' => array('prc-block-utils', 'prc-components', 'prc-icons', 'react', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '550d3bd91706e2d61871');

includes/facets/blocks/facet-template/facet-template.php

@@ -75,6 +75,13 @@ public function render_dropdown_facet($facet, $inner_blocks) {
 			}
 			$options[] = $opts;
 		}
+		// sort $options such that isSelected are first
+		usort($options, function($a, $b) {
+			if ( $a['isSelected'] === $b['isSelected'] ) {
+				return 0;
+			}
+			return $a['isSelected'] ? -1 : 1;
+		});
 		$field['attrs']['options'] = $options;
 		if (null !== $field_value) {
 			$field['attrs']['value'] = $field_value;
@@ -101,21 +108,33 @@ public function render_checkbox_radio_facet($facet, $inner_blocks) {
 		$field_template = $inner_blocks[0];
 		$content = '';
 		$expanded_content = '';
-		$i = 1;
+		// make sure $selected_choices are first in the $facet_choices array
+		$blocks_to_generate = [];
 		foreach ($facet_choices as $choice) {
 			$field = $field_template;
 			$count = $choice['count'] > 250 ? '250+' : $choice['count'];
 			$field['attrs']['label'] = $choice['label'] . ' (' . $count . ')';
 			$field['attrs']['metadata']['name'] = sanitize_title($choice['label']);
 			$field['attrs']['value'] = $choice['value'];
 			$field['attrs']['defaultChecked'] = in_array($choice['value'], $selected_choices);
+			$blocks_to_generate[] = $field;
+		}
+		// sort it such that the defaultChecked are first
+		usort($blocks_to_generate, function($a, $b) {
+			if ( $a['attrs']['defaultChecked'] === $b['attrs']['defaultChecked'] ) {
+				return 0;
+			}
+			return $a['attrs']['defaultChecked'] ? -1 : 1;
+		});
 
+		$i = 1;
+		foreach ($blocks_to_generate as $block) {
 			$parsed = new WP_Block_Parser_Block(
-				$field['blockName'],
-				$field['attrs'],
-				$field['innerBlocks'],
-				$field['innerHTML'],
-				$field['innerContent']
+				$block['blockName'],
+				$block['attrs'],
+				$block['innerBlocks'],
+				$block['innerHTML'],
+				$block['innerContent']
 			);
 
 			if ( $i > 5 ) {

includes/facets/blocks/facet-template/src/block.json

@@ -71,6 +71,7 @@
 			"label": "No Label"
 		}
 	],
+	"ancestor": [ "prc-platform/facets-context-provider" ],
 	"textdomain": "facet-template",
 	"editorScript": "file:./index.js",
 	"editorStyle": "file:./index.css",

includes/facets/class-facets.php

@@ -31,7 +31,7 @@ class Facets {
 			"show_expanded" => "no",
 			"ghosts" => "yes",
 			"preserve_ghosts" => "no",
-			"operator" => "and",
+			"operator" => "or",
 			"orderby" => "count",
 			"count" => "50",
 			"soft_limit" => "5"