From 8bfc7e942c00bee4294b3c825f4b5d1c5ba5236c Mon Sep 17 00:00:00 2001 From: Belen Curcio Date: Mon, 18 Sep 2017 10:04:39 -0300 Subject: [PATCH] Renaming --- .../client/actions.js | 13 +++++++------ .../client/constants.js | 4 ++-- .../client/containers/BanUserAction.js | 10 ++++++---- .../client/containers/BanUserDialog.js | 10 ++++++---- .../client/reducer.js | 3 ++- 5 files changed, 23 insertions(+), 17 deletions(-) diff --git a/plugins/talk-plugin-moderation-actions/client/actions.js b/plugins/talk-plugin-moderation-actions/client/actions.js index 8bca6bde2..4f58247d4 100644 --- a/plugins/talk-plugin-moderation-actions/client/actions.js +++ b/plugins/talk-plugin-moderation-actions/client/actions.js @@ -1,4 +1,4 @@ -import {OPEN_MENU, CLOSE_MENU, OPEN_DIALOG, CLOSE_DIALOG} from './constants'; +import {OPEN_MENU, CLOSE_MENU, OPEN_BAN_DIALOG, CLOSE_BAN_DIALOG} from './constants'; export const openMenu = (id) => ({ type: OPEN_MENU, @@ -9,11 +9,12 @@ export const closeMenu = () => ({ type: CLOSE_MENU, }); -export const openDialog = (comment) => ({ - type: OPEN_DIALOG, - comment +export const openBanDialog = ({commentId, authorId}) => ({ + type: OPEN_BAN_DIALOG, + commentId, + authorId }); -export const closeDialog = () => ({ - type: CLOSE_DIALOG, +export const closeBanDialog = () => ({ + type: CLOSE_BAN_DIALOG, }); diff --git a/plugins/talk-plugin-moderation-actions/client/constants.js b/plugins/talk-plugin-moderation-actions/client/constants.js index 54e4329ff..36523affd 100644 --- a/plugins/talk-plugin-moderation-actions/client/constants.js +++ b/plugins/talk-plugin-moderation-actions/client/constants.js @@ -2,5 +2,5 @@ const prefix = 'TALK_MODERATION_ACTIONS'; export const OPEN_MENU = `${prefix}_OPEN_MENU`; export const CLOSE_MENU = `${prefix}_CLOSE_MENU`; -export const OPEN_DIALOG = `${prefix}_OPEN_DIALOG`; -export const CLOSE_DIALOG = `${prefix}_CLOSE_DIALOG`; +export const OPEN_BAN_DIALOG = `${prefix}_OPEN_BAN_DIALOG`; +export const CLOSE_BAN_DIALOG = `${prefix}_CLOSE_BAN_DIALOG`; diff --git a/plugins/talk-plugin-moderation-actions/client/containers/BanUserAction.js b/plugins/talk-plugin-moderation-actions/client/containers/BanUserAction.js index 18ca2b743..bc68c4ed9 100644 --- a/plugins/talk-plugin-moderation-actions/client/containers/BanUserAction.js +++ b/plugins/talk-plugin-moderation-actions/client/containers/BanUserAction.js @@ -1,27 +1,29 @@ import React from 'react'; import {compose} from 'react-apollo'; -import {openDialog} from '../actions'; +import {openBanDialog} from '../actions'; import {bindActionCreators} from 'redux'; import BanUserAction from '../components/BanUserAction'; import {connect, excludeIf} from 'plugin-api/beta/client/hocs'; class BanUserActionContainer extends React.Component { onBanUser = () => { - this.props.openDialog(this.props.comment); + this.props.openBanDialog({ + commentId: this.props.comment.id, + authorId: this.props.comment.user.id + }); } render() { return ; } } const mapDispatchToProps = (dispatch) => bindActionCreators({ - openDialog + openBanDialog }, dispatch); const enhance = compose( diff --git a/plugins/talk-plugin-moderation-actions/client/containers/BanUserDialog.js b/plugins/talk-plugin-moderation-actions/client/containers/BanUserDialog.js index 8302b05bf..07ea934f4 100644 --- a/plugins/talk-plugin-moderation-actions/client/containers/BanUserDialog.js +++ b/plugins/talk-plugin-moderation-actions/client/containers/BanUserDialog.js @@ -13,7 +13,8 @@ class BanUserDialogContainer extends React.Component { banUser = async () => { const { notify, - comment, + authorId, + commentId, closeMenu, closeDialog, setCommentStatus, @@ -22,7 +23,7 @@ class BanUserDialogContainer extends React.Component { try { await setUserStatus({ - userId: comment.user.id, + userId: authorId, status: 'BANNED' }); @@ -31,7 +32,7 @@ class BanUserDialogContainer extends React.Component { if (comment.status !== 'REJECTED') { await setCommentStatus({ - commentId: comment.id, + commentId: commentId, status: 'REJECTED' }); } @@ -54,7 +55,8 @@ class BanUserDialogContainer extends React.Component { const mapStateToProps = ({talkPluginModerationActions: state}) => ({ showDialog: state.showDialog, - comment: state.comment + commentId: state.commentId, + authorId: state.authorId }); const mapDispatchToProps = (dispatch) => diff --git a/plugins/talk-plugin-moderation-actions/client/reducer.js b/plugins/talk-plugin-moderation-actions/client/reducer.js index c57df5f6f..1aa3e0931 100644 --- a/plugins/talk-plugin-moderation-actions/client/reducer.js +++ b/plugins/talk-plugin-moderation-actions/client/reducer.js @@ -22,7 +22,8 @@ export default function reducer(state = initialState, action) { return { ...state, showDialog: true, - comment: action.comment + commentId: action.commentId, + authorId: action.authorId }; case CLOSE_DIALOG: return {