From 29d5656fb27f8f318adec9380b68b5ea1243e4f4 Mon Sep 17 00:00:00 2001 From: 2458773093 <2458773093@protonmail.com> Date: Fri, 23 Aug 2019 03:43:33 +0300 Subject: [PATCH] add edit to status detail action bar + comment out delete&redraft --- app/javascript/gabsocial/components/status_action_bar.js | 2 +- .../gabsocial/features/status/components/action_bar.js | 8 +++++++- app/javascript/gabsocial/features/status/index.js | 7 ++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/javascript/gabsocial/components/status_action_bar.js b/app/javascript/gabsocial/components/status_action_bar.js index 90e069ff..0fc9ac48 100644 --- a/app/javascript/gabsocial/components/status_action_bar.js +++ b/app/javascript/gabsocial/components/status_action_bar.js @@ -222,7 +222,7 @@ class StatusActionBar extends ImmutablePureComponent { } menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDeleteClick }); - menu.push({ text: intl.formatMessage(messages.redraft), action: this.handleRedraftClick }); + // menu.push({ text: intl.formatMessage(messages.redraft), action: this.handleRedraftClick }); menu.push({ text: intl.formatMessage(messages.edit), action: this.handleEditClick }); } else { menu.push({ text: intl.formatMessage(messages.mention, { name: status.getIn(['account', 'username']) }), action: this.handleMentionClick }); diff --git a/app/javascript/gabsocial/features/status/components/action_bar.js b/app/javascript/gabsocial/features/status/components/action_bar.js index a774b773..0d0705b2 100644 --- a/app/javascript/gabsocial/features/status/components/action_bar.js +++ b/app/javascript/gabsocial/features/status/components/action_bar.js @@ -11,6 +11,7 @@ import { me, isStaff } from '../../../initial_state'; const messages = defineMessages({ delete: { id: 'status.delete', defaultMessage: 'Delete' }, redraft: { id: 'status.redraft', defaultMessage: 'Delete & re-draft' }, + edit: { id: 'status.edit', defaultMessage: 'Edit' }, direct: { id: 'status.direct', defaultMessage: 'Direct message @{name}' }, mention: { id: 'status.mention', defaultMessage: 'Mention @{name}' }, reply: { id: 'status.reply', defaultMessage: 'Reply' }, @@ -102,6 +103,10 @@ class ActionBar extends React.PureComponent { this.props.onDelete(this.props.status, this.context.router.history); } + handleEditClick = () => { + this.props.onEdit(this.props.status); + } + handleRedraftClick = () => { this.props.onDelete(this.props.status, this.context.router.history, true); } @@ -191,7 +196,8 @@ class ActionBar extends React.PureComponent { menu.push({ text: intl.formatMessage(mutingConversation ? messages.unmuteConversation : messages.muteConversation), action: this.handleConversationMuteClick }); menu.push(null); menu.push({ text: intl.formatMessage(messages.delete), action: this.handleDeleteClick }); - menu.push({ text: intl.formatMessage(messages.redraft), action: this.handleRedraftClick }); + // menu.push({ text: intl.formatMessage(messages.redraft), action: this.handleRedraftClick }); + menu.push({ text: intl.formatMessage(messages.edit), action: this.handleEditClick }); } else { menu.push({ text: intl.formatMessage(messages.mention, { name: status.getIn(['account', 'username']) }), action: this.handleMentionClick }); //menu.push({ text: intl.formatMessage(messages.direct, { name: status.getIn(['account', 'username']) }), action: this.handleDirectClick }); diff --git a/app/javascript/gabsocial/features/status/index.js b/app/javascript/gabsocial/features/status/index.js index 8ed5ea90..08663554 100644 --- a/app/javascript/gabsocial/features/status/index.js +++ b/app/javascript/gabsocial/features/status/index.js @@ -4,7 +4,7 @@ import { connect } from 'react-redux'; import PropTypes from 'prop-types'; import classNames from 'classnames'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import { fetchStatus } from '../../actions/statuses'; +import { fetchStatus, editStatus } from '../../actions/statuses'; import MissingIndicator from '../../components/missing_indicator'; import DetailedStatus from './components/detailed_status'; import ActionBar from './components/action_bar'; @@ -238,6 +238,10 @@ class Status extends ImmutablePureComponent { } } + handleEditClick = (status) => { + this.props.dispatch(editStatus(status)); + } + handleDirectClick = (account, router) => { this.props.dispatch(directCompose(account, router)); } @@ -511,6 +515,7 @@ class Status extends ImmutablePureComponent { onQuote={this.handleQuoteClick} onReblog={this.handleReblogClick} onDelete={this.handleDeleteClick} + onEdit={this.handleEditClick} onDirect={this.handleDirectClick} onMention={this.handleMentionClick} onMute={this.handleMuteClick}