diff --git a/client/coral-admin/src/actions/community.js b/client/coral-admin/src/actions/community.js
index c2d738460..030ae1c0c 100644
--- a/client/coral-admin/src/actions/community.js
+++ b/client/coral-admin/src/actions/community.js
@@ -7,18 +7,21 @@ import {
SORT_UPDATE,
COMMENTERS_NEW_PAGE,
SET_ROLE,
- SET_COMMENTER_STATUS
+ SET_COMMENTER_STATUS,
+ FETCH_FLAGGED_COMMENTERS_REQUEST,
+ FETCH_FLAGGED_COMMENTERS_SUCCESS,
+ FETCH_FLAGGED_COMMENTERS_FAILURE
} from '../constants/community';
import coralApi from '../../../coral-framework/helpers/response';
-export const fetchCommenters = (query = {}) => dispatch => {
- dispatch(requestFetchCommenters());
+export const fetchAccounts = (query = {}) => dispatch => {
+ dispatch(requestFetchAccounts());
coralApi(`/users?${qs.stringify(query)}`)
.then(({result, page, count, limit, totalPages}) =>
dispatch({
type: FETCH_COMMENTERS_SUCCESS,
- commenters: result,
+ accounts: result,
page,
count,
limit,
@@ -28,7 +31,7 @@ export const fetchCommenters = (query = {}) => dispatch => {
.catch(error => dispatch({type: FETCH_COMMENTERS_FAILURE, error}));
};
-const requestFetchCommenters = () => ({
+const requestFetchAccounts = () => ({
type: FETCH_COMMENTERS_REQUEST
});
@@ -55,3 +58,25 @@ export const setCommenterStatus = (id, status) => (dispatch) => {
return dispatch({type: SET_COMMENTER_STATUS, id, status});
});
};
+
+// Fetch flagged accounts to display in the moderation queue of the community.
+
+export const fetchFlaggedAccounts = (query = {}) => dispatch => {
+ dispatch(requestFetchFlaggedAccounts());
+ coralApi(`/users?${qs.stringify(query)}`)
+ .then(({result, page, count, limit, totalPages}) =>
+ dispatch({
+ type: FETCH_FLAGGED_COMMENTERS_SUCCESS,
+ flaggedAccounts: result,
+ page,
+ count,
+ limit,
+ totalPages
+ })
+ )
+ .catch(error => dispatch({type: FETCH_FLAGGED_COMMENTERS_FAILURE, error}));
+};
+
+const requestFetchFlaggedAccounts = () => ({
+ type: FETCH_FLAGGED_COMMENTERS_REQUEST
+});
diff --git a/client/coral-admin/src/constants/comments.js b/client/coral-admin/src/constants/comments.js
index 35a915a1b..603a3ce00 100644
--- a/client/coral-admin/src/constants/comments.js
+++ b/client/coral-admin/src/constants/comments.js
@@ -1,6 +1,5 @@
export const SHOW_BANUSER_DIALOG = 'SHOW_BANUSER_DIALOG';
export const HIDE_BANUSER_DIALOG = 'HIDE_BANUSER_DIALOG';
-export const USERS_MODERATION_QUEUE_FETCH_SUCCESS = 'USERS_MODERATION_QUEUE_FETCH_SUCCESS';
export const COMMENTS_MODERATION_QUEUE_FETCH_REQUEST = 'COMMENTS_MODERATION_QUEUE_FETCH_REQUEST';
export const COMMENTS_MODERATION_QUEUE_FETCH_SUCCESS = 'COMMENTS_MODERATION_QUEUE_FETCH_SUCCESS';
export const COMMENT_CREATE_SUCCESS = 'COMMENT_CREATE_SUCCESS';
diff --git a/client/coral-admin/src/constants/community.js b/client/coral-admin/src/constants/community.js
index e3fd88a71..5d9fb4ab8 100644
--- a/client/coral-admin/src/constants/community.js
+++ b/client/coral-admin/src/constants/community.js
@@ -5,3 +5,7 @@ export const SORT_UPDATE = 'SORT_UPDATE';
export const COMMENTERS_NEW_PAGE = 'COMMENTERS_NEW_PAGE';
export const SET_ROLE = 'SET_ROLE';
export const SET_COMMENTER_STATUS = 'SET_COMMENTER_STATUS';
+
+export const FETCH_FLAGGED_COMMENTERS_REQUEST = 'FETCH_FLAGGED_COMMENTERS_REQUEST';
+export const FETCH_FLAGGED_COMMENTERS_SUCCESS = 'FETCH_FLAGGED_COMMENTERS_SUCCESS';
+export const FETCH_FLAGGED_COMMENTERS_FAILURE = 'FETCH_FLAGGED_COMMENTERS_FAILURE';
diff --git a/client/coral-admin/src/constants/users.js b/client/coral-admin/src/constants/users.js
index 9cd7e2093..6e8d173c0 100644
--- a/client/coral-admin/src/constants/users.js
+++ b/client/coral-admin/src/constants/users.js
@@ -3,4 +3,3 @@ export const UPDATE_STATUS_SUCCESS = 'UPDATE_STATUS_SUCCESS';
export const UPDATE_STATUS_FAILURE = 'UPDATE_STATUS_FAILURE';
export const USER_EMAIL_FAILURE = 'USER_EMAIL_FAILURE';
export const USERNAME_ENABLE_FAILURE = 'USERNAME_ENABLE_FAILURE';
-export const USERS_MODERATION_QUEUE_FETCH_SUCCESS = 'USERS_MODERATION_QUEUE_FETCH_SUCCESS';
diff --git a/client/coral-admin/src/containers/Community/Community.css b/client/coral-admin/src/containers/Community/Community.css
index 6c101fcaf..05a268d5a 100644
--- a/client/coral-admin/src/containers/Community/Community.css
+++ b/client/coral-admin/src/containers/Community/Community.css
@@ -15,6 +15,12 @@
box-sizing: border-box;
}
+.mainFlaggedContent {
+ width: 100%;
+ padding: 34px 14px;
+ box-sizing: border-box;
+}
+
.roleButton {
display: block;
}
diff --git a/client/coral-admin/src/containers/Community/CommunityContainer.js b/client/coral-admin/src/containers/Community/CommunityContainer.js
index 56e4e7762..abe481677 100644
--- a/client/coral-admin/src/containers/Community/CommunityContainer.js
+++ b/client/coral-admin/src/containers/Community/CommunityContainer.js
@@ -1,7 +1,7 @@
import React, {Component} from 'react';
import {connect} from 'react-redux';
import {
- fetchCommenters,
+ fetchAccounts,
updateSorting,
newPage,
} from '../../actions/community';
@@ -15,6 +15,8 @@ class CommunityContainer extends Component {
constructor(props) {
super(props);
+ console.log('DEBUG CONSTRUCTOR CommunityContainer ', props);
+
this.state = {
searchValue: ''
};
@@ -41,10 +43,10 @@ class CommunityContainer extends Component {
search(query = {}) {
const {community} = this.props;
- this.props.dispatch(fetchCommenters({
+ this.props.dispatch(fetchAccounts({
value: this.state.searchValue,
- field: community.field,
- asc: community.asc,
+ field: community.fieldPeople,
+ asc: community.ascPeople,
...query
}));
}
@@ -70,19 +72,26 @@ class CommunityContainer extends Component {
if (activeTab === 'people') {
return (