diff --git a/client/coral-admin/src/actions/community.js b/client/coral-admin/src/actions/community.js
index 92d10fac9..0674926db 100644
--- a/client/coral-admin/src/actions/community.js
+++ b/client/coral-admin/src/actions/community.js
@@ -13,6 +13,7 @@ import {
import coralApi from '../../../coral-framework/helpers/response';
export const fetchAccounts = (query = {}) => dispatch => {
+
dispatch(requestFetchAccounts());
coralApi(`/users?${qs.stringify(query)}`)
.then(({result, page, count, limit, totalPages}) =>{
diff --git a/client/coral-admin/src/containers/Community/CommunityContainer.js b/client/coral-admin/src/containers/Community/CommunityContainer.js
index 79bfd2123..0effb551c 100644
--- a/client/coral-admin/src/containers/Community/CommunityContainer.js
+++ b/client/coral-admin/src/containers/Community/CommunityContainer.js
@@ -1,10 +1,11 @@
import React, {Component} from 'react';
import {connect} from 'react-redux';
+import {modUserFlaggedQuery} from 'coral-admin/src/graphql/queries';
+import {compose} from 'react-apollo';
import {
fetchAccounts,
updateSorting,
- newPage,
- fetchFlaggedAccounts,
+ newPage
} from '../../actions/community';
import CommunityMenu from './components/CommunityMenu';
@@ -33,6 +34,10 @@ class CommunityContainer extends Component {
this.onNewPageHandler = this.onNewPageHandler.bind(this);
}
+ componentWillMount() {
+ this.props.fetchAccounts({});
+ }
+
onKeyDownHandler(e) {
if (e.key === 'Enter') {
e.preventDefault();
@@ -49,23 +54,15 @@ class CommunityContainer extends Component {
search(query = {}) {
const {community} = this.props;
- this.props.dispatch(fetchAccounts({
+ this.props.fetchAccounts({
value: this.state.searchValue,
field: community.fieldPeople,
asc: community.ascPeople,
...query
- }));
+ });
}
- componentWillMount() {
- this.props.dispatch(fetchFlaggedAccounts());
- }
-
- componentDidMount() {
- this.search();
- }
-
onHeaderClickHandler(sort) {
this.props.dispatch(updateSorting(sort));
this.search();
@@ -76,9 +73,9 @@ class CommunityContainer extends Component {
this.search({page});
}
- getTabContent(searchValue) {
- const {community} = this.props;
- const activeTab = this.props.route.path === ':id' ? 'flagged' : this.props.route.path;
+ getTabContent(searchValue, props) {
+ const {community, data} = props;
+ const activeTab = props.route.path === ':id' ? 'flagged' : props.route.path;
if (activeTab === 'people') {
return (
@@ -96,18 +93,18 @@ class CommunityContainer extends Component {
return (