.my-class, #my-id',
+ ),
+ 'required' => false,
+ ],
];
// Add the groups.
$this->groups = [
- 'alerts' => [
+ 'alerts' => [
'label' => __( 'Alerts', 'apple-news' ),
'settings' => [ 'component_alerts' ],
],
- 'images' => [
+ 'images' => [
'label' => __( 'Image Settings', 'apple-news' ),
'settings' => [ 'use_remote_images', 'full_bleed_images' ],
],
- 'format' => [
+ 'cover' => [
+ 'label' => __( 'Cover Media Settings', 'apple-news' ),
+ 'settings' => [ 'deduplicate_cover_media' ],
+ ],
+ 'format' => [
'label' => __( 'Format Settings', 'apple-news' ),
'settings' => [ 'html_support', 'in_article_position' ],
],
- 'aside' => [
+ 'aside' => [
'label' => __( 'Aside Component', 'apple-news' ),
'settings' => [ 'aside_component_class' ],
],
+ 'recipe' => [
+ 'label' => __( 'Recipe Component', 'apple-news' ),
+ 'settings' => [ 'recipe_component_class', 'recipe_component_use_schema' ],
+ ],
+ 'selectors' => [
+ 'label' => __( 'Excluded Elements', 'apple-news' ),
+ 'settings' => [ 'excluded_selectors' ],
+ ],
];
parent::__construct( $page );
diff --git a/admin/settings/class-admin-apple-settings-section.php b/admin/settings/class-admin-apple-settings-section.php
index a96aab801..2954abbd8 100644
--- a/admin/settings/class-admin-apple-settings-section.php
+++ b/admin/settings/class-admin-apple-settings-section.php
@@ -135,6 +135,7 @@ class Admin_Apple_Settings_Section extends Apple_News {
'b' => [],
'strong' => [],
'i' => [],
+ 'code' => [],
'em' => [],
'a' => [
'href' => [],
diff --git a/apple-news.php b/apple-news.php
index 4d0f01a8c..d0f1f05de 100644
--- a/apple-news.php
+++ b/apple-news.php
@@ -3,7 +3,7 @@
* Plugin Name: Publish To Apple News
* Plugin URI: http://github.com/alleyinteractive/apple-news
* Description: Export and sync posts to Apple format.
- * Version: 2.6.3
+ * Version: 2.7.0
* Author: Alley
* Author URI: https://alley.com
* Text Domain: apple-news
diff --git a/assets/js/admin-settings/index.jsx b/assets/js/admin-settings/index.jsx
index ada1ca8f0..dcb463a47 100644
--- a/assets/js/admin-settings/index.jsx
+++ b/assets/js/admin-settings/index.jsx
@@ -23,6 +23,14 @@ function AdminSettings() {
const { apple_news_automation: ruleList } = settings;
const { fields } = AppleNewsAutomationConfig;
+ if (!ruleList) {
+ return null;
+ }
+
+ const LINK_SECTIONS = 'links.sections';
+ const allFieldsButSections = Object.keys(fields).filter((field) => field !== LINK_SECTIONS);
+ const sectionsOnly = [LINK_SECTIONS];
+
/**
* Helper function for pushing to in-memory settings inside useSiteOptions.
* @param {array} updatedRules - The new array of rules.
@@ -33,12 +41,13 @@ function AdminSettings() {
/**
* Adds a new empty rule to the end of the list.
+ * @param {string} field - The field to add a rule for.
*/
- const addRule = () => {
+ const addRule = (field = '') => {
updateSettings([
...(ruleList ?? []),
{
- field: '',
+ field,
taxonomy: '',
term_id: 0,
value: '',
@@ -75,11 +84,103 @@ function AdminSettings() {
updateSettings(updatedRules);
};
+ /**
+ * Generates a rule component.
+ * @param {object} item - The rule object.
+ * @param {number} index - The index of the rule.
+ * @return {React.JSX.Element}
+ */
+ const generateRule = (item, index) => {
+ const hideFieldTypes = item.field === LINK_SECTIONS ? allFieldsButSections : sectionsOnly;
+ const hideColumns = item.field === LINK_SECTIONS ? ['field'] : [];
+
+ return (
+ {__('Apple News Automation', 'apple-news')}
{__('Configure automation rules below to automatically apply certain settings based on the taxonomy terms applied to each post.', 'apple-news')}
-{__('For more information on how automation works, visit our wiki.', 'apple-news')}
++ {__('For more information on how automation works, visit our wiki.', 'apple-news')} +
+{__('Section Mapping Automation', 'apple-news')}
+| {__('Taxonomy', 'apple-news')} | +{__('Term', 'apple-news')} | +{__('Section', 'apple-news')} | +{__('Delete?', 'apple-news')} | +
|---|
+
+
+
+ {' '}
+
+
+ +
{__('Additional Automation', 'apple-news')}
diff --git a/assets/js/admin-settings/rule.jsx b/assets/js/admin-settings/rule.jsx
index 7ff51878f..e06b0a54d 100644
--- a/assets/js/admin-settings/rule.jsx
+++ b/assets/js/admin-settings/rule.jsx
@@ -21,6 +21,9 @@ function Rule({
taxonomy,
termId,
value,
+ index,
+ hideFieldTypes,
+ hideColumns,
}) {
const {
fields,
@@ -43,132 +46,178 @@ function Rule({
fieldType = 'string';
}
+ /**
+ * Get field type options.
+ */
+ const getFieldTypes = () => {
+ // Filter out field types that should be hidden.
+ const filteredFieldsObject = Object.keys(fields).reduce((acc, fieldSlug) => {
+ if (!hideFieldTypes.includes(fieldSlug)) {
+ acc[fieldSlug] = fields[fieldSlug];
+ }
+ return acc;
+ }, {});
+
+ return [
+ { value: '', label: __('Select Field', 'apple-news') },
+ ...Object.keys(filteredFieldsObject).map((fieldSlug) => ({
+ label: fields[fieldSlug].label,
+ value: fieldSlug,
+ })),
+ ];
+ };
+
return (
-
- onUpdate('taxonomy', next)}
- options={[
- { value: '', label: __('Select Taxonomy', 'apple-news') },
- ...Object.keys(taxonomies).map((tax) => ({ value: tax, label: tax })),
- ]}
- value={taxonomy}
- />
-
-
- onUpdate('term_id', next)}
- taxonomy={taxonomy}
- termId={termId}
- />
-
-
- onUpdate('field', next)}
- options={[
- { value: '', label: __('Select Field', 'apple-news') },
- ...Object.keys(fields).map((fieldSlug) => ({
- label: fields[fieldSlug].label,
- value: fieldSlug,
- })),
- ]}
- value={field}
- />
-
-
- {fieldType === 'contentGenerationType' ? (
- onUpdate('value', next)}
- options={[
- { value: '', label: __('None', 'apple-news') },
- { value: 'AI', label: __('AI', 'apple-news') },
- ]}
- value={value}
- />
- ) : null}
- {fieldType === 'sections' ? (
- onUpdate('value', next)}
- options={[
- { value: '', label: __('Select Section', 'apple-news') },
- ...sections.map((sect) => ({ value: sect.id, label: sect.name })),
- ]}
- value={value}
- />
- ) : null}
- {fieldType === 'boolean-select' ? (
- onUpdate('value', next)}
- options={[
- { value: '', label: __('Channel Default', 'apple-news') },
- { value: 'true', label: __('True', 'apple-news') },
- { value: 'false', label: __('False', 'apple-news') },
- ]}
- value={value}
- />
- ) : null}
- {fieldType === 'boolean' ? (
- onUpdate('value', next.toString())}
- />
- ) : null}
- {fieldType === 'string' ? (
- onUpdate('value', next)}
- value={value}
- />
- ) : null}
- {fieldType === 'themes' ? (
- onUpdate('value', next)}
- options={[
- { value: '', label: __('Select Theme', 'apple-news') },
- ...themes.map((name) => ({ value: name, label: name })),
- ]}
- value={value}
- />
- ) : null}
-
-
-
-
+ {
+ hideColumns.includes('taxonomy')
+ ? null
+ : (
+
+ onUpdate('taxonomy', next)}
+ options={[
+ { value: '', label: __('Select Taxonomy', 'apple-news') },
+ ...Object.keys(taxonomies).map((tax) => ({ value: tax, label: tax })),
+ ]}
+ value={taxonomy}
+ />
+
+ )
+ }
+ {
+ hideColumns.includes('term') ? null : (
+
+ onUpdate('term_id', next)}
+ taxonomy={taxonomy}
+ termId={termId}
+ />
+
+ )
+ }
+ {
+ hideColumns.includes('field') ? null : (
+
+ onUpdate('field', next)}
+ options={getFieldTypes()}
+ value={field}
+ />
+
+ )
+ }
+ {
+ hideColumns.includes('value') ? null : (
+
+ {fieldType === 'contentGenerationType' ? (
+ onUpdate('value', next)}
+ options={[
+ { value: '', label: __('None', 'apple-news') },
+ { value: 'AI', label: __('AI', 'apple-news') },
+ ]}
+ value={value}
+ />
+ ) : null}
+ {fieldType === 'sections' ? (
+ onUpdate('value', next)}
+ options={[
+ { value: '', label: __('Select Section', 'apple-news') },
+ ...sections.map((sect) => ({ value: sect.id, label: sect.name })),
+ ]}
+ value={value}
+ />
+ ) : null}
+ {fieldType === 'boolean-select' ? (
+ onUpdate('value', next)}
+ options={[
+ { value: '', label: __('Channel Default', 'apple-news') },
+ { value: 'true', label: __('True', 'apple-news') },
+ { value: 'false', label: __('False', 'apple-news') },
+ ]}
+ value={value}
+ />
+ ) : null}
+ {fieldType === 'boolean' ? (
+ onUpdate('value', next.toString())}
+ />
+ ) : null}
+ {fieldType === 'string' ? (
+ onUpdate('value', next)}
+ value={value}
+ />
+ ) : null}
+ {fieldType === 'themes' ? (
+ onUpdate('value', next)}
+ options={[
+ { value: '', label: __('Select Theme', 'apple-news') },
+ ...themes.map((name) => ({ value: name, label: name })),
+ ]}
+ value={value}
+ />
+ ) : null}
+
+ )
+ }
+ {
+ hideColumns.includes('delete') ? null : (
+
+
+
+ )
+ }
);
}
+Rule.defaultProps = {
+ hideColumns: [],
+ hideFieldTypes: [],
+};
+
Rule.propTypes = {
busy: PropTypes.bool.isRequired,
field: PropTypes.string.isRequired,
+ hideColumns: PropTypes.arrayOf(PropTypes.string),
+ hideFieldTypes: PropTypes.arrayOf(PropTypes.string),
+ index: PropTypes.number.isRequired,
onDelete: PropTypes.func.isRequired,
onDragEnd: PropTypes.func.isRequired,
onUpdate: PropTypes.func.isRequired,
diff --git a/assets/js/bulk-export.js b/assets/js/bulk-export.js
index 85752ffc3..c9d71e169 100644
--- a/assets/js/bulk-export.js
+++ b/assets/js/bulk-export.js
@@ -1,10 +1,13 @@
(function ( $, window, undefined ) {
'use strict';
- var started = false;
+ var started = false,
+ searchParams = new URLSearchParams( window.location.search ),
+ $submitButton = $( '.bulk-export-submit' );
function done() {
- $( '.bulk-export-submit' ).text( 'Done' );
+ $submitButton.text( 'Done' );
+ $submitButton.attr( 'disabled', 'disabled' );
}
function pushItem( item, next, nonce ) {
@@ -12,14 +15,14 @@
var $status = $item.find( '.bulk-export-list-item-status' );
var id = +$item.data( 'post-id' ); // fetch the post-id and cast to integer
- $status.removeClass( 'pending' ).addClass( 'in-progress' ).text( 'Publishing...' );
+ $status.removeClass( 'pending' ).addClass( 'in-progress' ).text( 'In Progress…' );
// Send a GET request to ajaxurl, which is WordPress endpoint for AJAX
// requests. Expects JSON as response.
$.getJSON(
ajaxurl,
{
- action: 'push_post',
+ action: searchParams.get( 'action' ),
id: id,
_ajax_nonce: nonce
},
@@ -27,7 +30,7 @@
if ( res.success ) {
$status.removeClass( 'in-progress' ).addClass( 'success' ).text( 'Success' );
} else {
- $status.removeClass( 'in-progress' ).addClass( 'failed' ).text( res.error );
+ $status.removeClass( 'in-progress' ).addClass( 'failed' ).text( res.data );
}
next();
},
@@ -56,7 +59,7 @@
next();
}
- $('.bulk-export-submit').click(function (e) {
+ $submitButton.click( function ( e ) {
e.preventDefault();
if ( started ) {
@@ -65,6 +68,6 @@
started = true;
bulkPush();
- });
+ } );
})( jQuery, window );
diff --git a/assets/js/cover-image.js b/assets/js/cover-image.js
deleted file mode 100644
index 5eb14d23f..000000000
--- a/assets/js/cover-image.js
+++ /dev/null
@@ -1,60 +0,0 @@
-(function ( $, window, undefined ) {
- 'use strict';
-
- // Set up add and remove image functionality.
- $( '.apple-news-coverimage-image-container' ).each( function () {
- var $this = $( this ),
- $addImgButton = $this.find( '.apple-news-coverimage-add' ),
- $delImgButton = $this.find( '.apple-news-coverimage-remove' ),
- $imgContainer = $this.find( '.apple-news-coverimage-image' ),
- $imgIdInput = $this.find( '.apple-news-coverimage-id' ),
- frame;
-
- // Set up handler for remove image functionality.
- $delImgButton.on( 'click', function() {
- $imgContainer.empty();
- $addImgButton.removeClass( 'hidden' );
- $delImgButton.addClass( 'hidden' );
- $imgIdInput.val( '' );
- } );
-
- // Set up handler for add image functionality.
- $addImgButton.on( 'click', function () {
-
- // Open frame, if it already exists.
- if ( frame ) {
- frame.open();
- return;
- }
-
- // Set configuration for media frame.
- frame = wp.media( { multiple: false } );
-
- // Set up handler for image selection.
- frame.on( 'select', function () {
-
- // Get information about the attachment.
- var attachment = frame.state().get( 'selection' ).first().toJSON(),
- imgUrl = attachment.url;
-
- // Set image URL to medium size, if available.
- if ( attachment.sizes.medium && attachment.sizes.medium.url ) {
- imgUrl = attachment.sizes.medium.url;
- }
-
- // Clear current values.
- $imgContainer.empty();
- $imgIdInput.val( '' );
-
- // Add the image and ID, swap visibility of add and remove buttons.
- $imgContainer.append( '
' ); // phpcs:ignore WordPressVIPMinimum.JS.StringConcat.Found, WordPressVIPMinimum.JS.HTMLExecutingFunctions.append
- $imgIdInput.val( attachment.id );
- $addImgButton.addClass( 'hidden' );
- $delImgButton.removeClass( 'hidden' );
- } );
-
- // Open the media frame.
- frame.open();
- } );
- } );
-})( jQuery, window );
diff --git a/assets/js/cover-media.js b/assets/js/cover-media.js
new file mode 100644
index 000000000..50ad4be65
--- /dev/null
+++ b/assets/js/cover-media.js
@@ -0,0 +1,154 @@
+(function ( $, window, undefined ) {
+ 'use strict';
+
+ // Set up show/hide functionality for cover media provider containers.
+ (function () {
+ var $provider = $( '[name="apple_news_cover_media_provider"]' ),
+ $containers = $( '.apple-news-cover-media-provider-container' ),
+ showSelectedContainer = function () {
+ $containers.hide();
+ $containers.filter( '[data-provider="' + $provider.filter( ':checked' ).val() + '"]' ).show();
+ };
+
+ showSelectedContainer();
+ $provider.on( 'change', showSelectedContainer );
+ })();
+
+ // Set up add and remove image functionality.
+ $( '.apple-news-coverimage-image-container' ).each( function () {
+ var $this = $( this ),
+ $addImgButton = $this.find( '.apple-news-coverimage-add' ),
+ $delImgButton = $this.find( '.apple-news-coverimage-remove' ),
+ $imgContainer = $this.find( '.apple-news-coverimage-image' ),
+ $imgIdInput = $this.find( '.apple-news-coverimage-id' ),
+ frame;
+
+ // Set up handler for remove image functionality.
+ $delImgButton.on( 'click', function() {
+ $imgContainer.empty();
+ $addImgButton.removeClass( 'hidden' );
+ $delImgButton.addClass( 'hidden' );
+ $imgIdInput.val( '' );
+ } );
+
+ // Set up handler for add image functionality.
+ $addImgButton.on( 'click', function () {
+
+ // Open frame, if it already exists.
+ if ( frame ) {
+ frame.open();
+ return;
+ }
+
+ // Set configuration for media frame.
+ frame = wp.media( { multiple: false } );
+
+ // Set up handler for image selection.
+ frame.on( 'select', function () {
+
+ // Get information about the attachment.
+ var attachment = frame.state().get( 'selection' ).first().toJSON(),
+ imgUrl = attachment.url;
+
+ // Set image URL to medium size, if available.
+ if ( attachment.sizes.medium && attachment.sizes.medium.url ) {
+ imgUrl = attachment.sizes.medium.url;
+ }
+
+ // Clear current values.
+ $imgContainer.empty();
+ $imgIdInput.val( '' );
+
+ // Add the image and ID, swap visibility of add and remove buttons.
+ $imgContainer.append( '' ); // phpcs:ignore WordPressVIPMinimum.JS.StringConcat.Found, WordPressVIPMinimum.JS.HTMLExecutingFunctions.append
+ $imgIdInput.val( attachment.id );
+ $addImgButton.addClass( 'hidden' );
+ $delImgButton.removeClass( 'hidden' );
+ } );
+
+ // Open the media frame.
+ frame.open();
+ } );
+ } );
+
+ // Set up add and remove video functionality.
+ $( '[data-provider="video_id"]' ).each( function () {
+ var $this = $( this ),
+ $addVideoButton = $this.find( '.apple-news-cover-video-id-add' ),
+ $delVideoButton = $this.find( '.apple-news-cover-video-id-remove' ),
+ $previewContainer = $this.find( '.apple-news-cover-media-video' ),
+ $videoIdInput = $this.find( '[name="apple_news_cover_video_id"]' ),
+ frame;
+
+ // Set up handler for remove functionality.
+ $delVideoButton.on( 'click', function() {
+ $previewContainer.empty();
+ $addVideoButton.removeClass( 'hidden' );
+ $delVideoButton.addClass( 'hidden' );
+ $videoIdInput.val( '' );
+ } );
+
+ // Set up handler for add functionality.
+ $addVideoButton.on( 'click', function () {
+ // Open frame, if it already exists.
+ if ( frame ) {
+ frame.open();
+ return;
+ }
+
+ // Set configuration for media frame.
+ frame = wp.media( {
+ multiple: false,
+ library: {
+ type: 'video/mp4'
+ },
+ } );
+
+ // Set up handler for image selection.
+ frame.on( 'select', function () {
+ // Get information about the attachment.
+ var attachment = frame.state().get( 'selection' ).first().toJSON(),
+ videoUrl = attachment.url;
+
+ // Clear current values.
+ $previewContainer.empty();
+ $videoIdInput.val( '' );
+
+ // Add the preview and ID, swap visibility of add and remove buttons.
+ $previewContainer.append( $( '
+HTML;
+
+ $post_id = self::factory()->post->create( [ 'post_content' => $post_content ] );
+ $json = $this->get_json_for_post( $post_id );
+
+ // There should be a photo component, but there shouldn't be a caption.
+ $this->assertTrue( isset( $json['components'][3]['components'][0]['role'] ) );
+ $this->assertSame( 'photo', $json['components'][3]['components'][0]['role'] );
+ $this->assertFalse( isset( $json['components'][3]['components'][0]['caption'] ) );
+ }
+
+ /**
+ * Test that recipe instructions are expanded from a list of strings.
+ */
+ public function test_recipe_instructions_list_of_strings(): void {
+ // These instructions via https://www.delicious.com.au/recipes/huevos-rancheros-beans/7WDKzQe3.
+ $post_content = <<
+ ' ); // phpcs:ignore WordPressVIPMinimum.JS.StringConcat.Found, WordPressVIPMinimum.JS.HTMLExecutingFunctions.append
- $imgIdInput.val( attachment.id );
- $addImgButton.addClass( 'hidden' );
- $delImgButton.removeClass( 'hidden' );
- } );
-
- // Open the media frame.
- frame.open();
- } );
- } );
-})( jQuery, window );
diff --git a/assets/js/cover-media.js b/assets/js/cover-media.js
new file mode 100644
index 000000000..50ad4be65
--- /dev/null
+++ b/assets/js/cover-media.js
@@ -0,0 +1,154 @@
+(function ( $, window, undefined ) {
+ 'use strict';
+
+ // Set up show/hide functionality for cover media provider containers.
+ (function () {
+ var $provider = $( '[name="apple_news_cover_media_provider"]' ),
+ $containers = $( '.apple-news-cover-media-provider-container' ),
+ showSelectedContainer = function () {
+ $containers.hide();
+ $containers.filter( '[data-provider="' + $provider.filter( ':checked' ).val() + '"]' ).show();
+ };
+
+ showSelectedContainer();
+ $provider.on( 'change', showSelectedContainer );
+ })();
+
+ // Set up add and remove image functionality.
+ $( '.apple-news-coverimage-image-container' ).each( function () {
+ var $this = $( this ),
+ $addImgButton = $this.find( '.apple-news-coverimage-add' ),
+ $delImgButton = $this.find( '.apple-news-coverimage-remove' ),
+ $imgContainer = $this.find( '.apple-news-coverimage-image' ),
+ $imgIdInput = $this.find( '.apple-news-coverimage-id' ),
+ frame;
+
+ // Set up handler for remove image functionality.
+ $delImgButton.on( 'click', function() {
+ $imgContainer.empty();
+ $addImgButton.removeClass( 'hidden' );
+ $delImgButton.addClass( 'hidden' );
+ $imgIdInput.val( '' );
+ } );
+
+ // Set up handler for add image functionality.
+ $addImgButton.on( 'click', function () {
+
+ // Open frame, if it already exists.
+ if ( frame ) {
+ frame.open();
+ return;
+ }
+
+ // Set configuration for media frame.
+ frame = wp.media( { multiple: false } );
+
+ // Set up handler for image selection.
+ frame.on( 'select', function () {
+
+ // Get information about the attachment.
+ var attachment = frame.state().get( 'selection' ).first().toJSON(),
+ imgUrl = attachment.url;
+
+ // Set image URL to medium size, if available.
+ if ( attachment.sizes.medium && attachment.sizes.medium.url ) {
+ imgUrl = attachment.sizes.medium.url;
+ }
+
+ // Clear current values.
+ $imgContainer.empty();
+ $imgIdInput.val( '' );
+
+ // Add the image and ID, swap visibility of add and remove buttons.
+ $imgContainer.append( '' ); // phpcs:ignore WordPressVIPMinimum.JS.StringConcat.Found, WordPressVIPMinimum.JS.HTMLExecutingFunctions.append
+ $imgIdInput.val( attachment.id );
+ $addImgButton.addClass( 'hidden' );
+ $delImgButton.removeClass( 'hidden' );
+ } );
+
+ // Open the media frame.
+ frame.open();
+ } );
+ } );
+
+ // Set up add and remove video functionality.
+ $( '[data-provider="video_id"]' ).each( function () {
+ var $this = $( this ),
+ $addVideoButton = $this.find( '.apple-news-cover-video-id-add' ),
+ $delVideoButton = $this.find( '.apple-news-cover-video-id-remove' ),
+ $previewContainer = $this.find( '.apple-news-cover-media-video' ),
+ $videoIdInput = $this.find( '[name="apple_news_cover_video_id"]' ),
+ frame;
+
+ // Set up handler for remove functionality.
+ $delVideoButton.on( 'click', function() {
+ $previewContainer.empty();
+ $addVideoButton.removeClass( 'hidden' );
+ $delVideoButton.addClass( 'hidden' );
+ $videoIdInput.val( '' );
+ } );
+
+ // Set up handler for add functionality.
+ $addVideoButton.on( 'click', function () {
+ // Open frame, if it already exists.
+ if ( frame ) {
+ frame.open();
+ return;
+ }
+
+ // Set configuration for media frame.
+ frame = wp.media( {
+ multiple: false,
+ library: {
+ type: 'video/mp4'
+ },
+ } );
+
+ // Set up handler for image selection.
+ frame.on( 'select', function () {
+ // Get information about the attachment.
+ var attachment = frame.state().get( 'selection' ).first().toJSON(),
+ videoUrl = attachment.url;
+
+ // Clear current values.
+ $previewContainer.empty();
+ $videoIdInput.val( '' );
+
+ // Add the preview and ID, swap visibility of add and remove buttons.
+ $previewContainer.append( $( '