See pewresearch/pewresearch-org@d85966d from refs/heads/release/5.0-u…

…rl-rewrites

.github/workflows/on-deploy__build-docs.yml

@@ -4,7 +4,7 @@ name: Deploy static ./.docs content to GitHub Pages
 on:
   # Runs on pushes targeting the default branch
   push:
-    branches: ["main"]
+    branches: ["develop"]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

includes/block-area-modules/blocks/block-area-context-provider/block-area-context-provider.php

@@ -83,7 +83,7 @@ public function execute_block_context( $context, $parsed_block, $parent_block_ob
 
 			$query_args = $context['query'] ?? array();
 
-			$default_pub_listing_args = apply_filters('prc_platform_pub_listing_default_args', null);
+			$default_pub_listing_args = apply_filters('prc_platform_pub_listing_default_args', array());
 
 			// change the snake_case keys to camelCase
 			$default_pub_listing_args = array_combine(array_map(function($key) {

includes/datasets/class-datasets.php

@@ -145,23 +145,9 @@ public function init($loader) {
 			$loader->add_action( 'init', $download_logger, 'register_meta' );
 			$loader->add_action( 'rest_api_init', $download_logger, 'register_field' );
 			$loader->add_filter( 'prc_api_endpoints', $download_logger, 'register_download_logger_endpoint' );
-			// $loader->add_filter('prc_platform_pub_listing_default_args', 'filter_pub_listing_query_args', 10, 1);
 		}
 	}
 
-	/**
-	 * @hook prc_platform_pub_listing_default_args
-	 * @param mixed $query
-	 * @return mixed
-	 */
-	public function filter_pub_listing_query_args($query) {
-		if ( is_admin() || !is_array($query) ) {
-			return $query;
-		}
-		do_action('qm/debug', print_r($query, true));
-		return $query;
-	}
-
 	/**
 	 * Register the dataset post type and taxonomy and establish a relationship between them.
 	 * @hook init

includes/decoded/class-decoded.php

@@ -80,8 +80,8 @@ public function register_type() {
 			'label'               => __( 'Decoded', 'text_domain' ),
 			'description'         => __( 'A post type for Decoded blog posts.', 'text_domain' ),
 			'labels'              => $labels,
-			'supports'            => array( 'title', 'editor', 'excerpt', 'author', 'thumbnail', 'revisions', 'custom-fields' ),
-			'taxonomies'          => array( 'category', 'research-teams', 'collection', 'languages', 'formats' ),
+			'supports'            => array( 'title', 'editor', 'excerpt', 'author', 'thumbnail', 'revisions' ),
+			'taxonomies'          => array( 'formats' ),
 			'hierarchical'        => false,
 			'public'              => true,
 			'show_ui'             => true,

includes/gutenberg/class-gutenberg.php

@@ -76,7 +76,6 @@ public function load_gutenberg( $use_block_editor, $post ) {
 	/**
 	 * Enable revisions for reusable blocks.
 	 * @hook init
-	 * @TODO: Look into this, I'm pretty sure a recent Gutenberg release defaulted to this.
 	 */
 	public function add_revisions_to_reusable_blocks() {
 		add_post_type_support( 'wp_block', 'revisions' );
@@ -92,8 +91,12 @@ public function group_admin_menus_together( $menu_order ) {
 		$new_menu_order = array();
 
 		$reorder = array(
-			'edit.php?post_type=block_module',
-			'edit.php?post_type=wp_block',
+			'edit.php?post_type=topic-page', // Legacy
+			'edit.php?post_type=template-block', // Legacy
+			'edit.php?post_type=block_module', // New
+			'edit.php?post_type=wp_block', // Core Patterns
+			'edit.php?post_type=blockmeister_pattern', // Block Meister Patterns
+			'admin.php?page=blockmeister', // Block Meister Settings
 		);
 
 		foreach ( $menu_order as $index => $item ) {

includes/homepages/class-homepages.php

@@ -205,8 +205,8 @@ public function add_front_page_quick_edit( $admin_bar ) {
 			$admin_bar->remove_menu( 'edit' );
 			$admin_bar->add_menu(
 				array(
-					'id'    => 'edit',
-					'title' => __( 'Edit Homepage' ),
+					'id'    => 'edit-homepage',
+					'title' => '<span class="ab-icon dashicons dashicons-admin-home"></span>' . _( 'Edit Homepage' ),
 					'href'  => $link,
 					'meta'  => array(
 						'title' => __( 'Edit Homepage' ),

includes/interactives/blocks/loader-block/build/block.json

@@ -30,6 +30,26 @@
           "type": "string"
         },
         "deps": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      }
+    },
+    "legacyAssetsS3": {
+      "type": "object",
+      "properties": {
+        "path": {
+          "type": "string"
+        },
+        "react": {
+          "type": "string"
+        },
+        "libraries": {
+          "type": "string"
+        },
+        "styles": {
           "type": "string"
         }
       }
@@ -49,6 +69,5 @@
     "postType"
   ],
   "textdomain": "prc-platform-interactive-loader",
-  "editorScript": "file:./index.js",
-  "style": "file:./style-index.css"
+  "editorScript": "file:./index.js"
 }

includes/interactives/blocks/loader-block/build/index.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('prc-components', 'react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => '8b748b48794fa4d2e372');
+<?php return array('dependencies' => array('prc-components', 'react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-element', 'wp-i18n', 'wp-polyfill', 'wp-primitives'), 'version' => '7f7c92b447cefccfda24');