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

Editor: Refactor Post Author component #33695

Merged
merged 9 commits into from
Jul 27, 2021
Merged

Editor: Refactor Post Author component #33695

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
3779e05
Editor: Refactor Post Author component
Mamaduka Jul 26, 2021
99c19ea
Cleanup PostAuthorCheck component
Mamaduka Jul 26, 2021
29cd70b
Only set search query argument when we have filter value
Mamaduka Jul 27, 2021
0c18516
Update check component unit tests
Mamaduka Jul 27, 2021
3f06b0f
Don't set post author name as search value on mount
Mamaduka Jul 27, 2021
5ce07f2
Decode entities in author names
Mamaduka Jul 27, 2021
36e7d2c
Add explaining comment for the need of context 'view'
Mamaduka Jul 27, 2021
c505b46
Refactor PostAuthorCheck to use hooks
Mamaduka Jul 27, 2021
04c1add
Don't map values inside useSelect to avoid rerendering
Mamaduka Jul 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
9 changes: 5 additions & 4 deletions packages/editor/src/components/post-author/check.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,16 @@ import { store as coreStore } from '@wordpress/core-data';
/**
* Internal dependencies
*/
import { AUTHORS_QUERY } from './constants';
import PostTypeSupportCheck from '../post-type-support-check';
import { store as editorStore } from '../../store';

export function PostAuthorCheck( {
hasAssignAuthorAction,
authors,
hasAuthors,
children,
} ) {
if ( ! hasAssignAuthorAction || ! authors || 1 >= authors.length ) {
if ( ! hasAssignAuthorAction || ! hasAuthors ) {
return null;
}

Expand All @@ -35,14 +36,14 @@ export function PostAuthorCheck( {
export default compose( [
youknowriad marked this conversation as resolved.
Show resolved Hide resolved
withSelect( ( select ) => {
const post = select( editorStore ).getCurrentPost();
const authors = select( coreStore ).getUsers( AUTHORS_QUERY );
return {
hasAssignAuthorAction: get(
post,
[ '_links', 'wp:action-assign-author' ],
false
),
postType: select( editorStore ).getCurrentPostType(),
Copy link
Member Author

Choose a reason for hiding this comment

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

We weren't using this prop in PostAuthorCheck.

authors: select( coreStore ).getAuthors(),
hasAuthors: authors?.length >= 1,
};
} ),
withInstanceId,
Expand Down
22 changes: 12 additions & 10 deletions packages/editor/src/components/post-author/combobox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,29 @@ import { store as coreStore } from '@wordpress/core-data';
/**
* Internal dependencies
*/
import { AUTHORS_QUERY } from './constants';
import { store as editorStore } from '../../store';

function PostAuthorCombobox() {
const [ fieldValue, setFieldValue ] = useState();

const { authorId, isLoading, authors, postAuthor } = useSelect(
( select ) => {
const { __unstableGetAuthor, getAuthors, isResolving } = select(
coreStore
);
const { getUser, getUsers, isResolving } = select( coreStore );
const { getEditedPostAttribute } = select( editorStore );
const author = __unstableGetAuthor(
getEditedPostAttribute( 'author' )
);
const query =
! fieldValue || '' === fieldValue ? {} : { search: fieldValue };
const author = getUser( getEditedPostAttribute( 'author' ), {
context: 'view',
} );
const query = {
search: ! fieldValue ? undefined : fieldValue,
...AUTHORS_QUERY,
};

return {
authorId: getEditedPostAttribute( 'author' ),
postAuthor: author,
authors: getAuthors( query ),
isLoading: isResolving( 'core', 'getAuthors', [ query ] ),
authors: getUsers( query ),
isLoading: isResolving( 'core', 'getUsers', [ query ] ),
};
},
[ fieldValue ]
Expand Down
6 changes: 6 additions & 0 deletions packages/editor/src/components/post-author/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export const AUTHORS_QUERY = {
who: 'authors',
per_page: 50,
Copy link
Member Author

@Mamaduka Mamaduka Jul 27, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

I changed the "per_page" argument from 100 to 50. However, I don't think this number makes a big difference when used with ComboboxControl. It just needs to be higher than 25 and reasonable :)

Happy to revert it if needed.

_fields: 'id,name',
context: 'view',
youknowriad marked this conversation as resolved.
Show resolved Hide resolved
};
5 changes: 3 additions & 2 deletions packages/editor/src/components/post-author/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ import { store as coreStore } from '@wordpress/core-data';
*/
import PostAuthorCombobox from './combobox';
import PostAuthorSelect from './select';
import { AUTHORS_QUERY } from './constants';

const minimumUsersForCombobox = 25;

function PostAuthor() {
const showCombobox = useSelect( ( select ) => {
// Not using `getUsers()` because it requires `list_users` capability.
const authors = select( coreStore ).getAuthors();
youknowriad marked this conversation as resolved.
Show resolved Hide resolved
const authors = select( coreStore ).getUsers( AUTHORS_QUERY );

return authors?.length >= minimumUsersForCombobox;
}, [] );

Expand Down
4 changes: 3 additions & 1 deletion packages/editor/src/components/post-author/select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@ import { store as coreStore } from '@wordpress/core-data';
* Internal dependencies
*/
import { store as editorStore } from '../../store';
import { AUTHORS_QUERY } from './constants';

function PostAuthorSelect() {
const { editPost } = useDispatch( editorStore );
const { postAuthor, authors } = useSelect( ( select ) => {
const authorsFromAPI = select( coreStore ).getAuthors();
const authorsFromAPI = select( coreStore ).getUsers( AUTHORS_QUERY );

return {
postAuthor: select( editorStore ).getEditedPostAttribute(
'author'
Expand Down