Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add PostFeaturedImage to PrePublishPanel #6563

Merged
merged 9 commits into from
Aug 30, 2021
Merged

Add PostFeaturedImage to PrePublishPanel #6563

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
21498ed
Add PostFeaturedImage to PrePublishPanel
arthur791004 Aug 25, 2021
4d9cf3e
Keep featured image check in pre-publish panel after selected an image
arthur791004 Aug 26, 2021
88edc04
Fix tests
arthur791004 Aug 27, 2021
3938ae8
Simplify PrePublishPanel because we already applied filter to PostFea…
arthur791004 Aug 27, 2021
a3f904a
Update comments
pierlon Aug 27, 2021
9761650
Merge branch 'develop' into add/post-featured-image-in-pre-publish-panel
pierlon Aug 27, 2021
ac183ea
Show a warning notice when there are validation errors for the featur…
pierlon Aug 27, 2021
09e81c8
Remove unnecessary constant
pierlon Aug 27, 2021
1fb801e
Place import in correct position
pierlon Aug 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions assets/src/common/components/pre-publish-panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import PropTypes from 'prop-types';
* WordPress dependencies
*/
import { Notice } from '@wordpress/components';
import { PostFeaturedImage } from '@wordpress/editor';
import { PluginPrePublishPanel } from '@wordpress/edit-post';
import { withSelect } from '@wordpress/data';
import { __ } from '@wordpress/i18n';
Expand All @@ -27,28 +28,27 @@ import { validateFeaturedImage } from '../helpers';
*/
const PrePublishPanel = ( { featuredMedia, dimensions, required } ) => {
const errors = validateFeaturedImage( featuredMedia, dimensions, required );

if ( ! errors ) {
return null;
}
const noticeUI = errors ? (
<Notice
status={ required ? 'warning' : 'notice' }
isDismissible={ false }
>
{ errors.map( ( errorMessage, index ) => {
return (
<p key={ `error-${ index }` }>
{ errorMessage }
</p>
);
} ) }
</Notice>
) : null;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just noticed that since the plugin is filtering the PostFeaturedImage component to add the error notice in the Post Settings, we don't need to recreate the notice UI here and instead use the PostFeaturedImage component as is. The parameter annotations for this component (PrePublishPanel) and propTypes object would have to also be adapted of course.

Suggested change
const noticeUI = errors ? (
<Notice
status={ required ? 'warning' : 'notice' }
isDismissible={ false }
>
{ errors.map( ( errorMessage, index ) => {
return (
<p key={ `error-${ index }` }>
{ errorMessage }
</p>
);
} ) }
</Notice>
) : null;

Copy link
Contributor Author

@arthur791004 arthur791004 Aug 27, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great 👍 I've removed lots of code that doesn't need now!


return (
<PluginPrePublishPanel
title={ __( 'Featured Image', 'amp' ) }
initialOpen="true"
>
<Notice
status={ required ? 'warning' : 'notice' }
isDismissible={ false }
>
{ errors.map( ( errorMessage, index ) => {
return (
<p key={ `error-${ index }` }>
{ errorMessage }
</p>
);
} ) }
</Notice>
<PostFeaturedImage noticeUI={ noticeUI } />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion to go along with comment above:

Suggested change
<PostFeaturedImage noticeUI={ noticeUI } />
<PostFeaturedImage />

</PluginPrePublishPanel>
);
};
Expand Down
Loading