diff options
Diffstat (limited to 'webapp/components')
-rw-r--r-- | webapp/components/rhs_comment.jsx | 6 | ||||
-rw-r--r-- | webapp/components/rhs_thread/index.js | 12 | ||||
-rw-r--r-- | webapp/components/rhs_thread/rhs_thread.jsx | 6 |
3 files changed, 19 insertions, 5 deletions
diff --git a/webapp/components/rhs_comment.jsx b/webapp/components/rhs_comment.jsx index 202be9748..68190da98 100644 --- a/webapp/components/rhs_comment.jsx +++ b/webapp/components/rhs_comment.jsx @@ -11,7 +11,6 @@ import FailedPostOptions from 'components/post_view/failed_post_options'; import DotMenu from 'components/dot_menu'; import EmojiPickerOverlay from 'components/emoji_picker/emoji_picker_overlay.jsx'; -import * as GlobalActions from 'actions/global_actions.jsx'; import {addReaction} from 'actions/post_actions.jsx'; import TeamStore from 'stores/team_store.jsx'; @@ -56,7 +55,7 @@ export default class RhsComment extends React.Component { } removePost() { - GlobalActions.emitRemovePost(this.props.post); + this.props.removePost(this.props.post); } createRemovePostButton() { @@ -447,5 +446,6 @@ RhsComment.propTypes = { isFlagged: PropTypes.bool, status: PropTypes.string, isBusy: PropTypes.bool, - getPostList: PropTypes.func.isRequired + getPostList: PropTypes.func.isRequired, + removePost: PropTypes.func.isRequired }; diff --git a/webapp/components/rhs_thread/index.js b/webapp/components/rhs_thread/index.js index c4465cafd..ed7618427 100644 --- a/webapp/components/rhs_thread/index.js +++ b/webapp/components/rhs_thread/index.js @@ -2,7 +2,9 @@ // See License.txt for license information. import {connect} from 'react-redux'; +import {bindActionCreators} from 'redux'; import {getPost, makeGetPostsForThread} from 'mattermost-redux/selectors/entities/posts'; +import {removePost} from 'mattermost-redux/actions/posts'; import RhsThread from './rhs_thread.jsx'; @@ -24,4 +26,12 @@ function makeMapStateToProps() { }; } -export default connect(makeMapStateToProps)(RhsThread); +function mapDispatchToProps(dispatch) { + return { + actions: bindActionCreators({ + removePost + }, dispatch) + }; +} + +export default connect(makeMapStateToProps, mapDispatchToProps)(RhsThread); diff --git a/webapp/components/rhs_thread/rhs_thread.jsx b/webapp/components/rhs_thread/rhs_thread.jsx index bbf61af19..5ce6af018 100644 --- a/webapp/components/rhs_thread/rhs_thread.jsx +++ b/webapp/components/rhs_thread/rhs_thread.jsx @@ -59,7 +59,10 @@ export default class RhsThread extends React.Component { currentUser: PropTypes.object.isRequired, useMilitaryTime: PropTypes.bool.isRequired, toggleSize: PropTypes.func, - shrink: PropTypes.func + shrink: PropTypes.func, + actions: PropTypes.shape({ + removePost: PropTypes.func.isRequired + }).isRequired } static defaultProps = { @@ -401,6 +404,7 @@ export default class RhsThread extends React.Component { status={status} isBusy={this.state.isBusy} getPostList={this.getPostListContainer} + removePost={this.props.actions.removePost} /> </div> ); |