From f740698dbe06816921d2a20eea876c9ca7b515ed Mon Sep 17 00:00:00 2001
From: David Meza <dmeza@users.noreply.github.com>
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/post_view/post/post.jsx          |  1 +
 .../components/post_view/post_body/post_body.jsx   |  1 +
 .../post_view/post_header/post_header.jsx          |  1 +
 .../post_message_view/post_message_view.jsx        | 24 +++++++++++++++++++---
 4 files changed, 24 insertions(+), 3 deletions(-)

(limited to 'webapp/components/post_view')

diff --git a/webapp/components/post_view/post/post.jsx b/webapp/components/post_view/post/post.jsx
index 4491d888c..25d23c690 100644
--- a/webapp/components/post_view/post/post.jsx
+++ b/webapp/components/post_view/post/post.jsx
@@ -210,6 +210,7 @@ export default class Post extends React.PureComponent {
                 status={status}
                 user={this.props.user}
                 isBusy={this.props.isBusy}
+                hasMention={true}
             />
         );
 
diff --git a/webapp/components/post_view/post_body/post_body.jsx b/webapp/components/post_view/post_body/post_body.jsx
index 2f8f86d82..d21192330 100644
--- a/webapp/components/post_view/post_body/post_body.jsx
+++ b/webapp/components/post_view/post_body/post_body.jsx
@@ -163,6 +163,7 @@ export default class PostBody extends React.PureComponent {
                     lastPostCount={this.props.lastPostCount}
                     post={this.props.post}
                     compactDisplay={this.props.compactDisplay}
+                    hasMention={true}
                 />
             </div>
         );
diff --git a/webapp/components/post_view/post_header/post_header.jsx b/webapp/components/post_view/post_header/post_header.jsx
index 562bd2b82..0715f047c 100644
--- a/webapp/components/post_view/post_header/post_header.jsx
+++ b/webapp/components/post_view/post_header/post_header.jsx
@@ -91,6 +91,7 @@ export default class PostHeader extends React.PureComponent {
                 displayNameType={this.props.displayNameType}
                 status={this.props.status}
                 isBusy={this.props.isBusy}
+                hasMention={true}
             />
         );
         let botIndicator;
diff --git a/webapp/components/post_view/post_message_view/post_message_view.jsx b/webapp/components/post_view/post_message_view/post_message_view.jsx
index 1c6035df9..348748450 100644
--- a/webapp/components/post_view/post_message_view/post_message_view.jsx
+++ b/webapp/components/post_view/post_message_view/post_message_view.jsx
@@ -66,12 +66,24 @@ export default class PostMessageView extends React.PureComponent {
         /**
          * Set to render post body compactly
          */
-        compactDisplay: PropTypes.bool
+        compactDisplay: PropTypes.bool,
+
+        /**
+         * Flags if the post_message_view is for the RHS (Reply).
+         */
+        isRHS: PropTypes.bool,
+
+        /**
+         * Flags if the post_message_view is for the RHS (Reply).
+         */
+        hasMention: PropTypes.bool
     };
 
     static defaultProps = {
         options: {},
-        mentionKeys: []
+        mentionKeys: [],
+        isRHS: false,
+        hasMention: false
     };
 
     renderDeletedPost() {
@@ -116,7 +128,13 @@ export default class PostMessageView extends React.PureComponent {
                 processNode: (node) => {
                     const mentionName = node.attribs[attrib];
 
-                    return <AtMention mentionName={mentionName}/>;
+                    return (
+                        <AtMention
+                            mentionName={mentionName}
+                            isRHS={this.props.isRHS}
+                            hasMention={this.props.hasMention}
+                        />
+                    );
                 }
             },
             {
-- 
cgit v1.2.3-1-g7c22