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

Merge pull request #1234 from coralproject/modqueue-enh

Browse Source 
Modqueue fixes and enhancements
This commit is contained in:
Kim Gardner
2017-12-21 15:26:09 -05:00
committed by GitHub
parent e2cb3fdd3d 111af0acf8
commit 5488d5a7fa
1 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-admin/src/routes/Moderation/components/ModerationQueue.js
+27 -11
View File
@@ -190,20 +190,24 @@ class ModerationQueue extends React.Component {
componentDidUpdate (prev) {
const {commentCount, selectedCommentId} = this.props;
// If the user just moderated the last (visible) comment
// AND there are more comments available on the server,
// go ahead and load more comments
if (prev.comments.length > 0 && this.getCommentCountWithoutDagling() === 0 && commentCount > 0) {
this.props.loadMore();
const switchedToMultiMode = prev.singleView && !this.props.singleView;
const switchedMode = prev.singleView !== this.props.singleView;
const selectedDifferentComment = prev.selectedCommentId !== selectedCommentId && selectedCommentId;
const moderatedLastComment = prev.comments.length > 0 && this.getCommentCountWithoutDagling() === 0;
const hasMoreComment = commentCount > 0;
if (switchedToMultiMode) {
// Reflow virtual list.
this.reflowList();
}
// Scroll to selected comment.
if (prev.selectedCommentId !== selectedCommentId && this.listRef) {
if (switchedMode || selectedDifferentComment) {
this.scrollToSelectedComment();
}
const view = this.state.view;
const index = view.findIndex(({id}) => id === selectedCommentId);
this.listRef.scrollToRow(index);
if (moderatedLastComment && hasMoreComment) {
this.props.loadMore();
}
}
@@ -242,6 +246,17 @@ class ModerationQueue extends React.Component {
this.listRef = list;
};
scrollToSelectedComment = (props = this.props, state = this.state) => {
if (props.singleMode) {
document.querySelector(`#comment_${props.selectedCommentId}`).scrollIntoView();
}
else if(this.listRef) {
const view = state.view;
const index = view.findIndex(({id}) => id === props.selectedCommentId);
this.listRef.scrollToRow(index);
}
}
viewNewComments = (callback) => {
this.setState(resetCursors, () => {
this.reflowList();
@@ -372,6 +387,7 @@ class ModerationQueue extends React.Component {
rejectComment={props.rejectComment}
currentAsset={props.currentAsset}
currentUserId={this.props.currentUserId}
dangling={!this.props.commentBelongToQueue(this.props.activeTab, comment)}
/>;
</div>
);