diff --git a/client/coral-admin/src/components/AccountHistory.js b/client/coral-admin/src/components/AccountHistory.js index c74effeed..cfeb4b591 100644 --- a/client/coral-admin/src/components/AccountHistory.js +++ b/client/coral-admin/src/components/AccountHistory.js @@ -2,9 +2,27 @@ import React from 'react'; import PropTypes from 'prop-types'; import styles from './AccountHistory.css'; import cn from 'classnames'; +import flatten from 'lodash/flatten'; +import orderBy from 'lodash/orderBy'; +import moment from 'moment'; + +const buildUserHistory = (userState = {}) => { + return orderBy(flatten(Object.keys(userState.status) + .filter((k) => k !== '__typename') + .map((k) => userState.status[k].history)), 'created_at', 'asc'); +}; + +const actionResponses = { + 'UsernameStatusHistory' : 'Username Status', + 'BannedStatusHistory': 'Banned Status', + 'SuspensionStatusHistory': 'Suspension Status' +}; class AccountHistory extends React.Component { render() { + const {userState} = this.props; + const userHistory = buildUserHistory(userState); + console.log(userHistory); return (
@@ -13,11 +31,15 @@ class AccountHistory extends React.Component {
Action
Moderation
-
-
Date
-
Action
-
Moderation
-
+ { + userHistory.map((h, i) => ( +
+
{moment(new Date(h.created_at)).format('MMM DD, YYYY')}
+
{actionResponses[h.__typename]}: {h.status}
+
{h.assigned_by ? h.assigned_by.username : 'SYSTEM'}
+
+ )) + }
); @@ -26,6 +48,7 @@ class AccountHistory extends React.Component { AccountHistory.propTypes = { history: PropTypes.array, + userState: PropTypes.object, }; export default AccountHistory; diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js index 8160d9566..1ded7f59e 100644 --- a/client/coral-admin/src/components/UserDetail.js +++ b/client/coral-admin/src/components/UserDetail.js @@ -229,7 +229,9 @@ export default class UserDetail extends React.Component { } : - + }