From f740698dbe06816921d2a20eea876c9ca7b515ed Mon Sep 17 00:00:00 2001 From: David Meza Date: Mon, 31 Jul 2017 07:24:13 -0500 Subject: PLT-6486 Add an `@username` button to the profile popover, that puts the username in the post when clicked (#6349) * PLT-6486 Add an `@username` button to the profile popover, that puts the username in the post when clicked * PLT-6486 Display `@username` mention on the right text area on center or RHS. * Disable @mentions from profile popover on searches, mentions and pinned posts. Fix js errors. * Control undefined post in SearchStore that causes an exception. --- webapp/components/user_profile.jsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'webapp/components/user_profile.jsx') diff --git a/webapp/components/user_profile.jsx b/webapp/components/user_profile.jsx index d8549cc7b..d4d900e6a 100644 --- a/webapp/components/user_profile.jsx +++ b/webapp/components/user_profile.jsx @@ -82,6 +82,8 @@ export default class UserProfile extends React.Component { status={this.props.status} isBusy={this.props.isBusy} hide={this.hideProfilePopover} + isRHS={this.props.isRHS} + hasMention={this.props.hasMention} /> } > @@ -99,7 +101,9 @@ UserProfile.defaultProps = { user: {}, overwriteName: '', overwriteImage: '', - disablePopover: false + disablePopover: false, + isRHS: false, + hasMention: false }; UserProfile.propTypes = { user: PropTypes.object, @@ -108,5 +112,7 @@ UserProfile.propTypes = { disablePopover: PropTypes.bool, displayNameType: PropTypes.string, status: PropTypes.string, - isBusy: PropTypes.bool + isBusy: PropTypes.bool, + isRHS: PropTypes.bool, + hasMention: PropTypes.bool }; -- cgit v1.2.3-1-g7c22