|
@@ -57,9 +76,8 @@ const Table = ({headers, commenters, onHeaderClickHandler, onRoleChange, onComme
);
Table.propTypes = {
- headers: PropTypes.array,
- commenters: PropTypes.array,
- onHeaderClickHandler: PropTypes.func,
+ users: PropTypes.array,
+ onHeaderClickHandler: PropTypes.func.isRequired,
onRoleChange: PropTypes.func,
onCommenterStatusChange: PropTypes.func,
viewUserDetail: PropTypes.func,
diff --git a/client/coral-admin/src/routes/Community/containers/Community.js b/client/coral-admin/src/routes/Community/containers/Community.js
index 6e20a3167..4cf9eeb8a 100644
--- a/client/coral-admin/src/routes/Community/containers/Community.js
+++ b/client/coral-admin/src/routes/Community/containers/Community.js
@@ -1,65 +1,21 @@
-import React, {Component} from 'react';
import {connect} from 'react-redux';
import {bindActionCreators} from 'redux';
-import PropTypes from 'prop-types';
import {compose, gql} from 'react-apollo';
import withQuery from 'coral-framework/hocs/withQuery';
import {getDefinitionName} from 'coral-framework/utils';
import {withSetUserStatus, withRejectUsername} from 'coral-framework/graphql/mutations';
import FlaggedAccounts from '../containers/FlaggedAccounts';
import FlaggedUser from '../containers/FlaggedUser';
-
-import {
- fetchAccounts,
- updateSorting,
- newPage,
- hideRejectUsernameDialog
-} from '../../../actions/community';
-
+import {hideRejectUsernameDialog} from '../../../actions/community';
import Community from '../components/Community';
-class CommunityContainer extends Component {
-
- componentWillMount() {
- this.props.fetchAccounts({});
- }
-
- render() {
- return ;
- }
-}
const mapStateToProps = (state) => ({
community: state.community,
});
-CommunityContainer.propTypes = {
- community: PropTypes.object,
- fetchAccounts: PropTypes.func,
- hideRejectUsernameDialog: PropTypes.func,
- updateSorting: PropTypes.func,
- newPage: PropTypes.func,
- route: PropTypes.object,
- rejectUsername: PropTypes.func,
- data: PropTypes.object,
- root: PropTypes.object
-};
-
const mapDispatchToProps = (dispatch) =>
bindActionCreators({
- fetchAccounts,
hideRejectUsernameDialog,
- updateSorting,
- newPage,
}, dispatch);
const withData = withQuery(gql`
@@ -89,4 +45,4 @@ export default compose(
withSetUserStatus,
withRejectUsername,
withData
-)(CommunityContainer);
+)(Community);
diff --git a/client/coral-admin/src/routes/Community/containers/People.js b/client/coral-admin/src/routes/Community/containers/People.js
new file mode 100644
index 000000000..fb383917f
--- /dev/null
+++ b/client/coral-admin/src/routes/Community/containers/People.js
@@ -0,0 +1,102 @@
+import React from 'react';
+import {connect} from 'react-redux';
+import {bindActionCreators} from 'redux';
+import People from '../components/People';
+import PropTypes from 'prop-types';
+
+import {viewUserDetail} from '../../../actions/userDetail';
+
+import {
+ fetchUsers,
+ updateSorting,
+ newPage,
+ hideRejectUsernameDialog,
+ setCommenterStatus,
+ setRole,
+} from '../../../actions/community';
+
+class PeopleContainer extends React.Component {
+ state = {
+ searchValue: '',
+ timer: null
+ };
+
+ componentWillMount() {
+ this.props.fetchUsers();
+ }
+
+ onKeyDownHandler = (e) => {
+ if (e.key === 'Enter') {
+ e.preventDefault();
+ this.search();
+ }
+ }
+
+ onSearchChange = (e) => {
+ const value = e.target.value;
+
+ this.setState((prevState) => {
+ prevState.searchValue = value;
+ clearTimeout(prevState.timer);
+ const fetchAccounts = this.props.fetchUsers;
+ prevState.timer = setTimeout(() => {
+ fetchAccounts({value});
+ }, 350);
+ return prevState;
+ });
+ }
+
+ onHeaderClickHandler = (sort) => {
+ this.props.updateSorting(sort);
+ this.search();
+ }
+
+ onNewPageHandler = ({selected}) => {
+ const page = selected + 1;
+ this.props.newPage(page);
+ this.search({page});
+ }
+
+ search(query = {}) {
+ const {community} = this.props;
+
+ this.props.fetchUsers({
+ value: this.state.searchValue,
+ field: community.fieldPeople,
+ asc: community.ascPeople,
+ ...query
+ });
+ }
+ render() {
+ return ;
+ }
+}
+
+PeopleContainer.propTypes = {
+ newPage: PropTypes.func,
+ fetchUsers: PropTypes.func,
+ updateSorting: PropTypes.func,
+ setRole: PropTypes.func,
+ setCommenterStatus: PropTypes.func,
+ community: PropTypes.object,
+};
+
+const mapDispatchToProps = (dispatch) =>
+ bindActionCreators({
+ newPage,
+ fetchUsers,
+ updateSorting,
+ hideRejectUsernameDialog,
+ setCommenterStatus,
+ setRole,
+ viewUserDetail,
+ }, dispatch);
+
+export default connect(null, mapDispatchToProps)(PeopleContainer);
diff --git a/client/coral-admin/src/routes/Community/containers/Table.js b/client/coral-admin/src/routes/Community/containers/Table.js
deleted file mode 100644
index 086a56638..000000000
--- a/client/coral-admin/src/routes/Community/containers/Table.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import React, {Component} from 'react';
-import {connect} from 'react-redux';
-import {bindActionCreators} from 'redux';
-import {setRole, setCommenterStatus} from '../../../actions/community';
-import Table from '../components/Table';
-import {viewUserDetail} from '../../../actions/userDetail';
-import PropTypes from 'prop-types';
-
-class TableContainer extends Component {
-
- constructor (props) {
- super(props);
- }
-
- render () {
- return ;
- }
-}
-
-TableContainer.propTypes = {
- setRole: PropTypes.func,
- setCommenterStatus: PropTypes.func,
- commenters: PropTypes.array,
-};
-
-const mapStateToProps = (state) => ({
- commenters: state.community.accounts,
-});
-
-const mapDispatchToProps = (dispatch) =>
- bindActionCreators({
- setCommenterStatus,
- setRole,
- viewUserDetail,
- }, dispatch);
-
-export default connect(mapStateToProps, mapDispatchToProps)(TableContainer);
-
diff --git a/client/coral-admin/src/routes/Stories/components/Stories.js b/client/coral-admin/src/routes/Stories/components/Stories.js
index 746c733d7..57caa2744 100644
--- a/client/coral-admin/src/routes/Stories/components/Stories.js
+++ b/client/coral-admin/src/routes/Stories/components/Stories.js
@@ -2,7 +2,7 @@ import React, {Component} from 'react';
import {Link} from 'react-router';
import PropTypes from 'prop-types';
import sortBy from 'lodash/sortBy';
-import {Dropdown, Option, Pager, Icon} from 'coral-ui';
+import {Dropdown, Option, Paginate, Icon} from 'coral-ui';
import {DataTable, TableHeader, RadioGroup, Radio} from 'react-mdl';
import t from 'coral-framework/services/i18n';
import styles from './Stories.css';
@@ -139,10 +139,10 @@ class Stories extends Component {
{t('streams.status')}
-
+ onNewPageHandler={this.onPageClick} /> */}
: {t('streams.empty_result')}
}
|