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

Check for existing of avatar_urls array before trying to return the avatar img part of user autocomplete fragment #18259

Merged
merged 3 commits into from
Jan 16, 2020
Merged

Check for existing of avatar_urls array before trying to return the avatar img part of user autocomplete fragment #18259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d10f97
Check for existing of avatar_urls array before trying to return the a…
Nov 3, 2019
8c716a3
Show avatar dash icon if show avatars is off
Nov 11, 2019
3cf3bd2
Fix unit test
Nov 11, 2019
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
8 changes: 8 additions & 0 deletions packages/editor/src/components/autocompleters/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@
}

.editor-autocompleters__user {
.editor-autocompleters__no-avatar::before {
/* stylelint-disable */
font: normal 20px/1 dashicons;
/* stylelint-enable */
content: "\f110";
margin-right: 5px;
vertical-align: middle;
}
.editor-autocompleters__user-avatar {
margin-right: 8px;
flex-grow: 0;
Expand Down
30 changes: 30 additions & 0 deletions packages/editor/src/components/autocompleters/test/user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
/**
* Internal dependencies
*/
import userCompleter from '../user';

describe( 'user', () => {
describe( 'getOptionLabel', () => {
it( 'should return user details fragment', () => {
const user = {
name: 'Smithers Jones',
slug: 'userSlug',
avatar_urls: { 24: 'http://my.avatar' },
};
const userLabel = userCompleter.getOptionLabel( user );
expect( userLabel[ 0 ] ).toEqual( <img key="avatar" className="editor-autocompleters__user-avatar" alt="" src="http://my.avatar" /> );
expect( userLabel[ 1 ] ).toEqual( <span key="name" className="editor-autocompleters__user-name">Smithers Jones</span> );
expect( userLabel[ 2 ] ).toEqual( <span key="slug" className="editor-autocompleters__user-slug">userSlug</span> );
} );
it( 'should return user details fragment without default avatar dashicon if avatar_urls array not set', () => {
const user = {
name: 'Smithers Jones',
slug: 'userSlug',
};
const userLabel = userCompleter.getOptionLabel( user );
expect( userLabel[ 0 ] ).toEqual( <span className="editor-autocompleters__no-avatar"></span> );
expect( userLabel[ 1 ] ).toEqual( <span key="name" className="editor-autocompleters__user-name">Smithers Jones</span> );
expect( userLabel[ 2 ] ).toEqual( <span key="slug" className="editor-autocompleters__user-slug">userSlug</span> );
} );
} );
} );
6 changes: 5 additions & 1 deletion packages/editor/src/components/autocompleters/user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,12 @@ export default {
return [ user.slug, user.name ];
},
getOptionLabel( user ) {
const avatar = user.avatar_urls && user.avatar_urls[ 24 ] ?
<img key="avatar" className="editor-autocompleters__user-avatar" alt="" src={ user.avatar_urls[ 24 ] } /> :
<span className="editor-autocompleters__no-avatar"></span>;

return [
<img key="avatar" className="editor-autocompleters__user-avatar" alt="" src={ user.avatar_urls[ 24 ] } />,
avatar,
<span key="name" className="editor-autocompleters__user-name">{ user.name }</span>,
<span key="slug" className="editor-autocompleters__user-slug">{ user.slug }</span>,
];
Expand Down