diff options
-rw-r--r-- | webapp/components/post_view/post_info/post_info.jsx | 15 | ||||
-rw-r--r-- | webapp/components/post_view/post_time.jsx | 11 | ||||
-rw-r--r-- | webapp/tests/components/post_view/post_info/__snapshots__/post_info.test.jsx.snap | 7 | ||||
-rw-r--r-- | webapp/utils/post_utils.jsx | 19 |
4 files changed, 35 insertions, 17 deletions
diff --git a/webapp/components/post_view/post_info/post_info.jsx b/webapp/components/post_view/post_info/post_info.jsx index 2c5b98c69..cc3133764 100644 --- a/webapp/components/post_view/post_info/post_info.jsx +++ b/webapp/components/post_view/post_info/post_info.jsx @@ -9,6 +9,7 @@ import DotMenu from 'components/dot_menu'; import * as Utils from 'utils/utils.jsx'; import * as PostUtils from 'utils/post_utils.jsx'; +import * as ReduxPostUtils from 'mattermost-redux/utils/post_utils'; import {emitEmojiPosted} from 'actions/post_actions.jsx'; import Constants from 'utils/constants.jsx'; import {Posts} from 'mattermost-redux/constants'; @@ -77,7 +78,7 @@ export default class PostInfo extends React.PureComponent { */ addReaction: PropTypes.func.isRequired }).isRequired - } + }; constructor(props) { super(props); @@ -96,12 +97,12 @@ export default class PostInfo extends React.PureComponent { this.setState({showEmojiPicker}); this.props.handleDropdownOpened(showEmojiPicker); - } + }; hideEmojiPicker = () => { this.setState({showEmojiPicker: false}); this.props.handleDropdownOpened(false); - } + }; removePost() { this.props.actions.removePost(this.props.post); @@ -131,7 +132,7 @@ export default class PostInfo extends React.PureComponent { getDotMenu = () => { return this.refs.dotMenu; - } + }; render() { const post = this.props.post; @@ -242,10 +243,16 @@ export default class PostInfo extends React.PureComponent { ); } + // timestamp should not be a permalink if the post has been deleted, is ephemeral message, or is pending + const isPermalink = !(isEphemeral || + Posts.POST_DELETED === this.props.post.state || + ReduxPostUtils.isPostPendingOrFailed(this.props.post)); + return ( <div className='post__header--info'> <div className='col'> <PostTime + isPermalink={isPermalink} eventTime={post.create_at} useMilitaryTime={this.props.useMilitaryTime} postId={post.id} diff --git a/webapp/components/post_view/post_time.jsx b/webapp/components/post_view/post_time.jsx index 133b6b5a3..2619c6807 100644 --- a/webapp/components/post_view/post_time.jsx +++ b/webapp/components/post_view/post_time.jsx @@ -13,6 +13,11 @@ export default class PostTime extends React.PureComponent { static propTypes = { /* + * If true, time will be rendered as a permalink to the post + */ + isPermalink: PropTypes.bool.isRequired, + + /* * The time to display */ eventTime: PropTypes.number.isRequired, @@ -26,12 +31,12 @@ export default class PostTime extends React.PureComponent { * The post id of posting being rendered */ postId: PropTypes.string - } + }; static defaultProps = { eventTime: 0, useMilitaryTime: false - } + }; constructor(props) { super(props); @@ -74,7 +79,7 @@ export default class PostTime extends React.PureComponent { } render() { - if (isMobile()) { + if (isMobile() || !this.props.isPermalink) { return this.renderTimeTag(); } diff --git a/webapp/tests/components/post_view/post_info/__snapshots__/post_info.test.jsx.snap b/webapp/tests/components/post_view/post_info/__snapshots__/post_info.test.jsx.snap index 911008a7b..d58df052d 100644 --- a/webapp/tests/components/post_view/post_info/__snapshots__/post_info.test.jsx.snap +++ b/webapp/tests/components/post_view/post_info/__snapshots__/post_info.test.jsx.snap @@ -9,6 +9,7 @@ exports[`components/post_view/PostInfo should match snapshot 1`] = ` > <PostTime eventTime={1502715365009} + isPermalink={true} postId="e584uzbwwpny9kengqayx5ayzw" useMilitaryTime={false} /> @@ -98,6 +99,7 @@ exports[`components/post_view/PostInfo should match snapshot, compact display 1` > <PostTime eventTime={1502715365009} + isPermalink={true} postId="e584uzbwwpny9kengqayx5ayzw" useMilitaryTime={false} /> @@ -187,6 +189,7 @@ exports[`components/post_view/PostInfo should match snapshot, ephemeral deleted > <PostTime eventTime={1502715365009} + isPermalink={false} postId="e584uzbwwpny9kengqayx5ayzw" useMilitaryTime={false} /> @@ -222,6 +225,7 @@ exports[`components/post_view/PostInfo should match snapshot, ephemeral post 1`] > <PostTime eventTime={1502715365009} + isPermalink={false} postId="e584uzbwwpny9kengqayx5ayzw" useMilitaryTime={false} /> @@ -266,6 +270,7 @@ exports[`components/post_view/PostInfo should match snapshot, flagged post 1`] = > <PostTime eventTime={1502715365009} + isPermalink={true} postId="e584uzbwwpny9kengqayx5ayzw" useMilitaryTime={false} /> @@ -355,6 +360,7 @@ exports[`components/post_view/PostInfo should match snapshot, military time 1`] > <PostTime eventTime={1502715365009} + isPermalink={true} postId="e584uzbwwpny9kengqayx5ayzw" useMilitaryTime={true} /> @@ -418,6 +424,7 @@ exports[`components/post_view/PostInfo should match snapshot, pinned post 1`] = > <PostTime eventTime={1502715365009} + isPermalink={true} postId="e584uzbwwpny9kengqayx5ayzw" useMilitaryTime={false} /> diff --git a/webapp/utils/post_utils.jsx b/webapp/utils/post_utils.jsx index 83fb666af..1ff16a5ab 100644 --- a/webapp/utils/post_utils.jsx +++ b/webapp/utils/post_utils.jsx @@ -9,7 +9,7 @@ import UserStore from 'stores/user_store.jsx'; import ChannelStore from 'stores/channel_store.jsx'; export function isSystemMessage(post) { - return post.type && (post.type.lastIndexOf(Constants.SYSTEM_MESSAGE_PREFIX) === 0); + return Boolean(post.type && (post.type.lastIndexOf(Constants.SYSTEM_MESSAGE_PREFIX) === 0)); } export function isFromWebhook(post) { @@ -53,11 +53,11 @@ export function getProfilePicSrcForPost(post, user) { } export function canDeletePost(post) { - var isOwner = isPostOwner(post); - var isSystemAdmin = UserStore.isSystemAdminForCurrentUser(); - var isTeamAdmin = TeamStore.isTeamAdminForCurrentTeam() || isSystemAdmin; - var isChannelAdmin = ChannelStore.isChannelAdminForCurrentChannel() || isTeamAdmin; - var isAdmin = isChannelAdmin || isTeamAdmin || isSystemAdmin; + const isOwner = isPostOwner(post); + const isSystemAdmin = UserStore.isSystemAdminForCurrentUser(); + const isTeamAdmin = TeamStore.isTeamAdminForCurrentTeam() || isSystemAdmin; + const isChannelAdmin = ChannelStore.isChannelAdminForCurrentChannel() || isTeamAdmin; + const isAdmin = isChannelAdmin || isTeamAdmin || isSystemAdmin; if (global.window.mm_license.IsLicensed === 'true') { return (global.window.mm_config.RestrictPostDelete === Constants.PERMISSIONS_DELETE_POST_ALL && (isOwner || isChannelAdmin)) || @@ -69,15 +69,14 @@ export function canDeletePost(post) { } export function canEditPost(post, editDisableAction) { - var isOwner = isPostOwner(post); - - var canEdit = isOwner && !isSystemMessage(post); + const isOwner = isPostOwner(post); + let canEdit = isOwner && !isSystemMessage(post); if (canEdit && global.window.mm_license.IsLicensed === 'true') { if (global.window.mm_config.AllowEditPost === Constants.ALLOW_EDIT_POST_NEVER) { canEdit = false; } else if (global.window.mm_config.AllowEditPost === Constants.ALLOW_EDIT_POST_TIME_LIMIT) { - var timeLeft = (post.create_at + (global.window.mm_config.PostEditTimeLimit * 1000)) - Utils.getTimestamp(); + const timeLeft = (post.create_at + (global.window.mm_config.PostEditTimeLimit * 1000)) - Utils.getTimestamp(); if (timeLeft > 0) { editDisableAction.fireAfter(timeLeft + 1000); } else { |