summaryrefslogtreecommitdiffstats
path: root/webapp/components/post_view/post_body
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-06-18 14:42:32 -0400
committerGitHub <noreply@github.com>2017-06-18 14:42:32 -0400
commitab67f6e257f6e8f08145a02a7b93550f99641be4 (patch)
treed33d1c58a3d229f7e37db58bc2c397ac3806c503 /webapp/components/post_view/post_body
parent0231e95f1c5a8c42ba97875f0d2301815f552974 (diff)
downloadchat-ab67f6e257f6e8f08145a02a7b93550f99641be4.tar.gz
chat-ab67f6e257f6e8f08145a02a7b93550f99641be4.tar.bz2
chat-ab67f6e257f6e8f08145a02a7b93550f99641be4.zip
PLT-6215 Major post list refactor (#6501)
* Major post list refactor * Fix post and thread deletion * Fix preferences not selecting correctly * Fix military time displaying * Fix UP key for editing posts * Fix ESLint error * Various fixes and updates per feedback * Fix for permalink view * Revert to old scrolling method and various fixes * Add floating timestamp, new message indicator, scroll arrows * Update post loading for focus mode and add visibility limit * Fix pinning posts and a react warning * Add loading UI updates from Asaad * Fix refreshing loop * Temporarily bump post visibility limit * Update infinite scrolling * Remove infinite scrolling
Diffstat (limited to 'webapp/components/post_view/post_body')
-rw-r--r--webapp/components/post_view/post_body/index.js30
-rw-r--r--webapp/components/post_view/post_body/post_body.jsx195
2 files changed, 225 insertions, 0 deletions
diff --git a/webapp/components/post_view/post_body/index.js b/webapp/components/post_view/post_body/index.js
new file mode 100644
index 000000000..37cf114b0
--- /dev/null
+++ b/webapp/components/post_view/post_body/index.js
@@ -0,0 +1,30 @@
+// Copyright (c) 2017 Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+import {connect} from 'react-redux';
+
+import {getUser} from 'mattermost-redux/selectors/entities/users';
+import {get} from 'mattermost-redux/selectors/entities/preferences';
+import {getPost} from 'mattermost-redux/selectors/entities/posts';
+
+import {Preferences} from 'utils/constants.jsx';
+
+import PostBody from './post_body.jsx';
+
+function mapStateToProps(state, ownProps) {
+ let parentPost;
+ let parentPostUser;
+ if (ownProps.post.root_id) {
+ parentPost = getPost(state, ownProps.post.root_id);
+ parentPostUser = getUser(state, parentPost.user_id);
+ }
+
+ return {
+ ...ownProps,
+ parentPost,
+ parentPostUser,
+ previewCollapsed: get(state, Preferences.CATEGORY_DISPLAY_SETTINGS, Preferences.COLLAPSE_DISPLAY, 'false')
+ };
+}
+
+export default connect(mapStateToProps)(PostBody);
diff --git a/webapp/components/post_view/post_body/post_body.jsx b/webapp/components/post_view/post_body/post_body.jsx
new file mode 100644
index 000000000..a60d25760
--- /dev/null
+++ b/webapp/components/post_view/post_body/post_body.jsx
@@ -0,0 +1,195 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+import * as Utils from 'utils/utils.jsx';
+import * as PostUtils from 'utils/post_utils.jsx';
+import {Posts} from 'mattermost-redux/constants';
+
+import CommentedOnFilesMessage from 'components/post_view/commented_on_files_message';
+import FileAttachmentListContainer from 'components/file_attachment_list';
+import PostBodyAdditionalContent from 'components/post_view/post_body_additional_content.jsx';
+import PostMessageContainer from 'components/post_view/post_message_view';
+import ReactionListContainer from 'components/post_view/reaction_list';
+import FailedPostOptions from 'components/post_view/failed_post_options';
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import {FormattedMessage} from 'react-intl';
+
+export default class PostBody extends React.PureComponent {
+ static propTypes = {
+
+ /**
+ * The post to render the body of
+ */
+ post: PropTypes.object.isRequired,
+
+ /**
+ * The parent post of the thread this post is in
+ */
+ parentPost: PropTypes.object,
+
+ /**
+ * The poster of the parent post, if exists
+ */
+ parentPostUser: PropTypes.object,
+
+ /**
+ * The function called when the comment icon is clicked
+ */
+ handleCommentClick: PropTypes.func.isRequired,
+
+ /**
+ * Set to render post body compactly
+ */
+ compactDisplay: PropTypes.bool,
+
+ /**
+ * Set to highlight comment as a mention
+ */
+ isCommentMention: PropTypes.bool,
+
+ /**
+ * Set to collapse image and video previews
+ */
+ previewCollapsed: PropTypes.string,
+
+ /**
+ * Post identifiers for selenium tests
+ */
+ lastPostCount: PropTypes.number
+ }
+
+ render() {
+ const post = this.props.post;
+ const parentPost = this.props.parentPost;
+
+ let comment = '';
+ let postClass = '';
+
+ if (parentPost && this.props.parentPostUser) {
+ const profile = this.props.parentPostUser;
+
+ let apostrophe = '';
+ let name = '...';
+ if (profile != null) {
+ let username = profile.username;
+ if (parentPost.props &&
+ parentPost.props.from_webhook &&
+ parentPost.props.override_username &&
+ global.window.mm_config.EnablePostUsernameOverride === 'true') {
+ username = parentPost.props.override_username;
+ }
+
+ if (username.slice(-1) === 's') {
+ apostrophe = '\'';
+ } else {
+ apostrophe = '\'s';
+ }
+ name = (
+ <a
+ className='theme'
+ onClick={Utils.searchForTerm.bind(null, username)}
+ >
+ {username}
+ </a>
+ );
+ }
+
+ let message = '';
+ if (parentPost.message) {
+ message = Utils.replaceHtmlEntities(parentPost.message);
+ } else if (parentPost.file_ids && parentPost.file_ids.length > 0) {
+ message = (
+ <CommentedOnFilesMessage
+ parentPostId={parentPost.id}
+ />
+ );
+ }
+
+ comment = (
+ <div className='post__link'>
+ <span>
+ <FormattedMessage
+ id='post_body.commentedOn'
+ defaultMessage='Commented on {name}{apostrophe} message: '
+ values={{
+ name,
+ apostrophe
+ }}
+ />
+ <a
+ className='theme'
+ onClick={this.props.handleCommentClick}
+ >
+ {message}
+ </a>
+ </span>
+ </div>
+ );
+ }
+
+ let failedOptions;
+ if (this.props.post.failed) {
+ postClass += ' post--fail';
+ failedOptions = <FailedPostOptions post={this.props.post}/>;
+ }
+
+ if (PostUtils.isEdited(this.props.post)) {
+ postClass += ' post--edited';
+ }
+
+ let fileAttachmentHolder = null;
+ if (((post.file_ids && post.file_ids.length > 0) || (post.filenames && post.filenames.length > 0)) && this.props.post.state !== Posts.POST_DELETED) {
+ fileAttachmentHolder = (
+ <FileAttachmentListContainer
+ post={post}
+ compactDisplay={this.props.compactDisplay}
+ />
+ );
+ }
+
+ const messageWrapper = (
+ <div
+ key={`${post.id}_message`}
+ id={`${post.id}_message`}
+ className={postClass}
+ >
+ {failedOptions}
+ <PostMessageContainer
+ lastPostCount={this.props.lastPostCount}
+ post={this.props.post}
+ />
+ </div>
+ );
+
+ let messageWithAdditionalContent;
+ if (this.props.post.state === Posts.POST_DELETED) {
+ messageWithAdditionalContent = messageWrapper;
+ } else {
+ messageWithAdditionalContent = (
+ <PostBodyAdditionalContent
+ post={this.props.post}
+ message={messageWrapper}
+ previewCollapsed={this.props.previewCollapsed}
+ />
+ );
+ }
+
+ let mentionHighlightClass = '';
+ if (this.props.isCommentMention) {
+ mentionHighlightClass = 'mention-comment';
+ }
+
+ return (
+ <div>
+ {comment}
+ <div className={'post__body ' + mentionHighlightClass}>
+ {messageWithAdditionalContent}
+ {fileAttachmentHolder}
+ <ReactionListContainer post={post}/>
+ </div>
+ </div>
+ );
+ }
+}