wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-06-29 03:05:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Port plugins

Browse Source
This commit is contained in:
Chi Vinh Le
2018-01-23 20:06:55 +01:00
parent b196bb379a
commit 59cdc9fd5d
9 changed files with 39 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugin-api/beta/client/hocs/withReaction.js
+1 -7
View File
@@ -9,11 +9,7 @@ import withFragments from 'coral-framework/hocs/withFragments';
import withMutation from 'coral-framework/hocs/withMutation';
import { notify } from 'coral-framework/actions/notification';
import { capitalize } from 'coral-framework/helpers/strings';
import {
getMyActionSummary,
getTotalActionCount,
getErrorMessages,
} from 'coral-framework/utils';
import { getMyActionSummary, getTotalActionCount } from 'coral-framework/utils';
import hoistStatics from 'recompose/hoistStatics';
import * as PropTypes from 'prop-types';
import { getDefinitionName } from '../utils';
@@ -282,7 +278,6 @@ export default (reaction, options = {}) =>
})
.catch(err => {
this.duringMutation = false;
this.props.notify('error', getErrorMessages(err));
throw err;
});
};
@@ -307,7 +302,6 @@ export default (reaction, options = {}) =>
})
.catch(err => {
this.duringMutation = false;
this.props.notify('error', getErrorMessages(err));
throw err;
});
};
plugin-api/beta/client/hocs/withTags.js
+3 -5
View File
@@ -7,7 +7,7 @@ import { capitalize } from 'coral-framework/helpers/strings';
import { withAddTag, withRemoveTag } from 'coral-framework/graphql/mutations';
import withFragments from 'coral-framework/hocs/withFragments';
import { notify } from 'coral-framework/actions/notification';
import { getErrorMessages, isTagged } from 'coral-framework/utils';
import { isTagged } from 'coral-framework/utils';
import hoistStatics from 'recompose/hoistStatics';
import { getDefinitionName } from '../utils';
@@ -38,7 +38,7 @@ export default (tag, options = {}) =>
loading = false;
postTag = () => {
const { comment, asset, notify } = this.props;
const { comment, asset } = this.props;
if (this.loading) {
return;
@@ -59,13 +59,12 @@ export default (tag, options = {}) =>
})
.catch(err => {
this.loading = false;
notify('error', getErrorMessages(err));
throw err;
});
};
deleteTag = () => {
const { comment, asset, notify } = this.props;
const { comment, asset } = this.props;
if (this.loading) {
return;
@@ -84,7 +83,6 @@ export default (tag, options = {}) =>
})
.catch(err => {
this.loading = false;
notify('error', getErrorMessages(err));
throw err;
});
};
plugins/talk-plugin-featured-comments/client/components/TabPane.js
+1 -3
View File
@@ -1,7 +1,6 @@
import React from 'react';
import Comment from '../containers/Comment';
import LoadMore from './LoadMore';
import { getErrorMessages } from 'plugin-api/beta/client/utils';
class TabPane extends React.Component {
state = {
@@ -15,9 +14,8 @@ class TabPane extends React.Component {
.then(() => {
this.setState({ loadingState: 'success' });
})
.catch(error => {
.catch(() => {
this.setState({ loadingState: 'error' });
this.props.notify('error', getErrorMessages(error));
});
};
plugins/talk-plugin-featured-comments/client/containers/ModActionButton.js
+4 -2
View File
@@ -3,18 +3,20 @@ import { bindActionCreators } from 'redux';
import ModActionButton from '../components/ModActionButton';
import { withTags, connect } from 'plugin-api/beta/client/hocs';
import { closeMenu } from 'plugins/talk-plugin-moderation-actions/client/actions';
import { notify } from 'plugin-api/beta/client/actions/notification';
const mapDispatchToProps = dispatch =>
bindActionCreators(
{
notify,
closeMenu,
},
dispatch
);
const enhance = compose(
withTags('featured'),
connect(null, mapDispatchToProps)
connect(null, mapDispatchToProps),
withTags('featured')
);
export default enhance(ModActionButton);
plugins/talk-plugin-featured-comments/client/containers/ModTag.js
+2 -2
View File
@@ -24,8 +24,8 @@ const fragments = {
`,
};
const enhance = compose(
withTags('featured', { fragments }),
connect(null, mapDispatchToProps)
connect(null, mapDispatchToProps),
withTags('featured', { fragments })
);
export default enhance(ModTag);
plugins/talk-plugin-ignore-user/client/containers/IgnoreUserConfirmation.js
+6 -11
View File
@@ -10,21 +10,16 @@ import { bindActionCreators } from 'redux';
import { closeMenu } from 'plugins/talk-plugin-author-menu/client/actions';
import { notify } from 'plugin-api/beta/client/actions/notification';
import { t } from 'plugin-api/beta/client/services';
import { getErrorMessages } from 'plugin-api/beta/client/utils';
class IgnoreUserConfirmationContainer extends React.Component {
ignoreUser = () => {
const { ignoreUser, notify, comment, closeMenu } = this.props;
ignoreUser(comment.user.id)
.then(() => {
notify(
'success',
t('talk-plugin-ignore-user.notify_success', comment.user.username)
);
})
.catch(err => {
notify('error', getErrorMessages(err));
});
ignoreUser(comment.user.id).then(() => {
notify(
'success',
t('talk-plugin-ignore-user.notify_success', comment.user.username)
);
});
closeMenu();
};
plugins/talk-plugin-moderation-actions/client/containers/ApproveCommentAction.js
+5 -10
View File
@@ -1,23 +1,18 @@
import React from 'react';
import { compose } from 'react-apollo';
import { bindActionCreators } from 'redux';
import { getErrorMessages } from 'plugin-api/beta/client/utils';
import { notify } from 'plugin-api/beta/client/actions/notification';
import ApproveCommentAction from '../components/ApproveCommentAction';
import { connect, withSetCommentStatus } from 'plugin-api/beta/client/hocs';
class ApproveCommentActionContainer extends React.Component {
approveComment = async () => {
const { setCommentStatus, comment, hideMenu, notify } = this.props;
const { setCommentStatus, comment, hideMenu } = this.props;
try {
await setCommentStatus({
commentId: comment.id,
status: 'ACCEPTED',
});
} catch (err) {
notify('error', getErrorMessages(err));
}
await setCommentStatus({
commentId: comment.id,
status: 'ACCEPTED',
});
hideMenu();
};
plugins/talk-plugin-moderation-actions/client/containers/BanUserDialog.js
+12 -18
View File
@@ -9,13 +9,11 @@ import {
withSetCommentStatus,
withBanUser,
} from 'plugin-api/beta/client/hocs';
import { getErrorMessages } from 'plugin-api/beta/client/utils';
import BanUserDialog from '../components/BanUserDialog';
class BanUserDialogContainer extends React.Component {
banUser = async () => {
const {
notify,
authorId,
commentId,
commentStatus,
@@ -25,23 +23,19 @@ class BanUserDialogContainer extends React.Component {
banUser,
} = this.props;
try {
await banUser({
id: authorId,
message: '',
await banUser({
id: authorId,
message: '',
});
closeMenu();
closeBanDialog();
if (commentStatus !== 'REJECTED') {
await setCommentStatus({
commentId: commentId,
status: 'REJECTED',
});
closeMenu();
closeBanDialog();
if (commentStatus !== 'REJECTED') {
await setCommentStatus({
commentId: commentId,
status: 'REJECTED',
});
}
} catch (err) {
notify('error', getErrorMessages(err));
}
};
plugins/talk-plugin-moderation-actions/client/containers/RejectCommentAction.js
+5 -10
View File
@@ -1,23 +1,18 @@
import React from 'react';
import { compose } from 'react-apollo';
import { bindActionCreators } from 'redux';
import { getErrorMessages } from 'plugin-api/beta/client/utils';
import { notify } from 'plugin-api/beta/client/actions/notification';
import RejectCommentAction from '../components/RejectCommentAction';
import { connect, withSetCommentStatus } from 'plugin-api/beta/client/hocs';
class RejectCommentActionContainer extends React.Component {
rejectComment = async () => {
const { setCommentStatus, comment, hideMenu, notify } = this.props;
const { setCommentStatus, comment, hideMenu } = this.props;
try {
await setCommentStatus({
commentId: comment.id,
status: 'REJECTED',
});
} catch (err) {
notify('error', getErrorMessages(err));
}
await setCommentStatus({
commentId: comment.id,
status: 'REJECTED',
});
hideMenu();
};