summaryrefslogtreecommitdiffstats
path: root/webapp/components/at_mention/index.jsx
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-06-20 15:22:46 -0400
committerGitHub <noreply@github.com>2017-06-20 15:22:46 -0400
commit68ea0abfa665144164041c9421899bfc21412f8a (patch)
tree5d2f2aa5665a084bd1e544d8342e229a8fafc064 /webapp/components/at_mention/index.jsx
parent270fc41c0ffe52266f821748db9fd8b4e9d10b36 (diff)
downloadchat-68ea0abfa665144164041c9421899bfc21412f8a.tar.gz
chat-68ea0abfa665144164041c9421899bfc21412f8a.tar.bz2
chat-68ea0abfa665144164041c9421899bfc21412f8a.zip
PLT-4457 Added AtMention component to better render at mentions (#6563)
* Moved Utils.searchForTerm into an action * Added easier importing of index.jsx files * PLT-4457 Added AtMention component to better render at mentions * Fixed client unit tests * Fixed merge conflict * Fixed merge conflicts
Diffstat (limited to 'webapp/components/at_mention/index.jsx')
-rw-r--r--webapp/components/at_mention/index.jsx27
1 files changed, 27 insertions, 0 deletions
diff --git a/webapp/components/at_mention/index.jsx b/webapp/components/at_mention/index.jsx
new file mode 100644
index 000000000..c733158c6
--- /dev/null
+++ b/webapp/components/at_mention/index.jsx
@@ -0,0 +1,27 @@
+// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+import {connect} from 'react-redux';
+
+import {getUsersByUsername} from 'mattermost-redux/selectors/entities/users';
+
+import {searchForTerm} from 'actions/post_actions.jsx';
+
+import AtMention from './at_mention.jsx';
+
+function mapStateToProps(state, ownProps) {
+ return {
+ ...ownProps,
+ usersByUsername: getUsersByUsername(state)
+ };
+}
+
+function mapDispatchToProps() {
+ return {
+ actions: {
+ searchForTerm
+ }
+ };
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(AtMention);