diff --git a/client/coral-admin/src/routes/Community/components/People.js b/client/coral-admin/src/routes/Community/components/People.js index ff1c2c279..b0524f273 100644 --- a/client/coral-admin/src/routes/Community/components/People.js +++ b/client/coral-admin/src/routes/Community/components/People.js @@ -5,6 +5,7 @@ import Table from '../containers/Table'; import {Pager, Icon} from 'coral-ui'; import EmptyCard from '../../../components/EmptyCard'; import t from 'coral-framework/services/i18n'; +import PropTypes from 'prop-types'; const tableHeaders = [ { @@ -62,4 +63,12 @@ const People = ({commenters, searchValue, onSearchChange, ...props}) => { ); }; +People.propTypes = { + commenters: PropTypes.array, + searchValue: PropTypes.string, + onSearchChange: PropTypes.func, + totalPages: PropTypes.number, + onNewPageHandler: PropTypes.func, +}; + export default People; diff --git a/client/coral-admin/src/routes/Community/components/Table.css b/client/coral-admin/src/routes/Community/components/Table.css index affc6c0e2..65eda5b4c 100644 --- a/client/coral-admin/src/routes/Community/components/Table.css +++ b/client/coral-admin/src/routes/Community/components/Table.css @@ -19,6 +19,13 @@ } } +.username, .email { + max-width: 215px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} + .email { display: block; } diff --git a/client/coral-admin/src/routes/Community/components/Table.js b/client/coral-admin/src/routes/Community/components/Table.js index 18f52592d..60621080e 100644 --- a/client/coral-admin/src/routes/Community/components/Table.js +++ b/client/coral-admin/src/routes/Community/components/Table.js @@ -2,8 +2,10 @@ import React from 'react'; import {SelectField, Option} from 'react-mdl-selectfield'; import styles from '../components/Table.css'; import t from 'coral-framework/services/i18n'; +import PropTypes from 'prop-types'; +import cn from 'classnames'; -export default ({headers, commenters, onHeaderClickHandler, onRoleChange, onCommenterStatusChange, viewUserDetail}) => ( +const Table = ({headers, commenters, onHeaderClickHandler, onRoleChange, onCommenterStatusChange, viewUserDetail}) => ( @@ -21,7 +23,7 @@ export default ({headers, commenters, onHeaderClickHandler, onRoleChange, onComm {commenters.map((row, i)=> (
- + {row.profiles.map(({id}) => id)} @@ -54,3 +56,14 @@ export default ({headers, commenters, onHeaderClickHandler, onRoleChange, onComm
); + +Table.propTypes = { + headers: PropTypes.array, + commenters: PropTypes.array, + onHeaderClickHandler: PropTypes.func, + onRoleChange: PropTypes.func, + onCommenterStatusChange: PropTypes.func, + viewUserDetail: PropTypes.func, +}; + +export default Table; diff --git a/client/coral-admin/src/routes/Community/containers/Table.js b/client/coral-admin/src/routes/Community/containers/Table.js index 5d4e4914f..086a56638 100644 --- a/client/coral-admin/src/routes/Community/containers/Table.js +++ b/client/coral-admin/src/routes/Community/containers/Table.js @@ -1,10 +1,10 @@ import React, {Component} from 'react'; import {connect} from 'react-redux'; import {bindActionCreators} from 'redux'; -import {compose} from 'react-apollo'; 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 { @@ -22,6 +22,12 @@ class TableContainer extends Component { } } +TableContainer.propTypes = { + setRole: PropTypes.func, + setCommenterStatus: PropTypes.func, + commenters: PropTypes.array, +}; + const mapStateToProps = (state) => ({ commenters: state.community.accounts, }); @@ -33,7 +39,5 @@ const mapDispatchToProps = (dispatch) => viewUserDetail, }, dispatch); -export default compose( - connect(mapStateToProps, mapDispatchToProps), -)(TableContainer); +export default connect(mapStateToProps, mapDispatchToProps)(TableContainer);